Fix spelling and formatting

h2/src/docsrc/html/changelog.html

@@ -29,7 +29,7 @@ Change Log
 </li>
 <li>Issue #1632: TestMVTableEngine failure
 </li>
-<li>PR #1631: Prepere to release: javadoc cleanup
+<li>PR #1631: Prepare to release: javadoc cleanup
 </li>
 <li>PR #1630: fix duplicate words typos in comments and javadoc
 </li>

h2/src/docsrc/textbase/_text_en.prop

@@ -37,7 +37,7 @@ adminTranslateStart=Translate
 helpAction=Action
 helpAddAnotherRow=Add another row
 helpAddDrivers=Adding Database Drivers
-helpAddDriversText=Additional database drivers can be registered by adding the Jar file location of the driver to the the environment variables H2DRIVERS or CLASSPATH. Example (Windows): to add the database driver library  C:/Programs/hsqldb/lib/hsqldb.jar, set the environment variable H2DRIVERS to  C:/Programs/hsqldb/lib/hsqldb.jar.
+helpAddDriversText=Additional database drivers can be registered by adding the Jar file location of the driver to the environment variables H2DRIVERS or CLASSPATH. Example (Windows): to add the database driver library  C:/Programs/hsqldb/lib/hsqldb.jar, set the environment variable H2DRIVERS to  C:/Programs/hsqldb/lib/hsqldb.jar.
 helpAddRow=Add a new row
 helpCommandHistory=Shows the Command History
 helpCreateTable=Create a new table

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

@@ -1297,7 +1297,8 @@ public class MVMap<K, V> extends AbstractMap<K, V>
                 }
                 p = replacePage(pos, p, unsavedMemoryHolder);
 
-                RootReference updatedRootReference = new RootReference(rootReference, p, remainingBuffer, lockedForUpdate);
+                RootReference updatedRootReference = new RootReference(rootReference, p, remainingBuffer,
+                        lockedForUpdate);
                 if (root.compareAndSet(rootReference, updatedRootReference)) {
                     lockedRootReference = null;
                     while (tip != null) {
@@ -1422,7 +1423,8 @@ public class MVMap<K, V> extends AbstractMap<K, V>
          */
         public  final    byte          appendCounter;
 
-        RootReference(Page root, long version, RootReference previous, int appendCounter, long updateCounter, long updateAttemptCounter) {
+        RootReference(Page root, long version, RootReference previous, int appendCounter, long updateCounter,
+                long updateAttemptCounter) {
             this.root = root;
             this.version = version;
             this.previous = previous;

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

@@ -1038,7 +1038,7 @@ public abstract class Page implements Cloneable
         }
 
         @Override
-        public void expand(int keyCount, Object[] extraKys, Object[] extraValues) {
+        public void expand(int keyCount, Object[] extraKeys, Object[] extraValues) {
             throw new UnsupportedOperationException();
         }
 

h2/src/main/org/h2/mvstore/tx/TransactionMap.java

@@ -178,7 +178,8 @@ public class TransactionMap<K, V> extends AbstractMap<K, V> {
                                     int txId = TransactionStore.getTransactionId(operationId);
                                     boolean isVisible = txId == transaction.transactionId ||
                                             committingTransactions.get(txId);
-                                    Object v = isVisible ? currentValue.getCurrentValue() : currentValue.getCommittedValue();
+                                    Object v = isVisible ? currentValue.getCurrentValue()
+                                            : currentValue.getCommittedValue();
                                     if (v == null) {
                                         --size;
                                     }
@@ -242,7 +243,7 @@ public class TransactionMap<K, V> extends AbstractMap<K, V> {
     }
 
     /**
-     * Appends entry to uderlying map. This method may be used concurrently,
+     * Appends entry to underlying map. This method may be used concurrently,
      * but latest appended values are not guaranteed to be visible.
      * @param key should be higher in map's order than any existing key
      * @param value to be appended
@@ -313,7 +314,8 @@ public class TransactionMap<K, V> extends AbstractMap<K, V> {
                 return res;
             }
             decisionMaker.reset();
-        } while (blockingTransaction.sequenceNum > sequenceNumWhenStarted || transaction.waitFor(blockingTransaction, map, key));
+        } while (blockingTransaction.sequenceNum > sequenceNumWhenStarted
+                || transaction.waitFor(blockingTransaction, map, key));
 
         throw DataUtils.newIllegalStateException(DataUtils.ERROR_TRANSACTION_LOCKED,
                 "Map entry <{0}> with key <{1}> and value {2} is locked by tx {3} and can not be updated by tx {4}"
@@ -719,7 +721,8 @@ public class TransactionMap<K, V> extends AbstractMap<K, V> {
                                 // current value comes from another uncommitted transaction
                                 // take committed value instead
                                 Object committedValue = data.getCommittedValue();
-                                data = committedValue == null ? null : VersionedValueCommitted.getInstance(committedValue);
+                                data = committedValue == null ? null
+                                        : VersionedValueCommitted.getInstance(committedValue);
                             }
                         }
                     }

h2/src/main/org/h2/mvstore/tx/TxDecisionMaker.java

@@ -48,7 +48,8 @@ abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue> {
             // We assume that we are looking at the final value for this transaction,
             // and if it's not the case, then it will fail later,
             // because a tree root has definitely been changed.
-            logIt(existingValue.getCurrentValue() == null ? null : VersionedValueCommitted.getInstance(existingValue.getCurrentValue()));
+            logIt(existingValue.getCurrentValue() == null ? null
+                    : VersionedValueCommitted.getInstance(existingValue.getCurrentValue()));
             decision = MVMap.Decision.PUT;
         } else if (getBlockingTransaction() != null) {
             // this entry comes from a different transaction, and this

h2/src/test/org/h2/test/db/TestDateStorage.java

@@ -178,7 +178,7 @@ public class TestDateStorage extends TestDb {
                  */
                 if (tz.getID().startsWith("SystemV/")) {
                     if (tz.getDSTSavings() < 0) {
-                       continue;
+                        continue;
                     }
                 }
                 // println(tz.getID());

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

@@ -805,4 +805,4 @@ queryparser tokenized freeze factorings recompilation unenclosed rfe dsync
 econd irst bcef ordinality nord unnest
 analyst occupation distributive josaph aor engineer sajeewa isuru randil kevin doctor businessman artist ashan
 corrupts splitted disruption unintentional octets preconditions predicates subq objectweb insn opcodes
-preserves
+preserves masking holder unboxing avert iae