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 2006/03/30 20:21:56 UTC

svn commit: r390204 [2/8] - in /db/derby/site/trunk: build/site/ build/site/integrate/ build/site/integrate/plugin_help/ build/site/manuals/ build/site/papers/ build/site/papers/DerbyTut/ build/site/releases/ build/site/skin/ build/site/skin/images/ sr...

Modified: db/derby/site/trunk/build/site/integrate/Readme.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/Readme.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/Readme.html (original)
+++ db/derby/site/trunk/build/site/integrate/Readme.html Thu Mar 30 10:21:49 2006
@@ -31,16 +31,19 @@
 <a class="base-not-selected" href="../index.html">Home</a>
 </li>
 <li>
-<a class="base-not-selected" href="../derby_comm.html">Community</a>
+<a class="base-not-selected" href="../quick_start.html">Quick Start</a>
+</li>
+<li>
+<a class="base-not-selected" href="../derby_downloads.html">Download</a>
 </li>
 <li>
-<a class="base-not-selected" href="../manuals/index.html">Manuals</a>
+<a class="base-not-selected" href="../derby_comm.html">Community</a>
 </li>
 <li>
-<a class="base-not-selected" href="../papers/index.html">Papers</a>
+<a class="base-not-selected" href="../manuals/index.html">Documentation</a>
 </li>
 <li class="current">
-<a class="base-selected" href="../integrate/index.html">Integration</a>
+<a class="base-selected" href="../integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -57,49 +60,16 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Integration</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Other Products</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="../integrate/index.html">Index</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
+<a href="../integrate/index.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+<a href="../integrate/index.html#uses">What works with Derby?</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
-</div>
-<div class="menuitem">
-<a href="../integrate/db_ddlutils.html">DdlUtils</a>
-</div>
-<div class="menuitem">
-<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/JPOX_Derby.html">JPOX JDO</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 class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+<a href="../integrate/index.html#products">Product Writeups</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');">Eclipse Plug-ins</div>
@@ -174,6 +144,99 @@
 </div>
 <div class="menuitem">
 <a href="../integrate/plugin_help/resources.html">Derby Manuals</a>
+</div>
+</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">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.3.2', '../skin/')" id="menu_1.3.2Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.3.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.3.2.1', '../skin/')" id="menu_1.3.2.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.3.2.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_arch.html">Architecture</a>
+</div>
+<div class="menuitem">
+<a href="../papers/btree_package.html">BTree</a>
+</div>
+<div class="menuitem">
+<a href="../papers/pageformats.html">Disk Page Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_htw.html">How Things Work</a>
+</div>
+<div class="menuitem">
+<a href="../papers/Intersect-design.html">Intersect &amp; Except</a>
+</div>
+<div class="menuitem">
+<a href="../papers/JDBCImplementation.html">JDBC</a>
+</div>
+<div class="menuitem">
+<a href="../papers/logformats.html">Log Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/recovery.html">Logging &amp; Recovery</a>
+</div>
+<div class="menuitem">
+<a href="../papers/optimizer.html">Optimizer</a>
+</div>
+<div class="menuitem">
+<a href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>
+</div>
+<div class="menuitem">
+<a href="../papers/versionupgrade.html">Versioning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.3', '../skin/')" id="menu_1.3.3Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.3.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyClientSpec.html">Functional Spec</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.4', '../skin/')" id="menu_1.3.4Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.3.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyTut/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/install_software.html">Step 1: Install Software</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.5', '../skin/')" id="menu_1.3.5Title" class="menutitle">Presentations</div>
+<div id="menu_1.3.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/ApacheCon.html">ApacheCon</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/db_ddlutils.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/db_ddlutils.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/db_ddlutils.html (original)
+++ db/derby/site/trunk/build/site/integrate/db_ddlutils.html Thu Mar 30 10:21:49 2006
@@ -31,16 +31,19 @@
 <a class="base-not-selected" href="../index.html">Home</a>
 </li>
 <li>
-<a class="base-not-selected" href="../derby_comm.html">Community</a>
+<a class="base-not-selected" href="../quick_start.html">Quick Start</a>
 </li>
 <li>
-<a class="base-not-selected" href="../manuals/index.html">Manuals</a>
+<a class="base-not-selected" href="../derby_downloads.html">Download</a>
 </li>
 <li>
-<a class="base-not-selected" href="../papers/index.html">Papers</a>
+<a class="base-not-selected" href="../derby_comm.html">Community</a>
 </li>
-<li class="current">
-<a class="base-selected" href="../integrate/index.html">Integration</a>
+<li>
+<a class="base-not-selected" href="../manuals/index.html">Documentation</a>
+</li>
+<li>
+<a class="base-not-selected" href="../integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -57,53 +60,110 @@
              &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');">Integration</div>
-<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Home</div>
+<div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="../integrate/index.html">Index</a>
+<a href="../index.html">Apache Derby</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
+<a href="../derby_charter.html">Charter</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+<a href="../quick_start.html">Quick Start</a>
+</div>
 </div>
+<div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Quick Links</div>
+<div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
+<a href="http://www.apache.org">ASF</a>
 </div>
-<div class="menupage">
-<div class="menupagetitle">DdlUtils</div>
+<div class="menuitem">
+<a href="http://db.apache.org">Apache DB Project</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/DOTS_Derby.htm">DOTS Derby</a>
+<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/UsingDotsDerbySystemTest.pdf">DOTS System</a>
+<a href="../license.html">License</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/DerbyCodeCoverageUsingEmma.pdf">EMMA</a>
+<a href="../faq.html">FAQs</a>
+</div>
 </div>
