svn commit: r1019521 [3/8] - in /websites/production/db/content/derby: ./ blogs/ dev/ integrate/ manuals/ papers/ papers/DerbyTut/ releases/

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1019521 [3/8] - in /websites/production/db/content/derby: ./ blogs/ dev/ integrate/ manuals/ papers/ papers/DerbyTut/ releases/

rhillegas
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 Sat Oct 14 18:58:50 2017
@@ -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.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="pelt">
 <title>ApacheCon</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -316,7 +316,6 @@ 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>
@@ -352,10 +351,9 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
-</div>
 
 
-<a name="ApacheCon+US%3A+November+12-16%2C+2007"></a>
+<a name="N1000D"></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>
@@ -382,7 +380,7 @@ document.write("Last Published: " + docu
 </div>
 
 
-<a name="ApacheCon+EU%3A+May+1-4%2C+2007"></a>
+<a name="N10035"></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>
@@ -404,7 +402,7 @@ document.write("Last Published: " + docu
 </div>
 
 
-<a name="ApacheCon+US%3A+October+9-13%2C+2006"></a>
+<a name="N10053"></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>
@@ -437,7 +435,7 @@ Sessions that focused on Apache Derby in
 </div>
 
 
-<a name="ApacheCon+US%3A+December+10-14%2C+2005"></a>
+<a name="N1008F"></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>
@@ -465,7 +463,7 @@ Sessions that focused on Apache Derby in
 </div>
 
 
-<a name="ApacheCon+US%3A+November+13-17%2C+2004"></a>
+<a name="N100BE"></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>
@@ -523,7 +521,7 @@ Sessions that focused on Apache Derby in
 
 
 </ul>
-<a name="Derby+Code+Contest"></a>
+<a name="N10102"></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
@@ -540,7 +538,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="First+Place"></a>
+<a name="N1011A"></a><a name="First+Place"></a>
 <h4>First Place</h4>
 <p>
   The first place winner was
@@ -566,7 +564,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="Second+Place"></a>
+<a name="N10139"></a><a name="Second+Place"></a>
 <h4>Second Place</h4>
 <p>
   The second place winner was
@@ -582,7 +580,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="Third+Place"></a>
+<a name="N1014D"></a><a name="Third+Place"></a>
 <h4>Third Place</h4>
 <p>
   The third place winner was
@@ -628,7 +626,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         2004-2015 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+         2004-2017 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
 <div id="feedback">
     Send feedback about the website to:
   <a id="feedbackto" href="mailto:[hidden email]?subject=Feedback%C2%A0papers/ApacheCon.html">[hidden email]</a>

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 Sat Oct 14 18:58:50 2017
@@ -3,8 +3,9 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="pelt">
+<meta name="generator" content="">
 <meta name="" content="">
 <meta name="GENERATOR" content="">
 <title>Derby Network Client</title>
@@ -318,7 +319,6 @@ 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="#-N10031">Functionality</a>
+<a href="#-N1003A">Functionality</a>
 </li>
 <li>
-<a href="#-N10042">JDBC Driver and DataSource names</a>
+<a href="#-N1004B">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="#-N100AC">Data Source properties</a>
+<a href="#-N100B5">Data Source properties</a>
 <ul class="minitoc">
 <li>
-<a href="#-N101A4">Tracing</a>
+<a href="#-N101AD">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="#-N101E3">ClientDataSource Tracing Examples</a>
+<a href="#-N101EC">ClientDataSource Tracing Examples</a>
 </li>
 <li>
-<a href="#-N10227">DriverManager Tracing Examples</a>
+<a href="#-N10230">DriverManager Tracing Examples</a>
 </li>
 <li>
-<a href="#-N10240">Changing the Default Trace Level</a>
+<a href="#-N10249">Changing the Default Trace Level</a>
 </li>
 </ul>
 </li>
 <li>
-<a href="#-N102A8">Security</a>
+<a href="#-N102B1">Security</a>
 </li>
 <li>
-<a href="#-N102FD">Packaging, Distribution and Versioning</a>
+<a href="#-N10306">Packaging, Distribution and Versioning</a>
 </li>
 <li>
-<a href="#-N1030B">Comparision and/or differences with the Derby Embedded Driver</a>
+<a href="#-N10314">Comparision and/or differences with the Derby Embedded Driver</a>
 </li>
 <li>
-<a href="#-N1032B">Effects to existing documentation</a>
+<a href="#-N10334">Effects to existing documentation</a>
 </li>
 <li>
-<a href="#-N103A0">Miscellaneous</a>
+<a href="#-N103A9">Miscellaneous</a>
 <ul class="minitoc">
 <li>
 <a href="#Tools">Tools</a>
@@ -396,19 +396,18 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
-</div>
-<a name="Derby+Network+Client"></a>
+<a name="N10025"></a><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="N10027"></a>
+<a name="N1002F"></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="-N10031"></a>
+<a name="N1003A"></a><a name="-N1003A"></a>
 <h3 class="boxed">Functionality</h3>
 <br>
 <br>
@@ -417,7 +416,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="-N10042"></a>
+<a name="N1004B"></a><a name="-N1004B"></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">
@@ -439,7 +438,7 @@ document.write("Last Published: " + docu
 </tr>
 </tbody>
 </table>
-<a name="Connection+URL+Format"></a>
+<a name="N10078"></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>
@@ -449,9 +448,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="Ways+to+Connect+using+the+Derby+Client+Driver"></a>
+<a name="N10088"></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="Client+CLASSPATH"></a>
+<a name="N1008C"></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>
@@ -484,7 +483,7 @@ document.write("Last Published: " + docu
 <pre>
 
 </pre>
-<a name="-N100AC"></a>
+<a name="N100B5"></a><a name="-N100B5"></a>
 <h3 class="boxed">Data Source properties</h3>
 <pre>
 <br>The following data source properties are available on the ClientDataSource,
@@ -565,7 +564,7 @@ ClientConnectionPoolDataSource and the C
 <pre>
 
 </pre>
-<a name="-N101A4"></a>
+<a name="N101AD"></a><a name="-N101AD"></a>
 <h4>Tracing</h4>
 <pre>
 <br>The Derby network client provides a tracing facility to collect JDBC trace
@@ -578,7 +577,7 @@ to the file trace.out from an ij session
 <pre>
 
 </pre>
-<a name="ClientDataSource+Tracing"></a>
+<a name="N101BB"></a><a name="ClientDataSource+Tracing"></a>
 <h4>ClientDataSource Tracing</h4>
 <pre>
 <br>Three methods can be used to collect tracing data if obtaining connections
@@ -590,7 +589,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="DriverManager+Tracing"></a>
+<a name="N101D3"></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
@@ -601,7 +600,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="-N101E3"></a>
+<a name="N101EC"></a><a name="-N101EC"></a>
 <h4>ClientDataSource Tracing Examples</h4>
 <pre>
 <br>Shown below are examples of each tracing type for the ClientDataSource
@@ -832,7 +831,7 @@ e.printStackTrace();
 <pre>
 
 </pre>
-<a name="-N10227"></a>
+<a name="N10230"></a><a name="-N10230"></a>
 <h4>DriverManager Tracing Examples</h4>
 <pre>
 <br>Shown below is an example of enabling tracing when obtaining connections
@@ -938,7 +937,7 @@ e.printStackTrace();
 <pre>
 
 </pre>
-<a name="-N10240"></a>
+<a name="N10249"></a><a name="-N10249"></a>
 <h4>Changing the Default Trace Level</h4>
 <pre>
 <br>The trace level defaults to ClientDataSource.TRACE_ALL. The tracing can be
@@ -1015,7 +1014,7 @@ DriverManager.getConnection(url,"user1",
 <pre>
 
 </pre>
-<a name="-N102A8"></a>
+<a name="N102B1"></a><a name="-N102B1"></a>
 <h3 class="boxed">Security</h3>
 <pre>
 <br>Derby network client allows you to select a security mechanism by specifying
@@ -1060,7 +1059,7 @@ The default user, if none is specified i
 <pre>
 
 </pre>
-<a name="-N102FD"></a>
+<a name="N10306"></a><a name="-N10306"></a>
 <h3 class="boxed">Packaging, Distribution and Versioning</h3>
 <pre>
 <br>The Derby network client will assume the version of the Derby release in
@@ -1074,7 +1073,7 @@ files and scripts will need to be change
 <pre>
 
 </pre>
-<a name="-N1030B"></a>
+<a name="N10314"></a><a name="-N10314"></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
@@ -1098,7 +1097,7 @@ user/password are not required. Below is
 <pre>
 
 </pre>
-<a name="-N1032B"></a>
+<a name="N10334"></a><a name="-N10334"></a>
 <h3 class="boxed">Effects to existing documentation</h3>
 <pre>
 <br>The following Derby Manuals should be updated to include the new client
@@ -1176,16 +1175,16 @@ new driver except for the items listed b
 <pre>
 
 </pre>
-<a name="-N103A0"></a>
+<a name="N103A9"></a><a name="-N103A9"></a>
 <h3 class="boxed">Miscellaneous</h3>
 <pre></pre>
-<a name="Tools"></a>
+<a name="N103B0"></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="Testing"></a>
+<a name="N103B7"></a><a name="Testing"></a>
 <h4>Testing</h4>
 <pre>
 <br>You can run the client regression tests by running the suite
@@ -1221,7 +1220,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         2004-2015 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+         2004-2017 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
 <div id="feedback">
     Send feedback about the website to:
   <a id="feedbackto" href="mailto:[hidden email]?subject=Feedback%C2%A0papers/DerbyClientSpec.html">[hidden email]</a>

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 Sat Oct 14 18:58:50 2017
@@ -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.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Step 3: Embedded Derby</title>
 <link type="text/css" href="../../skin/basic.css" rel="stylesheet">
@@ -316,7 +316,6 @@ 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>
@@ -357,11 +356,10 @@ 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="ij_intro"></a>
+<a name="N1000D"></a><a name="ij_intro"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>
@@ -394,7 +392,7 @@ For complete information, see the
 </div>
 
 
-<a name="embedded_setup"></a>
+<a name="N1002B"></a><a name="embedded_setup"></a>
 <h2 class="boxed">Set the environment</h2>
 <div class="section">
 <p>
@@ -406,10 +404,10 @@ instructions.
 </div>
 
 
-<a name="sample_app"></a>
+<a name="N10039"></a><a name="sample_app"></a>
 <h2 class="boxed">Sample Application</h2>
 <div class="section">
-<a name="copy_sample_app"></a>
+<a name="N1003F"></a><a name="copy_sample_app"></a>
 <h3 class="boxed">Copy sample application</h3>
 <p>
    The Derby software includes a sample application called
@@ -444,7 +442,7 @@ instructions.
 <li> Shuts down Derby</li>
   
 </ul>
-<a name="em_lookat_code"></a>
+<a name="N10073"></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
@@ -456,7 +454,7 @@ instructions.
    section shows how the same JDBC calls turn the same code into a
    client/server application.
    </p>
-<a name="embedded_driver"></a>
+<a name="N10083"></a><a name="embedded_driver"></a>
 <h4>Load the Embedded JDBC Driver</h4>
 <p>
    The <span class="codefrag">SimpleApp</span> application
@@ -466,7 +464,7 @@ instructions.
 ...
 Class.forName(driver).newInstance();
 </p>
-<a name="embedded_url"></a>
+<a name="N10094"></a><a name="embedded_url"></a>
 <h4>Get an Embedded Connection</h4>
 <p>
    The <span class="codefrag">SimpleApp</span> application
@@ -480,7 +478,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="shutdown"></a>
+<a name="N100AF"></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,
@@ -498,14 +496,14 @@ conn = DriverManager.getConnection(proto
     A clean shutdown always throws SQL exception <span class="codefrag">XJ015</span>,
     which can be ignored.
    </p>
-<a name="compile_sample_app"></a>
+<a name="N100D1"></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="run_sample_app"></a>
+<a name="N100E2"></a><a name="run_sample_app"></a>
 <h3 class="boxed">Run sample application</h3>
 <p>
    Run the sample application like this:
@@ -557,7 +555,7 @@ SimpleApp finished
 </div>
 
 
-<a name="just_one_app"></a>
+<a name="N1010A"></a><a name="just_one_app"></a>
 <h2 class="boxed">Embedded Derby supports multiple users in one JVM</h2>
 <div class="section">
 <p>
@@ -651,7 +649,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         2004-2015 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+         2004-2017 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
 <div id="feedback">
     Send feedback about the website to:
   <a id="feedbackto" href="mailto:[hidden email]?subject=Feedback%C2%A0papers/DerbyTut/embedded_intro.html">[hidden email]</a>

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 Sat Oct 14 18:58:50 2017
@@ -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.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Step 2: ij Basics</title>
 <link type="text/css" href="../../skin/basic.css" rel="stylesheet">
@@ -316,7 +316,6 @@ 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>
@@ -355,11 +354,10 @@ document.write("Last Published: " + docu
 <a href="#Run+SQL+Scripts">Run SQL Scripts</a>
 </li>
 </ul>
-</div>
 </div>
 
 
-<a name="ij_intro"></a>
+<a name="N1000D"></a><a name="ij_intro"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>
@@ -381,7 +379,7 @@ and Utilities Guide</a>.
 </div>
 
 
-<a name="ij_setup"></a>
+<a name="N10028"></a><a name="ij_setup"></a>
 <h2 class="boxed">Set the environment</h2>
 <div class="section">
 <p>
@@ -393,7 +391,7 @@ instructions.
 </div>
 
 
-<a name="ij_start"></a>
+<a name="N10036"></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>
@@ -418,7 +416,7 @@ instructions.
 </div>
 
 
-<a name="ij_create"></a>
+<a name="N10060"></a><a name="ij_create"></a>
 <h2 class="boxed">Create a database</h2>
 <div class="section">
 <p>
@@ -451,7 +449,7 @@ whenever things don't work as expected.
 </div>
 
 
-<a name="ij_connect"></a>
+<a name="N10094"></a><a name="ij_connect"></a>
 <h2 class="boxed">Connect to a database</h2>
 <div class="section">
 <p>
@@ -466,7 +464,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="Protocol"></a>
+<a name="N100B1"></a><a name="Protocol"></a>
 <h3 class="boxed">Protocol</h3>
 <p>
 Internally, <span class="codefrag">ij</span> determines by default which driver to load
@@ -484,7 +482,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="Database"></a>
+<a name="N100D3"></a><a name="Database"></a>
 <h3 class="boxed">Database</h3>
 <p>
 Connecting to the <span class="codefrag">MyDbTest</span> database in the connection URL
@@ -529,7 +527,7 @@ about where Derby looks for databases:
 </div>
 
 
-<a name="ij_sql"></a>
+<a name="N10116"></a><a name="ij_sql"></a>
 <h2 class="boxed">Execute SQL statements</h2>
 <div class="section">
 <p>
@@ -546,7 +544,7 @@ ij&gt; select * from derbyDb;
 </div>
 
 
-<a name="ij_disconnect"></a>
+<a name="N10127"></a><a name="ij_disconnect"></a>
 <h2 class="boxed">Disconnect from a database</h2>
 <div class="section">
 <p>
@@ -557,7 +555,7 @@ command disconnects from the current dat
 </div>
 
 
-<a name="ij_exit"></a>
+<a name="N10139"></a><a name="ij_exit"></a>
 <h2 class="boxed">Exit</h2>
 <div class="section">
 <p>
@@ -569,7 +567,7 @@ shuts down the Derby database:
 </div>
 
 
-<a name="Run+SQL+Scripts"></a>
+<a name="N1014E"></a><a name="Run+SQL+Scripts"></a>
 <h2 class="boxed">Run SQL Scripts</h2>
 <div class="section">
 <p>
@@ -608,7 +606,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         2004-2015 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+         2004-2017 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
 <div id="feedback">
     Send feedback about the website to:
   <a id="feedbackto" href="mailto:[hidden email]?subject=Feedback%C2%A0papers/DerbyTut/ij_intro.html">[hidden email]</a>

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 Sat Oct 14 18:58:50 2017
@@ -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.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby Tutorial</title>
 <link type="text/css" href="../../skin/basic.css" rel="stylesheet">
@@ -319,7 +319,6 @@ 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>
@@ -343,11 +342,10 @@ document.write("Last Published: " + docu
 </ul>
 </li>
 </ul>
-</div>
 </div>
 
 
-<a name="Overview"></a>
+<a name="N1000D"></a><a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>
@@ -368,7 +366,7 @@ Derby Network Client JDBC driver.
 </div>
 
 
-<a name="Intended+Audience"></a>
+<a name="N1001F"></a><a name="Intended+Audience"></a>
 <h2 class="boxed">Intended Audience</h2>
 <div class="section">
 <p>
@@ -378,7 +376,7 @@ had at least light exposure to SQL, Java
 </div>
 
 
-<a name="Tutorial+Topics"></a>
+<a name="N10029"></a><a name="Tutorial+Topics"></a>
 <h2 class="boxed">Tutorial Topics</h2>
 <div class="section">
 <p>
@@ -435,7 +433,7 @@ This tutorial is organized into the sect
 </div>
 
 
-<a name="next"></a>
+<a name="N10070"></a><a name="next"></a>
 <h2 class="boxed">Next Steps</h2>
 <div class="section">
 <p>
@@ -443,7 +441,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="More+Information"></a>
+<a name="N10079"></a><a name="More+Information"></a>
 <h3 class="boxed">More Information</h3>
 <p>
 More information about Derby is on the
@@ -454,7 +452,7 @@ Please post any problems or questions to
 <a href="http://db.apache.org/derby/derby_mail.html">[hidden email]</a>
 mail list.
 </p>
-<a name="Using+Derby+with+other+Products"></a>
+<a name="N1008F"></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
@@ -554,7 +552,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         2004-2015 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+         2004-2017 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
 <div id="logos">
 <a href="http://validator.w3.org/check/referer"><img style="height: 31px; width: 88px;" title="Valid HTML 4.01!" alt="Valid HTML 4.01!" src="../../skin/images/valid-html401.png" class="logoImage"></a><a href="http://jigsaw.w3.org/css-validator/check/referer"><img style="height: 31px; width: 88px;" title="Valid CSS!" alt="Valid CSS!" src="../../skin/images/vcss.png" class="logoImage"></a>
 </div>

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 Sat Oct 14 18:58:50 2017
@@ -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.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Step 1: Install Software</title>
 <link type="text/css" href="../../skin/basic.css" rel="stylesheet">
@@ -316,7 +316,6 @@ 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>
@@ -357,11 +356,10 @@ document.write("Last Published: " + docu
 </ul>
 </li>
 </ul>
-</div>
 </div>
 
 
-<a name="Introduction"></a>
+<a name="N1000D"></a><a name="Introduction"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>
@@ -382,10 +380,10 @@ and verify your installation with the De
 </div>
 
 
-<a name="jdk"></a>
+<a name="N10020"></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.
+<p>Derby requires Java 2 Standard Edition (J2SE) 8 or higher.
 Only the Java Runtime Environment (JRE) is required to run Derby,
 but this tutorial compiles a Java application, so it requires
 the Java Development Kit (JDK).
@@ -396,33 +394,33 @@ If you already have a JDK installed,
 then proceed
 to the <a href="#derby">Apache Derby</a> installation section.
 </p>
-<a name="jdk_install"></a>
+<a name="N10034"></a><a name="jdk_install"></a>
 <h3 class="boxed">Install JDK</h3>
 <p>
 If you have not already installed a JDK,
 download and install it now.
 No specific vendor implementation is required;
-the only requirement is that it be certified for J2SE 6 or higher.
+the only requirement is that it be certified for J2SE 8 or higher.
 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>.
+<a class="external" href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">http://www.oracle.com/technetwork/java/javase/downloads/index.html</a>.
 After installing the JDK of your choice, proceed to the next section.
 </p>
-<a name="jdk_configure"></a>
+<a name="N10042"></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
 the JDK installation directory.
 The examples below use
-<span class="codefrag">C:\jdk1.7</span> for Windows and
-<span class="codefrag">/opt/jdk1.7</span> for UNIX, but be sure to use the actual
+<span class="codefrag">C:\jdk1.8</span> for Windows and
+<span class="codefrag">/opt/jdk1.8</span> for UNIX, but be sure to use the actual
 location on your system. (e.g. The default installation location used by the JDK
-installer might be something like C:\Program Files\Java\jdk1.7.0_11-b21)
+installer might be something like C:\Program Files\Java\jdk1.8.0_11-b21)
 </p>
 <p class="code-block">Windows:
-C:\&gt; set JAVA_HOME=C:\jdk1.7
+C:\&gt; set JAVA_HOME=C:\jdk1.8
 </p>
 <p class="code-block">UNIX Korn Shell:
-$ export JAVA_HOME=/opt/jdk1.7
+$ export JAVA_HOME=/opt/jdk1.8
 </p>
 <p>
 Next set the <span class="codefrag">PATH</span> environment variable to include the JDK
@@ -437,15 +435,15 @@ C:\&gt; set PATH=%PATH%;%JAVA_HOME%\bin
 <p class="code-block">UNIX Korn Shell:
 $ export PATH=$JAVA_HOME/bin:$PATH
 </p>
-<a name="jdk_verify"></a>
+<a name="N1007A"></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,
 to verify the installed release:
 </p>
 <p class="code-block">java -version
-java version "1.7.0_11"
-Java(TM) SE Runtime Environment (build 1.7.0_11-b21)
+java version "1.8.0_11"
+Java(TM) SE Runtime Environment (build 1.8.0_11-b21)
 Java HotSpot(TM) 64-Bit Server VM (build 23.6-b04, mixed mode)
 </p>
 <p>
@@ -458,15 +456,15 @@ And don't proceed until you resolve that
 </div>
 
 
-<a name="derby"></a>
+<a name="N10095"></a><a name="derby"></a>
 <h2 class="boxed">Apache Derby</h2>
 <div class="section">
-<a name="derby_download"></a>
+<a name="N1009B"></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
 <a href="http://db.apache.org/derby/derby_downloads.html">http://db.apache.org/derby/derby_downloads.html</a>.
-These tutorial instructions use version 10.13.1.1 and
+These tutorial instructions use version 10.14.1.0 and
 assume you downloaded one of the binary distribution files
 listed in the table below:
 </p>
@@ -477,19 +475,19 @@ listed in the table below:
 </tr>
     
 <tr>
-<td colspan="1" rowspan="1">Windows</td><td colspan="1" rowspan="1">db-derby-10.13.1.1-bin.zip</td>
+<td colspan="1" rowspan="1">Windows</td><td colspan="1" rowspan="1">db-derby-10.14.1.0-bin.zip</td>
 </tr>
     
 <tr>
-<td colspan="1" rowspan="1">UNIX, Linux, and Mac</td><td colspan="1" rowspan="1">db-derby-10.13.1.1-bin.tar.gz</td>
+<td colspan="1" rowspan="1">UNIX, Linux, and Mac</td><td colspan="1" rowspan="1">db-derby-10.14.1.0-bin.tar.gz</td>
 </tr>
 
 </table>
 <p>If a more recent release is available, download that,
    then substitute that version number
-for <span class="codefrag">10.13.1.1</span> in the following instructions.
+for <span class="codefrag">10.14.1.0</span> in the following instructions.
    </p>
-<a name="derby_install"></a>
+<a name="N100D0"></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.
@@ -501,20 +499,20 @@ for <span class="codefrag">10.13.1.1</sp
     </p>
 <p class="code-block">Windows (use your extraction tool e.g. WinZip -- these instructions use mks unzip):
 mkdir C:\Apache
-copy db-derby-10.13.1.1-bin.zip C:\Apache
+copy db-derby-10.14.1.0-bin.zip C:\Apache
 cd C:\Apache
-unzip db-derby-10.13.1.1-bin.zip
+unzip db-derby-10.14.1.0-bin.zip
 </p>
 <p class="code-block">UNIX:
 mkdir /opt/Apache
-cp db-derby-10.13.1.1-bin.tar.gz /opt/Apache
+cp db-derby-10.14.1.0-bin.tar.gz /opt/Apache
 cd /opt/Apache
-tar xzvf db-derby-10.13.1.1-bin.tar.gz
+tar xzvf db-derby-10.14.1.0-bin.tar.gz
 </p>
 <p>In both cases, the software will now be extracted into a subdirectory
-    named <span class="codefrag">db-derby-10.13.1.1-bin</span>.
+    named <span class="codefrag">db-derby-10.14.1.0-bin</span>.
    </p>
-<a name="set_derby_install"></a>
+<a name="N100EE"></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
@@ -523,12 +521,12 @@ Examples are shown below, but be sure to
 your system:
 </p>
 <p class="code-block">Windows:
-C:\&gt; set DERBY_INSTALL=C:\Apache\db-derby-10.13.1.1-bin
+C:\&gt; set DERBY_INSTALL=C:\Apache\db-derby-10.14.1.0-bin
 </p>
 <p class="code-block">UNIX Korn Shell:
-$ export DERBY_INSTALL=/opt/Apache/db-derby-10.13.1.1-bin
+$ export DERBY_INSTALL=/opt/Apache/db-derby-10.14.1.0-bin
 </p>
-<a name="derby_configure"></a>
+<a name="N10103"></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>
@@ -582,13 +580,13 @@ semicolon (;) on Windows and a colon (:)
    </p>
 <p class="code-block">Windows:
 C:\&gt; cd %DERBY_INSTALL%\bin
-C:\Apache\db-derby-10.13.1.1-bin\bin&gt; setEmbeddedCP.bat
+C:\Apache\db-derby-10.14.1.0-bin\bin&gt; setEmbeddedCP.bat
 </p>
 <p class="code-block">UNIX:
 $ cd $DERBY_INSTALL/bin
 $ . setEmbeddedCP
 </p>
-<a name="derby_verify"></a>
+<a name="N10163"></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:
@@ -597,53 +595,54 @@ system information:
 <p>Successful output will look something like this:</p>
 <p class="code-block">
 ------------------ Java Information ------------------
-Java Version:    1.7.0_11
+Java Version:    1.8.0
 Java Vendor:     Oracle Corporation
-Java home:       /Library/Java/JavaVirtualMachines/jdk1.7.0_11.jdk/Contents/Home/jre
-Java classpath:  /Users/me/src:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derby.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derby.war:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_cs.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_de_DE.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_es.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_fr.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_hu.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_it.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_ja_JP.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_ko_KR.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_pl.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_pt_BR.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_ru.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_zh_CN.jar:/Us
 ers/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyLocale_zh_TW.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyclient.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbynet.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyrun.jar:/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbytools.jar:/Users/me/sw/db2jcc/lib/db2jcc.jar:/Users/me/sw/db2jcc/lib/db2jcc_license_c.jar:/Users/me/src:/Users/me/sw/demo/tableFunctionWhitePaper/jars/vtis-example.jar
+Java home:       /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre
+Java classpath:  /Users/me/src:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derby.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derby.war:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_cs.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_de_DE.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_es.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_fr.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_hu.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_it.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_ja_JP.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_ko_KR.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_pl.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_pt_BR.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_ru.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_zh_CN.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyLocale_zh_TW.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyclie
 nt.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbynet.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyoptionaltools.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyrun.jar:/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbytools.jar:/Users/me/sw/db2jcc/lib/db2jcc.jar:/Users/me/sw/db2jcc/lib/db2jcc_license_c.jar:/Users/me/sw/mysql/connectorj/mysql-connector-java-5.0.7/mysql-connector-java-5.0.7-bin.jar:/Users/me/sw/demo/jdbc.concurrent/jars/jdbc-concurrent.jar:/Users/me/sw/demo/tableFunctionWhitePaper/jars/vtis-example.jar
 OS name:         Mac OS X
 OS architecture: x86_64
-OS version:      10.7.5
+OS version:      10.11.5
 Java user name:  me
 Java user home:  /Users/me
-Java user dir:   /Users/me/derby/mainline
+Java user dir:   /Users/me/derby/branches/10.14
 java.specification.name: Java Platform API Specification
-java.specification.version: 1.7
-java.runtime.version: 1.7.0_11-b21
+java.specification.version: 1.8
+java.runtime.version: 1.8.0-b132
 --------- Derby Information --------
-[/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derby.jar] 10.13.1.1 - (1766613)
-[/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbytools.jar] 10.13.1.1 - (1766613)
-[/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbynet.jar] 10.13.1.1 - (1766613)
-[/Users/me/sw/z/10.10.1/db-derby-10.13.1.1-bin/lib/derbyclient.jar] 10.13.1.1 - (1766613)
+[/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derby.jar] 10.14.1.0 - (1808820)
+[/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbytools.jar] 10.14.1.0 - (1808820)
+[/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbynet.jar] 10.14.1.0 - (1808820)
+[/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyclient.jar] 10.14.1.0 - (1808820)
+[/Users/me/sw/z/db-derby-10.14.1.0-bin/lib/derbyoptionaltools.jar] 10.14.1.0 - (1808820)
 ------------------------------------------------------
 ----------------- Locale Information -----------------
 Current Locale :  [English/United States [en_US]]
 Found support for locale: [cs]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 Found support for locale: [de_DE]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 Found support for locale: [es]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 Found support for locale: [fr]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 Found support for locale: [hu]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 Found support for locale: [it]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 Found support for locale: [ja_JP]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 Found support for locale: [ko_KR]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 Found support for locale: [pl]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 Found support for locale: [pt_BR]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 Found support for locale: [ru]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 Found support for locale: [zh_CN]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 Found support for locale: [zh_TW]
- version: 10.13.1.1 - (1766613)
+ version: 10.14.1.0 - (1808820)
 ------------------------------------------------------
 </p>
 <p>
@@ -669,7 +668,7 @@ C:\Apache\DB-DER~1.1-B\lib\derby.jar;C:\
 </p>
 <p class="code-block">UNIX:
 $ echo $CLASSPATH
-/opt/Apache/db-derby-10.13.1.1-bin/lib/derby.jar:/opt/Apache/db-derby-10.13.1.1-bin/lib/derbytools.jar:
+/opt/Apache/db-derby-10.14.1.0-bin/lib/derby.jar:/opt/Apache/db-derby-10.14.1.0-bin/lib/derbytools.jar:
 </p>
 <p>
 If <span class="codefrag">sysinfo</span> outputs valid information, you're
@@ -695,7 +694,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         2004-2015 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+         2004-2017 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
 <div id="feedback">
     Send feedback about the website to:
   <a id="feedbackto" href="mailto:[hidden email]?subject=Feedback%C2%A0papers/DerbyTut/install_software.html">[hidden email]</a>

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 Sat Oct 14 18:58:50 2017
@@ -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.9">
+<meta name="Forrest-version" content="0.8">
 <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,7 +316,6 @@ 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>
@@ -385,11 +384,10 @@ document.write("Last Published: " + docu
 </ul>
 </li>
 </ul>
-</div>
 </div>
 
 
-<a name="ns_intro"></a>
+<a name="N1000D"></a><a name="ns_intro"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>
@@ -430,7 +428,7 @@ Administration Guide</a>.
 </div>
 
 
-<a name="ns"></a>
+<a name="N10035"></a><a name="ns"></a>
 <h2 class="boxed">Derby Network Server</h2>
 <div class="section">
 <p>
@@ -438,7 +436,7 @@ Administration Guide</a>.
    <a href="install_software.html#set_derby_install">DERBY_INSTALL</a>
    environment variable.
 </p>
-<a name="ns_config_env"></a>
+<a name="N10042"></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>
@@ -481,7 +479,7 @@ C:\Apache\db-derby-10.4.1.3-bin\bin&gt;
 $ cd $DERBY_INSTALL/bin
 $ . setNetworkServerCP
 </p>
-<a name="start_ns"></a>
+<a name="N10082"></a><a name="start_ns"></a>
 <h3 class="boxed">Start Network Server</h3>
 <p>
 Start the Network server by executing the
@@ -510,7 +508,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="ns_easier_way"></a>
+<a name="N100A3"></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,
@@ -533,7 +531,7 @@ Apache Derby Network Server - 10.4.1.3 -
 </div>
 
 
-<a name="ns_sample"></a>
+<a name="N100B6"></a><a name="ns_sample"></a>
 <h2 class="boxed">Sample Application</h2>
 <div class="section">
 <p>
@@ -541,7 +539,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="configure_ns_client"></a>
+<a name="N100C3"></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>
@@ -581,7 +579,7 @@ C:\Apache\db-derby-10.4.1.3-bin\bin&gt;
 <p class="code-block">UNIX:
 $ . setNetworkClientCP
 </p>
-<a name="ij_ns_client"></a>
+<a name="N10107"></a><a name="ij_ns_client"></a>
 <h3 class="boxed">Test network server connection with ij</h3>
 <p>
    An <strong>embedded</strong>
@@ -630,7 +628,7 @@ ij&gt; connect 'jdbc:derby://localhost:1
 </li>
   
 </ul>
-<a name="copy_ns_client"></a>
+<a name="N10149"></a><a name="copy_ns_client"></a>
 <h3 class="boxed">Copy sample application</h3>
 <p>
    This section uses the same sample application that the
@@ -643,7 +641,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="ns_lookat_code"></a>
+<a name="N1015D"></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
@@ -654,7 +652,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="jdbc_ns_client"></a>
+<a name="N1016D"></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,
@@ -665,7 +663,7 @@ ij&gt; connect 'jdbc:derby://localhost:1
 ...
 Class.forName(driver).newInstance();
 </p>
-<a name="url_ns_client"></a>
+<a name="N10181"></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,
@@ -680,7 +678,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="ns_client_noshutdown"></a>
+<a name="N1019F"></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
@@ -689,13 +687,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="compile_ns_client"></a>
+<a name="N101B0"></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="run_ns_client"></a>
+<a name="N101BE"></a><a name="run_ns_client"></a>
 <h3 class="boxed">Run Sample Application</h3>
 <p>
    Run the sample application like this:
@@ -728,7 +726,7 @@ SimpleApp finished</p>
 </div>
 
 
-<a name="stop_ns"></a>
+<a name="N101E2"></a><a name="stop_ns"></a>
 <h2 class="boxed">Stop Network Server</h2>
 <div class="section">
 <p>
@@ -765,10 +763,10 @@ series.
 </div>
 
 
-<a name="ns_next_steps"></a>
+<a name="N1020F"></a><a name="ns_next_steps"></a>
 <h2 class="boxed">Next Steps</h2>
 <div class="section">
-<a name="Network+Server+Options"></a>
+<a name="N10215"></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
@@ -795,7 +793,7 @@ For more information about these options
 <a href="http://db.apache.org/derby/manuals">Derby Server and
 Administration Guide</a>.
 </p>
-<a name="Embedded+Server"></a>
+<a name="N1023A"></a><a name="Embedded+Server"></a>
 <h3 class="boxed">Embedded Server</h3>
 <p>
 Up until this point,
@@ -869,7 +867,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         2004-2015 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+         2004-2017 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
 <div id="feedback">
     Send feedback about the website to:
   <a id="feedbackto" href="mailto:[hidden email]?subject=Feedback%C2%A0papers/DerbyTut/ns_intro.html">[hidden email]</a>

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 Sat Oct 14 18:58:50 2017
@@ -3,8 +3,9 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <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">
@@ -317,7 +318,6 @@ 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,10 +339,9 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
-</div>
 <br>
 <br>
-<a name="Introduction"></a>
+<a name="N1001B"></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>
@@ -365,11 +364,11 @@ document.write("Last Published: " + docu
 <a href="#Parser">the parser</a>.</li>
 </ol>
 </div>
-<a name="Execution"></a>
+<a name="N1004F"></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="Alternative+Execution+Plans"></a>
+<a name="N10057"></a><a name="Alternative+Execution+Plans"></a>
 <h3 class="boxed">Alternative Execution Plans</h3>
 <p>Other implementations are possible.</p>
 <ol>
@@ -380,7 +379,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="Compilation"></a>
+<a name="N10068"></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>
@@ -388,7 +387,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="Parser"></a>
+<a name="N10076"></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>
@@ -466,7 +465,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         2004-2015 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+         2004-2017 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
 <div id="feedback">
     Send feedback about the website to:
   <a id="feedbackto" href="mailto:[hidden email]?subject=Feedback%C2%A0papers/Intersect-design.html">[hidden email]</a>

Modified: websites/production/db/content/derby/papers/JDBCImplementation.html
==============================================================================
--- websites/production/db/content/derby/papers/JDBCImplementation.html (original)
+++ websites/production/db/content/derby/papers/JDBCImplementation.html Sat Oct 14 18:58:50 2017
@@ -3,8 +3,9 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="pelt">
+<meta name="generator" content="">
 <meta name="" content="">
 <meta name="GENERATOR" content="">
 <meta name="CREATED" content="">
@@ -322,7 +323,6 @@ document.write("Last Published: " + docu
           &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Derby JDBC Implementation Notes</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -453,8 +453,7 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
-</div>
-<a name="Overview"></a>
+<a name="N10049"></a><a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>The JDBC specification is sometimes unclear or contradictory. This document covers how Derby implements some JDBC features where the specification might be unclear.</p>
@@ -466,38 +465,38 @@ document.write("Last Published: " + docu
 <p>[TUTORIAL3] &ndash; JDBC API Tutorial and Reference, Third Edition. ISBN 0321173848 <a class="external" href="http://java.sun.com/developer/Books/jdbc/Fisher/index.html">http://java.sun.com/developer/Books/jdbc/Fisher/index.html</a>
 </p>
 </div>
-<a name="Java.sql.Connection"></a>
+<a name="N10060"></a><a name="Java.sql.Connection"></a>
 <h2 class="boxed">Java.sql.Connection</h2>
 <div class="section">
-<a name="CreateStatement%2C+prepareStatement+and+prepareCall"></a>
+<a name="N10064"></a><a name="CreateStatement%2C+prepareStatement+and+prepareCall"></a>
 <h3 class="boxed">CreateStatement, prepareStatement and prepareCall</h3>
 <p>Behavior Clarification</p>
 <p>CONCUR_UPDATABLE concurrency is supported for FORWARD ONLY ResultSet types only.</p>
 </div>
-<a name="Java.sql.PreparedStatement"></a>
+<a name="N1006C"></a><a name="Java.sql.PreparedStatement"></a>
 <h2 class="boxed">Java.sql.PreparedStatement</h2>
 <div class="section">
-<a name="setAsciiStream%2CsetBinaryStream%2CsetCharacterStream"></a>
+<a name="N10070"></a><a name="setAsciiStream%2CsetBinaryStream%2CsetCharacterStream"></a>
 <h3 class="boxed">setAsciiStream,setBinaryStream,setCharacterStream</h3>
 <p>Behavior Clarification</p>
 <p>In Derby, the stream must have the exact amount of data as the length argument, otherwise an exception with the following message 'Input Stream did not have exact amount of data as the requested length' is thrown.</p>
 <p>Stream parameter values are not re-used. The JDBC 3.0 specification says in the last paragraph of 13.2.2 that parameters are re-used but nothing special about streams. However javadoc for java.sql.PreparedStatement.clearParamters() says 'In general, parameter values remain in force for repeated use of a statement'. Maybe 'in general' can be interpreted to mean 'except for streams'. Stream parameter values are not re-used and if a stream is re-used, the statement execution will fail with 'Stream has already been read and end-of-file reached and cannot be re-used.'.</p>
 </div>
-<a name="Java.sql.ResultSet"></a>
+<a name="N1007A"></a><a name="Java.sql.ResultSet"></a>
 <h2 class="boxed">Java.sql.ResultSet</h2>
 <div class="section">
 <p>Support for data conversion using the getXXX() methods matches Table B-6 in the [JDBC3], with some extensions described below.</p>
 <p>Extension</p>
 <p>If the value column is null, then generally any getXXX method can be used to fetch the null value and a null or a representation of zero will be returned and a subsequent call to wasNull() will return true. It is not recommended that applications take advantage of this liberal conversion of SQL NULL values, use of a getXXX() method that works against NULL and non-NULL values is strongly recommended.</p>
-<a name="deleteRow%28%29"></a>
+<a name="N10084"></a><a name="deleteRow%28%29"></a>
 <h3 class="boxed">deleteRow()</h3>
 <p>Behavior Clarification</p>
 <p>After deleteRow, ResultSet will be positioned right before the next row for FORWARD ONLY updatable ResultSets.</p>
-<a name="updateRow%28%29"></a>
+<a name="N1008C"></a><a name="updateRow%28%29"></a>
 <h3 class="boxed">updateRow()</h3>
 <p>Behavior Clarification</p>
 <p>After updateRow, ResultSet will be positioned right before the next row for FORWARD ONLY updatable ResultSets.</p>
-<a name="GetAsciiStream%28%29"></a>
+<a name="N10094"></a><a name="GetAsciiStream%28%29"></a>
 <h3 class="boxed">GetAsciiStream()</h3>
 <p>Behavior Clarification</p>
 <p>An ASCII character is defined as an eight bit character (range 0x00 to 0xff), see CHAR() function definition by [JDBC3] in appendix C.2.</p>
@@ -515,11 +514,11 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 <p>This method is not recommended to use in Derby.<br>Because Derby handles characters as unicode internally , there is no advantage in using this method .</p>
-<a name="GetBinaryStream%28%29"></a>
+<a name="N100AE"></a><a name="GetBinaryStream%28%29"></a>
 <h3 class="boxed">GetBinaryStream()</h3>
 <p>Extensions</p>
 <p>On Types.BLOB columns returns a stream with identical contents to that returned by getBlob().getBinaryStream() on the same column if the BLOB value is not NULL. If the BLOB value is NULL then null is returned.</p>
-<a name="GetCharacterStream%28%29"></a>
+<a name="N100B6"></a><a name="GetCharacterStream%28%29"></a>
 <h3 class="boxed">GetCharacterStream()</h3>
 <p>Behavior Clarification</p>
 <p>For binary types (Types.BINARY, Types.VARBINARY, and Types.LONGVARBINARY, Types.BLOB) getString() the value is converted to a stream of characters as though it is encoded using UTF-16BE.</p>
@@ -534,7 +533,7 @@ document.write("Last Published: " + docu
 <p>On Types.BLOB columns supported with conversion as a binary type.</p>
 </li>
 </ul>
-<a name="GetString%28%29"></a>
+<a name="N100C8"></a><a name="GetString%28%29"></a>
 <h3 class="boxed">GetString()</h3>
 <p>Behavior Clarification</p>
 <p>For binary types (Types.BINARY, Types.VARBINARY, and Types.LONGVARBINARY, Types.BLOB) getString() returns String containing a two character hexadecimal representation for every byte in a non-null value.&nbsp; The two characters are in the range &lsquo;0&rsquo; &ndash; &lsquo;9&rsquo; and &lsquo;a&rsquo; &ndash; &lsquo;f&rsquo;. For NULL values, null is returned. Note, that this String does not match the contents of the stream returned by getAsciiStream or getCharacterStream on the same column.</p>
@@ -549,10 +548,10 @@ document.write("Last Published: " + docu
 <p>On Types.BLOB columns supported with conversion as a binary type.</p>
 </li>
 </ul>
-<a name="GetUnicodeStream%28%29"></a>
+<a name="N100DA"></a><a name="GetUnicodeStream%28%29"></a>
 <h3 class="boxed">GetUnicodeStream()</h3>
 <p>Not implemented, deprecated by [JDBC3].</p>
-<a name="Examples"></a>
+<a name="N100E0"></a><a name="Examples"></a>
 <h3 class="boxed">Examples</h3>
 <p>Binary Column</p>
 <p>If a binary column has been set with the Java byte array containing fours bytes, byte[] data = {0x34, 0x87, 0xc2, 0x1f} then:</p>
@@ -581,43 +580,43 @@ document.write("Last Published: " + docu
 </ul>
 </div>
 </div>
-<a name="java.sql.Blob"></a>
+<a name="N100FD"></a><a name="java.sql.Blob"></a>
 <h2 class="boxed">java.sql.Blob</h2>
 <div class="section">
-<a name="getBytes%28int+pos%2C+int+length%29"></a>
+<a name="N10101"></a><a name="getBytes%28int+pos%2C+int+length%29"></a>
 <h3 class="boxed">getBytes(int pos, int length)</h3>
 <p>Behavior Clarification</p>
 <p>If the pos (position) argument is greater than the length of the BLOB then an exception is thrown. This matches the semantics of the SQL SUBSTR function.</p>
-<a name="position%28byte+pattern%2C+int+start%29+and+position%28Blob+pattern%2C+int+start%29"></a>
+<a name="N10109"></a><a name="position%28byte+pattern%2C+int+start%29+and+position%28Blob+pattern%2C+int+start%29"></a>
 <h3 class="boxed">position(byte pattern, int start) and position(Blob pattern, int start)</h3>
 <p>Behavior Clarification</p>
 <p>If the pattern argument has length zero, then the value of start argument will be returned. This matches the semantics of the SQL LOCATE function.</p>
 </div>
-<a name="java.sql.Clob"></a>
+<a name="N10111"></a><a name="java.sql.Clob"></a>
 <h2 class="boxed">java.sql.Clob</h2>
 <div class="section">
-<a name="getSubString%28int+pos%2C+int+length%29"></a>
+<a name="N10115"></a><a name="getSubString%28int+pos%2C+int+length%29"></a>
 <h3 class="boxed">getSubString(int pos, int length)</h3>
 <p>Behavior Clarification</p>
 <p>If the pos (position) argument is greater than the length of the CLOB then an exception is thrown. This matches the semantics of the SQL SUBSTR function.</p>
-<a name="position%28String+searchstr%2C+int+start%29+and"></a>
+<a name="N1011D"></a><a name="position%28String+searchstr%2C+int+start%29+and"></a>
 <h3 class="boxed">position(String searchstr, int start) andposition(Clob searchstr, int start)</h3>
 <p>Behavior Clarification</p>
 <p>If the searchstr argument has length zero (the empty string), then the value of start argument will be returned. This matches the semantics of the SQL LOCATE function.</p>
 </div>
-<a name="Date+Handling"></a>
+<a name="N10127"></a><a name="Date+Handling"></a>
 <h2 class="boxed">Date Handling</h2>
 <div class="section">
-<a name="Derby+SQL+DATE"></a>
+<a name="N1012B"></a><a name="Derby+SQL+DATE"></a>
 <h3 class="boxed">Derby SQL DATE</h3>
 <p>Derby&rsquo;s SQL DATE type represents a date in the form yyyy-mm-dd with no associated time zone information.</p>
-<a name="java.sql.Date"></a>
+<a name="N10131"></a><a name="java.sql.Date"></a>
 <h4>java.sql.Date</h4>
 <p>A JDBC Date (java.sql.Date) by definition represents a point in time on a given date in a given time zone.</p>
 <p>[JDBC3] intends that the point in time for a java.sql.Date object is 00:00 (midnight), but this is not enforced by the class.</p>
 <p>JDBC drivers are required to return java.sql.Date objects that are normalized to 00:00 according to the required time zone.</p>
 <p>Applications are expected to pass in java.sql.Date instances that are normalized to 00:00 (see section 18.1.1 of [TUTORIAL3]).</p>
-<a name="Conversion+of+a+JDBC+java.sql.Date+to+a+Derby+DATE+value"></a>
+<a name="N1013D"></a><a name="Conversion+of+a+JDBC+java.sql.Date+to+a+Derby+DATE+value"></a>
 <h4>Conversion of a JDBC java.sql.Date to a Derby DATE value</h4>
 <ol>
 <li>
@@ -648,7 +647,7 @@ document.write("Last Published: " + docu
 </ol>
 <p>Derby does not require that the application&rsquo;s java.sql.Date value is normalized to 00:00 according to the required time zone.</p>
 <p>In both cases no time zone information is stored with the SQL DATE value.</p>
-<a name="Conversion+of+a+Derby+DATE+value+to+a+JDBC+java.sql.Date"></a>
+<a name="N10165"></a><a name="Conversion+of+a+Derby+DATE+value+to+a+JDBC+java.sql.Date"></a>
 <h4>Conversion of a Derby DATE value to a JDBC java.sql.Date</h4>
 <ol>
 <li>
@@ -674,7 +673,7 @@ document.write("Last Published: " + docu
 </ul>
 </li>
 </ol>
-<a name="Conversion+of+a+string+type+to+a+JDBC+java.sql.Date"></a>
+<a name="N1017E"></a><a name="Conversion+of+a+string+type+to+a+JDBC+java.sql.Date"></a>
 <h4>Conversion of a string type to a JDBC java.sql.Date</h4>
 <p>Three different date formats are built into Derby.</p>
 <div style="margin-left: 2em">
@@ -692,16 +691,16 @@ document.write("Last Published: " + docu
 </div>
 <p>If the format of the string matches one of the built in formats then a conversion to a java.sql.Date matches that of a SQL DATE value with value yyyy-mm-dd.</p>
 <p>If the string does not match any of the built in formats Derby attempts to use the Java locale specific parser to interpret the string as a date.</p>
-<a name="Derby+SQL+TIME"></a>
+<a name="N10194"></a><a name="Derby+SQL+TIME"></a>
 <h3 class="boxed">Derby SQL TIME</h3>
 <p>Derby&rsquo;s SQL TIME type represents a time of day in the form hh:mm:ss with no associated time zone information.</p>
-<a name="java.sql.Time"></a>
+<a name="N1019A"></a><a name="java.sql.Time"></a>
 <h4>java.sql.Time</h4>
 <p>A JDBC Time (java.sql.Time) by definition represents a point in time on an unspecified day in a given time zone.</p>
 <p>Java.sql.Time extends java.util.date, so it includes a date. [JDBC3] intends that the date stored in a java.sql.Time be Jan 1 1970, but this is not enforced by the class.</p>
 <p>JDBC drivers are required to return java.sql.Time objects that are normalized to Jan. 1 1970 according to the required time zone.</p>
 <p>Applications are expected to pass in java.sql.Time instances that are normalized to Jan. 1 1970.</p>
-<a name="Conversion+of+a+JDBC+java.sql.Time+to+a+Derby+TIME+value"></a>
+<a name="N101A6"></a><a name="Conversion+of+a+JDBC+java.sql.Time+to+a+Derby+TIME+value"></a>
 <h4>Conversion of a JDBC java.sql.Time to a Derby TIME value</h4>
 <ol>
 <li>
@@ -732,7 +731,7 @@ document.write("Last Published: " + docu
 </ol>
 <p>Derby does not require that the application&rsquo;s java.sql.Time value be normalized to Jan 1 1970 according to the required time zone.</p>
 <p>In both cases no time zone information is stored with the SQL TIME value.</p>
-<a name="Conversion+of+a+Derby+TIME+value+to+a+JDBC+java.sql.Time"></a>
+<a name="N101CE"></a><a name="Conversion+of+a+Derby+TIME+value+to+a+JDBC+java.sql.Time"></a>
 <h4>Conversion of a Derby TIME value to a JDBC java.sql.Time</h4>
 <ol>
 <li>
@@ -758,7 +757,7 @@ document.write("Last Published: " + docu
 </ul>
 </li>
 </ol>
-<a name="Conversion+of+a+string+type+to+a+JDBC+java.sql.Time"></a>
+<a name="N101E7"></a><a name="Conversion+of+a+string+type+to+a+JDBC+java.sql.Time"></a>
 <h4>Conversion of a string type to a JDBC java.sql.Time</h4>
 <p>Three different time formats are built into Derby:</p>
 <div style="margin-left: 2em">
@@ -776,13 +775,13 @@ document.write("Last Published: " + docu
 </div>
 <p>If the format of the string matches one of the built in formats then a conversion to a java.sql.Time matches that of a SQL TIME value with value hh:mm:ss.</p>
 <p>If the string does not match any of the built in formats Derby attempts to use the Java locale specific parser to interpret the string as a date.</p>
-<a name="Derby+SQL+TIMESTAMP"></a>
+<a name="N101FD"></a><a name="Derby+SQL+TIMESTAMP"></a>
 <h3 class="boxed">Derby SQL TIMESTAMP</h3>
 <p>Derby&rsquo;s SQL TIMESTAMP type represents a time of day in the form yyyy-mm-dd hh:mm:ss.fffffffff (nanosecond granularity) with no associated time zone information.</p>
-<a name="java.sql.Timestamp"></a>
+<a name="N10203"></a><a name="java.sql.Timestamp"></a>
 <h4>java.sql.Timestamp</h4>
 <p>A JDBC Timestamp (java.sql.Timestamp) by definition represents a point in time, with nanosecond resolution, in a given time zone.</p>
-<a name="Conversion+of+a+JDBC+java.sql.Timestamp+to+a+Derby+TIMESTAMP+value"></a>
+<a name="N10209"></a><a name="Conversion+of+a+JDBC+java.sql.Timestamp+to+a+Derby+TIMESTAMP+value"></a>
 <h4>Conversion of a JDBC java.sql.Timestamp to a Derby TIMESTAMP value</h4>
 <ol>
 <li>
@@ -811,7 +810,7 @@ document.write("Last Published: " + docu
 </ul>
 </li>
 </ol>
-<a name="Conversion+of+a+Derby+TIMESTAMP+value+to+a+JDBC+java.sql.Timestamp"></a>
+<a name="N10235"></a><a name="Conversion+of+a+Derby+TIMESTAMP+value+to+a+JDBC+java.sql.Timestamp"></a>
 <h4>Conversion of a Derby TIMESTAMP value to a JDBC java.sql.Timestamp</h4>
 <ol>
 <li>
@@ -837,7 +836,7 @@ document.write("Last Published: " + docu
 </ul>
 </li>
 </ol>
-<a name="Conversion+of+a+string+type+to+a+JDBC+java.sql.Timestamp"></a>
+<a name="N1024E"></a><a name="Conversion+of+a+string+type+to+a+JDBC+java.sql.Timestamp"></a>
 <h4>Conversion of a string type to a JDBC java.sql.Timestamp</h4>
 <p>Two different timestamp formats are built into Derby:</p>
 <div style="margin-left: 2em">
@@ -874,7 +873,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         2004-2015 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+         2004-2017 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
 <div id="feedback">
     Send feedback about the website to:
   <a id="feedbackto" href="mailto:[hidden email]?subject=Feedback%C2%A0papers/JDBCImplementation.html">[hidden email]</a>

Modified: websites/production/db/content/derby/papers/MiscPresentations.html
==============================================================================
--- websites/production/db/content/derby/papers/MiscPresentations.html (original)
+++ websites/production/db/content/derby/papers/MiscPresentations.html Sat Oct 14 18:58:50 2017
@@ -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.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Miscellaneous Derby Presentations</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -316,7 +316,6 @@ document.write("Last Published: " + docu
           &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Miscellaneous Derby Presentations</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -330,10 +329,9 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
-</div>
 
 
-<a name="Colorado+Software+Summit+2004"></a>
+<a name="N1000D"></a><a name="Colorado+Software+Summit+2004"></a>
 <h2 class="boxed">Colorado Software Summit 2004</h2>
 <div class="section">
 <p>
@@ -348,7 +346,7 @@ is available for download
 </div>
 
 
-<a name="OSCON+2005"></a>
+<a name="N10026"></a><a name="OSCON+2005"></a>
 <h2 class="boxed">OSCON 2005</h2>
 <div class="section">
 <p>
@@ -367,7 +365,7 @@ Dive with Apache Derby: Perl, PHP, and P
 </div>
 
 
-<a name="Victorian+Java+User+Group+2008"></a>
+<a name="N1003F"></a><a name="Victorian+Java+User+Group+2008"></a>
 <h2 class="boxed">Victorian Java User Group 2008</h2>
 <div class="section">
 <p>
@@ -378,7 +376,7 @@ spoke at the August meeting</a> of the
 in Melbourne, Australia. The slides from his presentation,
 <em>Using Apache Derby in the real world</em>, are available for download
 [<a class="external" href="http://www.papercut.com/anonftp/pub/open-source/apache-derby/ApacheDerbyAJUGPresentation.pdf">PDF</a>]
-[<a class="external" href="http://docs.google.com/Present?docid=dcz4c74g_82nr92vgnt&amp;skipauth=true">HTML</a>].
+[<a class="external" href="http://docs.google.com/Present?docid=dcz4c74g_82nr92vgnt&skipauth=true">HTML</a>].
 </p>
 </div>
 
@@ -407,7 +405,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         2004-2015 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+         2004-2017 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
 <div id="feedback">
     Send feedback about the website to:
   <a id="feedbackto" href="mailto:[hidden email]?subject=Feedback%C2%A0papers/MiscPresentations.html">[hidden email]</a>

Modified: websites/production/db/content/derby/papers/btree_package.html
==============================================================================
--- websites/production/db/content/derby/papers/btree_package.html (original)
+++ websites/production/db/content/derby/papers/btree_package.html Sat Oct 14 18:58:50 2017
@@ -3,8 +3,9 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="pelt">
+<meta name="generator" content="">
 <meta name="" content="">
 <title>org.apache.derby.impl.store.access.btree</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -317,7 +318,6 @@ document.write("Last Published: " + docu
           &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>org.apache.derby.impl.store.access.btree</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -354,9 +354,8 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
-</div>
 <p>Implements BTree access method, which is the basis for SQL indexes.</p>
-<a name="Overview"></a>
+<a name="N1001B"></a><a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>Derby implements secondary SQL indexes as BTrees. The high level features of the BTree implementation are:</p>
@@ -368,7 +367,7 @@ document.write("Last Published: " + docu
 <li>Derby uses logical key deletes. This enables it to perform undos during rollbacks and restart recovery as single page operations.</li>
 </ol>
 </div>
-<a name="High+level+structure+of+the+B%2BTree"></a>
+<a name="N10031"></a><a name="High+level+structure+of+the+B%2BTree"></a>
 <h2 class="boxed">High level structure of the B+Tree</h2>
 <div class="section">
 <ul>
@@ -379,12 +378,12 @@ document.write("Last Published: " + docu
 <li>IndexRows are generated by the <a href="http://db.apache.org/derby/javadoc/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.html">IndexRowGenerator</a>.</li>
 </ul>
 </div>
-<a name="Latching+implementation"></a>
+<a name="N10058"></a><a name="Latching+implementation"></a>
 <h2 class="boxed">Latching implementation</h2>
 <div class="section">
 <p>Derby uses latches on pages to get exclusive access to the page while reading or writing the page (Derby only uses exclusive latches, no shared latches are used). In order to prevent deadlocks latches requested while holding other latches are always requested top/down and left to right. Btree splits are always left to right. If for any reason the code needs to break this protocol then it will first request the latch NOWAIT and if it can't get the latch it will release all current latches and wait for the latch it is trying to get, and then after obtaining it go about getting the other latches it needs for the particular operation. While traversing down the tree Derby may hold 2 latches: one on parent and one on child. It then continues doing "ladder" latching down the tree releasing the highest node when it has successfully got a new lower node latch. Latches are short term, only held while reading/modifying the page, never held while an I/O is happening. Structure modifications
 are all isolated from other operations through the use of latches.</p>
 </div>
-<a name="Locking+and+Isolation+Levels"></a>
+<a name="N1005E"></a><a name="Locking+and+Isolation+Levels"></a>
 <h2 class="boxed">Locking and Isolation Levels</h2>
 <div class="section">
 <p>Derby uses data only locking for its logical row level locking. All isolation level implementation is done using logical locks (Derby does not support non-locking isolation such as multi-versioning).</p>
@@ -400,7 +399,7 @@ document.write("Last Published: " + docu
 <dd>No row locks are acquired. The code still gets table level intent locks to prevent concurrent DDL during the query.</dd>
 </dl>
 </div>
-<a name="BTree+Structure+Modifications"></a>
+<a name="N1007F"></a><a name="BTree+Structure+Modifications"></a>
 <h2 class="boxed">BTree Structure Modifications</h2>
 <div class="section">
 <p>In Derby, SMOs (structure modification operations - ie. page splits), only happen top down. This is not as concurrent as bottom up in <a class="external" href="http://www.almaden.ibm.com/u/mohan/RJ6846.pdf">ARIES/IM</a>, but is simpler. As in ARIES/IM <q>Not more than 2 index pages are held latched simultaneously at anytime. In order to improve concurrency and to avoid deadlocks involving latches, even those latches are not held while waiting for a lock wich is not immediately grantable. No data page latch is held or acquired during an index access. Latch coupling is used while traversing the tree - ie. the latch on a parent page is held while requesting a latch on a child page.</q>
@@ -409,24 +408,24 @@ document.write("Last Published: " + docu
 <p>The hard case is when P does not have room for descriminator key. In this case all latches are released, and Derby does a split pass from top to bottom, and will split the internal nodes that do not have room for the decrimator key. Note this may result in more splits than necessary for this particular insert, but the assumption is that the splits will have to happen eventually anyway. After this split pass is done, the search for the insert starts again from top down, but it must once again check for space because it has given up all its latches and some other transaction may have acquired the space in the meantime.</p>
 <p>Optimization is possible to remember C and see if it is right location, and/or use sideway pointers to search right rather than do research of tree.</p>
 </div>
-<a name="Logical+Key+Deletes"></a>
+<a name="N10091"></a><a name="Logical+Key+Deletes"></a>
 <h2 class="boxed">Logical Key Deletes</h2>
 <div class="section">
 <p>In both the BTree and the Heap, deletes are first executed by marking a "deleted" bit. This is to insure space on the page for abort, since row level locking will allow other rows on the page to be modified conncurrently with the transaction executing the delete. The system uses a background daemon to schedule work after commit to reclaim the space of the deleted rows. A row marked deleted can be "purged" if one can obtain a lock on it (if it was an uncommitted delete then the transaction doing the commit would still have an exclusive lock on the row).</p>
 </div>
-<a name="Garbage+Collection+of+deleted+keys"></a>
+<a name="N10097"></a><a name="Garbage+Collection+of+deleted+keys"></a>
 <h2 class="boxed">Garbage Collection of deleted keys</h2>
 <div class="section">
 <p>Since rows are only marked as "deleted", and not physically removed, it is necessary to perform space reclamation on deleted rows.</p>
-<a name="Online+during+BTREE+split"></a>
+<a name="N1009D"></a><a name="Online+during+BTREE+split"></a>
 <h3 class="boxed">Online during BTREE split</h3>
 <p>Whenever there is not enough room on a leaf to do an insert the code attempts to find space on the leaf, by checking if it can reclaim any committed deletes on that leaf. That work only requires the latch on the leaf and NOWAIT row write locks. It is expected that most of the space reclaim done in the BTree goes through this path. Most of this work is done in {@link org.apache.derby.impl.store.access.btree.BTreeController.reclaim_deleted_rows}.</p>
-<a name="BTREE+post+commit+work"></a>
+<a name="N100A3"></a><a name="BTREE+post+commit+work"></a>
 <h3 class="boxed">BTREE post commit work</h3>
 <p>Whenever a delete operation deletes the last row from a leaf page then a BtreePostCommit job is queued to be executed after the transaction which did the delete commits. This work currently requires a table level lock as page merges have not been implemented to be allowed concurrent with other operations. Many DBMSes don't even try to do page merges except when called from some sort of reorg utility. If all rows on page are purged, then the page will move to the free list and perform a merge to the tree.</p>
 <p>It is expected that the normal space reclamation happens with row locks during btree split, which is why not much work has been done to optimize btree post commit path</p>
 </div>
-<a name="Logging+and+Recovery"></a>
+<a name="N100AB"></a><a name="Logging+and+Recovery"></a>
 <h2 class="boxed">Logging and Recovery</h2>
 <div class="section">
 <p>Derby uses physical redo and logical undo for BTree inserts and deletes. Logical undo is simplified as a result of using logical key deletes. If keys were physically removed during deletes, then the undo of a key delete would have required an insert operation which can potentially lead to page splits at various levels within the tree. Since the key is not physically removed, but only marked as "deleted", undoing a key delete is accomplished easily. However, since the page where the insert or delete should take place may have moved, it may be necessary to search for the page.</p>
@@ -449,7 +448,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         2004-2015 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+         2004-2017 Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
 <div id="feedback">
     Send feedback about the website to:
   <a id="feedbackto" href="mailto:[hidden email]?subject=Feedback%C2%A0papers/btree_package.html">[hidden email]</a>