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 2012/10/22 20:53:05 UTC

svn commit: r835789 [3/3] - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/about/ content/api/docs/java/ref/com/sun/star/lib/uno/helper/class-use/ content/bizdev/ content/cs/ content/de/ content/de/about-ooo/ content/de/dev/members/ con...

Modified: websites/staging/ooo-site/trunk/content/news/newslist.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/news/newslist.html (original)
+++ websites/staging/ooo-site/trunk/content/news/newslist.html Mon Oct 22 18:53:02 2012
@@ -31,7 +31,7 @@
   <a id="apache-hosted"></a>
   <h2>www.openoffice.org is now hosted by the Apache Software Foundation</h2>
   <p>Our website has migrated to infrastructure hosted by the Apache Software Foundation. Join the 
-  <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#users-mailing-list">Users Mailing List</a> or
+  <a href="http://openoffice.apache.org/mailing-lists.html#users-mailing-list">Users Mailing List</a> or
   <a href="http://user.services.openoffice.org/">User Forums</a> if you have questions or comments
   </p>
 
@@ -41,9 +41,9 @@
   <a href="http://www.marketwire.com/press-release/statements-on-openofficeorg-contribution-to-apache-nasdaq-orcl-1521400.htm">
   The Apache Software Foundation's Incubator.</a> 
   The Apache OpenOffice "podling"
-  <a href="http://incubator.apache.org/openofficeorg/">http://incubator.apache.org/openofficeorg</a>
+  <a href="http://openoffice.apache.org/">http://openoffice.apache.org/</a>
   site was established on June 13, 2011. Please join us in this new phase of OpenOffice.org by subscribing to our
-  <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">mailing lists</a>.
+  <a href="http://openoffice.apache.org/mailing-lists.html">mailing lists</a>.
   </p>
   	
   <a id="asf_statement"></a>
@@ -51,7 +51,7 @@
   <p><em>14 October 2011:</em> On 1 June 2011, Oracle Corporation submitted the OpenOffice.org code base to The Apache
   Software Foundation. That submission was accepted, and the project is now being developed as a podling in the Apache
   Incubator under the ASF's meritocratic process informally dubbed "The Apache Way". OpenOffice.org is now officially part
-  of the Apache family. The project is known as Apache OpenOffice.org (incubating). Over its 12-year history, the ASF has
+  of the Apache family. The project is known as Apache OpenOffice. Over its 12-year history, the ASF has
   welcomed contributions from individuals and organizations alike, but, as a policy, does not solicit code donations. The
   OpenOffice.org code base was not pursued by the ASF prior to its acceptance into the Apache Incubator.
   <a href="http://blogs.apache.org/foundation/entry/the_apache_software_foundation_statement">

Modified: websites/staging/ooo-site/trunk/content/nl-template/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/nl-template/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/nl-template/topnav.html Mon Oct 22 18:53:02 2012
@@ -3,7 +3,7 @@
 <li><a href="/nl-template/download/index.html" title="Download OpenOffice.org">Download</a></li>
 <li><a href="/support/index.html" title="Find Support for OpenOffice.org">Support</a></li>
 <li><a href="/extensions/index.html" title="Extensions and Templates for OpenOffice">Extend</a></li>
-<li><a href="http://incubator.apache.org/openofficeorg/get-involved.html" title="Get involved in Apache OpenOffice (incubating)">Develop</a></li>
+<li><a href="http://openoffice.apache.org/get-involved.html" title="Get involved in Apache OpenOffice">Develop</a></li>
 <li><a href="/projects/accepted.html" title="Apache OpenOffice development focus areas">Focus Areas</a></li>
 <li><a href="/projects/native-lang.html" title="Apache OpenOffice in your Native Language">Native Language</a></li>
 </ul></div>

Modified: websites/staging/ooo-site/trunk/content/nl/nl-nieuws.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/nl/nl-nieuws.html (original)
+++ websites/staging/ooo-site/trunk/content/nl/nl-nieuws.html Mon Oct 22 18:53:02 2012
@@ -50,13 +50,13 @@
 			<p> De organisatie die hiervoor is uitgekozen is de <a href="http://www.apache.org/">Apache Software Foundation</a>. Op 1 juni 2011 
 				<a href="http://www.marketwire.com/press-release/statements-on-openofficeorg-contribution-to-apache-nasdaq-orcl-1521400.htm"> kondigde Oracle aan </a> 
 				dat het de rechten op de broncode van OpenOffice.org en de ermee verbonden handelsmerken eraan zou doneren. Het 
-				OpenOffice.org-project werd daarmee een <a href="http://incubator.apache.org/openofficeorg/">&quot;podling&quot;</a> binnen de ASF. 
+				OpenOffice.org-project werd daarmee een <a href="http://openoffice.apache.org/">&quot;podling&quot;</a> binnen de ASF. 
 			</p>
 			<p>
 				Dit heeft veel veranderingen meegebracht voor de opzet van het project. Verheugend is dat een aantal van de ontwikkelaars die vroeger in dienst van 
 				Sun Microsystems en Oracle aan OpenOffice.org werkten erbij betrokken zijn gebleven en zo heel veel know-how inbrengen.
 				De afgelopen tijd is hard gewerkt aan de broncode. Veel aandacht is eraan besteed om deze in lijn te brengen met het beleid van de ASF betreffende 
-				de te hanteren <a href="http://incubator.apache.org/openofficeorg/license.html"> licenties </a>, maar ook om de software verder te verbeteren. Zo is 
+				de te hanteren <a href="http://openoffice.apache.org/license.html"> licenties </a>, maar ook om de software verder te verbeteren. Zo is 
 				het grafische systeem waarmee vectorafbeeldingen 
 				kunnen worden gemaakt en weergegeven helemaal herschreven zodat de open standaard svg beter kan worden ondersteund.
 			</p>

Modified: websites/staging/ooo-site/trunk/content/nl/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/nl/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/nl/topnav.html Mon Oct 22 18:53:02 2012
@@ -3,7 +3,7 @@
 <li><a href="/download/index.html" title="Download OpenOffice.org">Download</a></li>
 <li><a href="/support/index.html" title="Find Support for OpenOffice.org">Support</a></li>
 <li><a href="/extensions/index.html" title="Extensions and Templates for OpenOffice">Extend</a></li>
-<li><a href="http://incubator.apache.org/openofficeorg/get-involved.html" title="Get involved in Apache OpenOffice (incubating)">Develop</a></li>
+<li><a href="http://openoffice.apache.org/get-involved.html" title="Get involved in Apache OpenOffice">Develop</a></li>
 <li><a href="/projects/accepted.html" title="Apache OpenOffice development focus areas">Focus Areas</a></li>
 <li><a href="/projects/native-lang.html" title="Apache OpenOffice in your Native Language">Native Language</a></li>
 </ul></div>

Modified: websites/staging/ooo-site/trunk/content/no/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/no/index.html (original)
+++ websites/staging/ooo-site/trunk/content/no/index.html Mon Oct 22 18:53:02 2012
@@ -100,7 +100,7 @@
 	</p>
 	<p>
 		Vi er et lite team som jobber med å fullføre siste del av oversettelsen av versjon 3.4 til norsk, og hvis du ønsker å være med og bidra er du velkommen! 