+<div onclick="SwitchMenu('menu_1.3', '../skin/')" id="menu_1.3Title" class="menutitle">Download</div>
+<div id="menu_1.3" class="menuitemgroup">
 <div class="menuitem">
-<a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
+<a href="../derby_downloads.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPOX_Derby.html">JPOX JDO</a>
+<a href="../license.html">License</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
+<a href="../releases/release-10.1.2.1.cgi">10.1.2.1</a>
+</div>
 </div>
+<div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Community</div>
+<div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
+<a href="../derby_comm.html">Get Involved!</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/db_torque.html">Torque</a>
+<a href="../faq.html">FAQs</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+<a href="../derby_mail.html">Mailing Lists</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby">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="../logo.html">Logo</a>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_web.html">Updating the web site</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Documentation</div>
+<div id="menu_1.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../manuals/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/index.html#latest">Latest Manuals</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Eclipse Plug-ins</div>
-<div id="menu_1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="../manuals/index.html#docs_10.1">10.1 Manuals</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/index.html#docs_10.0">10.0 Manuals</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/index.html#doc_issues">Report Issues</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/dita.html">DITA Source</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Other Products</div>
+<div id="menu_1.6" class="menuitemgroup">
+<div class="menuitem">
+<a href="../integrate/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/index.html#uses">What works with Derby?</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/index.html#products">Product Writeups</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.7', '../skin/')" id="menu_1.7Title" class="menutitle">Eclipse Plug-ins</div>
+<div id="menu_1.7" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/derby_plugin.html">10.1 Core</a>
 </div>
@@ -119,16 +179,16 @@
 <div class="menuitem">
 <a href="../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.6', '../skin/')" id="menu_1.2.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_1.2.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.7.6', '../skin/')" id="menu_1.7.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_1.7.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.2.6.3', '../skin/')" id="menu_1.2.6.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.2.6.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.7.6.3', '../skin/')" id="menu_1.7.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.7.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -139,8 +199,8 @@
 <a href="../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.2.6.4', '../skin/')" id="menu_1.2.6.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.2.6.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.7.6.4', '../skin/')" id="menu_1.7.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.7.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -154,8 +214,8 @@
 <div class="menuitem">
 <a href="../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.6.6', '../skin/')" id="menu_1.2.6.6Title" class="menutitle">ij</div>
-<div id="menu_1.2.6.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.7.6.6', '../skin/')" id="menu_1.7.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.7.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>
@@ -174,6 +234,99 @@
 </div>
 <div class="menuitem">
 <a href="../integrate/plugin_help/resources.html">Derby Manuals</a>
+</div>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8', '../skin/')" id="menu_1.8Title" class="menutitle">Papers</div>
+<div id="menu_1.8" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.8.2', '../skin/')" id="menu_1.8.2Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.8.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.2.1', '../skin/')" id="menu_1.8.2.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.8.2.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_arch.html">Architecture</a>
+</div>
+<div class="menuitem">
+<a href="../papers/btree_package.html">BTree</a>
+</div>
+<div class="menuitem">
+<a href="../papers/pageformats.html">Disk Page Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_htw.html">How Things Work</a>
+</div>
+<div class="menuitem">
+<a href="../papers/Intersect-design.html">Intersect &amp; Except</a>
+</div>
+<div class="menuitem">
+<a href="../papers/JDBCImplementation.html">JDBC</a>
+</div>
+<div class="menuitem">
+<a href="../papers/logformats.html">Log Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/recovery.html">Logging &amp; Recovery</a>
+</div>
+<div class="menuitem">
+<a href="../papers/optimizer.html">Optimizer</a>
+</div>
+<div class="menuitem">
+<a href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>
+</div>
+<div class="menuitem">
+<a href="../papers/versionupgrade.html">Versioning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8.3', '../skin/')" id="menu_1.8.3Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.8.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyClientSpec.html">Functional Spec</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8.4', '../skin/')" id="menu_1.8.4Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.8.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyTut/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/install_software.html">Step 1: Install Software</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8.5', '../skin/')" id="menu_1.8.5Title" class="menutitle">Presentations</div>
+<div id="menu_1.8.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/ApacheCon.html">ApacheCon</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/db_torque.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/db_torque.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/db_torque.html (original)
+++ db/derby/site/trunk/build/site/integrate/db_torque.html Thu Mar 30 10:21:49 2006
@@ -31,16 +31,19 @@
 <a class="base-not-selected" href="../index.html">Home</a>
 </li>
 <li>
-<a class="base-not-selected" href="../derby_comm.html">Community</a>
+<a class="base-not-selected" href="../quick_start.html">Quick Start</a>
 </li>
 <li>
-<a class="base-not-selected" href="../manuals/index.html">Manuals</a>
+<a class="base-not-selected" href="../derby_downloads.html">Download</a>
 </li>
 <li>
-<a class="base-not-selected" href="../papers/index.html">Papers</a>
+<a class="base-not-selected" href="../derby_comm.html">Community</a>
 </li>
-<li class="current">
-<a class="base-selected" href="../integrate/index.html">Integration</a>
+<li>
+<a class="base-not-selected" href="../manuals/index.html">Documentation</a>
+</li>
+<li>
+<a class="base-not-selected" href="../integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -57,53 +60,110 @@
              &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');">Integration</div>
