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/11/05 00:25:18 UTC

svn commit: r837270 - in /websites/staging/openofficeorg/trunk/content: ./ openofficeorg/ openofficeorg/orientation/

Author: buildbot
Date: Sun Nov  4 23:25:17 2012
New Revision: 837270

Log:
Staging update by buildbot for openofficeorg

Modified:
    websites/staging/openofficeorg/trunk/content/   (props changed)
    websites/staging/openofficeorg/trunk/content/openofficeorg/contact.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/get-it-here.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/native-lang.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/decision-making.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/how-aoo-project-works.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/infrastructure.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/intro-contributing.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/pmc-faqs.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/press.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html

Propchange: websites/staging/openofficeorg/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Nov  4 23:25:17 2012
@@ -1 +1 @@
-1405251
+1405668

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 Sun Nov  4 23:25:17 2012
@@ -104,11 +104,11 @@
 </ul>
 <p>For any questions, comments, or concerns about this project or website please contact the project on the developer mailing list:</p>
 <ul>
-<li><a href="mailto:ooo-dev@incubator.apache.org">ooo-dev@incubator.apache.org</a>.</li>
+<li><a href="mailto:dev@openoffice.apache.org">dev@openoffice.apache.org</a>.</li>
 </ul>
 <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>
+<li><a href="mailto:private@openoffice.apache.org">private@openoffice.apache.org</a>.</li>
 </ul>
 <p>For security issues, please contact the private security list:</p>
 <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 Sun Nov  4 23:25:17 2012
@@ -123,14 +123,14 @@ 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">PMC</a> 
+<li>Once the your ICLA has been recorded, you should send a note to the <a href="mailto:private@openoffice.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 PMC member, you should then <a href="mailto:ooo-private-subscribe@incubator.apache.org">subscribe</a> to the 
+<p>If you were also voted as a PMC member, you should then <a href="mailto:private-subscribe@openoffice.apache.org">subscribe</a> to the 
 PMC's private mailing list.</p>
 </li>
 <li>
@@ -145,7 +145,7 @@ the <a href="https://cms.apache.org/#boo
 and submit a patch as described in the <a href="http://www.apache.org/dev/cmsref.html#non-committer">Apache CMS Reference Manual</a>.
 Save your PATCH. File an issue using <a href="https://issues.apache.org/ooo/">OpenOffice Bugzilla</a> and select the "www"
 category to file it. You should then use your saved patch as an attachment to the
-issue. Please send a follow-up e-mail to <a href="mailto: ooo-dev@incubator.openoffice.org">ooo-dev</a> and provide the 
+issue. Please send a follow-up e-mail to <a href="mailto:dev@openoffice.apache.org">dev</a> and provide the 
 issue number so we can follow-up.</p>
 <p>Your contributions will be recognized by the committer submitting the PATCH in the
 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>

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 Sun Nov  4 23:25:17 2012
@@ -107,7 +107,7 @@ src="http://openoffice.apache.org/images
 
 <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://openoffice.apache.org/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">dev mailing list</a> and we can make a translated version for you.</p>
 <h2 id="conditions">Conditions:</h2>
 <ol>
 <li>

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 Sun Nov  4 23:25:17 2012
@@ -114,11 +114,11 @@ ideas about Apache OpenOffice.</p>
 <h2 id="participation-guidelines">Participation Guidelines</h2>
 <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
+On our high-traffic lists, especially dev, we encourage the use of email subject
 tags that indicate the topic of your post.  Consistent use of such tags makes it
 more likely that your post will be read by subscribers most interested in that
 topic.  It also faciliates sorting and filtering by email inbox rules.</p>
-<p>Some subject tags often seen on ooo-dev include:</p>
+<p>Some subject tags often seen on dev include:</p>
 <ul>
 <li>[www] for posts related to the website</li>
 <li>[Repo] for posts related to the source code repository</li>
@@ -158,9 +158,9 @@ discussions about the product and projec
 <p>This list is for application developers and other interested in scripting, macros or developing
 OpenOffice extensions.</p>
 <ul>
