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 [1/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...

Author: jta
Date: Thu Mar 30 10:21:49 2006
New Revision: 390204

URL: http://svn.apache.org/viewcvs?rev=390204&view=rev
Log:
Derby web site reorg:

1) Changed the blue navigation menu to beige using the "Lenya using pelt" 
colors in the skinconf.xml, but set the Lenya subheading and published
values to "#E5E4D9" and "#FFFFFF", respectively.

2) Added new "Quick Start" tab and page.

3) Added new "Downloads" tab that links to existing content and also features 
the latest official release in the nav menu. The downloads overview page still
needs to be rewritten.

4) Renamed "Manuals" tab to "Documentation". Moved the doc links from nav menu 
to the body of the index page so pages can be opened in a new browser window 
using forrest's class="fork".

5) Combined the "Papers" and "Integrate" tabs into one "Resources" tab.

6) Renamed logo_contest.html to logo.html in preparation to move
http://wiki.apache.org/db-derby/DerbyGraphicsAndLogo to this space.

Since the tabs.xml and site.xml config files were modified substantially,
every page on the web site gets rebuilt.

Added:
    db/derby/site/trunk/build/site/logo.html   (with props)
    db/derby/site/trunk/build/site/quick_start.html   (with props)
    db/derby/site/trunk/src/documentation/content/xdocs/logo.xml
      - copied unchanged from r390173, db/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml
    db/derby/site/trunk/src/documentation/content/xdocs/quick_start.xml   (with props)
Removed:
    db/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml
Modified:
    db/derby/site/trunk/build/site/DerbyBugGuidelines.html
    db/derby/site/trunk/build/site/DerbyToDo.html
    db/derby/site/trunk/build/site/derby_charter.html
    db/derby/site/trunk/build/site/derby_comm.html
    db/derby/site/trunk/build/site/derby_downloads.html
    db/derby/site/trunk/build/site/derby_mail.html
    db/derby/site/trunk/build/site/derby_proposal.html
    db/derby/site/trunk/build/site/derby_tests.html
    db/derby/site/trunk/build/site/faq.html
    db/derby/site/trunk/build/site/index.html
    db/derby/site/trunk/build/site/integrate/DerbyTomcat5512JPetStor.html
    db/derby/site/trunk/build/site/integrate/JPOX_Derby.html
    db/derby/site/trunk/build/site/integrate/JPetStoreGeronimo.html
    db/derby/site/trunk/build/site/integrate/JPetStoreWebSphere.html
    db/derby/site/trunk/build/site/integrate/Readme.html
    db/derby/site/trunk/build/site/integrate/db_ddlutils.html
    db/derby/site/trunk/build/site/integrate/db_torque.html
    db/derby/site/trunk/build/site/integrate/derby_plugin.html
    db/derby/site/trunk/build/site/integrate/func_spec_plugins.html
    db/derby/site/trunk/build/site/integrate/index.html
    db/derby/site/trunk/build/site/integrate/misc.html
    db/derby/site/trunk/build/site/integrate/plugin_help/derby_app.html
    db/derby/site/trunk/build/site/integrate/plugin_help/ij.html
    db/derby/site/trunk/build/site/integrate/plugin_help/ij2.html
    db/derby/site/trunk/build/site/integrate/plugin_help/ij_toc.html
    db/derby/site/trunk/build/site/integrate/plugin_help/java_project.html
    db/derby/site/trunk/build/site/integrate/plugin_help/nature.html
    db/derby/site/trunk/build/site/integrate/plugin_help/nature_toc.html
    db/derby/site/trunk/build/site/integrate/plugin_help/properties.html
    db/derby/site/trunk/build/site/integrate/plugin_help/remove_nature.html
    db/derby/site/trunk/build/site/integrate/plugin_help/resources.html
    db/derby/site/trunk/build/site/integrate/plugin_help/server_toc.html
    db/derby/site/trunk/build/site/integrate/plugin_help/start_server.html
    db/derby/site/trunk/build/site/integrate/plugin_help/start_toc.html
    db/derby/site/trunk/build/site/integrate/plugin_help/stop_server.html
    db/derby/site/trunk/build/site/integrate/plugin_help/sysinfo.html
    db/derby/site/trunk/build/site/integrate/plugin_howto.html
    db/derby/site/trunk/build/site/integrate/plugin_slides.html
    db/derby/site/trunk/build/site/license.html
    db/derby/site/trunk/build/site/linkmap.html
    db/derby/site/trunk/build/site/logo_contest.html
    db/derby/site/trunk/build/site/manuals/dita.html
    db/derby/site/trunk/build/site/manuals/index.html
    db/derby/site/trunk/build/site/papers/ApacheCon.html
    db/derby/site/trunk/build/site/papers/DerbyClientSpec.html
    db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html
    db/derby/site/trunk/build/site/papers/DerbyTut/ij_intro.html
    db/derby/site/trunk/build/site/papers/DerbyTut/index.html
    db/derby/site/trunk/build/site/papers/DerbyTut/install_software.html
    db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.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/build/site/releases/release-10.0.2.1.html
    db/derby/site/trunk/build/site/skin/images/rc-b-l-15-1body-2menu-3menu.png
    db/derby/site/trunk/build/site/skin/images/rc-b-r-15-1body-2menu-3menu.png
    db/derby/site/trunk/build/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
    db/derby/site/trunk/build/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
    db/derby/site/trunk/build/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
    db/derby/site/trunk/build/site/skin/images/rc-t-r-15-1body-2menu-3menu.png
    db/derby/site/trunk/build/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
    db/derby/site/trunk/build/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
    db/derby/site/trunk/build/site/skin/profile.css
    db/derby/site/trunk/src/documentation/content/xdocs/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/integrate/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/manuals/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/site.xml
    db/derby/site/trunk/src/documentation/content/xdocs/tabs.xml
    db/derby/site/trunk/src/documentation/skinconf.xml

