You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ho...@apache.org on 2011/12/23 18:35:44 UTC

svn commit: r800921 - in /websites/production/ooo-site: ./ content/mail_list.html content/news/index.html content/projects/accepted.html content/projects/native-lang.html content/pt-br/index.html

Author: homembit
Date: Fri Dec 23 17:35:43 2011
New Revision: 800921

Log:
Fixed some orthographical errors.

Modified:
    websites/production/ooo-site/   (props changed)
    websites/production/ooo-site/content/mail_list.html
    websites/production/ooo-site/content/news/index.html
    websites/production/ooo-site/content/projects/accepted.html
    websites/production/ooo-site/content/projects/native-lang.html
    websites/production/ooo-site/content/pt-br/index.html

Propchange: websites/production/ooo-site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 23 17:35:43 2011
@@ -1 +1 @@
-/websites/staging/ooo-site/trunk:797592-800841
+/websites/staging/ooo-site/trunk:797592-800920

Modified: websites/production/ooo-site/content/mail_list.html
==============================================================================
--- websites/production/ooo-site/content/mail_list.html (original)
+++ websites/production/ooo-site/content/mail_list.html Fri Dec 23 17:35:43 2011
@@ -5,7 +5,7 @@
 
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <title>Most Popular Mail Lists</title>
+  <title>How to join the OpenOffice.org project?</title>
 
 
 </head>
@@ -40,17 +40,44 @@
     
     
 
-<h1>General &amp; Project Mailing Lists</h1>
+<h1>How to join the OpenOffice.org project?</h1>
 
-<p>&nbsp;</p>
+<h3><a href="#general">Information for all</a></h3>
+<h3><a href="#user">What users should do</a></h3>
+<h3><a href="#dev">What developers should do</a></h3>
 
-<div align="center">
-  <p class="Header"><a href="#general">General Mailing Lists</a> | <a href="#project">Project  Mailing Lists</a> | <a href="#newsgroups">Newsgroups</a></p>
-</div>
+<br/>
 
-<p>&nbsp;</p>
+<p id="general">As you might have heard, the future development of OpenOffice.org (OOo) will happen under the roof of the Apache Software Foundation (ASF).</p>
 
