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 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/>| 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> @@ -152,7 +151,7 @@ pages are updated by the project communi <h2 id="two-websites">Two Websites</h2> <p>The Apache OpenOffice project maintains two websites:</p> <ul> -<li>The <a href="http://incubator.apache.org/openofficeorg/";>project website</a>, primarily for development and technical information (which you're viewing now)</li> +<li>The <a href="http://openoffice.apache.org/";>project website</a>, primarily for development and technical information (which you're viewing now)</li> <li>The user portal, <a href="http://www.openoffice.org";>www.openoffice.org</a>, primarily for end user information and support</li> </ul> <p>Both of these sites use the <a href="http://www.apache.org/dev/cms.html";>Apache Content Management System</a> (CMS) to manage editing, submitting changes, and updating the live websites. @@ -202,7 +201,7 @@ section, you will likely be running <str <h3 id="for-contributors-non-committers">For Contributors -- non-committers</h3> <p>If you are not a committer, you will need to follow the procedures for "contributors" in the -<a href="http://incubator.apache.org/openofficeorg/developer-faqs.html#im_not_a_committer";>Developer FAQ</a> +<a href="http://openoffice.apache.org/developer-faqs.html#im_not_a_committer";>Developer FAQ</a> for getting your changes published by a committer of the project, after you submit a patch.</p> <h2 id="how-to-do-website-development-locally-for-technical-users">How To Do Website Development Locally (for technical users)</h2> <p>The following information provides instructions on doing website development on your local computer.
![http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/](http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/){kind=link}
