incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r794698 [4/23] - in /websites/staging/openofficeorg/trunk/content/openofficeorg: ./ css/ docs/ docs/governance/ download/ download/2.4.3/ download/common/ download/md5sums/ download/next/ download/next/md5sums/ download/sdk/ download/source...
Date Sun, 21 Aug 2011 19:30:59 GMT
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/download/test/test_mla.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/download/test/test_mla.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/download/test/test_mla.html Sun Aug 21 19:30:45 2011
@@ -19,8 +19,8 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
-<link href="/openofficeorg/css/ooohtml.css" rel="stylesheet" type="text/css">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <title>OpenOffice.org - Download</title>
@@ -42,14 +42,15 @@
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
 
@@ -152,13 +153,19 @@
 
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/download/test/test_single_table_mla.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/download/test/test_single_table_mla.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/download/test/test_single_table_mla.html Sun Aug 21 19:30:45 2011
@@ -19,8 +19,8 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
-<link href="/openofficeorg/css/ooohtml.css" rel="stylesheet" type="text/css">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <title>OpenOffice.org - Download</title>
@@ -42,14 +42,15 @@
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
 
@@ -150,13 +151,19 @@
 
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

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 Sun Aug 21 19:30:45 2011
@@ -19,23 +19,23 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title>Get Involved</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-  <div id="navigation">
+  <div id="sidenav">
     <h1 id="general">General</h1>
 <ul>
 <li><a href="/openofficeorg/index.html">About</a></li>
@@ -71,13 +71,9 @@
 <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="contenta">
   
-
-  <div id="content">
     <h1 class="title">Get Involved</h1>
     <p>You don't need to be a software developer to contribute to 
 Apache OpenOffice.org. To be successful this project 
@@ -133,13 +129,19 @@ have a measurable consensus. For example
 to approve a release. </p>
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Added: websites/staging/openofficeorg/trunk/content/openofficeorg/images/feather-small.gif
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/openofficeorg/trunk/content/openofficeorg/images/feather-small.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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 Sun Aug 21 19:30:45 2011
@@ -19,23 +19,23 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title>Apache OpenOffice.org (Incubating)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-  <div id="navigation">
+  <div id="sidenav">
     <h1 id="general">General</h1>
 <ul>
 <li><a href="/openofficeorg/index.html">About</a></li>
@@ -71,13 +71,9 @@
 <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="contenta">
   
-
-  <div id="content">
     <h1 class="title">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 
@@ -89,13 +85,19 @@ The project website has also just come t
 <p><a href="http://www.openoffice.org">http://www.openoffice.org</a></p>
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

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 Sun Aug 21 19:30:45 2011
@@ -19,23 +19,23 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title></title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-  <div id="navigation">
+  <div id="sidenav">
     <h1 id="general">General</h1>
 <ul>
 <li><a href="/openofficeorg/index.html">About</a></li>
@@ -71,13 +71,9 @@
 <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="contenta">
   
-
-  <div id="content">
     
     <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>
@@ -257,13 +253,19 @@ identification within third-party archiv
 </pre></div>
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html Sun Aug 21 19:30:45 2011
@@ -19,23 +19,23 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title>Mailing Lists</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-  <div id="navigation">
+  <div id="sidenav">
     <h1 id="general">General</h1>
 <ul>
 <li><a href="/openofficeorg/index.html">About</a></li>
@@ -71,13 +71,9 @@
 <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="contenta">
   
-
-  <div id="content">
     <h1 class="title">Mailing Lists</h1>
     <h2 id="openofficeorg_mailing_lists">OpenOffice.org Mailing Lists</h2>
 <p>We welcome you to join our mailing lists and let us know about your thoughts or
@@ -135,13 +131,19 @@ OpenOffice.org code and documentation.  
 </ul>
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

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 Sun Aug 21 19:30:45 2011
@@ -19,23 +19,23 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title>Some of our contributors</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-  <div id="navigation">
+  <div id="sidenav">
     <h1 id="general">General</h1>
 <ul>
 <li><a href="/openofficeorg/index.html">About</a></li>
@@ -71,13 +71,9 @@
 <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="contenta">
   
-
-  <div id="content">
     <h1 class="title">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
@@ -300,13 +296,19 @@ to look at all contributors to our issue
 </table>
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

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 Sun Aug 21 19:30:45 2011
@@ -19,23 +19,23 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title>PPMC FAQs</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-  <div id="navigation">
+  <div id="sidenav">
     <h1 id="general">General</h1>
 <ul>
 <li><a href="/openofficeorg/index.html">About</a></li>
