Modified: websites/production/db/content/derby/integrate/db_ddlutils.html
==============================================================================
--- websites/production/db/content/derby/integrate/db_ddlutils.html (original)
+++ websites/production/db/content/derby/integrate/db_ddlutils.html Wed Sep 28 
01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Using DdlUtils to Migrate Databases to Derby</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Using DdlUtils to Migrate Databases to Derby</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -359,7 +360,7 @@ document.write("Last Published: " + docu
 <a href="#Add+an+import+target+to+the+build.xml">Add an import target to the 
build.xml</a>
 </li>
 <li>
-<a href="#Execute+the+Ant+task-N10228">Execute the Ant task</a>
+<a href="#Execute+the+Ant+task-N10229">Execute the Ant task</a>
 </li>
 </ul>
 </li>
@@ -373,10 +374,11 @@ document.write("Last Published: " + docu
 <a href="#Questions%3F">Questions?</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="Overview"></a>
+<a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>
@@ -412,7 +414,7 @@ you must export the schema and data beca
 an alpha database.
 DdlUtils makes this migration easier.
 </p>
-<a name="N1002F"></a><a name="Target+Audience"></a>
+<a name="Target+Audience"></a>
 <h3 class="boxed">Target Audience</h3>
 <p>DdlUtils doesn't have an official release yet, 
       so this example is intended for developers -- and for users who have a 
@@ -426,7 +428,7 @@ DdlUtils makes this migration easier.
       variables, and troubleshooting
       any problems that might occur.
    </p>
-<a name="N10039"></a><a name="Prerequisites"></a>
+<a name="Prerequisites"></a>
 <h3 class="boxed">Prerequisites</h3>
 <p>This project assumes a basic knowledge of Derby.
          If you're new, start with the on-line
@@ -455,7 +457,7 @@ DdlUtils makes this migration easier.
 </div>
 
 
-<a name="N1006F"></a><a name="Step+1%3A+Setup+a+working+directory"></a>
+<a name="Step+1%3A+Setup+a+working+directory"></a>
 <h2 class="boxed">Step 1: Setup a working directory</h2>
 <div class="section">
 <p>
@@ -473,7 +475,7 @@ mkdir lib</p>
 </div>
 
 
-<a name="N10086"></a><a name="Step+2%3A+Build+and+Install+DdlUtils"></a>
+<a name="Step+2%3A+Build+and+Install+DdlUtils"></a>
 <h2 class="boxed">Step 2: Build and Install DdlUtils</h2>
 <div class="section">
 <p>
@@ -527,7 +529,7 @@ cd ..  </p>
 
 
 
-<a name="N100C8"></a><a 
name="Step+3%3A+Create+a+sample+database%3A+Books1"></a>
+<a name="Step+3%3A+Create+a+sample+database%3A+Books1"></a>
 <h2 class="boxed">Step 3: Create a sample database: Books1 </h2>
 <div class="section">
 <p>
@@ -593,7 +595,7 @@ Finally, exit the database:
 </div>
 
 
-<a name="N10102"></a><a name="Step+4%3A+Books1+--+Export+Schema+and+Data"></a>
+<a name="Step+4%3A+Books1+--+Export+Schema+and+Data"></a>
 <h2 class="boxed">Step 4: Books1 -- Export Schema and Data </h2>
 <div class="section">
 <p>
@@ -603,7 +605,7 @@ You'll use the
 <a href="http://db.apache.org/ddlutils/ant/index.all.html";>DdlUtils Ant 
tasks</a>
 to execute the export.
 </p>
-<a name="N10115"></a><a 
name="Create+an+Ant+build.xml+file+with+an+export+target"></a>
+<a name="Create+an+Ant+build.xml+file+with+an+export+target"></a>
 <h3 class="boxed">Create an Ant build.xml file with an export target</h3>
 <p>
 Complete source for the Ant build file is below.
@@ -683,7 +685,7 @@ Here are a few notes about the <span cla
 </li>
 
 </ul>
-<a name="N10173"></a><a name="Execute+the+Ant+task"></a>
+<a name="Execute+the+Ant+task"></a>
 <h3 class="boxed">Execute the Ant task</h3>
 <p>
 Now execute the task with <span class="codefrag">ant</span>:
@@ -705,7 +707,7 @@ succeeded and there should be two new fi
 </div>
 
 
-<a name="N10198"></a><a 
name="Step+5%3A+Books2+--+Create+Database+and+Import+Schema+and+Data"></a>
+<a name="Step+5%3A+Books2+--+Create+Database+and+Import+Schema+and+Data"></a>
 <h2 class="boxed">Step 5: Books2 -- Create Database and Import Schema and 
Data</h2>
 <div class="section">
 <p>
@@ -715,7 +717,7 @@ As with the export task, you'll use the
 <a href="http://db.apache.org/ddlutils/ant/index.all.html";>DdlUtils Ant 
tasks</a>
 to execute the import.
 </p>
-<a name="N101AB"></a><a 
name="Copy+and+%28maybe%29+modify+the+db-schema.xml+file"></a>
+<a name="Copy+and+%28maybe%29+modify+the+db-schema.xml+file"></a>
 <h3 class="boxed">Copy and (maybe) modify the db-schema.xml file </h3>
 <p>
 The export step created a file called <span 
class="codefrag">db-schema.xml</span>. Copy that
@@ -751,7 +753,7 @@ for example, to change the mapping of a
 </li>
 
 </ul>
-<a name="N101E9"></a><a name="Add+an+import+target+to+the+build.xml"></a>
+<a name="Add+an+import+target+to+the+build.xml"></a>
 <h3 class="boxed">Add an import target to the build.xml</h3>
 <p>
 Copy the source for the <span class="codefrag">import-target-db</span> target 
below
@@ -802,7 +804,7 @@ Here are a few notes about the source:
    </li>
 
 </ul>
-<a name="N10228"></a><a name="Execute+the+Ant+task-N10228"></a>
+<a name="Execute+the+Ant+task-N10229"></a>
 <h3 class="boxed">Execute the Ant task</h3>
 <p>
 Execute the task with <span class="codefrag">ant</span>:
@@ -831,7 +833,7 @@ Total time: 4 seconds </p>
 </div>
 
 
-<a name="N10241"></a><a name="Step+6%3A+Verify+Migration"></a>
+<a name="Step+6%3A+Verify+Migration"></a>
 <h2 class="boxed">Step 6: Verify Migration</h2>
 <div class="section">
 <p>
@@ -852,7 +854,7 @@ ij&gt; select * from book;
 </div>
 
 
-<a name="N1025D"></a><a name="Caveats"></a>
+<a name="Caveats"></a>
 <h2 class="boxed">Caveats</h2>
 <div class="section">
 <p>
@@ -865,7 +867,7 @@ DdlUtils database support on the
 </div>
 
 
-<a name="N1026B"></a><a name="Questions%3F"></a>
+<a name="Questions%3F"></a>
 <h2 class="boxed">Questions?</h2>
 <div class="section">
 <p>Please post questions about this example to 

Modified: websites/production/db/content/derby/integrate/db_torque.html
==============================================================================
--- websites/production/db/content/derby/integrate/db_torque.html (original)
+++ websites/production/db/content/derby/integrate/db_torque.html Wed Sep 28 
01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Running the Torque Tutorial on Derby</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Running the Torque Tutorial on Derby</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -367,10 +368,11 @@ document.write("Last Published: " + docu
 <a href="#Got+Questions%3F">Got Questions?</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="Overview"></a>
+<a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>
@@ -402,7 +404,7 @@ Details are in
 </div>
 
 
-<a name="N10029"></a><a name="Step+1"></a>
+<a name="Step+1"></a>
 <h2 class="boxed">Step 1</h2>
 <div class="section"></div>
 
@@ -412,10 +414,10 @@ No changes to this step are required.
 </p>
 
 
-<a name="N10033"></a><a name="Step+2"></a>
+<a name="Step+2"></a>
 <h2 class="boxed">Step 2</h2>
 <div class="section">
-<a name="N10039"></a><a name="Torque+Generator+Properties"></a>
+<a name="Torque+Generator+Properties"></a>
 <h3 class="boxed">Torque Generator Properties</h3>
 <p>Below is a <span class="codefrag">project.properties</span> file that works
       with the Derby embedded driver:</p>
@@ -457,10 +459,10 @@ No changes to this step are required.
 
 
 
-<a name="N1004B"></a><a name="Step+3"></a>
+<a name="Step+3"></a>
 <h2 class="boxed">Step 3</h2>
 <div class="section">
-<a name="N10051"></a><a name="Adding+the+driver+to+the+maven+repository"></a>
+<a name="Adding+the+driver+to+the+maven+repository"></a>
 <h3 class="boxed">Adding the driver to the maven repository</h3>
 <p>
 I added the Derby jar to my local maven repository like this:
@@ -474,7 +476,7 @@ I added the Derby jar to my local maven
 There are probably other ways for incorporating the Derby jar
 that don't require renaming the jar to include the version.
 </p>
-<a name="N10062"></a><a name="Specifying+the+driver+dependency"></a>
+<a name="Specifying+the+driver+dependency"></a>
 <h3 class="boxed">Specifying the driver dependency</h3>
 <p>
 Here is the complete <span class="codefrag">project.xml</span> file:
@@ -498,7 +500,7 @@ Here is the complete <span class="codefr
      &lt;/dependencies&gt;
    &lt;/project&gt;
 </pre>
-<a name="N10073"></a><a name="Creating+the+database"></a>
+<a name="Creating+the+database"></a>
 <h3 class="boxed">Creating the database</h3>
 <p>
 The Torque Tutorial instructions mention that 
@@ -534,7 +536,7 @@ If I were on Windows, I would have set t
 <pre class="code">
    set DERBY_SYSTEM_HOME=C:\home\jta\Apache\TorqueTutorial
 </pre>
-<a name="N1009B"></a><a name="Creating+the+tables"></a>
+<a name="Creating+the+tables"></a>
 <h3 class="boxed">Creating the tables</h3>
 <p>
 No changes to this step are required.
@@ -542,10 +544,10 @@ No changes to this step are required.
 </div>
 
 
-<a name="N100A6"></a><a name="Step+4"></a>
+<a name="Step+4"></a>
 <h2 class="boxed">Step 4</h2>
 <div class="section">
-<a name="N100AC"></a><a name="Torque+Run-Time+Properties"></a>
+<a name="Torque+Run-Time+Properties"></a>
 <h3 class="boxed">Torque Run-Time Properties</h3>
 <p>
 Here is the complete <span class="codefrag">src/conf/torque.properties</span> 
file:
@@ -564,7 +566,7 @@ Here is the complete <span class="codefr
 </div>
 
 
-<a name="N100BE"></a><a name="Step+5"></a>
+<a name="Step+5"></a>
 <h2 class="boxed">Step 5</h2>
 <div class="section">
 <p>
@@ -573,7 +575,7 @@ No changes to this step are required.
 </div>
 
 
-<a name="N100C8"></a><a name="Step+6"></a>
+<a name="Step+6"></a>
 <h2 class="boxed">Step 6</h2>
 <div class="section">
 <p>
@@ -600,7 +602,7 @@ Here is the command I ran on my Linux ma
 </div>
 
 
-<a name="N100E8"></a><a name="Got+Questions%3F"></a>
+<a name="Got+Questions%3F"></a>
 <h2 class="boxed">Got Questions?</h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/integrate/derby_plugin_info.html
==============================================================================
--- websites/production/db/content/derby/integrate/derby_plugin_info.html 
(original)
+++ websites/production/db/content/derby/integrate/derby_plugin_info.html Wed 
Sep 28 01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Derby Plug-in for Eclipse</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Derby Plug-in for Eclipse</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -332,9 +333,10 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
+</div>
 
 
-<a name="N1000D"></a><a name="Overview"></a>
+<a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>
@@ -381,7 +383,7 @@ Contained the Eclipse-Help documentation
 </div>
 
 
-<a name="N1004E"></a><a name="Build"></a>
+<a name="Build"></a>
 <h2 class="boxed">Build</h2>
 <div class="section">
 <p>
@@ -393,7 +395,7 @@ To build the ui and doc plug-ins, follow
 </div>
 
 
-<a name="N10063"></a><a name="Alternative"></a>
+<a name="Alternative"></a>
 <h2 class="boxed">Alternative</h2>
 <div class="section">
 <p>
@@ -402,7 +404,7 @@ To achieve similar functionality as the
 </div>
 
 
-<a name="N1006D"></a><a name="Resources"></a>
+<a name="Resources"></a>
 <h2 class="boxed">Resources</h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/integrate/index.html
==============================================================================
--- websites/production/db/content/derby/integrate/index.html (original)
+++ websites/production/db/content/derby/integrate/index.html Wed Sep 28 
01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby and Other Products</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -319,6 +319,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby and Other Products</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -331,10 +332,11 @@ document.write("Last Published: " + docu
 <a href="#eclipse">Eclipse Plug-ins</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="uses"></a>
+<a name="uses"></a>
 <h2 class="boxed">What works with Derby?</h2>
 <div class="section">
 <p>
@@ -347,7 +349,7 @@ so please feel free to add more entries.
 </div>
 
 
-<a name="N1001B"></a><a name="products"></a>
+<a name="products"></a>
 <h2 class="boxed">Product Writeups</h2>
 <div class="section">
 <p>
@@ -477,7 +479,7 @@ contributed to the Derby web site and ar
 </div>
 
 
-<a name="N10104"></a><a name="eclipse"></a>
+<a name="eclipse"></a>
 <h2 class="boxed">Eclipse Plug-ins</h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/license.html
==============================================================================
--- websites/production/db/content/derby/license.html (original)
+++ websites/production/db/content/derby/license.html Wed Sep 28 01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: License</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -172,6 +172,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby: License</h1>
+<div id="front-matter"></div>
 
 <p>
 Derby is available under the 

Modified: websites/production/db/content/derby/linkmap.html
==============================================================================
--- websites/production/db/content/derby/linkmap.html (original)
+++ websites/production/db/content/derby/linkmap.html Wed Sep 28 01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Site Linkmap Table of Contents</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -484,6 +484,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Site Linkmap Table of Contents</h1>
+<div id="front-matter"></div>
 <p>
           This is a map of the complete site and its structure.
         </p>

Modified: websites/production/db/content/derby/logo.html
==============================================================================
--- websites/production/db/content/derby/logo.html (original)
+++ websites/production/db/content/derby/logo.html Wed Sep 28 01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: Logo</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -175,6 +175,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby: Logo</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -200,9 +201,10 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
+</div>
 
 
-<a name="N1000D"></a><a name="Introduction"></a>
+<a name="Introduction"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>
@@ -226,7 +228,7 @@ to prc &lt;AT&gt; apache.org.
 </div>
 
 
-<a name="N10029"></a><a name="logo"></a>
+<a name="logo"></a>
 <h2 class="boxed"> Logo </h2>
 <div class="section">
 <p>
@@ -257,7 +259,7 @@ to prc &lt;AT&gt; apache.org.
 </div>
 
 
-<a name="N10069"></a><a name="logo_with_text_white"></a>
+<a name="logo_with_text_white"></a>
 <h2 class="boxed"> Logo with Text: White Background </h2>
 <div class="section">
 <p>
@@ -293,7 +295,7 @@ to prc &lt;AT&gt; apache.org.
 </div>
 
 
-<a name="N100AB"></a><a name="logo_with_text_black"></a>
+<a name="logo_with_text_black"></a>
 <h2 class="boxed"> Logo with Text: Black Background </h2>
 <div class="section">
 <p>
@@ -312,7 +314,7 @@ to prc &lt;AT&gt; apache.org.
 </div>
 
 
-<a name="N100CA"></a><a name="logo_with_nimbus"></a>
+<a name="logo_with_nimbus"></a>
 <h2 class="boxed"> Logo with "Powered By Apache" Nimbus </h2>
 <div class="section">
 <p>
@@ -331,7 +333,7 @@ to prc &lt;AT&gt; apache.org.
 </div>
 
 
-<a name="N100EB"></a><a name="hat_with_nimbus"></a>
+<a name="hat_with_nimbus"></a>
 <h2 class="boxed"> Hat with "Powered By Apache" Nimbus </h2>
 <div class="section">
 <p>
@@ -350,7 +352,7 @@ to prc &lt;AT&gt; apache.org.
 </div>
 
 
-<a name="N1010C"></a><a name="tiny_buttons"></a>
+<a name="tiny_buttons"></a>
 <h2 class="boxed"> Tiny Buttons </h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/manuals/dita.html
==============================================================================
--- websites/production/db/content/derby/manuals/dita.html (original)
+++ websites/production/db/content/derby/manuals/dita.html Wed Sep 28 01:33:43 
2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: DITA-sourced documentation</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -172,6 +172,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby: DITA-sourced documentation</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -199,6 +200,7 @@ document.write("Last Published: " + docu
 <a href="#Committing+documentation+patches">Committing documentation 
patches</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
@@ -212,7 +214,7 @@ documentation in PDF format</a> thread).
 <p>This page lists the software required to convert the DITA-sourced 
documentation into HTML or PDF, and describes how to convert the DITA source to 
the desired outputs.  These instructions describe how to use an <span 
class="codefrag">ant</span> build file with the DITA Toolkit to create 
output.</p>
 
 
-<a name="N1001A"></a><a name="Setting+up+your+environment"></a>
+<a name="Setting+up+your+environment"></a>
 <h2 class="boxed">Setting up your environment</h2>
 <div class="section">
 <p>
@@ -285,7 +287,7 @@ set the
 </div>
 
 
-<a name="N100AF"></a><a name="Locating+the+correct+DITA+file"></a>
+<a name="Locating+the+correct+DITA+file"></a>
 <h2 class="boxed">Locating the correct DITA file</h2>
 <div class="section">
 <p>The simpliest way to determine the name of the file that contains the 
information that you want to update is to:</p>
@@ -319,7 +321,7 @@ Guidelines for writing Derby information
 </div> 
 
 
-<a name="N100EA"></a><a name="Editing+DITA+files"></a>
+<a name="Editing+DITA+files"></a>
 <h2 class="boxed">Editing DITA files</h2>
 <div class="section">
 <p>DITA is an XML specification.  You can edit DITA files in any text editor, 
but XML editors allow you to insert and modifiy tags easily while conforming to 
the DITA DTD and schemas.  It is HIGHLY recommended that you use an XML editor 
to avoid errors in tagging.</p>
@@ -350,7 +352,7 @@ Guidelines for writing Derby information
 </div>
 
 
-<a name="N10122"></a><a name="Creating+output"></a>
+<a name="Creating+output"></a>
 <h2 class="boxed">Creating output</h2>
 <div class="section">
 <p>To create output from the DITA source files:</p>
@@ -450,7 +452,7 @@ set up and configured correctly, the bui
 </table>
 </div>
 
-<a name="N101DB"></a><a name="DITA+file+names"></a>
+<a name="DITA+file+names"></a>
 <h2 class="boxed">DITA file names</h2>
 <div class="section">
 <p>Dita files are named to provide a sense of what type of topic they contain 
as well as to which manual they belong.  All DITA topics are classified as 
either concepts, tasks, or reference material.  Thus, every file begins with 
either a "c", "t", or "r".  In addition, the letters that appear immediately 
after this first one provide a shorthand id for the manual.  For example, the 
<span class="codefrag">Getting Started with Derby</span> manual uses "gs", so a 
reference topic DITA file in that manual will start with "rgs".  Subsequent 
letters in the file name may provide hints at the topic's section within the 
manual, as well as numbers distinguishing it from other DITA files.</p>
@@ -458,7 +460,7 @@ set up and configured correctly, the bui
 </div>
 
 
-<a name="N101EA"></a><a name="Modifying+the+output+format"></a>
+<a name="Modifying+the+output+format"></a>
 <h2 class="boxed">Modifying the output format</h2>
 <div class="section">
 <p>You may wish to modify the output created by the DITA Toolkit to fix 
organization, formatting, links, indexing, etc.  To do this, you will have to 
modify the xsl files distributed with the DITA Toolkit.  The instructions for 
which files to modify and how are included within the Toolkit documentation.  
To modify the PDF output, it is recommended that you make changes only to the 
<span class="codefrag">dita2fo_shell.xsl</span> file.</p>
@@ -474,7 +476,7 @@ Please post feedback to the
 </p>
 
 
-<a name="N10203"></a><a name="Submitting+documentation+patches"></a>
+<a name="Submitting+documentation+patches"></a>
 <h2 class="boxed">Submitting documentation patches</h2>
 <div class="section">
 <p> 
@@ -714,7 +716,7 @@ easier.</li>
 </div>
 
 
-<a name="N102F6"></a><a name="Committing+documentation+patches"></a>
+<a name="Committing+documentation+patches"></a>
 <h2 class="boxed">Committing documentation patches</h2>
 <div class="section">
 <p>You must be a Derby committer to commit Derby patches.</p>

Modified: websites/production/db/content/derby/manuals/docscheck.html
==============================================================================
--- websites/production/db/content/derby/manuals/docscheck.html (original)
+++ websites/production/db/content/derby/manuals/docscheck.html Wed Sep 28 
01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: Release Checklist for Docs</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -172,6 +172,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby: Release Checklist for Docs</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -187,6 +188,7 @@ document.write("Last Published: " + docu
 <a href="#Update+the+ditamap+files">Update the ditamap files</a>
 </li>
 </ul>
+</div>
 </div> 
 
 <p>
@@ -203,7 +205,7 @@ that need to be done for Derby releases<
 for more information.
 </p>
 
-<a name="N10017"></a><a name="Update+the+conrefs+files"></a>
+<a name="Update+the+conrefs+files"></a>
 <h2 class="boxed">Update the conrefs files</h2>
 <div class="section">
 <p>
@@ -241,7 +243,7 @@ new manual in the "pub" section in each
 </p>
 </div>
 
-<a name="N1003E"></a><a name="Update+examples+in+the+manuals"></a>
+<a name="Update+examples+in+the+manuals"></a>
 <h2 class="boxed">Update examples in the manuals</h2>
 <div class="section">
 <p>
@@ -302,7 +304,7 @@ The following files need to be updated:
 </ul>
 </div>
 
-<a name="N1008C"></a><a 
name="Check+the+licensing+and+copyright+information"></a>
+<a name="Check+the+licensing+and+copyright+information"></a>
 <h2 class="boxed">Check the licensing and copyright information</h2>
 <div class="section">
 <p>
@@ -338,7 +340,7 @@ JIRA issue <a class="external" href="htt
 </p>
 </div>
 
-<a name="N100B2"></a><a name="Update+the+ditamap+files"></a>
+<a name="Update+the+ditamap+files"></a>
 <h2 class="boxed">Update the ditamap files</h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/manuals/docsfaq.html
==============================================================================
--- websites/production/db/content/derby/manuals/docsfaq.html (original)
+++ websites/production/db/content/derby/manuals/docsfaq.html Wed Sep 28 
01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: Writing FAQs</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -172,6 +172,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby: Writing FAQs</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -195,8 +196,9 @@ or expression?</a>
 </li>
 </ul>
 </div>
+</div>
 
-<a name="N1000D"></a><a 
name="Cross+references%3A+To+another+DITA+topic+in+the+same+Derby+manual"></a>
+<a 
name="Cross+references%3A+To+another+DITA+topic+in+the+same+Derby+manual"></a>
 <h2 class="boxed">Cross references: To another DITA topic in the same Derby 
manual</h2>
 <div class="section">
 <p>To create a cross reference to another DITA topic in the same Derby manual, 
@@ -215,7 +217,7 @@ topic,  followed by the pound symbol and
 </p>
 </div>
 
-<a name="N10026"></a><a 
name="Cross+references%3A+To+a+DITA+topic+in+a+different+Derby+manual"></a>
+<a name="Cross+references%3A+To+a+DITA+topic+in+a+different+Derby+manual"></a>
 <h2 class="boxed">Cross references: To a DITA topic in a different Derby 
manual</h2>
 <div class="section">
 <p>Currently, you cannot create a cross reference to a DITA topic in a 
different 
@@ -237,7 +239,7 @@ for instructions on how to print more in
 </p>
 </div>
 
-<a name="N10042"></a><a name="Cross+references%3A+To+a+Web+site"></a>
+<a name="Cross+references%3A+To+a+Web+site"></a>
 <h2 class="boxed">Cross references: To a Web site</h2>
 <div class="section">
 <p>To create a cross reference to a Web site, use the 
@@ -255,7 +257,7 @@ for instructions on how to print more in
 </p>
 </div>
 
-<a name="N1005B"></a><a name="Code+Examples"></a>
+<a name="Code+Examples"></a>
 <h2 class="boxed">Code Examples</h2>
 <div class="section">
 <p>
@@ -293,7 +295,7 @@ CREATE TABLE x_table
 </pre>
 </div>
 
-<a name="N10085"></a><a 
name="Semi-colon+use+at+the+end+of+statements+and+commands"></a>
+<a name="Semi-colon+use+at+the+end+of+statements+and+commands"></a>
 <h2 class="boxed">Semi-colon use at the end of statements and commands</h2>
 <div class="section">
 <p>
@@ -319,7 +321,7 @@ SQL statement, the semi-colon should not
 </p>
 </div>
 
-<a name="N100A5"></a><a 
name="SQL+terminology%3A+When+do+I+use+the+terms+statement%2C+clause%2C+parameter%2C+%0Aor+expression%3F"></a>
+<a 
name="SQL+terminology%3A+When+do+I+use+the+terms+statement%2C+clause%2C+parameter%2C+%0Aor+expression%3F"></a>
 <h2 class="boxed">SQL terminology: When do I use the terms statement, clause, 
parameter, 
 or expression?</h2>
 <div class="section">

Modified: websites/production/db/content/derby/manuals/guidelines.html
==============================================================================
--- websites/production/db/content/derby/manuals/guidelines.html (original)
+++ websites/production/db/content/derby/manuals/guidelines.html Wed Sep 28 
01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: Writing guidelines</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -172,6 +172,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby: Writing guidelines</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -199,6 +200,7 @@ document.write("Last Published: " + docu
 <a href="#Customizing+tables+in+the+Derby+documentation">Customizing tables in 
the Derby documentation</a>
 </li>
 </ul>
+</div>
 </div> 
 
 <p>
@@ -208,7 +210,7 @@ for working with DITA topics and tagging
 </p>
 
 
-<a name="N10014"></a><a 
name="New+topics%3A+Choosing+the+correct+topic+type"></a>
+<a name="New+topics%3A+Choosing+the+correct+topic+type"></a>
 <h2 class="boxed">New topics: Choosing the correct topic type</h2>
 <div class="section">
 <p>
@@ -242,7 +244,7 @@ the task.
 </div>
 
 
-<a name="N10030"></a><a 
name="New+topics%3A+Using+a+template+to+create+a+new+topic"></a>
+<a name="New+topics%3A+Using+a+template+to+create+a+new+topic"></a>
 <h2 class="boxed">New topics: Using a template to create a new topic</h2>
 <div class="section">
 <p>When you need to create a new topic, use one of the templates that are 
@@ -252,7 +254,7 @@ included with the Derby source files. Th
 </div>
 
 
-<a name="N1003D"></a><a name="New+topics%3A+Selecting+the+best+filename"></a>
+<a name="New+topics%3A+Selecting+the+best+filename"></a>
 <h2 class="boxed">New topics: Selecting the best filename</h2>
 <div class="section">
 <p>When you create a new topic, use a filename that is easy to understand. 
@@ -403,7 +405,7 @@ The following table shows some examples
 </div>
 
 
-<a name="N1012B"></a><a name="Understanding+DITA+tags"></a>
+<a name="Understanding+DITA+tags"></a>
 <h2 class="boxed">Understanding DITA tags</h2>
 <div class="section">
 <p>The tags that are used in DITA topics are similar to HTML and XML tags.</p>
@@ -423,7 +425,7 @@ ask on the <a href="../derby_mail.html">
 </div>
 
 
-<a name="N10148"></a><a name="Tagging+examples+-+structural+tags"></a>
+<a name="Tagging+examples+-+structural+tags"></a>
 <h2 class="boxed">Tagging examples - structural tags</h2>
 <div class="section">
 <p>The following table lists the proper structural tags to use for the most 
common 
@@ -593,7 +595,7 @@ features within the Derby topics.
 </div>
 
 
-<a name="N1025D"></a><a name="Tagging+examples+-+textual+tags"></a>
+<a name="Tagging+examples+-+textual+tags"></a>
 <h2 class="boxed">Tagging examples - textual tags</h2>
 <div class="section">
 <p>The following table lists the proper textual tags to use for the most 
common 
@@ -684,7 +686,7 @@ features within the Derby topics.
 
 
 
-<a name="N102CE"></a><a name="Indexing+guidelines"></a>
+<a name="Indexing+guidelines"></a>
 <h2 class="boxed">Indexing guidelines</h2>
 <div class="section">
 <p>
@@ -853,7 +855,7 @@ of the secondary entries appear under on
 </div>
 
 
-<a name="N10374"></a><a 
name="Customizing+tables+in+the+Derby+documentation"></a>
+<a name="Customizing+tables+in+the+Derby+documentation"></a>
 <h2 class="boxed">Customizing tables in the Derby documentation</h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/manuals/index.html
==============================================================================
--- websites/production/db/content/derby/manuals/index.html (original)
+++ websites/production/db/content/derby/manuals/index.html Wed Sep 28 01:33:43 
2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: Documentation</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -175,6 +175,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby: Documentation</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -229,10 +230,11 @@ document.write("Last Published: " + docu
 <a href="#doc_issues">Reporting Documentation Issues</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="Descriptions"></a>
+<a name="Descriptions"></a>
 <h2 class="boxed">Descriptions</h2>
 <div class="section">
 <p>
@@ -338,7 +340,7 @@ A description of each manual is below:
 </div>
 
 
-<a name="N1006D"></a><a name="latest"></a>
+<a name="latest"></a>
 <h2 class="boxed">Latest Alpha Manuals</h2>
 <div class="section">
 <p>The latest development version of the manuals,  corresponding to the
@@ -427,7 +429,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="N1013A"></a><a name="docs_10.12"></a>
+<a name="docs_10.12"></a>
 <h2 class="boxed">10.12 Manuals</h2>
 <div class="section">
 <p>The 10.12 manuals are listed in this section.
@@ -514,7 +516,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="N10207"></a><a name="docs_10.11"></a>
+<a name="docs_10.11"></a>
 <h2 class="boxed">10.11 Manuals</h2>
 <div class="section">
 <p>The 10.11 manuals are listed in this section.
@@ -601,7 +603,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="N102D4"></a><a name="docs_10.10"></a>
+<a name="docs_10.10"></a>
 <h2 class="boxed">10.10 Manuals</h2>
 <div class="section">
 <p>The 10.10 manuals are listed in this section.
@@ -679,7 +681,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="N10389"></a><a name="docs_10.9"></a>
+<a name="docs_10.9"></a>
 <h2 class="boxed">10.9 Manuals</h2>
 <div class="section">
 <p>The 10.9 manuals are listed in this section.
@@ -757,7 +759,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="N1043E"></a><a name="docs_10.8"></a>
+<a name="docs_10.8"></a>
 <h2 class="boxed">10.8 Manuals</h2>
 <div class="section">
 <p>The 10.8 manuals are listed in this section.
@@ -835,7 +837,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="N104F3"></a><a name="docs_10.7"></a>
+<a name="docs_10.7"></a>
 <h2 class="boxed">10.7 Manuals</h2>
 <div class="section">
 <p>The 10.7 manuals are listed in this section.
@@ -913,7 +915,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="N105A8"></a><a name="docs_10.6"></a>
+<a name="docs_10.6"></a>
 <h2 class="boxed">10.6 Manuals</h2>
 <div class="section">
 <p>The 10.6 manuals are listed in this section.
@@ -991,7 +993,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="N1065D"></a><a name="docs_10.5"></a>
+<a name="docs_10.5"></a>
 <h2 class="boxed">10.5 Manuals</h2>
 <div class="section">
 <p>The 10.5 manuals are listed in this section.
@@ -1069,7 +1071,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="N10712"></a><a name="docs_10.4"></a>
+<a name="docs_10.4"></a>
 <h2 class="boxed">10.4 Manuals</h2>
 <div class="section">
 <p>The 10.4 manuals are listed in this section.
@@ -1173,7 +1175,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="N107F5"></a><a name="docs_10.3"></a>
+<a name="docs_10.3"></a>
 <h2 class="boxed">10.3 Manuals</h2>
 <div class="section">
 <p>The 10.3 manuals are listed in this section.
@@ -1251,7 +1253,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="N108AA"></a><a name="docs_10.2"></a>
+<a name="docs_10.2"></a>
 <h2 class="boxed">10.2 Manuals</h2>
 <div class="section">
 <p>The 10.2 manuals are listed in this section.
@@ -1372,7 +1374,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="N109C7"></a><a name="docs_10.1"></a>
+<a name="docs_10.1"></a>
 <h2 class="boxed">10.1 Manuals</h2>
 <div class="section">
 <p>
@@ -1457,7 +1459,7 @@ discussions about format.
 </div>
 
 
-<a name="N10A84"></a><a name="docs_10.0"></a>
+<a name="docs_10.0"></a>
 <h2 class="boxed">10.0 Manuals</h2>
 <div class="section">
 <p>
@@ -1549,7 +1551,7 @@ to see if the problem still exists in th
 </div>
 
 
-<a name="N10B30"></a><a name="javadoc"></a>
+<a name="javadoc"></a>
 <h2 class="boxed">Internal API documentation</h2>
 <div class="section">
 <p>A recent version of the internal API documentation for Derby.</p>
@@ -1593,7 +1595,7 @@ to see if the problem still exists in th
 </div>
 
 
-<a name="N10B85"></a><a name="doc_issues"></a>
+<a name="doc_issues"></a>
 <h2 class="boxed">Reporting Documentation Issues</h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/manuals/messages.html
==============================================================================
--- websites/production/db/content/derby/manuals/messages.html (original)
+++ websites/production/db/content/derby/manuals/messages.html Wed Sep 28 
01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: Documenting messages</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -171,7 +171,8 @@ document.write("Last Published: " + docu
                  &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: Documenting messages</h1> 
+<h1>Apache Derby: Documenting messages</h1>
+<div id="front-matter"></div> 
 
 
 <p>

Modified: websites/production/db/content/derby/papers/ApacheCon.html
==============================================================================
--- websites/production/db/content/derby/papers/ApacheCon.html (original)
+++ websites/production/db/content/derby/papers/ApacheCon.html Wed Sep 28 
01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>ApacheCon</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>ApacheCon</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -351,9 +352,10 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
+</div>
 
 
-<a name="N1000D"></a><a name="ApacheCon+US%3A+November+12-16%2C+2007"></a>
+<a name="ApacheCon+US%3A+November+12-16%2C+2007"></a>
 <h2 class="boxed">ApacheCon US: November 12-16, 2007</h2>
 <div class="section">
 <p>
@@ -380,7 +382,7 @@ document.write("Last Published: " + docu
 </div>
 
 
-<a name="N10035"></a><a name="ApacheCon+EU%3A+May+1-4%2C+2007"></a>
+<a name="ApacheCon+EU%3A+May+1-4%2C+2007"></a>
 <h2 class="boxed">ApacheCon EU: May 1-4, 2007</h2>
 <div class="section">
 <p>
@@ -402,7 +404,7 @@ document.write("Last Published: " + docu
 </div>
 
 
-<a name="N10053"></a><a name="ApacheCon+US%3A+October+9-13%2C+2006"></a>
+<a name="ApacheCon+US%3A+October+9-13%2C+2006"></a>
 <h2 class="boxed">ApacheCon US: October 9-13, 2006</h2>
 <div class="section">
 <p>
@@ -435,7 +437,7 @@ Sessions that focused on Apache Derby in
 </div>
 
 
-<a name="N1008F"></a><a name="ApacheCon+US%3A+December+10-14%2C+2005"></a>
+<a name="ApacheCon+US%3A+December+10-14%2C+2005"></a>
 <h2 class="boxed">ApacheCon US: December 10-14, 2005</h2>
 <div class="section">
 <p>
@@ -463,7 +465,7 @@ Sessions that focused on Apache Derby in
 </div>
 
 
-<a name="N100BE"></a><a name="ApacheCon+US%3A+November+13-17%2C+2004"></a>
+<a name="ApacheCon+US%3A+November+13-17%2C+2004"></a>
 <h2 class="boxed">ApacheCon US: November 13-17, 2004</h2>
 <div class="section">
 <p>
@@ -521,7 +523,7 @@ Sessions that focused on Apache Derby in
 
 
 </ul>
-<a name="N10102"></a><a name="Derby+Code+Contest"></a>
+<a name="Derby+Code+Contest"></a>
 <h3 class="boxed">Derby Code Contest</h3>
 <p>
   An on-site Derby code contest tooks place at ApacheCon with the
@@ -538,7 +540,7 @@ Sessions that focused on Apache Derby in
 <li> Result can be a tool, mini-application, or any other demonstration of 
Derby integration</li>
   
 </ul>
-<a name="N1011A"></a><a name="First+Place"></a>
+<a name="First+Place"></a>
 <h4>First Place</h4>
 <p>
   The first place winner was 
@@ -564,7 +566,7 @@ Sessions that focused on Apache Derby in
   Universal JDBC Driver. Please try it out and post your experience to the
   Derby mail lists.
   </p>
-<a name="N10139"></a><a name="Second+Place"></a>
+<a name="Second+Place"></a>
 <h4>Second Place</h4>
 <p>
   The second place winner was 
@@ -580,7 +582,7 @@ Sessions that focused on Apache Derby in
   time you attend ApacheCon, you won't walk right by people you may have
   been interacting with in email during the last year(s).
   </p>
-<a name="N1014D"></a><a name="Third+Place"></a>
+<a name="Third+Place"></a>
 <h4>Third Place</h4>
 <p>
   The third place winner was 

Modified: websites/production/db/content/derby/papers/DerbyClientSpec.html
==============================================================================
--- websites/production/db/content/derby/papers/DerbyClientSpec.html (original)
+++ websites/production/db/content/derby/papers/DerbyClientSpec.html Wed Sep 28 
01:33:43 2016
@@ -3,9 +3,8 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
-<meta name="generator" content="">
 <meta name="" content="">
 <meta name="GENERATOR" content="">
 <title>Derby Network Client</title>
@@ -319,6 +318,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Derby Network Client</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -328,10 +328,10 @@ document.write("Last Published: " + docu
 <a href="#">Overview</a>
 </li>
 <li>
-<a href="#-N1003A">Functionality</a>
+<a href="#-N10031">Functionality</a>
 </li>
 <li>
-<a href="#-N1004B">JDBC Driver and DataSource names</a>
+<a href="#-N10042">JDBC Driver and DataSource names</a>
 <ul class="minitoc">
 <li>
 <a href="#Connection+URL+Format">Connection URL Format</a>
@@ -347,10 +347,10 @@ document.write("Last Published: " + docu
 </ul>
 </li>
 <li>
-<a href="#-N100B5">Data Source properties</a>
+<a href="#-N100AC">Data Source properties</a>
 <ul class="minitoc">
 <li>
-<a href="#-N101AD">Tracing</a>
+<a href="#-N101A4">Tracing</a>
 </li>
 <li>
 <a href="#ClientDataSource+Tracing">ClientDataSource Tracing</a>
@@ -359,30 +359,30 @@ document.write("Last Published: " + docu
 <a href="#DriverManager+Tracing">DriverManager Tracing</a>
 </li>
 <li>
-<a href="#-N101EC">ClientDataSource Tracing Examples</a>
+<a href="#-N101E3">ClientDataSource Tracing Examples</a>
 </li>
 <li>
-<a href="#-N10230">DriverManager Tracing Examples</a>
+<a href="#-N10227">DriverManager Tracing Examples</a>
 </li>
 <li>
-<a href="#-N10249">Changing the Default Trace Level</a>
+<a href="#-N10240">Changing the Default Trace Level</a>
 </li>
 </ul>
 </li>
 <li>
-<a href="#-N102B1">Security</a>
+<a href="#-N102A8">Security</a>
 </li>
 <li>
-<a href="#-N10306">Packaging, Distribution and Versioning</a>
+<a href="#-N102FD">Packaging, Distribution and Versioning</a>
 </li>
 <li>
-<a href="#-N10314">Comparision and/or differences with the Derby Embedded 
Driver</a>
+<a href="#-N1030B">Comparision and/or differences with the Derby Embedded 
Driver</a>
 </li>
 <li>
-<a href="#-N10334">Effects to existing documentation</a>
+<a href="#-N1032B">Effects to existing documentation</a>
 </li>
 <li>
-<a href="#-N103A9">Miscellaneous</a>
+<a href="#-N103A0">Miscellaneous</a>
 <ul class="minitoc">
 <li>
 <a href="#Tools">Tools</a>
@@ -396,18 +396,19 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
-<a name="N10025"></a><a name="Derby+Network+Client"></a>
+</div>
+<a name="Derby+Network+Client"></a>
 <h2 class="boxed">Derby Network Client</h2>
 <div class="section">
 <hr>
 <p>Created: 4/11/05<br>Last update: 10/25/05 -- changed h4 tags to h3 (forrest 
hid data), and removed manual table of contents</p>
 <hr>
-<a name="N1002F"></a>
+<a name="N10027"></a>
 <h3 class="boxed">Overview</h3>
 <p>The Derby network client provides network connectivity to the Derby Network 
Server. It is distributed as an additional jar file, derbyclient.jar, with an 
entirely independent code base from the embedded driver.</p>
 <p>The Derby network client is a type 4, JDBC compliant Driver, which attempts 
to match the Derby Embedded JDBC driver as much as possible. Initially, it will 
have some differences from the embedded driver, for example, some SQL States 
will remain null and error messages will not be localized in the initial 
offering. Hopefully, over time the functionality of the two drivers will 
converge.</p>
 <hr>
-<a name="N1003A"></a><a name="-N1003A"></a>
+<a name="-N10031"></a>
 <h3 class="boxed">Functionality</h3>
 <br>
 <br>
@@ -416,7 +417,7 @@ document.write("Last Published: " + docu
 <p>Tools support for ij and dblook as well as test harness support is 
provided.</p>
 <p>The sections that follow will describe the functionality and provide 
examples of using each characteristic mentioned here.</p>
 <hr>
-<a name="N1004B"></a><a name="-N1004B"></a>
+<a name="-N10042"></a>
 <h3 class="boxed">JDBC Driver and DataSource names</h3>
 <p>The Derby network client classes and JDBC interfaces they implement are 
listed below.</p>
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -438,7 +439,7 @@ document.write("Last Published: " + docu
 </tr>
 </tbody>
 </table>
-<a name="N10078"></a><a name="Connection+URL+Format"></a>
+<a name="Connection+URL+Format"></a>
 <h4>Connection URL Format</h4>
 <p>The protocol for the client URL is jdbc:derby://. The embedded and client 
attributes are specified the same way. The embedded driver has been changed to 
reject URL's with a // following derby:</p>
 <p>
@@ -448,9 +449,9 @@ document.write("Last Published: " + docu
 <p>An example of using this URL to connect to the Derby network server running 
on the localhost at port 1527 in ij is:</p>
 <p>ij&gt; connect 
`jdbc:derby://localhost:1527/sample;create=true;user=user1;password=secret4me';</p>
 <hr>
-<a name="N10088"></a><a 
name="Ways+to+Connect+using+the+Derby+Client+Driver"></a>
+<a name="Ways+to+Connect+using+the+Derby+Client+Driver"></a>
 <h3 class="boxed">Ways to Connect using the Derby Client Driver</h3>
-<a name="N1008C"></a><a name="Client+CLASSPATH"></a>
+<a name="Client+CLASSPATH"></a>
 <h4>Client CLASSPATH</h4>
 <p>Prior to using the Derby network client, the derbyclient.jar file needs to 
be added to the classpath on the client. On Windows, to add the derbyclient.jar 
file to your classpath, use the following command:</p>
 <p>set CLASSPATH=%CLASSPATH%;%DERBY_INSTALL%\lib\derbyclient.jar;</p>
@@ -483,7 +484,7 @@ document.write("Last Published: " + docu
 <pre>
 
 </pre>
-<a name="N100B5"></a><a name="-N100B5"></a>
+<a name="-N100AC"></a>
 <h3 class="boxed">Data Source properties</h3>
 <pre>
 <br>The following data source properties are available on the 
ClientDataSource, 
@@ -564,7 +565,7 @@ ClientConnectionPoolDataSource and the C
 <pre>
 
 </pre>
-<a name="N101AD"></a><a name="-N101AD"></a>
+<a name="-N101A4"></a>
 <h4>Tracing</h4>
 <pre>
 <br>The Derby network client provides a tracing facility to collect JDBC trace 
@@ -577,7 +578,7 @@ to the file trace.out from an ij session
 <pre> 
 
 </pre>
-<a name="N101BB"></a><a name="ClientDataSource+Tracing"></a>
+<a name="ClientDataSource+Tracing"></a>
 <h4>ClientDataSource Tracing</h4>
 <pre>
 <br>Three methods can be used to collect tracing data if obtaining connections 
@@ -589,7 +590,7 @@ from the ClientDataSource.
 <li>Use the <em>setTraceDirectory(String dirname)</em> method of 
ClientDataSource to trace each connection flow in its own file for programs 
that have multiple connections.</li>
 </ol>
 <pre></pre>
-<a name="N101D3"></a><a name="DriverManager+Tracing"></a>
+<a name="DriverManager+Tracing"></a>
 <h4>DriverManager Tracing</h4>
 <pre>
 <br>If the DriverManager is used to obtain connections, two ways are available 
to 
@@ -600,7 +601,7 @@ enable and collect tracing information.
 <li>Use the URL attributes <em>traceFile</em> or <em>traceDirectory</em> to 
set these properties prior to creating the connection with the 
<em>DriverManager.getConnection()</em> method.</li>
 </ul>
 <pre></pre>
-<a name="N101EC"></a><a name="-N101EC"></a>
+<a name="-N101E3"></a>
 <h4>ClientDataSource Tracing Examples</h4>
 <pre>
 <br>Shown below are examples of each tracing type for the ClientDataSource 
@@ -831,7 +832,7 @@ e.printStackTrace();
 <pre>
 
 </pre>
-<a name="N10230"></a><a name="-N10230"></a>
+<a name="-N10227"></a>
 <h4>DriverManager Tracing Examples</h4>
 <pre>
 <br>Shown below is an example of enabling tracing when obtaining connections 
@@ -937,7 +938,7 @@ e.printStackTrace();
 <pre>
 
 </pre>
-<a name="N10249"></a><a name="-N10249"></a>
+<a name="-N10240"></a>
 <h4>Changing the Default Trace Level</h4>
 <pre>
 <br>The trace level defaults to ClientDataSource.TRACE_ALL. The tracing can be 
@@ -1014,7 +1015,7 @@ DriverManager.getConnection(url,"user1",
 <pre>
 
 </pre>
-<a name="N102B1"></a><a name="-N102B1"></a>
+<a name="-N102A8"></a>
 <h3 class="boxed">Security</h3>
 <pre>
 <br>Derby network client allows you to select a security mechanism by 
specifying 
@@ -1059,7 +1060,7 @@ The default user, if none is specified i
 <pre>
 
 </pre>
-<a name="N10306"></a><a name="-N10306"></a>
+<a name="-N102FD"></a>
 <h3 class="boxed">Packaging, Distribution and Versioning</h3>
 <pre>
 <br>The Derby network client will assume the version of the Derby release in 
@@ -1073,7 +1074,7 @@ files and scripts will need to be change
 <pre>
 
 </pre>
-<a name="N10314"></a><a name="-N10314"></a>
+<a name="-N1030B"></a>
 <h3 class="boxed">Comparision and/or differences with the Derby Embedded 
Driver</h3>
 <pre>
 <br>The following known differences exist between the embedded driver and the 
@@ -1097,7 +1098,7 @@ user/password are not required. Below is
 <pre>
 
 </pre>
-<a name="N10334"></a><a name="-N10334"></a>
+<a name="-N1032B"></a>
 <h3 class="boxed">Effects to existing documentation</h3>
 <pre>
 <br>The following Derby Manuals should be updated to include the new client 
@@ -1175,16 +1176,16 @@ new driver except for the items listed b
 <pre>
 
 </pre>
-<a name="N103A9"></a><a name="-N103A9"></a>
+<a name="-N103A0"></a>
 <h3 class="boxed">Miscellaneous</h3>
 <pre></pre>
-<a name="N103B0"></a><a name="Tools"></a>
+<a name="Tools"></a>
 <h4>Tools</h4>
 <pre>
 <br>ij will recognize the new URL and load the driver automatically. dblook 
will 
 accept the client URL. sysinfo has been changed to locate the new jar file. 
 </pre>
-<a name="N103B7"></a><a name="Testing"></a>
+<a name="Testing"></a>
 <h4>Testing</h4>
 <pre>
 <br>You can run the client regression tests by running the suite 

Modified: websites/production/db/content/derby/papers/DerbyTut/embedded.png
==============================================================================
Binary files - no diff available.

Modified: 
websites/production/db/content/derby/papers/DerbyTut/embedded_intro.html
==============================================================================
--- websites/production/db/content/derby/papers/DerbyTut/embedded_intro.html 
(original)
+++ websites/production/db/content/derby/papers/DerbyTut/embedded_intro.html 
Wed Sep 28 01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Step 3: Embedded Derby</title>
 <link type="text/css" href="../../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Step 3: Embedded Derby</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -356,10 +357,11 @@ document.write("Last Published: " + docu
 <a href="#just_one_app">Embedded Derby supports multiple users in one JVM</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="ij_intro"></a>
+<a name="ij_intro"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>
@@ -392,7 +394,7 @@ For complete information, see the
 </div>
 
 
-<a name="N1002B"></a><a name="embedded_setup"></a>
+<a name="embedded_setup"></a>
 <h2 class="boxed">Set the environment</h2>
 <div class="section">
 <p>
@@ -404,10 +406,10 @@ instructions.
 </div>
 
 
-<a name="N10039"></a><a name="sample_app"></a>
+<a name="sample_app"></a>
 <h2 class="boxed">Sample Application</h2>
 <div class="section">
-<a name="N1003F"></a><a name="copy_sample_app"></a>
+<a name="copy_sample_app"></a>
 <h3 class="boxed">Copy sample application</h3>
 <p>
    The Derby software includes a sample application called 
@@ -442,7 +444,7 @@ instructions.
 <li> Shuts down Derby</li>
    
 </ul>
-<a name="N10073"></a><a name="em_lookat_code"></a>
+<a name="em_lookat_code"></a>
 <h3 class="boxed">A quick look at the code</h3>
 <p>
    The <span class="codefrag">SimpleApp.java</span> application spends most of 
its time
@@ -454,7 +456,7 @@ instructions.
    section shows how the same JDBC calls turn the same code into a 
    client/server application.
    </p>
-<a name="N10083"></a><a name="embedded_driver"></a>
+<a name="embedded_driver"></a>
 <h4>Load the Embedded JDBC Driver</h4>
 <p>
    The <span class="codefrag">SimpleApp</span> application
@@ -464,7 +466,7 @@ instructions.
 ...
 Class.forName(driver).newInstance();
 </p>
-<a name="N10094"></a><a name="embedded_url"></a>
+<a name="embedded_url"></a>
 <h4>Get an Embedded Connection</h4>
 <p>
    The <span class="codefrag">SimpleApp</span> application
@@ -478,7 +480,7 @@ conn = DriverManager.getConnection(proto
    That embedded connection URL, fully constructed, looks like this:
    </p>
 <p class="code-block">jdbc:derby:derbyDB;create=true</p>
-<a name="N100AF"></a><a name="shutdown"></a>
+<a name="shutdown"></a>
 <h4>Shut Derby down</h4>
 <p>A clean shutdown performs a checkpoint and releases resources. 
       If an embedded application doesn't shut down Derby, 
@@ -496,14 +498,14 @@ conn = DriverManager.getConnection(proto
     A clean shutdown always throws SQL exception <span 
class="codefrag">XJ015</span>, 
     which can be ignored.
    </p>
-<a name="N100D1"></a><a name="compile_sample_app"></a>
+<a name="compile_sample_app"></a>
 <h3 class="boxed">Compile sample application</h3>
 <p>
    Compile the sample application as shown below:
    </p>
 <p class="code-block">javac SimpleApp.java</p>
 <p>You can safely ignore any compile warnings that might pop up.</p>
-<a name="N100E2"></a><a name="run_sample_app"></a>
+<a name="run_sample_app"></a>
 <h3 class="boxed">Run sample application</h3>
 <p>
    Run the sample application like this:
@@ -555,7 +557,7 @@ SimpleApp finished
 </div>
 
 
-<a name="N1010A"></a><a name="just_one_app"></a>
+<a name="just_one_app"></a>
 <h2 class="boxed">Embedded Derby supports multiple users in one JVM</h2>
 <div class="section">
 <p>

Modified: 
websites/production/db/content/derby/papers/DerbyTut/embedded_server.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/db/content/derby/papers/DerbyTut/ij_intro.html
==============================================================================
--- websites/production/db/content/derby/papers/DerbyTut/ij_intro.html 
(original)
+++ websites/production/db/content/derby/papers/DerbyTut/ij_intro.html Wed Sep 
28 01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Step 2: ij Basics</title>
 <link type="text/css" href="../../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Step 2: ij Basics</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -354,10 +355,11 @@ document.write("Last Published: " + docu
 <a href="#Run+SQL+Scripts">Run SQL Scripts</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="ij_intro"></a>
+<a name="ij_intro"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>
@@ -379,7 +381,7 @@ and Utilities Guide</a>.
 </div>
 
 
-<a name="N10028"></a><a name="ij_setup"></a>
+<a name="ij_setup"></a>
 <h2 class="boxed">Set the environment</h2>
 <div class="section">
 <p>
@@ -391,7 +393,7 @@ instructions.
 </div>
 
 
-<a name="N10036"></a><a name="ij_start"></a>
+<a name="ij_start"></a>
 <h2 class="boxed">Start up ij</h2>
 <div class="section">
 <p>Start up <span class="codefrag">ij</span> with this command:</p>
@@ -416,7 +418,7 @@ instructions.
 </div>
 
 
-<a name="N10060"></a><a name="ij_create"></a>
+<a name="ij_create"></a>
 <h2 class="boxed">Create a database</h2>
 <div class="section">
 <p>
@@ -449,7 +451,7 @@ whenever things don't work as expected.
 </div>
 
 
-<a name="N10094"></a><a name="ij_connect"></a>
+<a name="ij_connect"></a>
 <h2 class="boxed">Connect to a database</h2>
 <div class="section">
 <p>
@@ -464,7 +466,7 @@ We'll take a quick look at the
 protocol ("<span class="codefrag">jdbc:derby:</span>") and
 database ("<span class="codefrag">MyDbTest</span>") in this connection URL.
 </p>
-<a name="N100B1"></a><a name="Protocol"></a>
+<a name="Protocol"></a>
 <h3 class="boxed">Protocol</h3>
 <p>
 Internally, <span class="codefrag">ij</span> determines by default which 
driver to load
@@ -482,7 +484,7 @@ ij using properties</a> in the
 <a href="http://db.apache.org/derby/docs/dev/tools/ttoolsij98878.html";>Tools 
 and Utilities Guide</a>.
 </p>
-<a name="N100D3"></a><a name="Database"></a>
+<a name="Database"></a>
 <h3 class="boxed">Database</h3>
 <p>
 Connecting to the <span class="codefrag">MyDbTest</span> database in the 
connection URL
@@ -527,7 +529,7 @@ about where Derby looks for databases:
 </div>
 
 
-<a name="N10116"></a><a name="ij_sql"></a>
+<a name="ij_sql"></a>
 <h2 class="boxed">Execute SQL statements</h2>
 <div class="section">
 <p>
@@ -544,7 +546,7 @@ ij&gt; select * from derbyDb;
 </div>
 
 
-<a name="N10127"></a><a name="ij_disconnect"></a>
+<a name="ij_disconnect"></a>
 <h2 class="boxed">Disconnect from a database</h2>
 <div class="section">
 <p>
@@ -555,7 +557,7 @@ command disconnects from the current dat
 </div>
 
 
-<a name="N10139"></a><a name="ij_exit"></a>
+<a name="ij_exit"></a>
 <h2 class="boxed">Exit</h2>
 <div class="section">
 <p>
@@ -567,7 +569,7 @@ shuts down the Derby database:
 </div>
 
 
-<a name="N1014E"></a><a name="Run+SQL+Scripts"></a>
+<a name="Run+SQL+Scripts"></a>
 <h2 class="boxed">Run SQL Scripts</h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/papers/DerbyTut/index.html
==============================================================================
--- websites/production/db/content/derby/papers/DerbyTut/index.html (original)
+++ websites/production/db/content/derby/papers/DerbyTut/index.html Wed Sep 28 
01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby Tutorial</title>
 <link type="text/css" href="../../skin/basic.css" rel="stylesheet">
@@ -319,6 +319,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby Tutorial</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -342,10 +343,11 @@ document.write("Last Published: " + docu
 </ul>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="Overview"></a>
+<a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>
@@ -366,7 +368,7 @@ Derby Network Client JDBC driver.
 </div>
 
 
-<a name="N1001F"></a><a name="Intended+Audience"></a>
+<a name="Intended+Audience"></a>
 <h2 class="boxed">Intended Audience</h2>
 <div class="section">
 <p>
@@ -376,7 +378,7 @@ had at least light exposure to SQL, Java
 </div>
 
 
-<a name="N10029"></a><a name="Tutorial+Topics"></a>
+<a name="Tutorial+Topics"></a>
 <h2 class="boxed">Tutorial Topics</h2>
 <div class="section">
 <p>
@@ -433,7 +435,7 @@ This tutorial is organized into the sect
 </div>
 
 
-<a name="N10070"></a><a name="next"></a>
+<a name="next"></a>
 <h2 class="boxed">Next Steps</h2>
 <div class="section">
 <p>
@@ -441,7 +443,7 @@ After completing the four steps in this
 you'll understand the basics of how to
 use Derby in the embedded and Network Server frameworks.
 </p>
-<a name="N10079"></a><a name="More+Information"></a>
+<a name="More+Information"></a>
 <h3 class="boxed">More Information</h3>
 <p>
 More information about Derby is on the
@@ -452,7 +454,7 @@ Please post any problems or questions to
 <a 
href="http://db.apache.org/derby/derby_mail.html";>derby-u...@db.apache.org</a>
 mail list.
 </p>
-<a name="N1008F"></a><a name="Using+Derby+with+other+Products"></a>
+<a name="Using+Derby+with+other+Products"></a>
 <h3 class="boxed">Using Derby with other Products</h3>
 <p>
 Below is a partial list of resources on the Derby web site that show how 

Modified: 
websites/production/db/content/derby/papers/DerbyTut/install_software.html
==============================================================================
--- websites/production/db/content/derby/papers/DerbyTut/install_software.html 
(original)
+++ websites/production/db/content/derby/papers/DerbyTut/install_software.html 
Wed Sep 28 01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Step 1: Install Software</title>
 <link type="text/css" href="../../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Step 1: Install Software</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -356,10 +357,11 @@ document.write("Last Published: " + docu
 </ul>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="Introduction"></a>
+<a name="Introduction"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>
@@ -380,7 +382,7 @@ and verify your installation with the De
 </div>
 
 
-<a name="N10020"></a><a name="jdk"></a>
+<a name="jdk"></a>
 <h2 class="boxed">Java Development Kit (JDK)</h2>
 <div class="section">
 <p>Derby requires Java 2 Standard Edition (J2SE) 6 or higher.
@@ -394,7 +396,7 @@ If you already have a JDK installed,
 then proceed
 to the <a href="#derby">Apache Derby</a> installation section.
 </p>
-<a name="N10034"></a><a name="jdk_install"></a>
+<a name="jdk_install"></a>
 <h3 class="boxed">Install JDK</h3>
 <p>
 If you have not already installed a JDK,
@@ -405,7 +407,7 @@ Java's reference implementation is at
 <a class="external" 
href="http://www.oracle.com/technetwork/java/javase/overview/index.html";>http://www.oracle.com/technetwork/java/javase/overview/index.html</a>.
 After installing the JDK of your choice, proceed to the next section.
 </p>
-<a name="N10042"></a><a name="jdk_configure"></a>
+<a name="jdk_configure"></a>
 <h3 class="boxed">Configure JDK</h3>
 <p>
 Set the <span class="codefrag">JAVA_HOME</span> environment variable to the 
root location of
@@ -435,7 +437,7 @@ C:\&gt; set PATH=%PATH%;%JAVA_HOME%\bin
 <p class="code-block">UNIX Korn Shell:
 $ export PATH=$JAVA_HOME/bin:$PATH
 </p>
-<a name="N1007A"></a><a name="jdk_verify"></a>
+<a name="jdk_verify"></a>
 <h3 class="boxed">Verify JDK</h3>
 <p>
 Use the <span class="codefrag">java -version</span> command, as shown below,
@@ -456,10 +458,10 @@ And don't proceed until you resolve that
 </div>
 
 
-<a name="N10095"></a><a name="derby"></a>
+<a name="derby"></a>
 <h2 class="boxed">Apache Derby</h2>
 <div class="section">
-<a name="N1009B"></a><a name="derby_download"></a>
+<a name="derby_download"></a>
 <h3 class="boxed">Download Derby</h3>
 <p>
 Download the binary Apache Derby distribution from the Derby web site at 
@@ -487,7 +489,7 @@ listed in the table below:
    then substitute that version number 
 for <span class="codefrag">10.12.1.1</span> in the following instructions.
    </p>
-<a name="N100D0"></a><a name="derby_install"></a>
+<a name="derby_install"></a>
 <h3 class="boxed">Install Derby</h3>
 <p>
     Choose the directory into which you want to install the Derby software.
@@ -512,7 +514,7 @@ tar xzvf db-derby-10.12.1.1-bin.tar.gz
 <p>In both cases, the software will now be extracted into a subdirectory
     named <span class="codefrag">db-derby-10.12.1.1-bin</span>. 
    </p>
-<a name="N100EE"></a><a name="set_derby_install"></a>
+<a name="set_derby_install"></a>
 <h3 class="boxed">Set DERBY_INSTALL</h3>
 <p>
 Set the <span class="codefrag">DERBY_INSTALL</span> variable to the location 
where you
@@ -526,7 +528,7 @@ C:\&gt; set DERBY_INSTALL=C:\Apache\db-d
 <p class="code-block">UNIX Korn Shell:
 $ export DERBY_INSTALL=/opt/Apache/db-derby-10.12.1.1-bin
 </p>
-<a name="N10103"></a><a name="derby_configure"></a>
+<a name="derby_configure"></a>
 <h3 class="boxed">Configure Embedded Derby</h3>
 <p>To use Derby in its embedded mode
       set your <span class="codefrag">CLASSPATH</span> to include the jar 
files listed below:</p>
@@ -586,7 +588,7 @@ C:\Apache\db-derby-10.12.1.1-bin\bin&gt;
 $ cd $DERBY_INSTALL/bin
 $ . setEmbeddedCP
 </p>
-<a name="N10163"></a><a name="derby_verify"></a>
+<a name="derby_verify"></a>
 <h3 class="boxed">Verify Derby</h3>
 <p>Run the <span class="codefrag">sysinfo</span> command, as shown below, to 
output Derby
 system information:

Modified: 
websites/production/db/content/derby/papers/DerbyTut/network_server.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/db/content/derby/papers/DerbyTut/ns_intro.html
==============================================================================
--- websites/production/db/content/derby/papers/DerbyTut/ns_intro.html 
(original)
+++ websites/production/db/content/derby/papers/DerbyTut/ns_intro.html Wed Sep 
28 01:33:43 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Step 4: Derby Network Server</title>
 <link type="text/css" href="../../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Step 4: Derby Network Server</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -384,10 +385,11 @@ document.write("Last Published: " + docu
 </ul>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="ns_intro"></a>
+<a name="ns_intro"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>
@@ -428,7 +430,7 @@ Administration Guide</a>.
 </div>
 
 
-<a name="N10035"></a><a name="ns"></a>
+<a name="ns"></a>
 <h2 class="boxed">Derby Network Server</h2>
 <div class="section">
 <p>
@@ -436,7 +438,7 @@ Administration Guide</a>.
    <a href="install_software.html#set_derby_install">DERBY_INSTALL</a>
    environment variable.
 </p>
-<a name="N10042"></a><a name="ns_config_env"></a>
+<a name="ns_config_env"></a>
 <h3 class="boxed">Configure environment</h3>
 <p>To start or stop the Network Server,
       set your <span class="codefrag">CLASSPATH</span> to include the jar 
files listed below:</p>
@@ -479,7 +481,7 @@ C:\Apache\db-derby-10.4.1.3-bin\bin&gt;
 $ cd $DERBY_INSTALL/bin
 $ . setNetworkServerCP
 </p>
-<a name="N10082"></a><a name="start_ns"></a>
+<a name="start_ns"></a>
 <h3 class="boxed">Start Network Server</h3>
 <p>
 Start the Network server by executing the
@@ -508,7 +510,7 @@ processes connection requests.
 The Network Server starts Derby, so you'll find the <span 
class="codefrag">derby.log</span>
 error log in the directory where you start the Network Server.
 </p>
-<a name="N100A3"></a><a name="ns_easier_way"></a>
+<a name="ns_easier_way"></a>
 <h3 class="boxed">An easier way: derbyrun.jar</h3>
 <p>
 Furthermore, it is much easier to start Network Server now than before,
@@ -531,7 +533,7 @@ Apache Derby Network Server - 10.4.1.3 -
 </div>
 
 
-<a name="N100B6"></a><a name="ns_sample"></a>
+<a name="ns_sample"></a>
 <h2 class="boxed">Sample Application</h2>
 <div class="section">
 <p>
@@ -539,7 +541,7 @@ Apache Derby Network Server - 10.4.1.3 -
    <a href="install_software.html#set_derby_install">DERBY_INSTALL</a>
    environment variable.
 </p>
-<a name="N100C3"></a><a name="configure_ns_client"></a>
+<a name="configure_ns_client"></a>
 <h3 class="boxed">Configure environment to use Derby Network Client JDBC 
driver</h3>
 <p>To use the Derby Network Client JDBC driver,
       set your <span class="codefrag">CLASSPATH</span> to include the jar 
files listed below:</p>
@@ -579,7 +581,7 @@ C:\Apache\db-derby-10.4.1.3-bin\bin&gt;
 <p class="code-block">UNIX:
 $ . setNetworkClientCP
 </p>
-<a name="N10107"></a><a name="ij_ns_client"></a>
+<a name="ij_ns_client"></a>
 <h3 class="boxed">Test network server connection with ij</h3>
 <p>
    An <strong>embedded</strong> 
@@ -628,7 +630,7 @@ ij&gt; connect 'jdbc:derby://localhost:1
 </li>
    
 </ul>
-<a name="N10149"></a><a name="copy_ns_client"></a>
+<a name="copy_ns_client"></a>
 <h3 class="boxed">Copy sample application</h3>
 <p>
    This section uses the same sample application that the 
@@ -641,7 +643,7 @@ ij&gt; connect 'jdbc:derby://localhost:1
    create and connect to the database using the Derby Network Client JDBC
    driver instead.
    </p>
-<a name="N1015D"></a><a name="ns_lookat_code"></a>
+<a name="ns_lookat_code"></a>
 <h3 class="boxed">A quick look at the code</h3>
 <p>
    The <span class="codefrag">SimpleApp.java</span> application spends most of 
its time
@@ -652,7 +654,7 @@ ij&gt; connect 'jdbc:derby://localhost:1
    The "<a href="embedded_intro.html#em_lookat_code">Embedded Derby</a>"
    section shows how to turn the same code into an embedded application.
    </p>
-<a name="N1016D"></a><a name="jdbc_ns_client"></a>
+<a name="jdbc_ns_client"></a>
 <h4>Load the Client JDBC Driver</h4>
 <p>
    When executed with the <span class="codefrag">derbyclient</span> argument,
@@ -663,7 +665,7 @@ ij&gt; connect 'jdbc:derby://localhost:1
 ...
 Class.forName(driver).newInstance();
 </p>
-<a name="N10181"></a><a name="url_ns_client"></a>
+<a name="url_ns_client"></a>
 <h4>Get a Network Server Connection</h4>
 <p>
    When executed with the <span class="codefrag">derbyclient</span> argument,
@@ -678,7 +680,7 @@ conn = DriverManager.getConnection(proto
    That connection URL, fully constructed, looks like this:
    </p>
 <p class="code-block">jdbc:derby://localhost:1527/derbyDB;create=true</p>
-<a name="N1019F"></a><a name="ns_client_noshutdown"></a>
+<a name="ns_client_noshutdown"></a>
 <h4>Don't shut Derby down</h4>
 <p>
    If you look at the <span class="codefrag">SimpleApp.java</span> code you'll 
notice that it
@@ -687,13 +689,13 @@ conn = DriverManager.getConnection(proto
    other applications might be accessing
    the same database you are; so, don't shut down the databases or Derby.
    </p>
-<a name="N101B0"></a><a name="compile_ns_client"></a>
+<a name="compile_ns_client"></a>
 <h3 class="boxed">Compile Sample Application</h3>
 <p>
    Compile the sample application as shown below:
    </p>
 <p class="code-block">javac SimpleApp.java</p>
-<a name="N101BE"></a><a name="run_ns_client"></a>
+<a name="run_ns_client"></a>
 <h3 class="boxed">Run Sample Application</h3>
 <p>
    Run the sample application like this:
@@ -726,7 +728,7 @@ SimpleApp finished</p>
 </div>
 
 
-<a name="N101E2"></a><a name="stop_ns"></a>
+<a name="stop_ns"></a>
 <h2 class="boxed">Stop Network Server</h2>
 <div class="section">
 <p>
@@ -763,10 +765,10 @@ series.
 </div>
 
 
-<a name="N1020F"></a><a name="ns_next_steps"></a>
+<a name="ns_next_steps"></a>
 <h2 class="boxed">Next Steps</h2>
 <div class="section">
-<a name="N10215"></a><a name="Network+Server+Options"></a>
+<a name="Network+Server+Options"></a>
 <h3 class="boxed">Network Server Options</h3>
 <p>
 By default, the Derby Network Server only accepts requests from the
@@ -793,7 +795,7 @@ For more information about these options
 <a href="http://db.apache.org/derby/manuals";>Derby Server and 
 Administration Guide</a>.
 </p>
-<a name="N1023A"></a><a name="Embedded+Server"></a>
+<a name="Embedded+Server"></a>
 <h3 class="boxed">Embedded Server</h3>
 <p>
 Up until this point,

Modified: websites/production/db/content/derby/papers/Intersect-design.html
==============================================================================
--- websites/production/db/content/derby/papers/Intersect-design.html (original)
+++ websites/production/db/content/derby/papers/Intersect-design.html Wed Sep 
28 01:33:43 2016
@@ -3,9 +3,8 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
-<meta name="generator" content="">
 <meta name="" content="">
 <title>Intersect &amp; Except Design</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -318,6 +317,7 @@ document.write("Last Published: " + docu
                  &nbsp;<input value="+a" class="biggerfont" title="Enlarge 
text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Intersect &amp; Except Design</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -339,9 +339,10 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
+</div>
 <br>
 <br>
-<a name="N1001B"></a><a name="Introduction"></a>
+<a name="Introduction"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>Intersect &amp; Except Design<br>Jack Klebanoff<br>Feb. 22 2005<br>
@@ -364,11 +365,11 @@ document.write("Last Published: " + docu
 <a href="#Parser">the parser</a>.</li>
 </ol>
 </div>
-<a name="N1004F"></a><a name="Execution"></a>
+<a name="Execution"></a>
 <h2 class="boxed">Execution</h2>
 <div class="section">
 <p>If the left and right inputs have N and M rows respectively the sorts take 
time O(N*log(N) + M*log(M)). The final scan takes time O(N + M). So the time 
for the whole operation is O(N*log(N) + M*log(M)).</p>
-<a name="N10057"></a><a name="Alternative+Execution+Plans"></a>
+<a name="Alternative+Execution+Plans"></a>
 <h3 class="boxed">Alternative Execution Plans</h3>
 <p>Other implementations are possible.</p>
 <ol>
@@ -379,7 +380,7 @@ document.write("Last Published: " + docu
 <p>The current implementation was chosen because it always provides at least 
decent speed and memory utilization, and in many, though certainly not all 
cases, it is the best implementation.</p>
 <p>We could have provided several implementations and let the optimizer choose 
the best, but this does not seem worthwhile for operations that are seldom 
used.</p>
 </div>
-<a name="N10068"></a><a name="Compilation"></a>
+<a name="Compilation"></a>
 <h2 class="boxed">Binding, Optimization, and Code Generation</h2>
 <div class="section">
 <p>The INTERSECT and EXCEPT operators are bound much like the UNION operator. 
The bind methods are all found in super class SetOperatorNode, which is shared 
with UnionNode.</p>
@@ -387,7 +388,7 @@ document.write("Last Published: " + docu
 <p>The architecture of the Derby optimizer makes it difficult to do further 
optimizations. SelectNode processing requires that order by lists be pushed 
down to them at the start of preprocessing. If an input to INTERSECT or EXCEPT 
is a SELECT (a common case) then IntersectOrExceptNode has to decide whether it 
needs its inputs ordered before it calls the preprocess method of its inputs. 
That means that it must chose its execution plan at the start of the 
optimization process, not as the result of the optimization process.</p>
 <p>Code generation is straighforward. It generates code that invokes the 
ResultSetFactory.getSetOpResultSet method.</p>
 </div>
-<a name="N10076"></a><a name="Parser"></a>
+<a name="Parser"></a>
 <h2 class="boxed">Parser</h2>
 <div class="section">
 <p>The UNION and EXCEPT operators have the same precedence. The INTERSECT 
operator has higher precedence, so</p>


Reply via email to