Return-Path: 
 <ooo-commits-return-70-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A64546222
	for <apmail-incubator-ooo-commits-archive@minotaur.apache.org>;
 Mon, 20 Jun 2011 22:22:31 +0000 (UTC)
Received: (qmail 41611 invoked by uid 500); 20 Jun 2011 22:22:31 -0000
Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org
Received: (qmail 41587 invoked by uid 500); 20 Jun 2011 22:22:31 -0000
Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ooo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ooo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ooo-commits@incubator.apache.org>
List-Id: <ooo-commits.incubator.apache.org>
Reply-To: ooo-dev@incubator.apache.org
Delivered-To: mailing list ooo-commits@incubator.apache.org
Received: (qmail 41580 invoked by uid 99); 20 Jun 2011 22:22:31 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jun 2011 22:22:31 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jun 2011 22:22:28 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2D67623889E2; Mon, 20 Jun 2011 22:22:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r791315 - in /websites/production/openofficeorg: ./
 content/openofficeorg/ content/openofficeorg/docs/
 content/openofficeorg/docs/governance/
Date: Mon, 20 Jun 2011 22:22:06 -0000
To: ooo-commits@incubator.apache.org
From: wave@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110620222207.2D67623889E2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>