You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by si...@apache.org on 2011/01/07 13:18:04 UTC

svn commit: r782262 - in /websites/production/river: ./ content/river/ content/river/css/

Author: sijskes
Date: Fri Jan  7 12:18:03 2011
New Revision: 782262

Log:
modified page header

Modified:
    websites/production/river/   (props changed)
    websites/production/river/content/river/about.html
    websites/production/river/content/river/building-a-release.html
    websites/production/river/content/river/building-river.html
    websites/production/river/content/river/coding.html
    websites/production/river/content/river/committers.html
    websites/production/river/content/river/css/river.css
    websites/production/river/content/river/css/site.css
    websites/production/river/content/river/css/type-settings.css
    websites/production/river/content/river/development-process.html
    websites/production/river/content/river/discussion-futuredirection.html
    websites/production/river/content/river/discussion-internet.html
    websites/production/river/content/river/discussion-jarpackaging.html
    websites/production/river/content/river/discussion-supportedversions.html
    websites/production/river/content/river/documentation.html
    websites/production/river/content/river/downloads.html
    websites/production/river/content/river/found-a-bug.html
    websites/production/river/content/river/generics-javaspaces.html
    websites/production/river/content/river/get-involved.html
    websites/production/river/content/river/index.html
    websites/production/river/content/river/mailing-lists.html
    websites/production/river/content/river/news.html
    websites/production/river/content/river/roadmap.html
    websites/production/river/content/river/sitemap.html
    websites/production/river/content/river/source-code.html
    websites/production/river/content/river/success-stories.html
    websites/production/river/content/river/supported-platforms.html
    websites/production/river/content/river/testing-categories.html
    websites/production/river/content/river/user-guide-basic-river-services.html
    websites/production/river/content/river/user-guide-glossary.html
    websites/production/river/content/river/user-guide-river-jar-artifacts.html
    websites/production/river/content/river/user-guide-socketfactories.html

Propchange: websites/production/river/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  7 12:18:03 2011
@@ -1 +1 @@
-/websites/staging/river/trunk:778669-782238
+/websites/staging/river/trunk:778669-782261

Modified: websites/production/river/content/river/about.html
==============================================================================
--- websites/production/river/content/river/about.html (original)
+++ websites/production/river/content/river/about.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - About Apache River</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            About Apache River
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/building-a-release.html
==============================================================================
--- websites/production/river/content/river/building-a-release.html (original)
+++ websites/production/river/content/river/building-a-release.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Building a release</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Building a release
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/building-river.html
==============================================================================
--- websites/production/river/content/river/building-river.html (original)
+++ websites/production/river/content/river/building-river.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Building River</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Building River
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/coding.html
==============================================================================
--- websites/production/river/content/river/coding.html (original)
+++ websites/production/river/content/river/coding.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Coding conventions</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Coding conventions
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/committers.html
==============================================================================
--- websites/production/river/content/river/committers.html (original)
+++ websites/production/river/content/river/committers.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Committers</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Committers
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/css/river.css
==============================================================================
--- websites/production/river/content/river/css/river.css (original)
+++ websites/production/river/content/river/css/river.css Fri Jan  7 12:18:03 2011
@@ -5,3 +5,30 @@ div.navigation ul ul {
     padding-left: inherit ;
 }
 
+/*----------------------*/
+/* font specs */
+
+h1, h2, h3, h4, h5, h6, div.title  {
+  font-family: Georgia,'Times New Roman',serif;
+  line-height: normal;
+  font-weight: bold;
+}
+
+.title {
+    color: white ;
+    font-size: 200% ;
+    font-weight: bold ;
+}
+
+/* font specs */
+/*----------------------*/
+
+/*----------------------*/
+/* layout */
+
+.title {
+    margin-left: 40px ;
+}
+
+/* layout */
+/*----------------------*/

