Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 73638D983 for ; Thu, 18 Oct 2012 12:44:31 +0000 (UTC) Received: (qmail 54380 invoked by uid 500); 18 Oct 2012 12:44:31 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 54246 invoked by uid 500); 18 Oct 2012 12:44:29 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 54226 invoked by uid 99); 18 Oct 2012 12:44:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Oct 2012 12:44:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Oct 2012 12:44:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8FA6D238890D; Thu, 18 Oct 2012 12:43:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1399631 - in /incubator/ooo/trunk/main: DISCLAIMER LICENSE_aggregated LICENSE_category_b instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf Date: Thu, 18 Oct 2012 12:43:41 -0000 To: ooo-commits@incubator.apache.org From: hdu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121018124341.8FA6D238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hdu Date: Thu Oct 18 12:43:40 2012 New Revision: 1399631 URL: http://svn.apache.org/viewvc?rev=1399631&view=rev Log: Remove the "incubating" disclaimer now that Apache OpenOffice has graduated from the Apache Incubator On October 18th, 2012 the Apache Software foundation announced that the Apache OpenOffice project has graduated from the Apache Incubator Removed: incubator/ooo/trunk/main/DISCLAIMER Modified: incubator/ooo/trunk/main/LICENSE_aggregated incubator/ooo/trunk/main/LICENSE_category_b incubator/ooo/trunk/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf Modified: incubator/ooo/trunk/main/LICENSE_aggregated URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/LICENSE_aggregated?rev=1399631&r1=1399630&r2=1399631&view=diff ============================================================================== --- incubator/ooo/trunk/main/LICENSE_aggregated (original) +++ incubator/ooo/trunk/main/LICENSE_aggregated Thu Oct 18 12:43:40 2012 @@ -1,6 +1,6 @@ ____ -The binary package of Apache OpenOffice (incubating) may include +The binary package of Apache OpenOffice may include dictionary extensions that are merely aggregated for the convenience of end users. Basis for this aggregation is Apache JIRA issue LEGAL-117 Modified: incubator/ooo/trunk/main/LICENSE_category_b URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/LICENSE_category_b?rev=1399631&r1=1399630&r2=1399631&view=diff ============================================================================== --- incubator/ooo/trunk/main/LICENSE_category_b (original) +++ incubator/ooo/trunk/main/LICENSE_category_b Thu Oct 18 12:43:40 2012 @@ -15,16 +15,16 @@ ____ -- MPL 1.1 license - For Hunspell library - spell checker and morphological analyzer: -- GPL 2.0/LGPL 2.1/MPL 1.1 tri-license - MPL 1.1 is chosen for Apache OpenOffice (incubating) + MPL 1.1 is chosen for Apache OpenOffice - For Hyphen - hyphenation library: -- GPL 2.0/LGPL 2.1/MPL 1.1 tri-license - MPL 1.1 is chosen for Apache OpenOffice (incubating) + MPL 1.1 is chosen for Apache OpenOffice - For Network Security Services (NSS) library: -- GPL 2.0/LGPL 2.1/MPL 1.1 tri-license - MPL 1.1 is chosen for Apache OpenOffice (incubating) + MPL 1.1 is chosen for Apache OpenOffice - For Rhino -- MPL 1.1 / GPL 2.0 dual licensed - MPL 1.1 is chosen for Apache OpenOffice (incubating) + MPL 1.1 is chosen for Apache OpenOffice MOZILLA PUBLIC LICENSE @@ -1002,7 +1002,7 @@ ____ For Graphite: - CPL 0.5 / LGPL 2.1 dual-licensed - CPL 0.5 is chosen for Apache OpenOffice (incubating) + CPL 0.5 is chosen for Apache OpenOffice GRAPHITE LICENSING @@ -1484,7 +1484,7 @@ ____ For Beanshell: - SPL 1.0 / LGPL dual-licensed - SPL 1.0 is chosen for Apache OpenOffice (incubating) is chosen + SPL 1.0 is chosen for Apache OpenOffice is chosen This file is part of the BeanShell Java Scripting distribution. Documentation and updates may be found at http://www.beanshell.org/ Modified: incubator/ooo/trunk/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf?rev=1399631&r1=1399630&r2=1399631&view=diff ============================================================================== --- incubator/ooo/trunk/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf (original) +++ incubator/ooo/trunk/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf Thu Oct 18 12:43:40 2012 @@ -305,7 +305,7 @@ en-US = "< &Back" en-US = "Cancel" [OOO_CONTROL_124] -en-US = "This Program is based on the 'Apache OpenOffice (incubating)' project which is supported by members of the Apache Community. For credits, see: http://www.openoffice.org/welcome/credits.html" +en-US = "This Program is based on the 'Apache OpenOffice' project which is supported by members of the Apache Community. For credits please see: http://www.openoffice.org/welcome/credits.html" [OOO_CONTROL_125] en-US = "&Next >"