Documentation / formatting

h2/src/docsrc/html/advanced.html

@@ -1208,7 +1208,7 @@ Ensure the existing accessible databases are protected using strong passwords.
 </p>
 <p>
 If you enable remote access using <code>-webAllowOthers</code>,
-please ensure the web server can only be accessed from thrusted networks.
+please ensure the web server can only be accessed from trusted networks.
 The options <code>-baseDir, -ifExists</code> don't protect
 access to the tools section, prevent remote shutdown of the web server,
 changes to the preferences, the saved connection settings,

h2/src/main/org/h2/mvstore/MVStore.java

@@ -351,7 +351,7 @@ public class MVStore {
         int delay = o == null ? 1000 : (Integer) o;
         setAutoCommitDelay(delay);
     }
-    
+
     private void panic(IllegalStateException e) {
         try {
             closeStore(false);

h2/src/main/org/h2/mvstore/db/MVTable.java

@@ -80,7 +80,7 @@ public class MVTable extends TableBase {
 
     /**
      * Initialize the table.
-     * 
+     *
      * @param session the session
      */
     void init(Session session) {
@@ -127,13 +127,13 @@ public class MVTable extends TableBase {
             }
         }
     }
-    
+
     /**
      * The the object on which to synchronize and wait on. For the
      * multi-threaded mode, this is this object, but for non-multi-threaded, it
      * is the database, as in this case all operations are synchronized on the
      * database object.
-     * 
+     *
      * @return the lock sync object
      */
     private Object getLockSyncObject() {
@@ -768,7 +768,7 @@ public class MVTable extends TableBase {
 
     /**
      * Get the transaction to use for this session.
-     * 
+     *
      * @param session the session
      * @return the transaction
      */

h2/src/test/org/h2/test/store/TestConcurrent.java

@@ -60,7 +60,7 @@ public class TestConcurrent extends TestMVStore {
         testConcurrentWrite();
         testConcurrentRead();
     }
-    
+
     private void testConcurrentAutoCommitAndChange() throws InterruptedException {
         String fileName = "memFS:testConcurrentChangeAndBackgroundCompact";
         FileUtils.delete(fileName);

h2/src/test/org/h2/test/testScript.sql

@@ -4,6 +4,8 @@
 --
 --- special grammar and test cases ---------------------------------------------------------------------------------------------
 
+-- TODO
+
 create table results(eventId int, points int, studentId int);
 > ok
 
@@ -16,26 +18,26 @@ insert into results values(1, 10, 2), (2, 20, 2), (3, 5, 2);
 insert into results values(1, 10, 3), (2, 20, 3), (3, 5, 3);
 > update count: 3
 
-SELECT SUM(points) FROM RESULTS 
+SELECT SUM(points) FROM RESULTS
     WHERE eventID IN
-        (SELECT eventID FROM RESULTS 
-            WHERE studentID = 2 
-            ORDER BY points DESC
-            LIMIT 2 ) 
-        AND studentID = 2;
+    (SELECT eventID FROM RESULTS
+    WHERE studentID = 2
+    ORDER BY points DESC
+    LIMIT 2 )
+    AND studentID = 2;
 
-SELECT eventID FROM RESULTS 
-            WHERE studentID = 2 
-            ORDER BY points DESC
-            LIMIT 2;
+SELECT eventID FROM RESULTS
+    WHERE studentID = 2
+    ORDER BY points DESC
+    LIMIT 2;
 
 SELECT SUM(r.points) FROM RESULTS r,
-(SELECT eventID FROM RESULTS 
-  WHERE studentID = 2 
-  ORDER BY points DESC
-  LIMIT 2 ) r2
-WHERE r2.eventID = r.eventId
-AND studentID = 2;
+    (SELECT eventID FROM RESULTS
+    WHERE studentID = 2
+    ORDER BY points DESC
+    LIMIT 2 ) r2
+    WHERE r2.eventID = r.eventId
+    AND studentID = 2;
 
 drop table results;
 > ok

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

@@ -763,5 +763,4 @@ deque synchronizers affero kevent nikolaj hohmuth grajcar jens fogh hostnames
 operate resized jni yjp ownable starvation reaper biased introduce epoll hangs
 compaction aggressive powerful traversing pietrzak michi karl rewriting consequences
 linearly patching perfect hole sip enwiki flooding uniformly recursions happening
-
-permanently thrusted nucleus forbidden
+permanently nucleus forbidden student trusted