-<h2>Introduction</h2>
+<p>More information about OpenOffice.org @ Apache can be found here:</p>
+
+<ul>
+  <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Apache OpenOffice.org Incubation</a></li>
+  <li><a href="http://incubator.apache.org/openofficeorg/get-involved.html">Get Involved</a></li>
+  <li><a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+</ul>
+
+<big><big><b>Hope to see you soon at Apache!</b></big></big>
+
+<p><img src="http://incubator.apache.org/openofficeorg/images/feather-small.gif"/></p>
+
+<br/>
+
+<h2 id="user">For Users:</h2>
+
+<p>For questions relating to the use of OpenOffice.org (the application) write a mail to: <b>ooo-users@incubator.apache.org</b>. A very popular and effective mailing list.
+This list is in English only (for other languages visit the "<a href="http://native-lang.openoffice.org">Native-Lang</a>"project lists).</p>
+
+<ul>
+  <li><a href="mailto:ooo-users-subscribe@incubator.apache.org?subject=subscribe">Subscribe</a></li>
+  <li><a href="mailto:ooo-users-unsubscribe@incubator.apache.org?subject=unsubscribe">Unsubscribe</a></li>
+  <li><a href="http://openoffice.org/projects/www/lists/users/archive/">Search in the archives</a></li>
+  <li><a href="news://news.gmane.org/gmane.comp.openoffice.questions">gmane.comp.openoffice.questions</a></li>
+</ul>
+
+<p>Please note that this is not a normal mail address but a mailing list. Please familiarize yourself with the <a href="ml_guidelines.html">Mailing List Guidelines</a>
+and the text below if you have not already and do not know what this means.</p>
 
 <h3>All our lists are public</h3>
 
@@ -69,7 +96,7 @@ have their own announce and discuss list
 do is click on the "Subscribe" links and send on the empty email message that will be automatically generated and addressed. This message is just to let the
 friendly computer know of your intentions; you will immediately, upon sending this first note, receive a confirmation notice. Follow the instructions and
 send it back. Thus, to subscribe to the general discuss list, you just send mail to
-<a href="mailto:ooo-dev-subscribe@incubator.apache.org">ooo-dev@incubator.apache.org and then follow the
+<a href="mailto:sympa@openoffice.org?subject=subscribe%20discuss">sympa@openoffice.org with the subject:subscribe discuss</a> and then follow the
 instructions.</p>
 
 <h3>OpenOffice.org Member Responsibilities: Mail Lists</h3>
@@ -83,248 +110,38 @@ instructions.</p>
   to a list and posts spam to the list, he or she will be deleted from the list. Continued violation will result in the spammer being reported to his or her
   ISP (Internet Service Provider).</li>
   <li>Please <b>do not send attachments with your message,</b> as they add to the bandwidth burden we must all deal with. OpenOffice.org features several
-  other avenues for persons interested in submitting attachments. Check with your project lead or send a message to the
-  <a href="mailto:dev@infrastructure.openoffice.org">infrastructure team</a> to find out which would be best for you.</li>
+  other avenues for persons interested in submitting attachments. Send a message to
+  <a href="mailto:ooo-dev@incubator.apache.org">infrastructure team</a> to find out which would be best for you.</li>
 </ol>
 
 <h3>Mailing List Guidelines</h3>
 
 <p>Please familiarize yourself with the <a href="ml_guidelines.html">Mailing List Guidelines</a>, if you have not already.</p>
 
-<h3>Mailing List Archives</h3>
-
-<p>After the <a href="/news/#move">move to a new infrastructure</a> work to provide the list archives is still ongoing. Please bear
-with us if you see a message stating that a <i>list does not have any messages in its archive</i>.</p>
+<br/>
 
-<hr />
-<br />
+<h2 id="dev">For Developers:</h2>
 
-<table border="1" cellpadding="4" cellspacing="1" width="100%">
-  <tbody>
-    <tr>
-      <th colspan="6" class="alt2">
-      <p>General Mailing Lists</p>
-      <p>Lists in general are public!</p>
-      </th>
-    </tr>
-    <tr>
-      <td class="alt4">List</td>
-      <td class="alt4">Subscribe</td>
-      <td class="alt4">Unsubscribe</td>
-      <td class="alt4">Search Archives</td>
-      <td class="alt4">Browse Archives</td>
-      <td class="alt4">Newsgroup</td>
-    </tr>
-    <tr>
-      <td class="tableF0"><b>users@openoffice.org</b><br />
-      For questions relating to the use of OpenOffice.org (the application). A very popular and effective list. This list is in English. For non-English
-      help resources, visit the "<a href="http://native-lang.openoffice.org">Native-Lang</a>"project lists.</td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20users">Subscribe</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=unsubscribe%20users">Unsubscribe</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=users">Search</a></td>
-      <td class="alt6"><a href="http://openoffice.org/projects/www/lists/users/archive/">Browse archives</a></td>
-      <td class="alt6"><a href="news://news.gmane.org/gmane.comp.openoffice.questions">gmane.comp.openoffice.questions</a></td>
-    </tr>
-    <tr>
-      <td class="tableF0"><b>announce@openoffice.org</b><br />
-      The primary list for important, community-wide announcements. For major release notifications, major new projects, important documentation releases,
-      and so on. This is <i>not</i> a discussion list, and is <i>not</i> open to public posting. Traffic is expected to be very low, of the order of fewer
-      than ten messages per month. If you're interested in OpenOffice.org, it is recommended you subscribe at a minimum to this list.</td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20announce">Subscribe</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=unsubscribe%20announce">Unsubscribe</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=announce">Search</a></td>
-      <td class="alt6"><a href="http://openoffice.org/projects/www/lists/announce/archive/">Browse archives</a></td>
-      <td class="alt6"><a href="news://news.gmane.comp.openoffice.announce.general">gmane.comp.openoffice.announce.general</a></td>
-    </tr>
-    <tr>
-      <td class="tableF0"><b>discuss@openoffice.org</b><br />
-      This list is intended for discussions on OpenOffice.org and Open Source.<br />
-      Begin by stating:<br /><br />
-      <img src="/branding/images/small_blue_bullet.gif" alt="Who you are" /> Who you are;<br />
-      <img src="/branding/images/small_blue_bullet.gif" alt="A few words on your background" /> A few words on your background;<br />
-      <img src="/branding/images/small_blue_bullet.gif" alt="Your interest in OpenOffice.org" /> Your interest in OpenOffice.org; and<br />
-      <img src="/branding/images/small_blue_bullet.gif" alt="What you would like to see happen with OpenOffice.org" />&nbsp;What you would like to see
-      happen with OpenOffice.org.<br /><br />
-      <b>Note:</b> For questions regarding the use of the OpenOffice.org suite, please <a href="mailto:sympa@openoffice.org?subject=subscribe%20users">
-      subscribe</a> and <a href="mailto:users@openoffice.org"> submit</a> your question to users@openoffice.org.</td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20discuss">Subscribe</a><br /></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=unsubscribe%20discuss">Unsubscribe</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=discuss">Search</a></td>
-      <td class="alt6"><a href="http://openoffice.org/projects/www/lists/discuss/archive/">Browse archives</a></td>
-      <td class="alt6"><a href="news://news.gmane.org/gmane.comp.openoffice.general">gmane.comp.openoffice.general</a></td>
-    </tr>
-    <!--
-    <tr>
-      <td class="tableF0"><b>social@openoffice.org</b><br />
-      "social@openoffice.org" is our new and fairly funky permanently off-topic list for those who love OpenOffice.org.</td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20social">Subscribe</a><br />
-      <a href="mailto:sympa@openoffice.org?subject=subscribe%20social-digest">Digest</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20social-unsubscribe@openoffice.org">Unsubscribe</a><br />
-      <a href="mailto:sympa@openoffice.org?subject=subscribe%20social-digest-unsubscribe@openoffice.org">Digest</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=social">Search</a></td>
-      <td class="alt6"><a href="http://openoffice.org/projects/www/lists/social/archive/">Browse archives</a></td>
-      <td class="alt6">n/a</td>
-    </tr>
-    -->
-    <!--
-    <tr>
-      <td class="tableF0"><b>webmasters@openoffice.org</b><br />
-      This list is for questions relating to the overall project, <b><em>not</em></b> for how to use OpenOffice.org, the product. Such questions will
-      not be answered here. See <a href="/support/">Support</a>.</td>
-      <td class="alt6">n/a</td>
-      <td class="alt6">n/a</td>
-      <td class="alt6">n/a</td>
-      <td class="alt6">n/a</td>
-      <td class="alt6">n/a</td>
-    </tr>
-    -->
-    <tr>
-      <td class="tableF0"><b>dev@openoffice.org</b><br />
-      This list provides a general entry point for developers; it is also strongly urged that all developers subscribe to this list for announcements, etc.
-      If you are unsure which <a href="/projects/">project</a> fits your needs best, ask for redirection here. But do <b>not</b> expect
-      user discussions or support. Rather, discussions are focused on the development of the technology.</td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20dev">Subscribe</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=unsubscribe%20dev">Unsubscribe</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=dev">Search</a></td>
-      <td class="alt6"><a href="http://openoffice.org/projects/www/lists/dev/archive/">Browse archives</a></td>
-      <td class="alt6"><a href="news://news.gmane.org/gmane.comp.openoffice.devel.general">gmane.comp.openoffice.devel.general</a></td>
-    </tr>
-    <!--
-    <tr>
-      <td class="tableF0"><b>allfeatures@openoffice.org</b><br/>
-      The primary list for announcements of new features in OpenOffice.org</td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20allfeatures">Subscribe</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20allfeatures-unsubscribe@openoffice.org">Unsubscribe</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=allfeatures">Search</a></td>
-      <td class="alt6"><a href="http://openoffice.org/projects/www/lists/allfeatures/archive/">Browse archives</a></td>
-      <td class="alt6"><a href="news://news.gmane.org/gmane.comp.openoffice.announce.features">gmane.comp.openoffice.announce.features</a></td>
-    </tr>
-    -->
-    <!--
-    <tr>
-      <td class="tableF0"><b>allcvs@openoffice.org.</b></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20allcvs">Subscribe</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20allcvs-unsubscribe@openoffice.org">Unsubscribe</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=allcvs">Search</a></td>
-      <td class="alt6"><a href="http://openoffice.org/projects/www/lists/allcvs/archive/">Browse archives</a></td>
-      <td class="alt6"><a href="news://news.gmane.org/gmane.comp.openoffice.cvs">gmane.comp.openoffice.cvs</a></td>
-    </tr>
-    -->
-    <tr>
-      <td class="tableF0"><b>allbugs@openoffice.org</b><br />
-      A high volume list with all notifications about work on bugs.</td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20allbugs">Subscribe</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=unsubscribe%20allbugs">Unsubscribe</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=allbugs">Search</a></td>
-      <td class="alt6"><a href="http://openoffice.org/projects/www/lists/allbugs/archive/">Browse archives</a></td>
-      <td class="alt6"><a href="news://news.gmane.org/gmane.comp.openoffice.bugs">gmane.comp.openoffice.bugs</a></td>
-    </tr>
-    <tr>
-      <td class="tableF0"><b>allhg@openoffice.org</b><br />
-      A high volume list with all notifications about work on the source code.<br /></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20allhg">Subscribe</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=unsubscribe%20allhg">Unsubscribe</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=allhg">Search</a></td>
-      <td class="alt6"><a href="/servlets/SummarizeList?listName=allhg">Browse archives</a></td>
-      <td class="alt6">n/a</td>
-    </tr>
-    <tr>
-      <td class="tableF0"><b>interface-announce@openoffice.org</b><br />
-      Changes to C++/Java Interfaces are announced on this list. Developers from higher-level projects have to act by changing their code on incompatible
-      modifications accordingly. Other messages may be for informational purposes only. This is <b>not</b> a discussion list, and is not open to public
-      posting.</td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20interface-announce">Subscribe</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=unsubscribe%20interface-announce">Unsubscribe</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=interface-announce">Search</a></td>
-      <td class="alt6"><a href="http://openoffice.org/projects/www/lists/interface-announce/archive/">Browse archives</a></td>
-      <td class="alt6"><a href="news://news.gmane.org/gmane.comp.announce.interface">gmane.comp.openoffice.announce.interface</a></td>
-    </tr>
-    <tr>
-      <td class="tableF0"><b>interface-discuss@openoffice.org</b><br />
-      Proposals for changes to C++/Java Interfaces are discussed here. Developers from other projects using your interface will provide feedback regarding
-      their current usage, feasibility, timeframes, alternatives or just give you a go according to our
-      <a href="/dev_docs/guidelines.html#Sources">guidelines</a>.</td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20interface-discuss">Subscribe</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=unsubscribe%20interface-discuss">Unsubscribe</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=interface-discuss">Search</a></td>
-      <td class="alt6"><a href="http://openoffice.org/projects/www/lists/interface-discuss/archive/">Browse archives</a></td>
-      <td class="alt6">n/a</td>
-    </tr>
-    <tr>
-      <td class="tableF0"><b>cws-announce@openoffice.org</b><br />
-      Announcements about the creation of new child workspaces and the subsequent status changes and other child workspace specific information. Also
-      available as RSS-Feed from <a href="http://eis.services.openoffice.org/">EIS</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20cws-announce">Subscribe</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=unsubscribe%20cws-announce">Unsubscribe</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=cws-announce">Search</a></td>
-      <td class="alt6"><a href="http://openoffice.org/projects/www/lists/cws-announce/archive/">Browse archives</a></td>
-      <td class="alt6">n/a</td>
-    </tr>
-    <tr>
-      <td class="tableF0"><b>releases@openoffice.org</b><br />
-      This list serves as a medium to synchronize our efforts for building, testing, and publishing milestone/snapshot builds. For general roadmap
-      discussions please use "discuss@openoffice.org".</td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=subscribe%20releases">Subscribe</a></td>
-      <td class="alt6"><a href="mailto:sympa@openoffice.org?subject=unsubscribe%20releases">Unsubscribe</a></td>
-      <td class="alt6"><a href="/servlets/SearchList?listName=releases">Search</a></td>
-      <td class="alt6"><a href="http://openoffice.org/projects/www/lists/releases/archive/">Browse archives</a></td>
-      <td class="alt6"><a href="news://news.gmane.org/gmane.comp.openoffice.releases">gmane.comp.openoffice.releases</a></td>
-    </tr>
-  </tbody>
-</table>
-
-<br />
-<hr />
-
-<h3 id="project">Project Mailing Lists</h3>
-
-<p>Please visit your <a href="/projects/index.html">project's homepage</a> to see what lists are available for the project you're
-interested in. You'll also find lists where your <a href="http://native-lang.openoffice.org">native language</a> is used.<br /></p>
-
-<h3 id="newsgroups">Newsgroups</h3>
-
-<p>For those who prefer to use <a href="http://www.hyperdictionary.com/dictionary/newsgroup">newsgroups</a> rather than e-mail mailing lists, there are the
-Gmane newsgroups. For more information on Gmane, contact <a href="http://www.gmane.org/">Gmane</a>. To correspond via newsgroups, you can use open-source
-command-line clients, <a href="http://www.mozilla.org/">Mozilla</a>, or many other clients. The Gmane server address is:</p>
+<p>Developers, some of the old folks as well as some new ones, are currently working on the code import from the OOo repository to the ASF repository.
+In parallel similar work is done for the Bugzilla content, the wiki, the web pages etc. Currently OOo still is an "incubator" project and it will remain in that state until it fulfills all criteria for an accepted ASF project.
+One of the most important criteria is that all code that is used for a release is licensed under the ASF license or a compatible license.
+(OK, it is a little bit more complicated, but you may get the idea.) As soon as the code import to the ASF repository is done, the work will go further on that.
+Some parts of this work can be seen here:</p>
 
 <ul>
-  <li>news.gmane.org</li>
+  <li><a href="http://wiki.services.openoffice.org/wiki/ApacheMigration">Todo list of the Apache migration</a></li>
 </ul>
 
-<p>Then enter the list you wish to subscribe to; see below for the ones available or scan Gmane's list, which is always growing. Many specific projects
-also use Gmane. For instance, ES, FR are two projects that use Gmane. If you want your project lists to use Gmane, contact Gmane directly and set it up.
-It's easy.</p>
-
-<h3>Process</h3>
-
-<p>E-mails that are sent by subscribers to the mailing lists are automatically forwarded to the relevant Newsgroup. Conversely, posts to a Newsgroup are
-forwarded to the appropriate mailing list. That is, the operation of Gmane is bidirectional. It is not necessary to be subscribed to a mailing list to be
-able to post to a Newsgroup. The Gmane system uses its own authorization process. Thus, to post to a Newsgroup, do the following:</p>
+<p>Later on the OOo development will continued at the ASF and as a part of that it will be tried to move over all the unfinished work of OOo from the last months.
+And of course the the OOo 3.4 release will be finished with a high priority.</p>
+
+<p><b>Every developer is invited to join us, old hackers as well as new ones.</b> Please join the new project's mailing list and help us to shape the next decade of
+OpenOffice.org development:</p>
 
 <ul>
-  <li>Post a message to the appropriate Newsgroup. You will receive an authorization request from Gmane.</li>
-  <li>Reply to that request.</li>
-  <li>Your post will then appear in both the Gmane newsgroup and it will also appear on the mailing list.</li>
-  <li>You will need to be authorized for each Newsgroup to which you post (but only once per group).</li>
+  <li><a href="mailto:ooo-dev@incubator.apache.org">ooo-dev (at) incubator.apache.org</a></li>
 </ul>
 
-<p>Gmane newsgroups are listed next to the relevant mail lists. If a newsgroup is not listed and exists, please contact
-<a href="mailto:dev@infrastructure.openoffice.org">the infrastrcuture team</a>.</p>
-
-<hr />
-
-<h3 id="problems">Mailing List Problems?</h3>
-
-<p>If you're having problems specific to any of the lists, <i>please</i> contact the list owner rather than posting your problem to the whole list.
-Addresses for list owners take the form "listname-request@openoffice.org", so for example the discuss list owner address would be
-<a href="mailto:discuss-request@openoffice.org">discuss-request@openoffice.org</a></p>
-
-<p>By far the most common mailing list problem is attempting to unsubscribe from an address that is not subscribed. If you need to unsubscribe a specific
-address, say "mary@host.domain" from the global list discuss, send an email with an empty body to "sympa@openoffice.org" with the subject "unsubscribe
-discuss mary@host.domain".</p>
-
-<p>If none of this helps, and you still have questions, please <a href="/contact.html">contact us</a>.</p>
-
 
 
   </div>

Modified: websites/production/ooo-site/content/news/index.html
==============================================================================
--- websites/production/ooo-site/content/news/index.html (original)
+++ websites/production/ooo-site/content/news/index.html Fri Dec 23 17:35:43 2011
@@ -54,6 +54,30 @@
     
 
   <h1>News from OpenOffice.org</h1>
+  <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).
+  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>
+  </p>
+
+  <a name="asf_ooo_blog" id="asf_ooo_blog"></a>
+  <h2>OpenOffice.org Blog at Apache</h2>
+  <p><em>11 July 2011:</em> Keep up with latest developments in the OpenOffice.org to Apache project transition at the
+  <a href="https://blogs.apache.org/OOo/">OpenOffice.org (OOo) blog.</a>
+  </p>
+
+  <a name="asfsetup" id="asfsetup"></a>
+  <h2>OpenOffice.org is Established as an ASF Project</h2>
+  <p><em>13 June 2011:</em> OpenOffice.org has now been accepted as an Apache incubator project. Details
+  and further participation in the OpenOffice.org project can be found at the new 
+  <a href="http://incubator.apache.org/projects/openofficeorg.html">incubator site.</a>
+  </p>
+  
   <a name="asfsetup" id="asfsetup"></a>
   <h2>OpenOffice.org is Established as an ASF Project</h2>
   <p><em>13 June 2011:</em> OpenOffice.org has now been accepted as an Apache incubator project. Details