-		Du finner mer informasjon <a href="http://incubator.apache.org/openofficeorg/translate.html">her</a>. Du bør også melde deg på mailing-listen for oversettere ved å sende en 
+		Du finner mer informasjon <a href="http://openoffice.apache.org/translate.html">her</a>. Du bør også melde deg på mailing-listen for oversettere ved å sende en 
 		tom e-post til <a href="mailto:ooo-L10n-subscribe@incubator.apache.org">ooo-L10n-subscribe@incubator.apache.org.</a>
 	</p>
 	<p>

Modified: websites/staging/ooo-site/trunk/content/pl/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/pl/index.html (original)
+++ websites/staging/ooo-site/trunk/content/pl/index.html Mon Oct 22 18:53:02 2012
@@ -72,7 +72,7 @@
 		the remaining 5%.  
 	</p>
 	<p>
-		If you are interested in helping translate, please review <a href="http://incubator.apache.org/openofficeorg/translate.html">this information</a>.  You can send a note to our mailing list, ooo-L10n@incubator.apache.org,
+		If you are interested in helping translate, please review <a href="http://openoffice.apache.org/translate.html">this information</a>.  You can send a note to our mailing list, ooo-L10n@incubator.apache.org,
 		if you want to volunteer or if you have questions.
 	</p>
 	<hr>	  	

Modified: websites/staging/ooo-site/trunk/content/porting/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/porting/index.html (original)
+++ websites/staging/ooo-site/trunk/content/porting/index.html Mon Oct 22 18:53:02 2012
@@ -271,7 +271,7 @@ send the details to our <a href="ooo-dev
         Once ports have been made, people are needed for preparing and providing the builds on a regular basis.
       </td>
       <td>
-        <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#development-mailing-list">
+        <a href="http://openoffice.apache.org/mailing-lists.html#development-mailing-list">
         Apache OpenOffice ooo-dev mailinglist</a>
       </td>
     </tr>
@@ -282,7 +282,7 @@ send the details to our <a href="ooo-dev
         There is a certain demand for doing a port. At the moment there are no efforts visible for such a port. Create one!
       </td>
       <td>
-        <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#development-mailing-list">
+        <a href="http://openoffice.apache.org/mailing-lists.html#development-mailing-list">
         Apache OpenOffice ooo-dev mailinglist</a>
       </td>
     </tr>

Modified: websites/staging/ooo-site/trunk/content/projects/accepted.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/projects/accepted.html (original)
+++ websites/staging/ooo-site/trunk/content/projects/accepted.html Mon Oct 22 18:53:02 2012
@@ -28,8 +28,8 @@
   <h1><br />
    Focus Areas of Apache OpenOffice (Legacy Projects of OpenOffice.org)</h1>
   <p>The following Apache OpenOffice Focus Areas provide core technical development as well as key user information. To learn how you can get involved in any of these areas of Apache OpenOffice,
-   please see <a href="http://incubator.apache.org/openofficeorg/get-involved.html">Getting Involved</a>. 
-   The best way to get started with participating in any of these areas is to review posts and subscribe to the Apache OpenOffice development mailing list described on the  <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">Mailing List</a> page.
+   please see <a href="http://openoffice.apache.org/get-involved.html">Getting Involved</a>. 
+   The best way to get started with participating in any of these areas is to review posts and subscribe to the Apache OpenOffice development mailing list described on the  <a href="http://openoffice.apache.org/mailing-lists.html">Mailing List</a> page.
    If a previous OpenOffice.org project is not listed here, it may well be in the <a href="/projects/incubator.html">Incubator</a> or <a href="/projects/native-lang.html">Native-Lang</a> category.</p>
   <table cellpadding="4" cellspacing="2"  width="100%">
    <thead>

Modified: websites/staging/ooo-site/trunk/content/projects/incubator.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/projects/incubator.html (original)
+++ websites/staging/ooo-site/trunk/content/projects/incubator.html Mon Oct 22 18:53:02 2012
@@ -105,7 +105,7 @@
           <td class="tableF0"><a href="mailto:liheng@redoffice.com">Li Heng</a>, <a href="mailto:Dieter.Loeschky@Sun.COM">Dieter Loeschky</a></td>
         </tr>
         <tr>
-          <td class="tableF0"><a href="http://incubator.apache.org/openofficeorg/security.html">Security</a></td>
+          <td class="tableF0"><a href="http://openoffice.apache.org/security.html">Security</a></td>
           <td class="tableF0">security</td>
           <td class="tableF0"></td>
         </tr>

Modified: websites/staging/ooo-site/trunk/content/projects/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/projects/index.html (original)
+++ websites/staging/ooo-site/trunk/content/projects/index.html Mon Oct 22 18:53:02 2012
@@ -31,7 +31,7 @@
     
   <h1>Project Areas of Apache OpenOffice</h1><!-- DISTRIBUTION -->
   <p>This page lists some of the main project areas of Apache OpenOffice categorized by function. Please see the 
-  <a href="http://incubator.apache.org/openofficeorg/get-involved.html">Get Involved</a> page for more
+  <a href="http://openoffice.apache.org/get-involved.html">Get Involved</a> page for more
   information on how to participate in any of these areas.</p><!-- category icons table -->
   <table border="0" cellpadding="0" cellspacing="0" width="100%">
     <tr>
@@ -73,7 +73,7 @@
       </tr>
     </thead>
     <tr>
-      <td class="tableF0"><a href="http://incubator.apache.org/openofficeorg/security.html">Security</a></td>
+      <td class="tableF0"><a href="http://openoffice.apache.org/security.html">Security</a></td>
       <td class="tableF0">security</td>
       <td class="tableF0">To improve security and privacy features in OpenOffice.org</td>
       <td class="tableF0"></td>

Modified: websites/staging/ooo-site/trunk/content/projects/native-lang.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/projects/native-lang.html (original)
+++ websites/staging/ooo-site/trunk/content/projects/native-lang.html Mon Oct 22 18:53:02 2012
@@ -39,8 +39,8 @@
    <p>The Native Language Confederation are projects which offer information, resources, and much more in a user's native language. 
    Apache OpenOffice continues to welcome participation and support OpenOffice.org's  Native Language Confederation in a  variety of ways, as with
    native language mailing lists and forums, and continued support of native language web areas. Please visit the
-   <a href="http://incubator.apache.org/openofficeorg/native-lang.html">Native Language Information</a> area of the Apache OpenOffice project to find out more
-   about native language support specifically, and please see <a href="http://incubator.apache.org/openofficeorg/get-involved.html">Getting Involved</a>
+   <a href="http://openoffice.apache.org/native-lang.html">Native Language Information</a> area of the Apache OpenOffice project to find out more
+   about native language support specifically, and please see <a href="http://openoffice.apache.org/get-involved.html">Getting Involved</a>
    for additional information on getting involved in Apache OpenOffice. </p>
    
    <p>(<a href="http://www.openoffice.org/native-lang/">Legacy information for the Native Language Confederation</a>, not accurate for Apache OpenOffice.)</p> 

