svn commit: r986280 - in /websites/staging/sis/trunk/content: ./ branches.html

[buildbot]

Author: buildbot
Date: Thu Apr 21 20:55:12 2016
New Revision: 986280

Log:
Staging update by buildbot for sis

Modified:
    websites/staging/sis/trunk/content/   (props changed)
    websites/staging/sis/trunk/content/branches.html

Propchange: websites/staging/sis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Apr 21 20:55:12 2016
@@ -1 +1 @@
-1740407
+1740409

Modified: websites/staging/sis/trunk/content/branches.html
==============================================================================
--- websites/staging/sis/trunk/content/branches.html (original)
+++ websites/staging/sis/trunk/content/branches.html Thu Apr 21 20:55:12 2016
@@ -168,12 +168,14 @@ necessary for implementing an older vers
 <li>Usages of non-existent GeoAPI interfaces are replaced by direct usages of 
the
     corresponding Apache SIS implementation.</li>
 </ul>
-<p>For security reasons and for avoiding misleading information, two 
functionalities are disabled on trunk:</p>
+<p>For security reasons and for avoiding misleading information, the following 
functionalities are disabled on trunk
+(but are still enabled on branches as experimental features). In particular 
the <code>Supervisor.ENABLED</code> flag controls
+whether the MBeans documented in the <code>org.apache.sis.console</code> 
package are enabled or not.</p>
 <ul>
 <li>In 
<code>core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java</code>,
 the <code>ENABLED</code> flag is set to <code>false</code>.</li>
 <li>In 
<code>core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java</code>,
 the <code>REPORT_MISSING_MODULE</code> flag is set to <code>false</code>.</li>
 </ul>
-<p>Above flag values may be changed in future SIS releases.</p>
+<p>Above flag values may change in future SIS releases.</p>
 <h1 id="behavior">Behavioral differences between the branches<a 
class="headerlink" href="#behavior" title="Permanent link">&para;</a></h1>
 <p>Some JDK7-specific features are reproduced on the JDK6 branch in an 
approximative way,
 which may cause some differences in application behavior (ignoring differences 
in performance).