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 2011/12/26 21:58:28 UTC
svn commit: r801066 - in
/websites/staging/openofficeorg/trunk/content/openofficeorg: ./ docs/
docs/governance/
Author: buildbot
Date: Mon Dec 26 20:58:27 2011
New Revision: 801066
Log:
Staging update by buildbot
Modified:
websites/staging/openofficeorg/trunk/content/openofficeorg/bug-tracking.html
websites/staging/openofficeorg/trunk/content/openofficeorg/community-faqs.html
websites/staging/openofficeorg/trunk/content/openofficeorg/contact.html
websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html
websites/staging/openofficeorg/trunk/content/openofficeorg/docs/download_process.html
websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html
websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html
websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html
websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html
websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html
websites/staging/openofficeorg/trunk/content/openofficeorg/index.html
websites/staging/openofficeorg/trunk/content/openofficeorg/license.html
websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html
websites/staging/openofficeorg/trunk/content/openofficeorg/people.html
websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html
websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html
websites/staging/openofficeorg/trunk/content/openofficeorg/security.html
websites/staging/openofficeorg/trunk/content/openofficeorg/source.html
websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html
websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html
websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html
websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/bug-tracking.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/bug-tracking.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/bug-tracking.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
@@ -83,6 +83,8 @@
<a href="https://issues.apache.org/ooo/enter_bug.cgi"><img src="https://issues.apache.org/ooo/skins/standard/index/file-a-bug.png" /></a>
<a href="https://issues.apache.org/ooo/query.cgi"><img src="https://issues.apache.org/ooo/skins/standard/index/search.png" /></a>
<a href="https://issues.apache.org/ooo/userprefs.cgi"><img src="https://issues.apache.org/ooo/skins/standard/index/new-account.png" /></a></div>
+
+<p>The <a href="http://www.openoffice.org/qa/issue_handling/pre_submission.html">issue handling pages</a> of the <a href="http://www.openoffice.org/">OpenOffice.org</a> website is useful. </p>
</div>
<div id="footera">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/community-faqs.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/community-faqs.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/community-faqs.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/contact.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/contact.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/contact.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/download_process.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/download_process.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/download_process.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/index.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/index.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/index.html Mon Dec 26 20:58:27 2011
@@ -21,7 +21,7 @@
<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
-<title>Apache OpenOffice(Incubating)</title>
+<title>Apache OpenOffice (Incubating)</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,14 +70,14 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
- <h1 class="title">Apache OpenOffice(Incubating)</h1>
+ <h1 class="title">Apache OpenOffice (Incubating)</h1>
<p>Apache OpenOffice is comprised of six personal productivity applications: a word processor (and its web-authoring component),
spreadsheet, presentation graphics, drawing, equation editor, and database. OpenOffice is released on Windows, Solaris, Linux and
Macintosh operation systems, with more communities joining, including a mature FreeBSD port. OpenOffice is localized, supporting
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/license.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/license.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/license.html Mon Dec 26 20:58:27 2011
@@ -21,7 +21,7 @@
<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
-<title></title>
+<title>Apache License</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,14 +70,14 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
-
+ <h1 class="title">Apache License</h1>
<p>Apache License<br></br>Version 2.0, January 2004<br></br>
<a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a> </p>
<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/people.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/people.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/people.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/security.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/security.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/security.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/source.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/source.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/source.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,19 +70,19 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">
<h1 class="title">Apache OpenOffice Trademarks</h1>
- <p>The Apache Software Foundation hold trademarks on behalf of its
+ <p>The Apache Software Foundation holds trademarks on behalf of its
projects. For the Apache OpenOffice project these trademarks include
the names Apache OpenOffice and OpenOffice.org, as well as the
graphical logo. Use of these marks is prohibited without explicit
-permission from ASF.</p>
+permission from the ASF.</p>
<p>However, the Apache OpenOffice project is happy to work with 3rd
parties who desire to use these trademarks in ways that are beneficial
to the project, which do not imply endorsement by ASF, and which are
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html Mon Dec 26 20:58:27 2011
@@ -60,7 +60,7 @@
<li><a href="/openofficeorg/security.html">Security Reports</a></li>
<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
</ul>
-<h1 id="project_management_ppmc">Project Management (P)PMC</h1>
+<h1 id="project_management_ppmc">Project Management PPMC</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>
@@ -70,9 +70,9 @@
<h1 id="apache_software_foundation">Apache Software Foundation</h1>
<ul>
<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/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</div>
<div id="contenta">