Modified: websites/staging/ooo-site/trunk/content/pt-br/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/pt-br/index.html (original)
+++ websites/staging/ooo-site/trunk/content/pt-br/index.html Mon Oct 22 18:53:02 2012
@@ -98,9 +98,9 @@
       <li>
 	<div class="action-participate">
 	  <div class="action-text action-link">
-	    <h2><a href="http://incubator.apache.org/openofficeorg/get-involved.html">Eu desejo participar no OpenOffice</a></h2>
+	    <h2><a href="http://openoffice.apache.org/get-involved.html">Eu desejo participar no OpenOffice</a></h2>
 	    <p>
-	      <a href="http://incubator.apache.org/openofficeorg/get-involved.html">O Apache OpenOffice é feito da ajuda de pessoas de todas as partes do mundo. Sinta-se a vontade para contribuir!</a>
+	      <a href="http://openoffice.apache.org/get-involved.html">O Apache OpenOffice é feito da ajuda de pessoas de todas as partes do mundo. Sinta-se a vontade para contribuir!</a>
 	    </p>
 	  </div>
 	</div>
@@ -159,7 +159,7 @@
     projeto Apache OpenOffice project em nosso novo 
     <a href="https://blogs.apache.org/OOo/">blog do Apache OpenOffice.org blog</a> 
     ou pela inscrição em nossa 
-    <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#announce-mailing-list">Lista de Anúncios</a>.</p>
+    <a href="http://openoffice.apache.org/mailing-lists.html#announce-mailing-list">Lista de Anúncios</a>.</p>
   </div>  
   
   <div class="campaign">

Modified: websites/staging/ooo-site/trunk/content/pt-br/news/aoo34.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/pt-br/news/aoo34.html (original)
+++ websites/staging/ooo-site/trunk/content/pt-br/news/aoo34.html Mon Oct 22 18:53:02 2012
@@ -95,7 +95,7 @@ Como um projeto na Incubadora Apache, o 
 Incubado (Podling Project Management Committee - PPMC) que orienta a sua operação, desenvolvimento comunitário, 
 e lançamentos do produto. O código fonte do Apache OpenOffice bem como downloads, documentação, listas de 
 discussão e recursos relacionados estão disponíveis em 
-<a href="http://incubator.apache.org/openofficeorg/">http://incubator.apache.org/openofficeorg/</a>
+<a href="http://openoffice.apache.org/">http://openoffice.apache.org/</a>
 </p>
 <p>
 Para o primeiro lançamento oficial Apache do OpenOffice, a equipe de desenvolvedores se adequou, com sucesso, 
@@ -111,7 +111,7 @@ do IBM Lotus Symphony.
 </p>
 <p>
 O Comitê de Gestão do Projeto convida as pessoas a participar. Há diversas áreas onde contribuições são bem-vindas. 
-Confira na página <a href="http://incubator.apache.org/openofficeorg/get-involved.html">Envolva-se</a>.
+Confira na página <a href="http://openoffice.apache.org/get-involved.html">Envolva-se</a>.
 </p>
 <p>
 "O Apache OpenOffice é o pacote de produtividade para escritório de código aberto líder, com mais de 15 anos de 

Modified: websites/staging/ooo-site/trunk/content/pt-br/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/pt-br/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/pt-br/topnav.html Mon Oct 22 18:53:02 2012
@@ -3,7 +3,7 @@
 <li><a href="/download/index.html" title="Baixe o OpenOffice.org">Baixe já</a></li>
 <li><a href="/support/index.html" title="Encontre Suporte para OpenOffice.org">Suporte</a></li>
 <li><a href="/extensions/index.html" title="Extensões e Modelos para o OpenOffice">Extenda</a></li>
-<li><a href="http://incubator.apache.org/openofficeorg/get-involved.html" title="Se involva no Apache OpenOffice (incubating)">Desenvolva</a></li>
+<li><a href="http://openoffice.apache.org/get-involved.html" title="Se involva no Apache OpenOffice">Desenvolva</a></li>
 <li><a href="/projects/accepted.html" title="Áreas de foco no desenvolvimento do Apache OpenOffice">Áreas de Foco</a></li>
 <li><a href="/projects/native-lang.html" title="Apache OpenOffice no seu Idioma Nativo">Idioma Nativo</a></li>
 </ul></div>

Modified: websites/staging/ooo-site/trunk/content/qa/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/qa/index.html (original)
+++ websites/staging/ooo-site/trunk/content/qa/index.html Mon Oct 22 18:53:02 2012
@@ -26,7 +26,7 @@
     
     
 
-	  <div style="color:red; font-size:18pt;">The page is out of date. We moved to <a href="http://incubator.apache.org/openofficeorg/qa.html">here</a>. </div>
+	  <div style="color:red; font-size:18pt;">The page is out of date. We moved to <a href="http://openoffice.apache.org/qa.html">here</a>. </div>
 	  
 <div align="right"><font size="-1" color=#BDBEBD>Project Mailing list: <a href="mailto:ooo-qa@incubator.openoffice.org">Quality Assurance Mailing list</a> </font></div>
 

Modified: websites/staging/ooo-site/trunk/content/qa/ooQAReloaded/Docs/QA-Reloaded-HowToStart.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/qa/ooQAReloaded/Docs/QA-Reloaded-HowToStart.html (original)
+++ websites/staging/ooo-site/trunk/content/qa/ooQAReloaded/Docs/QA-Reloaded-HowToStart.html Mon Oct 22 18:53:02 2012
@@ -30,7 +30,7 @@
 <br>
 Welcome to the Quality Assurance of OpenOffice.org! <br>
 Contributing and helping in a large project like OOo is simpler than you think....
-The first thing is to register as an Openoffice.org user. You can do so on the <a href="http://incubator.apache.org/openofficeorg/get-involved.html"><font size="+1">Register page</font></a>.<br>
+The first thing is to register as an Openoffice.org user. You can do so on the <a href="http://openoffice.apache.org/get-involved.html"><font size="+1">Register page</font></a>.<br>
 <p></p>
 Supporting the Quality Assurance of OpenOffice.org is graduated in 3 <a href ="http://wiki.services.openoffice.org/wiki/OOo_QA_Participation_Steps">Participation Steps:</a>
 <ol start="1" type="1">

Modified: websites/staging/ooo-site/trunk/content/quickbugzilla.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/quickbugzilla.html (original)
+++ websites/staging/ooo-site/trunk/content/quickbugzilla.html Mon Oct 22 18:53:02 2012
@@ -43,7 +43,7 @@ Please navigate to the <a href="/support
 including a "users" mailing list and the OpenOffice.org Community Forum.
 
 <h1>If you want to contact the Apache OpenOffice developers...</h1>
