You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by jt...@apache.org on 2005/11/24 00:34:36 UTC

svn commit: r348592 [1/2] - in /db/derby/site/trunk: build/site/ build/site/papers/ src/documentation/content/xdocs/ src/documentation/content/xdocs/papers/

Author: jta
Date: Wed Nov 23 15:34:21 2005
New Revision: 348592

URL: http://svn.apache.org/viewcvs?rev=348592&view=rev
Log:
Moved the information on the Papers tab for the Instruction section and the
Articles and Books section to the Derby Wiki to make it easier for anyone to 
add new entries. Also modified the site menu for the Papers tab, thus
all papers on that tab were modified.

Modified:
    db/derby/site/trunk/build/site/linkmap.html
    db/derby/site/trunk/build/site/papers/ApacheConUs04.html
    db/derby/site/trunk/build/site/papers/DerbyClientSpec.html
    db/derby/site/trunk/build/site/papers/Intersect-design.html
    db/derby/site/trunk/build/site/papers/JDBCImplementation.html
    db/derby/site/trunk/build/site/papers/MiscPresentations.html
    db/derby/site/trunk/build/site/papers/btree_package.html
    db/derby/site/trunk/build/site/papers/derby_arch.html
    db/derby/site/trunk/build/site/papers/derby_htw.html
    db/derby/site/trunk/build/site/papers/derby_web.html
    db/derby/site/trunk/build/site/papers/fortune_tut.html
    db/derby/site/trunk/build/site/papers/index.html
    db/derby/site/trunk/build/site/papers/logformats.html
    db/derby/site/trunk/build/site/papers/optimizer.html
    db/derby/site/trunk/build/site/papers/pageformats.html
    db/derby/site/trunk/build/site/papers/recovery.html
    db/derby/site/trunk/build/site/papers/versionupgrade.html
    db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/site.xml

Modified: db/derby/site/trunk/build/site/linkmap.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/linkmap.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/linkmap.html (original)
+++ db/derby/site/trunk/build/site/linkmap.html Wed Nov 23 15:34:21 2005
@@ -105,7 +105,7 @@
 <a href="logo_contest.html">Logo Contest</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Papers</div>
 <div id="menu_1.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="papers/index.html">Index</a>
@@ -113,6 +113,12 @@
 <div class="menuitem">
 <a href="papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Derby Engine</div>
 <div id="menu_1.4" class="menuitemgroup">
@@ -183,48 +189,9 @@
 <a href="papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.7', 'skin/')" id="menu_1.7Title" class="menutitle">Instruction</div>
+<div onclick="SwitchMenu('menu_1.7', 'skin/')" id="menu_1.7Title" class="menutitle">Integration</div>
 <div id="menu_1.7" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.8', 'skin/')" id="menu_1.8Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.8" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.9', 'skin/')" id="menu_1.9Title" class="menutitle">Integration</div>
-<div id="menu_1.9" class="menuitemgroup">
-<div class="menuitem">
 <a href="integrate/index.html">Index</a>
 </div>
 <div class="menuitem">
@@ -261,8 +228,8 @@
 <a href="integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.10', 'skin/')" id="menu_1.10Title" class="menutitle">Eclipse Plug-ins</div>
-<div id="menu_1.10" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8', 'skin/')" id="menu_1.8Title" class="menutitle">Eclipse Plug-ins</div>
+<div id="menu_1.8" class="menuitemgroup">
 <div class="menuitem">
 <a href="integrate/derby_plugin.html">10.1 Core</a>
 </div>
@@ -278,16 +245,16 @@
 <div class="menuitem">
 <a href="integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_1.10.6', 'skin/')" id="menu_1.10.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_1.10.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.6', 'skin/')" id="menu_1.8.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_1.8.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
 <a href="integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_1.10.6.3', 'skin/')" id="menu_1.10.6.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.10.6.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.6.3', 'skin/')" id="menu_1.8.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.8.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -298,8 +265,8 @@
 <a href="integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.10.6.4', 'skin/')" id="menu_1.10.6.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.10.6.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.6.4', 'skin/')" id="menu_1.8.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.8.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -313,8 +280,8 @@
 <div class="menuitem">
 <a href="integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.10.6.6', 'skin/')" id="menu_1.10.6.6Title" class="menutitle">ij</div>
