--no commit message

--no commit message

h2/src/docsrc/html/advanced.html

@@ -213,8 +213,8 @@ when dropping the table, and when using SELECT ... FOR UPDATE. Connections
 only 'see' committed data, and own changes. That means, if connection A updates
 a row but doesn't commit this change yet, connection B will see the old value.
 Only when the change is committed, the new value is visible by other connections
-(read committed). If multiple connections concurrently try to update the same row, this
-database fails fast: a concurrent update exception is thrown.
+(read committed). If multiple connections concurrently try to update the same row, the
+database waits until it can apply the change, but at most until the lock timeout expires.
 </p>
 <p>
 To use the MVCC feature, append MVCC=TRUE to the database URL:

h2/src/docsrc/html/changelog.html

@@ -19,6 +19,7 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul><li>Server-less multi-connection mode: more bugs are fixed.
+</li><li>The download page now included the SHA1 checksums.
 </li><li>Shell tool: the file encoding workaround is now documented
     if you run java org.h2.tools.Shell -?.
 </li><li>The RunScript tool and SQL statement did not work with the compression method LZF.

h2/src/docsrc/html/download.html

@@ -19,8 +19,10 @@ Downloads
 
 <h3>Version ${version} (${versionDate})</h3>
 <p>
-<a href="http://www.h2database.com/h2-setup-${versionDate}.exe">Windows Installer</a><br />
-<a href="http://www.h2database.com/h2-${versionDate}.zip">Platform-Independent Zip</a><br />
+<a href="http://www.h2database.com/h2-setup-${versionDate}.exe">Windows Installer</a>
+<!-- sha1Exe --><br />
+<a href="http://www.h2database.com/h2-${versionDate}.zip">Platform-Independent Zip</a>
+<!-- sha1Zip --><br />
 </p>
 
 <h3>Version ${stableVersion} (${stableVersionDate}, Last Stable)</h3>

h2/src/docsrc/html/roadmap.html

@@ -238,6 +238,10 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Ability to resize the cache array when resizing the cache
 </li><li>Time based cache writing (one second after writing the log)
 </li><li>Check state of H2 driver for DDLUtils: https://issues.apache.org/jira/browse/DDLUTILS-185
+</li><li>Support JMX: Create an MBean for each database and server (support JConsole).
+    See http://thedevcloud.blogspot.com/2008/10/displaying-hsql-database-manager-in.html
+    http://java.sun.com/j2se/1.5.0/docs/api/java/lang/management/ManagementFactory.html#getPlatformMBeanServer()
+    http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html
 </li><li>Index usage for REGEXP LIKE.
 </li><li>Compatibility: add a role DBA (like ADMIN).
 </li><li>Better support multiple processors for in-memory databases.
@@ -294,8 +298,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
     move Comparison to Other Database Engines to Comparison,
     move Products that Work with H2 to Comparison,
     move Performance Tuning to Advanced Topics
-</li><li>Support JMX: Create an MBean for each database and server (support JConsole).
-    See http://thedevcloud.blogspot.com/2008/10/displaying-hsql-database-manager-in.html
 </li><li>Translation: use ${.} in help.csv
 </li><li>Translated .pdf
 </li><li>Cluster: hot deploy (adding a node at runtime)
@@ -421,6 +423,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Oracle compatibility: support CREATE OR REPLACE VIEW syntax.
 </li><li>Sybase/DB2/Oracle compatibility: support out parameters in stored procedures - See http://code.google.com/p/h2database/issues/detail?id=83
 </li><li>Support INTERVAL data type (see Oracle and others).
+</li><li>Combine Server and Console tool (only keep Server).
 </li></ul>
 
 <h2>Not Planned</h2>