Documentation.

h2/src/docsrc/html/build.html

@@ -42,10 +42,6 @@ Build
 This database is written in Java and therefore works on many platforms.
 It can also be compiled to a native executable using GCJ.
 </p>
-<p>
-For Java 1.4, the jar file needs to be converted first using
-<a href="http://retrotranslator.sourceforge.net">Retrotranslator</a>.
-</p>
 
 <h2 id="environment">Environment</h2>
 <p>

h2/src/docsrc/html/changelog.html

@@ -18,12 +18,15 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>When the system property h2.lobInDatabase is set, reading a BLOB is a bit faster
+<ul><li>Multi-version concurrency: SELECT ... FOR UPDATE threw a "concurrent update" exception immediately
+    instead of a "lock timeout" exception after the set lock timeout if the row was already locked by another connection.
+</li><li>Translation: the H2 Console and error messages have been translated to Czech by Hannibal (http://hannibal.cestiny.cz/). Thanks a lot!
+</li><li>When the system property h2.lobInDatabase is set, reading a BLOB is a bit faster
     because the length is not read.
 </li><li>The SimpleResultSet now has a feature to not close the result set after reading the last row.
 </li><li>Native fulltext search: the ignore list doesn't need to be all uppercase now.
 </li><li>Improved statistics output in the Recover tool.
-</li><li>Issue 269: GROUP BY queries with a column or having clause that contains IN(SELECT ...) 
+</li><li>Issue 269: GROUP BY queries with a column or having clause that contains IN(SELECT ...)
     could return the wrong values. Example: SELECT X IN(SELECT Y) FROM Z GROUP BY X.
 </li><li>After closing a database, the writer thread will stop almost immediately (instead of after at most 100 ms).
     This should avoid error messages in the Tomcat log file after a shutdown.
@@ -31,7 +34,7 @@ Change Log
 </li><li>The SLF4J 1.6 API is now used by default (this should not have any user visible effect).
 </li><li>The org.h2.tools.Console no longer calls System.exit on shutdown
     (this should not have any user visible effect, but should allow to integrate the tool easier into other applications).
-</li><li>Improved date / time arithmetics. Adding and subtracting a 
+</li><li>Improved date / time arithmetics. Adding and subtracting a
     floating point value from a date or timestamp is now supported.
 </li><li>When creating a BLOB with in InputStream or a CLOB with a Reader, and the InputStream or Reader
     threw an non-IOException, then the LOB storage was broken when storing LOBs in the database.

h2/src/docsrc/html/features.html

@@ -1120,9 +1120,9 @@ This feature doesn't work with in-memory databases. Example database URL:
 jdbc:h2:/data/test;AUTO_SERVER=TRUE
 </pre>
 <p>
-Use the same URL for all connections to this database. Behind the scenes, when using this mode, 
-the first connection to the database is made in embedded mode, and additionally a server 
-is started internally (as a daemon thread). If the database is already open in another process, 
+Use the same URL for all connections to this database. Internally, when using this mode,
+the first connection to the database is made in embedded mode, and additionally a server
+is started internally (as a daemon thread). If the database is already open in another process,
 the server mode is used automatically.
 </p>
 <p>

h2/src/docsrc/html/history.html

@@ -130,6 +130,7 @@ spread the word, and translated this project. Also many thanks to the donors:
 </li><li>Philippe Marschall, Switzerland
 </li><li>Knut Staring, Norway
 </li><li>Theis Borg, Denmark
+</li><li>Joel A. Garringer, USA
 </li></ul>
 
 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>

h2/src/docsrc/html/links.html

@@ -632,6 +632,13 @@ SQLOrm</a><br />
 Java Object Relation Mapping.
 </p>
 
+<p><a href="http://csv-jdbc.com">
+StelsCSV and StelsXML</a><br />
+StelsCSV is a CSV JDBC type 4 driver that allows to perform SQL queries and other JDBC operations on text files.
+StelsXML is a XML JDBC type 4 driver that allows to perform SQL queries and other JDBC operations on XML files.
+Both use H2 as the SQL engine.
+</p>
+
 <p><a href="http://www.intertec.ch/storybook">
 StorYBook</a><br />
 A summary-based tool for novelist and script writers. It helps to keep the overview over the various traces a story has.

h2/src/main/org/h2/tools/SimpleResultSet.java

@@ -2124,8 +2124,8 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
 //## Java 1.6 end ##
 
     /**
-     * Set the auto-close behavior. If enabled (the default), the result set is closed
-     * after reading the last row.
+     * Set the auto-close behavior. If enabled (the default), the result set is
+     * closed after reading the last row.
      *
      * @param autoClose the new value
      */

h2/src/test/org/h2/test/jdbc/TestLobApi.java

@@ -68,7 +68,7 @@ public class TestLobApi extends TestBase {
         try {
             prep.setCharacterStream(1, new Reader() {
                 int pos;
-                public int read(char[] cbuf, int off, int len) throws IOException {
+                public int read(char[] buff, int off, int len) throws IOException {
                     pos += len;
                     if (pos > 100001) {
                         if (ioException) {

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -665,4 +665,4 @@ mbeans unregisters subtracting multiplying dividing contended bindings
 projection managing observer misuse windowed discriminator abort familiar rice
 reachable mind develop disposition extras arithmetics readwrite syncable
 requeried requery closable curr outdated market accurate borg theis welford
-ooq exceeded eye
+ooq exceeded eye prevention