Modified: db/derby/site/trunk/build/site/DerbyBugGuidelines.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/DerbyBugGuidelines.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/DerbyBugGuidelines.html (original)
+++ db/derby/site/trunk/build/site/DerbyBugGuidelines.html Thu Mar 30 10:21:49 2006
@@ -35,17 +35,20 @@
 <li>
 <a class="base-not-selected" href="index.html">Home</a>
 </li>
-<li class="current">
-<a class="base-selected" href="derby_comm.html">Community</a>
+<li>
+<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 class="current">
+<a class="base-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>
-<a class="base-not-selected" href="integrate/index.html">Integration</a>
+<a class="base-not-selected" href="integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -68,10 +71,13 @@
 <a href="derby_comm.html">Get Involved!</a>
 </div>
 <div class="menuitem">
+<a href="faq.html">FAQs</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>
+<a href="http://wiki.apache.org/db-derby">Derby Wiki</a>
 </div>
 <div class="menupage">
 <div class="menupagetitle">BUGS</div>
@@ -80,10 +86,10 @@
 <a href="derby_tests.html">Tests</a>
 </div>
 <div class="menuitem">
-<a href="DerbyToDo.html">To-Do</a>
+<a href="logo.html">Logo</a>
 </div>
 <div class="menuitem">
-<a href="logo_contest.html">Logo Contest</a>
+<a href="papers/derby_web.html">Updating the web site</a>
 </div>
 </div>
 <div class="searchbox">

Modified: db/derby/site/trunk/build/site/DerbyToDo.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/DerbyToDo.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/DerbyToDo.html (original)
+++ db/derby/site/trunk/build/site/DerbyToDo.html Thu Mar 30 10:21:49 2006
@@ -37,17 +37,20 @@
 <li>
 <a class="base-not-selected" href="index.html">Home</a>
 </li>
