db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r390204 [4/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...
Date Thu, 30 Mar 2006 18:21:56 GMT
Modified: db/derby/site/trunk/build/site/integrate/plugin_howto.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_howto.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_howto.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_howto.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/plugin_slides.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_slides.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_slides.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_slides.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/license.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/license.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/license.html (original)
+++ db/derby/site/trunk/build/site/license.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 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="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_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="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="menupage">
 <div class="menupagetitle">License</div>
 </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/linkmap.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/linkmap.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/linkmap.html (original)
+++ db/derby/site/trunk/build/site/linkmap.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>
-<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,198 +60,111 @@
              &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>
-</div>
-<div class="menuitem">
-<a href="faq.html">FAQs</a>
-</div>
-<div class="menuitem">
-<a href="derby_downloads.html">Downloads</a>
-</div>
-<div class="menuitem">
-<a href="license.html">License</a>
+<a href="index.html">Apache Derby</a>
 </div>
 <div class="menuitem">
 <a href="derby_charter.html">Charter</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Community</div>
-<div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
-<a href="derby_comm.html">Get Involved!</a>
+<a href="quick_start.html">Quick Start</a>
 </div>
-<div class="menuitem">
-<a href="derby_mail.html">Mailing Lists</a>
 </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://wiki.apache.org/db-derby">Wiki</a>
+<a href="http://www.apache.org">ASF</a>
 </div>
 <div class="menuitem">
-<a href="DerbyBugGuidelines.html">BUGS</a>
+<a href="http://db.apache.org">Apache DB Project</a>
 </div>
 <div class="menuitem">
-<a href="derby_tests.html">Tests</a>
+<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a>
 </div>
 <div class="menuitem">
-<a href="DerbyToDo.html">To-Do</a>
+<a href="license.html">License</a>
 </div>
 <div class="menuitem">
-<a href="logo_contest.html">Logo Contest</a>
+<a href="faq.html">FAQs</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Papers</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="papers/index.html">Index</a>
-</div>
-<div class="menuitem">
-<a href="papers/derby_web.html">Derby Web Site</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
-</div>
-<div onclick="SwitchMenu('menu_1.3.5', 'skin/')" id="menu_1.3.5Title" class="menutitle">Derby Tutorial</div>
-<div id="menu_1.3.5" 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>
+<a href="derby_downloads.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
+<a href="license.html">License</a>
 </div>
 <div class="menuitem">
-<a href="papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
+<a href="releases/release-10.1.2.1.cgi">10.1.2.1</a>
 </div>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Derby Engine</div>
+<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Community</div>
 <div id="menu_1.4" class="menuitemgroup">
-<div onclick="SwitchMenu('menu_1.4.1', 'skin/')" id="menu_1.4.1Title" class="menutitle">Javadoc</div>
-<div id="menu_1.4.1" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
-</div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/javadoc/language">Language</a>
+<a href="derby_comm.html">Get Involved!</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
+<a href="faq.html">FAQs</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
-</div>
+<a href="derby_mail.html">Mailing Lists</a>
 </div>
 <div class="menuitem">
-<a href="papers/derby_arch.html">Architecture</a>
+<a href="http://wiki.apache.org/db-derby">Derby Wiki</a>
 </div>
 <div class="menuitem">
-<a href="papers/btree_package.html">BTree</a>
+<a href="DerbyBugGuidelines.html">BUGS</a>
 </div>
 <div class="menuitem">
-<a href="papers/pageformats.html">Disk Page Format</a>
+<a href="derby_tests.html">Tests</a>
 </div>
 <div class="menuitem">
-<a href="papers/derby_htw.html">How Things Work</a>
+<a href="logo.html">Logo</a>
 </div>
 <div class="menuitem">
-<a href="papers/Intersect-design.html">Intersect &amp; Except</a>
+<a href="papers/derby_web.html">Updating the web site</a>
 </div>
-<div class="menuitem">
-<a href="papers/JDBCImplementation.html">JDBC</a>
 </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="papers/logformats.html">Log Format</a>
+<a href="manuals/index.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="papers/recovery.html">Logging &amp; Recovery</a>
+<a href="manuals/index.html#latest">Latest Manuals</a>
 </div>
 <div class="menuitem">
-<a href="papers/optimizer.html">Optimizer</a>
+<a href="manuals/index.html#docs_10.1">10.1 Manuals</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>
+<a href="manuals/index.html#docs_10.0">10.0 Manuals</a>
 </div>
 <div class="menuitem">
-<a href="papers/versionupgrade.html">Versioning</a>
+<a href="manuals/index.html#doc_issues">Report Issues</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Derby Network Client</div>
-<div id="menu_1.5" class="menuitemgroup">
 <div class="menuitem">
-<a href="papers/DerbyClientSpec.html">Functional Spec</a>
+<a href="manuals/dita.html">DITA Source</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', 'skin/')" id="menu_1.6Title" class="menutitle">Presentations</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="papers/ApacheCon.html">ApacheCon</a>
+<a href="integrate/index.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="integrate/index.html#uses">What works with Derby?</a>
 </div>
 <div class="menuitem">
-<a href="papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
+<a href="integrate/index.html#products">Product Writeups</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.7', 'skin/')" id="menu_1.7Title" class="menutitle">Integration</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/index.html">Index</a>
-</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>
-<div class="menuitem">
-<a href="integrate/db_torque.html">Torque</a>
-</div>
-<div class="menuitem">
-<a href="integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.8', 'skin/')" id="menu_1.8Title" class="menutitle">Eclipse Plug-ins</div>
-<div id="menu_1.8" class="menuitemgroup">
-<div class="menuitem">
 <a href="integrate/derby_plugin.html">10.1 Core</a>
 </div>
 <div class="menuitem">
@@ -263,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.8.6', 'skin/')" id="menu_1.8.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_1.8.6" class="menuitemgroup">
+<div 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.8.6.3', 'skin/')" id="menu_1.8.6.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.8.6.3" class="menuitemgroup">
+<div 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>
@@ -283,8 +199,8 @@
 <a href="integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.8.6.4', 'skin/')" id="menu_1.8.6.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.8.6.4" class="menuitemgroup">
+<div 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>
@@ -298,8 +214,8 @@
 <div class="menuitem">
 <a href="integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.8.6.6', 'skin/')" id="menu_1.8.6.6Title" class="menutitle">ij</div>
-<div id="menu_1.8.6.6" class="menuitemgroup">
+<div 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>
@@ -321,231 +237,96 @@
 </div>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.9', 'skin/')" id="menu_1.9Title" class="menutitle">Manuals</div>
-<div id="menu_1.9" class="menuitemgroup">
-<div class="menuitem">
-<a href="manuals/index.html">About</a>
-</div>
-<div class="menuitem">
-<a href="manuals/dita.html">DITA Source</a>
-</div>
-<div onclick="SwitchMenu('menu_1.9.3', 'skin/')" id="menu_1.9.3Title" class="menutitle">English</div>
-<div id="menu_1.9.3" class="menuitemgroup">
-<div onclick="SwitchMenu('menu_1.9.3.1', 'skin/')" id="menu_1.9.3.1Title" class="menutitle">Latest Alpha Manuals</div>
-<div id="menu_1.9.3.1" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
-</div>
-<div onclick="SwitchMenu('menu_1.9.3.1.2', 'skin/')" id="menu_1.9.3.1.2Title" class="menutitle">Getting Started</div>
-<div id="menu_1.9.3.1.2" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/getstart/getstartderby.pdf">PDF</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/getstart/getstart-single.html">HTML Book</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/getstart/">HTML Files</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.9.3.1.3', 'skin/')" id="menu_1.9.3.1.3Title" class="menutitle">Reference</div>
-<div id="menu_1.9.3.1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/ref/refderby.pdf">PDF</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/ref/ref-single.html">HTML Book</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/ref/">HTML Files</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.9.3.1.4', 'skin/')" id="menu_1.9.3.1.4Title" class="menutitle">Developer's Guide</div>
-<div id="menu_1.9.3.1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/devguide/derbydev.pdf">PDF</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/devguide/devguide-single.html">HTML Book</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/devguide/">HTML Files</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.9.3.1.5', 'skin/')" id="menu_1.9.3.1.5Title" class="menutitle">Tuning Derby</div>
-<div id="menu_1.9.3.1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/tuning/tuningderby.pdf">PDF</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/tuning/tuning-single">HTML Book</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/tuning/">HTML Files</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.9.3.1.6', 'skin/')" id="menu_1.9.3.1.6Title" class="menutitle">Server &amp; Admin</div>
-<div id="menu_1.9.3.1.6" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/adminguide/derbyadmin.pdf">PDF</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/adminguide/adminguide-single.html">HTML Book</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/adminguide/">HTML Files</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.9.3.1.7', 'skin/')" id="menu_1.9.3.1.7Title" class="menutitle">Tools &amp; Utility Guide</div>
-<div id="menu_1.9.3.1.7" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/tools/derbytools.pdf">PDF</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/tools/tools-single.html">HTML Book</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/tools/">HTML Files</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.9.3.2', 'skin/')" id="menu_1.9.3.2Title" class="menutitle">10.1 Manuals</div>
-<div id="menu_1.9.3.2" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/publishedapi">API</a>
-</div>
-<div onclick="SwitchMenu('menu_1.9.3.2.2', 'skin/')" id="menu_1.9.3.2.2Title" class="menutitle">Getting Started</div>
-<div id="menu_1.9.3.2.2" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/getstart/getstartderby.pdf">PDF</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/getstart/getstart-single.html">HTML Book</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/getstart/">HTML Files</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.9.3.2.3', 'skin/')" id="menu_1.9.3.2.3Title" class="menutitle">Reference</div>
-<div id="menu_1.9.3.2.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/ref/refderby.pdf">PDF</a>
-</div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/ref/ref-single.html">HTML Book</a>
-</div>
+<div 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="http://db.apache.org/derby/docs/10.1/ref/">HTML Files</a>
+<a href="papers/index.html">Overview</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_1.9.3.2.4', 'skin/')" id="menu_1.9.3.2.4Title" class="menutitle">Developer's Guide</div>
-<div id="menu_1.9.3.2.4" class="menuitemgroup">
+<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/docs/10.1/devguide/derbydev.pdf">PDF</a>
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/devguide/devguide-single.html">HTML Book</a>
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/devguide/">HTML Files</a>
-</div>
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
 </div>
-<div onclick="SwitchMenu('menu_1.9.3.2.5', 'skin/')" id="menu_1.9.3.2.5Title" class="menutitle">Tuning Derby</div>
-<div id="menu_1.9.3.2.5" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/tuning/tuningderby.pdf">PDF</a>
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
 </div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/tuning/tuning-single">HTML Book</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/tuning/">HTML Files</a>
-</div>
+<a href="papers/derby_arch.html">Architecture</a>
 </div>
-<div onclick="SwitchMenu('menu_1.9.3.2.6', 'skin/')" id="menu_1.9.3.2.6Title" class="menutitle">Server &amp; Admin</div>
-<div id="menu_1.9.3.2.6" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/adminguide/derbyadmin.pdf">PDF</a>
+<a href="papers/btree_package.html">BTree</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/adminguide/adminguide-single.html">HTML Book</a>
+<a href="papers/pageformats.html">Disk Page Format</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/adminguide/">HTML Files</a>
-</div>
+<a href="papers/derby_htw.html">How Things Work</a>
 </div>
-<div onclick="SwitchMenu('menu_1.9.3.2.7', 'skin/')" id="menu_1.9.3.2.7Title" class="menutitle">Tools &amp; Utility Guide</div>
-<div id="menu_1.9.3.2.7" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/tools/derbytools.pdf">PDF</a>
+<a href="papers/Intersect-design.html">Intersect &amp; Except</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/tools/tools-single.html">HTML Book</a>
+<a href="papers/JDBCImplementation.html">JDBC</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.1/tools/">HTML Files</a>
-</div>
-</div>
+<a href="papers/logformats.html">Log Format</a>
 </div>
-<div onclick="SwitchMenu('menu_1.9.3.3', 'skin/')" id="menu_1.9.3.3Title" class="menutitle">10.0 Manuals</div>
-<div id="menu_1.9.3.3" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.0/publishedapi">API</a>
+<a href="papers/recovery.html">Logging &amp; Recovery</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/docs-10.0.zip">All docs: zip</a>
+<a href="papers/optimizer.html">Optimizer</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/docs-10.0.tar.gz">All docs: tar.gz</a>
+<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="http://db.apache.org/derby/docs/10.0/manuals/getstart/gspr02.html">Getting Started</a>
+<a href="papers/versionupgrade.html">Versioning</a>
 </div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.0/manuals/reference/sqlj02.html">Reference Manual</a>
 </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="http://db.apache.org/derby/docs/10.0/manuals/develop/develop02.html">Developer's Guide</a>
+<a href="papers/DerbyClientSpec.html">Functional Spec</a>
 </div>
-<div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.0/manuals/tuning/perf02.html">Tuning Derby</a>
 </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="http://db.apache.org/derby/docs/10.0/manuals/admin/hubprnt02.html">Server &amp; Admin Guide</a>
+<a href="papers/DerbyTut/index.html">Overview</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/10.0/manuals/tools/tools02.html">Tools &amp; Utility Guide</a>
-</div>
-</div>
+<a href="papers/DerbyTut/install_software.html">Step 1: Install Software</a>
 </div>
-<div onclick="SwitchMenu('menu_1.9.4', 'skin/')" id="menu_1.9.4Title" class="menutitle">Brazilian Portuguese</div>
-<div id="menu_1.9.4" class="menuitemgroup">
-<div onclick="SwitchMenu('menu_1.9.4.1', 'skin/')" id="menu_1.9.4.1Title" class="menutitle">Latest Alpha Manuals</div>
-<div id="menu_1.9.4.1" class="menuitemgroup">
-<div onclick="SwitchMenu('menu_1.9.4.1.1', 'skin/')" id="menu_1.9.4.1.1Title" class="menutitle">Introdu&ccedil;&atilde;o ao Derby</div>
-<div id="menu_1.9.4.1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/pt_BR/getstart/getstartderby.pdf">PDF</a>
+<a href="papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/pt_BR/getstart/pt_BR/getstart-single.html">HTML Book</a>
+<a href="papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/pt_BR/getstart/">HTML Files</a>
+<a href="papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.9.4.1.2', 'skin/')" id="menu_1.9.4.1.2Title" class="menutitle">Manual de Refer&ecirc;ncia do Derby</div>
-<div id="menu_1.9.4.1.2" class="menuitemgroup">
+<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="http://db.apache.org/derby/docs/dev/pt_BR/ref/refderby.pdf">PDF</a>
+<a href="papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/pt_BR/ref/pt_BR/ref-single.html">HTML Book</a>
+<a href="papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
-<a href="http://db.apache.org/derby/docs/dev/pt_BR/ref/">HTML Files</a>
-</div>
-</div>
+<a href="papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
 </div>
 </div>
@@ -588,93 +369,98 @@
   
 <ul>
 <li>
-<a href="">Derby</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>about</em>
+<a href="">Home</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>about</em>
 </li>
 <ul>
     
 <ul>
 <li>
-<a href="index.html">Index</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
+<a href="index.html">Apache Derby</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
 </li>
 </ul>
     
 <ul>
 <li>
-<a href="faq.html">FAQs</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>faq</em>
+<a href="derby_charter.html">Charter</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>charter</em>
 </li>
 </ul>
     
 <ul>
 <li>
-<a href="derby_downloads.html">Downloads</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>downloads</em>
+<a href="quick_start.html">Quick Start</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>qstart</em>
 </li>
 </ul>
     
+  
+</ul>
+</ul>
+
+  
 <ul>
 <li>
-<a href="license.html">License</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>license</em>
+<a href="">Quick Links</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>quick_links</em>
 </li>
-</ul>
+<ul>
     
 <ul>
 <li>
-<a href="derby_charter.html">Charter</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>charter</em>
+<a class="external" href="http://www.apache.org">ASF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>asf</em>
 </li>
 </ul>
     
-  
-</ul>
-</ul>
-  
-
-  
 <ul>
 <li>
-<a href="">Community</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>community</em>
+<a href="http://db.apache.org">Apache DB Project</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>db</em>
 </li>
-<ul>
+</ul>
     
 <ul>
 <li>
-<a href="derby_comm.html">Get Involved!</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
+<a class="external" href="http://wiki.apache.org/db-derby/">Derby Wiki</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>wiki</em>
 </li>
 </ul>
     
 <ul>
 <li>
-<a href="derby_mail.html">Mailing Lists</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_mail</em>
+<a href="license.html">License</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>license</em>
 </li>
 </ul>
     
 <ul>
 <li>
-<a class="external" href="http://wiki.apache.org/db-derby">Wiki</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_wiki</em>
+<a href="faq.html">FAQs</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>faq</em>
 </li>
 </ul>
-    
+  
+</ul>
+</ul>
+
+
+  
 <ul>
 <li>
-<a href="DerbyBugGuidelines.html">BUGS</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_bugs</em>
+<a href="">Download</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>download</em>
 </li>
-</ul>
+<ul>
     
 <ul>
 <li>
-<a href="derby_tests.html">Tests</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_tests</em>
+<a href="derby_downloads.html">Overview</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
 </li>
 </ul>
     
 <ul>
 <li>
-<a href="DerbyToDo.html">To-Do</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_todo</em>
+<a href="license.html">License</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>license</em>
 </li>
 </ul>
     
 <ul>
 <li>
-<a href="logo_contest.html">Logo Contest</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>logo</em>
+<a href="releases/release-10.1.2.1.cgi">10.1.2.1</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>latests</em>
 </li>
 </ul>
+    
   
 </ul>
 </ul>
@@ -682,73 +468,57 @@
   
 <ul>
 <li>
-<a href="papers/">Papers</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>papers</em>
+<a href="">Community</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>community</em>
 </li>
 <ul>
-       
+    
 <ul>
 <li>
-<a href="papers/index.html">Index</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
+<a href="derby_comm.html">Get Involved!</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
 </li>
 </ul>
-       
-       
+    
 <ul>
 <li>
-<a href="papers/derby_web.html">Derby Web Site</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_web</em>
+<a href="faq.html">FAQs</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>faq</em>
 </li>
 </ul>
-       
+    
 <ul>
 <li>
-<a class="external" href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>howto</em>
+<a href="derby_mail.html">Mailing Lists</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_mail</em>
 </li>
 </ul>
-       
+    
 <ul>
 <li>
-<a class="external" href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>articles</em>
+<a class="external" href="http://wiki.apache.org/db-derby">Derby Wiki</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_wiki</em>
 </li>
 </ul>
-       
+    
 <ul>
 <li>
-<a href="papers/DerbyTut/">Derby Tutorial</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derbyTut</em>
+<a href="DerbyBugGuidelines.html">BUGS</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_bugs</em>
 </li>
-<ul>
-           
-<ul>
-<li>
-<a href="papers/DerbyTut/index.html">Overview</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
-</li>
-</ul>
-           
+</ul>
+    
 <ul>
 <li>
-<a href="papers/DerbyTut/install_software.html">Step 1: Install Software</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>install</em>
-</li>
-</ul>
-           
-<ul>
-<li>
-<a href="papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ij_intro</em>
+<a href="derby_tests.html">Tests</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_tests</em>
 </li>
 </ul>
-           
+    
 <ul>
 <li>
-<a href="papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>embed</em>
+<a href="logo.html">Logo</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>logo</em>
 </li>
 </ul>
-           
+    
 <ul>
 <li>
-<a href="papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ns</em>
+<a href="papers/derby_web.html">Updating the web site</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_web</em>
 </li>
 </ul>
-       
-</ul>
-</ul>
   
 </ul>
 </ul>
@@ -756,122 +526,43 @@
   
 <ul>
 <li>
-<a href="papers/">Derby Engine</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>engine</em>
-</li>
-<ul>
-      
-<ul>
-<li>
-<a href="">Javadoc</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>javadoc</em>
-</li>
-<ul>
-             
-<ul>
-<li>
-<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>engine</em>
-</li>
-</ul>
-             
-<ul>
-<li>
-<a href="http://db.apache.org/derby/javadoc/language">Language</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>language</em>
-</li>
-</ul>
-             
-<ul>
-<li>
-<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tools</em>
-</li>
-</ul>
-             
-<ul>
-<li>
-<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>api</em>
-</li>
-</ul>
-      
-</ul>
-</ul>
-      
-<ul>
-<li>
-<a href="papers/derby_arch.html">Architecture</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="papers/btree_package.html">BTree</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="papers/pageformats.html">Disk Page Format</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>pformat</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="papers/derby_htw.html">How Things Work</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>misc</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="papers/Intersect-design.html">Intersect &amp; Except</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>intersect</em>
+<a href="manuals/">Documentation</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>manuals</em>
 </li>
-</ul>
-      
 <ul>
-<li>
-<a href="papers/JDBCImplementation.html">JDBC</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>jdbc</em>
-</li>
-</ul>
-      
+    
 <ul>
 <li>
-<a href="papers/logformats.html">Log Format</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>log</em>
+<a href="manuals/index.html">Overview</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
 </li>
 </ul>
-      
+    
 <ul>
 <li>
-<a href="papers/recovery.html">Logging &amp; Recovery</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>recover</em>
+<a href="manuals/index.html#latest">Latest Manuals</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>latest</em>
 </li>
 </ul>
-      
+    
 <ul>
 <li>
-<a href="papers/optimizer.html">Optimizer</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>optimizer</em>
+<a href="manuals/index.html#docs_10.1">10.1 Manuals</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>docs_101</em>
 </li>
 </ul>
-      
+    
 <ul>
 <li>
-<a class="external" href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>types</em>
+<a href="manuals/index.html#docs_10.0">10.0 Manuals</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>docs_100</em>
 </li>
 </ul>
-      
+    
 <ul>
 <li>
-<a href="papers/versionupgrade.html">Versioning</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>version</em>
+<a href="manuals/index.html#doc_issues">Report Issues</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>bugs</em>
 </li>
 </ul>
-  
-</ul>
-</ul>
-
-  
-<ul>
-<li>
-<a href="papers/">Derby Network Client</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>net_client</em>
-</li>
-<ul>
-      
+    
 <ul>
 <li>
-<a href="papers/DerbyClientSpec.html">Functional Spec</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>func_spec</em>
+<a href="manuals/dita.html">DITA Source</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ditafile</em>
 </li>
 </ul>
   
@@ -881,25 +572,25 @@
   
 <ul>
 <li>
-<a href="papers/">Presentations</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>present</em>
+<a href="integrate/">Other Products</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>integrate</em>
 </li>
 <ul>
       
 <ul>
 <li>
-<a href="papers/ApacheCon.html">ApacheCon</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>apacheCon</em>
+<a href="integrate/index.html">Overview</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>oscon05</em>
+<a href="integrate/index.html#uses">What works with Derby?</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>uses</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>colorado</em>
+<a href="integrate/index.html#products">Product Writeups</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>products</em>
 </li>
 </ul>
   
@@ -907,103 +598,7 @@
 </ul>
 
 
-
-  
-<ul>
-<li>
-<a href="integrate/">Integration</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>integrate</em>
-</li>
-<ul>
-      
-<ul>
-<li>
-<a href="integrate/index.html">Index</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a class="external" href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>uses</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="integrate/../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>cjdbc-pdf</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="integrate/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>cjdbc-oo</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="integrate/db_ddlutils.html">DdlUtils</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ddlutils</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="integrate/DOTS_Derby.htm">DOTS Derby</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dots</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="integrate/../binaries/UsingDotsDerbySystemTest.pdf">DOTS System</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dots</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="integrate/../binaries/DerbyCodeCoverageUsingEmma.pdf">EMMA</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>emma</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="integrate/../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>jonas</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="integrate/JPOX_Derby.html">JPOX JDO</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>jpox</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="integrate/JPetStoreGeronimo.html">Geronimo Demo</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>jpetstoreG</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tomcat</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="integrate/db_torque.html">Torque</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>torque</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="integrate/JPetStoreWebSphere.html">WebSphere Demo</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>jpetstoreW</em>
-</li>
-</ul>
-      
   
-</ul>
-</ul>
-
-      
 <ul>
 <li>
 <a href="integrate/">Eclipse Plug-ins</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>eclipse</em>
@@ -1168,541 +763,220 @@
          
 </ul>
 </ul>
-      
+  
 </ul>
 </ul>
 
   
 <ul>
 <li>
-<a href="manuals/">Manuals</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>manuals</em>
+<a href="papers/">Papers</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>papers</em>
 </li>
 <ul>
-    
-<ul>
-<li>
-<a href="manuals/index.html">About</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
-</li>
-</ul>
-    
+     
 <ul>
 <li>
-<a href="manuals/dita.html">DITA Source</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ditafile</em>
+<a href="papers/index.html">Overview</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
 </li>
 </ul>
-    
+     
+
+     
 <ul>
 <li>
-<a href="manuals/">English</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>english</em>
+<a href="">Derby Engine</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>engine</em>
 </li>
 <ul>
-    
+        
 <ul>
 <li>
-<a href="manuals/">Latest Alpha Manuals</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>devbooks</em>
+<a href="">Javadoc</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>javadoc</em>
 </li>
 <ul>
-         
+           
 <ul>
 <li>
-<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>api</em>
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>engine</em>
 </li>
 </ul>
            
 <ul>
 <li>
-<a href="manuals/">Getting Started</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>gstart</em>
-</li>
-<ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/dev/getstart/getstartderby.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>getstart1</em>
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>language</em>
 </li>
 </ul>
-              
+           
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/getstart/getstart-single.html">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>getstart2</em>
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tools</em>
 </li>
 </ul>
-              
+           
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/getstart/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>getstart2</em>
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>api</em>
 </li>
 </ul>
-           
+        
 </ul>
 </ul>
-
-           
+        
 <ul>
 <li>
-<a href="manuals/">Reference</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>refman</em>
+<a href="papers/derby_arch.html">Architecture</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
 </li>
-<ul>
-              
+</ul>
+        
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/ref/refderby.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ref1</em>
+<a href="papers/btree_package.html">BTree</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
 </li>
 </ul>
-              
+        
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/ref/ref-single.html">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ref2</em>
+<a href="papers/pageformats.html">Disk Page Format</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>pformat</em>
 </li>
 </ul>
-              
+        
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/ref/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ref2</em>
+<a href="papers/derby_htw.html">How Things Work</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>misc</em>
 </li>
 </ul>
-           
-</ul>
-</ul>
-           
+        
 <ul>
 <li>
-<a href="manuals/">Developer's Guide</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>devman</em>
+<a href="papers/Intersect-design.html">Intersect &amp; Except</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>intersect</em>
 </li>
-<ul>
-             
+</ul>
+        
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/devguide/derbydev.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dev1</em>
+<a href="papers/JDBCImplementation.html">JDBC</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>jdbc</em>
 </li>
 </ul>
-             
+        
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/devguide/devguide-single.html">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dev2</em>
+<a href="papers/logformats.html">Log Format</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>log</em>
 </li>
 </ul>
-             
+        
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/devguide/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dev2</em>
+<a href="papers/recovery.html">Logging &amp; Recovery</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>recover</em>
 </li>
 </ul>
-           
-</ul>
-</ul>
-
-           
-<ul>
-<li>
-<a href="manuals/">Tuning Derby</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tuneman</em>
-</li>
-<ul>
-              
+        
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/tuning/tuningderby.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tune1</em>
+<a href="papers/optimizer.html">Optimizer</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>optimizer</em>
 </li>
 </ul>
-              
+        
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/tuning/tuning-single">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tune2</em>
+<a class="external" href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>types</em>
 </li>
 </ul>
-              
+        
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/tuning/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tune2</em>
+<a href="papers/versionupgrade.html">Versioning</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>version</em>
 </li>
 </ul>
-           
+    
 </ul>
 </ul>
 
-           
-<ul>
-<li>
-<a href="manuals/">Server &amp; Admin</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>adminman</em>
-</li>
-<ul>
-              
+    
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/adminguide/derbyadmin.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>admin1</em>
+<a href="">Derby Network Client</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>net_client</em>
 </li>
-</ul>
-              
 <ul>
-<li>
-<a href="http://db.apache.org/derby/docs/dev/adminguide/adminguide-single.html">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>admin2</em>
-</li>
-</ul>
-              
+         
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/adminguide/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>admin2</em>
+<a href="papers/DerbyClientSpec.html">Functional Spec</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>func_spec</em>
 </li>
 </ul>
-           
+     
 </ul>
 </ul>
 
-           
-<ul>
-<li>
-<a href="manuals/">Tools &amp; Utility Guide</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>toolsman</em>
-</li>
-<ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/dev/tools/derbytools.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tools1</em>
-</li>
-</ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/dev/tools/tools-single.html">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tools2</em>
-</li>
-</ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/dev/tools/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tools2</em>
-</li>
-</ul>
-           
-</ul>
-</ul>
      
-</ul>
-</ul>
-    
 <ul>
 <li>
-<a href="manuals/">10.1 Manuals</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>rel10.1</em>
+<a href="papers/DerbyTut/">Derby Tutorial</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derbyTut</em>
 </li>
 <ul>
-      
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/publishedapi">API</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>api</em>
-</li>
-</ul>
-
            
 <ul>
 <li>
-<a href="manuals/">Getting Started</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>gstart</em>
-</li>
-<ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/getstart/getstartderby.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>getstart1</em>
-</li>
-</ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/getstart/getstart-single.html">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>getstart2</em>
-</li>
-</ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/getstart/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>getstart2</em>
+<a href="papers/DerbyTut/index.html">Overview</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>index</em>
 </li>
 </ul>
            
-</ul>
-</ul>
-
-           
-<ul>
-<li>
-<a href="manuals/">Reference</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>refman</em>
-</li>
-<ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/ref/refderby.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ref1</em>
-</li>
-</ul>
-              
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/10.1/ref/ref-single.html">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ref2</em>
-</li>
-</ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/ref/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ref2</em>
+<a href="papers/DerbyTut/install_software.html">Step 1: Install Software</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>install</em>
 </li>
 </ul>
            
-</ul>
-</ul>
-           
-<ul>
-<li>
-<a href="manuals/">Developer's Guide</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>devman</em>
-</li>
-<ul>
-             
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/devguide/derbydev.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dev1</em>
-</li>
-</ul>
-             
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/10.1/devguide/devguide-single.html">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dev2</em>
-</li>
-</ul>
-             
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/devguide/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dev2</em>
+<a href="papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ij_intro</em>
 </li>
 </ul>
            
-</ul>
-</ul>
-
-           
-<ul>
-<li>
-<a href="manuals/">Tuning Derby</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tuneman</em>
-</li>
-<ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/tuning/tuningderby.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tune1</em>
-</li>
-</ul>
-              
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/10.1/tuning/tuning-single">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tune2</em>
-</li>
-</ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/tuning/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tune2</em>
-</li>
-</ul>
-           
-</ul>
-</ul>
-
-           
-<ul>
-<li>
-<a href="manuals/">Server &amp; Admin</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>adminman</em>
-</li>
-<ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/adminguide/derbyadmin.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>admin1</em>
-</li>
-</ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/adminguide/adminguide-single.html">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>admin2</em>
-</li>
-</ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/adminguide/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>admin2</em>
+<a href="papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>embed</em>
 </li>
 </ul>
            
-</ul>
-</ul>
-
-           
-<ul>
-<li>
-<a href="manuals/">Tools &amp; Utility Guide</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>toolsman</em>
-</li>
-<ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/tools/derbytools.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tools1</em>
-</li>
-</ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.1/tools/tools-single.html">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tools2</em>
-</li>
-</ul>
-              
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/10.1/tools/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tools2</em>
+<a href="papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ns</em>
 </li>
 </ul>
-           
-</ul>
-</ul>
      
 </ul>
 </ul>
-    
-<ul>
-<li>
-<a href="manuals/">10.0 Manuals</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>original</em>
-</li>
-<ul>
-      
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.0/publishedapi">API</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>api</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/docs-10.0.zip">All docs: zip</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>docs_zip</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/docs-10.0.tar.gz">All docs: tar.gz</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>docs_zip</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.0/manuals/getstart/gspr02.html">Getting Started</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>getstart</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.0/manuals/reference/sqlj02.html">Reference Manual</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>reference</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.0/manuals/develop/develop02.html">Developer's Guide</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>develop</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.0/manuals/tuning/perf02.html">Tuning Derby</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tuning</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.0/manuals/admin/hubprnt02.html">Server &amp; Admin Guide</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>admin</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/10.0/manuals/tools/tools02.html">Tools &amp; Utility Guide</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tools</em>
-</li>
-</ul>
-    
-</ul>
-</ul>
-    
-</ul>
-</ul>
 
-    
-<ul>
-<li>
-<a href="manuals/">Brazilian Portuguese</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>brazport</em>
-</li>
-<ul>
-      
-<ul>
-<li>
-<a href="manuals/">Latest Alpha Manuals</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>brazalpha</em>
-</li>
-<ul>
-           
-<ul>
-<li>
-<a href="manuals/">Introdu&ccedil;&atilde;o ao Derby</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>gstart</em>
-</li>
-<ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/dev/pt_BR/getstart/getstartderby.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>getstart1</em>
-</li>
-</ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/dev/pt_BR/getstart/pt_BR/getstart-single.html">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>getstart2</em>
-</li>
-</ul>
-              
-<ul>
-<li>
-<a href="http://db.apache.org/derby/docs/dev/pt_BR/getstart/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>getstart2</em>
-</li>
-</ul>
-           
-</ul>
-</ul>
-           
+     
 <ul>
 <li>
-<a href="manuals/">Manual de Refer&ecirc;ncia do Derby</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>refman</em>
+<a href="">Presentations</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>present</em>
 </li>
 <ul>
-              
+         
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/pt_BR/ref/refderby.pdf">PDF</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ref1</em>
+<a href="papers/ApacheCon.html">ApacheCon</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>apacheCon</em>
 </li>
 </ul>
-              
+         
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/pt_BR/ref/pt_BR/ref-single.html">HTML Book</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ref2</em>
+<a href="papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>oscon05</em>
 </li>
 </ul>
-              
+         
 <ul>
 <li>
-<a href="http://db.apache.org/derby/docs/dev/pt_BR/ref/">HTML Files</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>ref2</em>
+<a href="papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>colorado</em>
 </li>
 </ul>
-           
-</ul>
-</ul>
-      
-</ul>
-</ul>
-    
+     
 </ul>
 </ul>
 
   
 </ul>
 </ul>
-
 
   
 

Added: db/derby/site/trunk/build/site/logo.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/logo.html?rev=390204&view=auto
==============================================================================
--- db/derby/site/trunk/build/site/logo.html (added)
+++ db/derby/site/trunk/build/site/logo.html Thu Mar 30 10:21:49 2006
@@ -0,0 +1,238 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="Apache Forrest" name="Generator">
+<meta name="Forrest-version" content="0.7">
+<meta name="Forrest-skin-name" content="pelt">
+<title>Apache Derby: Logo Contest</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">
+<link type="text/css" href="skin/profile.css" rel="stylesheet">
+<script src="skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="skin/fontsize.js" language="javascript" type="text/javascript"></script>
+<link rel="shortcut icon" href="">
+</head>
+<body onload="init()">
+<script type="text/javascript">ndeSetTextSize();</script>
+<div id="top">
+<div class="breadtrail">
+<a href="http://www.apache.org/">apache</a> &gt; <a href="http://db.apache.org/">db</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
+</div>
+<div class="header">
+<div class="grouplogo">
+<a href="http://db.apache.org/derby"><img class="logoImage" alt="Apache Derby" src="images/derby-logo-web.png" title="Derby is a zero-admin Java RDBMS"></a>
+</div>
+<div class="projectlogoA1">
+<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>
+<a class="base-not-selected" href="index.html">Home</a>
+</li>
+<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 class="current">
+<a class="base-selected" href="derby_comm.html">Community</a>
+</li>
+<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>
+</div>
+<div id="main">
+<div id="publishedStrip">
+<div id="level2tabs"></div>
+<script type="text/javascript"><!--
+document.write("<text>Last Published:</text> " + document.lastModified);
+//  --></script>
+</div>
+<div class="breadtrail">
+             
+             &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 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">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="menupage">
+<div class="menupagetitle">Logo</div>
+</div>
+<div class="menuitem">
+<a href="papers/derby_web.html">Updating the web site</a>
+</div>
+</div>
+<div class="searchbox">
+<hr>
+<form action="http://www.google.com/search" method="get">
+<input value="db.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="18" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
+                  <input attr="value" name="Search" value="Search" type="submit">
+</form>
+</div>
+<div id="credit"></div>
+<div id="roundbottom">
+<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
+<div id="credit2"></div>
+</div>
+<div id="content">
+<div class="trail">
+<text>Font size:</text> 
+	          &nbsp;<input value="Reset" class="resetfont" title="Reset text" onclick="ndeSetTextSize('reset'); return false;" type="button">      
+	          &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: Logo Contest</h1>
+<div id="minitoc-area">
+<ul class="minitoc">
+<li>
+<a href="#Contest+Results">Contest Results</a>
+</li>
+<li>
+<a href="#Contest+Rules">Contest Rules</a>
+</li>
+<li>
+<a href="#Entries">Entries</a>
+</li>
+</ul>
+</div>
+
+
+<a name="N1000C"></a><a name="Contest+Results"></a>
+<h2 class="boxed">Contest Results</h2>
+<div class="section">
+<p>
+The vote closed at noon PST on Dec 7, 2005, and 
+<a class="external" href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200512.mbox/%3c43974AD5.9020304@sun.com%3e">Roger Dudler's entries won</a>:
+</p>
+<ul>
+ 
+<li>
+<a class="external" href="http://issues.apache.org/jira/secure/attachment/12321022/derby_logo_only.jpg">derby_logo_only.jpg</a>
+</li>
+ 
+<li>
+<a class="external" href="http://issues.apache.org/jira/secure/attachment/12321023/derby_with_text.jpg">derby_with_text.jpg</a>
+</li>
+ 
+<li>
+<a class="external" href="http://issues.apache.org/jira/secure/attachment/12321055/roger_full_showcase.jpg">roger_full_showcase.jpg</a>
+</li>
+
+</ul>
+<p>
+Thanks to everyone for participating!
+</p>
+</div>
+
+
+<a name="N1002F"></a><a name="Contest+Rules"></a>
+<h2 class="boxed">Contest Rules</h2>
+<div class="section">
+<div class="frame note">
+<div class="label">Note</div>
+<div class="content">
+The contest is now over.
+This section left for historical reasons. 
+</div>
+</div>
+<p>
+Derby needs a logo!  
+This contest is open to anyone in the Derby community who would like to submit
+an image for the Apache Derby logo.
+The contest was kicked off on
+<a class="external" href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200505.mbox/%3c20050503184855.71659.qmail@web81310.mail.yahoo.com%3e">May 3, 2005</a>.
+Please participate in the creation of rules on the
+<a href="derby_mail.html">derby-user@db.apache.org</a> mail list.
+</p>
+</div>
+
+
+<a name="N10044"></a><a name="Entries"></a>
+<h2 class="boxed">Entries</h2>
+<div class="section">
+<div class="frame note">
+<div class="label">Note</div>
+<div class="content">
+The contest is now over.
+This section left for historical reasons. 
+</div>
+</div>
+<p>
+Please attach logo entries to Jira issue
+<a class="external" href="http://issues.apache.org/jira/browse/DERBY-297">DERBY-297</a>.
+Anyone can upload a logo to this Jira issue.  
+You do need a Jira id, which you can sign up for at
+<a class="external" href="http://issues.apache.org/jira/">http://issues.apache.org/jira/</a>.
+</p>
+<p>
+When you upload attachments to Jira, 
+you have two options:
+</p>
+<ul>
+ 
+<li>Grant license to ASF for inclusion in ASF works (as per the
+     <a class="external" href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+     Software License</a>)</li>
+ 
+<li> Attachment not intended for inclusion</li>
+
+</ul>
+<p>
+The only logos that will be considered are those for which the
+license has been granted to the ASF.
+But only grant the license to the ASF if you are entitled to do so.
+Don't include any elements to which you don't have rights or permission.
+</p>
+</div>
+
+
+<p>
+
+<em>Last updated: December 7, 2005</em>
+
+</p>
+
+</div>
+<div class="clearboth">&nbsp;</div>
+</div>
+<div id="footer">
+<div class="lastmodified">
+<script type="text/javascript"><!--
+document.write("<text>Last Published:</text> " + document.lastModified);
+//  --></script>
+</div>
+<div class="copyright">
+        Copyright &copy;
+         2004-2006 Apache Software Foundation</div>
+<div id="feedback">
+    Send feedback about the website to:
+  <a id="feedbackto" href="mailto:derby-dev@db.apache.org?subject=Feedback%C2%A0logo.html">derby-dev@db.apache.org</a>
+</div>
+</div>
+</body>
+</html>

Propchange: db/derby/site/trunk/build/site/logo.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/site/trunk/build/site/logo_contest.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/logo_contest.html?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/logo_contest.html (original)
+++ db/derby/site/trunk/build/site/logo_contest.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>
@@ -74,11 +80,11 @@
 <div class="menuitem">
 <a href="derby_tests.html">Tests</a>
 </div>
-<div class="menuitem">
-<a href="DerbyToDo.html">To-Do</a>
-</div>
 <div class="menupage">
-<div class="menupagetitle">Logo Contest</div>
+<div class="menupagetitle">Logo</div>
+</div>
+<div class="menuitem">
+<a href="papers/derby_web.html">Updating the web site</a>
 </div>
 </div>
 <div class="searchbox">



Mime
View raw message