-Please check out the <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">mailing list page</a> and use the developer mailing list.
+Please check out the <a href="http://openoffice.apache.org/mailing-lists.html">mailing list page</a> and use the developer mailing list.
 
 <h1>If you want to search existing issues, you can use this simple interface...</h1>
 It searches only for bugs that are marked "Open" in the "www" project. This means that it may miss bugs which have been fixed in internal builds. Using this will open the search in a new browser window, <b>Bugzilla Window</b>. If your problem shows up in the issue listing, please add your own comment to the original report. You will have to Log In properly to Bugzilla from the <em>Bugzilla Window</em> to do that. <p>Additionally, if your issue is not found in the issue list, and you want to submit a new issue, you can apply for a Bugzilla account from the <em>BugZilla Window</em>.</p> 

Modified: websites/staging/ooo-site/trunk/content/ru/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/ru/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/ru/topnav.html Mon Oct 22 18:53:02 2012
@@ -3,7 +3,7 @@
 <li><a href="/download/index.html" title="Download OpenOffice.org">Download</a></li>
 <li><a href="/support/index.html" title="Find Support for OpenOffice.org">Support</a></li>
 <li><a href="/extensions/index.html" title="Extensions and Templates for OpenOffice">Extend</a></li>
-<li><a href="http://incubator.apache.org/openofficeorg/get-involved.html" title="Get involved in Apache OpenOffice (incubating)">Develop</a></li>
+<li><a href="http://openoffice.apache.org/get-involved.html" title="Get involved in Apache OpenOffice">Develop</a></li>
 <li><a href="/projects/accepted.html" title="Apache OpenOffice development focus areas">Focus Areas</a></li>
 <li><a href="/projects/native-lang.html" title="Apache OpenOffice in your Native Language">Native Language</a></li>
 </ul></div>

Modified: websites/staging/ooo-site/trunk/content/sk/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/sk/index.html (original)
+++ websites/staging/ooo-site/trunk/content/sk/index.html Mon Oct 22 18:53:02 2012
@@ -93,9 +93,9 @@
         <li>
             <div class="action-participate">
                 <div class="action-text action-link">
-                    <h2><a href="http://incubator.apache.org/openofficeorg/get-involved.html">Chcem spolupracovať na OpenOffice</a></h2>
+                    <h2><a href="http://openoffice.apache.org/get-involved.html">Chcem spolupracovať na OpenOffice</a></h2>
                     <p>
-                    <a href="http://incubator.apache.org/openofficeorg/get-involved.html">Apache OpenOffice je vytvorený s pomocou ľudí z celého sveta. Bez obáv môžeťe spolupravcovať!</a>
+                    <a href="http://openoffice.apache.org/get-involved.html">Apache OpenOffice je vytvorený s pomocou ľudí z celého sveta. Bez obáv môžeťe spolupravcovať!</a>
                     </p>
                 </div>
             </div>

Modified: websites/staging/ooo-site/trunk/content/sk/news/news.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/sk/news/news.html (original)
+++ websites/staging/ooo-site/trunk/content/sk/news/news.html Mon Oct 22 18:53:02 2012
@@ -41,7 +41,7 @@
 	<a name="apache-hosted" id="apache-hosted"></a>
   <h2>www.openoffice.org je teraz hosťovaný nadáciou Apache Software Foundation</h2>
   <p>Naša webstránka bola migrovaná do infraštruktúry hosťovanou nadáciou Apache Software Foundation. Pripojte sa do 
-    <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#users-mailing-list">Mailing listu užívateľov</a> alebo
+    <a href="http://openoffice.apache.org/mailing-lists.html#users-mailing-list">Mailing listu užívateľov</a> alebo
     <a href="http://user.services.openoffice.org/">Užívateľských diskusií</a> ak budete mať nejaké otázky alebo pripomienky</p>
   	
 	
@@ -49,15 +49,15 @@
   <h2>OpenOffice.org je pripojený k Apache Incubator</h2>
   <p>Dňa 1. júna, 2011, Oracle oznámil že daroval kód OpenOffice.org do inkubátoru organizácie 
   <a href="http://www.marketwire.com/press-release/statements-on-openofficeorg-contribution-to-apache-nasdaq-orcl-1521400.htm">Apache Software Foundation.</a> 
-  Stránka "zárodku" Apache OpenOffice <a href="http://incubator.apache.org/openofficeorg/">http://incubator.apache.org/openofficeorg</a> bola zavedená 13. júna 2011.
-	  Prosím, pripojte sa k nám do tejto novej fázy OpenOffice.org prihlásením sa do našich <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">mailing listov</a>.</p>
+  Stránka "zárodku" Apache OpenOffice <a href="http://openoffice.apache.org/">http://openoffice.apache.org/</a> bola zavedená 13. júna 2011.
+	  Prosím, pripojte sa k nám do tejto novej fázy OpenOffice.org prihlásením sa do našich <a href="http://openoffice.apache.org/mailing-lists.html">mailing listov</a>.</p>
   	
   <a name="asf_statement" id="asf_statement"></a>
   <h2>Vyhlásenie Apache Software Foundation o Apache OpenOffice.org</h2>
   <p><em>14. október 2011:</em> 1. júna 2011 sa Oracle Corporation vzdal kódu OpenOffice.org v prospech nadácie Apache Software Foundation. Nadácia kód prijala
   a projekt je teraz vyvíjaný ako zárodok v Apache Incubator v rámci ASF meritokratického procesu neformálne nazývaného "The Apache Way".
   Teraz je OpenOffice.org oficiálne časť Apache rodiny.
-  Projekt je známy ako Apache OpenOffice.org (incubating).
+  Projekt je známy ako Apache OpenOffice.
   Počas 12-ročnej histórie, ASF privítal príspevky od jednotlivcov a organizácií ale rovnako, ako v politike, nemá vyžadovať žiadne dary.
 <!--  The OpenOffice.org code base was not pursued by the ASF prior to its acceptance into the Apache Incubator. -->
   <a href="http://blogs.apache.org/foundation/entry/the_apache_software_foundation_statement">Prečítajte si kompletné ASF oznámenie</a>

Modified: websites/staging/ooo-site/trunk/content/sk/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/sk/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/sk/topnav.html Mon Oct 22 18:53:02 2012
@@ -3,6 +3,6 @@
 <li><a href="/sk/download/index.html" title="Stiahnuť OpenOffice.org">Stiahnuť</a></li>
 <li><a href="/support/index.html" title="Potrebujem pomôcť s OpenOffice.org">Podpora</a></li>
 <li><a href="/extensions/index.html" title="Rozšírenia a šablóny OpenOffice">Rozšítiť</a></li>
-<li><a href="http://incubator.apache.org/openofficeorg/get-involved.html" title="Zapojiť sa do Apache OpenOffice (incubating)">Vývoj</a></li>
+<li><a href="http://openoffice.apache.org/get-involved.html" title="Zapojiť sa do Apache OpenOffice">Vývoj</a></li>
 <li><a href="/projects/accepted.html" title="Oblasti vývoja Apache OpenOffice, v ktorých môžem pomôcť">Oblasti záujmu</a></li>
 </ul></div>