-<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Home</div>
+<div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="../integrate/index.html">Index</a>
+<a href="../index.html">Apache Derby</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
+<a href="../derby_charter.html">Charter</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+<a href="../quick_start.html">Quick Start</a>
+</div>
 </div>
+<div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Quick Links</div>
+<div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
+<a href="http://www.apache.org">ASF</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/db_ddlutils.html">DdlUtils</a>
+<a href="http://db.apache.org">Apache DB Project</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/DOTS_Derby.htm">DOTS Derby</a>
+<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/UsingDotsDerbySystemTest.pdf">DOTS System</a>
+<a href="../license.html">License</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/DerbyCodeCoverageUsingEmma.pdf">EMMA</a>
+<a href="../faq.html">FAQs</a>
 </div>
+</div>
+<div onclick="SwitchMenu('menu_1.3', '../skin/')" id="menu_1.3Title" class="menutitle">Download</div>
+<div id="menu_1.3" class="menuitemgroup">
 <div class="menuitem">
-<a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
+<a href="../derby_downloads.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPOX_Derby.html">JPOX JDO</a>
+<a href="../license.html">License</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
+<a href="../releases/release-10.1.2.1.cgi">10.1.2.1</a>
+</div>
 </div>
+<div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Community</div>
+<div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
+<a href="../derby_comm.html">Get Involved!</a>
 </div>
-<div class="menupage">
-<div class="menupagetitle">Torque</div>
+<div class="menuitem">
+<a href="../faq.html">FAQs</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+<a href="../derby_mail.html">Mailing Lists</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby">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="../logo.html">Logo</a>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_web.html">Updating the web site</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Documentation</div>
+<div id="menu_1.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../manuals/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/index.html#latest">Latest Manuals</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Eclipse Plug-ins</div>
-<div id="menu_1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="../manuals/index.html#docs_10.1">10.1 Manuals</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/index.html#docs_10.0">10.0 Manuals</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/index.html#doc_issues">Report Issues</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/dita.html">DITA Source</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Other Products</div>
+<div id="menu_1.6" class="menuitemgroup">
+<div class="menuitem">
+<a href="../integrate/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/index.html#uses">What works with Derby?</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/index.html#products">Product Writeups</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.7', '../skin/')" id="menu_1.7Title" class="menutitle">Eclipse Plug-ins</div>
+<div id="menu_1.7" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/derby_plugin.html">10.1 Core</a>
 </div>
@@ -119,16 +179,16 @@
 <div class="menuitem">
 <a href="../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.6', '../skin/')" id="menu_1.2.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_1.2.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.7.6', '../skin/')" id="menu_1.7.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_1.7.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.2.6.3', '../skin/')" id="menu_1.2.6.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.2.6.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.7.6.3', '../skin/')" id="menu_1.7.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.7.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -139,8 +199,8 @@
 <a href="../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.2.6.4', '../skin/')" id="menu_1.2.6.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.2.6.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.7.6.4', '../skin/')" id="menu_1.7.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.7.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -154,8 +214,8 @@
 <div class="menuitem">
 <a href="../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.6.6', '../skin/')" id="menu_1.2.6.6Title" class="menutitle">ij</div>
-<div id="menu_1.2.6.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.7.6.6', '../skin/')" id="menu_1.7.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.7.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>
@@ -174,6 +234,99 @@
 </div>
 <div class="menuitem">
 <a href="../integrate/plugin_help/resources.html">Derby Manuals</a>
+</div>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8', '../skin/')" id="menu_1.8Title" class="menutitle">Papers</div>
+<div id="menu_1.8" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.8.2', '../skin/')" id="menu_1.8.2Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.8.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.2.1', '../skin/')" id="menu_1.8.2.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.8.2.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_arch.html">Architecture</a>
+</div>
+<div class="menuitem">
+<a href="../papers/btree_package.html">BTree</a>
+</div>
+<div class="menuitem">
+<a href="../papers/pageformats.html">Disk Page Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_htw.html">How Things Work</a>
+</div>
+<div class="menuitem">
+<a href="../papers/Intersect-design.html">Intersect &amp; Except</a>
+</div>
+<div class="menuitem">
+<a href="../papers/JDBCImplementation.html">JDBC</a>
+</div>
+<div class="menuitem">
+<a href="../papers/logformats.html">Log Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/recovery.html">Logging &amp; Recovery</a>
+</div>
+<div class="menuitem">
+<a href="../papers/optimizer.html">Optimizer</a>
+</div>
+<div class="menuitem">
+<a href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>
+</div>
+<div class="menuitem">
+<a href="../papers/versionupgrade.html">Versioning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8.3', '../skin/')" id="menu_1.8.3Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.8.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyClientSpec.html">Functional Spec</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8.4', '../skin/')" id="menu_1.8.4Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.8.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyTut/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/install_software.html">Step 1: Install Software</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8.5', '../skin/')" id="menu_1.8.5Title" class="menutitle">Presentations</div>
+<div id="menu_1.8.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/ApacheCon.html">ApacheCon</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/derby_plugin.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/derby_plugin.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/derby_plugin.html (original)
+++ db/derby/site/trunk/build/site/integrate/derby_plugin.html Thu Mar 30 10:21:49 2006
@@ -31,16 +31,19 @@
 <a class="base-not-selected" href="../index.html">Home</a>
 </li>
 <li>
-<a class="base-not-selected" href="../derby_comm.html">Community</a>
+<a class="base-not-selected" href="../quick_start.html">Quick Start</a>
+</li>
+<li>
+<a class="base-not-selected" href="../derby_downloads.html">Download</a>
 </li>
 <li>