-<li>Subscribe: <a href="mailto:ooo-api-subscribe@incubator.apache.org">ooo-api-subscribe@incubator.apache.org</a></li>
-<li>Post (after subscription): <a href="mailto:ooo-api@incubator.apache.org">ooo-api@incubator.apache.org</a></li>
-<li>Unsubscribe: <a href="mailto:ooo-api-unsubscribe@incubator.apache.org">ooo-api-unsubscribe@incubator.apache.org</a></li>
+<li>Subscribe: <a href="mailto:api-subscribe@openoffice.apache.org">api-subscribe@openoffice.apache.org</a></li>
+<li>Post (after subscription): <a href="mailto:api@openoffice.apache.org">api@openoffice.apache.org</a></li>
+<li>Unsubscribe: <a href="mailto:api-unsubscribe@openoffice.apache.org">api-unsubscribe@openoffice.apache.org</a></li>
 <li>Archives<ul>
 <li><a href="http://markmail.org/search/+list:org.apache.incubator.ooo-api">Markmail</a></li>
 <li><a href="http://mail-archives.apache.org/mod_mbox/incubator-ooo-api/">Apache</a></li>
@@ -184,8 +184,8 @@ planning and related activities.</p>
 <p>Subscribe to this list to receive notice about new releases and other important
 news from the project.</p>
 <ul>
-<li>Subscribe: <a href="mailto:ooo-announce-subscribe@incubator.apache.org">ooo-announce-subscribe@incubator.apache.org</a></li>
-<li>Unsubscribe: <a href="mailto:ooo-announce-unsubscribe@incubator.apache.org">ooo-announce-unsubscribe@incubator.apache.org</a></li>
+<li>Subscribe: <a href="mailto:announce-subscribe@openoffice.apache.org">announce-subscribe@openoffice.apache.org</a></li>
+<li>Unsubscribe: <a href="mailto:announce-unsubscribe@openoffice.apache.org">announce-unsubscribe@openoffice.apache.org</a></li>
 <li>Archives<ul>
 <li><a href="http://markmail.org/search/+list:org.apache.incubator.ooo-announce">Markmail</a></li>
 <li><a href="http://mail-archives.apache.org/mod_mbox/incubator-ooo-announce/">Apache</a></li>
@@ -200,9 +200,9 @@ example, send using <strong>myapacheid@a
 activities and ensure we are all pulling in the same direction. This is a high
 traffic list, with an average of 88 posts/day.</p>
 <ul>
-<li>Subscribe: <a href="mailto:ooo-dev-subscribe@incubator.apache.org">ooo-dev-subscribe@incubator.apache.org</a></li>
-<li>Post (after subscription): <a href="mailto:ooo-dev@incubator.apache.org">ooo-dev@incubator.apache.org</a></li>
-<li>Unsubscribe: <a href="mailto:ooo-dev-unsubscribe@incubator.apache.org">ooo-dev-unsubscribe@incubator.apache.org</a></li>
+<li>Subscribe: <a href="mailto:dev-subscribe@openoffice.apache.org">dev-subscribe@openoffice.apache.org</a></li>
+<li>Post (after subscription): <a href="mailto:dev@openoffice.apache.org">dev@openoffice.apache.org</a></li>
+<li>Unsubscribe: <a href="mailto:dev-unsubscribe@openoffice.apache.org">dev-unsubscribe@openoffice.apache.org</a></li>
 <li>Archives<ul>
 <li><a href="http://markmail.org/search/+list:org.apache.incubator.ooo-dev">Markmail</a></li>
 <li><a href="http://dir.gmane.org/gmane.comp.apache.incubator.ooo.devel/">Gmane</a></li>
@@ -241,8 +241,8 @@ both the OpenOffice product, as well as 
 OpenOffice.org code and documentation.  This is a moderate traffic list, with an
 average of 10 posts/day.</p>
 <ul>
-<li>Subscribe: <a href="mailto:ooo-commits-subscribe@incubator.apache.org">ooo-commits-subscribe@incubator.apache.org</a></li>
-<li>Unsubscribe: <a href="mailto:ooo-commmits-unsubscribe@incubator.apache.org">ooo-commmits-unsubscribe@incubator.apache.org</a></li>
+<li>Subscribe: <a href="mailto:commits-subscribe@openoffice.apache.org">commits-subscribe@openoffice.apache.org</a></li>
+<li>Unsubscribe: <a href="mailto:commmits-unsubscribe@openoffice.apache.org">ooo-commmits-unsubscribe@incubator.apache.org</a></li>
 <li>Archives<ul>
 <li><a href="http://markmail.org/search/+list:org.apache.incubator.ooo-commits">Markmail</a></li>
 <li><a href="http://mail-archives.apache.org/mod_mbox/incubator-ooo-commits/">Apache</a></li>
