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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/build_faq.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/build_faq.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/build_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">
+  
     
     
 
@@ -513,13 +514,19 @@ libvcl644li.so.
 
   </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/faq-asian.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-asian.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-asian.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>Asian FAQ</title>
@@ -30,14 +30,15 @@
 
 <body>
   <div id="banner">
-    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>
-   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
+    <div id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/openofficeorg/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
      
 <h2>FAQs</h2>
@@ -154,13 +155,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/faq-community.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-community.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-community.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>FAQs</h2>
@@ -160,13 +161,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/faq-issuezilla.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-issuezilla.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-issuezilla.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>Issue Tracker (formerly IssueZilla) FAQ</title>
 <meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
@@ -30,14 +30,15 @@
 
 <body>
   <div id="banner">
-    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>
-   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
+    <div id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/openofficeorg/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
      
 <h2>FAQs</h2>
@@ -146,13 +147,19 @@ src="/branding/images/start_blue_bar.gif
 
   </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/faq-licensing.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-licensing.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-licensing.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>Licensing FAQ</title>
@@ -30,14 +30,15 @@
 
 <body>
   <div id="banner">
-    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>
-   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
+    <div id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/openofficeorg/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
 <h2>FAQs<i>
@@ -341,13 +342,19 @@ The new agreement also protects against 
 
   </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/faq-other.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-other.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-other.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>OOo: Other FAQ</title>
@@ -30,14 +30,15 @@
 
 <body>
   <div id="banner">
-    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>
-   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
+    <div id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/openofficeorg/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
 <h2>FAQs</h2>
@@ -184,13 +185,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/faq-overview.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-overview.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-overview.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>FAQ--Overview</title>
@@ -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>FAQs</h2>
@@ -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/FAQs/faq-questions.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-questions.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-questions.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 Project FAQ</title>
@@ -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>Project and Technology FAQ</h2>
@@ -66,13 +67,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/faq-source.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-source.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/faq-source.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>Source &amp; Technology</title>
@@ -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>FAQs</h2>
@@ -257,13 +258,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/fontguide.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/fontguide.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/fontguide.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>Font Trouble Shooting 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">
+  
     
     
 <h2>Font Trouble Shooting Guide</h2>
@@ -273,13 +274,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/license-change.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/license-change.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/license-change.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>License Simplification FAQ</title>
@@ -30,14 +30,15 @@
 
 <body>
   <div id="banner">
-    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>
-   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
+    <div id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/openofficeorg/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and Open Productivity Suite</div>
   </div>
   
-  
-
   <div id="content">
+  
     
     
 <h2>License Simplification FAQ</h2>
@@ -81,13 +82,19 @@ $Revision: 1.5 $
 
   </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/mirrors_faq.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/mirrors_faq.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/www/FAQs/mirrors_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>FAQs</h2>
@@ -201,13 +202,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