-<a class="base-not-selected" href="../manuals/index.html">Manuals</a>
+<a class="base-not-selected" href="../derby_comm.html">Community</a>
 </li>
 <li>
-<a class="base-not-selected" href="../papers/index.html">Papers</a>
+<a class="base-not-selected" href="../manuals/index.html">Documentation</a>
 </li>
 <li class="current">
-<a class="base-selected" href="../integrate/index.html">Integration</a>
+<a class="base-selected" href="../integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -57,49 +60,16 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Integration</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Other Products</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="../integrate/index.html">Index</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
+<a href="../integrate/index.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+<a href="../integrate/index.html#uses">What works with Derby?</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
-</div>
-<div class="menuitem">
-<a href="../integrate/db_ddlutils.html">DdlUtils</a>
-</div>
-<div class="menuitem">
-<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/JPOX_Derby.html">JPOX JDO</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 class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+<a href="../integrate/index.html#products">Product Writeups</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');">Eclipse Plug-ins</div>
@@ -174,6 +144,99 @@
 </div>
 <div class="menuitem">
 <a href="../integrate/plugin_help/resources.html">Derby Manuals</a>
+</div>
+</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">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.3.2', '../skin/')" id="menu_1.3.2Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.3.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.3.2.1', '../skin/')" id="menu_1.3.2.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.3.2.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_arch.html">Architecture</a>
+</div>
+<div class="menuitem">
+<a href="../papers/btree_package.html">BTree</a>
+</div>
+<div class="menuitem">
+<a href="../papers/pageformats.html">Disk Page Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_htw.html">How Things Work</a>
+</div>
+<div class="menuitem">
+<a href="../papers/Intersect-design.html">Intersect &amp; Except</a>
+</div>
+<div class="menuitem">
+<a href="../papers/JDBCImplementation.html">JDBC</a>
+</div>
+<div class="menuitem">
+<a href="../papers/logformats.html">Log Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/recovery.html">Logging &amp; Recovery</a>
+</div>
+<div class="menuitem">
+<a href="../papers/optimizer.html">Optimizer</a>
+</div>
+<div class="menuitem">
+<a href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>
+</div>
+<div class="menuitem">
+<a href="../papers/versionupgrade.html">Versioning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.3', '../skin/')" id="menu_1.3.3Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.3.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyClientSpec.html">Functional Spec</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.4', '../skin/')" id="menu_1.3.4Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.3.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyTut/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/install_software.html">Step 1: Install Software</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.5', '../skin/')" id="menu_1.3.5Title" class="menutitle">Presentations</div>
+<div id="menu_1.3.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/ApacheCon.html">ApacheCon</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/func_spec_plugins.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/func_spec_plugins.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/func_spec_plugins.html (original)
+++ db/derby/site/trunk/build/site/integrate/func_spec_plugins.html Thu Mar 30 10:21:49 2006
@@ -32,16 +32,19 @@
 <a class="base-not-selected" href="../index.html">Home</a>
 </li>
 <li>
-<a class="base-not-selected" href="../derby_comm.html">Community</a>
+<a class="base-not-selected" href="../quick_start.html">Quick Start</a>
+</li>
+<li>
+<a class="base-not-selected" href="../derby_downloads.html">Download</a>
 </li>
 <li>
-<a class="base-not-selected" href="../manuals/index.html">Manuals</a>
+<a class="base-not-selected" href="../derby_comm.html">Community</a>
 </li>
 <li>
-<a class="base-not-selected" href="../papers/index.html">Papers</a>
+<a class="base-not-selected" href="../manuals/index.html">Documentation</a>
 </li>
 <li class="current">
-<a class="base-selected" href="../integrate/index.html">Integration</a>
+<a class="base-selected" href="../integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -58,49 +61,16 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Integration</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Other Products</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="../integrate/index.html">Index</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
+<a href="../integrate/index.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+<a href="../integrate/index.html#uses">What works with Derby?</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
-</div>
-<div class="menuitem">
-<a href="../integrate/db_ddlutils.html">DdlUtils</a>
-</div>
-<div class="menuitem">
-<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/JPOX_Derby.html">JPOX JDO</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 class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+<a href="../integrate/index.html#products">Product Writeups</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');">Eclipse Plug-ins</div>
@@ -175,6 +145,99 @@
 </div>
 <div class="menuitem">
 <a href="../integrate/plugin_help/resources.html">Derby Manuals</a>
+</div>
+</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">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.3.2', '../skin/')" id="menu_1.3.2Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.3.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.3.2.1', '../skin/')" id="menu_1.3.2.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.3.2.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_arch.html">Architecture</a>
+</div>
+<div class="menuitem">
+<a href="../papers/btree_package.html">BTree</a>
+</div>
+<div class="menuitem">
+<a href="../papers/pageformats.html">Disk Page Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_htw.html">How Things Work</a>
+</div>
+<div class="menuitem">
+<a href="../papers/Intersect-design.html">Intersect &amp; Except</a>
+</div>
+<div class="menuitem">
+<a href="../papers/JDBCImplementation.html">JDBC</a>
+</div>
+<div class="menuitem">
+<a href="../papers/logformats.html">Log Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/recovery.html">Logging &amp; Recovery</a>
+</div>
+<div class="menuitem">
+<a href="../papers/optimizer.html">Optimizer</a>
+</div>
+<div class="menuitem">
+<a href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>
+</div>
+<div class="menuitem">
+<a href="../papers/versionupgrade.html">Versioning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.3', '../skin/')" id="menu_1.3.3Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.3.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyClientSpec.html">Functional Spec</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.4', '../skin/')" id="menu_1.3.4Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.3.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyTut/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/install_software.html">Step 1: Install Software</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.5', '../skin/')" id="menu_1.3.5Title" class="menutitle">Presentations</div>
+<div id="menu_1.3.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/ApacheCon.html">ApacheCon</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/index.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/index.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/index.html (original)
+++ db/derby/site/trunk/build/site/integrate/index.html Thu Mar 30 10:21:49 2006
@@ -5,7 +5,7 @@
 <meta content="Apache Forrest" name="Generator">
 <meta name="Forrest-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
