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 D44B4989D for ; Tue, 26 Jun 2012 22:53:15 +0000 (UTC) Received: (qmail 63361 invoked by uid 500); 26 Jun 2012 22:53:14 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 63329 invoked by uid 500); 26 Jun 2012 22:53:14 -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 63281 invoked by uid 99); 26 Jun 2012 22:53:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jun 2012 22:53:14 +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; Tue, 26 Jun 2012 22:53:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 97B5823888CD; Tue, 26 Jun 2012 22:52:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1354282 - /incubator/ooo/ooo-site/trunk/content/distribution/index.html Date: Tue, 26 Jun 2012 22:52:53 -0000 To: ooo-commits@incubator.apache.org From: kschenk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120626225253.97B5823888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kschenk Date: Tue Jun 26 22:52:52 2012 New Revision: 1354282 URL: http://svn.apache.org/viewvc?rev=1354282&view=rev Log: Updated use of "incubating" in project name Modified: incubator/ooo/ooo-site/trunk/content/distribution/index.html Modified: incubator/ooo/ooo-site/trunk/content/distribution/index.html URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/distribution/index.html?rev=1354282&r1=1354281&r2=1354282&view=diff ============================================================================== --- incubator/ooo/ooo-site/trunk/content/distribution/index.html (original) +++ incubator/ooo/ooo-site/trunk/content/distribution/index.html Tue Jun 26 22:52:52 2012 @@ -19,10 +19,10 @@

-Distribution FAQ

+Apache OpenOffice (incubating) Distribution FAQ

Where is the old distribution list/information?

The Apache OpenOffice project distributes OpenOffice online, as a +

The Apache OpenOffice (incubating) project distributes Apache OpenOffice online, as a free download from our website. Although this is sufficient for most users, we also know that for other users, a copy of OpenOffice on CD-ROM or other media is preferred.

@@ -77,7 +77,7 @@ Can I distribute OpenOffice on a CD, or something else?

Generally, no. If such a need arises for whatever reason, please contact the Apache -OpenOffice PPMC.

+OpenOffice (incubating) PPMC.

Can I distribute OpenOffice and use my company's name with it?

If you, as company ABC, wish to distribute OpenOffice on a CD with