Author: sijskes
Date: Tue Nov 23 09:54:02 2010
New Revision: 779575

URL: http://svn.apache.org/viewvc?rev=779575&view=rev
Log:
Publishing merge to river site by sijskes

Modified:
    websites/production/river/   (props changed)
    websites/production/river/content/river/building-river.html
    websites/production/river/content/river/committers.html
    websites/production/river/content/river/css/site.css
    websites/production/river/content/river/development-process.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/get-involved.html
    websites/production/river/content/river/index.html
    websites/production/river/content/river/javadoc.html
    websites/production/river/content/river/mailing-lists.html
    websites/production/river/content/river/news.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/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 Tue Nov 23 09:54:02 2010
@@ -1 +1 @@
-/websites/staging/river/trunk:778669-779534
+/websites/staging/river/trunk:778669-779574

Modified: websites/production/river/content/river/building-river.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/building-river.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/building-river.html (original)
+++ websites/production/river/content/river/building-river.html Tue Nov 23 
09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/committers.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/committers.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/committers.html (original)
+++ websites/production/river/content/river/committers.html Tue Nov 23 09:54:02 
2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/css/site.css
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/css/site.css?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/css/site.css (original)
+++ websites/production/river/content/river/css/site.css Tue Nov 23 09:54:02 
2010
@@ -48,14 +48,14 @@ div.copyright_footer {
 /* ====================================================== */
 /*  Rounded Box Styles */
 /* ====================================================== */
-div.white_box div.header   {background: transparent 
url("../images/white-header-top.png") repeat-x 0pt;}
-div.white_box div.header_l {background: transparent 
url("../images/white-header-left.png") no-repeat 0pt;}
-div.white_box div.header_r {background: transparent 
url("../images/white-header-right.png") no-repeat 100% 0pt;}
+//div.white_box div.header   {background: transparent 
url("../images/white-header-top.png") repeat-x 0pt;}
+//div.white_box div.header_l {background: transparent 
url("../images/white-header-left.png") no-repeat 0pt;}
+//div.white_box div.header_r {background: transparent 
url("../images/white-header-right.png") no-repeat 100% 0pt;}
 div.white_box div.header_r {height: 18px;}
 
 div.white_box div.content   {background: #ffffff; } 
-div.white_box div.content_l {background: transparent 
url("../images/content-left.png") repeat-y 0pt;}
-div.white_box div.content_r {background: transparent 
url("../images/content-right.png") repeat-y 100% 0pt;}
+//div.white_box div.content_l {background: transparent 
url("../images/content-left.png") repeat-y 0pt;}
+//div.white_box div.content_r {background: transparent 
url("../images/content-right.png") repeat-y 100% 0pt;}
 div.white_box div.content_r {padding-left: 6px; padding-right: 9px;}
 
 div.white_box div.footer {background: transparent 
url("../images/white-footer-bottom.png") repeat-x 0pt;}

Modified: websites/production/river/content/river/development-process.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/development-process.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/development-process.html (original)
+++ websites/production/river/content/river/development-process.html Tue Nov 23 
09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/documentation.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/documentation.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/documentation.html (original)
+++ websites/production/river/content/river/documentation.html Tue Nov 23 
09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/downloads.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/downloads.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/downloads.html (original)
+++ websites/production/river/content/river/downloads.html Tue Nov 23 09:54:02 
2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/found-a-bug.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/found-a-bug.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/found-a-bug.html (original)
+++ websites/production/river/content/river/found-a-bug.html Tue Nov 23 
09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/get-involved.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/get-involved.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/get-involved.html (original)
+++ websites/production/river/content/river/get-involved.html Tue Nov 23 
09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/index.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/index.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/index.html (original)
+++ websites/production/river/content/river/index.html Tue Nov 23 09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/javadoc.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/javadoc.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/javadoc.html (original)
+++ websites/production/river/content/river/javadoc.html Tue Nov 23 09:54:02 
2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/mailing-lists.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/mailing-lists.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/mailing-lists.html (original)
+++ websites/production/river/content/river/mailing-lists.html Tue Nov 23 
09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/news.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/news.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/news.html (original)
+++ websites/production/river/content/river/news.html Tue Nov 23 09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/sitemap.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/sitemap.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/sitemap.html (original)
+++ websites/production/river/content/river/sitemap.html Tue Nov 23 09:54:02 
2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/source-code.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/source-code.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/source-code.html (original)
+++ websites/production/river/content/river/source-code.html Tue Nov 23 
09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/success-stories.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/success-stories.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/success-stories.html (original)
+++ websites/production/river/content/river/success-stories.html Tue Nov 23 
09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: 
websites/production/river/content/river/user-guide-basic-river-services.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/user-guide-basic-river-services.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- 
websites/production/river/content/river/user-guide-basic-river-services.html 
(original)
+++ 
websites/production/river/content/river/user-guide-basic-river-services.html 
Tue Nov 23 09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: websites/production/river/content/river/user-guide-glossary.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/user-guide-glossary.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/user-guide-glossary.html (original)
+++ websites/production/river/content/river/user-guide-glossary.html Tue Nov 23 
09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: 
websites/production/river/content/river/user-guide-river-jar-artifacts.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/user-guide-river-jar-artifacts.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/user-guide-river-jar-artifacts.html 
(original)
+++ websites/production/river/content/river/user-guide-river-jar-artifacts.html 
Tue Nov 23 09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>

Modified: 
websites/production/river/content/river/user-guide-socketfactories.html
URL: 
http://svn.apache.org/viewvc/websites/production/river/content/river/user-guide-socketfactories.html?rev=779575&r1=779574&r2=779575&view=diff
==============================================================================
--- websites/production/river/content/river/user-guide-socketfactories.html 
(original)
+++ websites/production/river/content/river/user-guide-socketfactories.html Tue 
Nov 23 09:54:02 2010
@@ -45,7 +45,7 @@
             <div id="header_background">
        <div id="river_logo">
                <a href="/river"><img 
src="/river/images/apache_river_v2b_small.png"/></a>
-<img src="/images/apache-incubator-logo.png"/>
+<img src="/river/images/apache-incubator-logo.png"/>
 
        </div>
        </div>


Reply via email to