-<title>Apache Derby Integration</title>
+<title>Apache Derby and Other Products</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
 <link media="screen" type="text/css" href="../skin/screen.css" rel="stylesheet">
 <link media="print" type="text/css" href="../skin/print.css" rel="stylesheet">
@@ -31,16 +31,19 @@
 <a class="base-not-selected" href="../index.html">Home</a>
 </li>
 <li>
-<a class="base-not-selected" href="../derby_comm.html">Community</a>
+<a class="base-not-selected" href="../quick_start.html">Quick Start</a>
+</li>
+<li>
+<a class="base-not-selected" href="../derby_downloads.html">Download</a>
 </li>
 <li>
-<a class="base-not-selected" href="../manuals/index.html">Manuals</a>
+<a class="base-not-selected" href="../derby_comm.html">Community</a>
 </li>
 <li>
-<a class="base-not-selected" href="../papers/index.html">Papers</a>
+<a class="base-not-selected" href="../manuals/index.html">Documentation</a>
 </li>
 <li class="current">
-<a class="base-selected" href="../integrate/index.html">Integration</a>
+<a class="base-selected" href="../integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -57,49 +60,16 @@
              &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');">Integration</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');">Other Products</div>
 <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menupage">
-<div class="menupagetitle">Index</div>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
-</div>
-<div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
-</div>
-<div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
-</div>
-<div class="menuitem">
-<a href="../integrate/db_ddlutils.html">DdlUtils</a>
-</div>
-<div class="menuitem">
-<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/JPOX_Derby.html">JPOX JDO</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 class="menupagetitle">Overview</div>
 </div>
 <div class="menuitem">
-<a href="../integrate/db_torque.html">Torque</a>
+<a href="../integrate/index.html#uses">What works with Derby?</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+<a href="../integrate/index.html#products">Product Writeups</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Eclipse Plug-ins</div>
@@ -177,6 +147,99 @@
 </div>
 </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">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.3.2', '../skin/')" id="menu_1.3.2Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.3.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.3.2.1', '../skin/')" id="menu_1.3.2.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.3.2.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_arch.html">Architecture</a>
+</div>
+<div class="menuitem">
+<a href="../papers/btree_package.html">BTree</a>
+</div>
+<div class="menuitem">
+<a href="../papers/pageformats.html">Disk Page Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_htw.html">How Things Work</a>
+</div>
+<div class="menuitem">
+<a href="../papers/Intersect-design.html">Intersect &amp; Except</a>
+</div>
+<div class="menuitem">
+<a href="../papers/JDBCImplementation.html">JDBC</a>
+</div>
+<div class="menuitem">
+<a href="../papers/logformats.html">Log Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/recovery.html">Logging &amp; Recovery</a>
+</div>
+<div class="menuitem">
+<a href="../papers/optimizer.html">Optimizer</a>
+</div>
+<div class="menuitem">
+<a href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>
+</div>
+<div class="menuitem">
+<a href="../papers/versionupgrade.html">Versioning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.3', '../skin/')" id="menu_1.3.3Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.3.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyClientSpec.html">Functional Spec</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.4', '../skin/')" id="menu_1.3.4Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.3.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyTut/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/install_software.html">Step 1: Install Software</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.5', '../skin/')" id="menu_1.3.5Title" class="menutitle">Presentations</div>
+<div id="menu_1.3.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/ApacheCon.html">ApacheCon</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
+</div>
+</div>
+</div>
 <div class="searchbox">
 <hr>
 <form action="http://www.google.com/search" method="get">
@@ -199,22 +262,42 @@
 	          &nbsp;<input value="-a" class="smallerfont" title="Shrink text" onclick="ndeSetTextSize('decr'); return false;" type="button">
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
-<h1>Apache Derby Integration</h1> 
+<h1>Apache Derby and Other Products</h1>
+<div id="minitoc-area">
+<ul class="minitoc">
+<li>
+<a href="#uses">What works with Derby?</a>
+</li>
+<li>
+<a href="#products">Product Writeups</a>
+</li>
+<li>
+<a href="#eclipse">Eclipse Plug-ins</a>
+</li>
+</ul>
+</div> 
 
 
+<a name="N1000C"></a><a name="uses"></a>
+<h2 class="boxed">What works with Derby?</h2>
+<div class="section">
 <p>
 The <a class="external" href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
 Wiki page
 lists products that use or work with Derby. 
-It is on the Wiki to encourage everyone to please feel free to add more entries.
+The list is maintained on the Wiki to make it easy for anyone to update,
+so please feel free to add more entries.
 </p>
+</div>
+
 
+<a name="N1001A"></a><a name="products"></a>
+<h2 class="boxed">Product Writeups</h2>
+<div class="section">
 <p>
-Detailed writeups on how to get a product working with Derby, which have been
-contributed to the Derby web site, are listed below.
+Detailed writeups on how to get a product working with Derby have been
+contributed to the Derby web site and are listed in the table below.
 </p>