-<div id="menu_1.10.6.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.6.6', 'skin/')" id="menu_1.8.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.8.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>
@@ -336,13 +303,13 @@
 </div>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11', 'skin/')" id="menu_1.11Title" class="menutitle">Manuals</div>
-<div id="menu_1.11" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9', 'skin/')" id="menu_1.9Title" class="menutitle">Manuals</div>
+<div id="menu_1.9" class="menuitemgroup">
 <div class="menuitem">
 <a href="manuals/index.html">About</a>
 </div>
-<div onclick="SwitchMenu('menu_1.11.2', 'skin/')" id="menu_1.11.2Title" class="menutitle">10.0 Manuals</div>
-<div id="menu_1.11.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.2', 'skin/')" id="menu_1.9.2Title" class="menutitle">10.0 Manuals</div>
+<div id="menu_1.9.2" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/10.0/publishedapi">API</a>
 </div>
@@ -371,16 +338,16 @@
 <a href="http://db.apache.org/derby/docs/10.0/manuals/tools/tools02.html">Tools &amp; Utility Guide</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11.3', 'skin/')" id="menu_1.11.3Title" class="menutitle">10.1 Manuals</div>
-<div id="menu_1.11.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.3', 'skin/')" id="menu_1.9.3Title" class="menutitle">10.1 Manuals</div>
+<div id="menu_1.9.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/10.1/publishedapi">API</a>
 </div>
 <div class="menuitem">
 <a href="manuals/dita.html">DITA Source</a>
 </div>
-<div onclick="SwitchMenu('menu_1.11.3.3', 'skin/')" id="menu_1.11.3.3Title" class="menutitle">Getting Started</div>
-<div id="menu_1.11.3.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.3.3', 'skin/')" id="menu_1.9.3.3Title" class="menutitle">Getting Started</div>
+<div id="menu_1.9.3.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/10.1/getstart/getstartderby.pdf">PDF</a>
 </div>
@@ -391,8 +358,8 @@
 <a href="http://db.apache.org/derby/docs/10.1/getstart/">HTML Files</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11.3.4', 'skin/')" id="menu_1.11.3.4Title" class="menutitle">Reference</div>
-<div id="menu_1.11.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.3.4', 'skin/')" id="menu_1.9.3.4Title" class="menutitle">Reference</div>
+<div id="menu_1.9.3.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/10.1/ref/refderby.pdf">PDF</a>
 </div>
@@ -403,8 +370,8 @@
 <a href="http://db.apache.org/derby/docs/10.1/ref/">HTML Files</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11.3.5', 'skin/')" id="menu_1.11.3.5Title" class="menutitle">Developer's Guide</div>
-<div id="menu_1.11.3.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.3.5', 'skin/')" id="menu_1.9.3.5Title" class="menutitle">Developer's Guide</div>
+<div id="menu_1.9.3.5" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/10.1/devguide/derbydev.pdf">PDF</a>
 </div>
@@ -415,8 +382,8 @@
 <a href="http://db.apache.org/derby/docs/10.1/devguide/">HTML Files</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11.3.6', 'skin/')" id="menu_1.11.3.6Title" class="menutitle">Tuning Derby</div>
-<div id="menu_1.11.3.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.3.6', 'skin/')" id="menu_1.9.3.6Title" class="menutitle">Tuning Derby</div>
+<div id="menu_1.9.3.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/10.1/tuning/tuningderby.pdf">PDF</a>
 </div>
@@ -427,8 +394,8 @@
 <a href="http://db.apache.org/derby/docs/10.1/tuning/">HTML Files</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11.3.7', 'skin/')" id="menu_1.11.3.7Title" class="menutitle">Server &amp; Admin</div>
-<div id="menu_1.11.3.7" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.3.7', 'skin/')" id="menu_1.9.3.7Title" class="menutitle">Server &amp; Admin</div>
+<div id="menu_1.9.3.7" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/10.1/adminguide/derbyadmin.pdf">PDF</a>
 </div>
@@ -439,8 +406,8 @@
 <a href="http://db.apache.org/derby/docs/10.1/adminguide/">HTML Files</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11.3.8', 'skin/')" id="menu_1.11.3.8Title" class="menutitle">Tools &amp; Utility Guide</div>
-<div id="menu_1.11.3.8" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.3.8', 'skin/')" id="menu_1.9.3.8Title" class="menutitle">Tools &amp; Utility Guide</div>
+<div id="menu_1.9.3.8" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/10.1/tools/derbytools.pdf">PDF</a>
 </div>
