Documentation.

h2/src/docsrc/help/help.csv

@@ -27,7 +27,7 @@ of H2 please use parentheses.
 
 If FOR UPDATE is specified, the tables are locked for writing. When using
 MVCC, only the selected rows are locked as in an UPDATE statement.
-In this case, aggregate, GROUP BY, DISTINCT queries or joins 
+In this case, aggregate, GROUP BY, DISTINCT queries or joins
 are not allowed in this case.
 ","
 SELECT * FROM TEST;
@@ -1772,7 +1772,9 @@ create a single quote inside a string.
 "Other Grammar","Summand","
 factor [ { { + | - } factor } [...] ]
 ","
-A value or a numeric sum.
+A value or a numeric sum. 
+
+Please note the text concatenation operator is ||.
 ","
 ID + 20
 "

h2/src/docsrc/html/changelog.html

@@ -18,12 +18,14 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>The BOM (the byte-order-mark) character 0xfeff at the beginning of the file is ignored.
+<ul><li>The source code is now switched to Java 6 (JDK 1.6) by default.
+	Java 5 (JDK 1.5) is still supported, and the jar file is still compiled for Java 5.
+</li><li>The BOM (the byte-order-mark) character 0xfeff at the beginning of the file is ignored.
     This is for compatibility with Microsoft Excel.
 </li><li>When opening an existing database, the cache size is set to at most
-    half the amount of memory available for the virtual machine 
+    half the amount of memory available for the virtual machine
     (Runtime.getRuntime().maxMemory()), even if the cache size setting stored in the database
-    is larger. Setting the cache size in the database URL or explicitly using SET CACHE_SIZE 
+    is larger. Setting the cache size in the database URL or explicitly using SET CACHE_SIZE
     overrides this value (even if larger than the physical memory).
 </li><li>INFORMATION_SCHEMA.SETTINGS: the cache size is now returned in KB.
 </li><li>New system property h2.selectForUpdateMvcc, the default is false (the feature is disabled).

h2/src/docsrc/html/roadmap.html

@@ -471,8 +471,8 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Fix the disk space leak (killing the process at the exact right moment will increase
     the disk space usage; this space is not re-used). See TestDiskSpaceLeak.java
 </li><li>ROWNUM: Oracle compatibility when used within a subquery. Issue 198.
-</li><li>Allow to access the database over HTTP (possibly using port 80) and a servlet (tunnel) in a "REST-ful" way.
-</li><li>CSV tool: support UTF-8 marker ("BOF") (files starting with the byte sequence EF BB BF). 
+</li><li>Allow to access the database over HTTP (possibly using port 80) and a servlet in a REST way.
+</li><li>CSV tool: support UTF-8 marker ("BOM") (files starting with the byte sequence EF BB BF).
     See also http://en.wikipedia.org/wiki/Byte_order_mark#cite_note-utf-8-bom-3
 </li></ul>
 

h2/src/test/org/h2/test/db/TestCsv.java

@@ -67,7 +67,7 @@ public class TestCsv extends TestBase {
     private void testPseudoBom() throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         // UTF-8 "BOM" / marker
-        out.write(Utils.convertStringToBytes("efbbbf"));
+        out.write(Utils.convertStringToBytes("ef" + "bb" + "bf"));
         out.write("\"ID\", \"NAME\"\n1, Hello".getBytes("UTF-8"));
         byte[] buff = out.toByteArray();
         Reader r = new InputStreamReader(new ByteArrayInputStream(buff), "UTF-8");

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

@@ -644,4 +644,4 @@ pulakka pagination collide visual aejaks simulation joonas finland minneapolis
 determine timestampdiff harmony doap shortdesc wireless iceland sigurdsson
 darri chunks bjorn chunked watson regardless usefulinc represented pushd
 recorder grajciar recording slovensky uninitialized arriving lubomir unchanged
-erik dick calculations lutin
+erik dick calculations lutin cite bom evaluating telegard excel bbs