-
-
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
 
 <tr>
@@ -325,13 +408,18 @@
 
 
 </table>
-
-<p>
+</div>
 
 
+<a name="N100F3"></a><a name="eclipse"></a>
+<h2 class="boxed">Eclipse Plug-ins</h2>
+<div class="section">
+<p>
+Eclipse plug-ins for Derby are available 
+for <a href="../derby_downloads.html">download</a>
+in official Derby releases.
+The table below lists documentation available for it.
 </p>
-
-
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
 
 <tr>
@@ -390,10 +478,11 @@
 </tr>
 
 </table>
+</div>
 
 
 <p>
-<em>Last Updated: February 20, 2006</em>
+<em>Last Updated: March 30, 2006</em>
 </p>
 
 

Modified: db/derby/site/trunk/build/site/integrate/misc.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/misc.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/misc.html (original)
+++ db/derby/site/trunk/build/site/integrate/misc.html Thu Mar 30 10:21:49 2006
@@ -31,16 +31,19 @@
 <a class="base-not-selected" href="../index.html">Home</a>
 </li>
 <li>
-<a class="base-not-selected" href="../derby_comm.html">Community</a>
+<a class="base-not-selected" href="../quick_start.html">Quick Start</a>
+</li>
+<li>
+<a class="base-not-selected" href="../derby_downloads.html">Download</a>
 </li>
 <li>
-<a class="base-not-selected" href="../manuals/index.html">Manuals</a>
+<a class="base-not-selected" href="../derby_comm.html">Community</a>
 </li>
 <li>
-<a class="base-not-selected" href="../papers/index.html">Papers</a>
+<a class="base-not-selected" href="../manuals/index.html">Documentation</a>
 </li>
-<li class="current">
-<a class="base-selected" href="../integrate/index.html">Integration</a>
+<li>
+<a class="base-not-selected" href="../integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -57,53 +60,110 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Integration</div>
+<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Home</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="../integrate/index.html">Index</a>
+<a href="../index.html">Apache Derby</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
+<a href="../derby_charter.html">Charter</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+<a href="../quick_start.html">Quick Start</a>
+</div>
 </div>
+<div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Quick Links</div>
+<div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
-<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
+<a href="http://www.apache.org">ASF</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/db_ddlutils.html">DdlUtils</a>
+<a href="http://db.apache.org">Apache DB Project</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/DOTS_Derby.htm">DOTS Derby</a>
+<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/UsingDotsDerbySystemTest.pdf">DOTS System</a>
+<a href="../license.html">License</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/DerbyCodeCoverageUsingEmma.pdf">EMMA</a>
+<a href="../faq.html">FAQs</a>
+</div>
 </div>
+<div onclick="SwitchMenu('menu_1.3', '../skin/')" id="menu_1.3Title" class="menutitle">Download</div>
+<div id="menu_1.3" class="menuitemgroup">
 <div class="menuitem">
-<a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
+<a href="../derby_downloads.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPOX_Derby.html">JPOX JDO</a>
+<a href="../license.html">License</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
+<a href="../releases/release-10.1.2.1.cgi">10.1.2.1</a>
+</div>
 </div>
+<div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Community</div>
+<div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
+<a href="../derby_comm.html">Get Involved!</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/db_torque.html">Torque</a>
+<a href="../faq.html">FAQs</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+<a href="../derby_mail.html">Mailing Lists</a>
 </div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby">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="../logo.html">Logo</a>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_web.html">Updating the web site</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Documentation</div>
+<div id="menu_1.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../manuals/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/index.html#latest">Latest Manuals</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Eclipse Plug-ins</div>
-<div id="menu_1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="../manuals/index.html#docs_10.1">10.1 Manuals</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/index.html#docs_10.0">10.0 Manuals</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/index.html#doc_issues">Report Issues</a>
+</div>
+<div class="menuitem">
+<a href="../manuals/dita.html">DITA Source</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Other Products</div>
+<div id="menu_1.6" class="menuitemgroup">
+<div class="menuitem">
+<a href="../integrate/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/index.html#uses">What works with Derby?</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/index.html#products">Product Writeups</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.7', '../skin/')" id="menu_1.7Title" class="menutitle">Eclipse Plug-ins</div>
+<div id="menu_1.7" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/derby_plugin.html">10.1 Core</a>
 </div>
@@ -119,16 +179,16 @@
 <div class="menuitem">
 <a href="../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.6', '../skin/')" id="menu_1.2.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_1.2.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.7.6', '../skin/')" id="menu_1.7.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_1.7.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.2.6.3', '../skin/')" id="menu_1.2.6.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.2.6.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.7.6.3', '../skin/')" id="menu_1.7.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.7.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -139,8 +199,8 @@
 <a href="../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.2.6.4', '../skin/')" id="menu_1.2.6.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.2.6.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.7.6.4', '../skin/')" id="menu_1.7.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.7.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -154,8 +214,8 @@
 <div class="menuitem">
 <a href="../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.6.6', '../skin/')" id="menu_1.2.6.6Title" class="menutitle">ij</div>
-<div id="menu_1.2.6.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.7.6.6', '../skin/')" id="menu_1.7.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.7.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>
@@ -174,6 +234,99 @@
 </div>
 <div class="menuitem">
 <a href="../integrate/plugin_help/resources.html">Derby Manuals</a>
