Documentation

h2/src/docsrc/help/help.csv

@@ -1092,7 +1092,8 @@ SET CLUSTER ''
 SET BINARY_COLLATION
 { UNSIGNED | SIGNED } ] }
 ","
-Sets the collation used for comparing BINARY columns, the default is SIGNED.
+Sets the collation used for comparing BINARY columns, the default is SIGNED
+for version 1.3 and older, and UNSIGNED for version 1.4 and newer.
 This command can only be executed if there are no tables defined.
 
 Admin rights are required to execute this command.

h2/src/docsrc/html/advanced.html

@@ -905,7 +905,7 @@ is put to sleep.
 
 <h3>File Locking Method 'File'</h3>
 <p>
-The default method for database file locking for version 1.3 and older is the 'File Method'. 
+The default method for database file locking for version 1.3 and older is the 'File Method'.
 The algorithm is:
 </p>
 <ul>

h2/src/docsrc/html/changelog.html

@@ -18,8 +18,12 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Changes in Version 1.4 Beta (unreleased)</h2>
-<ul><li>The file locking method 'serialized' is no longer supported.
-    This mode might return in a future version, 
+<ul><li>By default, the MV_STORE option is enabled, so it is using the new MVStore
+    storage. The MVCC setting is set to the same values as the MV_STORE setting,
+    so it is also enabled by default. For testing, both settings can be disabled by appending
+    ";MV_STORE=FALSE" / ";MVCC=FALSE" to the database URL.
+</li><li>The file locking method 'serialized' is no longer supported.
+    This mode might return in a future version,
     however this is not clear right now.
     A new implementation and new tests would be needed.
 </li><li>Enable the new storage format for dates (system property "h2.storeLocalTime").
@@ -32,7 +36,7 @@ Change Log
     See also Mode.supportOffsetFetch.
 </li><li>Byte arrays are now sorted in unsigned mode
     (x'99' is larger than x'09').
-    (System property "h2.sortBinaryUnsigned", Mode.binaryUnsigned).
+    (System property "h2.sortBinaryUnsigned", Mode.binaryUnsigned, setting "binary_collation").
 </li><li>Csv.getInstance will be removed in future versions of 1.4.
     Use the public constructor instead.
 </li><li>Remove support for the limited old-style outer join syntax using "(+)".
@@ -89,7 +93,7 @@ Change Log
 </li><li>Support some more DDL syntax for MySQL, patch from Peter Jentsch.
 </li><li>Issue 548: TO_CHAR does not format MM and DD correctly when the month or day of
     the month is 1 digit, patch from "the.tucc"
-</li><li>Fix bug in varags support in ALIAS's, patch from Nicolas Fortin    
+</li><li>Fix bug in varargs support in ALIAS's, patch from Nicolas Fortin
 </li></ul>
 
 <h2>Version 1.3.175 (2014-01-18)</h2>

h2/src/docsrc/html/history.html

@@ -134,6 +134,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>Mark De Mendonca Duske, USA
 </li><li>Joel A. Garringer, USA
 </li><li>Olivier Chafik, France
 </li><li>Rene Schwietzke, Germany
@@ -144,7 +145,6 @@ spread the word, and translated this project. Also many thanks to the donors:
 </li><li>Laurent van Roy, Belgium
 </li><li>Qian Chen, China
 </li><li>Clinton Hyde, USA
-</li><li>Mark De Mendonca Duske, USA
 </li><li>Kritchai Phromros, Thailand
 </li></ul>
 

h2/src/docsrc/html/mvstore.html

@@ -63,7 +63,7 @@ But it can also be used directly within an application, without using JDBC or SQ
 </li><li>Both file-based persistence and in-memory operation are supported.
 </li><li>It is intended to be fast, simple to use, and small.
 </li><li>Old versions of the data can be read concurrently with all other operations.
-</li><li>Transaction are supported (including concurrent transactions and 2-phase commit).
+</li><li>Transactions are supported (including concurrent transactions and 2-phase commit).
 </li><li>The tool is very modular.
     It supports pluggable data types and serialization,
     pluggable storage (to a file, to off-heap memory),
@@ -74,7 +74,7 @@ But it can also be used directly within an application, without using JDBC or SQ
 
 <h2 id="example_code">Example Code</h2>
 <p>
-The following sample code show how to use the tool:
+The following sample code shows how to use the tool:
 </p>
 <pre>
 import org.h2.mvstore.*;
@@ -96,7 +96,7 @@ s.close();
 <h2 id="store_builder">Store Builder</h2>
 <p>
 The <code>MVStore.Builder</code> provides a fluid interface
-to build a store if more complex configuration options are used.
+to build a store if configuration options are needed.
 Example usage:
 </p>
 <pre>
@@ -111,14 +111,14 @@ The list of available options is:
 </p>
 <ul><li>autoCommitBufferSize: the size of the write buffer.
 </li><li>autoCommitDisabled: to disable auto-commit.
-</li><li>backgroundExceptionHandler: specify a handler for
+</li><li>backgroundExceptionHandler: a handler for
     exceptions that could occur while writing in the background.
 </li><li>cacheSize: the cache size in MB.
 </li><li>compress: compress the data when storing
     using a fast algorithm (LZF).
 </li><li>compressHigh: compress the data when storing
     using a slower algorithm (Deflate).
-</li><li>encryptionKey: the encryption key for file encryption.
+</li><li>encryptionKey: the key for file encryption.
 </li><li>fileName: the name of the file, for file based stores.
 </li><li>fileStore: the storage implementation to use.
 </li><li>pageSplitSize: the point where pages are split.
@@ -156,7 +156,7 @@ s.close();
 <p>
 The default number of dimensions is 2. To use a different number of dimensions,
 call <code>new MVRTreeMap.Builder&lt;String&gt;().dimensions(3)</code>.
-The minimum number of dimensions is 1, the maximum is 255.
+The minimum number of dimensions is 1, the maximum is 32.
 </p>
 
 <h2 id="features">Features</h2>
@@ -212,7 +212,7 @@ s.commit();
 map.put(1, "Hi");
 map.remove(2);
 
-// access the old data (before incrementVersion)
+// access the old data (before the commit)
 MVMap&lt;Integer, String&gt; oldMap =
         map.openVersion(oldVersion);
 

h2/src/docsrc/html/roadmap.html

@@ -24,6 +24,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 
 <h2>Version 1.5.x: Planned Changes</h2>
 <ul><li>Replace file password hash with file encryption key; validate encryption key when connecting.
+</li><li>Remove "set binary collation" feature.
 </li><li>Remove the encryption algorithm XTEA.
 </li></ul>