Author: sijskes
Date: Mon Feb 7 20:29:20 2011
New Revision: 784958
Log:
Publishing merge to river site by sijskes
Added:
websites/production/river/content/river/people.html
- copied unchanged from r784957,
websites/staging/river/trunk/content/river/people.html
Removed:
websites/production/river/content/river/committers.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/concepts.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/resources.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 Mon Feb 7 20:29:20 2011
@@ -1 +1 @@
-/websites/staging/river/trunk:778669-784950
+/websites/staging/river/trunk:778669-784957
Modified: websites/production/river/content/river/about.html
==============================================================================
--- websites/production/river/content/river/about.html (original)
+++ websites/production/river/content/river/about.html Mon Feb 7 20:29:20 2011
@@ -129,7 +129,7 @@ computing environments.</p>
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -134,7 +134,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -235,7 +235,7 @@ Currently, River should be built with JD
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
Modified: websites/production/river/content/river/coding.html
==============================================================================
--- websites/production/river/content/river/coding.html (original)
+++ websites/production/river/content/river/coding.html Mon Feb 7 20:29:20 2011
@@ -133,7 +133,7 @@ intervals.</p>
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
Modified: websites/production/river/content/river/concepts.html
==============================================================================
--- websites/production/river/content/river/concepts.html (original)
+++ websites/production/river/content/river/concepts.html Mon Feb 7 20:29:20
2011
@@ -136,7 +136,7 @@ client, registry and class-server.</p>
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -233,7 +233,7 @@ The preferred place of discussion on iss
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon
Feb 7 20:29:20 2011
@@ -121,7 +121,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -119,7 +119,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon
Feb 7 20:29:20 2011
@@ -137,7 +137,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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
Mon Feb 7 20:29:20 2011
@@ -155,7 +155,7 @@ The requirements collected until now are
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
Modified: websites/production/river/content/river/documentation.html
==============================================================================
--- websites/production/river/content/river/documentation.html (original)
+++ websites/production/river/content/river/documentation.html Mon Feb 7
20:29:20 2011
@@ -141,7 +141,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
Modified: websites/production/river/content/river/downloads.html
==============================================================================
--- websites/production/river/content/river/downloads.html (original)
+++ websites/production/river/content/river/downloads.html Mon Feb 7 20:29:20
2011
@@ -156,7 +156,7 @@ Older releases, when available, can be o
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -122,7 +122,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -126,7 +126,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -134,7 +134,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
Modified: websites/production/river/content/river/index.html
==============================================================================
--- websites/production/river/content/river/index.html (original)
+++ websites/production/river/content/river/index.html Mon Feb 7 20:29:20 2011
@@ -174,7 +174,7 @@ The River graduation is currently under
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -153,7 +153,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
Modified: websites/production/river/content/river/resources.html
==============================================================================
--- websites/production/river/content/river/resources.html (original)
+++ websites/production/river/content/river/resources.html Mon Feb 7 20:29:20
2011
@@ -124,7 +124,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
Modified: websites/production/river/content/river/roadmap.html
==============================================================================
--- websites/production/river/content/river/roadmap.html (original)
+++ websites/production/river/content/river/roadmap.html Mon Feb 7 20:29:20
2011
@@ -123,7 +123,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
Modified: websites/production/river/content/river/sitemap.html
==============================================================================
--- websites/production/river/content/river/sitemap.html (original)
+++ websites/production/river/content/river/sitemap.html Mon Feb 7 20:29:20
2011
@@ -76,7 +76,6 @@
<li><a href="/river/building-a-release.html">Building a release</a></li>
<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">Future direction</a></li>
@@ -90,6 +89,7 @@
<li><a href="/river/get-involved.html">Get Involved</a></li>
<li><a href="/river/index.html">Apache River News</a></li>
<li><a href="/river/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/river/people.html">People</a></li>
<li><a href="/river/resources.html">External resources</a></li>
<li><a href="/river/roadmap.html">Roadmap</a></li>
<li><a href="/river/source-code.html">Source Code</a></li>
@@ -147,7 +147,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -168,7 +168,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -193,7 +193,7 @@ Front Office Development Manager, Sucden
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -197,7 +197,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -241,7 +241,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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
Mon Feb 7 20:29:20 2011
@@ -261,7 +261,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon Feb 7
20:29:20 2011
@@ -128,7 +128,7 @@ The formal interface of a Lookup Service
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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
Mon Feb 7 20:29:20 2011
@@ -123,7 +123,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
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 Mon
Feb 7 20:29:20 2011
@@ -119,7 +119,7 @@
</li>
<li><a href="success-stories.html">Success Stories</a></li>
<li><a href="mailing-lists.html">Mailing Lists</a></li>
-<li><a href="committers.html">Committers</a></li>
+<li><a href="people.html">People</a></li>
<li><a href="found-a-bug.html">Found a Bug</a>?</li>
</ul>
<h3 id="development">Development</h3>