Modified: websites/staging/ooo-site/trunk/content/stats/aoo34-downloads.txt
==============================================================================
--- websites/staging/ooo-site/trunk/content/stats/aoo34-downloads.txt (original)
+++ websites/staging/ooo-site/trunk/content/stats/aoo34-downloads.txt Mon Oct 22 18:53:02 2012
@@ -154,3 +154,12 @@
 2012-10-08,157809,19764467
 2012-10-09,143443,19907910
 2012-10-10,158938,20066848
+2012-10-11,148673,20215521
+2012-10-12,130728,20346249
+2012-10-13,119061,20465310
+2012-10-14,135240,20600550
+2012-10-15,152532,20753082
+2012-10-16,155591,20908673
+2012-10-17,157453,21066126
+2012-10-18,149470,21215596
+2012-10-19,131860,21347456

Modified: websites/staging/ooo-site/trunk/content/support/books.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/support/books.html (original)
+++ websites/staging/ooo-site/trunk/content/support/books.html Mon Oct 22 18:53:02 2012
@@ -27,7 +27,7 @@
 	<h1>Books about OpenOffice</h1>
 	<p>
 		The following list of books may be of interest to OpenOffice users.  Authors and publishers who wish to see their book listed here are encouraged to send these details to our
-		public <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#development-mailing-list">ooo-dev mailing list</a> for consideration.  Although we do not endorse books, we are glad to 
+		public <a href="http://openoffice.apache.org/mailing-lists.html#development-mailing-list">ooo-dev mailing list</a> for consideration.  Although we do not endorse books, we are glad to 
 		offer this listing as a service to the community.  We would also be interested in interviewing book authors for our <a href="http://blogs.apache.org/ooo/">Apache OpenOffice blog</a>. 
 	</p>
 	<hr/>

Modified: websites/staging/ooo-site/trunk/content/support/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/support/index.html (original)
+++ websites/staging/ooo-site/trunk/content/support/index.html Mon Oct 22 18:53:02 2012
@@ -94,7 +94,7 @@ Welcome to the Apache OpenOffice Support
             </li>
             <li>
                 <span class='title'>
-                <a href="http://incubator.apache.org/openofficeorg/native-lang.html">Apache OpenOffice Native Language Mailing Lists</a>
+                <a href="http://openoffice.apache.org/native-lang.html">Apache OpenOffice Native Language Mailing Lists</a>
                 </span>
                 <br />
                 Mailing lists for several native languages.

Modified: websites/staging/ooo-site/trunk/content/tools/dev_docs/howtocontribute.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/tools/dev_docs/howtocontribute.html (original)
+++ websites/staging/ooo-site/trunk/content/tools/dev_docs/howtocontribute.html Mon Oct 22 18:53:02 2012
@@ -60,7 +60,7 @@
 <h2>Warning</h2>
 <p>Much of the information here is <b>outdated</b> and refers to obsolete project procedures.</p>
 <p>For current information on how to contribute to OpenOffice, see 
-   <a href="http://incubator.apache.org/openofficeorg/get-involved.html">this page</a></p>
+   <a href="http://openoffice.apache.org/get-involved.html">this page</a></p>
 </div>
 	
 	

Modified: websites/staging/ooo-site/trunk/content/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/topnav.html Mon Oct 22 18:53:02 2012
@@ -3,7 +3,7 @@
 <li><a href="/download/index.html" title="Download OpenOffice.org">Download</a></li>
 <li><a href="/support/index.html" title="Find Support for OpenOffice.org">Support</a></li>
 <li><a href="/extensions/index.html" title="Extensions and Templates for OpenOffice">Extend</a></li>
-<li><a href="http://incubator.apache.org/openofficeorg/get-involved.html" title="Get involved in Apache OpenOffice (incubating)">Develop</a></li>
+<li><a href="http://openoffice.apache.org/get-involved.html" title="Get involved in Apache OpenOffice">Develop</a></li>
 <li><a href="/projects/accepted.html" title="Apache OpenOffice development focus areas">Focus Areas</a></li>
 <li><a href="/projects/native-lang.html" title="Apache OpenOffice in your Native Language">Native Language</a></li>
 </ul></div>

Modified: websites/staging/ooo-site/trunk/content/trademark/brandrefresh.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/trademark/brandrefresh.html (original)
+++ websites/staging/ooo-site/trunk/content/trademark/brandrefresh.html Mon Oct 22 18:53:02 2012
@@ -103,7 +103,7 @@ projects collaborate in I-Teams. For mor
 <p>&nbsp;</p>
 
 <h2>Third Party Use of OpenOffice.org Logos </h2>
-<p> Please see the <a href="http://incubator.apache.org/openofficeorg/trademarks.html">Apache OpenOffice Trademarks</a> page for information on the use of,
+<p> Please see the <a href="http://openoffice.apache.org/trademarks.html">Apache OpenOffice Trademarks</a> page for information on the use of,
 and how to request the use of the OpenOffice.org logos and other trademarked items.
 
   </div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/index.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/index.html Mon Oct 22 18:53:02 2012
@@ -97,9 +97,9 @@
         <li>
             <div class="action-participate">
                 <div class="action-text action-link">
-                    <h2><a href="http://incubator.apache.org/openofficeorg/get-involved.html">我要参与 OpenOffice</a></h2>
+                    <h2><a href="http://openoffice.apache.org/get-involved.html">我要参与 OpenOffice</a></h2>
                     <p>
-                    <a href="http://incubator.apache.org/openofficeorg/get-involved.html">全世界的人都在协助 Apache OpenOffice 。不要客气，马上加入我们！</a>
+                    <a href="http://openoffice.apache.org/get-involved.html">全世界的人都在协助 Apache OpenOffice 。不要客气，马上加入我们！</a>
                     </p>
                 </div>
             </div>
@@ -140,7 +140,7 @@
   <h2>掌握 Apache OpenOffice 最新动态</h2>
   <p>要掌握 OpenOffice.org 和 Apache OpenOffice 的最新动态，欢迎参阅
   <a href="https://blogs.apache.org/OOo/">Apache OpenOffice.org 博客</a>或订阅我们的
-    <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#announce-mailing-list">电子报</a>。</p>
+    <a href="http://openoffice.apache.org/mailing-lists.html#announce-mailing-list">电子报</a>。</p>
   </div>  
   <div class="campaign">
   <h2><a href="news">其他 OpenOffice 新闻动态…</a></h2>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/news/aoo34-1M.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/news/aoo34-1M.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/news/aoo34-1M.html Mon Oct 22 18:53:02 2012
@@ -80,7 +80,7 @@
 
 <h2>进一步信息</h2>
 
