Documentation.

h2/src/docsrc/help/help.csv

@@ -1656,15 +1656,16 @@ charsetString [, fieldSepString [, fieldDelimString [, escString [, nullString]]
 Optional parameters for CSVREAD and CSVWRITE.
 Instead of setting the options one by one, all options can be
 combined into a space separated key-value pairs, as follows:
-'charset=UTF-8 escape="" fieldDelimiter="" fieldSeparator=, ' ||
-'lineComment=# lineSeparator=\n null= rowSeparator='.
+STRINGDECODE('charset=UTF-8 escape=\"" fieldDelimiter=\"" fieldSeparator=, ' ||
+'lineComment=# lineSeparator=\n null= rowSeparator=').
 The following options are supported:
 charset, escape, fieldDelimiter, fieldSeparator,
 lineComment (# for H2 version 1.2, disabled for H2 version 1.3),
 lineSeparator, null, rowSeparator (not set by default).
-The options text is encoded like a Java string.
+For a newline or other special character, use STRINGDECODE as in the example above.
+A space needs to be escaped with a backslash ('\ ').
+A backslash needs to be escaped with another backslash ('\\').
 ","
-CALL CSVWRITE('test2.csv', 'SELECT * FROM TEST', 'UTF-8', '|');
 CALL CSVWRITE('test2.csv', 'SELECT * FROM TEST', 'charset=UTF-8 fieldSeparator=|');
 "
 

h2/src/docsrc/html/changelog.html

@@ -20,7 +20,7 @@ Change Log
 <h2>Next Version (unreleased)</h2>
 <ul><li>Improved error detection when starting a server with invalid arguments,
     such as "-tcpPort=9091" or "-tcpPort 9091" (as one parameter) instead of "-tcpPort", "9091".
-</li><li>The function JAVADECODE ignored characters after a non-escaped double quote.
+</li><li>The function STRINGDECODE ignored characters after a non-escaped double quote.
     This is no longer the case.
 </li><li>The new CSV option feature introduced in version 1.3.150 didn't support spaces.
     Now the escape mechanism is changed to support it.

h2/src/main/org/h2/util/Tool.java

@@ -106,7 +106,7 @@ public abstract class Tool {
      * then an exception is thrown.
      *
      * @param arg the argument
-     * @param the option
+     * @param option the command line option
      * @return true if it matches
      */
     public static boolean isOption(String arg, String option) {