Modified: websites/production/river/content/river/css/site.css
==============================================================================
--- websites/production/river/content/river/css/site.css (original)
+++ websites/production/river/content/river/css/site.css Fri Jan  7 12:18:03 2011
@@ -50,7 +50,7 @@ div.copyright_footer {
 /* ====================================================== */
 /*  Rounded Box Styles */
 /* ====================================================== */
-div.white_box div.header_r {height: 18px;}
+/* div.white_box div.header_r {height: 18px;} */
 
 div.white_box div.content   {background: #ffffff; } 
 div.white_box div.content_r {padding-left: 6px; padding-right: 9px;}
@@ -65,7 +65,7 @@ div.black_box div.footer_r {padding-left
 /*  Logo Positioning */
 /* ====================================================== */
 div#header_background{background: #294563; }
-div#river_logo{background: transparent url("../images/river_logo.png") no-repeat center center; height: 60px; }
+/*div#river_logo{background: transparent url("../images/river_logo.png") no-repeat center center; height: 60px; }*/
 div#river_logo{margin-left: 20px; overflow: hidden;}
 div#asf_logo {background: transparent url("../images/asf-logo.png") no-repeat right center; height: 100px; }
 

Modified: websites/production/river/content/river/css/type-settings.css
==============================================================================
--- websites/production/river/content/river/css/type-settings.css (original)
+++ websites/production/river/content/river/css/type-settings.css Fri Jan  7 12:18:03 2011
@@ -474,12 +474,6 @@ div.blogpost div.wiki-content {
 	margin-top: 10px;
 }
 
-h1, h2, h3, h4, h5, h6  {
-  font-family: Georgia,'Times New Roman',serif;
-  line-height: normal;
-  font-weight: bold;
-}
-
 h1 {
   border-bottom: 1px solid #808080;
   padding: 2px;

Modified: websites/production/river/content/river/development-process.html
==============================================================================
--- websites/production/river/content/river/development-process.html (original)
+++ websites/production/river/content/river/development-process.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Development Process</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Development Process
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/discussion-futuredirection.html
==============================================================================
--- websites/production/river/content/river/discussion-futuredirection.html (original)
+++ websites/production/river/content/river/discussion-futuredirection.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - </title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/discussion-internet.html
==============================================================================
--- websites/production/river/content/river/discussion-internet.html (original)
+++ websites/production/river/content/river/discussion-internet.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - River on the Internet (roti)</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            River on the Internet (roti)
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/discussion-jarpackaging.html
==============================================================================
--- websites/production/river/content/river/discussion-jarpackaging.html (original)
+++ websites/production/river/content/river/discussion-jarpackaging.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - River Build Modularisation</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            River Build Modularisation
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/discussion-supportedversions.html
==============================================================================
--- websites/production/river/content/river/discussion-supportedversions.html (original)
+++ websites/production/river/content/river/discussion-supportedversions.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - </title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/documentation.html
==============================================================================
--- websites/production/river/content/river/documentation.html (original)
+++ websites/production/river/content/river/documentation.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Documentation</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Documentation
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/downloads.html
==============================================================================
--- websites/production/river/content/river/downloads.html (original)
+++ websites/production/river/content/river/downloads.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Downloads</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Downloads
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/found-a-bug.html
==============================================================================
--- websites/production/river/content/river/found-a-bug.html (original)
+++ websites/production/river/content/river/found-a-bug.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Found a Bug</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Found a Bug
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/generics-javaspaces.html
==============================================================================
--- websites/production/river/content/river/generics-javaspaces.html (original)
+++ websites/production/river/content/river/generics-javaspaces.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Generics in Java Spaces</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Generics in Java Spaces
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/get-involved.html
==============================================================================
--- websites/production/river/content/river/get-involved.html (original)
+++ websites/production/river/content/river/get-involved.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Get Involved</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Get Involved
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/index.html
==============================================================================
--- websites/production/river/content/river/index.html (original)
+++ websites/production/river/content/river/index.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Index</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Index
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/mailing-lists.html
==============================================================================
--- websites/production/river/content/river/mailing-lists.html (original)
+++ websites/production/river/content/river/mailing-lists.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Mailing Lists</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Mailing Lists
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/news.html
==============================================================================
--- websites/production/river/content/river/news.html (original)
+++ websites/production/river/content/river/news.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - News</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            News
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/roadmap.html
==============================================================================
--- websites/production/river/content/river/roadmap.html (original)
+++ websites/production/river/content/river/roadmap.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Roadmap</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Roadmap
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/sitemap.html
==============================================================================
--- websites/production/river/content/river/sitemap.html (original)
+++ websites/production/river/content/river/sitemap.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - River Sitemap</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            River Sitemap
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/source-code.html
==============================================================================
--- websites/production/river/content/river/source-code.html (original)
+++ websites/production/river/content/river/source-code.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Source Code</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Source Code
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/success-stories.html
==============================================================================
--- websites/production/river/content/river/success-stories.html (original)
+++ websites/production/river/content/river/success-stories.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Success Stories</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Success Stories
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/supported-platforms.html
==============================================================================
--- websites/production/river/content/river/supported-platforms.html (original)
+++ websites/production/river/content/river/supported-platforms.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Supported platforms</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Supported platforms
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/testing-categories.html
==============================================================================
--- websites/production/river/content/river/testing-categories.html (original)
+++ websites/production/river/content/river/testing-categories.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - Test categories</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            Test categories
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/user-guide-basic-river-services.html
==============================================================================
--- websites/production/river/content/river/user-guide-basic-river-services.html (original)
+++ websites/production/river/content/river/user-guide-basic-river-services.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - User Guide - Basic River Services</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            User Guide - Basic River Services
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/user-guide-glossary.html
==============================================================================
--- websites/production/river/content/river/user-guide-glossary.html (original)
+++ websites/production/river/content/river/user-guide-glossary.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - User Guide - Glossary</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            User Guide - Glossary
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/user-guide-river-jar-artifacts.html
==============================================================================
--- websites/production/river/content/river/user-guide-river-jar-artifacts.html (original)
+++ websites/production/river/content/river/user-guide-river-jar-artifacts.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - User Guide - River JAR Artifacts</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            User Guide - River JAR Artifacts
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>

Modified: websites/production/river/content/river/user-guide-socketfactories.html
==============================================================================
--- websites/production/river/content/river/user-guide-socketfactories.html (original)
+++ websites/production/river/content/river/user-guide-socketfactories.html Fri Jan  7 12:18:03 2011
@@ -23,6 +23,12 @@
     <link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
     <link href="/river/css/river.css" rel="stylesheet" type="text/css">
 
+    <!--
+    <link href="css/site.css" rel="stylesheet" type="text/css">
+    <link href="css/type-settings.css" rel="stylesheet" type="text/css">
+    <link href="css/river.css" rel="stylesheet" type="text/css">
+    -->
+
     <title>Apache River - User Guide - SocketFactories</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -30,26 +36,33 @@
 <body>
 <div class="white_box">
 <div class="header">
-  <div class="header_l">
-    <div class="header_r">
+    <div id="header_background">
+        <div id="river_logo">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <a href="/river"><img alt="river logo" src="images/apache_river_v2b_small.png"/></a>
+                        </td>
+                        <td>
+                            <img alt="incubator logo" src="images/apache-incubator-logo.png"/>
+                        </td>
+                        <td>
+                            <div class="title" >
+                            User Guide - SocketFactories
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-  </div>
 </div>
 <div class="content">
   <div class="content_l">
     <div class="content_r">
       <div>
 
-<!-- Banner -->
-                                                                        
-                                                                        
-            <div id="header_background">
-	<div id="river_logo">
-		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/river/images/apache-incubator-logo.png"/>
-
-	</div>
-	</div>
                                     
     <table border="0">
     <tbody>