You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2018/01/28 19:01:33 UTC
svn commit: r1024495 - in /websites/staging/openoffice/trunk/content: ./
docs/ docs/governance/ orientation/
Author: buildbot
Date: Sun Jan 28 19:01:32 2018
New Revision: 1024495
Log:
Staging update by buildbot for openoffice
Modified:
websites/staging/openoffice/trunk/content/ (props changed)
websites/staging/openoffice/trunk/content/bug-tracking.html
websites/staging/openoffice/trunk/content/community-faqs.html
websites/staging/openoffice/trunk/content/contact.html
websites/staging/openoffice/trunk/content/contributing-code.html
websites/staging/openoffice/trunk/content/developer-faqs.html
websites/staging/openoffice/trunk/content/docs/download_process.html
websites/staging/openoffice/trunk/content/docs/edit-cms.html
websites/staging/openoffice/trunk/content/docs/governance/consensusBuilding.html
websites/staging/openoffice/trunk/content/docs/governance/lazyConsensus.html
websites/staging/openoffice/trunk/content/docs/governance/voting.html
websites/staging/openoffice/trunk/content/downloads.html
websites/staging/openoffice/trunk/content/events.html
websites/staging/openoffice/trunk/content/get-involved-de.html
websites/staging/openoffice/trunk/content/get-involved.html
websites/staging/openoffice/trunk/content/get-it-here.html
websites/staging/openoffice/trunk/content/index.html
websites/staging/openoffice/trunk/content/license.html
websites/staging/openoffice/trunk/content/list-conduct.html
websites/staging/openoffice/trunk/content/mailing-lists.html
websites/staging/openoffice/trunk/content/mission.html
websites/staging/openoffice/trunk/content/native-lang.html
websites/staging/openoffice/trunk/content/orientation/decision-making.html
websites/staging/openoffice/trunk/content/orientation/how-aoo-project-works.html
websites/staging/openoffice/trunk/content/orientation/index.html
websites/staging/openoffice/trunk/content/orientation/infrastructure.html
websites/staging/openoffice/trunk/content/orientation/intro-contributing.html
websites/staging/openoffice/trunk/content/orientation/intro-development.html
websites/staging/openoffice/trunk/content/orientation/intro-doc.html
websites/staging/openoffice/trunk/content/orientation/intro-l10n.html
websites/staging/openoffice/trunk/content/orientation/intro-marketing.html
websites/staging/openoffice/trunk/content/orientation/intro-qa.html
websites/staging/openoffice/trunk/content/people.html
websites/staging/openoffice/trunk/content/pmc-faqs.html
websites/staging/openoffice/trunk/content/press.html
websites/staging/openoffice/trunk/content/privacy.html
websites/staging/openoffice/trunk/content/qa.html
websites/staging/openoffice/trunk/content/security.html
websites/staging/openoffice/trunk/content/social.html
websites/staging/openoffice/trunk/content/source.html
websites/staging/openoffice/trunk/content/students.html
websites/staging/openoffice/trunk/content/style-test.html
websites/staging/openoffice/trunk/content/svn-basics.html
websites/staging/openoffice/trunk/content/terms.html
websites/staging/openoffice/trunk/content/trademarks.html
websites/staging/openoffice/trunk/content/translate.html
websites/staging/openoffice/trunk/content/website-local.html
websites/staging/openoffice/trunk/content/website-native.html
Propchange: websites/staging/openoffice/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jan 28 19:01:32 2018
@@ -1 +1 @@
-1822438
+1822474
Modified: websites/staging/openoffice/trunk/content/bug-tracking.html
==============================================================================
--- websites/staging/openoffice/trunk/content/bug-tracking.html (original)
+++ websites/staging/openoffice/trunk/content/bug-tracking.html Sun Jan 28 19:01:32 2018
@@ -142,7 +142,7 @@ h2:hover > .headerlink, h3:hover > .head
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/community-faqs.html
==============================================================================
--- websites/staging/openoffice/trunk/content/community-faqs.html (original)
+++ websites/staging/openoffice/trunk/content/community-faqs.html Sun Jan 28 19:01:32 2018
@@ -161,7 +161,7 @@ to approve a release.</p>
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/contact.html
==============================================================================
--- websites/staging/openoffice/trunk/content/contact.html (original)
+++ websites/staging/openoffice/trunk/content/contact.html Sun Jan 28 19:01:32 2018
@@ -157,7 +157,7 @@ h2:hover > .headerlink, h3:hover > .head
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/contributing-code.html
==============================================================================
--- websites/staging/openoffice/trunk/content/contributing-code.html (original)
+++ websites/staging/openoffice/trunk/content/contributing-code.html Sun Jan 28 19:01:32 2018
@@ -170,7 +170,7 @@ us under the Apache License as well.</p>
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/developer-faqs.html
==============================================================================
--- websites/staging/openoffice/trunk/content/developer-faqs.html (original)
+++ websites/staging/openoffice/trunk/content/developer-faqs.html Sun Jan 28 19:01:32 2018
@@ -207,7 +207,7 @@ additional information on current and fu
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/docs/download_process.html
==============================================================================
--- websites/staging/openoffice/trunk/content/docs/download_process.html (original)
+++ websites/staging/openoffice/trunk/content/docs/download_process.html Sun Jan 28 19:01:32 2018
@@ -137,7 +137,7 @@ h2:hover > .headerlink, h3:hover > .head
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/docs/edit-cms.html
==============================================================================
--- websites/staging/openoffice/trunk/content/docs/edit-cms.html (original)
+++ websites/staging/openoffice/trunk/content/docs/edit-cms.html Sun Jan 28 19:01:32 2018
@@ -247,7 +247,7 @@ in the staging repository in order for t
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/docs/governance/consensusBuilding.html
==============================================================================
--- websites/staging/openoffice/trunk/content/docs/governance/consensusBuilding.html (original)
+++ websites/staging/openoffice/trunk/content/docs/governance/consensusBuilding.html Sun Jan 28 19:01:32 2018
@@ -173,7 +173,7 @@ the work under the <a href="/docs/govern
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/docs/governance/lazyConsensus.html
==============================================================================
--- websites/staging/openoffice/trunk/content/docs/governance/lazyConsensus.html (original)
+++ websites/staging/openoffice/trunk/content/docs/governance/lazyConsensus.html Sun Jan 28 19:01:32 2018
@@ -180,7 +180,7 @@ can take some time to get used to.</p>
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/docs/governance/voting.html
==============================================================================
--- websites/staging/openoffice/trunk/content/docs/governance/voting.html (original)
+++ websites/staging/openoffice/trunk/content/docs/governance/voting.html Sun Jan 28 19:01:32 2018
@@ -217,7 +217,7 @@ and present the results. Everyone has 1
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/downloads.html
==============================================================================
--- websites/staging/openoffice/trunk/content/downloads.html (original)
+++ websites/staging/openoffice/trunk/content/downloads.html Sun Jan 28 19:01:32 2018
@@ -649,7 +649,7 @@ by Sun Microsystems and Oracle. All inst
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/events.html
==============================================================================
--- websites/staging/openoffice/trunk/content/events.html (original)
+++ websites/staging/openoffice/trunk/content/events.html Sun Jan 28 19:01:32 2018
@@ -167,7 +167,7 @@ from the <a href="http://archive.apachec
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/get-involved-de.html
==============================================================================
--- websites/staging/openoffice/trunk/content/get-involved-de.html (original)
+++ websites/staging/openoffice/trunk/content/get-involved-de.html Sun Jan 28 19:01:32 2018
@@ -212,7 +212,7 @@ möchtest, werfe einen Blick auf unser
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/get-involved.html
==============================================================================
--- websites/staging/openoffice/trunk/content/get-involved.html (original)
+++ websites/staging/openoffice/trunk/content/get-involved.html Sun Jan 28 19:01:32 2018
@@ -209,7 +209,7 @@ page.</p>
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/get-it-here.html
==============================================================================
--- websites/staging/openoffice/trunk/content/get-it-here.html (original)
+++ websites/staging/openoffice/trunk/content/get-it-here.html Sun Jan 28 19:01:32 2018
@@ -192,7 +192,7 @@ website. You can send your links to us
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/index.html
==============================================================================
--- websites/staging/openoffice/trunk/content/index.html (original)
+++ websites/staging/openoffice/trunk/content/index.html Sun Jan 28 19:01:32 2018
@@ -209,7 +209,7 @@ a <a href="https://www.openoffice.org/ab
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/license.html
==============================================================================
--- websites/staging/openoffice/trunk/content/license.html (original)
+++ websites/staging/openoffice/trunk/content/license.html Sun Jan 28 19:01:32 2018
@@ -313,7 +313,7 @@ identification within third-party archiv
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/list-conduct.html
==============================================================================
--- websites/staging/openoffice/trunk/content/list-conduct.html (original)
+++ websites/staging/openoffice/trunk/content/list-conduct.html Sun Jan 28 19:01:32 2018
@@ -246,7 +246,7 @@ The decision of the PMC is final.</p>
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/mailing-lists.html
==============================================================================
--- websites/staging/openoffice/trunk/content/mailing-lists.html (original)
+++ websites/staging/openoffice/trunk/content/mailing-lists.html Sun Jan 28 19:01:32 2018
@@ -365,7 +365,7 @@ the OpenOffice project:</p>
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/mission.html
==============================================================================
--- websites/staging/openoffice/trunk/content/mission.html (original)
+++ websites/staging/openoffice/trunk/content/mission.html Sun Jan 28 19:01:32 2018
@@ -181,7 +181,7 @@ to improve these standards and to test a
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/native-lang.html
==============================================================================
--- websites/staging/openoffice/trunk/content/native-lang.html (original)
+++ websites/staging/openoffice/trunk/content/native-lang.html Sun Jan 28 19:01:32 2018
@@ -184,7 +184,7 @@ endeavors.</p>
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/orientation/decision-making.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/decision-making.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/decision-making.html Sun Jan 28 19:01:32 2018
@@ -213,7 +213,7 @@ list.</p>
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/orientation/how-aoo-project-works.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/how-aoo-project-works.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/how-aoo-project-works.html Sun Jan 28 19:01:32 2018
@@ -172,7 +172,7 @@ users around the globe. This includes tr
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/orientation/index.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/index.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/index.html Sun Jan 28 19:01:32 2018
@@ -176,7 +176,7 @@ h2:hover > .headerlink, h3:hover > .head
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/orientation/infrastructure.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/infrastructure.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/infrastructure.html Sun Jan 28 19:01:32 2018
@@ -191,7 +191,7 @@ h2:hover > .headerlink, h3:hover > .head
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/orientation/intro-contributing.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/intro-contributing.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/intro-contributing.html Sun Jan 28 19:01:32 2018
@@ -190,7 +190,7 @@ Apache, then much of this will already b
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/orientation/intro-development.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/intro-development.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/intro-development.html Sun Jan 28 19:01:32 2018
@@ -184,7 +184,7 @@ Although there are many other combinatio
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/orientation/intro-doc.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/intro-doc.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/intro-doc.html Sun Jan 28 19:01:32 2018
@@ -194,7 +194,7 @@ h2:hover > .headerlink, h3:hover > .head
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/orientation/intro-l10n.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/intro-l10n.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/intro-l10n.html Sun Jan 28 19:01:32 2018
@@ -144,7 +144,7 @@ h2:hover > .headerlink, h3:hover > .head
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/orientation/intro-marketing.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/intro-marketing.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/intro-marketing.html Sun Jan 28 19:01:32 2018
@@ -202,7 +202,7 @@ h2:hover > .headerlink, h3:hover > .head
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/orientation/intro-qa.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/intro-qa.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/intro-qa.html Sun Jan 28 19:01:32 2018
@@ -280,7 +280,7 @@ problem, improving report titles to make
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/people.html
==============================================================================
--- websites/staging/openoffice/trunk/content/people.html (original)
+++ websites/staging/openoffice/trunk/content/people.html Sun Jan 28 19:01:32 2018
@@ -142,7 +142,7 @@ h2:hover > .headerlink, h3:hover > .head
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/pmc-faqs.html
==============================================================================
--- websites/staging/openoffice/trunk/content/pmc-faqs.html (original)
+++ websites/staging/openoffice/trunk/content/pmc-faqs.html Sun Jan 28 19:01:32 2018
@@ -347,7 +347,7 @@ that means also to count the votes and p
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/press.html
==============================================================================
--- websites/staging/openoffice/trunk/content/press.html (original)
+++ websites/staging/openoffice/trunk/content/press.html Sun Jan 28 19:01:32 2018
@@ -149,7 +149,7 @@ e-mailing <a href="mailto:press@openoffi
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/privacy.html
==============================================================================
--- websites/staging/openoffice/trunk/content/privacy.html (original)
+++ websites/staging/openoffice/trunk/content/privacy.html Sun Jan 28 19:01:32 2018
@@ -157,7 +157,7 @@ manner and for the purpose described abo
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/qa.html
==============================================================================
--- websites/staging/openoffice/trunk/content/qa.html (original)
+++ websites/staging/openoffice/trunk/content/qa.html Sun Jan 28 19:01:32 2018
@@ -158,7 +158,7 @@ to the Level 1 and Level 2 topics, as w
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/security.html
==============================================================================
--- websites/staging/openoffice/trunk/content/security.html (original)
+++ websites/staging/openoffice/trunk/content/security.html Sun Jan 28 19:01:32 2018
@@ -162,7 +162,7 @@ it may take us a little longer to respon
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/social.html
==============================================================================
--- websites/staging/openoffice/trunk/content/social.html (original)
+++ websites/staging/openoffice/trunk/content/social.html Sun Jan 28 19:01:32 2018
@@ -150,7 +150,7 @@ Recommended hashtags for Twitter: #aoo #
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/source.html
==============================================================================
--- websites/staging/openoffice/trunk/content/source.html (original)
+++ websites/staging/openoffice/trunk/content/source.html Sun Jan 28 19:01:32 2018
@@ -190,7 +190,7 @@ LGPL-licenced and is not maintained by t
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/students.html
==============================================================================
--- websites/staging/openoffice/trunk/content/students.html (original)
+++ websites/staging/openoffice/trunk/content/students.html Sun Jan 28 19:01:32 2018
@@ -172,7 +172,7 @@ context. The following points will help
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/style-test.html
==============================================================================
--- websites/staging/openoffice/trunk/content/style-test.html (original)
+++ websites/staging/openoffice/trunk/content/style-test.html Sun Jan 28 19:01:32 2018
@@ -170,7 +170,7 @@ Vestibulum enim wisi, viverra nec, fring
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/svn-basics.html
==============================================================================
--- websites/staging/openoffice/trunk/content/svn-basics.html (original)
+++ websites/staging/openoffice/trunk/content/svn-basics.html Sun Jan 28 19:01:32 2018
@@ -457,7 +457,7 @@ and commit from the aoo-update directory
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/terms.html
==============================================================================
--- websites/staging/openoffice/trunk/content/terms.html (original)
+++ websites/staging/openoffice/trunk/content/terms.html Sun Jan 28 19:01:32 2018
@@ -183,7 +183,7 @@ h2:hover > .headerlink, h3:hover > .head
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/trademarks.html
==============================================================================
--- websites/staging/openoffice/trunk/content/trademarks.html (original)
+++ websites/staging/openoffice/trunk/content/trademarks.html Sun Jan 28 19:01:32 2018
@@ -209,7 +209,7 @@ logo may be used according to the requir
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/translate.html
==============================================================================
--- websites/staging/openoffice/trunk/content/translate.html (original)
+++ websites/staging/openoffice/trunk/content/translate.html Sun Jan 28 19:01:32 2018
@@ -192,7 +192,7 @@ if you want that help.</p>
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/website-local.html
==============================================================================
--- websites/staging/openoffice/trunk/content/website-local.html (original)
+++ websites/staging/openoffice/trunk/content/website-local.html Sun Jan 28 19:01:32 2018
@@ -407,7 +407,7 @@ the effort comes from adding it to the k
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>
Modified: websites/staging/openoffice/trunk/content/website-native.html
==============================================================================
--- websites/staging/openoffice/trunk/content/website-native.html (original)
+++ websites/staging/openoffice/trunk/content/website-native.html Sun Jan 28 19:01:32 2018
@@ -313,7 +313,7 @@ See the general explaination for
</p>
<p>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
Other names appearing on the site may be trademarks of their respective owners.
</p>