You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by wa...@apache.org on 2011/06/21 00:22:06 UTC
svn commit: r791315 - in /websites/production/openofficeorg: ./ content/openofficeorg/ content/openofficeorg/docs/ content/openofficeorg/docs/governance/

Author: wave
Date: Mon Jun 20 22:22:06 2011
New Revision: 791315

Log:
publishing merge

Modified:
    websites/production/openofficeorg/   (props changed)
    websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html
    websites/production/openofficeorg/content/openofficeorg/docs/governance/consensusBuilding.html
    websites/production/openofficeorg/content/openofficeorg/docs/governance/lazyConsensus.html
    websites/production/openofficeorg/content/openofficeorg/docs/governance/voting.html
    websites/production/openofficeorg/content/openofficeorg/get-involved.html
    websites/production/openofficeorg/content/openofficeorg/index.html
    websites/production/openofficeorg/content/openofficeorg/license.html
    websites/production/openofficeorg/content/openofficeorg/mailing-lists.html
    websites/production/openofficeorg/content/openofficeorg/people.html
    websites/production/openofficeorg/content/openofficeorg/release-process.html
    websites/production/openofficeorg/content/openofficeorg/source.html

Propchange: websites/production/openofficeorg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 22:22:06 2011
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-791309
+/websites/staging/openofficeorg/trunk:791146-791314

Modified: websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html Mon Jun 20 22:22:06 2011
@@ -40,11 +40,13 @@
 <ul>
 <li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
 <li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Community Wiki</a></li>
 <li><a href="/openofficeorg/people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
 <li><a href="/openofficeorg/source.html">Source Code</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
 </ul>
 <h1 id="asf">ASF</h1>
 <ul>

Modified: websites/production/openofficeorg/content/openofficeorg/docs/governance/consensusBuilding.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/governance/consensusBuilding.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/governance/consensusBuilding.html Mon Jun 20 22:22:06 2011
@@ -40,11 +40,13 @@
 <ul>
 <li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
 <li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Community Wiki</a></li>
 <li><a href="/openofficeorg/people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
 <li><a href="/openofficeorg/source.html">Source Code</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
 </ul>
 <h1 id="asf">ASF</h1>
 <ul>

Modified: websites/production/openofficeorg/content/openofficeorg/docs/governance/lazyConsensus.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/governance/lazyConsensus.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/governance/lazyConsensus.html Mon Jun 20 22:22:06 2011
@@ -40,11 +40,13 @@
 <ul>
 <li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
 <li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Community Wiki</a></li>
 <li><a href="/openofficeorg/people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
 <li><a href="/openofficeorg/source.html">Source Code</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
 </ul>
 <h1 id="asf">ASF</h1>
 <ul>

Modified: websites/production/openofficeorg/content/openofficeorg/docs/governance/voting.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/governance/voting.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/governance/voting.html Mon Jun 20 22:22:06 2011
@@ -40,11 +40,13 @@
 <ul>
 <li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
 <li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Community Wiki</a></li>
 <li><a href="/openofficeorg/people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
 <li><a href="/openofficeorg/source.html">Source Code</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
 </ul>
 <h1 id="asf">ASF</h1>
 <ul>

Modified: websites/production/openofficeorg/content/openofficeorg/get-involved.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/get-involved.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/get-involved.html Mon Jun 20 22:22:06 2011
@@ -40,11 +40,13 @@
 <ul>
 <li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
 <li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Community Wiki</a></li>
 <li><a href="/openofficeorg/people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
 <li><a href="/openofficeorg/source.html">Source Code</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
 </ul>
 <h1 id="asf">ASF</h1>
 <ul>

Modified: websites/production/openofficeorg/content/openofficeorg/index.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/index.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/index.html Mon Jun 20 22:22:06 2011
@@ -40,11 +40,13 @@
 <ul>
 <li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
 <li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Community Wiki</a></li>
 <li><a href="/openofficeorg/people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
 <li><a href="/openofficeorg/source.html">Source Code</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
 </ul>
 <h1 id="asf">ASF</h1>
 <ul>

Modified: websites/production/openofficeorg/content/openofficeorg/license.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/license.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/license.html Mon Jun 20 22:22:06 2011
@@ -40,11 +40,13 @@
 <ul>
 <li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
 <li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Community Wiki</a></li>
 <li><a href="/openofficeorg/people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
 <li><a href="/openofficeorg/source.html">Source Code</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
 </ul>
 <h1 id="asf">ASF</h1>
 <ul>

Modified: websites/production/openofficeorg/content/openofficeorg/mailing-lists.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/mailing-lists.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/mailing-lists.html Mon Jun 20 22:22:06 2011
@@ -40,11 +40,13 @@
 <ul>
 <li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
 <li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Community Wiki</a></li>
 <li><a href="/openofficeorg/people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
 <li><a href="/openofficeorg/source.html">Source Code</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
 </ul>
 <h1 id="asf">ASF</h1>
 <ul>

Modified: websites/production/openofficeorg/content/openofficeorg/people.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/people.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/people.html Mon Jun 20 22:22:06 2011
@@ -40,11 +40,13 @@
 <ul>
 <li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
 <li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Community Wiki</a></li>
 <li><a href="/openofficeorg/people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
 <li><a href="/openofficeorg/source.html">Source Code</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
 </ul>
 <h1 id="asf">ASF</h1>
 <ul>

Modified: websites/production/openofficeorg/content/openofficeorg/release-process.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/release-process.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/release-process.html Mon Jun 20 22:22:06 2011
@@ -40,11 +40,13 @@
 <ul>
 <li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
 <li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Community Wiki</a></li>
 <li><a href="/openofficeorg/people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
 <li><a href="/openofficeorg/source.html">Source Code</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
 </ul>
 <h1 id="asf">ASF</h1>
 <ul>

Modified: websites/production/openofficeorg/content/openofficeorg/source.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/source.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/source.html Mon Jun 20 22:22:06 2011
@@ -40,11 +40,13 @@
 <ul>
 <li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
 <li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Community Wiki</a></li>
 <li><a href="/openofficeorg/people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
 <li><a href="/openofficeorg/source.html">Source Code</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
 </ul>
 <h1 id="asf">ASF</h1>
 <ul>