Documentation.

h2/src/docsrc/html/advanced.html

@@ -1431,7 +1431,7 @@ and call the method <code>FileSystem.register</code> before using it.
 <p>
 For input streams (but not for random access files), URLs may be used in addition to the registered file systems.
 Example: <code>jar:file:///c:/temp/example.zip!/org/example/nested.csv</code>.
-To read a stream from the classpath, use the prefix <code>classpath:</code>, as in 
+To read a stream from the classpath, use the prefix <code>classpath:</code>, as in
 <code>classpath:org/h2/samples/newsfeed.sql</code>.
 </p>
 

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'.
@@ -30,7 +34,7 @@ Change Log
 </li><li>TCP Server: a base directory with a prefix with a database name with prefix didn't work as expected
     (this only applies to non-disk and wrapped file systems).
 </li><li>Version 1.3: when re-running the same query so that the previous result was re-used,
-    and if the result set was large so that it was stored externally (in a temp file or in a temp table), 
+    and if the result set was large so that it was stored externally (in a temp file or in a temp table),
     then reading rows from both result sets resulted in an exception or wrong behavior.
 </li><li>A new sample application that shows how to create
     a read-only database in a zip file where the database file is split into multiple smaller parts.

h2/src/docsrc/html/faq.html

@@ -131,7 +131,7 @@ See <a href="advanced.html#limits_limitations">Limits and Limitations</a>.
 <h3 id="reliable">Is it Reliable?</h3>
 <p>
 That is not easy to say. It is still a quite new product. A lot of tests have been written,
-and the code coverage of these tests is higher than 80% for each package. 
+and the code coverage of these tests is higher than 80% for each package.
 Randomized stress tests are run regularly. But there are probably still
 bugs that have not yet been found (as with most software). Some features are known
 to be dangerous, they are only supported for situations where performance is more important

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