Modified: websites/production/ooo-site/content/projects/accepted.html
==============================================================================
--- websites/production/ooo-site/content/projects/accepted.html (original)
+++ websites/production/ooo-site/content/projects/accepted.html Fri Dec 23 17:35:43 2011
@@ -41,8 +41,9 @@
     
   <p><strong>Categories: </strong><a href="accepted.html">Accepted Projects</a>, <a href="incubator.html">Incubator Projects</a>, <a href="native-lang.html">Native-Lang Projects</a></p>
   <h1><br />
-   Accepted Projects of OpenOffice.org</h1>
-  <p>&quot;Accepted Projects Category&quot; refers to those projects that include core technical projects as well as key user information projects. Any registered member of OpenOffice.org may join any public project. To learn how to join, see the <a href="//servlets/HelpTOC">Help</a>. If a 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>
+   Teams of Apache OpenOffice (Legacy Projects of OpenOffice.org)</h1>
+  <p>The following Apache OpenOffice Teams include those projects that provide core technical development as well as key user information projects. 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>. (Please note, project leads may have changed so it is best to contact the ooo-dev list noted on <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">Mailing Lists</a>.) 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>
   <tr>

Modified: websites/production/ooo-site/content/projects/native-lang.html
==============================================================================
--- websites/production/ooo-site/content/projects/native-lang.html (original)
+++ websites/production/ooo-site/content/projects/native-lang.html Fri Dec 23 17:35:43 2011
@@ -49,9 +49,10 @@
    </ul>
   
   <h1><br />
-   <img src="/contributing/_media/language.png" alt=" " class="catpic" /><a href="/native-lang/">Native Language Confederation</a> Projects of OpenOffice.org</h1>
+   <img src="/contributing/_media/language.png" alt=" " class="catpic" /><a href="/native-lang/">Native Language Confederation</a> </h1>
   <div class="Acta1">
-   <p>The <a href="/native-lang/">Native Language Confederation</a> includes those projects offering information, resources, and much more in a user's native language. Any registered member of OpenOffice.org may join any public project. To learn how to join, see the <a href="//servlets/HelpTOC">Help</a>. </p>
+   <p>The <a href="/native-lang/">Native Language Confederation</a> includes those projects offering information, resources, and much more in a user's native language. To learn how you can get involved with this area of Apache OpenOffice
+   please see <a href="http://incubator.apache.org/openofficeorg/get-involved.html">Getting Involved</a>.</p>
   </div>
     <p>Note: Not all languages are represented here, only those that have OpenOffice.org websites. For example, many of the African localizations are not listed. A <a href="http://l10n.openoffice.org/languages.html">complete list is also available</a>.</p>
   <ul>

Modified: websites/production/ooo-site/content/pt-br/index.html
==============================================================================
--- websites/production/ooo-site/content/pt-br/index.html (original)
+++ websites/production/ooo-site/content/pt-br/index.html Fri Dec 23 17:35:43 2011
@@ -58,7 +58,7 @@
 
 <div id="news">
   <div class="campaign">
-  <h2>Sobre o Apache OpenOffice.org</h2>
+  <h2>Sobre o Apache OpenOffice</h2>
     <p>O Projeto OpenOffice está de casa nova, e agora é um projeto incubado da Fundação Apache. O primeiro release do Apache OpenOffice está planejado para o início de 2012.</p>        
   </div>
    
@@ -70,17 +70,17 @@
   <div class="campaign">
   <h2>Blog do OpenOffice.org na Apache</h2>
   <p>Mantenha-se informado sobre os últimos desenvolvimentos do Apache OpenOffice no
-  <a href="https://blogs.apache.org/OOo/">blog da incubadora do Apache OpenOffice.org.</a></p>
+  <a href="https://blogs.apache.org/OOo/">blog da incubadora do Apache OpenOffice.</a></p>
 
   </div>
   
   <div class="campaign">
   <h2>OpenOffice.org entra na Incubadora da Apache</h2>
-  <p>Em 1 de Junho de 2011, a Oracle anunciou a doação do código fonte do OpenOffice.org's para a
+  <p>Em 1 de Junho de 2011, a Oracle anunciou a doação do código fonte do OpenOffice.org para a
   <a href="http://www.marketwire.com/press-release/statements-on-openofficeorg-contribution-to-apache-nasdaq-orcl-1521400.htm">Incubadora da Fundação Apache.</a>
-  Um site preliminar de incubação do OpenOffice.org <a href="http://incubator.apache.org/openofficeorg/">http://incubator.apache.org/openofficeorg</a> foi criado em 13 de Junho de 2011 para a transição.
-  Junte-se a nós nesta nova fase da vida do OpenOffice.org se inscrevendo nas <a href="http://incubator.apache.org/projects/openofficeorg.html">listas de discussão</a>.
-    A lista <i>dev</i> é onde está sendo planejado e realizado o desenvolvimento do OpenOffice.org no ambiente Apache. Suas contribuições serão bem vindas !<br />
+  Um site preliminar de incubação do OpenOffice <a href="http://incubator.apache.org/openofficeorg/">http://incubator.apache.org/openofficeorg</a> foi criado em 13 de Junho de 2011 para a transição.
+  Junte-se a nós nesta nova fase da vida do OpenOffice se inscrevendo nas <a href="http://incubator.apache.org/projects/openofficeorg.html">listas de discussão</a>.
+    A lista <i>dev</i> é onde está sendo planejado e realizado o desenvolvimento do OpenOffice no ambiente Apache. Suas contribuições serão bem-vindas!<br />
   <br>
   Os downloads e o suporte ao OpenOffice.org continuarão disponíveis através deste site durante a fase de transição. </p>
   </div>