incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r835784 [1/2] - in /websites/staging/openofficeorg/trunk/content: ./ openofficeorg/ openofficeorg/docs/ openofficeorg/orientation/
Date Mon, 22 Oct 2012 18:46:48 GMT
Author: buildbot
Date: Mon Oct 22 18:46:46 2012
New Revision: 835784

Log:
Staging update by buildbot for openofficeorg

Added:
    websites/staging/openofficeorg/trunk/content/openofficeorg/pmc-faqs.html
Removed:
    websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html
Modified:
    websites/staging/openofficeorg/trunk/content/   (props changed)
    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/downloads.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/get-it-here.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/google6fb27cb926cc20ac.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/index.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/license.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/list-conduct.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/mission.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/native-lang.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/level-1.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/people.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/press.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/privacy.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/qa.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/security.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/social.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/translate.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html

Propchange: websites/staging/openofficeorg/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Oct 22 18:46:46 2012
@@ -1 +1 @@
-1400496
+1400999

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -107,7 +106,7 @@
 <ul>
 <li><a href="mailto:ooo-dev@incubator.apache.org">ooo-dev@incubator.apache.org</a>.</li>
 </ul>
-<p>For private or legal matters, please contact the Podling Project Management Committee (PPMC):</p>
+<p>For private or legal matters, please contact the Project Management Committee (PMC):</p>
 <ul>
 <li><a href="mailto:ooo-private@incubator.apache.org">ooo-private@incubator.apache.org</a>.</li>
 </ul>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -111,7 +110,7 @@
 <p>The migrated www.openoffice.org is stored in SVN at <a href="https://svn.apache.org/repos/asf/incubator/ooo/ooo-site">https://svn.apache.org/repos/asf/incubator/ooo/ooo-site</a> and is primarily "html".</p>
 <p>Via integration with the <a href="http://www.apache.org/dev/cms.html">Apache CMS</a>, it is possible to edit, stage and publish 
 website updates from the command line, or by using a web-based interface, the <a href="https://cms.apache.org/#bookmark">CMS bookmarklet</a>.</p>
-<p>Detailed information can be found in the <a href="http://incubator.apache.org/openofficeorg/docs/edit-cms.html">How to edit the OpenOffice.org website</a> page.</p>
+<p>Detailed information can be found in the <a href="http://openoffice.apache.org/docs/edit-cms.html">How to edit the OpenOffice.org website</a> page.</p>
 <p>Information on deeper website development is found on the <a href="website-local.html">Website Development</a> page.</p>
 <h2 id="wzxhzdk2ive-just-been-voted-in-as-a-committer-what-do-i-need-to-dowzxhzdk3"><a name="ive_just_been_voted_in_as_a_committer__what_do_i_need_to_do">I've just been voted in as a Committer.  What do I need to do?</a></h2>
 <p>First, congratulations.  Your contributions to the project have been noted and we 
@@ -124,15 +123,15 @@ administrative steps that you will need 
 when this has occurred when your name appears in the <a href="http://people.apache.org/committer-index.html#unlistedclas">Unlisted ICLAs</a> section 
 on the Apache Committers page.  This could take a couple of days, longer if you
 submitted the ICLA via post.</li>
-<li>Once the your ICLA has been recorded, you should send a note to the <a href="mailto:ooo-private@incubator.apache.org">PPMC</a> 
+<li>Once the your ICLA has been recorded, you should send a note to the <a href="mailto:ooo-private@incubator.apache.org">PMC</a> 
 and request an Apache account.  You will want to include your full name and email address, 
 as you entered in the ICLA, as well as your preferred userid.  Please <a href="http://people.apache.org/committer-index.html">check first</a> 
 that your preferred userid is not already in use by another Apache Committer.</li>
 <li>Once your Apache account has been created, you will receive an email with
 further instructions for setting up your account.  This may take a couple of days.</li>
 <li>
-<p>If you were also voted as a PPMC member, you should then <a href="mailto:ooo-private-subscribe@incubator.apache.org">subscribe</a> to the 
-PPMC's private mailing list.</p>
+<p>If you were also voted as a PMC member, you should then <a href="mailto:ooo-private-subscribe@incubator.apache.org">subscribe</a> to the 
+PMC's private mailing list.</p>
 </li>
 <li>
 <p>Finally, you should read the <a href="http://www.apache.org/dev/new-committers-guide.html">"Guide for new committers"</a></p>
@@ -152,12 +151,12 @@ issue number so we can follow-up.</p>
 log entry for the committed patch, and you will be added to the <a href="http://www.openoffice.org/welcome/credits.html">OpenOffice credits page</a>
 to recognize your contribution.</p>
 <h2 id="wzxhzdk6how-do-i-use-apache-subversionwzxhzdk7"><a name="how_do_i_use_apache_subversion">How do I use Apache Subversion?</a></h2>
