Documentation.

h2/src/docsrc/help/help.csv

@@ -1559,7 +1559,8 @@ AES
 "
 
 "Other Grammar","Column Definition","
-columnName dataType { DEFAULT expression | AS computedColumnExpression } [ [ NOT ] NULL ]
+columnName dataType
+[ { DEFAULT expression | AS computedColumnExpression } ] [ [ NOT ] NULL ]
 [ { AUTO_INCREMENT | IDENTITY } [ ( startInt [, incrementInt ] ) ] ]
 [ SELECTIVITY selectivity ] [ COMMENT expression ]
 [ PRIMARY KEY [ HASH ] | UNIQUE ] [ CHECK condition ]

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Executing a CSVREAD query multiple times could result in an exception if the data was changed on disk.
+<ul><li>Issue 289: Railroads (BNF) for "Column Definition" was incorrect.
+</li><li>Issue 287: Railroads (BNF) is not readable for certain web-browser configurations (dark background).
+</li><li>Executing a CSVREAD query multiple times could result in an exception if the data was changed on disk.
 </li><li>SQL railroad diagrams: improved images for people with black background settings.
 </li><li>Build-in documentation search: improved results if searching for multiple words.
 </li><li>DatabaseMetaData.getColumns: there is a typo in the JDBC specification, so that the column #19 is named

h2/src/docsrc/html/roadmap.html

@@ -558,7 +558,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Single-column primary key values are always stored explicitly. This is not required.
 </li><li>Compatibility with MySQL: support CREATE TABLE TEST(NAME VARCHAR(255) CHARACTER SET UTF8).
 </li><li>CALL is incompatible with other databases because it returns a result set, so that CallableStatement.execute() returns true.
-</li><li>Opimization for large lists for column IN(1, 2, 3, 4,...) - currently an list is used, could potentially use a hash set
+</li><li>Optimization for large lists for column IN(1, 2, 3, 4,...) - currently an list is used, could potentially use a hash set
     (maybe only for a part of the values - the ones that can be evaluated).
 </li></ul>
 

h2/src/main/org/h2/index/BaseIndex.java

@@ -109,8 +109,8 @@ public abstract class BaseIndex extends SchemaObjectBase implements Index {
 
     /**
      * Calculate the cost for the given mask as if this index was a typical
-     * b-tree range index. This is the estimated cost required to search one row, and then iterate over the
-     * given number of rows.
+     * b-tree range index. This is the estimated cost required to search one
+     * row, and then iterate over the given number of rows.
      *
      * @param masks the search mask
      * @param rowCount the number of rows in the index

h2/src/main/org/h2/res/help.csv

@@ -505,7 +505,8 @@ Returns the first expression where the condition is true."
 ","
 Two algorithms are supported: AES (AES-128) and XTEA (using 32 rounds)."
 "Other Grammar","Column Definition","
-columnName dataType { DEFAULT expression | AS computedColumnExpression } [ [ NOT ] NULL ]
+columnName dataType
+[ { DEFAULT expression | AS computedColumnExpression } ] [ [ NOT ] NULL ]
 [ { AUTO_INCREMENT | IDENTITY } [ ( startInt [, incrementInt ] ) ] ]
 [ SELECTIVITY selectivity ] [ COMMENT expression ]
 [ PRIMARY KEY [ HASH ] | UNIQUE ] [ CHECK condition ]

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

@@ -677,4 +677,4 @@ trouble designed decouple reflectively skeletons retention reflective validates
 clip upgrades demonstrate inspectors
 exceed identities differentiate inherited tracks notated strip suggestions
 registration sanity improperly annotate inheritance composite inspected
-hurt imposes marshal policy upgrader
+hurt imposes marshal policy upgrader configurations dark