-<li class="current">
-<a class="base-selected" href="derby_comm.html">Community</a>
+<li>
+<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>
-<a class="base-not-selected" href="integrate/index.html">Integration</a>
+<a class="base-not-selected" href="integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -64,16 +67,61 @@
              &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');">Community</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="index.html">Apache Derby</a>
+</div>
+<div class="menuitem">
+<a href="derby_charter.html">Charter</a>
+</div>
+<div class="menuitem">
+<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="http://www.apache.org">ASF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org">Apache DB Project</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a>
+</div>
+<div class="menuitem">
+<a href="license.html">License</a>
+</div>
+<div class="menuitem">
+<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="derby_downloads.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="license.html">License</a>
+</div>
+<div class="menuitem">
+<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="derby_comm.html">Get Involved!</a>
 </div>
 <div class="menuitem">
+<a href="faq.html">FAQs</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>
+<a href="http://wiki.apache.org/db-derby">Derby Wiki</a>
 </div>
 <div class="menuitem">
 <a href="DerbyBugGuidelines.html">BUGS</a>
@@ -81,11 +129,212 @@
 <div class="menuitem">
 <a href="derby_tests.html">Tests</a>
 </div>
-<div class="menupage">
-<div class="menupagetitle">To-Do</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 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>
+<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.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.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>
+<div class="menuitem">
+<a href="integrate/plugin_help/nature.html">Adding the Derby Nature</a>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
+</div>
+</div>
+<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>
+<div class="menuitem">
+<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.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>
+<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.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="logo_contest.html">Logo Contest</a>
+<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>
 <div class="searchbox">

Modified: db/derby/site/trunk/build/site/derby_charter.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/derby_charter.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/derby_charter.html (original)
+++ db/derby/site/trunk/build/site/derby_charter.html Thu Mar 30 10:21:49 2006
@@ -31,16 +31,19 @@
 <a class="base-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>
-<a class="base-not-selected" href="integrate/index.html">Integration</a>
+<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,22 +60,34 @@
              &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');">Derby</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');">Home</div>
 <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="index.html">Index</a>
+<a href="index.html">Apache Derby</a>
+</div>
+<div class="menupage">
+<div class="menupagetitle">Charter</div>
 </div>
 <div class="menuitem">
-<a href="faq.html">FAQs</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="derby_downloads.html">Downloads</a>
+<a href="http://www.apache.org">ASF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org">Apache DB Project</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a>
 </div>
 <div class="menuitem">
 <a href="license.html">License</a>
 </div>
-<div class="menupage">
-<div class="menupagetitle">Charter</div>
+<div class="menuitem">
+<a href="faq.html">FAQs</a>
 </div>
 </div>
 <div class="searchbox">

Modified: db/derby/site/trunk/build/site/derby_comm.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/derby_comm.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/derby_comm.html (original)
+++ db/derby/site/trunk/build/site/derby_comm.html Thu Mar 30 10:21:49 2006
@@ -30,17 +30,20 @@
 <li>
 <a class="base-not-selected" href="index.html">Home</a>
 </li>
-<li class="current">
-<a class="base-selected" href="derby_comm.html">Community</a>
+<li>
+<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 class="current">
+<a class="base-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>
-<a class="base-not-selected" href="integrate/index.html">Integration</a>
+<a class="base-not-selected" href="integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -63,10 +66,13 @@
 <div class="menupagetitle">Get Involved!</div>
 </div>
 <div class="menuitem">
+<a href="faq.html">FAQs</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>
+<a href="http://wiki.apache.org/db-derby">Derby Wiki</a>
 </div>
 <div class="menuitem">
 <a href="DerbyBugGuidelines.html">BUGS</a>
@@ -75,10 +81,10 @@
 <a href="derby_tests.html">Tests</a>
 </div>
 <div class="menuitem">
-<a href="DerbyToDo.html">To-Do</a>
+<a href="logo.html">Logo</a>
 </div>
 <div class="menuitem">
