You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by wa...@apache.org on 2011/12/26 20:04:02 UTC
svn commit: r801061 - in /websites/production/openofficeorg: ./
content/openofficeorg/ content/openofficeorg/docs/
content/openofficeorg/docs/governance/
Author: wave
Date: Mon Dec 26 19:04:01 2011
New Revision: 801061
Log:
Adjusted the lefthand navigation.
Modified:
websites/production/openofficeorg/ (props changed)
websites/production/openofficeorg/content/openofficeorg/bug-tracking.html
websites/production/openofficeorg/content/openofficeorg/community-faqs.html
websites/production/openofficeorg/content/openofficeorg/contact.html
websites/production/openofficeorg/content/openofficeorg/developer-faqs.html
websites/production/openofficeorg/content/openofficeorg/docs/download_process.html
websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html
websites/production/openofficeorg/content/openofficeorg/docs/governance/consensusBuilding.html
websites/production/openofficeorg/content/openofficeorg/docs/governance/lazyConsensus.html
websites/production/openofficeorg/content/openofficeorg/docs/governance/voting.html
websites/production/openofficeorg/content/openofficeorg/get-involved.html
websites/production/openofficeorg/content/openofficeorg/index.html
websites/production/openofficeorg/content/openofficeorg/license.html
websites/production/openofficeorg/content/openofficeorg/mailing-lists.html
websites/production/openofficeorg/content/openofficeorg/people.html
websites/production/openofficeorg/content/openofficeorg/ppmc-faqs.html
websites/production/openofficeorg/content/openofficeorg/release-process.html
websites/production/openofficeorg/content/openofficeorg/security.html
websites/production/openofficeorg/content/openofficeorg/source.html
websites/production/openofficeorg/content/openofficeorg/svn-basics.html
websites/production/openofficeorg/content/openofficeorg/terms.html
websites/production/openofficeorg/content/openofficeorg/trademarks.html
websites/production/openofficeorg/content/openofficeorg/website-local.html
Propchange: websites/production/openofficeorg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 26 19:04:01 2011
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-801055
+/websites/staging/openofficeorg/trunk:791146-801060
Modified: websites/production/openofficeorg/content/openofficeorg/bug-tracking.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/bug-tracking.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/bug-tracking.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/community-faqs.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/community-faqs.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/community-faqs.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/contact.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/contact.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/contact.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/developer-faqs.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/developer-faqs.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/developer-faqs.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/docs/download_process.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/download_process.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/download_process.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/docs/governance/consensusBuilding.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/governance/consensusBuilding.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/governance/consensusBuilding.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/docs/governance/lazyConsensus.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/governance/lazyConsensus.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/governance/lazyConsensus.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/docs/governance/voting.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/governance/voting.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/governance/voting.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/get-involved.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/get-involved.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/get-involved.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/index.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/index.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/index.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/license.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/license.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/license.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/mailing-lists.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/mailing-lists.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/mailing-lists.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/people.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/people.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/people.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/ppmc-faqs.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/ppmc-faqs.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/ppmc-faqs.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/release-process.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/release-process.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/release-process.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/security.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/security.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/security.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/source.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/source.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/source.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/svn-basics.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/svn-basics.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/svn-basics.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/terms.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/terms.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/terms.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/trademarks.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/trademarks.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/trademarks.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/production/openofficeorg/content/openofficeorg/website-local.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/website-local.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/website-local.html Mon Dec 26 19:04:01 2011
@@ -40,7 +40,6 @@
<h1 id="general">General</h1>
<ul>
<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
<li><a href="/openofficeorg/license.html">License</a></li>
<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
</ul>
@@ -58,21 +57,22 @@
<li><a href="/openofficeorg/source.html">Source Code</a></li>
<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubation Status</a></li>
<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
</ul>
-<h1 id="asf">ASF</h1>
+<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/">Website</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
</ul>
</div>
<div id="contenta">