Documentation fix.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,14 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>A subselect which used an index could lead to wrong results. Fixed.
+<ul><li>The H2 Console can now be used within another application, in a frame or iframe. Issue 197.
+</li><li>Recover tool: the statistics section now includes page type counts again.
+</li><li>Queries with multiple IN(...) conditions sometimes return the wrong results when there was a multi-column index for the column.
+</li><li>Queries with IN(..., NULL) did sometimes return the wrong results when there was a index for the column.
+</li><li>DECIMAL: faster precision and memory usage calculations.
+</li><li>A new class org.h2.tools.TriggerAdapter allows to use the ResultSet interface within trigger implementations.
+</li><li>A subselect which used an index could lead to wrong results. Fixed.
+</li><li>Creating a cached temporary non persistent table with a primary key threw a NullPointerException.
 </li></ul>
 
 <h2>Version 1.2.135 (2010-05-08)</h2>

h2/src/docsrc/html/roadmap.html

@@ -38,8 +38,8 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 
 <h2>Priority 2</h2>
 <ul><li>Improve test code coverage.
-</li><li>Test multi-threaded in-memory db access
 </li><li>MVCC: select for update should only lock the selected rows.
+</li><li>Test multi-threaded in-memory db access
 </li><li>Option to shutdown all the running servers (on the same VM).
 </li><li>Full outer joins.
 </li><li>Support nested outer joins (see todo.txt).

h2/src/docsrc/textbase/_text_en.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=Source file name
 tools.sourceScriptFileName=Source script file name
 tools.targetDatabaseName=Target database name
 tools.targetDatabaseURL=Target database URL
+tools.targetDirectory=Target directory
 tools.targetFileName=Target file name
 tools.targetScriptFileName=Target script file name
 tools.traceFileName=Trace file name

h2/src/main/org/h2/server/web/res/_text_de.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=Quell-Dateiname
 tools.sourceScriptFileName=Dateiname des Scripts (Quelle)
 tools.targetDatabaseName=Ziel-Datenbankname
 tools.targetDatabaseURL=Ziel-Datenbank URL
+tools.targetDirectory=Ziel-Verzeichnis
 tools.targetFileName=Ziel-Dateiname
 tools.targetScriptFileName=Dateiname des Scripts (Ziel)
 tools.traceFileName=Name der Trace Datei

h2/src/main/org/h2/server/web/res/_text_en.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=Source file name
 tools.sourceScriptFileName=Source script file name
 tools.targetDatabaseName=Target database name
 tools.targetDatabaseURL=Target database URL
+tools.targetDirectory=Target directory
 tools.targetFileName=Target file name
 tools.targetScriptFileName=Target script file name
 tools.traceFileName=Trace file name

h2/src/main/org/h2/server/web/res/_text_es.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=#Source file name
 tools.sourceScriptFileName=#Source script file name
 tools.targetDatabaseName=#Target database name
 tools.targetDatabaseURL=#Target database URL
+tools.targetDirectory=#Target directory
 tools.targetFileName=#Target file name
 tools.targetScriptFileName=#Target script file name
 tools.traceFileName=#Trace file name

h2/src/main/org/h2/server/web/res/_text_fr.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=Nom de fichier source
 tools.sourceScriptFileName=Nom du fichier script source
 tools.targetDatabaseName=Base de données cible
 tools.targetDatabaseURL=URL base de données cible
+tools.targetDirectory=Répertoire cible
 tools.targetFileName=Nom de fichier cible
 tools.targetScriptFileName=Nom de fichier script cible
 tools.traceFileName=Nom du fichier de trace

h2/src/main/org/h2/server/web/res/_text_hu.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=#Source file name
 tools.sourceScriptFileName=#Source script file name
 tools.targetDatabaseName=#Target database name
 tools.targetDatabaseURL=#Target database URL
+tools.targetDirectory=#Target directory
 tools.targetFileName=#Target file name
 tools.targetScriptFileName=#Target script file name
 tools.traceFileName=#Trace file name

h2/src/main/org/h2/server/web/res/_text_in.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=#Source file name
 tools.sourceScriptFileName=#Source script file name
 tools.targetDatabaseName=#Target database name
 tools.targetDatabaseURL=#Target database URL
