Documentation.

h2/src/docsrc/html/datatypes.html

@@ -16,6 +16,7 @@ Data Types
 <!-- } -->
 
 <h1>Data Types</h1>
+<h2>Index</h2>
 <!-- syntax-start
 <p class="notranslate">
 <c:forEach var="item" items="dataTypes">
@@ -43,11 +44,20 @@ syntax-end -->
 </table>
 <!-- railroad-end -->
 
+<!-- railroad-start -->
+<h2>Details</h2>
+<p>Click on the header to switch between railroad diagram and BNF.</p>
+<!-- railroad-end -->
 
 <c:forEach var="item" items="dataTypes">
-<h3 id="${item.link}" class="notranslate">${item.topic}</h3>
+<h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
 <!-- railroad-start -->
+<pre name="bnf" style="display: none">
+${item.syntax}
+</pre>
+<div name="railroad">
 ${item.railroad}
+</div>
 <!-- railroad-end -->
 <!-- syntax-start
 <pre>
@@ -59,5 +69,7 @@ syntax-end -->
 <p class="notranslate">${item.example}</p>
 </c:forEach>
 
+<!--[if lte IE 7]><script language="javascript">switchBnf(null);</script><![endif]-->
+
 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>
 

h2/src/docsrc/html/functions.html

@@ -16,8 +16,8 @@ Functions
 <!-- } -->
 
 <h1>Functions</h1>
-
-<h2>Aggregate Functions</h2>
+<h2>Index</h2>
+<h3>Aggregate Functions</h3>
 <!-- syntax-start
 <p class="notranslate">
 <c:forEach var="item" items="functionsAggregate">
@@ -45,7 +45,7 @@ syntax-end -->
 </table>
 <!-- railroad-end -->
 
-<h2>Numeric Functions</h2>
+<h3>Numeric Functions</h3>
 <!-- syntax-start
 <p class="notranslate">
 <c:forEach var="item" items="functionsNumeric">
@@ -73,7 +73,7 @@ syntax-end -->
 </table>
 <!-- railroad-end -->
 
-<h2>String Functions</h2>
+<h3>String Functions</h3>
 <!-- syntax-start
 <p class="notranslate">
 <c:forEach var="item" items="functionsString">
@@ -101,7 +101,7 @@ syntax-end -->
 </table>
 <!-- railroad-end -->
 
-<h2>Time and Date Functions</h2>
+<h3>Time and Date Functions</h3>
 <!-- syntax-start
 <p class="notranslate">
 <c:forEach var="item" items="functionsTimeDate">
@@ -129,7 +129,7 @@ syntax-end -->
 </table>
 <!-- railroad-end -->
 
-<h2>System Functions</h2>
+<h3>System Functions</h3>
 <!-- syntax-start
 <p class="notranslate">
 <c:forEach var="item" items="functionsSystem">
@@ -157,10 +157,20 @@ syntax-end -->
 </table>
 <!-- railroad-end -->
 
+<!-- railroad-start -->
+<h2>Details</h2>
+<p>Click on the header to switch between railroad diagram and BNF.</p>
+<!-- railroad-end -->
+
 <c:forEach var="item" items="functionsAll">
-<h3 id="${item.link}" class="notranslate">${item.topic}</h3>
+<h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
 <!-- railroad-start -->
+<pre name="bnf" style="display: none">
+${item.syntax}
+</pre>
+<div name="railroad">
 ${item.railroad}
+</div>
 <!-- railroad-end -->
 <!-- syntax-start
 <pre>
@@ -172,5 +182,7 @@ syntax-end -->
 <p class="notranslate">${item.example}</p>
 </c:forEach>
 
+<!--[if lte IE 7]><script language="javascript">switchBnf(null);</script><![endif]-->
+
 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>
 

h2/src/docsrc/html/grammar.html

@@ -16,7 +16,8 @@ SQL Grammar
 <!-- } -->
 
 <h1>SQL Grammar</h1>
-<h2>Commands (Data Manipulation)</h2>
+<h2>Index</h2>
+<h3>Commands (Data Manipulation)</h3>
 <!-- syntax-start
 <p class="notranslate">
 <c:forEach var="item" items="commandsDML">
@@ -44,7 +45,7 @@ syntax-end -->
 </table>
 <!-- railroad-end -->
 
-<h2>Commands (Data Definition)</h2>
+<h3>Commands (Data Definition)</h3>
 <!-- syntax-start
 <p class="notranslate">
 <c:forEach var="item" items="commandsDDL">
@@ -72,7 +73,7 @@ syntax-end -->
 </table>
 <!-- railroad-end -->
 
-<h2>Commands (Other)</h2>
+<h3>Commands (Other)</h3>
 <!-- syntax-start
 <p class="notranslate">
 <c:forEach var="item" items="commandsOther">
@@ -100,7 +101,7 @@ syntax-end -->
 </table>
 <!-- railroad-end -->
 
-<h2>Other Grammar</h2>
+<h3>Other Grammar</h3>
 <!-- syntax-start
 <p class="notranslate">
 <c:forEach var="item" items="otherGrammar">
@@ -128,16 +129,26 @@ syntax-end -->
 </table>
 <!-- railroad-end -->
 
-<h2>System Tables</h2>
+<h3>System Tables</h3>
 <p class="notranslate">
 <a href="#information_schema">Information Schema</a><br />
 <a href="#range_table">Range Table</a><br />
 </p>
 