-<p>Instructions can be found on the <a href="http://incubator.apache.org/openofficeorg/svn-basics.html">Subversion Basics</a> page.</p>
+<p>Instructions can be found on the <a href="http://openoffice.apache.org/svn-basics.html">Subversion Basics</a> page.</p>
 <h2 id="wzxhzdk8where-can-i-find-out-more-about-code-developmentwzxhzdk9"><a name="where_can_i_find_out_more_about_code_development">Where can I find out more about code development?</a></h2>
 <p>You might want to start by reviewing the legacy information on <a href="http://www.openoffice.org/development/">OpenOffice.org
 development</a>. Or, take
 a look at information posted on the <a href="http://wiki.services.openoffice.org/wiki/Main_Page">OpenOffice.org wiki</a>.</p>
-<p>Of course, you will need the <a href="http://incubator.apache.org/openofficeorg/source.html">source code</a> to do anything.</p>
+<p>Of course, you will need the <a href="http://openoffice.apache.org/source.html">source code</a> to do anything.</p>
 <p>You don't have to be an actual committer to submit code. You can submit patches through
 the Apache OpenOffice Bugzilla issue reporting system. You simply need to file an issue
 and supply your patch as an attachment to the issue.</p>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/downloads.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/downloads.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/downloads.html Mon Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -97,7 +96,7 @@
   
     <h1 class="title">Downloads</h1>
     <p>The Apache OpenOffice project is pleased to announce the release of 3.4.1 on August 22, 2012. </p>
-<p>Our comprehensive <a href="http://www.openoffice.org/development/releases/3.4.1.html">RELEASE Notes</a> will inform about the changes in this release. People interested in AOO should also follow the <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">mailing lists</a> to track progress.</p>
+<p>Our comprehensive <a href="http://www.openoffice.org/development/releases/3.4.1.html">RELEASE Notes</a> will inform about the changes in this release. People interested in AOO should also follow the <a href="http://openoffice.apache.org/mailing-lists.html">mailing lists</a> to track progress.</p>
 <p>The Apache OpenOffice source release files are listed below. The pre-built versions of Apache OpenOffice 3.4.1 are available via the central <a href="http://www.openoffice.org/download/index.html">download</a> page.</p>
 <p>List of the current downloads:</p>
 <p><strong>Current Version 3.4.1 (incubating)</strong></p>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/get-it-here.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/get-it-here.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/get-it-here.html Mon Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -102,13 +101,13 @@ following logo subject to the following 
 <p> 
 <a href="http://download.openoffice.org/">
 <img width="300" height="100" alt="Download Apache OpenOffice here" 
-src="http://incubator.apache.org/openofficeorg/images/get-it-here/en.png"/>
+src="http://openoffice.apache.org/images/get-it-here/en.png"/>
 </a>
 </p>
 
-<p>The logo file may be <a href="http://incubator.apache.org/openofficeorg/images/get-it-here/en.png">found here</a>.</p>
+<p>The logo file may be <a href="http://openoffice.apache.org/images/get-it-here/en.png">found here</a>.</p>
 <p>If translations of the "Get it here!" text are required, send a request to the 
-<a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#development-mailing-list">ooo-dev mailing list</a> and we can make a translated version for you.</p>
+<a href="http://openoffice.apache.org/mailing-lists.html#development-mailing-list">ooo-dev mailing list</a> and we can make a translated version for you.</p>
 <h2 id="conditions">Conditions:</h2>
 <ol>
 <li>
@@ -136,7 +135,7 @@ users from getting the latest version of
 </li>
 <li>
 <p>Any use of this logo or any other Apache logo beyond the above 
-requires explicit permission per the existing <a href="http://incubator.apache.org/openofficeorg/trademarks.html">trademark policy</a></p>
+requires explicit permission per the existing <a href="http://openoffice.apache.org/trademarks.html">trademark policy</a></p>
 </li>
 </ol>
 <h2 id="example">Example</h2>
@@ -144,7 +143,7 @@ requires explicit permission per the exi
 HTML page:</p>
 <div class="codehilite"><pre><span class="nt">&lt;a</span> <span class="na">href=</span><span class="s">&quot;http://download.openoffice.org/&quot;</span><span class="nt">&gt;</span>
 <span class="nt">&lt;img</span> <span class="na">width=</span><span class="s">&quot;300&quot;</span> <span class="na">height=</span><span class="s">&quot;100&quot;</span> <span class="na">alt=</span><span class="s">&quot;Download Apache OpenOffice here&quot;</span> 
-<span class="na">src=</span><span class="s">&quot;http://incubator.apache.org/openofficeorg/images/get-it-here/en.png&quot;</span><span class="nt">/&gt;</span>
+<span class="na">src=</span><span class="s">&quot;http://openoffice.apache.org/images/get-it-here/en.png&quot;</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;/a&gt;</span>
 </pre></div>
 

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/google6fb27cb926cc20ac.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/google6fb27cb926cc20ac.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/google6fb27cb926cc20ac.html Mon Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -104,7 +103,7 @@
 <p><em>2012-08-23 -- Apache OpenOffice 3.4.1 (incubating) is released!</em></p>
 <ul>
 <li><a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_3_41">Release announcement</a></li>