@@ -71,13 +71,9 @@
 <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="contenta">
   
-
-  <div id="content">
     <h1 class="title">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
@@ -173,13 +169,19 @@ that means also to count the votes and p
 <br> (<a href="http://incubator.apache.org/openofficeorg/docs/governance/voting.html">see here for more information</a>)</p>
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

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 Sun Aug 21 19:30:45 2011
@@ -19,23 +19,23 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title>Release Process</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-  <div id="navigation">
+  <div id="sidenav">
     <h1 id="general">General</h1>
 <ul>
 <li><a href="/openofficeorg/index.html">About</a></li>
@@ -71,13 +71,9 @@
 <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="contenta">
   
-
-  <div id="content">
     <h1 class="title">Release Process</h1>
     <h3 id="incubator_release_steps">Incubator Release Steps</h3>
 <ol>
@@ -335,13 +331,19 @@
 gpg: Signature made ...</p>
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

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 Sun Aug 21 19:30:45 2011
@@ -19,23 +19,23 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title>Security Reports</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-  <div id="navigation">
+  <div id="sidenav">
     <h1 id="general">General</h1>
 <ul>
 <li><a href="/openofficeorg/index.html">About</a></li>
@@ -71,13 +71,9 @@
 <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="contenta">
   
-
-  <div id="content">
     <h1 class="title">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>
@@ -98,13 +94,19 @@ does not relate to an undisclosed securi
 <p>Please note that security bulletins of the pre-Apache OpenOffice.org project are archived <a href="http://www.openoffice.org/security/bulletin.html">at that site</a>.</p>
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

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 Sun Aug 21 19:30:45 2011
@@ -19,23 +19,23 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title>Source Control</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-  <div id="navigation">
+  <div id="sidenav">
     <h1 id="general">General</h1>
 <ul>
 <li><a href="/openofficeorg/index.html">About</a></li>
@@ -71,13 +71,9 @@
 <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="contenta">
   
-
-  <div id="content">
     <h1 class="title">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>
@@ -93,13 +89,19 @@ repository</a> in your web browser.</p>
 <p>For further information see the <a href="http://www.apache.org/dev/version-control.html">Apache Source Code Repository</a> page.</p>
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

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 Sun Aug 21 19:30:45 2011
@@ -19,23 +19,23 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title>Subversion Basics</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-  <div id="navigation">
+  <div id="sidenav">
     <h1 id="general">General</h1>
 <ul>
 <li><a href="/openofficeorg/index.html">About</a></li>
@@ -71,13 +71,9 @@
 <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="contenta">
   
-
-  <div id="content">
     <h1 class="title">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>
