svn commit: r941861 - in /websites/staging/openoffice/trunk/content: ./ pmc-faqs.html

[bu...@apache.org]

Author: buildbot
Date: Sun Mar  1 23:25:27 2015
New Revision: 941861

Log:
Staging update by buildbot for openoffice

Modified:
    websites/staging/openoffice/trunk/content/   (props changed)
    websites/staging/openoffice/trunk/content/pmc-faqs.html

Propchange: websites/staging/openoffice/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Mar  1 23:25:27 2015
@@ -1 +1 @@
-1661796
+1663178

Modified: websites/staging/openoffice/trunk/content/pmc-faqs.html
==============================================================================
--- websites/staging/openoffice/trunk/content/pmc-faqs.html (original)
+++ websites/staging/openoffice/trunk/content/pmc-faqs.html Sun Mar  1 23:25:27 2015
@@ -108,8 +108,7 @@
 <li><a href="#blog">Blog</a></li>
 <li><a href="#bugzilla">Bugzilla</a></li>
 <li><a href="#svn">SVN</a></li>
-<li><a href="#confluence-wiki">Confluence Wiki</a></li>
-<li><a href="#mediawiki">MediaWiki.</a></li>
+<li><a href="#confluence-mediawiki-and-forums">Confluence, MediaWiki and Forums</a></li>
 <li><a href="#google">Google +</a></li>
 <li><a href="#facebook">Facebook</a></li>
 <li><a href="#twitter">Twitter</a></li>
@@ -132,17 +131,7 @@ subsystems which have admin or similar r
 have a question with one of these systems, these are the people you might want to
 contact first, before escalating to Apache Infrastructure.</p>
 <h2 id="mailing-lists">Mailing lists</h2>
-<p>Each mailing list has one or more moderators.  Here are moderators for some of the Apache OpenOffice lists.</p>
-<ul>
-<li>announce moderators are Rob Weir, Herbert Dürr, Jian Fang Zhang</li>
-<li>commits moderators are Peter Junge, Louis Suárez-Potts</li>
-<li>dev moderators are  Dave Barton, Yong Lin Ma, Ian Lynch</li>
-<li>users moderators are Peter Junge, Dave Barton</li>
-<li>QA moderators are Peter Junge, Ji Yan, Louis Suárez-Potts</li>
-<li>marketing moderators are Dave Barton</li>
-<li>private (restricted access) moderators are Louis Suárez-Potts, Peter Junge</li>
-<li>security (restricted access)with Wolf Halton and Juergen Schmidt as members.  New members can be added by consensus of the PMC</li>
-</ul>
+<p>Each mailing list has one or more moderators. See the <a href="mailing-lists.html">Mailing List page</a> for how to contact a moderator.</p>
 <p>Responsibilities of mailing list moderators include:</p>
 <ul>
 <li>Review messages that have been held for moderation, reject spam posts and
@@ -220,14 +209,9 @@ allow the valid messages through.</li>
 <h2 id="svn">SVN</h2>
 <p>All committers have equal access.  If you need to do something beyond ordinary committ
 rights, such as importing a dump file, <a href="https://issues.apache.org/jira/browse/INFRA">enter a JIRA issue</a> with Apache Infra.</p>
-<h2 id="confluence-wiki">Confluence Wiki</h2>
-<ul>
-<li>OOOUSERS. This wiki is open to anyone with a CWiki account.</li>
-<li>OOODEV. This wiki may only be edited by project committers, PMC, and iCLA signers.</li>
-</ul>
-<p>Admins (Apache id): pescetti, wave (space admin), jeanweber, joes, kschenk, Keith McKenna</p>
-<h2 id="mediawiki">MediaWiki.</h2>
-<p>Admins: (Apache id): jani, imacat, Keith McKenna (account assignment)</p>
+<h2 id="confluence-mediawiki-and-forums">Confluence, MediaWiki and Forums</h2>
+<p>Registered users on any of these services generally have equal access.
+Contact the admins for these services using the links provided for the service.</p>
 <h2 id="google"><a href="https://plus.google.com/s/apache%20Openoffice">Google +</a></h2>
 <p>Admins: Rob Weir, Chao Huang, Don Harbison,  Juergen Schmidt,  Samer Mansour</p>
 <h2 id="facebook"><a href="https://www.facebook.com/ApacheOO">Facebook</a></h2>