@@ -452,16 +419,16 @@
 </div>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11.4', 'skin/')" id="menu_1.11.4Title" class="menutitle">Latest Alpha Manuals</div>
-<div id="menu_1.11.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.4', 'skin/')" id="menu_1.9.4Title" class="menutitle">Latest Alpha Manuals</div>
+<div id="menu_1.9.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
 </div>
 <div class="menuitem">
 <a href="manuals/dita.html">DITA Source</a>
 </div>
-<div onclick="SwitchMenu('menu_1.11.4.3', 'skin/')" id="menu_1.11.4.3Title" class="menutitle">Getting Started</div>
-<div id="menu_1.11.4.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.4.3', 'skin/')" id="menu_1.9.4.3Title" class="menutitle">Getting Started</div>
+<div id="menu_1.9.4.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/dev/getstart/getstartderby.pdf">PDF</a>
 </div>
@@ -472,8 +439,8 @@
 <a href="http://db.apache.org/derby/docs/dev/getstart/">HTML Files</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11.4.4', 'skin/')" id="menu_1.11.4.4Title" class="menutitle">Reference</div>
-<div id="menu_1.11.4.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.4.4', 'skin/')" id="menu_1.9.4.4Title" class="menutitle">Reference</div>
+<div id="menu_1.9.4.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/dev/ref/refderby.pdf">PDF</a>
 </div>
@@ -484,8 +451,8 @@
 <a href="http://db.apache.org/derby/docs/dev/ref/">HTML Files</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11.4.5', 'skin/')" id="menu_1.11.4.5Title" class="menutitle">Developer's Guide</div>
-<div id="menu_1.11.4.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.4.5', 'skin/')" id="menu_1.9.4.5Title" class="menutitle">Developer's Guide</div>
+<div id="menu_1.9.4.5" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/dev/devguide/derbydev.pdf">PDF</a>
 </div>
@@ -496,8 +463,8 @@
 <a href="http://db.apache.org/derby/docs/dev/devguide/">HTML Files</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11.4.6', 'skin/')" id="menu_1.11.4.6Title" class="menutitle">Tuning Derby</div>
-<div id="menu_1.11.4.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.4.6', 'skin/')" id="menu_1.9.4.6Title" class="menutitle">Tuning Derby</div>
+<div id="menu_1.9.4.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/dev/tuning/tuningderby.pdf">PDF</a>
 </div>
@@ -508,8 +475,8 @@
 <a href="http://db.apache.org/derby/docs/dev/tuning/">HTML Files</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11.4.7', 'skin/')" id="menu_1.11.4.7Title" class="menutitle">Server &amp; Admin</div>
-<div id="menu_1.11.4.7" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.4.7', 'skin/')" id="menu_1.9.4.7Title" class="menutitle">Server &amp; Admin</div>
+<div id="menu_1.9.4.7" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/dev/adminguide/derbyadmin.pdf">PDF</a>
 </div>
@@ -520,8 +487,8 @@
 <a href="http://db.apache.org/derby/docs/dev/adminguide/">HTML Files</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.11.4.8', 'skin/')" id="menu_1.11.4.8Title" class="menutitle">Tools &amp; Utility Guide</div>
-<div id="menu_1.11.4.8" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.4.8', 'skin/')" id="menu_1.9.4.8Title" class="menutitle">Tools &amp; Utility Guide</div>
+<div id="menu_1.9.4.8" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/docs/dev/tools/derbytools.pdf">PDF</a>
 </div>
@@ -658,7 +625,7 @@
   
 <ul>
 <li>
-<a href="papers/">About</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>papers</em>
+<a href="papers/">Papers</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>papers</em>
 </li>
 <ul>
        
@@ -673,6 +640,18 @@
 <a href="papers/derby_web.html">Derby Web Site</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_web</em>
 </li>
 </ul>
+       
+<ul>
+<li>
+<a class="external" href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>howto</em>
+</li>
+</ul>
+       
+<ul>
+<li>
+<a class="external" href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>articles</em>
+</li>
+</ul>
   
 </ul>
 </ul>
@@ -830,91 +809,7 @@
 </ul>
 </ul>
 
