Author: sijskes
Date: Fri Feb 11 08:38:36 2011
New Revision: 785283
Log:
Publishing merge to river site by sijskes
Modified:
websites/production/river/ (props changed)
websites/production/river/content/about.html
websites/production/river/content/building-a-release.html
websites/production/river/content/building-river.html
websites/production/river/content/coding.html
websites/production/river/content/concepts.html
websites/production/river/content/development-process.html
websites/production/river/content/discussion-futuredirection.html
websites/production/river/content/discussion-internet.html
websites/production/river/content/discussion-jarpackaging.html
websites/production/river/content/discussion-supportedversions.html
websites/production/river/content/documentation.html
websites/production/river/content/downloads.html
websites/production/river/content/found-a-bug.html
websites/production/river/content/generics-javaspaces.html
websites/production/river/content/get-involved.html
websites/production/river/content/index.html
websites/production/river/content/mailing-lists.html
websites/production/river/content/people.html
websites/production/river/content/resources.html
websites/production/river/content/roadmap.html
websites/production/river/content/sitemap.html
websites/production/river/content/source-code.html
websites/production/river/content/success-stories.html
websites/production/river/content/supported-platforms.html
websites/production/river/content/testing-categories.html
websites/production/river/content/user-guide-basic-river-services.html
websites/production/river/content/user-guide-glossary.html
websites/production/river/content/user-guide-river-jar-artifacts.html
websites/production/river/content/user-guide-socketfactories.html
Propchange: websites/production/river/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 11 08:38:36 2011
@@ -1 +1 @@
-/websites/staging/river/trunk:778669-785280
+/websites/staging/river/trunk:778669-785282
Modified: websites/production/river/content/about.html
==============================================================================
--- websites/production/river/content/about.html (original)
+++ websites/production/river/content/about.html Fri Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/building-a-release.html
==============================================================================
--- websites/production/river/content/building-a-release.html (original)
+++ websites/production/river/content/building-a-release.html Fri Feb 11
08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/building-river.html
==============================================================================
--- websites/production/river/content/building-river.html (original)
+++ websites/production/river/content/building-river.html Fri Feb 11 08:38:36
2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/coding.html
==============================================================================
--- websites/production/river/content/coding.html (original)
+++ websites/production/river/content/coding.html Fri Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/concepts.html
==============================================================================
--- websites/production/river/content/concepts.html (original)
+++ websites/production/river/content/concepts.html Fri Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/development-process.html
==============================================================================
--- websites/production/river/content/development-process.html (original)
+++ websites/production/river/content/development-process.html Fri Feb 11
08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/discussion-futuredirection.html
==============================================================================
--- websites/production/river/content/discussion-futuredirection.html (original)
+++ websites/production/river/content/discussion-futuredirection.html Fri Feb
11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/discussion-internet.html
==============================================================================
--- websites/production/river/content/discussion-internet.html (original)
+++ websites/production/river/content/discussion-internet.html Fri Feb 11
08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/discussion-jarpackaging.html
==============================================================================
--- websites/production/river/content/discussion-jarpackaging.html (original)
+++ websites/production/river/content/discussion-jarpackaging.html Fri Feb 11
08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/discussion-supportedversions.html
==============================================================================
--- websites/production/river/content/discussion-supportedversions.html
(original)
+++ websites/production/river/content/discussion-supportedversions.html Fri Feb
11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/documentation.html
==============================================================================
--- websites/production/river/content/documentation.html (original)
+++ websites/production/river/content/documentation.html Fri Feb 11 08:38:36
2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/downloads.html
==============================================================================
--- websites/production/river/content/downloads.html (original)
+++ websites/production/river/content/downloads.html Fri Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/found-a-bug.html
==============================================================================
--- websites/production/river/content/found-a-bug.html (original)
+++ websites/production/river/content/found-a-bug.html Fri Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/generics-javaspaces.html
==============================================================================
--- websites/production/river/content/generics-javaspaces.html (original)
+++ websites/production/river/content/generics-javaspaces.html Fri Feb 11
08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/get-involved.html
==============================================================================
--- websites/production/river/content/get-involved.html (original)
+++ websites/production/river/content/get-involved.html Fri Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/index.html
==============================================================================
--- websites/production/river/content/index.html (original)
+++ websites/production/river/content/index.html Fri Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/mailing-lists.html
==============================================================================
--- websites/production/river/content/mailing-lists.html (original)
+++ websites/production/river/content/mailing-lists.html Fri Feb 11 08:38:36
2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/people.html
==============================================================================
--- websites/production/river/content/people.html (original)
+++ websites/production/river/content/people.html Fri Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/resources.html
==============================================================================
--- websites/production/river/content/resources.html (original)
+++ websites/production/river/content/resources.html Fri Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/roadmap.html
==============================================================================
--- websites/production/river/content/roadmap.html (original)
+++ websites/production/river/content/roadmap.html Fri Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/sitemap.html
==============================================================================
--- websites/production/river/content/sitemap.html (original)
+++ websites/production/river/content/sitemap.html Fri Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/source-code.html
==============================================================================
--- websites/production/river/content/source-code.html (original)
+++ websites/production/river/content/source-code.html Fri Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/success-stories.html
==============================================================================
--- websites/production/river/content/success-stories.html (original)
+++ websites/production/river/content/success-stories.html Fri Feb 11 08:38:36
2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/supported-platforms.html
==============================================================================
--- websites/production/river/content/supported-platforms.html (original)
+++ websites/production/river/content/supported-platforms.html Fri Feb 11
08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/testing-categories.html
==============================================================================
--- websites/production/river/content/testing-categories.html (original)
+++ websites/production/river/content/testing-categories.html Fri Feb 11
08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/user-guide-basic-river-services.html
==============================================================================
--- websites/production/river/content/user-guide-basic-river-services.html
(original)
+++ websites/production/river/content/user-guide-basic-river-services.html Fri
Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/user-guide-glossary.html
==============================================================================
--- websites/production/river/content/user-guide-glossary.html (original)
+++ websites/production/river/content/user-guide-glossary.html Fri Feb 11
08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/user-guide-river-jar-artifacts.html
==============================================================================
--- websites/production/river/content/user-guide-river-jar-artifacts.html
(original)
+++ websites/production/river/content/user-guide-river-jar-artifacts.html Fri
Feb 11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
Modified: websites/production/river/content/user-guide-socketfactories.html
==============================================================================
--- websites/production/river/content/user-guide-socketfactories.html (original)
+++ websites/production/river/content/user-guide-socketfactories.html Fri Feb
11 08:38:36 2011
@@ -19,9 +19,9 @@
limitations under the License.
-->
- <link href="/river/css/site.css" rel="stylesheet" type="text/css">
- <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">
<!--
<link href="css/site.css" rel="stylesheet" type="text/css">
