Author: buildbot
Date: Wed Dec 19 14:07:58 2012
New Revision: 843081
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/FAQs/faq-other.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Dec 19 14:07:58 2012
@@ -1 +1 @@
-1423232
+1423866
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Dec 19 14:07:58 2012
@@ -1 +1 @@
-1423232
+1423866
Modified: websites/staging/ooo-site/trunk/content/FAQs/faq-other.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/FAQs/faq-other.html (original)
+++ websites/staging/ooo-site/trunk/content/FAQs/faq-other.html Wed Dec 19
14:07:58 2012
@@ -35,7 +35,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>
@@ -66,10 +66,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 "OpenOffice" belongs to someone else.
Therefore we must use "OpenOffice.org" 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>