@@ -309,13 +305,19 @@ Select: (p) postpone, (df) diff-full, (e
 </ul>
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Added: websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html (added)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html Sun Aug 21 19:30:45 2011
@@ -0,0 +1,143 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    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>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+</head>
+
+<body>
+  <div id="banner">
+    <div id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
+  </div>
+  
+  <div id="sidenav">
+    <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>
+  </div>
+  <div id="contenta">
+  
+    
+    <p>Terms of Use for Apache Incubator project openoffice.org web site.</p>
+<ol>
+<li>
+<p>INTRODUCTION. This Site and its contents are made available by Apache Software Foundation, incubator project OpenOffice.org podling project management committee (AOO-PPMC). These Terms of Use apply to everyone who Uses this Site (as defined below), or who participates in any projects hosted on this Site. PLEASE READ THESE TERMS CAREFULLY FIRST. BY USING THE SITE OR PARTICIPATING IN ANY PROJECTS, YOU ACKNOWLEDGE THAT YOU HAVE READ THE TERMS AND AGREE TO THEM. IF YOU DO NOT WISH TO BE BOUND BY THE TERMS, THEN DO NOT USE THE SITE OR PARTICIPATE IN ANY PROJECTS HOSTED ON THIS SITE.</p>
+</li>
+<li>
+<p>DEFINITIONS. As used here: 
+a. "Host" means AOO-PPMC. 
+b. "Materials" means source code, code samples, object code, technical materials, documentation , discussion thread postings, weblogs, wikis, data, and any other content, information or technology available on the Site. 
+c. "Project" means a project hosted on the Site. 
+d. "Site" means the collection of web pages that can be accessed via this website, as well as any successor web pages or other technology as may be designated by the Host. 
+e. "Submissions" means any Materials submitted to the Site, including all Projects. 
+f. "Terms" means these Terms of Use. 
+g. "Use" and its variants are meant in their broadest sense, including, but not limited to, the acts of using, accessing, receiving, browsing, downloading from, and uploading to. A "User" is a person or entity who Uses the Site. 
+h. "You" means you personally, as well as the person or entity on whose behalf you are Using the Site.</p>
+</li>
+<li>
+<p>ACCESS TO THE SITE AND THINGS YOU FIND HERE. This section refers to the Materials found on the Site, as defined above. 
+a. Other Licenses/Terms. Some of the Materials may be accompanied by their own licenses or terms of use. With respect to Your rights in and obligations regarding such Materials, and to the extent there is a conflict, those licenses or terms of use take precedence over these Terms, and you agree to be bound accordingly. With respect to any other matters, including but not limited to Your Use of this Site, submission of Materials hereto, and obligations to the Host, these Terms take precedence over any conflicting terms.</p>
+</li>
+</ol>
+<p>b. Use at Your Own Risk. You understand that the Host does not pre-screen Materials, and You agree to assume all risks in Using them. These risks include, but are not limited to, errors, viruses, worms, time-limited software that expires without notice, and the possibility that the Materials infringe or misappropriate the intellectual property rights of others. You agree to assume all such risks.</p>
+<p>c. Don't Blame the Messenger. You understand that Materials may contain the opinions of others and You do not hold the Host responsible for such opinions.</p>
+<p>d. Copyright Infringement. If You believe that any Materials infringe Your copyrights, please follow the procedure set forth at Apache Software Foundation legal affairs website: http://apache.org/legal/.</p>
+<p>e. Management of Materials and Access. You agree that the Host has sole discretion in deciding whether to accept and post Materials, and that the Host may delete Materials for any reason (including no reason) whatsoever. You understand that access to the Site may be limited for technical reasons, that outages may occur, and that the Host has no obligation to store or back up any Materials. You agree that the Host has the right to restrict or terminate, in their sole discretion, access to the Site for any reason, including their belief that a User has violated these Terms.</p>
+<p>f. Links to Other Sites. You understand that this Site may provide links to other sites or content that is not hosted or managed by the Host, and you agree that the Host has no control over, responsibility or liability whatsoever relating to any such sites or content, including Your Use of them.</p>
+<ol>
+<li>THINGS YOU SUBMIT TO THE SITE. This Site offers many opportunities for You to contribute Materials to the on this site. In addition to the other terms found here, the following terms apply to any Submissions made by You ("Your Submissions").</li>
+</ol>
+<p>a. You Take Responsibility for Your Submissions. You warrant that You have all rights needed to provide Your Submissions to the Host for posting to the Site in accordance with the Terms and to grant the licenses set forth in sections 4.b and 4.c. You agree that You will make all reasonable efforts to ensure that Your Submissions:  do not infringe, misappropriate or violate the intellectual property rights or privacy interests of others; (ii) are not confidential or trade secret information, or subject to anyone's privacy interests; (iii) are not inaccurate, harmful, obscene, pornographic, defamatory, racist, or otherwise objectionable to a reasonable User; and (iv) do not violate any law, ordinance, or regulation of any country, state or locality. YOU AGREE THAT YOU, AND NOT THE HOST, ARE FULLY RESPONSIBLE FOR YOUR SUBMISSIONS AND THAT YOU, AND NOT THE HOST, ARE LIABLE FOR ANY AND ALL CLAIMS ARISING OUT OF THEM.</p>
+<p>b. Source Code Submissions. You agree that any source code You contribute to a Project will be submitted under, and subject to, the license posted for that Project. If no license is posted, You agree that Your Submission will be governed by the Apache License, Version 2.0, which terms can be found at http://opensource.org/licenses/apache2.0.php. You acknowledge that You are responsible for including all applicable copyright notices and licenses with Your Submissions, and that You assume the risks of failing to do so, including the potential loss of Your rights to Your Submissions.</p>
+<p>c. Other Submissions. (This Section 4.c applies to all Submissions other than source code contributed to a Project, which is governed by the preceding section.) The Host does not claim ownership of Your Submissions. However, in order to fulfill the purposes of this Site, You must give the Host and all Users the right to post, access, evaluate, discuss, and refine Your Submissions. In legalese: You hereby grant to the Host and all Users a royalty-free, perpetual, irrevocable, worldwide, non-exclusive and fully sub-licensable right and license under Your intellectual property rights to reproduce, modify, adapt, publish, translate, create derivative works from, distribute, perform, display and use Your Submissions (in whole or part) and to incorporate them in other works in any form, media, or technology now known or later developed, all subject to the obligation to retain any copyright notices included in Your Submissions. All Users, the Host, and their sublicensees are res
 ponsible for any modifications they make to the Submissions of others.</p>
+<p>d. Private Projects. With respect to a Project that is designated as "Private," the preceding license for "Other Submissions" is limited to Users who have access to the Project, and such rights may only be sublicensed to other Users with authorized access to the Project.</p>
+<p>e. Other Licenses/Terms. Some Projects are governed by their own terms regarding Submissions and may require You to sign agreements (such as an Apache Software Foundation Individual Contributor License Agreement) licensing Your rights in Your Submissions. In all such cases, and to the extent there is a conflict, the terms of those Projects and agreements take precedence over these Terms.</p>
+<p>f. Privacy. You consent to the collection, processing and storage by the Host of any personal information provided by You in accordance with the terms of AOO-PPMC Privacy Policy, which is available at http://incubator.apache.org/openoffice.org/privacy.html. You agree to comply with all applicable laws and regulations, and the terms of Apache OpenOffice.org Privacy Policy, with respect to any use by You of any personal information in connection with this Site.</p>
+<ol>
+<li>MISCELLANEOUS.</li>
+</ol>
+<p>a. Disclaimer of Warranties. YOUR USE OF THE SITE IS AT YOUR SOLE RISK. THE SITE, INCLUDING ALL MATERIALS FOUND ON IT, IS PROVIDED ON AN "AS IS," "AS AVAILABLE" AND "WITH ALL FAULTS" BASIS. THE HOST DISCLAIMS ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS, AND WARRANTIES OF ANY KIND, INCLUDING ANY IMPLIED WARRANTY OR CONDITION OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. THE HOST MAKES NO REPRESENTATIONS, WARRANTIES, CONDITIONS OR GUARANTEES AS TO THE USEFULNESS QUALITY, SUITABILITY, TRUTH, ACCURACY OR COMPLETENESS OF THE SITE. YOU AGREE TO ASSUME ALL RISK OF LOSS OR LIABILITY FOR THE USE OF THIS SITE OR ANY MATERIALS ON IT.</p>
+<p>b. Limitation of Liability. TO THE FULLEST EXTENT PERMITTED BY LAW, THE HOST IS NOT LIABLE FOR ANY DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR EXEMPLARY DAMAGES (INCLUDING, WITHOUT LIMITATION, LOSS OF BUSINESS, REVENUE, PROFITS, GOODWILL, USE, DATA, ELECTRONICALLY TRANSMITTED ORDERS, OR OTHER ECONOMIC ADVANTAGE) ARISING OUT OF OR IN CONNECTION WITH THE SITE OR MATERIALS, EVEN IF THE HOST HAS PREVIOUSLY BEEN ADVISED OF, OR REASONABLY COULD HAVE FORESEEN, THE POSSIBILITY OF SUCH DAMAGES, HOWEVER THEY ARISE, WHETHER IN BREACH OF CONTRACT OR IN TORT (INCLUDING NEGLIGENCE). TO THE EXTENT THAT ANY JURISDICTION DOES NOT ALLOW THE EXCLUSION OR LIMITATION OF DIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES, PORTIONS OF THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY.</p>
+<p>c. Trademarks. All logos and trademarks contained on this Site are and remain the property of their respective owners. No licenses or other rights in or to such logos and/or trademarks are granted to You by these Terms.</p>
+<p>d. Changes to Terms. These Terms may be changed or updated by the Host without notice.</p>
+<p>e. Export Compliance. You agree that U.S. export control laws and other applicable export and import laws govern your Submissions and use of the Site, Materials and Submissions, including technical data; additional information can be found on http://apache.org/dev/crypto.html. You agree that neither the Materials and Submissions nor any direct product thereof will be exported, directly, or indirectly, in violation of these laws, or will be used for any purpose prohibited by these laws including, without limitation, nuclear, chemical, or biological weapons proliferation.</p>
+<p>f. Governing Law. These Terms of Use are governed by the substantive and procedural laws of Delaware.</p>
+<p>g. General. You agree that these Terms of Use are the complete agreement for the Site, Materials and Submissions, and these Terms of Use supersedes all prior or contemporaneous agreements or representations. If any term of these Terms of Use is found to be invalid or unenforceable, the remaining provisions will remain effective</p>
+  </div>
+
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
+      <p>
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html Sun Aug 21 19:30:45 2011
@@ -19,23 +19,23 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title>Website Development</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-  <div id="navigation">
+  <div id="sidenav">
     <h1 id="general">General</h1>
 <ul>
 <li><a href="/openofficeorg/index.html">About</a></li>
@@ -71,13 +71,9 @@
 <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="contenta">
   
-
-  <div id="content">
     <h1 class="title">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>
@@ -177,13 +173,19 @@ See <a href="docs/edit-cms.html">How to 
 <p>For further information see the <a href="http://www.apache.org/dev/version-control.html">Apache Source Code Repository</a> page.</p>
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/www/CommunityNewsRightColumn.html.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/CommunityNewsRightColumn.html.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/CommunityNewsRightColumn.html.html Sun Aug 21 19:30:45 2011
@@ -19,35 +19,41 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title></title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/www/DomainFAQ.html.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/DomainFAQ.html.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/DomainFAQ.html.html Sun Aug 21 19:30:45 2011
@@ -19,8 +19,8 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
-<link href="/openofficeorg/css/ooohtml.css" rel="stylesheet" type="text/css">
 
 <style type="text/css">
 /* <![CDATA[ */ @import "/branding/css/tigris.css"; /* ]]> */
@@ -35,25 +35,32 @@
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/www/DomainFeedback.html.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/DomainFeedback.html.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/DomainFeedback.html.html Sun Aug 21 19:30:45 2011
@@ -19,8 +19,8 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
-<link href="/openofficeorg/css/ooohtml.css" rel="stylesheet" type="text/css">
 
 <style type="text/css">
 /* <![CDATA[ */ @import "/branding/css/tigris.css"; /* ]]> */
@@ -35,25 +35,32 @@
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/www/DomainHome.html.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/DomainHome.html.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/DomainHome.html.html Sun Aug 21 19:30:45 2011
@@ -19,8 +19,8 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
-<link href="/openofficeorg/css/ooohtml.css" rel="stylesheet" type="text/css">
 
 <meta http-equiv="refresh" content="0; URL=http://www.openoffice.org/index.html" />
 <style type="text/css" media="screen, projection">
@@ -37,14 +37,15 @@
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
 <div class="contentpart" id="spotlight">
@@ -155,13 +156,19 @@
 
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/www/DomainTermsOfUse.html.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/DomainTermsOfUse.html.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/DomainTermsOfUse.html.html Sun Aug 21 19:30:45 2011
@@ -19,8 +19,8 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
-<link href="/openofficeorg/css/ooohtml.css" rel="stylesheet" type="text/css">
 
 <meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 
@@ -29,14 +29,15 @@
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
 <!-- This is where the client can add their own terms of use for this domain -->
@@ -44,13 +45,19 @@
 
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/a.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/a.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/a.html Sun Aug 21 19:30:45 2011
@@ -19,24 +19,24 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title></title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
 <!-- This page is created by an automated process -->
@@ -100,13 +100,19 @@ We welcome <a href="mailto:siteindex@ope
 
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/b.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/b.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/b.html Sun Aug 21 19:30:45 2011
@@ -19,24 +19,24 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title></title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
 <!-- This page is created by an automated process -->
@@ -102,13 +102,19 @@ We welcome <a href="mailto:siteindex@ope
 
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/c.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/c.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/c.html Sun Aug 21 19:30:45 2011
@@ -19,24 +19,24 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title></title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
 <!-- This page is created by an automated process -->
@@ -101,13 +101,19 @@ We welcome <a href="mailto:siteindex@ope
 
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/d.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/d.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/d.html Sun Aug 21 19:30:45 2011
@@ -19,24 +19,24 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title></title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
 <!-- This page is created by an automated process -->
@@ -103,13 +103,19 @@ We welcome <a href="mailto:siteindex@ope
 
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/e.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/e.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/EN/e.html Sun Aug 21 19:30:45 2011
@@ -19,24 +19,24 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 <title></title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
 </head>
 
 <body>
   <div id="banner">
-    <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 id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><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="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
 <!-- This page is created by an automated process -->
@@ -94,13 +94,19 @@ We welcome <a href="mailto:siteindex@ope
 
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>



Mime
View raw message