-<a href="logo_contest.html">Logo Contest</a>
+<a href="papers/derby_web.html">Updating the web site</a>
 </div>
 </div>
 <div class="searchbox">

Modified: db/derby/site/trunk/build/site/derby_downloads.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/derby_downloads.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/derby_downloads.html (original)
+++ db/derby/site/trunk/build/site/derby_downloads.html Thu Mar 30 10:21:49 2006
@@ -27,20 +27,23 @@
 <a href="http://db.apache.org"><img class="logoImage" alt="Apache DB Project" src="images/db-logo-white.png" title="Apache DB creates and maintains database solutions."></a>
 </div>
 <ul id="tabs">
-<li class="current">
-<a class="base-selected" href="index.html">Home</a>
+<li>
+<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 class="current">
+<a class="base-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>
-<a class="base-not-selected" href="integrate/index.html">Integration</a>
+<a class="base-not-selected" href="integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -57,22 +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');">Derby</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');">Download</div>
 <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
-<div class="menuitem">
-<a href="index.html">Index</a>
-</div>
-<div class="menuitem">
-<a href="faq.html">FAQs</a>
-</div>
 <div class="menupage">
-<div class="menupagetitle">Downloads</div>
+<div class="menupagetitle">Overview</div>
 </div>
 <div class="menuitem">
 <a href="license.html">License</a>
 </div>
 <div class="menuitem">
-<a href="derby_charter.html">Charter</a>
+<a href="releases/release-10.1.2.1.cgi">10.1.2.1</a>
 </div>
 </div>
 <div class="searchbox">

Modified: db/derby/site/trunk/build/site/derby_mail.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/derby_mail.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/derby_mail.html (original)
+++ db/derby/site/trunk/build/site/derby_mail.html Thu Mar 30 10:21:49 2006
@@ -30,17 +30,20 @@
 <li>
 <a class="base-not-selected" href="index.html">Home</a>
 </li>
-<li class="current">
-<a class="base-selected" href="derby_comm.html">Community</a>
+<li>
+<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 class="current">
+<a class="base-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>
-<a class="base-not-selected" href="integrate/index.html">Integration</a>
+<a class="base-not-selected" href="integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -62,11 +65,14 @@
 <div class="menuitem">
 <a href="derby_comm.html">Get Involved!</a>
 </div>
+<div class="menuitem">
+<a href="faq.html">FAQs</a>
+</div>
 <div class="menupage">
 <div class="menupagetitle">Mailing Lists</div>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/db-derby">Wiki</a>
+<a href="http://wiki.apache.org/db-derby">Derby Wiki</a>
 </div>
 <div class="menuitem">
 <a href="DerbyBugGuidelines.html">BUGS</a>
@@ -75,10 +81,10 @@
 <a href="derby_tests.html">Tests</a>
 </div>
 <div class="menuitem">
-<a href="DerbyToDo.html">To-Do</a>
+<a href="logo.html">Logo</a>
 </div>
 <div class="menuitem">
-<a href="logo_contest.html">Logo Contest</a>
+<a href="papers/derby_web.html">Updating the web site</a>
 </div>
 </div>
 <div class="searchbox">

Modified: db/derby/site/trunk/build/site/derby_proposal.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/derby_proposal.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/derby_proposal.html (original)
+++ db/derby/site/trunk/build/site/derby_proposal.html Thu Mar 30 10:21:49 2006
@@ -31,16 +31,19 @@
 <a class="base-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>
-<a class="base-not-selected" href="integrate/index.html">Integration</a>
+<a class="base-not-selected" href="integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -57,22 +60,34 @@
              &nbsp;
            </div>
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">Derby</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="index.html">Index</a>
+<a href="index.html">Apache Derby</a>
 </div>
 <div class="menuitem">
-<a href="faq.html">FAQs</a>
+<a href="derby_charter.html">Charter</a>
 </div>
 <div class="menuitem">