+<!-- railroad-start -->
+<h2>Details</h2>
+<p>Click on the header to switch between railroad diagram and BNF.</p>
+<!-- railroad-end -->
+
 <c:forEach var="item" items="commands">
-<h3 id="${item.link}" class="notranslate">${item.topic}</h3>
+<h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
 <!-- railroad-start -->
+<pre name="bnf" style="display: none">
+${item.syntax}
+</pre>
+<div name="railroad">
 ${item.railroad}
+</div>
 <!-- railroad-end -->
 <!-- syntax-start
 <pre>
@@ -151,7 +162,7 @@ ${item.example}</p>
 </c:forEach>
 
 <c:forEach var="item" items="otherGrammar">
-<h3 id="${item.link}" class="notranslate">${item.topic}</h3>
+<h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
 <!-- railroad-start -->
 ${item.railroad}
 <!-- railroad-end -->
@@ -191,4 +202,6 @@ The table is used as follows:
 SELECT X FROM SYSTEM_RANGE(1, 10);
 </pre>
 
+<!--[if lte IE 7]><script language="javascript">switchBnf(null);</script><![endif]-->
+
 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>

h2/src/docsrc/html/license.html

@@ -38,8 +38,7 @@ There is a license FAQ for both the MPL and the EPL, most of that is applicable
 </li><li>Files containing only your code are not covered by this license (it is 'commercial friendly').
 </li><li>Modifications to the H2 source code must be published.
 </li><li>You don't need to provide the source code of H2 if you did not modify anything.
-</li><li>If you distribute a binary that includes H2, you need to add a disclaimer of liability 
-    (as you should do for your own code) and a notice or link about where to get the H2 source code.
+</li><li>If you distribute a binary that includes H2, you need to add a disclaimer of liability - see the example below.
 </li></ul>
 
 <p>
@@ -52,6 +51,20 @@ About porting the source code to another language (for example C# or C++): conve
 copyright and license as the original code. The copyright of the ported source code does not (automatically) go to the person who ported the code.
 </p>
 
+<p>
+If you distribute a binary that includes H2, you need to add a disclaimer of liability
+(as you should do for your own code). You should add disclaimers for all open source libraries you use.
+For example, add a file <code>3rdparty_license.txt</code> in the directory where the jar files are,
+where you list all licenses and disclaimers for all included open source libraries.
+The easiest solution is to copy the following below. You may also include a copy of the complete license.
+</p>
+<pre>
+This software contains unmodified binary redistributions for H2 database engine (http://www.h2database.com/), 
+which is dual licensed and available under a modified version of the MPL 1.1 (Mozilla Public License) 
+or under the (unmodified) EPL 1.0 (Eclipse Public License).
+An original copy of the license agreement can be found at: http://www.h2database.com/html/license.html
+</pre>
+
 <h2 id="h2_license">H2 License - Version 1.0</h2>
 
 <h3 id = "section-1">1. Definitions</h3>

h2/src/docsrc/html/navigation.js

@@ -167,3 +167,21 @@ function mouseMove(e) {
     }
     return false;
 }
+
+function switchBnf(x) {
+    var bnfList = document.getElementsByName('bnf');
+    for (var i = 0; i < bnfList.length; i++) {
+        var bnf = bnfList[i].style;
+        bnf.display = bnf.display == '' ? 'none' : '';
+        bnf.visibility = bnf.display == 'none' ? 'hidden' : 'visible';
+    }
+    var railroads = document.getElementsByName('railroad');
+    for (var i = 0; i < railroads.length; i++) {
+        var railroad = railroads[i].style;
+        railroad.display = railroad.display == '' ? 'none' : '';
+        railroad.visibility = railroad.display == 'none' ? 'hidden' : 'visible';
+    }
+    if (x) {
+        document.location = '#' + x.id;
+    }
+}

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

@@ -24,7 +24,7 @@ SET { columnName= { DEFAULT | expression } } [,...]
 ","
 Updates data in a table."
 "Commands (DML)","DELETE","
-DELETE FROM tableName [ WHERE expression ]
+DELETE [ TOP term ] FROM tableName [ WHERE expression ] [ LIMIT term ]
 ","
 Deletes rows form a table."
 "Commands (DML)","BACKUP","
@@ -845,6 +845,10 @@ Calculate the arc tangent."
 COS(double)
 ","
 Calculate the trigonometric cosine."
+"Functions (Numeric)","COSH","
+COSH(double)
+","
+Calculate the hyperbolic cosine."
 "Functions (Numeric)","COT","
 COT(double)
 ","
@@ -853,10 +857,18 @@ Calculate the trigonometric cotangent (""1/TAN(ANGLE)"")."
 SIN(double)
 ","
 Calculate the trigonometric sine."
+"Functions (Numeric)","SINH","
+SINH(double)
+","
+Calculate the hyperbolic sine."
 "Functions (Numeric)","TAN","
 TAN(double)
 ","
 Calculate the trigonometric tangent."
+"Functions (Numeric)","TANH","
+TANH(double)
+","
+Calculate the hyperbolic tangent."
 "Functions (Numeric)","ATAN2","
 ATAN2(double, double)
 ","

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

@@ -679,4 +679,4 @@ exceed identities differentiate inherited tracks strip suggestions
 registration sanity improperly annotate inheritance composite inspected
 hurt imposes marshal policy upgrader configurations dark varray xlint executor
 completion inactivity exports maintains backside schwietzke rene rectangular grandin noel
-sine cosine tangent cotangent trigonometric
+sine cosine tangent cotangent trigonometric hyperbolic lte