-<p>若要知道 Apache OpenOffice 更进一步的产品信息，请参阅我们的网站 <a href="http://www.openoffice.org">www.openoffice.org</a> 。关於 Apache OpenOffice 项目，及志愿者参与方法详情，请参阅我们的项目网站 <a href="http://incubator.apache.org/openofficeorg">http://incubator.apache.org/openofficeorg/</a> 。</p>
+<p>若要知道 Apache OpenOffice 更进一步的产品信息，请参阅我们的网站 <a href="http://www.openoffice.org">www.openoffice.org</a> 。关於 Apache OpenOffice 项目，及志愿者参与方法详情，请参阅我们的项目网站 <a href="http://openoffice.apache.org/">http://openoffice.apache.org/</a> 。</p>
 
 <p>若要订阅 OpenOffice 相关官方公告，请将邮件寄到 <a href="mailto:ooo-announce-subscribe@incubator.apache.org">ooo-announce-subscribe@incubator.apache.org</a> 。你也可以加我们的 <a href="http://www.facebook.com/ApacheOO">Facebook</a> 、 <a href="https://twitter.com/#!/apacheoo">Twitter</a> 、 <a href="http://identi.ca/apacheoo">Identi.ca</a> 和 <a href="https://plus.google.com/u/0/114598373874764163668/">Google+</a> 专页。</p>
 

Modified: websites/staging/ooo-site/trunk/content/zh-cn/news/aoo34.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/news/aoo34.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/news/aoo34.html Mon Oct 22 18:53:02 2012
@@ -75,7 +75,7 @@ OpenOffice 基本系统æœ�
 「从十年前的初版发表到现在，在 Apache 下的 OpenOffice 第一个版本 3.4 版，揭开了 OpenOffice 历史上崭新的一页。」 RedMonk 的首席分析师 Stephen O'Grady 指出。「经过几个月的努力， OpenOffice 得以用新的授权发布，更能吸引全球使用者、开发者和独立软件商。」
 </p>	
 <p>
-Apache OpenOffice 目前为 Apache 孵化项目，由预备项目管理委员会 (PPMC) 管理日常的运作、社区发展和新版本发布。 Apache OpenOffice 的原始码、下载、说明文件、通信群组和相关信息，请参阅 <a href="http://incubator.apache.org/openofficeorg/">http://incubator.apache.org/openofficeorg/</a>  。
+Apache OpenOffice 目前为 Apache 孵化项目，由预备项目管理委员会 (PPMC) 管理日常的运作、社区发展和新版本发布。 Apache OpenOffice 的原始码、下载、说明文件、通信群组和相关信息，请参阅 <a href="http://openoffice.apache.org/">http://openoffice.apache.org/</a>  。
 </p>
 <p>
 作为第一个 OpenOffice 的 Apache 官方版本，开发团队符合了孵化项目管理委员会订立的政策。为此，开发团队将与 Apache 软件基金会 (ASF) 授权政策不兼容的代码、程序库、功能等，一一找出来、以兼容的功能替代或移除，以符合孵化项目管理委员会的授权政策。</p>
@@ -85,14 +85,14 @@ Apache OpenOffice 目前为 Apa
 展望未来， OpenOffice 计划支持更多语言，强化无障碍设计，增强使用体验和性能，并采用 IBM Lotus Symphony 所贡献的新功能和新设计。
 </p>
 <p>
-Apache OpenOffice 项目管理委员会欢迎您的加入。有很多地方需要大家的参与与贡献。欲知详情请参阅<a href="http://incubator.apache.org/openofficeorg/get-involved.html">如何参与</a>。
+Apache OpenOffice 项目管理委员会欢迎您的加入。有很多地方需要大家的参与与贡献。欲知详情请参阅<a href="http://openoffice.apache.org/get-involved.html">如何参与</a>。
 </p>
 <p>
 「 Apache OpenOffice 投资开发了十五年以上，是开源文字处理软件的领导品牌。我们很高兴能完全以 Apache 2.0 授权发表。这是未来在 Apache 下， OpenOffice 创新开发的基础。」身兼版本管理者和资深核心开发者的 Juergen Schmidt 说。「这个重大里程碑，象征 OpenOffice 已经拥有足够多元、活跃、专业的社区基础，向未来迈进。我们可望能在接下来几周内，脱离孵化阶段，晋升为 Apache 一级项目。」
 </p>
 <h2>进一步信息</h2>
 <p>
-若要知道 Apache OpenOffice 更进一步的产品信息，请参阅我们的网站 <a href="http://www.openoffice.org">www.openoffice.org</a> 。关於 Apache OpenOffice 项目，及志愿者参与方法详情，请参阅我们的项目网站 <a href="http://incubator.apache.org/openofficeorg">http://incubator.apache.org/openofficeorg/</a> 。
+若要知道 Apache OpenOffice 更进一步的产品信息，请参阅我们的网站 <a href="http://www.openoffice.org">www.openoffice.org</a> 。关於 Apache OpenOffice 项目，及志愿者参与方法详情，请参阅我们的项目网站 <a href="http://openoffice.apache.org/">http://openoffice.apache.org/</a> 。
 </p>
 <p>
 若要订阅 OpenOffice 相关官方公告，请将邮件寄到 <a href="mailto:ooo-announce-subscribe@incubator.apache.org">ooo-announce-subscribe@incubator.apache.org</a> 。你也可以加我们的 <a href="http://www.facebook.com/ApacheOO">Facebook</a> 、 <a href="https://twitter.com/#!/apacheoo">Twitter</a> 、 <a href="http://identi.ca/apacheoo">Identi.ca</a> 和 <a href="https://plus.google.com/u/0/114598373874764163668/">Google+</a> 专页。

Modified: websites/staging/ooo-site/trunk/content/zh-cn/news/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/news/index.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/news/index.html Mon Oct 22 18:53:02 2012
@@ -42,7 +42,7 @@
 	<a name="apache-hosted" id="apache-hosted"></a>
   <h2>www.openoffice.org is now hosted by the Apache Software Foundation</h2>
   <p>Our website has migrated to infrastructure hosted by the Apache Software Foundation. Join the 
-    <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#users-mailing-list">Users Mailing List</a> or
+    <a href="http://openoffice.apache.org/mailing-lists.html#users-mailing-list">Users Mailing List</a> or
     <a href="http://user.services.openoffice.org/">User Forums</a> if you have questions or comments</p>
   	
 	
@@ -50,15 +50,15 @@
   <h2>OpenOffice.org Joins Apache Incubator</h2>
   <p>On June 1, 2011, Oracle announced that it was donating OpenOffice.org's code to 
   <a href="http://www.marketwire.com/press-release/statements-on-openofficeorg-contribution-to-apache-nasdaq-orcl-1521400.htm">The Apache Software Foundation's Incubator.</a> 
-  The Apache OpenOffice "podling" <a href="http://incubator.apache.org/openofficeorg/">http://incubator.apache.org/openofficeorg</a> site was established on June 13, 2011.
-	  Please join us in this new phase of OpenOffice.org by subscribing to our <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">mailing lists</a>.</p>
+  The Apache OpenOffice "podling" <a href="http://openoffice.apache.org/">http://openoffice.apache.org/</a> site was established on June 13, 2011.
+	  Please join us in this new phase of OpenOffice.org by subscribing to our <a href="http://openoffice.apache.org/mailing-lists.html">mailing lists</a>.</p>
   	
   <a name="asf_statement" id="asf_statement"></a>
   <h2>The Apache Software Foundation Statement on Apache OpenOffice.org</h2>
   <p><em>14 October 2011:</em> On 1 June 2011, Oracle Corporation submitted the OpenOffice.org code base to The Apache Software Foundation. That submission was accepted,
   and the project is now being developed as a podling in the Apache Incubator under the ASF's meritocratic process informally dubbed "The Apache Way".
   OpenOffice.org is now officially part of the Apache family.
