Author: sijskes
Date: Wed Jan 12 10:13:49 2011
New Revision: 782880
Log:
Publishing merge to river site by sijskes
Modified:
websites/production/river/ (props changed)
websites/production/river/content/river/discussion-supportedversions.html
Propchange: websites/production/river/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 10:13:49 2011
@@ -1 +1 @@
-/websites/staging/river/trunk:778669-782876
+/websites/staging/river/trunk:778669-782879
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
Wed Jan 12 10:13:49 2011
@@ -70,7 +70,7 @@
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
<h1 id="status_quo">Status Quo</h1>
-<p>Currently river is build with on a Oracle JDK 6,
+<p>Currently river is build with a Oracle JDK 6,
with source level '5' and target level 'jsr14'.</p>
<p>The compilation needs a JDK6 com.sun package.</p>
<h1 id="future_directions">Future directions</h1>