+</div>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8', '../skin/')" id="menu_1.8Title" class="menutitle">Papers</div>
+<div id="menu_1.8" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.8.2', '../skin/')" id="menu_1.8.2Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.8.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.2.1', '../skin/')" id="menu_1.8.2.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.8.2.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_arch.html">Architecture</a>
+</div>
+<div class="menuitem">
+<a href="../papers/btree_package.html">BTree</a>
+</div>
+<div class="menuitem">
+<a href="../papers/pageformats.html">Disk Page Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/derby_htw.html">How Things Work</a>
+</div>
+<div class="menuitem">
+<a href="../papers/Intersect-design.html">Intersect &amp; Except</a>
+</div>
+<div class="menuitem">
+<a href="../papers/JDBCImplementation.html">JDBC</a>
+</div>
+<div class="menuitem">
+<a href="../papers/logformats.html">Log Format</a>
+</div>
+<div class="menuitem">
+<a href="../papers/recovery.html">Logging &amp; Recovery</a>
+</div>
+<div class="menuitem">
+<a href="../papers/optimizer.html">Optimizer</a>
+</div>
+<div class="menuitem">
+<a href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>
+</div>
+<div class="menuitem">
+<a href="../papers/versionupgrade.html">Versioning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8.3', '../skin/')" id="menu_1.8.3Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.8.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyClientSpec.html">Functional Spec</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8.4', '../skin/')" id="menu_1.8.4Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.8.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/DerbyTut/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/install_software.html">Step 1: Install Software</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
+</div>
+<div class="menuitem">
+<a href="../papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8.5', '../skin/')" id="menu_1.8.5Title" class="menutitle">Presentations</div>
+<div id="menu_1.8.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../papers/ApacheCon.html">ApacheCon</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+</div>
+<div class="menuitem">
+<a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/derby_app.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/derby_app.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/derby_app.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/derby_app.html Thu Mar 30 10:21:49 2006
@@ -32,16 +32,19 @@
 <a class="base-not-selected" href="../../index.html">Home</a>
 </li>
 <li>
-<a class="base-not-selected" href="../../derby_comm.html">Community</a>
+<a class="base-not-selected" href="../../quick_start.html">Quick Start</a>
+</li>
+<li>
+<a class="base-not-selected" href="../../derby_downloads.html">Download</a>
 </li>
 <li>
-<a class="base-not-selected" href="../../manuals/index.html">Manuals</a>
+<a class="base-not-selected" href="../../derby_comm.html">Community</a>
 </li>
 <li>
-<a class="base-not-selected" href="../../papers/index.html">Papers</a>
+<a class="base-not-selected" href="../../manuals/index.html">Documentation</a>
 </li>
 <li class="current">
-<a class="base-selected" href="../../integrate/index.html">Integration</a>
+<a class="base-selected" href="../../integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -58,49 +61,16 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../../skin/')" id="menu_1.1Title" class="menutitle">Integration</div>
+<div onclick="SwitchMenu('menu_1.1', '../../skin/')" id="menu_1.1Title" class="menutitle">Other Products</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="../../integrate/index.html">Index</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
+<a href="../../integrate/index.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="../../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+<a href="../../integrate/index.html#uses">What works with Derby?</a>
 </div>
 <div class="menuitem">
-<a href="../../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
-</div>
-<div class="menuitem">
-<a href="../../integrate/db_ddlutils.html">DdlUtils</a>
-</div>
-<div class="menuitem">
-<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/JPOX_Derby.html">JPOX JDO</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 class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+<a href="../../integrate/index.html#products">Product Writeups</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');">Eclipse Plug-ins</div>
@@ -175,6 +145,99 @@
 </div>
 <div class="menuitem">
 <a href="../../integrate/plugin_help/resources.html">Derby Manuals</a>
+</div>
+</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">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.3.2', '../../skin/')" id="menu_1.3.2Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.3.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.3.2.1', '../../skin/')" id="menu_1.3.2.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.3.2.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../../papers/derby_arch.html">Architecture</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/btree_package.html">BTree</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/pageformats.html">Disk Page Format</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/derby_htw.html">How Things Work</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/Intersect-design.html">Intersect &amp; Except</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/JDBCImplementation.html">JDBC</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/logformats.html">Log Format</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/recovery.html">Logging &amp; Recovery</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/optimizer.html">Optimizer</a>
+</div>
+<div class="menuitem">
+<a href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/versionupgrade.html">Versioning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.3', '../../skin/')" id="menu_1.3.3Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.3.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../papers/DerbyClientSpec.html">Functional Spec</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.4', '../../skin/')" id="menu_1.3.4Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.3.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../papers/DerbyTut/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/DerbyTut/install_software.html">Step 1: Install Software</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.5', '../../skin/')" id="menu_1.3.5Title" class="menutitle">Presentations</div>
+<div id="menu_1.3.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../papers/ApacheCon.html">ApacheCon</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/ij.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/ij.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/ij.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/ij.html Thu Mar 30 10:21:49 2006
@@ -32,16 +32,19 @@
 <a class="base-not-selected" href="../../index.html">Home</a>
 </li>
 <li>
-<a class="base-not-selected" href="../../derby_comm.html">Community</a>
+<a class="base-not-selected" href="../../quick_start.html">Quick Start</a>
+</li>
+<li>
+<a class="base-not-selected" href="../../derby_downloads.html">Download</a>
 </li>
 <li>
-<a class="base-not-selected" href="../../manuals/index.html">Manuals</a>
+<a class="base-not-selected" href="../../derby_comm.html">Community</a>
 </li>
 <li>
