Author: buildbot
Date: Tue May 20 22:21:08 2014
New Revision: 909460
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 Tue May 20 22:21:08 2014
@@ -1 +1 @@
-1596421
+1596424
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue May 20 22:21:08 2014
@@ -1 +1 @@
-1596421
+1596424
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 May 20
22:21:08 2014
@@ -66,11 +66,25 @@ OpenOffice wiki</A>.
<H2><A NAME="cd_and_dvd_distribution"></A>
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
+3.4 or later, 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, without modifying the
product name.
</P>
+<H2><A NAME="ebay"></A>
+Can I sell, on CD or DVD, an unmodified version of Apache OpenOffice on Ebay
or similar site?</H2>
+<P>Yes, this is covered under Apache License 2. Please see the previous
question.
+We require that people selling Apache OpenOffice on EBay or similar sites
include this note
+for trademarks acknowledgment:</P>
+<BLOCKQUOTE>
+Apache OpenOffice can be downloaded free from the official site
+<a href="http://openoffice.org";>http://openoffice.org</a>. Apache, the Apache
feather logo,
+and OpenOffice are trademarks of The Apache Software Foundation.
OpenOffice.org and the seagull
+logo are registered trademarks of The Apache Software Foundation.
+</BLOCKQUOTE>
+<P>Note that use of other trademarks, such as the OpenOffice logo, requires
explicit permission.
+See <A
HREF="http://openoffice.apache.org/trademarks.html";>http://openoffice.apache.org/trademarks.html</A>.
+</P>
<H2><A NAME="partnership_links"></A>
I want to link to your product/page. Will you partner with me and
link to mine?</H2>
