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 [6/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/FAQs/mostfaqs.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/mostfaqs.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/mostfaqs.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>Most Frequently Asked Questions</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> FAQs</h2>
@@ -155,13 +156,19 @@
 
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/ms-access/ms-access.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/ms-access/ms-access.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/ms-access/ms-access.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">
+  
     
     
 <h1>HOW-TO use Microsoft Access databases from within
@@ -144,13 +145,19 @@ align="left" width="642" height="482" bo
 
   </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.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about.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>About Us: OpenOffice.org</title>
   <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">
+  
     
     
 
@@ -50,13 +51,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/1.1press_release.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/1.1press_release.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/1.1press_release.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">
+  
     
     
 
@@ -416,13 +417,19 @@ of Sun's Java access bridge available fr
 
   </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/1.1press_releaseb.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/1.1press_releaseb.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/1.1press_releaseb.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">
+  
     
     
 
@@ -416,13 +417,19 @@ of Sun's Java access bridge available fr
 
   </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/2.0beta_press_release.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/2.0beta_press_release.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/2.0beta_press_release.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 2.0 Beta Announcement</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">
+  
     
     
 
@@ -93,13 +94,19 @@ jpmcc@openoffice.org<br>
 
   </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/OEM_and_CD.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/OEM_and_CD.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/OEM_and_CD.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 - Distribution and Linking</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">
+  
     
     
 
@@ -231,13 +232,19 @@ form provided in 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/about_us/accomplishments.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/accomplishments.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/accomplishments.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>Accomplishments: Year One</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">
+  
     
     
 
@@ -166,13 +167,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/background.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/background.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/background.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">
+  
     
     
 <b>Background</b>
@@ -56,13 +57,19 @@ environments.
 
   </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/birthday.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/birthday.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/birthday.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>First Birthday</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>Birthday Page </h2>
@@ -72,13 +73,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/birthday2.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/birthday2.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/birthday2.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>Second Birthday</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>Anniversary Page </h2>
@@ -68,13 +69,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/birthday3.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/birthday3.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/birthday3.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>Third Birthday</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">
+  
     
     
 
@@ -80,13 +81,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/birthday4.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/birthday4.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/birthday4.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>Fourth Birthday</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 Is Four</h2>
@@ -57,13 +58,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/configuration_guide.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/configuration_guide.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/configuration_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">
 <title>OpenOffice.org Application Configuration Guide</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">
+  
     
     
 
@@ -350,13 +351,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/governance.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/governance.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/governance.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>Governance</h2><BR><BR>
@@ -48,13 +49,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/introduction.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/introduction.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/introduction.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 Introduction</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: An Introduction for those wanting to join</h2>
@@ -144,13 +145,19 @@ $Revision: 1.48 $
 
   </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/members.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/members.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/members.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">
+  
     
     
 
@@ -74,13 +75,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/milestones.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/milestones.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/milestones.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 History and Milestones</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><a name="top"></a>OpenOffice.org History and Milestones 1999 - 2005</h2>
@@ -259,13 +260,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/new.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/new.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/new.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>New to 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">
+  
     
     
 <h2> <a name="00" id="00"></a>Welcome to OpenOffice.org</h2>
@@ -81,13 +82,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/numbering_proposal.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/numbering_proposal.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/numbering_proposal.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>Proposal Regarding The OpenOffice.org Numbering Scheme</h2>
@@ -114,13 +115,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/ooo_release.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/ooo_release.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/ooo_release.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/about_us/osx112_pressrelease.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/osx112_pressrelease.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/osx112_pressrelease.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>Press Release: OpenOffice.org 1.1.2 for Mac OS X (X11)</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">
+  
     
     

 
@@ -46,13 +47,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/osx11_pressrelease.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/osx11_pressrelease.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/osx11_pressrelease.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">
+  
     
     
 <div class="Acta1">
@@ -106,13 +107,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/osx_pressrelease.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/osx_pressrelease.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/osx_pressrelease.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">
+  
     
     
 <h3>DEVELOPER RELEASE OF THE OPENOFFICE.ORG OFFICE SUITE FOR MAC OS X NOW AVAILABLE 
@@ -118,13 +119,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/pdl_jca_announce.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/pdl_jca_announce.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/pdl_jca_announce.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>The New License and New Joint Copyright Assignment</h2>
@@ -98,13 +99,19 @@ OpenOffice.org
 
   </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/people/along.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/people/along.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/people/along.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">
+  
     
     
 <p class="Header">About Anthony Long</p>
@@ -48,13 +49,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/press_faq.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/press_faq.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/press_faq.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.0 Media FAQ</h2>
@@ -372,13 +373,19 @@ Microsystems, Inc. in the United States 
 
   </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/pressfaq_ooo-osx.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/pressfaq_ooo-osx.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/pressfaq_ooo-osx.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">
+  
     
     
 
@@ -281,13 +282,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/pressfaq_ooo-osx11.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/pressfaq_ooo-osx11.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/pressfaq_ooo-osx11.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">
+  
     
     
 
@@ -266,13 +267,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/pressfaq_ooo-osx112.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/pressfaq_ooo-osx112.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/pressfaq_ooo-osx112.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>Press FAQ Mac OS X Port 1.1.2</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='Acta1'>
@@ -222,13 +223,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/protocols_proposing.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/protocols_proposing.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/protocols_proposing.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>Protocols for Project Proposal</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>Protocols for Project Proposal</h2>
@@ -123,13 +124,19 @@ for review;
 
   </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/quotes.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/quotes.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/about_us/quotes.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">
+  
     
     
 
@@ -196,13 +197,19 @@ CIO of ReelAmerica, Inc.
 
   </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