Author: buildbot
Date: Sat Mar 15 23:51:32 2014
New Revision: 901750
Log:
Staging update by buildbot for ooo-site
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 Sat Mar 15 23:51:32 2014
@@ -1 +1 @@
-1577946
+1577958
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Mar 15 23:51:32 2014
@@ -1 +1 @@
-1577946
+1577958
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 Sat Mar 15
23:51:32 2014
@@ -28,12 +28,12 @@
<H1><A NAME="ApacheOpenOfficeDistributionFAQ"></A>
Apache OpenOffice Distribution FAQ</H1>
<H2><A NAME="old_distribution_list_information"></A>
-Where is the old distribution list/information?</H2>
+Do you distribute OpenOffice on CD/DVD? Where is the old distribution
list/information?</H2>
<P>The Apache OpenOffice 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.</P>
-<P>The legacy OpenOffice.org project had a "Distribution
+<P>We used to have a "Distribution
Project" that listed the contact information for 3rd parties who
would provide, at a charge, a CD-ROM containing OpenOffice. We've
suspended this program. If you want to voice your opinion on
@@ -41,13 +41,13 @@ the distribution project, or offer any o
our public mailing list, at [email protected].</P>
<H2><A NAME="OpenOfficeLicense"></A>
What do I need to know about the OpenOffice License?</H2>
-<P>Version 3.4, named Apache OpenOffice 3.4 and distributed by the
-Apache Software Foundation, uses Apache license, <A
HREF="http://www.apache.org/licenses/LICENSE-2.0.txt";>Apache
+<P>Apache OpenOffice, since version 3.4, is distributed by the
+Apache Software Foundation and uses the Apache license, <A
HREF="http://www.apache.org/licenses/LICENSE-2.0.txt";>Apache
License v2</A>. More about this license and how this license applies
to various scenarios can be found on the <A
HREF="http://www.apache.org/foundation/license-faq.html";>Apache
License and Distribution FAQ</A> page.
</P>
-<P>Versions 3.0, beta to 3.3, named OpenOffice.org 3.3, etc., used
+<P>Versions 3.0-beta to 3.3, named OpenOffice.org 3.3, etc., used
the <A HREF="http://www.gnu.org/licenses/lgpl.html";>GNU Lesser
General Public License v3</A>, LGPL.</P>
<P>You should comply with the terms of these licenses for any
@@ -64,13 +64,12 @@ OpenOffice.org logos and icons</A> on <A
OpenOffice wiki</A>.
</P>
<H2><A NAME="cd_and_dvd_distribution"></A>
-Can I Produce a CD/DVD of your software and distribute it.</H2>
+Can I Produce a CD/DVD of your software and distribute it?</H2>
<P>Yes, this is covered under Apache License 2 for Apache OpenOffice
3.4, and covered under the LGPL for older versions. Please see <B>I'm
not a lawyer. What does it all MEAN?</B> section of the <A
HREF="http://www.apache.org/foundation/license-faq.html";>Apache
License FAQ page</A>. This means you can distribute unmodified
-versions of Apache OpenOffice as Apache OpenOffice, or older versions
-of OpenOffice.org as OpenOffice.org.
+versions of Apache OpenOffice as Apache OpenOffice, without modifying the
product name.
</P>
<H2><A NAME="partnership_links"></A>
I want to link to your product/page. Will you partner with me and