-<a href="derby_downloads.html">Downloads</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="http://www.apache.org">ASF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org">Apache DB Project</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a>
 </div>
 <div class="menuitem">
 <a href="license.html">License</a>
 </div>
 <div class="menuitem">
-<a href="derby_charter.html">Charter</a>
+<a href="faq.html">FAQs</a>
 </div>
 </div>
 <div class="searchbox">

Modified: db/derby/site/trunk/build/site/derby_tests.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/derby_tests.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/derby_tests.html (original)
+++ db/derby/site/trunk/build/site/derby_tests.html Thu Mar 30 10:21:49 2006
@@ -30,17 +30,20 @@
 <li>
 <a class="base-not-selected" href="index.html">Home</a>
 </li>
-<li class="current">
-<a class="base-selected" href="derby_comm.html">Community</a>
+<li>
+<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 class="current">
+<a class="base-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>
-<a class="base-not-selected" href="integrate/index.html">Integration</a>
+<a class="base-not-selected" href="integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -63,10 +66,13 @@
 <a href="derby_comm.html">Get Involved!</a>
 </div>
 <div class="menuitem">
+<a href="faq.html">FAQs</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>
+<a href="http://wiki.apache.org/db-derby">Derby Wiki</a>
 </div>
 <div class="menuitem">
 <a href="DerbyBugGuidelines.html">BUGS</a>
@@ -75,10 +81,10 @@
 <div class="menupagetitle">Tests</div>
 </div>
 <div class="menuitem">
-<a href="DerbyToDo.html">To-Do</a>
+<a href="logo.html">Logo</a>
 </div>
 <div class="menuitem">
-<a href="logo_contest.html">Logo Contest</a>
+<a href="papers/derby_web.html">Updating the web site</a>
 </div>
 </div>
 <div class="searchbox">

Modified: db/derby/site/trunk/build/site/faq.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/faq.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/faq.html (original)
+++ db/derby/site/trunk/build/site/faq.html Thu Mar 30 10:21:49 2006
@@ -31,16 +31,19 @@
 <a class="base-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>
-<a class="base-not-selected" href="integrate/index.html">Integration</a>
+<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,22 +60,34 @@
              &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');">Derby</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="index.html">Index</a>
+<a href="index.html">Apache Derby</a>
 </div>
-<div class="menupage">
-<div class="menupagetitle">FAQs</div>
+<div class="menuitem">
+<a href="derby_charter.html">Charter</a>
 </div>
 <div class="menuitem">
-<a href="derby_downloads.html">Downloads</a>
+<a href="quick_start.html">Quick Start</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');">Quick Links</div>
+<div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="license.html">License</a>
+<a href="http://www.apache.org">ASF</a>
 </div>
 <div class="menuitem">
-<a href="derby_charter.html">Charter</a>
+<a href="http://db.apache.org">Apache DB Project</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a>
+</div>
+<div class="menuitem">
+<a href="license.html">License</a>
+</div>
+<div class="menupage">
+<div class="menupagetitle">FAQs</div>
 </div>
 </div>
 <div class="searchbox">

Modified: db/derby/site/trunk/build/site/index.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/index.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/index.html (original)
+++ db/derby/site/trunk/build/site/index.html Thu Mar 30 10:21:49 2006
@@ -31,16 +31,19 @@
 <a class="base-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>
-<a class="base-not-selected" href="integrate/index.html">Integration</a>
+<a class="base-not-selected" href="integrate/index.html">Resources</a>
 </li>
 </ul>
 </div>
@@ -57,22 +60,34 @@
              &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');">Derby</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');">Home</div>
 <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menupage">
-<div class="menupagetitle">Index</div>
+<div class="menupagetitle">Apache Derby</div>
 </div>
 <div class="menuitem">
-<a href="faq.html">FAQs</a>
+<a href="derby_charter.html">Charter</a>
 </div>
 <div class="menuitem">