+tools.targetDirectory=#Target directory
 tools.targetFileName=#Target file name
 tools.targetScriptFileName=#Target script file name
 tools.traceFileName=#Trace file name

h2/src/main/org/h2/server/web/res/_text_it.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=Nome del file sorgente
 tools.sourceScriptFileName=Nome del file script sorgente
 tools.targetDatabaseName=Nome del database destinazione
 tools.targetDatabaseURL=URL del database destinazione
+tools.targetDirectory=Directory destinazione
 tools.targetFileName=Nome del file destinazione
 tools.targetScriptFileName=Nome del file di script destinazione
 tools.traceFileName=Nome del file di traccia

h2/src/main/org/h2/server/web/res/_text_ja.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=ソースファイル名
 tools.sourceScriptFileName=ソーススクリプトファイル名
 tools.targetDatabaseName=ターゲットデータベース名
 tools.targetDatabaseURL=ターゲットデータベースURL
+tools.targetDirectory=ターゲットディレクトリ
 tools.targetFileName=ターゲットファイル名
 tools.targetScriptFileName=ターゲットスクリプトファイル名
 tools.traceFileName=トレースファイル名

h2/src/main/org/h2/server/web/res/_text_nl.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=#Source file name
 tools.sourceScriptFileName=#Source script file name
 tools.targetDatabaseName=#Target database name
 tools.targetDatabaseURL=#Target database URL
+tools.targetDirectory=#Target directory
 tools.targetFileName=#Target file name
 tools.targetScriptFileName=#Target script file name
 tools.traceFileName=#Trace file name

h2/src/main/org/h2/server/web/res/_text_pl.prop

@@ -129,11 +129,12 @@ tools.scriptFileName=Nazwa pliku skryptu
 tools.serverList=Lista serwerów
 tools.sourceDatabaseName=Nazwa źrodłowej bazy danych
 tools.sourceDatabaseURL=URL źrodłowej bazy danych
-tools.sourceDirectory=#Source directory
+tools.sourceDirectory=Źrodłowy katalog
 tools.sourceFileName=Nazwa pliku źrodłowego
 tools.sourceScriptFileName=Nazwa pliku źrodłowego skryptu
 tools.targetDatabaseName=Nazwa docelowej bazy danych
 tools.targetDatabaseURL=URL docelowej bazy danych
+tools.targetDirectory=Docelowy katalog
 tools.targetFileName=Nazwa pliku docelowego
 tools.targetScriptFileName=Nazwa pliku docelowego skryptu
 tools.traceFileName=Nazwa pliku śladu

h2/src/main/org/h2/server/web/res/_text_pt_br.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=#Source file name
 tools.sourceScriptFileName=#Source script file name
 tools.targetDatabaseName=#Target database name
 tools.targetDatabaseURL=#Target database URL
+tools.targetDirectory=#Target directory
 tools.targetFileName=#Target file name
 tools.targetScriptFileName=#Target script file name
 tools.traceFileName=#Trace file name

h2/src/main/org/h2/server/web/res/_text_pt_pt.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=#Source file name
 tools.sourceScriptFileName=#Source script file name
 tools.targetDatabaseName=#Target database name
 tools.targetDatabaseURL=#Target database URL
+tools.targetDirectory=#Target directory
 tools.targetFileName=#Target file name
 tools.targetScriptFileName=#Target script file name
 tools.traceFileName=#Trace file name

h2/src/main/org/h2/server/web/res/_text_ru.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=#Source file name
 tools.sourceScriptFileName=#Source script file name
 tools.targetDatabaseName=#Target database name
 tools.targetDatabaseURL=#Target database URL
+tools.targetDirectory=#Target directory
 tools.targetFileName=#Target file name
 tools.targetScriptFileName=#Target script file name
 tools.traceFileName=#Trace file name

h2/src/main/org/h2/server/web/res/_text_sk.prop

@@ -129,11 +129,12 @@ tools.scriptFileName=Meno súboru skriptu
 tools.serverList=Zoznam serverov
 tools.sourceDatabaseName=Meno zdrojovej databázy
 tools.sourceDatabaseURL=URL zdrojovej databázy
