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 95E2598A1
for ;
Tue, 26 Jun 2012 22:53:55 +0000 (UTC)
Received: (qmail 65674 invoked by uid 500); 26 Jun 2012 22:53:55 -0000
Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org
Received: (qmail 65595 invoked by uid 500); 26 Jun 2012 22:53:55 -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 65586 invoked by uid 99); 26 Jun 2012 22:53:55 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jun 2012 22:53:55 +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:53 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
by eris.apache.org (Postfix) with ESMTP id 50A3F2388A4A
for ; Tue, 26 Jun 2012 22:53:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r823397 - in /websites/staging/ooo-site/trunk: cgi-bin/
content/
content/distribution/index.html
Date: Tue, 26 Jun 2012 22:53:32 -0000
To: ooo-commits@incubator.apache.org
From: buildbot@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120626225332.50A3F2388A4A@eris.apache.org>
Author: buildbot
Date: Tue Jun 26 22:53:31 2012
New Revision: 823397
Log:
Staging update by buildbot for openofficeorg
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/distribution/index.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 26 22:53:31 2012
@@ -1 +1 @@
-1354280
+1354282
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 26 22:53:31 2012
@@ -1 +1 @@
-1354280
+1354282
Modified: websites/staging/ooo-site/trunk/content/distribution/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/distribution/index.html (original)
+++ websites/staging/ooo-site/trunk/content/distribution/index.html Tue Jun 26 22:53:31 2012
@@ -35,10 +35,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.
@@ -93,7 +93,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