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 2011/08/09 02:19:18 UTC

svn commit: r794051 - in /websites/staging/openofficeorg/trunk/content/openofficeorg: ./ docs/ docs/governance/

Author: buildbot
Date: Tue Aug  9 00:19:18 2011
New Revision: 794051

Log:
Staging update by buildbot

Modified:
    websites/staging/openofficeorg/trunk/content/openofficeorg/community-faqs.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/download_process.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/index.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/license.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/people.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/security.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/source.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/community-faqs.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/community-faqs.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/community-faqs.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Community FAQs</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Community FAQs</h1>
+    <h1>Community FAQs</h1>
     
   </div>
 

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 Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Developer FAQs</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Developer FAQs</h1>
+    <h1>Developer FAQs</h1>
     <h3 id="how_do_i_edit_this_website">How do I edit this website?</h3>
 <p>The pages on this website are written in <a href="http://www.simpleeditions.com/59001/markdown-an-introduction">markdown syntax</a> and stored in SVN at 
 <a href="https://svn.apache.org/repos/asf/incubator/ooo/site">https://svn.apache.org/repos/asf/incubator/ooo/site</a></p>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/download_process.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/download_process.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/download_process.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title></title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title"></h1>
+    
     <p>test</p>
   </div>
 

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>How to edit the OpenOffice.org website</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">How to edit the OpenOffice.org website</h1>
+    <h1>How to edit the OpenOffice.org website</h1>
     <p>This documentation shows how to edit the Apache OpenOffice.org
 website. This includes creation of new pages, modification, and deletion - for files
 and sub-directories.</p>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Consensus Building</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Consensus Building</h1>
+    <h1>Consensus Building</h1>
     <p>In some cases there is no obvious path to take, or you might be a new community, 
 or a new member of an existing community. In these cases people will often 
 need to build consensus by making proposals and eliciting responses.</p>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Lazy Consensus</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Lazy Consensus</h1>
+    <h1>Lazy Consensus</h1>
     <p>The concept of "Lazy Consensus" is very important in our project. Lazy
 Consensus means that when you are convinced that you know what the community
 would like to see happen you can simply assume that you already have consensus

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Voting</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Voting</h1>
+    <h1>Voting</h1>
     <p>Occasionally a "feel" for consensus is not enough. Sometimes we need to have a
 measurable consensus. For example, when voting in new committers or to approve a
 release. </p>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Get Involved</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Get Involved</h1>
+    <h1>Get Involved</h1>
     <p>You don't need to be a software developer to contribute to 
 Apache OpenOffice.org. To be successful this project 
 requires a huge range of different skills, levels of involvement and degrees of 

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/index.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/index.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/index.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Apache OpenOffice.org (Incubating)</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Apache OpenOffice.org (Incubating)</h1>
+    <h1>Apache OpenOffice.org (Incubating)</h1>
     <p>Apache OpenOffice.org is comprised of six personal productivity applications: a word processor (and its web-authoring component), 
 spreadsheet, presentation graphics, drawing, equation editor, and database. OpenOffice.org is released on Windows, Solaris, Linux and 
 Macintosh operation systems, with more communities joining, including a mature FreeBSD port. OpenOffice.org is localized, supporting 

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/license.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/license.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/license.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title></title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title"></h1>
+    
     <p>Apache License<br></br>Version 2.0, January 2004<br></br>
 <a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a> </p>
 <p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>

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 Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Mailing Lists</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Mailing Lists</h1>
+    <h1>Mailing Lists</h1>
     <h3 id="openofficeorg_mailing_lists">OpenOffice.org Mailing Lists</h3>
 <p>We welcome you to join our mailing lists and let us know about your thoughts or
 ideas about Apache OpenOffice.org.</p>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/people.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/people.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/people.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Some of our contributors</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Some of our contributors</h1>
+    <h1>Some of our contributors</h1>
     <p>Apache OpenOffice.org (Incubating) is a community developed project. The list below
 is a partial list of contributors to the project, for a complete list you'd have
 to look at all contributors to our issue tracker, mailing list and version control.</p>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>PPMC FAQs</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">PPMC FAQs</h1>
+    <h1>PPMC FAQs</h1>
     <h3 id="what_is_the_ppmc">What is the PPMC?</h3>
 <p>The Podling Project Management Committee (PPMC) is the government of the project. It
 consists of ASF mentors and initial committers. The committee is responsible for the

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Release Process</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Release Process</h1>
+    <h1>Release Process</h1>
     <h3 id="incubator_release_steps">Incubator Release Steps</h3>
 <ol>
 <li>Environment setup for releasing artifacts (same for SNAPSHOTs and releases) -</li>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/security.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/security.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/security.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Security Reports</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Security Reports</h1>
+    <h1>Security Reports</h1>
     <h2 id="reporting_new_security_problems_with_apache_openofficeorg">Reporting New Security Problems with Apache OpenOffice.org</h2>
 <p>The Apache Software Foundation takes a very active stance in eliminating security problems with Apache OpenOffice.org</p>
 <p>We strongly encourage folks to report such problems to our private security mailing list first, before disclosing them in a public forum.</p>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/source.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/source.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/source.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Source Control</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Source Control</h1>
+    <h1>Source Control</h1>
     <p>We use <a href="http://subversion.apache.org">Apache Subversion</a> for version control. You can <a href="http://svn.apache.org/viewvc/incubator/ooo/trunk">browse our 
 repository</a> in your web browser.</p>
 <h2 id="getting_the_source_code">Getting the source code</h2>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Subversion Basics</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Subversion Basics</h1>
+    <h1>Subversion Basics</h1>
     <p>We use <a href="http://subversion.apache.org">Apache Subversion</a> for version control. For a complete reference on Subversion see the <a href="http://svnbook.red-bean.com">Subversion Book</a>. You can <a href="http://svn.apache.org/viewvc/incubator/ooo/trunk">browse our repository</a> in your web browser.</p>
 <p>This page gives instructions on performing basic development tasks using the Subversion Command-Line Client. This instruction assumes you have Apache Subversion installed.</p>
 <ul>

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 Tue Aug  9 00:19:18 2011
@@ -17,61 +17,25 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>Website Development</title>
+  
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
-  <div id="navigation">
-  <h1 id="general">General</h1>
-<ul>
-<li><a href="/openofficeorg/index.html">About</a></li>
-<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator page</a></li>
-<li><a href="/openofficeorg/license.html">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<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="http://support.openoffice.org/">Support</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>
-<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/openofficeorg/source.html">Source Code</a></li>
-<li><a href="/openofficeorg/website-local.html">Website</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Planning Wiki</a></li>
-<li><a href="/openofficeorg/security.html">Security Reports</a></li>
-<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1 id="ppmc">PPMC</h1>
-<ul>
-<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
-</li>
-<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-</ul>
-<h1 id="asf">ASF</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
+  
 
   <div id="content">
-    <h1 class="title">Website Development</h1>
+    <h1>Website Development</h1>
     <p>We use <a href="http://subversion.apache.org">Apache Subversion</a> for version control. You can <a href="http://svn.apache.org/viewvc/incubator/ooo/site/trunk">browse our 
 repository</a> in your web browser.</p>
 <p>Quick editing of the site is available for committers using the Apache CMS