-<a href="derby_downloads.html">Downloads</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="http://www.apache.org">ASF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org">Apache DB Project</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a>
 </div>
 <div class="menuitem">
 <a href="license.html">License</a>
 </div>
 <div class="menuitem">
-<a href="derby_charter.html">Charter</a>
+<a href="faq.html">FAQs</a>
 </div>
 </div>
 <div class="searchbox">
@@ -107,9 +122,6 @@
 <a href="#Events">Events</a>
 </li>
 <li>
-<a href="#Downloads">Downloads</a>
-</li>
-<li>
 <a href="#News">News</a>
 </li>
 </ul>
@@ -149,17 +161,13 @@
 
 </ul>
 <p>
-Check out the Derby
-<a class="external" href="http://wiki.apache.org/db-derby">Wiki</a> for help
-<a class="external" href="http://wiki.apache.org/db-derby/DerbyInstruction">getting started</a>
-and to find products that
-<a class="external" href="http://wiki.apache.org/db-derby/UsesOfDerby">use or 
-support Derby</a>.
+If you're new to Derby,
+check out the <a href="quick_start.html">Quick Start</a> page.
 </p>
 </div>
 
 
-<a name="N10046"></a><a name="Events"></a>
+<a name="N1003E"></a><a name="Events"></a>
 <h2 class="boxed">Events</h2>
 <div class="section">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -181,18 +189,7 @@
 </div>
 
 
-<a name="N10066"></a><a name="Downloads"></a>
-<h2 class="boxed">Downloads</h2>
-<div class="section">
-<p>
-You can download Derby from the
-<a href="http://db.apache.org/derby/derby_downloads.html">Downloads</a>
-page.
-</p>
-</div>
-
-
-<a name="N10073"></a><a name="News"></a>
+<a name="N1005E"></a><a name="News"></a>
 <h2 class="boxed">News</h2>
 <div class="section">
 <ul>
@@ -249,7 +246,7 @@
 
 <p>
 
-<em>Last updated: 14-February-2006</em>
+<em>Last updated: 30-March-2006</em>
 
 </p>
 

Modified: db/derby/site/trunk/build/site/integrate/DerbyTomcat5512JPetStor.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/DerbyTomcat5512JPetStor.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/DerbyTomcat5512JPetStor.html (original)
+++ db/derby/site/trunk/build/site/integrate/DerbyTomcat5512JPetStor.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 class="menupage">
-<div class="menupagetitle">Tomcat Demo</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/db_torque.html">Torque</a>
+<a href="../derby_comm.html">Get Involved!</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+<a href="../faq.html">FAQs</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">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/JPOX_Derby.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/JPOX_Derby.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/JPOX_Derby.html (original)
+++ db/derby/site/trunk/build/site/integrate/JPOX_Derby.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="menupage">
-<div class="menupagetitle">JPOX JDO</div>
+<div class="menuitem">
+<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/JPetStoreGeronimo.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/JPetStoreGeronimo.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/JPetStoreGeronimo.html (original)
+++ db/derby/site/trunk/build/site/integrate/JPetStoreGeronimo.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="../derby_downloads.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
+<a href="../license.html">License</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPOX_Derby.html">JPOX JDO</a>
+<a href="../releases/release-10.1.2.1.cgi">10.1.2.1</a>
 </div>
-<div class="menupage">
-<div class="menupagetitle">Geronimo Demo</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/JPetStoreWebSphere.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/JPetStoreWebSphere.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/JPetStoreWebSphere.html (original)
+++ db/derby/site/trunk/build/site/integrate/JPetStoreWebSphere.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="menuitem">
-<a href="../integrate/db_torque.html">Torque</a>
+<a href="../faq.html">FAQs</a>
 </div>
-<div class="menupage">
-<div class="menupagetitle">WebSphere Demo</div>
+<div class="menuitem">
+<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>