-<li><a href="http://incubator.apache.org/openofficeorg/downloads.html">Download Source and SDK</a></li>
+<li><a href="http://openoffice.apache.org/downloads.html">Download Source and SDK</a></li>
 <li><a href="http://download.openoffice.org">Download Binaries</a></li>
 </ul>
 <h2 id="what-is-openoffice">What is OpenOffice?</h2>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/list-conduct.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/list-conduct.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/list-conduct.html Mon Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -113,7 +112,7 @@ ideas about Apache OpenOffice.</p>
 <li><a href="#legacy-openofficeorg-lists">Legacy OpenOffice.org Lists</a>.</li>
 </ul>
 <h2 id="participation-guidelines">Participation Guidelines</h2>
-<p>We ask all mailing list participants to observe <a href="http://incubator.apache.org/openofficeorg/list-conduct.html">these conduct guidelines</a>. </p>
+<p>We ask all mailing list participants to observe <a href="http://openoffice.apache.org/list-conduct.html">these conduct guidelines</a>. </p>
 <p>Specifically note the request "Use sensible and concise email subject headings".
 On our high-trafficlists, especially ooo-dev, we encourage the use of email subject
 tags that indicate the topic of your post.  Consistent use of such tags makes it
@@ -267,7 +266,7 @@ with an average of 20 posts/day and will
 <p>The project has several mailing lists for discussion about OpenOffice in native
 (non-English) languages.</p>
 <p>Information about available Native Language mailing lists can be found in the page
-describing <a href="http://incubator.apache.org/openofficeorg/native-lang.html">native language resources</a>.</p>
+describing <a href="http://openoffice.apache.org/native-lang.html">native language resources</a>.</p>
 <h2 id="legacy-openofficeorg-lists">Legacy OpenOffice.org Lists</h2>
 <p>As of March 16th, 2012 the legacy OpenOffice.org mailing lists have been disabled.<br />
 Archived posts from these mailing lists are archived on <a href="http://openoffice.markmail.org/">MarkMail</a>.</p>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/mission.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/mission.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/mission.html Mon Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/native-lang.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/native-lang.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/native-lang.html Mon Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -105,7 +104,7 @@ Apache governance policies is still bein
 <li>Hosting of native language websites on <a href="http://www.openoffice.org/projects/native-lang.html">www.openoffice.org</a>.
 Established native language "friendly" links have also established &mdash; for example, <a href="http://www.openoffice.org/fr/">fr.openoffice.org</a></li>
 <li>Native language mailing lists (as requested and needed). The establishment of any native language mailing list requires the approval of Apache OpenOffice
-PPMC and typically at least two moderators. Requests for additional native language mailing lists can be
+PMC and typically at least two moderators. Requests for additional native language mailing lists can be
 made via the <a href="mailto:ooo-dev@incubator.apache.org">ooo-dev mailing list</a>.</li>
 <li><a href="http://user.services.openoffice.org/">Native Language User Support Forums</a> (for some languages).</li>
 <li>A <a href="https://translate.apache.org/">Pootle server</a> to aid with translation. <br />
@@ -118,7 +117,7 @@ for establishing a native language area.
 <h2 id="native-language-mailing-lists">Native Language Mailing Lists</h2>
 <p>Legacy OpenOffice.org were not automatically migrated to Apache OpenOffice. New native 
 language mailing lists for the project are made at the request of an Apache OpenOffice
-PPMC (Podling Project Management Committee) member, and after discussion and consensus on the
+PMC (Project Management Committee) member, and after discussion and consensus on the
 ooo-dev mailing list.  Additionally new mailing lists typically require at least two 
 moderators to be established. Initiate setup requests through: <a href="mailto:dev-ooo@openoffice.org">ooo-dev@incubator.openoffice.org</a></p>
 <p>Native language mailing list currently are:</p>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/level-1.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/level-1.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/level-1.html Mon Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -127,12 +126,12 @@ all meet together in the same room or ev
 everyone's busy and varying schedule, we use mailing lists to coordinate our work, make proposals, gather 
 consensus and resolve community issues.  There are three mailing lists that every Volunteer should be on:</p>
 <ol>
-<li><a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#development-mailing-list">ooo-dev</a>  This is the 
+<li><a href="http://openoffice.apache.org/mailing-lists.html#development-mailing-list">ooo-dev</a>  This is the 
 main mailing list for the project, and gets a lot of traffic.  But this is where project-wide discussions occur.</li>
-<li><a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#announce-mailing-list">ooo-announce</a> This 
+<li><a href="http://openoffice.apache.org/mailing-lists.html#announce-mailing-list">ooo-announce</a> This 
 is the official announcement list for the project.  It is used for announcing things like new releases, 
 security patches, conferences, etc.</li>