-<a class="base-not-selected" href="../../papers/index.html">Papers</a>
+<a class="base-not-selected" href="../../manuals/index.html">Documentation</a>
 </li>
 <li class="current">
-<a class="base-selected" href="../../integrate/index.html">Integration</a>
+<a class="base-selected" href="../../integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -58,49 +61,16 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../../skin/')" id="menu_1.1Title" class="menutitle">Integration</div>
+<div onclick="SwitchMenu('menu_1.1', '../../skin/')" id="menu_1.1Title" class="menutitle">Other Products</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="../../integrate/index.html">Index</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
+<a href="../../integrate/index.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="../../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+<a href="../../integrate/index.html#uses">What works with Derby?</a>
 </div>
 <div class="menuitem">
-<a href="../../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
-</div>
-<div class="menuitem">
-<a href="../../integrate/db_ddlutils.html">DdlUtils</a>
-</div>
-<div class="menuitem">
-<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/JPOX_Derby.html">JPOX JDO</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 class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+<a href="../../integrate/index.html#products">Product Writeups</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');">Eclipse Plug-ins</div>
@@ -175,6 +145,99 @@
 </div>
 <div class="menuitem">
 <a href="../../integrate/plugin_help/resources.html">Derby Manuals</a>
+</div>
+</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">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.3.2', '../../skin/')" id="menu_1.3.2Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.3.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.3.2.1', '../../skin/')" id="menu_1.3.2.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.3.2.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../../papers/derby_arch.html">Architecture</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/btree_package.html">BTree</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/pageformats.html">Disk Page Format</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/derby_htw.html">How Things Work</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/Intersect-design.html">Intersect &amp; Except</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/JDBCImplementation.html">JDBC</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/logformats.html">Log Format</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/recovery.html">Logging &amp; Recovery</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/optimizer.html">Optimizer</a>
+</div>
+<div class="menuitem">
+<a href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/versionupgrade.html">Versioning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.3', '../../skin/')" id="menu_1.3.3Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.3.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../papers/DerbyClientSpec.html">Functional Spec</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.4', '../../skin/')" id="menu_1.3.4Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.3.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../papers/DerbyTut/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/DerbyTut/install_software.html">Step 1: Install Software</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.5', '../../skin/')" id="menu_1.3.5Title" class="menutitle">Presentations</div>
+<div id="menu_1.3.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../papers/ApacheCon.html">ApacheCon</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/ij2.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/ij2.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/ij2.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/ij2.html Thu Mar 30 10:21:49 2006
@@ -32,16 +32,19 @@
 <a class="base-not-selected" href="../../index.html">Home</a>
 </li>
 <li>
-<a class="base-not-selected" href="../../derby_comm.html">Community</a>
+<a class="base-not-selected" href="../../quick_start.html">Quick Start</a>
+</li>
+<li>
+<a class="base-not-selected" href="../../derby_downloads.html">Download</a>
 </li>
 <li>
-<a class="base-not-selected" href="../../manuals/index.html">Manuals</a>
+<a class="base-not-selected" href="../../derby_comm.html">Community</a>
 </li>
 <li>
-<a class="base-not-selected" href="../../papers/index.html">Papers</a>
+<a class="base-not-selected" href="../../manuals/index.html">Documentation</a>
 </li>
 <li class="current">
-<a class="base-selected" href="../../integrate/index.html">Integration</a>
+<a class="base-selected" href="../../integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -58,49 +61,16 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../../skin/')" id="menu_1.1Title" class="menutitle">Integration</div>
+<div onclick="SwitchMenu('menu_1.1', '../../skin/')" id="menu_1.1Title" class="menutitle">Other Products</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="../../integrate/index.html">Index</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
+<a href="../../integrate/index.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="../../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+<a href="../../integrate/index.html#uses">What works with Derby?</a>
 </div>
 <div class="menuitem">
-<a href="../../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
-</div>
-<div class="menuitem">
-<a href="../../integrate/db_ddlutils.html">DdlUtils</a>
-</div>
-<div class="menuitem">
-<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/JPOX_Derby.html">JPOX JDO</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 class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+<a href="../../integrate/index.html#products">Product Writeups</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');">Eclipse Plug-ins</div>
@@ -175,6 +145,99 @@
 </div>
 <div class="menuitem">
 <a href="../../integrate/plugin_help/resources.html">Derby Manuals</a>
+</div>
+</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">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.3.2', '../../skin/')" id="menu_1.3.2Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.3.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.3.2.1', '../../skin/')" id="menu_1.3.2.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.3.2.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../../papers/derby_arch.html">Architecture</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/btree_package.html">BTree</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/pageformats.html">Disk Page Format</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/derby_htw.html">How Things Work</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/Intersect-design.html">Intersect &amp; Except</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/JDBCImplementation.html">JDBC</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/logformats.html">Log Format</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/recovery.html">Logging &amp; Recovery</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/optimizer.html">Optimizer</a>
+</div>
+<div class="menuitem">
+<a href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/versionupgrade.html">Versioning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.3', '../../skin/')" id="menu_1.3.3Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.3.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../papers/DerbyClientSpec.html">Functional Spec</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.4', '../../skin/')" id="menu_1.3.4Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.3.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../papers/DerbyTut/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/DerbyTut/install_software.html">Step 1: Install Software</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3.5', '../../skin/')" id="menu_1.3.5Title" class="menutitle">Presentations</div>
+<div id="menu_1.3.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../papers/ApacheCon.html">ApacheCon</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+</div>
+<div class="menuitem">
+<a href="../../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
 </div>