-tools.sourceDirectory=Cieľový priečinok
+tools.sourceDirectory=Zdrojový priečinok
 tools.sourceFileName=Meno zdrojového súboru
 tools.sourceScriptFileName=Meno súboru zdrojového skriptu
 tools.targetDatabaseName=Meno cieľovej databázy
 tools.targetDatabaseURL=URL cieľovej databázy
+tools.targetDirectory=Cieľový priečinok
 tools.targetFileName=Meno cieľového súboru
 tools.targetScriptFileName=Meno súboru cieľového skriptu
 tools.traceFileName=Meno trace súboru

h2/src/main/org/h2/server/web/res/_text_tr.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=Kaynak dosya adı
 tools.sourceScriptFileName=Kaynak betik dosya adı
 tools.targetDatabaseName=Hedef veritabanının adı
 tools.targetDatabaseURL=Hedef veritabanının  URL'u
+tools.targetDirectory=Hedef dizelge
 tools.targetFileName=Hedef dosya adı
 tools.targetScriptFileName=Hedef betik dosya adı
 tools.traceFileName=Trace dosya adı

h2/src/main/org/h2/server/web/res/_text_uk.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=#Source file name
 tools.sourceScriptFileName=#Source script file name
 tools.targetDatabaseName=#Target database name
 tools.targetDatabaseURL=#Target database URL
+tools.targetDirectory=#Target directory
 tools.targetFileName=#Target file name
 tools.targetScriptFileName=#Target script file name
 tools.traceFileName=#Trace file name

h2/src/main/org/h2/server/web/res/_text_zh_cn.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=#Source file name
 tools.sourceScriptFileName=#Source script file name
 tools.targetDatabaseName=#Target database name
 tools.targetDatabaseURL=#Target database URL
+tools.targetDirectory=#Target directory
 tools.targetFileName=#Target file name
 tools.targetScriptFileName=#Target script file name
 tools.traceFileName=#Trace file name

h2/src/main/org/h2/server/web/res/_text_zh_tw.prop

@@ -134,6 +134,7 @@ tools.sourceFileName=來源 (source) 檔案名稱
 tools.sourceScriptFileName=來源腳本 (script) 檔案名稱
 tools.targetDatabaseName=目的 (target) 資料庫名稱
 tools.targetDatabaseURL=目的 (target) 資料庫URL
+tools.targetDirectory=目的目錄 (target directory)
 tools.targetFileName=目的 (target) 檔案名稱
 tools.targetScriptFileName=目的腳本 (script) 檔案名稱
 tools.traceFileName=Trace 檔案名稱

h2/src/main/org/h2/server/web/res/login.jsp

@@ -12,7 +12,9 @@ Initial Developer: H2 Group
     <link rel="stylesheet" type="text/css" href="stylesheet.css" />
     <script type="text/javascript">
         if(self != top) {
-            top.location = "login.jsp";
+            if (self.name == 'h2result' || self.name == 'h2query' || self.name == 'h2menu') {
+                top.location = "login.jsp";
+            }
         }
     </script>
 </head>

h2/src/main/org/h2/server/web/res/tools.jsp

@@ -108,7 +108,7 @@ function update() {
         <tr><td>
         ${text.tools.sourceFileName}:&nbsp;</td><td><input id="optionRestore.0" name="file" onkeyup="update()" onchange="update()" value="~/backup.zip" size="50" />
         </td></tr><tr><td>
-        ${text.tools.sourceDirectory}:&nbsp;</td><td><input id="optionRestore.1" name="dir" onkeyup="update()" onchange="update()" value="~" size="50" />
+        ${text.tools.targetDirectory}:&nbsp;</td><td><input id="optionRestore.1" name="dir" onkeyup="update()" onchange="update()" value="~" size="50" />
         </td></tr><tr><td>
         ${text.tools.targetDatabaseName}:&nbsp;</td><td><input id="optionRestore.2" name="db" onkeyup="update()" onchange="update()" value="" size="50" />
         </td></tr>