Documentation.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,11 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Issue 277:  JaQu didn't correctly convert a CLOB column to a String.
+<ul><li>CSVREAD / CSVWRITE: instead of setting the options one by one, 
+    all options can be combined into a space separated key-value pairs.
+</li><li>CSVREAD / CSV tool: there is a new option "lineCommentCharacter" to set or disable line comments.
+    For H2 version 1.2, the default is '#' (as before). For H2 version 1.3, line comments are disabled by default.
+</li><li>Issue 277:  JaQu didn't correctly convert a CLOB column to a String.
 </li><li>./build.sh testNetwork could block if there was a network configuration problem.
 </li><li>Reading input streams from the classpath is now supported. Example:
     RUNSCRIPT FROM 'classpath:org/h2/samples/newsfeed.sql'.

h2/src/docsrc/html/mainWeb.html

@@ -69,7 +69,7 @@ Welcome to H2, the Java SQL database. The main features of H2 are:
                     var e = 'at ';
                     var f = '.com';
                     var g = 'h2database';
-                    document.write(d + c + '<!-- x -->' + e + '<span style="display:none"> (no sp<!-- -->am please) </span>' + g + f);
+                    document.write(d + c + '<!-'+'- x -' + '->' + e + '<span style="display:none"> (no sp<!-'+'- -'+'->am please) </span>' + g + f);
                     //-->
                     </script>
                 </p>

h2/src/docsrc/html/roadmap.html

@@ -47,10 +47,10 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li></ul>
 
 <h2>Priority 1</h2>
-<ul><li>Bugfixes
+<ul><li>Bugfixes.
 </li><li>Test if out of disk space can corrupt a database.
-</li><li>More tests with MULTI_THREADED=1
-</li><li>Server side cursors
+</li><li>More tests with MULTI_THREADED=1 (and MULTI_THREADED with MVCC).
+</li><li>Server side cursors.
 </li></ul>
 
 <h2>Priority 2</h2>

h2/src/main/org/h2/expression/ConditionInSelect.java

@@ -74,7 +74,7 @@ public class ConditionInSelect extends Condition {
         return ValueBoolean.get(false);
     }
 
-    public Value getValueSlow(LocalResult rows, Value l) {
+    private Value getValueSlow(LocalResult rows, Value l) {
         boolean hasNull = false;
         boolean result = all;
         boolean hasRow = false;

h2/src/test/org/h2/test/jaqu/ClobTest.java

@@ -35,13 +35,13 @@ public class ClobTest extends TestBase {
         Db db = Db.open("jdbc:h2:mem:", "sa", "sa");
         db.executeUpdate(MessageFormat.format(create, "VARCHAR(255)"));
         db.insertAll(StringRecord.getList());
-        testSimpleUpdate(db, "VARCHARs fail");
+        testSimpleUpdate(db, "VARCHAR fail");
         db.close();
 
         db = Db.open("jdbc:h2:mem:", "sa", "sa");
         db.executeUpdate(MessageFormat.format(create, "TEXT"));
         db.insertAll(StringRecord.getList());
-        testSimpleUpdate(db, "CLOBs fail because of single quote artifacts");
+        testSimpleUpdate(db, "CLOB fail because of single quote artifacts");
         db.close();
     }
 

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

@@ -666,4 +666,6 @@ 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 hannibal stels garringer czech prevention propagate
-compromise portion
+compromise portion nodded rapping door stealing napping artifacts lore
\ No newline at end of file
+pondered curious muttered quaint chamber nearly unwrapped flows weary volume
+tapping gently dreary wrapping tis moger udt