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 14:50:05 UTC
svn commit: r782279 - in /websites/production/river: ./ content/river/
Author: sijskes
Date: Fri Jan 7 13:50:04 2011
New Revision: 782279
Log:
Publishing merge to river site by sijskes
Added:
websites/production/river/content/river/concepts.html
- copied unchanged from r782278, websites/staging/river/trunk/content/river/concepts.html
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/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 13:50:04 2011
@@ -1 +1 @@
-/websites/staging/river/trunk:778669-782264
+/websites/staging/river/trunk:778669-782278
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 13:50:04 2011
@@ -80,6 +80,8 @@ and clients. Jini technology can be used
adaptive network systems that are scalable, evolvable
and flexible as typically required in dynamic
computing environments.</p>
+<p>For mere mortals a explanation in simple terms can be found in <a href="concepts.html">concepts</a>.</p>
+<h2 id="disclaimer">Disclaimer</h2>
<p>Apache River is an effort undergoing incubation at
<a href="http://www.apache.org/">The Apache Software Foundation</a>
(ASF), sponsored by the
@@ -116,6 +118,8 @@ by the ASF.</p>
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -110,6 +110,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -210,6 +210,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -109,6 +109,8 @@ intervals.</p>
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -246,6 +246,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -209,6 +209,8 @@ The preferred place of discussion on iss
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -97,6 +97,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -95,6 +95,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -113,6 +113,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -29,7 +29,7 @@
<link href="css/river.css" rel="stylesheet" type="text/css">
-->
- <title>Apache River - </title>
+ <title>Apache River - Discussion - supported versions</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
@@ -49,7 +49,7 @@
</td>
<td>
<div class="title" >
-
+ Discussion - supported versions
</div>
</td>
</tr>
@@ -69,7 +69,37 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<h1 id="supported_jsk_version">Supported JSK Version</h1>
+<h1 id="future_directions">Future directions</h1>
+<p>Discussions are underway on the river-dev mailinglist to determine the support of the different Java versions.
+The requirements collected until now are:</p>
+<table>
+<thead>
+<tr>
+<th>JDK</th>
+<th>Reason</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>1.4</td>
+<td>CDC/BlueRay depends on it.</td>
+</tr>
+<tr>
+<td>5</td>
+<td>RealTime Java (RTJ) depends on it, newer features</td>
+</tr>
+<tr>
+<td>6</td>
+<td>Bug fixes, performance improvements</td>
+</tr>
+</tbody>
+</table>
+<p>Please have a look at the <a href="roadmap.html">Roadmap</a> for the relevant milestones.</p>
+<h2 id="bug_fixes_jdk6">Bug fixes JDK6</h2>
+<ul>
+<li>no Thread.interrupt() classloader corruption</li>
+</ul>
+<h1 id="supported_jdk_version">Supported JDK Version</h1>
<p>There is a discussion on the mailing list (several actually) about which JDKs various parts of River should support. If you have an interested in this then please get involved!</p>
<p>The discussion can be found in the <a href="http://mail-archives.apache.org/mod_mbox/incubator-river-dev/201012.mbox/%3c1293700489.2872.16.camel@Nokia-N900-51-1%3e">mail archive</a>.</p>
<p>The current status of the support versions can be found on the river site; <a href="supported-platforms.html">Supported platforms</a>.</p>
@@ -97,6 +127,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -117,6 +117,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -132,6 +132,8 @@ Older releases, when available, can be o
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -98,6 +98,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -102,6 +102,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -110,6 +110,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -117,6 +117,8 @@ The River graduation is currently under
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -129,6 +129,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -131,6 +131,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -99,6 +99,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -75,11 +75,12 @@
<li><a href="/river/building-river.html">Building River</a></li>
<li><a href="/river/coding.html">Coding conventions</a></li>
<li><a href="/river/committers.html">Committers</a></li>
+<li><a href="/river/concepts.html">River concepts</a></li>
<li><a href="/river/development-process.html">Development Process</a></li>
<li><a href="/river/discussion-futuredirection.html" /></li>
<li><a href="/river/discussion-internet.html">River on the Internet (roti)</a></li>
<li><a href="/river/discussion-jarpackaging.html">River Build Modularisation</a></li>
-<li><a href="/river/discussion-supportedversions.html" /></li>
+<li><a href="/river/discussion-supportedversions.html">Discussion - supported versions</a></li>
<li><a href="/river/documentation.html">Documentation</a></li>
<li><a href="/river/downloads.html">Downloads</a></li>
<li><a href="/river/found-a-bug.html">Found a Bug</a></li>
@@ -122,6 +123,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -144,6 +144,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -169,6 +169,8 @@ Front Office Development Manager, Sucden
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -147,36 +147,8 @@
</table>
<h2 id="testing_framework">Testing framework</h2>
<p>Our current quality assurance (QA) framework only works with JDK6. </p>
-<h1 id="future_directions">Future directions</h1>
-<p>Discussions are underway on the river-dev mailinglist to determine the support of the different Java versions.
-The requirements collected until now are:</p>
-<table>
-<thead>
-<tr>
-<th>JDK</th>
-<th>Reason</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>1.4</td>
-<td>CDC/BlueRay depends on it.</td>
-</tr>
-<tr>
-<td>5</td>
-<td>RealTime Java (RTJ) depends on it, newer features</td>
-</tr>
-<tr>
-<td>6</td>
-<td>Bug fixes, performance improvements</td>
-</tr>
-</tbody>
-</table>
-<p>Please have a look at the <a href="roadmap.html">Roadmap</a> for the relevant milestones.</p>
-<h2 id="bug_fixes_jdk6">Bug fixes JDK6</h2>
-<ul>
-<li>no Thread.interrupt() classloader corruption</li>
-</ul>
+<h1 id="discussion">Discussion</h1>
+<p>The support JDK version is currently under discussion, see <a href="discussion-supportedversions.html">the discussion</a>.</p>
</div>
</td>
<td valign="top">
@@ -201,6 +173,8 @@ The requirements collected until now are
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -217,6 +217,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -237,6 +237,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -104,6 +104,8 @@ The formal interface of a Lookup Service
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -99,6 +99,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>
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 13:50:04 2011
@@ -95,6 +95,8 @@
</ul>
<h3 id="documentation">Documentation</h3>
<ul>
+<li><a href="concepts.html">Concepts</a></li>
+<li><a href="user-guide-basic-river-services.html">Getting started</a></li>
<li><a href="supported-platforms.html">Supported platforms</a></li>
<li><a href="user-guide-glossary.html">Glossary</a></li>
<li><a href="documentation.html">Cookbook</a></li>