-<li><a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#users-mailing-list">ooo-users</a> This is our users
+<li><a href="http://openoffice.apache.org/mailing-lists.html#users-mailing-list">ooo-users</a> This is our users
 list and is one way in which we provide support to end users.  Although you may not be interested specifically
 in user support, it is still recommended that you follow this list, even if just to get a feel for
 user concerns, problems, feature ideas, etc.</li>
@@ -140,8 +139,8 @@ user concerns, problems, feature ideas, 
 </li>
 <li>
 <p>You can also review other mailing lists we host and which may be of interest, including ones focused on 
-specific <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">project functions</a> and 
-<a href="http://incubator.apache.org/openofficeorg/native-lang.html">native languages</a>.</p>
+specific <a href="http://openoffice.apache.org/mailing-lists.html">project functions</a> and 
+<a href="http://openoffice.apache.org/native-lang.html">native languages</a>.</p>
 </li>
 <li>
 <p>One of the first practical tests each Volunteer faces is dealing with the volume of emails that comes from 
@@ -154,8 +153,8 @@ or a web search first, and if that fails
 <li>
 <p>Because our mailing lists can be busy, and we're not all native English speakers, and because email text is 
 a crude medium which makes it hard to express nuanced emotions, we need to be careful and tolerant in how we 
-use it.  Please read over our <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#participation-guidelines">Participation Guidelines</a> 
-and <a href="http://incubator.apache.org/openofficeorg/list-conduct.html">List Conduct Guidelines</a> for more information.</p>
+use it.  Please read over our <a href="http://openoffice.apache.org/mailing-lists.html#participation-guidelines">Participation Guidelines</a> 
+and <a href="http://openoffice.apache.org/list-conduct.html">List Conduct Guidelines</a> for more information.</p>
 </li>
 <li>
 <p>Aside from the mailing lists there are several online services that every volunteer should be signed up for:</p>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -99,7 +98,7 @@
     <p>Apache OpenOffice.org is a community developed project. The list below
 is a partial list of contributors to the project, for a complete list you'd have
 to look at all contributors to our issue tracker, mailing list and version control.
-For the complete list of Committers, PPMC, and Members to the project see 
+For the complete list of Committers, PMC, and Members to the project see 
 <a href="http://people.apache.org/committers-by-project.html#ooo">the committers by project list</a>.</p>
 <table>
 <thead>

