You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by wa...@apache.org on 2011/08/21 21:57:29 UTC

svn commit: r794701 [20/27] - in /websites/production/openofficeorg: ./ content/openofficeorg/ content/openofficeorg/css/ content/openofficeorg/docs/ content/openofficeorg/docs/governance/ content/openofficeorg/download/ content/openofficeorg/download/...

Modified: websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight20.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight20.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight20.html Sun Aug 21 19:57:15 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">
+  
     
     
 
@@ -96,13 +97,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/spotlight3.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight3.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight3.html Sun Aug 21 19:57:15 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">
+  
     
     
 
@@ -70,13 +71,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/spotlight4.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight4.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight4.html Sun Aug 21 19:57:15 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">
+  
     
     
 
@@ -91,13 +92,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/spotlight5.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight5.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight5.html Sun Aug 21 19:57:15 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">
+  
     
     
 
@@ -53,13 +54,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/spotlight6.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight6.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight6.html Sun Aug 21 19:57:15 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">
+  
     
     
 <h2> Spotlight: On Developers and Technology</h2><br>
@@ -56,13 +57,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/spotlight7.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight7.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight7.html Sun Aug 21 19:57:15 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">
+  
     
     
 
@@ -50,13 +51,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/spotlight8.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight8.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight8.html Sun Aug 21 19:57:15 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">
+  
     
     
  
@@ -60,13 +61,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/spotlight9.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight9.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlight9.html Sun Aug 21 19:57:15 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">
+  
     
     
 
@@ -67,13 +68,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/spotlightindex.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlightindex.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/spotlightindex.html Sun Aug 21 19:57:15 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">
 
@@ -31,14 +31,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">
+  
     
     
   <h1>OpenOffice.org Newsletters</h1>
@@ -443,13 +444,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/state_of_the_project_year_6.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/state_of_the_project_year_6.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/state_of_the_project_year_6.html Sun Aug 21 19:57:15 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>State of the Project, Year 6</title>
@@ -30,14 +30,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="spaced13">
@@ -106,13 +107,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/testec23July.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/testec23July.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/testec23July.html Sun Aug 21 19:57:15 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">
 
 <title>Anniversary Report</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -30,14 +30,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">
+  
     
     
 <h2> Community Articles: 
@@ -81,13 +82,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/thebuild.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/thebuild.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/thebuild.html Sun Aug 21 19:57:15 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">
 
 <title>The Build</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -30,14 +30,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">
+  
     
     
 <p>
@@ -113,13 +114,24 @@ href="http://www.openoffice.org/www-disc
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/upcoming.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/upcoming.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/upcoming.html Sun Aug 21 19:57:15 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">
+  
     
     
 
@@ -78,13 +79,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/update_spring_2005.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/update_spring_2005.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/update_spring_2005.html Sun Aug 21 19:57:15 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">
 
 <title>Local Works</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -30,14 +30,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">
+  
     
     
 <h2>Updates: Spring 2005</h2>
@@ -106,13 +107,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/volker_quetschke.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/volker_quetschke.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/volker_quetschke.html Sun Aug 21 19:57:15 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">
 
 <title>Spotlight: Volker Quetschke</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -30,14 +30,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">
+  
     
     
 <h2>Spotlight: Volker Quetschke</h2>
@@ -73,13 +74,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/website_designers.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/website_designers.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/website_designers.html Sun Aug 21 19:57:15 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">
 
 <title>Interview: Website Designers</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -30,14 +30,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">
+  
     
     
 <h2>Interview: Website Designers</h2>
@@ -88,13 +89,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/year_five.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/year_five.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/year_five.html Sun Aug 21 19:57:15 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>Year Five</title>
@@ -30,14 +30,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">
+  
     
     
 <h2>OpenOffice.org, Year Five</h2>
@@ -78,13 +79,24 @@ His efforts complement the downloads off
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/year_four.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/year_four.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/year_four.html Sun Aug 21 19:57:15 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">
 
 <title>Year 4</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -30,14 +30,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">
+  
     
     
 <h2>OpenOffice.org: Year 4</h2>
@@ -80,13 +81,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/editorial/year_three.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/editorial/year_three.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/editorial/year_three.html Sun Aug 21 19:57:15 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">
+  
     
     
 <h2>Happy Third Birthday!</h2>
@@ -71,13 +72,24 @@ OpenOffice.org<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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/extensions.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/extensions.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/extensions.html Sun Aug 21 19:57:15 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://extensions.services.openoffice.org/" />
@@ -32,14 +32,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">
+  
     
     
 <p class="Header">Redirecting to <a href="http://extensions.services.openoffice.org/">http://extensions.services.openoffice.org/</a></p>
@@ -49,13 +50,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/extensions/index.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/extensions/index.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/extensions/index.html Sun Aug 21 19:57:15 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://extensions.services.openoffice.org/" />
@@ -32,14 +32,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">
+  
     
     
 <p class="Header">Redirecting to <a href="http://extensions.services.openoffice.org/">http://extensions.services.openoffice.org/</a></p>
@@ -49,13 +50,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/faq.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/faq.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/faq.html Sun Aug 21 19:57:15 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 FAQ</title>
@@ -30,14 +30,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">
+  
     
     
     <h2>FAQ: General Frequently Asked Questions</h2>
@@ -110,13 +111,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/includes/CommunityNewsRightColumn.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/includes/CommunityNewsRightColumn.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/includes/CommunityNewsRightColumn.html Sun Aug 21 19:57:15 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">
+  
     
     
 <div class="www">
@@ -59,13 +60,24 @@ of the site.</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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/index-old.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/index-old.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/index-old.html Sun Aug 21 19:57:15 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 name="verify-v1" content="7/WnCcvax+gnJU1u0eXYQOYtS6zlmE13fsCzq+qnlUs="/>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -88,14 +88,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">
+  
     
     
 
@@ -168,13 +169,24 @@ see the <a href="/news/#move">news secti
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/index.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/index.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/index.html Sun Aug 21 19:57:15 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 name="verify-v1" content="7/WnCcvax+gnJU1u0eXYQOYtS6zlmE13fsCzq+qnlUs="/>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -95,14 +95,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">
+  
     
     
 
@@ -186,13 +187,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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/production/openofficeorg/content/openofficeorg/www/index_new.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/www/index_new.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/www/index_new.html Sun Aug 21 19:57:15 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 name="verify-v1" content="7/WnCcvax+gnJU1u0eXYQOYtS6zlmE13fsCzq+qnlUs="/>
@@ -87,14 +87,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">
+  
     
     
 
@@ -173,13 +174,24 @@
 
   </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>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
       <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 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</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>