@@ -278,18 +278,18 @@ mailing list for the OpenOffice project:
 <ul>
 <li>users@openoffice.org posts should be sent to ooo-users@incubator.apache.org</li>
 <li>discuss@openoffice.org posts should be sent to ooo-users@incubator.apache.org</li>
-<li>dev@openoffice.org posts should be sent to ooo-dev@incubator.apache.org</li>
+<li>dev@openoffice.org posts should be sent to dev@openoffice.apache.org</li>
 <li>securityteam@openoffice.org posts should be sent to ooo-security@incubator.apache.org</li>
 <li>project marketing related posts should be sent to ooo-marketing@incubator.apache.org</li>
-<li>requests to use trademarks should be sent to ooo-dev@incubator.apache.org</li>
-<li>anything of a confidential nature should be sent to ooo-private@incubator.apache.org</li>
+<li>requests to use trademarks should be sent to dev@openoffice.apache.org</li>
+<li>anything of a confidential nature should be sent to private@openoffice.apache.org</li>
 <li>support questions related to the OpenOffice product should go to ooo-users@incubator.apache.org</li>
-<li>website related questions should go to ooo-dev@incubator@apache.org</li>
-<li>questions on volunteering for the project should go to ooo-dev@incubator@apache.org</li>
-<li>press queries should go to ooo-private@incubator.apache.org</li>
+<li>website related questions should go to dev@openoffice.apache.org</li>
+<li>questions on volunteering for the project should go to dev@openoffice.apache.org</li>
+<li>press queries should go to private@openoffice.apache.org</li>
 </ul>
 <p>For any topic not covered by the above, send your post to
-ooo-dev@incubator.apache.org</p>
+dev@openoffice.apache.org</p>
   </div>
 
   <div id="footera">

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 Sun Nov  4 23:25:17 2012
@@ -105,7 +105,7 @@ Apache governance policies is still bein
 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
 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>
+made via the <a href="mailto:dev@openoffice.apache.org">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 />
 See the local <a href="http://wiki.services.openoffice.org/wiki/Pootle_User_Guide">Pootle User Guide</a> for more information.</li>
@@ -118,8 +118,8 @@ for establishing a native language area.
 <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
 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>
+dev mailing list.  Additionally new mailing lists typically require at least two 
+moderators to be established. Initiate setup requests through: <a href="mailto:dev@openoffice.apache.org">dev@openofifce.apache.org</a></p>
 <p>Native language mailing list currently are:</p>
 <ul>
 <li>ooo-users-de@incubator.apache.org (German users mailing list)</li>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/decision-making.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/decision-making.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/decision-making.html Sun Nov  4 23:25:17 2012
@@ -99,7 +99,7 @@
 open source software project, especially one at Apache, then much of this material will already be familiar to you.</p>
 <ol>
 <li>
-<p>Please send an email to <a href="mailto:ooo-dev@incubator.apache.org?subject=Starting Decision Making Module">ooo-dev@incubator.apache.org</a> to let us know you are working on this module.</p>
+<p>Please send an email to <a href="mailto:dev@openoffice.apache.org?subject=Starting Decision Making Module">dev@openoffice.apache.org</a> to let us know you are working on this module.</p>
 </li>
 <li>
 <p>In the previous Module we read about collaboration on the mailings lists, how to do it efficiently and how to avoid the most common pitfalls.  We use the mailing lists for many things,
@@ -127,7 +127,7 @@ on the mailing list.</p>
 <li>
 <p>A Committer can also voluntarily invocate a RTC on their own changes.  For example the Committer might be considering a change that of greater significance.  Maybe he would 
 value additional input, or technical review.  Maybe the change is controversial or require coordination.  If CTR is not appropriate then one can make a proposal and send it to 