Added: websites/staging/openofficeorg/trunk/content/openofficeorg/pmc-faqs.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/pmc-faqs.html (added)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/pmc-faqs.html Mon Oct 22 18:46:46 2012
@@ -0,0 +1,332 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<meta name="google-site-verification" content="wIHUbgA-JO5PaJHpR5jeI8N9E2y2iF94o4oUwpaAdk8" />
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
+<title>PMC FAQs</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-30193653-3']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>	
+</head>
+
+<body>
+  <div id="banner">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
+      <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
+    
+   <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
+  </div>
+  <div id="clear"></div>
+  
+  <div id="sidenav">
+    <h1 id="general">General</h1>
+<ul>
+<li><a href="/openofficeorg/index.html">About</a></li>
+<li><a href="/openofficeorg/downloads.html">Downloads</a></li>
+<li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
+<li><a href="/openofficeorg/press.html">Press</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
+<li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/openofficeorg/social.html">Social Networking</a></li>
+<li><a href="http://www.openoffice.org/support/">Support</a></li>
+<li><a href="/openofficeorg/native-lang.html">Native Language</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Planning Wiki</a></li>
+<li><a href="/openofficeorg/people.html">People</a></li>
+<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<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/qa.html">Quality Assurance</a></li>
+<li><a href="/openofficeorg/translate.html">Translation</a></li>
+<li><a href="/openofficeorg/website-local.html">Website</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="project-management-pmc">Project Management PMC</h1>
+<ul>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
+</li>
+</ul>
+<h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
+<ul>
+<li><a href="http://www.apache.org/">Website</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">PMC FAQs</h1>
+    <p>Here are a number of FAQ's about how the Apache OpenOffice project governance works.</p>
+<p><strong>Contents</strong></p>
+<div class="toc">
+<ul>
+<li><a href="#pmc">What is the PMC?</a></li>
+<li><a href="#moderator">Who is the Admin/Moderator/Owner for X?</a><ul>
+<li><a href="#mailing-lists">Mailing lists</a></li>
+<li><a href="#blog">Blog</a></li>
+<li><a href="#bugzilla">Bugzilla</a></li>
+<li><a href="#svn">SVN</a></li>
+<li><a href="#confluence-wiki">Confluence Wiki</a></li>
+<li><a href="#mediawiki">MediaWiki.</a></li>
+</ul>
+</li>
+<li><a href="#participate">How to participate?</a><ul>
+<li><a href="#i-was-invitedvoted-as-committer-so-whats-next">I was invited/voted as committer, so whats next?</a></li>
+</ul>
+</li>
+<li><a href="#voting">How and when to vote?</a></li>
+</ul>
+</div>
+<h1 id="pmc">What is the PMC?</h1>
+<p>The Project Management Committee (PMC) is the government of the project. The committee is responsible for the
+project and decides what to do and which direction to go.
+<br> (<a href="https://cwiki.apache.org/INFRA/resource-request-faqs.html">see here for more information</a>)</p>
+<h1 id="moderator">Who is the Admin/Moderator/Owner for X?</h1>
+<p>Although Apache projects have few formal roles, there are some technical 
+subsystems which have admin or similar roles filled by project volunteers.  If you
+have a question with one of these systems, these are the people you might want to
+contact first, before escalating to Apache Infrastructure.</p>
+<h2 id="mailing-lists">Mailing lists</h2>
+<p>Each mailing list has one or more moderators.<br />
+</p>
+<ul>
+<li>ooo-dev moderators are Rob Weir,</li>
+<li>ooo-users moderators are Rob Weir, Simon Phipps, </li>
+<li>ooo-qa moderators are Rob Weir,</li>
+<li>ooo-marketing moderators are Rob Weir,</li>
+<li>ooo-private (restricted access) moderators are Rob Weir,</li>
+<li>ooo-security (restricted access)with Rob Weir, Dennis Hamilton, Wolf Halton 
+and Juergen Schmidt as members.  New members can be added by consensus of the PMC</li>
+</ul>
+<p>Responsibilities of mailing list moderators include:</p>
+<ul>
+<li>Review messages that have been held for moderation, reject spam posts and
+allow the valid messages through.</li>
+<li>Assist users who are having difficulties subscribing or unsubscribing from the list.</li>
+<li>Provide reports to the PMC on request, on the number of current subscribers.</li>
+<li>For private lists, approve subscription requests for authorized subscribers only.</li>
+<li>When needed, escalate technical issues to Infra and privacy issues to the PMC.</li>
+</ul>
+<h2 id="blog">Blog</h2>
+<p>Blog authors: You must be a committer. To establish a Roller account <a href="https://cwiki.apache.org/INFRA/resource-request-faqs.html">contact Infrastructure</a>. </p>
+<table>
+<thead>
+<tr>
+<th>ID</th>
+<th class="w180">Author</th>
+<th>ID</th>
+<th class="w180">Author</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>rbircher</td>
+<td>Raphael Bircher</td>
+<td>clippka</td>
+<td>Christian Lippka</td>
+</tr>
+<tr>
+<td>orcmid</td>
+<td>Dennis E Hamilton</td>
+<td>jsc</td>
+<td>Jürgen Schmidt</td>
+</tr>
+<tr>
+<td>dpharbison</td>
+<td>Don Harbison</td>
+<td>robweir</td>
+<td>Rob Weir</td>
+</tr>
+<tr>
+<td>khirano</td>
+<td>Kazunari Hirano</td>
+<td>orw</td>
+<td>Oliver-Rainer Wittmann</td>
+</tr>
+<tr>
+<td>alg</td>
+<td>Armin Le Grand</td>
+<td></td>
+<td></td>
+</tr>
+</tbody>
+</table>
+<p>Blog admins: Admins authorize new authors once they have first established a Roller account. </p>
+<table>
+<thead>
+<tr>
+<th>ID</th>
+<th class="w200">Admin</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>wave</td>
+<td>Dave Fisher</td>
+</tr>
+<tr>
+<td>marcus</td>
+<td>Marcus Lange</td>
+</tr>
+</tbody>
+</table>
+<h2 id="bugzilla">Bugzilla</h2>
+<p>There are two admins on the PMC:  Rob Weir and T.J. Frazier.</p>
+<h2 id="svn">SVN</h2>
+<p>All committers have equal access.  If you need to do something beyond ordinary committ
+rights, such as importing a dump file, <a href="https://issues.apache.org/jira/browse/INFRA">enter a JIRA issue</a> with Apache Infra.</p>
+<h2 id="confluence-wiki">Confluence Wiki</h2>
+<ul>
+<li>OOOUSERS. This wiki is open to anyone with a CWiki account.</li>
+<li>OOODEV. This wiki may only be edited by project committers, PMC, and iCLA signers.</li>
+</ul>
+<p>Dave Fisher has Confluence Admin rights and can authorize new editors in the OOODEV Wiki.</p>
+<h2 id="mediawiki">MediaWiki.</h2>
+<p>TJ Frazier has Administrator rights and can enable others.  Email 
+him (on ooo-dev or privately) to activate an existing account, or set up a new one.</p>
+<h1 id="participate">How to participate?</h1>
+<p>First of all you have to think how you want to participate as we have different kind
+of roles like user, developer, committer. The easiest way is to use what we build as
+user. If you want to improve parts of the software, or documentation, write to our
+<a href="http://openoffice.apache.org/mailing-lists.html">mailing lists</a> what should be modified and how it should be done. On the
+<a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Wiki+Home">community wiki</a> you can just create an account and start to work on it right
+away.  There is a <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Help+Wanted">Help Wanted</a> page that has ideas for getting started.</p>
+<p>The following are conditions to become a committer:</p>
+<ol>
+<li>You have sent in patches that were well-respected to improve the software.</li>
+<li>You have added documentation to the Wiki or website that were well-respected to
+    improve the non-code part of the project.</li>
+<li>You have shown that you can discuss in the mailing lists and that this has
+    brought us forward.</li>
+<li>You are well known to the established members, who you are and what you have
+    done in the past. Regarding this project, a former-one or another project.</li>
+</ol>
+<p>If 1 of the 4 statements above are true, then you can be voted in as committer.</p>
+<p>When the vote result is positive, you will be asked for some information to setup
+your committer status. <a href="http://incubator.apache.org/guides/participation.html">Read the Participation guide for more information.</a></p>
+<h2 id="i-was-invitedvoted-as-committer-so-whats-next">I was invited/voted as committer, so whats next?</h2>
+<p>The following is a brief summary of what to expect as committer:</p>
+<ol>
+<li>
+<p>After your (individual Contributor License Agreement (<a href="http://www.apache.org/licenses/icla.txt">iCLA</a>) has been
+    received and registered, you will be invited to specify one or more preferred
+    Apache user names.</p>
+<p><strong>Important</strong>: <br>
+The e-mail address you provide in your iCLA will be used for the following
+communications with you.</p>
+<p>Please note that there is also a <a href="http://www.apache.org/licenses/cla-corporate.txt">Corporate Contributor License Agreement
+(CCLA)</a> if you want/have to commit in the name of a company or organization.</p>
+</li>
+<li>
+<p>Choose one or more user name(s) that would be acceptable to you. These are short
+    names or abbreviation that will be used for a Unix account login.</p>
+<p><strong>Example:</strong> <br>
+Your name is "John Doe", so an ID could be "johnd" or "jdoe". <a href="http://people.apache.org/committer-index.html">Here you can see
+if the ID is still free</a> or already given to another committer.</p>
+<p>Supply all other information that is requested. Return the ID requests as
+instructed.</p>
+</li>
+<li>
+<p>When your choices are returned, the first request that does not conflict with
+    an already-issued ID will be used to generate an Apache ID. Write them in
+    the order you would like to have, so the first one is the most wanted.</p>
+</li>
+<li>
+<p>You will receive an e-mail, from "root@apache.org", that confirms the Apache
+    user name for you and also provides you with an initial password. There are also
+    instructions for changing your password. Please be patient as this mail can take
+    some days.</p>
+</li>
+<li>
+<p>The ID will also be your Apache e-mail address. Note that the account will be
+    set up to forward all received mails to the e-mail address you supplied on your
+    iCLA. It is not a normal mail account but just for forwarding. After you have
+    the account there is also a way to associate your Apache e-mail address with
+    additional e-mail addresses that you have. (<strong>ToDo</strong>: Add a link to a how-to)</p>
+</li>
+<li>
+<p>The ID and password will allow you to check in changes and new additions on the
+    Apache SVN repository for the OpenOffice.org incubator repository. The ability
+    to check in material on the SVN repository is important for more than code. All
+    committers will have an use for it.</p>
+</li>
+<li>
+<p>The ID and password will allow you to login to a personal Unix account on the
+    Apache server "people.apache.org". You can produce a personal website at this
+    account as well as use it as a regular Unix (specifically, FreeBSD) account. You
+    do not need to be able to use this account. You may find it useful as you become
+    more accomplished as a committer.<br />
+</p>
+</li>
+<li>
+<p>Being a committer also grants access to some non-public resources and mailing
+    lists. There are details in the <a href="https://svn.apache.org/repos/private/committers">private committers SVN tree</a>.</p>
+</li>
+</ol>
+<p>See the <a href="http://www.apache.org/dev/new-committers-guide.html">Guide for new committers</a> and the <a href="http://www.apache.org/dev/committers.html">Committers' FAQ</a> for more information.</p>
+<h1 id="voting">How and when to vote?</h1>
+<p>Voting is done when a formal decision has to be made or due to legal reasons, e.g.,
+to vote in new members as committers. In any case avoid voting as the normal way is
+to come to a decision by discussions. The initiator is responsible for the vote,
+that means also to count the votes and present the result. Every member has 1 vote.
+<br> (<a href="http://openoffice.apache.org/docs/governance/voting.html">see here for more information</a>)</p>
+  </div>
+
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/></p>
+    </div>
+    <div id="copyrighta">
+      <p>
+  Copyright &copy; 2011-2012 The Apache Software Foundation Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> | <a href="/openofficeorg/contact.html">Contact Us</a> | <a href="/openofficeorg/terms.html">Terms of Use</a>
+      </p>
+      <p>
+  Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+  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>
+     
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/press.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/press.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/press.html Mon Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/privacy.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/privacy.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/privacy.html Mon Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/qa.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/qa.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/qa.html Mon Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -103,12 +102,12 @@ QA doesn't require programming skills, s
 <h2 id="how-to-start">How to Start</h2>
 <p>Some easy examples to help OpenOffice QA includes:</p>
 <ul>
-<li>Install and use daily builds of OpenOffice. <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds">Download builds from here.</a> </li>
+<li>Install and use daily builds of OpenOffice. <a href="http://ci.apache.org/projects/openoffice">Download builds from here.</a> </li>
 <li>Introduce OpenOffice to others. Talk to us about their feedback.</li>
 <li>Follow test cases to perform manual testing.</li>
 <li>Report bugs to help improve the quality. <a href="bug-tracking.html">Start from here.</a></li>
 <li>Triage bugs (Confirm bugs and category them correctly).</li>
-<li>Write test cases. <a href="">Learn it.</a></li>
+<li>Write test cases. <a href="http://wiki.openoffice.org/wiki/QA/Testcase/How_to_write_test_case">Learn it.</a></li>
 <li>Write automated testing. It requires a little bit of programming skill. <a href="http://wiki.services.openoffice.org/wiki/QA/Automated_Test">Learn it.</a></li>
 <li>Learn more about <a href="http://wiki.services.openoffice.org/wiki/Quality_Assurance">OpenOffice QA</a> from our wiki.</li>
 <li><a href="http://wiki.services.openoffice.org/wiki/QA/Tasks">Take on one easy short-term QA task</a>.</li>
@@ -119,6 +118,8 @@ QA doesn't require programming skills, s
 <li>Mailing list: <a href="mailto:ooo-qa@incubator.apache.org">ooo-qa@incubator.apache.org</a> Archives:  <a href="http://markmail.org/search/+list:org.apache.incubator.ooo-qa">Markmail</a> <a href="http://mail-archives.apache.org/mod_mbox/incubator-ooo-qa/">Apache</a></li>
 </ul>
 <h2 id="faq">FAQ</h2>
+<p>Apache Open Office</p>
+<p>test</p>
   </div>
 
   <div id="footera">

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/social.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/social.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/social.html Mon Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -98,7 +97,7 @@
     <h1 class="title">Source Control</h1>
     <p>We use <a href="http://subversion.apache.org">Apache Subversion</a> for version control. You can <a href="http://svn.apache.org/viewvc/incubator/ooo/trunk">browse our 
 repository</a> in your web browser. </p>
-<p>See our <a href="http://incubator.apache.org/openofficeorg/svn-basics.html">Subversion Basics</a>
+<p>See our <a href="http://openoffice.apache.org/svn-basics.html">Subversion Basics</a>
 for more information on using subversion (svn) for the Apache OpenOffice project.</p>
 <p>For further information see the <a href="http://www.apache.org/dev/version-control.html">Apache Source Code Repository</a> page.</p>
 <h2 id="getting-the-source-code">Getting the source code</h2>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -99,12 +98,12 @@
     <p>Terms of Use for Apache Incubator project openoffice.org web site</p>
 <ol>
 <li>
-<p>INTRODUCTION. This Site and its contents are made available by Apache Software Foundation, incubator project OpenOffice.org podling project management committee (AOO-PPMC). These Terms of Use apply to everyone who Uses this Site (as defined below), or who participates in any projects hosted on this Site. PLEASE READ THESE TERMS CAREFULLY FIRST. BY USING THE SITE OR PARTICIPATING IN ANY PROJECTS, YOU ACKNOWLEDGE THAT YOU HAVE READ THE TERMS AND AGREE TO THEM. IF YOU DO NOT WISH TO BE BOUND BY THE TERMS, THEN DO NOT USE THE SITE OR PARTICIPATE IN ANY PROJECTS HOSTED ON THIS SITE.</p>
+<p>INTRODUCTION. This Site and its contents are made available by Apache Software Foundation, OpenOffice Project Management Committee (AOO-PMC). These Terms of Use apply to everyone who Uses this Site (as defined below), or who participates in any projects hosted on this Site. PLEASE READ THESE TERMS CAREFULLY FIRST. BY USING THE SITE OR PARTICIPATING IN ANY PROJECTS, YOU ACKNOWLEDGE THAT YOU HAVE READ THE TERMS AND AGREE TO THEM. IF YOU DO NOT WISH TO BE BOUND BY THE TERMS, THEN DO NOT USE THE SITE OR PARTICIPATE IN ANY PROJECTS HOSTED ON THIS SITE.</p>
 </li>
 <li>
 <p>DEFINITIONS. As used here:<br />
 </p>
-<p>a. "Host" means AOO-PPMC.<br />
+<p>a. "Host" means AOO-PMC.<br />
 </p>
 <p>b. "Materials" means source code, code samples, object code, technical materials, documentation , discussion thread postings, weblogs, wikis, data, and any other content, information or technology available on the Site.<br />
 </p>
@@ -139,7 +138,7 @@
 <p>In legalese: You hereby grant to the Host and all Users a royalty-free, perpetual, irrevocable, worldwide, non-exclusive and fully sub-licensable right and license under Your intellectual property rights to reproduce, modify, adapt, publish, translate, create derivative works from, distribute, perform, display and use Your Submissions (in whole or part) and to incorporate them in other works in any form, media, or technology now known or later developed, all subject to the obligation to retain any copyright notices included in Your Submissions. All Users, the Host, and their sublicensees are responsible for any modifications they make to the Submissions of others.</p>
 <p>d. Private Projects. With respect to a Project that is designated as "Private," the preceding license for "Other Submissions" is limited to Users who have access to the Project, and such rights may only be sublicensed to other Users with authorized access to the Project.</p>
 <p>e. Other Licenses/Terms. Some Projects are governed by their own terms regarding Submissions and may require You to sign agreements (such as an Apache Software Foundation Individual Contributor License Agreement) licensing Your rights in Your Submissions. In all such cases, and to the extent there is a conflict, the terms of those Projects and agreements take precedence over these Terms.</p>
-<p>f. Privacy. You consent to the collection, processing and storage by the Host of any personal information provided by You in accordance with the terms of AOO-PPMC Privacy Policy, which is available at <a href="http://incubator.apache.org/openofficeorg/privacy.html">http://incubator.apache.org/openofficeorg/privacy.html</a>. You agree to comply with all applicable laws and regulations, and the terms of Apache OpenOffice.org Privacy Policy, with respect to any use by You of any personal information in connection with this Site.</p>
+<p>f. Privacy. You consent to the collection, processing and storage by the Host of any personal information provided by You in accordance with the terms of AOO-PMC Privacy Policy, which is available at <a href="http://openoffice.apache.org/privacy.html">http://openoffice.apache.org/privacy.html</a>. You agree to comply with all applicable laws and regulations, and the terms of Apache OpenOffice.org Privacy Policy, with respect to any use by You of any personal information in connection with this Site.</p>
 </li>
 <li>
 <p>MISCELLANEOUS.</p>

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 Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -136,11 +135,11 @@ context of the overall design.</p>
 </ol>
 </li>
 <li>
-<p>On receipt of the proposal, the Apache OpenOffice PPMC will review
+<p>On receipt of the proposal, the Apache OpenOffice PMC will review
 and decide whether or not to recommend approval.</p>
 </li>
 <li>
-<p>If the PPMC recommends approval, then they will forward their
+<p>If the PMC recommends approval, then they will forward their
 recommendation, along with your proposal and any follow up
 communications, to the Apache V.P. of Brand Management for final
 approval.</p>
@@ -151,7 +150,7 @@ approval.</p>
 </ol>
 <h2 id="the-get-it-here-download-logo">The "Get it here!" download logo</h2>
 <p>A specific logo is recommended for use by those who wish to help promote the 
-project by hosting a download logo on their website.  The <a href="http://incubator.apache.org/openofficeorg/get-it-here.html">"Get it here!"</a> 
+project by hosting a download logo on their website.  The <a href="http://openoffice.apache.org/get-it-here.html">"Get it here!"</a> 
 logo may be used according to the requirements listed on that page.</p>
   </div>
 

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/translate.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/translate.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/translate.html Mon Oct 22 18:46:46 2012
@@ -41,7 +41,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>
@@ -78,11 +78,10 @@
 <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 PPMC</h1>
+<h1 id="project-management-pmc">Project Management 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><a href="/openofficeorg/pmc-faqs.html">PMC FAQs</a><br />
 </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
@@ -127,7 +126,7 @@ means that the translation is not yet co
 the translation in several ways:</p>
 <ol>
 <li>
-<p>You can send a note to the <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#localization-mailing-list">ooo-L10n list</a> 
+<p>You can send a note to the <a href="http://openoffice.apache.org/mailing-lists.html#localization-mailing-list">ooo-L10n list</a> 
 requesting the PO file for that language.  This file can be
 loaded into a translation management tool (some popular ones are listed 
 <a href="http://wiki.services.openoffice.org/wiki/Pootle_User_Guide#Translating_off-line">here</a> where you can edit the
@@ -147,7 +146,7 @@ contributions via their efforts are regu
 <li>
 <p>Whichever method you use, when you have completed the initial
 translation, send a note to the 
-<a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#localization-mailing-list">ooo-L10n list</a>.   At that point we can make a special test build of Apache
+<a href="http://openoffice.apache.org/mailing-lists.html#localization-mailing-list">ooo-L10n list</a>.   At that point we can make a special test build of Apache
 OpenOffice for you to review.  If more changes are required in the
 translation, we can iterate on these steps, making changes, making new
 test builds, etc.</p>
@@ -159,7 +158,7 @@ additional users, even if they cannot he
 they can help review the test build and point out errors in
 translation, as well as other localization errors.  Others on the
 OpenOffice project might be able to help you find other interested
-users, so let us know, via a note to the <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#localization-mailing-list">ooo-L10n list</a> if you want that help.</p>
+users, so let us know, via a note to the <a href="http://openoffice.apache.org/mailing-lists.html#localization-mailing-list">ooo-L10n list</a> if you want that help.</p>
   </div>
 
   <div id="footera">



Mime
View raw message