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 [7/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/www/about_us/setup_guide.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/setup_guide.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/setup_guide.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">
+  
     
     
 
@@ -349,13 +350,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/about_us/sourcecast_upgrade_notes11.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/sourcecast_upgrade_notes11.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/sourcecast_upgrade_notes11.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">
+  
     
     
 
@@ -179,13 +180,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/about_us/testimonials.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/testimonials.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/testimonials.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 Testimonials</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 Testimonials</h2>
@@ -997,13 +998,19 @@ USA
 
   </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/about_us/whatsnew.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/whatsnew.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/whatsnew.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">
+  
     
     
 
@@ -623,13 +624,19 @@ features of OpenOffice.org, please see t
 
   </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/about_us/year_three.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/year_three.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/year_three.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">
+  
     
     
 <h2>Happy Third Birthday!</h2>
@@ -71,13 +72,19 @@ 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>
-        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/access/index.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/access/index.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/access/index.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="3; URL=http://ui.openoffice.org/accessibility/quickstart.html" />
@@ -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....</p>
@@ -49,13 +50,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/awards/awardpic.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/awards/awardpic.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/awards/awardpic.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">
 
 <title>Untitled Document</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -30,25 +30,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/awards/index.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/awards/index.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/awards/index.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">
+  
     
     
   <h1>OpenOffice.org Awards</h1>
@@ -375,13 +375,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/bugs/bug_writing_guidelines.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/bugs/bug_writing_guidelines.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/bugs/bug_writing_guidelines.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">
+  
     
     
 
@@ -151,13 +152,19 @@ It may be the
 
   </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/bugs/issues.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/bugs/issues.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/bugs/issues.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">
+  
     
     
 
@@ -340,13 +341,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/calendar/april.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/april.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/april.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">
+  
     
     
  
@@ -251,13 +252,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/calendar/august.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/august.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/august.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">
+  
     
     
  
@@ -245,13 +246,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/calendar/dec.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/dec.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/dec.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">
+  
     
     
  
@@ -326,13 +327,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/calendar/february.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/february.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/february.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">
+  
     
     
  
@@ -242,13 +243,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/calendar/index.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/index.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/index.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">
+  
     
     
  
@@ -96,13 +97,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/calendar/january.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/january.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/january.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">
+  
     
     
  
@@ -248,13 +249,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/calendar/july.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/july.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/july.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">
+  
     
     
  
@@ -276,13 +277,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/calendar/june.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/june.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/june.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">
+  
     
     
  
@@ -244,13 +245,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/calendar/march.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/march.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/march.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">
+  
     
     
  
@@ -244,13 +245,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/calendar/may.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/may.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/may.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">
+  
     
     
  
@@ -269,13 +270,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/calendar/nov.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/nov.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/nov.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">
+  
     
     
  
@@ -248,13 +249,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/calendar/oct.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/oct.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/oct.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">
+  
     
     
  
@@ -247,13 +248,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/calendar/sept.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/sept.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/calendar/sept.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">
+  
     
     
  
@@ -276,13 +277,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/contact.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/contact.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/contact.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>Contact OpenOffice.org</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">
+  
     
     
 
@@ -128,13 +129,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/contributing.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/contributing.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/contributing.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">
 
  <title>Contributing to OpenOffice.org</title>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -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">
+  
     
     
 
@@ -64,13 +65,19 @@ $Date: 2005/09/02 14:05:12 $
 
   </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/copyright/copyrightapproved.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/copyright/copyrightapproved.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/copyright/copyrightapproved.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>Copyright Assignment Approved</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">
+  
     
     
 
@@ -2949,13 +2950,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/custom_404.html.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/custom_404.html.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/custom_404.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">
 
   <title>No matches to your request were found</title>
  
@@ -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">
+  
     
     
   <div class="errormessage" id="alerterrormessage">
@@ -65,13 +66,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/dev_docs/features/1.1/features-text.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/dev_docs/features/1.1/features-text.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/dev_docs/features/1.1/features-text.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">
+  
     
     
 <h2>OpenOffice.org 1.1 Features</h2>
@@ -186,13 +187,19 @@ A <a href="index.html">Graphical present
 
   </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/dev_docs/features/1.1/index.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/dev_docs/features/1.1/index.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/dev_docs/features/1.1/index.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/dev_docs/features/2.0/index.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/dev_docs/features/2.0/index.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/dev_docs/features/2.0/index.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/dev_docs/features/3.0/index.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/dev_docs/features/3.0/index.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/dev_docs/features/3.0/index.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 3.0 New Features</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">
+  
     
     
 <h1>OpenOffice.org 3.0 New Features</h1>
@@ -336,13 +337,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/dev_docs/features/3.1/index.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/dev_docs/features/3.1/index.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/dev_docs/features/3.1/index.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" />
 
@@ -38,14 +38,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 3.1 New Features</h1>
@@ -741,13 +742,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/dev_docs/features/3.2/beta.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/dev_docs/features/3.2/beta.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/dev_docs/features/3.2/beta.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" />
 
@@ -43,14 +43,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 3.2 Beta New Features</h1>
@@ -627,13 +628,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>



Mime
View raw message