-the ooo-dev mailing list.<br />
+the dev mailing list.<br />
 </p>
 </li>
 <li>
@@ -167,7 +167,7 @@ Keep your eye out for terms like "propos
 not perfect.  But we work best and have the most fun when we follow the above guidelines.  And so will you when you apply then in your own list communications!</p>
 </li>
 <li>
-<p>Congratulations!  You have completed this Module  Please send a note to <a href="mailto:ooo-dev@incubator.apache.org?subject=Completed Decision Making Module">ooo-dev@incubator.apache.org</a> so 
+<p>Congratulations!  You have completed this Module  Please send a note to <a href="mailto:dev@openoffice.apache.org?subject=Completed Decision Making Module">dev@openoffice.apache.org</a> so 
 we all know.   This is also a good opportunity to send along any feedback or questions you might have on this Orientation Module.</p>
 </li>
 </ol>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/how-aoo-project-works.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/how-aoo-project-works.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/how-aoo-project-works.html Sun Nov  4 23:25:17 2012
@@ -97,7 +97,7 @@
     <h1 class="title">How the Apache OpenOffice Project Works
</h1>
     <ol>
 <li>
-<p>Please send an email to <a href="mailto:ooo-dev@incubator.apache.org?subject=Starting How the Apache OpenOffice Project Works">ooo-dev@incubator.apache.org</a> to let us know you are working on this module.</p>
+<p>Please send an email to <a href="mailto:dev@openoffice.apache.org?subject=Starting How the Apache OpenOffice Project Works">dev@openoffice.apache.org</a> to let us know you are working on this module.</p>
 </li>
 <li>
 <p>As you learned in the <a href="intro-contributing.html">previous module</a> the Apache Software Foundation formally has Members, who elect a Board of Directors who appoint Officers, including
@@ -131,7 +131,7 @@ users around the globe.  This includes t
 </ul>
 </li>
 <li>
-<p>Congratulations!  You have completed this Level.  Please send a note to <a href="mailto:ooo-dev@incubator.apache.org?subject=Completed How the Apache OpenOffice Project Works">ooo-dev@incubator.apache.org</a> so 
+<p>Congratulations!  You have completed this Level.  Please send a note to <a href="mailto:dev@openoffice.apache.org?subject=Completed How the Apache OpenOffice Project Works">dev@openoffice.apache.org</a> so 
 we all know you have completed this level.   This is also a good opportunity to send along any feedback or questions you might have on this Orientation Module.</p>
 </li>
 </ol>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/infrastructure.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/infrastructure.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/infrastructure.html Sun Nov  4 23:25:17 2012
@@ -100,7 +100,7 @@ or at least hear them discussed on the l
 need more information or run into problems.</p>
 <ol>
 <li>
-<p>First, Please send an email to <a href="mailto:ooo-dev@incubator.apache.org?subject=Starting Infrastructure Module">ooo-dev@incubator.apache.org</a> 
+<p>First, Please send an email to <a href="mailto:dev@openoffice.apache.org?subject=Starting Infrastructure Module">dev@openoffice.apache.org</a> 
 to let us know you are working on this module.</p>
 </li>
 <li>
@@ -108,10 +108,10 @@ to let us know you are working on this m
 <ul>
 <li>
 <p>ezmlm:  This is the time-tested EZ Mailing List Manager application that manages our mailing lists.  You 
-control ezmlm by sending commands to a list address.  For example, if the list address is ooo-dev@incubator.apache.org
-then you subscribe to the list with the command ooo-dev-<strong>subscribe</strong>@incubator.apache.org.  Some other popular commands 
+control ezmlm by sending commands to a list address.  For example, if the list address is dev@openoffice.apache.org
+then you subscribe to the list with the command dev-<strong>subscribe</strong>@openoffice.apache.org.  Some other popular commands 
 are listed <a href="http://www.apache.org/foundation/mailinglists.html">here</a>.  You can get a full list of commands 
-available to you by sending the <em>help</em> command, as in ooo-dev-<strong>help</strong>@incubator.apache.org.  Each list has moderators
+available to you by sending the <em>help</em> command, as in dev-<strong>help</strong>@openoffice.apache.org.  Each list has moderators
 who have additional capabilities.  You can find the moderators for our lists <a href="http://incubator.apache.org/openofficeorg/pmc-faqs.html#mailing-lists">here</a>.</p>
 </li>
 <li>