-  The project is known as Apache OpenOffice.org (incubating).
+  The project is known as Apache OpenOffice.
   Over its 12-year history, the ASF has welcomed contributions from individuals and organizations alike, but, as a policy, does not solicit code donations.
   The OpenOffice.org code base was not pursued by the ASF prior to its acceptance into the Apache Incubator.
   <a href="http://blogs.apache.org/foundation/entry/the_apache_software_foundation_statement">Read the complete ASF annoncement</a>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/topnav.html Mon Oct 22 18:53:02 2012
@@ -3,7 +3,7 @@
 <li><a href="/download/index.html" title="下载 Apache OpenOffice">下载</a></li>
 <li><a href="/support/index.html" title="为 Apache OpenOffice 寻求支持">支持</a></li>
 <li><a href="/extensions/index.html" title="Apache OpenOffice 的模板与扩展组件">扩展组件</a></li>
-<li><a href="http://incubator.apache.org/openofficeorg/get-involved.html" title="如何参与 Apache OpenOffice （孵化阶段）">开发</a></li>
+<li><a href="http://openoffice.apache.org/get-involved.html" title="如何参与 Apache OpenOffice （孵化阶段）">开发</a></li>
 <li><a href="/projects/accepted.html" title="Apache OpenOffice 开发焦点">焦点区</a></li>
 <li><a href="/projects/native-lang.html" title="你的语言的 Apache OpenOffice">各国语言</a></li>
 </ul></div>

Modified: websites/staging/ooo-site/trunk/content/zh-tw/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-tw/index.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-tw/index.html Mon Oct 22 18:53:02 2012
@@ -97,9 +97,9 @@
         <li>
             <div class="action-participate">
                 <div class="action-text action-link">
-                    <h2><a href="http://incubator.apache.org/openofficeorg/get-involved.html">我要參與 OpenOffice</a></h2>
+                    <h2><a href="http://openoffice.apache.org/get-involved.html">我要參與 OpenOffice</a></h2>
                     <p>
-                    <a href="http://incubator.apache.org/openofficeorg/get-involved.html">全世界的人都在協助 Apache OpenOffice 。不要客氣，馬上加入我們！</a>
+                    <a href="http://openoffice.apache.org/get-involved.html">全世界的人都在協助 Apache OpenOffice 。不要客氣，馬上加入我們！</a>
                     </p>
                 </div>
             </div>
@@ -141,7 +141,7 @@
   <h2>掌握 Apache OpenOffice 最新動態</h2>
   <p>要掌握 OpenOffice.org 和 Apache OpenOffice 的最新動態，歡迎參閱
   <a href="https://blogs.apache.org/OOo/">Apache OpenOffice.org 部落格</a>或訂閱我們的
-    <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#announce-mailing-list">電子報</a>。</p>
+    <a href="http://openoffice.apache.org/mailing-lists.html#announce-mailing-list">電子報</a>。</p>
   </div>  
   <div class="campaign">
   <h2><a href="news">其他 OpenOffice 新聞動態…</a></h2>

Modified: websites/staging/ooo-site/trunk/content/zh-tw/news/aoo34-1M.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-tw/news/aoo34-1M.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-tw/news/aoo34-1M.html Mon Oct 22 18:53:02 2012
@@ -78,7 +78,7 @@
 
 <h2>進一步資訊</h2>
 
-<p>若要知道 Apache OpenOffice 更進一步的產品資訊，請參閱我們的網站 <a href="http://www.openoffice.org">www.openoffice.org</a> 。關於 Apache OpenOffice 專案，及志工參與方法詳情，請參閱我們的專案網站 <a href="http://incubator.apache.org/openofficeorg">http://incubator.apache.org/openofficeorg/</a> 。</p>
+<p>若要知道 Apache OpenOffice 更進一步的產品資訊，請參閱我們的網站 <a href="http://www.openoffice.org">www.openoffice.org</a> 。關於 Apache OpenOffice 專案，及志工參與方法詳情，請參閱我們的專案網站 <a href="http://openoffice.apache.org/">http://openoffice.apache.org/</a> 。</p>
 
 <p>若要訂閱 OpenOffice 相關官方公告，請將郵件寄到 <a href="mailto:ooo-announce-subscribe@incubator.apache.org">ooo-announce-subscribe@incubator.apache.org</a> 。你也可以加我們的 <a href="http://www.facebook.com/ApacheOO">Facebook</a> 、 <a href="https://twitter.com/#!/apacheoo">Twitter</a> 、 <a href="http://identi.ca/apacheoo">Identi.ca</a> 和 <a href="https://plus.google.com/u/0/114598373874764163668/">Google+</a> 專頁。</p>
 

Modified: websites/staging/ooo-site/trunk/content/zh-tw/news/aoo34.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-tw/news/aoo34.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-tw/news/aoo34.html Mon Oct 22 18:53:02 2012
@@ -75,7 +75,7 @@ OpenOffice 基本系統æœ�
 「從十年前的初版發表到現在，在 Apache 下的 OpenOffice 第一個版本 3.4 版，揭開了 OpenOffice 歷史上嶄新的一頁。」 RedMonk 的首席分析師 Stephen O'Grady 指出。「經過幾個月的努力， OpenOffice 得以用新的授權釋出，更能吸引全球使用者、開發者和獨立軟體商。」
 </p>	
 <p>
-Apache OpenOffice 目前為 Apache 育成專案，由預備專案管理委員會 (PPMC) 管理日常的運作、社群發展和新版釋出。 Apache OpenOffice 的原始碼、下載、說明文件、通信群組和相關資訊，請參閱 <a href="http://incubator.apache.org/openofficeorg/">http://incubator.apache.org/openofficeorg/</a> 。
+Apache OpenOffice 目前為 Apache 育成專案，由預備專案管理委員會 (PPMC) 管理日常的運作、社群發展和新版釋出。 Apache OpenOffice 的原始碼、下載、說明文件、通信群組和相關資訊，請參閱 <a href="http://openoffice.apache.org/">http://openoffice.apache.org/</a> 。
 </p>
 <p>
 作為第一個 OpenOffice 的 Apache 官方版本，開發團隊符合了育成專案管理委員會訂立的政策。為此，開發團隊將與 Apache 軟體基金會 (ASF) 授權政策不相容的程式碼、函式庫、功能等，一一找出來、以相容的功能替代或移除，以符合育成專案管理委員會的授權政策。</p>
@@ -85,14 +85,14 @@ Apache OpenOffice 目前為 Apa
 展望未來， OpenOffice 計劃支援更多語言，強化無障礙設計，增強使用體驗和效能，並採用 IBM Lotus Symphony 所貢獻的新功能和新設計。
 </p>
 <p>