-  
-<ul>
-<li>
-<a href="papers/">Instruction</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>howto</em>
-</li>
-<ul>
-      
-<ul>
-<li>
-<a class="external" href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>php</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="papers/fortune_tut.html">Embedded Tutorial</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tut</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a class="external" href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>jdbc_oi</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a class="external" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dw_detct</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a class="external" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>birt</em>
-</li>
-</ul>
-  
-</ul>
-</ul>
 
-  
-<ul>
-<li>
-<a href="papers/">Articles/Books</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>articles</em>
-</li>
-<ul>
-    
-<ul>
-<li>
-<a class="external" href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dbltake</em>
-</li>
-</ul>
-    
-<ul>
-<li>
-<a class="external" href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>vsg</em>
-</li>
-</ul>
-    
-<ul>
-<li>
-<a class="external" href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>javardb</em>
-</li>
-</ul>
-    
-<ul>
-<li>
-<a class="external" href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>mysql</em>
-</li>
-</ul>
-    
-<ul>
-<li>
-<a class="external" href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dW</em>
-</li>
-</ul>
-    
-<ul>
-<li>
-<a class="external" href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>racing</em>
-</li>
-</ul>
-  
-</ul>
-</ul>
 
   
 <ul>

Modified: db/derby/site/trunk/build/site/papers/ApacheConUs04.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/ApacheConUs04.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/ApacheConUs04.html (original)
+++ db/derby/site/trunk/build/site/papers/ApacheConUs04.html Wed Nov 23 15:34:21 2005
@@ -63,7 +63,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Papers</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -71,6 +71,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Derby Engine</div>
 <div id="menu_1.2" class="menuitemgroup">
@@ -139,45 +145,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/DerbyClientSpec.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/DerbyClientSpec.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyClientSpec.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyClientSpec.html Wed Nov 23 15:34:21 2005
@@ -66,7 +66,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Papers</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -74,6 +74,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Derby Engine</div>
 <div id="menu_1.2" class="menuitemgroup">
@@ -142,45 +148,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/Intersect-design.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/Intersect-design.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/Intersect-design.html (original)
+++ db/derby/site/trunk/build/site/papers/Intersect-design.html Wed Nov 23 15:34:21 2005
@@ -65,7 +65,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Papers</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -73,6 +73,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Derby Engine</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -141,45 +147,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/JDBCImplementation.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/JDBCImplementation.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/JDBCImplementation.html (original)
+++ db/derby/site/trunk/build/site/papers/JDBCImplementation.html Wed Nov 23 15:34:21 2005
@@ -70,7 +70,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Papers</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -78,6 +78,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Derby Engine</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -146,45 +152,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/MiscPresentations.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/MiscPresentations.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/MiscPresentations.html (original)
+++ db/derby/site/trunk/build/site/papers/MiscPresentations.html Wed Nov 23 15:34:21 2005
@@ -63,7 +63,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Papers</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -71,6 +71,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Derby Engine</div>
 <div id="menu_1.2" class="menuitemgroup">
@@ -139,45 +145,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/btree_package.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/btree_package.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/btree_package.html (original)
+++ db/derby/site/trunk/build/site/papers/btree_package.html Wed Nov 23 15:34:21 2005
@@ -65,7 +65,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Papers</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -73,6 +73,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Derby Engine</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -141,45 +147,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/derby_arch.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/derby_arch.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/derby_arch.html (original)
+++ db/derby/site/trunk/build/site/papers/derby_arch.html Wed Nov 23 15:34:21 2005
@@ -63,7 +63,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Papers</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -71,6 +71,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Derby Engine</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -139,45 +145,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/derby_htw.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/derby_htw.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/derby_htw.html (original)
+++ db/derby/site/trunk/build/site/papers/derby_htw.html Wed Nov 23 15:34:21 2005
@@ -63,7 +63,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Papers</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -71,6 +71,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Derby Engine</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -139,45 +145,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/derby_web.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/derby_web.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/derby_web.html (original)
+++ db/derby/site/trunk/build/site/papers/derby_web.html Wed Nov 23 15:34:21 2005
@@ -63,7 +63,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_selected_1.1', '../skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">About</div>
+<div onclick="SwitchMenu('menu_selected_1.1', '../skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Papers</div>
 <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -71,6 +71,12 @@
 <div class="menupage">
 <div class="menupagetitle">Derby Web Site</div>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Derby Engine</div>
 <div id="menu_1.2" class="menuitemgroup">
