openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robw...@apache.org
Subject svn commit: r1423866 - /openoffice/ooo-site/trunk/content/FAQs/faq-other.html
Date Wed, 19 Dec 2012 14:06:44 GMT
Author: robweir
Date: Wed Dec 19 14:06:43 2012
New Revision: 1423866

URL: http://svn.apache.org/viewvc?rev=1423866&view=rev
Log:
CMS commit to ooo-site by robweir

Modified:
    openoffice/ooo-site/trunk/content/FAQs/faq-other.html

Modified: openoffice/ooo-site/trunk/content/FAQs/faq-other.html
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/FAQs/faq-other.html?rev=1423866&r1=1423865&r2=1423866&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/FAQs/faq-other.html (original)
+++ openoffice/ooo-site/trunk/content/FAQs/faq-other.html Wed Dec 19 14:06:43 2012
@@ -18,7 +18,7 @@
 <ol><li> <a href="#1">Why is Sun's copyright being maintained on some of
the documents available on OpenOffice.org?</a>
   <li> <a href="#2">How did Sun deal with source code where it does not have
copyright?</a>
   <li><a href="#3">What external code is required to build OpenOffice.org?</a>
-  <li><a href="#4">Why should we say "OpenOffice.org" instead of simply "OpenOffice"?</a>
   <li> <a href="#8">When will OpenOffice.org for Mac OS X be available for download?</a>
</li>
+  <li><a href="#4">Why should we say "Apache OpenOffice" instead of simply "OpenOffice"?</a>
   <li> <a href="#8">When will OpenOffice.org for Mac OS X be available for download?</a>
</li>
   <li><a href="#5">What are the different invocation syntaxes used by OpenOffice.org
binaries?</a> </li>
   <li><a href="#6">How should I refer to OpenOffice.org in my documents?</a>
</li>
   <li><a href="#7">How can I get OpenOffice.org in some language other than English?</a>
@@ -49,10 +49,10 @@
 <p> <a href="#top">Back to top</a>
 <p>
 <hr align=left size="1" noshade>
-<p><b>Why should we say "OpenOffice.org" instead of simply "OpenOffice"?</b>
<a name="4" id="4"></a>
+<p><b>Why should we say "Apache OpenOffice" instead of simply "OpenOffice"?</b>
<a name="4" id="4"></a>
 <ol>
   <li value="4">
-    <p> The trademark for &quot;OpenOffice&quot; belongs to someone else. Therefore
we must use &quot;OpenOffice.org&quot; when referring to this open source project
and its software.</p>
+    <p>To avoid ambiguity and to acknowledge that we are part of the Apache Software
Foundation.  "Apache OpenOffice" is our trademark and is an important element of our brand.</p>
   </li>
 </ol>
 <p> <a href="#top">Back to top</a></p>



Mime
View raw message