-Apache OpenOffice 專案管理委員會歡迎您的加入。有很多地方需要大家的參與與貢獻。欲知詳情請參閱<a href="http://incubator.apache.org/openofficeorg/get-involved.html">如何參與</a>。
+Apache OpenOffice 專案管理委員會歡迎您的加入。有很多地方需要大家的參與與貢獻。欲知詳情請參閱<a href="http://openoffice.apache.org/get-involved.html">如何參與</a>。
 </p>
 <p>
 「 Apache OpenOffice 投資開發了十五年以上，是開放源始碼文書處理軟體的領導品牌。我們很高興能完全以 Apache 2.0 授權發表。這是未來在 Apache 下， OpenOffice 創新開發的基礎。」身兼版本管理者和資深核心開發者的 Juergen Schmidt 說。「這個重大里程碑，象徵 OpenOffice 已經擁有足夠多元、活躍、專業的社群基礎，向未來邁進。我們可望能在接下來幾週內，脫離育成階段，晉陞為 Apache 一級專案。」
 </p>
 <h2>進一步資訊</h2>
 <p>
-若要知道 Apache OpenOffice 更進一步的產品資訊，請參閱我們的網站 <a href="http://www.openoffice.org">www.openoffice.org</a> 。關於 Apache OpenOffice 專案，及志工參與方法詳情，請參閱我們的專案網站 <a href="http://incubator.apache.org/openofficeorg">http://incubator.apache.org/openofficeorg/</a> 。
+若要知道 Apache OpenOffice 更進一步的產品資訊，請參閱我們的網站 <a href="http://www.openoffice.org">www.openoffice.org</a> 。關於 Apache OpenOffice 專案，及志工參與方法詳情，請參閱我們的專案網站 <a href="http://openoffice.apache.org/">http://openoffice.apache.org/</a> 。
 </p>
 <p>
 若要訂閱 OpenOffice 相關官方公告，請將郵件寄到 <a href="mailto:ooo-announce-subscribe@incubator.apache.org">ooo-announce-subscribe@incubator.apache.org</a> 。你也可以加我們的 <a href="http://www.facebook.com/ApacheOO">Facebook</a> 、 <a href="https://twitter.com/#!/apacheoo">Twitter</a> 、 <a href="http://identi.ca/apacheoo">Identi.ca</a> 和 <a href="https://plus.google.com/u/0/114598373874764163668/">Google+</a> 專頁。

Modified: websites/staging/ooo-site/trunk/content/zh-tw/news/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-tw/news/index.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-tw/news/index.html Mon Oct 22 18:53:02 2012
@@ -39,7 +39,7 @@
 	<a name="apache-hosted" id="apache-hosted"></a>
   <h2>www.openoffice.org is now hosted by the Apache Software Foundation</h2>
   <p>Our website has migrated to infrastructure hosted by the Apache Software Foundation. Join the 
-    <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#users-mailing-list">Users Mailing List</a> or
+    <a href="http://openoffice.apache.org/mailing-lists.html#users-mailing-list">Users Mailing List</a> or
     <a href="http://user.services.openoffice.org/">User Forums</a> if you have questions or comments</p>
   	
 	
@@ -47,15 +47,15 @@
   <h2>OpenOffice.org Joins Apache Incubator</h2>
   <p>On June 1, 2011, Oracle announced that it was donating OpenOffice.org's code to 
   <a href="http://www.marketwire.com/press-release/statements-on-openofficeorg-contribution-to-apache-nasdaq-orcl-1521400.htm">The Apache Software Foundation's Incubator.</a> 
-  The Apache OpenOffice "podling" <a href="http://incubator.apache.org/openofficeorg/">http://incubator.apache.org/openofficeorg</a> site was established on June 13, 2011.
-	  Please join us in this new phase of OpenOffice.org by subscribing to our <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">mailing lists</a>.</p>
+  The Apache OpenOffice "podling" <a href="http://openoffice.apache.org/">http://openoffice.apache.org/</a> site was established on June 13, 2011.
+	  Please join us in this new phase of OpenOffice.org by subscribing to our <a href="http://openoffice.apache.org/mailing-lists.html">mailing lists</a>.</p>
   	
   <a name="asf_statement" id="asf_statement"></a>
   <h2>The Apache Software Foundation Statement on Apache OpenOffice.org</h2>
   <p><em>14 October 2011:</em> On 1 June 2011, Oracle Corporation submitted the OpenOffice.org code base to The Apache Software Foundation. That submission was accepted,
   and the project is now being developed as a podling in the Apache Incubator under the ASF's meritocratic process informally dubbed "The Apache Way".
   OpenOffice.org is now officially part of the Apache family.
-  The project is known as Apache OpenOffice.org (incubating).
+  The project is known as Apache OpenOffice.
   Over its 12-year history, the ASF has welcomed contributions from individuals and organizations alike, but, as a policy, does not solicit code donations.
   The OpenOffice.org code base was not pursued by the ASF prior to its acceptance into the Apache Incubator.
   <a href="http://blogs.apache.org/foundation/entry/the_apache_software_foundation_statement">Read the complete ASF annoncement</a>

Modified: websites/staging/ooo-site/trunk/content/zh-tw/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-tw/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-tw/topnav.html Mon Oct 22 18:53:02 2012
@@ -3,7 +3,7 @@
 <li><a href="/download/index.html" title="下載 Apache OpenOffice">下載</a></li>
 <li><a href="/support/index.html" title="為 Apache OpenOffice 尋求支援">支援</a></li>
 <li><a href="/extensions/index.html" title="Apache OpenOffice 的範本與擴充套件">擴充套件</a></li>
-<li><a href="http://incubator.apache.org/openofficeorg/get-involved.html" title="如何參與 Apache OpenOffice （育成階段）">開發</a></li>
+<li><a href="http://openoffice.apache.org/get-involved.html" title="如何參與 Apache OpenOffice （育成階段）">開發</a></li>
 <li><a href="/projects/accepted.html" title="Apache OpenOffice 開發焦點">焦點區</a></li>
 <li><a href="/projects/native-lang.html" title="你的語言的 Apache OpenOffice">各國語言</a></li>
 </ul></div>

Modified: websites/staging/ooo-site/trunk/content/zh/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/zh/topnav.html Mon Oct 22 18:53:02 2012
@@ -3,7 +3,7 @@
 <li><a href="/download/index.html" title="下載 Apache OpenOffice">下載</a></li>
 <li><a href="/support/index.html" title="為 Apache OpenOffice 尋求支援">支援</a></li>
 <li><a href="/extensions/index.html" title="Apache OpenOffice 的範本與擴充套件">擴充套件</a></li>
-<li><a href="http://incubator.apache.org/openofficeorg/get-involved.html" title="如何參與 Apache OpenOffice （育成階段）">開發</a></li>
+<li><a href="http://openoffice.apache.org/get-involved.html" title="如何參與 Apache OpenOffice （育成階段）">開發</a></li>
 <li><a href="/projects/accepted.html" title="Apache OpenOffice 開發焦點">焦點區</a></li>
 <li><a href="/projects/native-lang.html" title="你的語言的 Apache OpenOffice">各國語言</a></li>
 </ul></div>