@@ -169,15 +169,15 @@ and the ability to do some customization
 <li>
 <p>What to do if you have a problem:</p>
 <ul>
-<li>Questions on how to use the service: First, look for intructions on the website.  If that fails, post a note to the ooo-dev mailing list for hints.</li>
+<li>Questions on how to use the service: First, look for intructions on the website.  If that fails, post a note to the dev mailing list for hints.</li>
 <li>Outages: <a href="http://monitoring.apache.org/status/">Current status</a> is posted.  You might also want to subscribe to Infra's <a href="https://twitter.com/infrabot">Twitter feed</a>.
 If you see an outage not noted there already, you can notify Infra via IRC channel #asfinfra on Freenode.</li>
-<li>Requests to enhance or modify the service: Propose something on ooo-dev.  Even though Infra is required to carry out some tasks, you still should get consensus 
+<li>Requests to enhance or modify the service: Propose something on dev.  Even though Infra is required to carry out some tasks, you still should get consensus 
 first on the project's mailing list.</li>
 </ul>
 </li>
 <li>
-<p>Congratulations!  You have completed this Module.  Please send a note to <a href="mailto:ooo-dev@incubator.apache.org?subject=Completed Infrastructure Module">ooo-dev@incubator.apache.org</a> so 
+<p>Congratulations!  You have completed this Module.  Please send a note to <a href="mailto:dev@openoffice.apache.org?subject=Completed Infrastructure Module">dev@openoffice.apache.org</a> so 
 we all know you have completed this level.   This is also a good opportunity to send along any feedback or questions you might have on this Orientation Module.</p>
 </li>
 </ol>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/intro-contributing.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/intro-contributing.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/intro-contributing.html Sun Nov  4 23:25:17 2012
@@ -105,7 +105,7 @@ Apache, then much of this will already b
 <ol>
 <li>
 <p>Introduce yourself to the other project Volunteers by sending an email to our main public 
-mailing list <a href="mailto:ooo-dev@incubator.apache.org?subject=Starting Introduction to Contributing to Apache OpenOffice Module">ooo-dev@incubator.apache.org</a>.  Who are you, where 
+mailing list <a href="mailto:dev@openoffice.apache.org?subject=Starting Introduction to Contributing to Apache OpenOffice Module">dev@openoffice.apache.org</a>.  Who are you, where 
 are you from, what are you interested in?  These are all good things to cover.  Also, as you work through the 
 items on this page, if you have questions or problems, please feel free to ask for help by sending a note to 
 this list.</p>
@@ -128,9 +128,9 @@ 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://openoffice.apache.org/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">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://openoffice.apache.org/mailing-lists.html#announce-mailing-list">ooo-announce</a> This 
+<li><a href="http://openoffice.apache.org/mailing-lists.html#announce-mailing-list">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://openoffice.apache.org/mailing-lists.html#users-mailing-list">ooo-users</a> This is our users
@@ -145,8 +145,8 @@ specific <a href="http://openoffice.apac
 <a href="http://openoffice.apache.org/native-lang.html">native languages</a>.</p>
 </li>
 <li>
-<p>A useful shortcut notation you will often see on the lists.  Writing a list name in full, like ooo-dev@incubator.apache.org can be tedious.  So you will often see
-it called just "ooo-dev" or "ooo-dev@i.a.o".   Similarly, top-level lists like trademarks@apache.org are often referred to as "trademarks@".  This shortcut can be used to refer
+<p>A useful shortcut notation you will often see on the lists.  Writing a list name in full, like dev@openoffice.apache.org can be tedious.  So you will often see
+it called just "dev".   Similarly, top-level lists like trademarks@apache.org are often referred to as "trademarks@".  This shortcut can be used to refer
 either to the mailing list and to the team that operates the mailing list.  The context should make it clear, e.g., "You should check with trademarks@ on whether this will be problem".</p>
 </li>
 <li>
@@ -155,7 +155,7 @@ participation in an open source project 
 folders, rule-based folder assignments, and most importantly quote collapsing.  A common practice is to make
 a separate folder for each Apache mailing list and define a rule to move incoming emails directly into that folder. 
 If you have a question on how to configure your email client to do these things, try your help files, 