@@ -139,45 +145,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/fortune_tut.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/fortune_tut.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/fortune_tut.html (original)
+++ db/derby/site/trunk/build/site/papers/fortune_tut.html Wed Nov 23 15:34:21 2005
@@ -42,8 +42,8 @@
 <li>
 <a class="base-not-selected" href="../manuals/index.html">Manuals</a>
 </li>
-<li class="current">
-<a class="base-selected" href="../papers/index.html">Papers</a>
+<li>
+<a class="base-not-selected" href="../papers/index.html">Papers</a>
 </li>
 <li>
 <a class="base-not-selected" href="../integrate/index.html">Integration</a>
@@ -63,19 +63,67 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Derby</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
+<a href="../index.html">Welcome</a>
+</div>
+<div class="menuitem">
+<a href="../license.html">License</a>
+</div>
+<div class="menuitem">
+<a href="../derby_proposal.html">Proposal</a>
+</div>
+<div class="menuitem">
+<a href="../faq.html">FAQs</a>
+</div>
+<div class="menuitem">
+<a href="../derby_downloads.html">Downloads</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Community</div>
+<div id="menu_1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="../derby_comm.html">Get Involved!</a>
+</div>
+<div class="menuitem">
+<a href="../derby_mail.html">Mailing Lists</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby">Wiki</a>
+</div>
+<div class="menuitem">
+<a href="../DerbyBugGuidelines.html">BUGS</a>
+</div>
+<div class="menuitem">
+<a href="../derby_tests.html">Tests</a>
+</div>
+<div class="menuitem">
+<a href="../DerbyToDo.html">To-Do</a>
+</div>
+<div class="menuitem">
+<a href="../logo_contest.html">Logo Contest</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3', '../skin/')" id="menu_1.3Title" class="menutitle">Papers</div>
+<div id="menu_1.3" class="menuitemgroup">
+<div class="menuitem">
 <a href="../papers/index.html">Index</a>
 </div>
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Derby Engine</div>
-<div id="menu_1.2" class="menuitemgroup">
-<div onclick="SwitchMenu('menu_1.2.1', '../skin/')" id="menu_1.2.1Title" class="menutitle">Javadoc</div>
-<div id="menu_1.2.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.4.1', '../skin/')" id="menu_1.4.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.4.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
 </div>
@@ -123,14 +171,14 @@
 <a href="../papers/versionupgrade.html">Versioning</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.3', '../skin/')" id="menu_1.3Title" class="menutitle">Derby Network Client</div>
-<div id="menu_1.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.5" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/DerbyClientSpec.html">Functional Spec</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
-<div id="menu_1.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Presentations</div>
+<div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
@@ -141,43 +189,316 @@
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.5', '../skin/')" id="menu_selected_1.5Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Instruction</div>
-<div id="menu_selected_1.5" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_1.7', '../skin/')" id="menu_1.7Title" class="menutitle">Integration</div>
+<div id="menu_1.7" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
+<a href="../integrate/index.html">Index</a>
 </div>
-<div class="menupage">
-<div class="menupagetitle">Embedded Tutorial</div>
+<div class="menuitem">
+<a href="../integrate/misc.html">Summary</a>
 </div>
 <div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
+<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
+<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
 </div>
 <div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+<a href="../integrate/DOTS_Derby.htm">DOTS Derby</a>
 </div>
+<div class="menuitem">
+<a href="../binaries/UsingDotsDerbySystemTest.pdf">DOTS System</a>
+</div>
+<div class="menuitem">
+<a href="../binaries/DerbyCodeCoverageUsingEmma.pdf">EMMA</a>
+</div>
+<div class="menuitem">
+<a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/db_torque.html">Torque</a>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
+<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8', '../skin/')" id="menu_1.8Title" class="menutitle">Eclipse Plug-ins</div>
+<div id="menu_1.8" class="menuitemgroup">
+<div class="menuitem">
+<a href="../integrate/derby_plugin.html">10.1 Core</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/func_spec_plugins.html">1.0 UI Functional Spec</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_howto.html">10.1 Core and 1.1 UI</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/Readme.html">Building 1.1 UI</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
+</div>
+<div onclick="SwitchMenu('menu_1.8.6', '../skin/')" id="menu_1.8.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_1.8.6" class="menuitemgroup">
+<div class="menuitem">
+<a href="../integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
+<a href="../integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
+<div onclick="SwitchMenu('menu_1.8.6.3', '../skin/')" id="menu_1.8.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.8.6.3" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
+<a href="../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
 <div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
