Shell tool: the file encoding workaround is now documented

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>The RunScript tool and SQL statement did not work with the compression method LZF.
+<ul><li>Shell tool: the file encoding workaround is now documented
+    if you run java org.h2.tools.Shell -?.
+</li><li>The RunScript tool and SQL statement did not work with the compression method LZF.
 </li><li>Fulltext search: searching for NULL or an empty string threw an exception.
 </li><li>Lucene fulltext search: FTL_DROP_ALL did not drop the triggers.
 </li><li>Backup: if the database contained CLOB or BLOB data, the backup

h2/src/main/org/h2/res/javadoc.properties

@@ -21,4 +21,4 @@ org.h2.tools.Script.main=Options are case sensitive. Supported options are\:\n[-
 org.h2.tools.Server=Starts the H2 Console (web-) server, TCP, and PG server.
 org.h2.tools.Server.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]       Print the list of options\n[-web]                Start the web server with the H2 Console\n[-webAllowOthers]     Allow other computers to connect\n[-webPort <port>]     The port (default\: 8082)\n[-webSSL]             Use encrypted (HTTPS) connections\n[-browser]            Start a browser and open a page to connect to the web server\n[-tcp]                Start the TCP server\n[-tcpAllowOthers]     Allow other computers to connect\n[-tcpPort <port>]     The port (default\: 9092)\n[-tcpSSL]             Use encrypted (SSL) connections\n[-tcpPassword <pwd>]  The password for shutting down a TCP server\n[-tcpShutdown <url>]  Stop the TCP server; example\: tcp\://localhost\:9094\n[-tcpShutdownForce]   Do not wait until all connections are closed\n[-pg]                 Start the PG server\n[-pgAllowOthers]      Allow other computers to connect\n[-pgPort <port>]      The port (default\: 5435)\n[-baseDir <dir>]      The base directory for H2 databases; for all servers\n[-ifExists]           Only existing databases may be opened; for all servers\n[-trace]              Print additional trace information; for all servers
 org.h2.tools.Shell=Interactive command line tool to access a database using JDBC.
-org.h2.tools.Shell.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:h2\:...)\n[-user <user>]     The user name\n[-password <pwd>]  The password\n[-driver <class>]  The JDBC driver class to use (not required in most cases)
+org.h2.tools.Shell.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:h2\:...)\n[-user <user>]     The user name\n[-password <pwd>]  The password\n[-driver <class>]  The JDBC driver class to use (not required in most cases)\nIf special characters don't work as expected, you may need to use\n -Dfile.encoding\=UTF-8 (Mac OS X) or CP850 (Windows).

h2/src/main/org/h2/tools/Shell.java

@@ -59,6 +59,8 @@ public class Shell extends Tool {
      * <tr><td>[-driver &lt;class&gt;]</td>
      * <td>The JDBC driver class to use (not required in most cases)</td></tr>
      * </table>
+     * If special characters don't work as expected, you may need to use
+     * -Dfile.encoding=UTF-8 (Mac OS X) or CP850 (Windows).
      * @h2.resource
      *
      * @param args the command line arguments