-or a web search first, and if that fails post a question to the ooo-dev list.</p>
+or a web search first, and if that fails post a question to the dev list.</p>
 </li>
 <li>
 <p>Because our mailing lists can be busy, and we're not all native English speakers, and because email text is 
@@ -179,7 +179,7 @@ and <a href="http://openoffice.apache.or
 </li>
 <li>
 <p>Finally, once you have done the above, go to our our <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Directory+of+Volunteers">Directory of Volunteers</a> wiki page and add your 
-information.  Congratulations!  Please send a note to <a href="mailto:ooo-dev@incubator.apache.org?subject=Completed Introduction to Contributing to Apache OpenOffice Module">ooo-dev@incubator.apache.org</a> 
+information.  Congratulations!  Please send a note to <a href="mailto:dev@openoffice.apache.org?subject=Completed Introduction to Contributing to Apache OpenOffice Module">dev@openoffice.apache.org</a> 
 so we know.</p>
 </li>
 </ol>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/pmc-faqs.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/pmc-faqs.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/pmc-faqs.html Sun Nov  4 23:25:17 2012
@@ -129,11 +129,11 @@ contact first, before escalating to Apac
 <p>Each mailing list has one or more moderators.<br />
 </p>
 <ul>
-<li>ooo-dev moderators are Rob Weir, Dave Barton</li>
+<li>dev moderators are Rob Weir, Dave Barton</li>
 <li>ooo-users moderators are Rob Weir, Simon Phipps, Dave Barton</li>
 <li>ooo-qa moderators are Rob Weir,</li>
 <li>ooo-marketing moderators are Rob Weir, Dave Barton</li>
-<li>ooo-private (restricted access) moderators are Rob Weir,</li>
+<li>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>
@@ -222,7 +222,7 @@ rights, such as importing a dump file, <
 <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>
+him (on 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

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 Sun Nov  4 23:25:17 2012
@@ -96,7 +96,7 @@
   
     <h1 class="title">Press Inquiries</h1>
     <h2 id="press-inquiries">Press Inquiries</h2>
-<p>The Apache OpenOffice Project Management Committee welcomes inquiries from the press.  We can be contacted via email at <a href="mailto:ooo-private@incubator.apache.org">ooo-private</a>. </p>
+<p>The Apache OpenOffice Project Management Committee welcomes inquiries from the press.  We can be contacted via email at <a href="mailto:private@openoffice.apache.org">private</a>. </p>
 <p>For members of the media and analyst communities with questions of a broader Apache nature, please contact the 
 <a href="https://www.apache.org/press/">ASF Press Team</a> directly.</p>
   </div>

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 Sun Nov  4 23:25:17 2012
@@ -113,7 +113,7 @@ Many of the common cases are already add
 of ASF marks ("nominative use") are automatically allowed.</p>
 </li>
 <li>
-<p>Email a proposal to <a href="mailto:ooo-private@incubator.apache.org?subject=Trademark">ooo-private@incubator.apache.org</a>.  In the
+<p>Email a proposal to <a href="mailto:private@openoffice.apache.org?subject=Trademark">private@openoffice.apache.org</a>.  In the
 proposal, please include:</p>
 <ol>
 <li>

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 Sun Nov  4 23:25:17 2012
@@ -173,7 +173,7 @@ doing an svn checkout, making changes to
 if you are an "Apache committer", or submitting a "patch" (an svn "diff" file) if you are a contributor but
 not a "committer". Consult your local svn implementation for how to do commits or create
 patches. (See also, the <a href="http://svnbook.red-bean.com/">SVN Book</a> ). Patches can be submitted as attachments to e-mail to the 
-<a href="mailto:ooo-dev@incubator.apache.org">Apache OpenOffice developer</a> list.</p>
+<a href="mailto:dev@openoffice.apache.org">Apache OpenOffice developer</a> list.</p>
 <p>SVN commits will commit your changes to the "staging area". you will need to 
 "publish" your changes to make them active on the "production" site.</p>
 <h3 id="using-the-apache-cms-bookmarklet-simpler-method">Using the Apache CMS Bookmarklet (simpler method)</h3>