+<a href="../integrate/plugin_help/nature.html">Adding the Derby Nature</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+<a href="../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8.6.4', '../skin/')" id="menu_1.8.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.8.6.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
+<a href="../integrate/plugin_help/start_server.html">Starting the Server</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/stop_server.html">Stopping the Server</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/properties.html">Derby Properties</a>
+</div>
+<div onclick="SwitchMenu('menu_1.8.6.6', '../skin/')" id="menu_1.8.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.8.6.6" class="menuitemgroup">
+<div class="menuitem">
+<a href="../integrate/plugin_help/ij_toc.html">Using ij</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/ij.html">SQL commands</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/ij2.html">SQL scripts</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/derby_app.html">Building a Java App</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/sysinfo.html">Running sysinfo</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/resources.html">Derby Manuals</a>
+</div>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9', '../skin/')" id="menu_1.9Title" class="menutitle">Manuals</div>
+<div id="menu_1.9" class="menuitemgroup">
+<div class="menuitem">
+<a href="../manuals/index.html">About</a>
+</div>
+<div onclick="SwitchMenu('menu_1.9.2', '../skin/')" id="menu_1.9.2Title" class="menutitle">10.0 Manuals</div>
+<div id="menu_1.9.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/publishedapi">API</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/docs-10.0.zip">All docs: zip</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/docs-10.0.tar.gz">All docs: tar.gz</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/manuals/getstart/gspr02.html">Getting Started</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/manuals/reference/sqlj02.html">Reference Manual</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/manuals/develop/develop02.html">Developer's Guide</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/manuals/tuning/perf02.html">Tuning Derby</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/manuals/admin/hubprnt02.html">Server &amp; Admin Guide</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/manuals/tools/tools02.html">Tools &amp; Utility Guide</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3', '../skin/')" id="menu_1.9.3Title" class="menutitle">10.1 Manuals</div>
+<div id="menu_1.9.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/publishedapi">API</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/dita.html">DITA Source</a>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3.3', '../skin/')" id="menu_1.9.3.3Title" class="menutitle">Getting Started</div>
+<div id="menu_1.9.3.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/getstart/getstartderby.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/getstart/getstart-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/getstart/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3.4', '../skin/')" id="menu_1.9.3.4Title" class="menutitle">Reference</div>
+<div id="menu_1.9.3.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/ref/refderby.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/ref/ref-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/ref/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3.5', '../skin/')" id="menu_1.9.3.5Title" class="menutitle">Developer's Guide</div>
+<div id="menu_1.9.3.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/devguide/derbydev.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/devguide/devguide-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/devguide/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3.6', '../skin/')" id="menu_1.9.3.6Title" class="menutitle">Tuning Derby</div>
+<div id="menu_1.9.3.6" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/tuning/tuningderby.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/tuning/tuning-single">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/tuning/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3.7', '../skin/')" id="menu_1.9.3.7Title" class="menutitle">Server &amp; Admin</div>
+<div id="menu_1.9.3.7" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/adminguide/derbyadmin.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/adminguide/adminguide-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/adminguide/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3.8', '../skin/')" id="menu_1.9.3.8Title" class="menutitle">Tools &amp; Utility Guide</div>
+<div id="menu_1.9.3.8" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/tools/derbytools.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/tools/tools-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/tools/">HTML Files</a>
+</div>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4', '../skin/')" id="menu_1.9.4Title" class="menutitle">Latest Alpha Manuals</div>
+<div id="menu_1.9.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/dita.html">DITA Source</a>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4.3', '../skin/')" id="menu_1.9.4.3Title" class="menutitle">Getting Started</div>
+<div id="menu_1.9.4.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/getstart/getstartderby.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/getstart/getstart-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/getstart/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4.4', '../skin/')" id="menu_1.9.4.4Title" class="menutitle">Reference</div>
+<div id="menu_1.9.4.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/ref/refderby.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/ref/ref-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/ref/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4.5', '../skin/')" id="menu_1.9.4.5Title" class="menutitle">Developer's Guide</div>
+<div id="menu_1.9.4.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/devguide/derbydev.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/devguide/devguide-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/devguide/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4.6', '../skin/')" id="menu_1.9.4.6Title" class="menutitle">Tuning Derby</div>
+<div id="menu_1.9.4.6" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/tuning/tuningderby.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/tuning/tuning-single">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/tuning/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4.7', '../skin/')" id="menu_1.9.4.7Title" class="menutitle">Server &amp; Admin</div>
+<div id="menu_1.9.4.7" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/adminguide/derbyadmin.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/adminguide/adminguide-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/adminguide/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4.8', '../skin/')" id="menu_1.9.4.8Title" class="menutitle">Tools &amp; Utility Guide</div>
+<div id="menu_1.9.4.8" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/tools/derbytools.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/tools/tools-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/tools/">HTML Files</a>
+</div>
+</div>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/index.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/index.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/index.html (original)
+++ db/derby/site/trunk/build/site/papers/index.html Wed Nov 23 15:34:21 2005
@@ -63,7 +63,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_selected_1.1', '../skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">About</div>
+<div onclick="SwitchMenu('menu_selected_1.1', '../skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Papers</div>
 <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menupage">
 <div class="menupagetitle">Index</div>
@@ -71,6 +71,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Derby Engine</div>
 <div id="menu_1.2" class="menuitemgroup">
@@ -141,45 +147,6 @@
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
-</div>
-</div>
 <div id="credit">
 <hr>
 <a href="http://forrest.apache.org/"><img border="0" title="Built with Apache Forrest" alt="Built with Apache Forrest - logo" src="../images/built-with-forrest-button.png" style="width: 88px;height: 31px;"></a>
@@ -441,127 +408,26 @@
 <a name="N1019D"></a><a name="Instruction"></a>
 <h2 class="boxed">Instruction</h2>
 <div class="section">
-<ul>
-  
-<li>
-  The
-<a class="external" href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Deep 
-   Dive with Apache Derby: Perl, PHP, and Python</a> tutorial,
-   from OSCON 2005, highlights non-java access to Derby databases.
-  </li>
-  
-<li>
-  The <a href="fortune_tut.html">Apache Derby Fortune Server Tutorial</a>,
-  from ApacheCon US 2004,
-  highlights integrating Apache software with Derby in Derby's
-  embedded environment.
-  </li>
-  
-<li>
-  The 
-  <a class="external" href="http://objectinnovations.com/CourseOutlines/168.html">Object
-  Innovations JDBC Course</a>
-  is commercial courseware that uses Derby as the default database.
-  </li>
-  
-<li>
-  The developerWorks
-  <a class="external" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a> introduces users
-  to relational database concepts using Derby.
-  </li>
-  
-<li> The
-  <a class="external" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-  tutorial includes the Derby engine+embedded driver and a sample Derby database.
-  </li>
-  
-</ul>
+<p>
+The information in this section was moved to the
+<a class="external" href="http://wiki.apache.org/db-derby/DerbyInstruction">Derby Wiki</a>
+to make it easier for anyone to add new entries.
+</p>
 </div>
 
 
-<a name="N101CA"></a><a name="Articles+and+Books"></a>
+<a name="N101AB"></a><a name="Articles+and+Books"></a>
 <h2 class="boxed">Articles and Books</h2>
-<div class="section"></div>
-
-
-<table class="ForrestTable" cellspacing="1" cellpadding="4">
-
-<tr>
-<th colspan="1" rowspan="1">Navigation Menu Entry</th>
-    <th colspan="1" rowspan="1">Title</th>
-    <th colspan="1" rowspan="1">Author</th>
-    <th colspan="1" rowspan="1">Publication</th>
-</tr>
-
-<tr>
-  
-<td colspan="1" rowspan="1">Double Take</td>
-  <td colspan="1" rowspan="1">
-   <em><a class="external" href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a></em> 
-   </td>
-   <td colspan="1" rowspan="1">Paul C. Zikopoulos</td>
-   <td colspan="1" rowspan="1">DB2 Magazine (no date)</td>
-
-</tr>
-
-<tr>
-  
-<td colspan="1" rowspan="1">Flying</td>
-  <td colspan="1" rowspan="1"><em><a class="external" href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying
-   out of the gate with Derby</a></em> 
-   </td>
-   <td colspan="1" rowspan="1">Sing Li</td>
-    <td colspan="1" rowspan="1">VSJ (June 30, 2005)</td>
-
-</tr>
-
-<tr>
-  
-<td colspan="1" rowspan="1">Java RDBMS</td>
-  <td colspan="1" rowspan="1"><em><a class="external" href="http://www.linux-mag.com/content/view/2134/">Derby:
-     The Java Relational Database</a></em> 
-  </td>
-  <td colspan="1" rowspan="1">Stanley Bradbury and David Fallside</td>
-  <td colspan="1" rowspan="1">Linux Magazine (September 18, 2005)</td>
-
-</tr>
-
-<tr>
-  
-<td colspan="1" rowspan="1">Versus MySQL</td>
-  <td colspan="1" rowspan="1"> <em><a class="external" href="http://www.devx.com/IBMCloudscape/Article/28526/1763">IBM's
-   Cloudscape Versus MySQL</a></em>
-  </td>
-  <td colspan="1" rowspan="1"> Roger Smith</td>
-  <td colspan="1" rowspan="1">DevX (June 28, 2005)  </td>
-
-</tr>
-
-<tr>
-  
-<td colspan="1" rowspan="1">developerWorks</td>
-  <td colspan="1" rowspan="1"><a class="external" href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a></td>
-   <td colspan="1" rowspan="1">Various</td>
-   <td colspan="1" rowspan="1">Web site hosts technical articles about Derby.
-  </td>
-
-</tr>
-
-<tr>
-  
-<td colspan="1" rowspan="1">Off to Races</td>
-  <td colspan="1" rowspan="1">
-   <em><a class="external" href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Apache Derby -- Off to the Races</a></em> 
-   </td>
-   <td colspan="1" rowspan="1">Paul C. Zikopoulos, George Baklarz, Dan Scott</td>
-   <td colspan="1" rowspan="1">IBM Press (2006)</td>
-
-</tr>
-
-</table>
+<div class="section">
+<p>
+The information in this section was moved to the
+<a class="external" href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Derby Wiki</a>
+to make it easier for anyone to add new entries.
+</p>
+</div>
 
 
-<a name="N1028C"></a><a name="How+to+Contribute+Papers"></a>
+<a name="N101B9"></a><a name="How+to+Contribute+Papers"></a>
 <h2 class="boxed">How to Contribute Papers</h2>
 <div class="section">
 <p>
@@ -653,7 +519,7 @@
 
 
 <p>
-<em>Last Updated: September 19, 2005</em>
+<em>Last Updated: November 23, 2005</em>
 </p>
 
 </div>

Modified: db/derby/site/trunk/build/site/papers/logformats.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/logformats.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/logformats.html (original)
+++ db/derby/site/trunk/build/site/papers/logformats.html Wed Nov 23 15:34:21 2005
@@ -63,7 +63,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Papers</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -71,6 +71,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Derby Engine</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -139,45 +145,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/optimizer.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/optimizer.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/optimizer.html (original)
+++ db/derby/site/trunk/build/site/papers/optimizer.html Wed Nov 23 15:34:21 2005
@@ -63,7 +63,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Papers</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -71,6 +71,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Derby Engine</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -139,45 +145,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/pageformats.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/pageformats.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/pageformats.html (original)
+++ db/derby/site/trunk/build/site/papers/pageformats.html Wed Nov 23 15:34:21 2005
@@ -63,7 +63,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Papers</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -71,6 +71,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Derby Engine</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -139,45 +145,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/recovery.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/recovery.html?rev=348592&r1=348591&r2=348592&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/recovery.html (original)
+++ db/derby/site/trunk/build/site/papers/recovery.html Wed Nov 23 15:34:21 2005
@@ -63,7 +63,7 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Papers</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Index</a>
@@ -71,6 +71,12 @@
 <div class="menuitem">
 <a href="../papers/derby_web.html">Derby Web Site</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Derby Engine</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -139,45 +145,6 @@
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Instruction</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://coffeecode.net/archives/16-Apache-Derby-tutorial-OSCON-2005-materials.html">Derby+Perl/PHP/Python</a>
-</div>
-<div class="menuitem">
-<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-</div>
-<div class="menuitem">
-<a href="http://objectinnovations.com/CourseOutlines/168.html">Object Innovations JDBC Course</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
-</div>
-<div class="menuitem">
-<a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
-<div id="menu_1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
-</div>
-<div class="menuitem">
-<a href="http://www.vsj.co.uk/databases/display.asp?id=466">Flying</a>
-</div>
-<div class="menuitem">
-<a href="http://www.linux-mag.com/content/view/2134/">Java RDBMS</a>
-</div>
-<div class="menuitem">
-<a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
-</div>
-<div class="menuitem">
-<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>