svn commit: r1019521 [2/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 [2/8] - in /websites/production/db/content/derby: ./ blogs/ dev/ integrate/ manuals/ papers/ papers/DerbyTut/ releases/

rhillegas
Modified: websites/production/db/content/derby/integrate/DerbyTomcat5512JPetStor.html
==============================================================================
--- websites/production/db/content/derby/integrate/DerbyTomcat5512JPetStor.html (original)
+++ websites/production/db/content/derby/integrate/DerbyTomcat5512JPetStor.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>Embedding  Apache Derby in Tomcat and creating an iBATIS JPetStore Demo</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>Embedding  Apache Derby in Tomcat and creating an iBATIS JPetStore Demo</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -354,7 +353,6 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
-</div>
 
 <p>This is the third in a series of articles that detail creating a demonstration web application using a Derby database running in different server environments.   This article details how to create the demo on the Apache Tomcat Server.  See the links in the <a href="#Rlinks">Related Articles</a> section below to access the other articles.</p>
 
@@ -368,7 +366,7 @@ document.write("Last Published: " + docu
 <p>
    This article shows the steps required to embed Derby in a Tomcat version 5.5.12 Server and  then deploy a copy of the iBATIS JPetStore application that utilizes a Derby database.  The implementation accesses the Derby database via a JNDI registered datasource and hence the same application code and Derby database can be used unchanged to create the demo in different environments.  Details are provided for registering the datasource as either a Tomcat server-wide (Global) JNDI resource or a per-application (context specific) JNDI resource.</p>
 
-<a name="Why+Derby"></a>
+<a name="N1001D"></a><a name="Why+Derby"></a>
 <h2 class="boxed">Why Derby</h2>
 <div class="section">
 <p>
@@ -381,7 +379,7 @@ Installation of the Derby DBMS is as sim
 The web application used for the demonstration is the freely distributable iBATIS JpetStore application.
  -->
 
-<a name="The+Software+Components"></a>
+<a name="N1002C"></a><a name="The+Software+Components"></a>
 <h2 class="boxed">The Software Components</h2>
 <div class="section">
 <p>Derby is an open source, java relational database freely available from the Apache Software Foundation (ASF).  It is well suited for use with Java applications that require data persistence and is ideally suited for use in a Server environment like Tomcat.  Derby can be used in one of two configurations, embedded in a java application or used with Network Server and run as a separate DBMS process.  When embedded in an application like Tomcat that provides network communication services there is usually no need to run the Network Server.</p>
@@ -391,7 +389,7 @@ Tomcat is a widely used, open source web
 JPetStore is a rewritten Pet Store application based on Sun's J2EE Pet Store. It was originally designed to compare the .NET and J2EE architectures. It is now the official example application for the iBATIS Data Mapper framework.  iBATIS  greatly simplifies the coding of Java and .NET applications that access data from a relational database like Derby.  iBATIS, like the other software used in this implementation is an open source product freely available from ASF.</p>
 </div>
 
-<a name="Typographic+Conventions+Used"></a>
+<a name="N1003C"></a><a name="Typographic+Conventions+Used"></a>
 <h2 class="boxed">Typographic Conventions Used</h2>
 <div class="section">
 <p> The following codes in curly braces will be used to represent installation dependant information as described below:</p>
@@ -418,7 +416,7 @@ JPetStore is a rewritten Pet Store appli
 </dl>
 </div>
 
-<a name="Required+Software+%2F+Downloads"></a>
+<a name="N1006D"></a><a name="Required+Software+%2F+Downloads"></a>
 <h2 class="boxed">Required Software / Downloads</h2>
 <div class="section">
 <ul>
@@ -432,7 +430,7 @@ JPetStore is a rewritten Pet Store appli
 </ul>
 </div>
 
-<a name="Setup+of+Application+with+the+Datasource+in+the+Global+Context%3A"></a>
+<a name="N10088"></a><a name="Setup+of+Application+with+the+Datasource+in+the+Global+Context%3A"></a>
 <h2 class="boxed">Setup of Application with the Datasource in the Global Context:</h2>
 <div class="section">
 <p>The initial steps below walk you through moving the files contained in the DerbyJPetStore4Tomcat.zip file to the  locations required to support the deployment instructions that follow.  Note that the zipfile contains not only the application system but also the DBMS and the initialized database.  No database activity is required other than placing the files in the proper directories.  Assuming you have a functioning Tomcat 5.5.12 system already everything you need to create the demo is found in the zipfile associated with this article.</p>
@@ -509,7 +507,7 @@ Deploy directory or WAR file located on
 </div>
 
 
-<a name="Alternate+Setup%3A+Datasource+in+the+Application+Context"></a>
+<a name="N100F9"></a><a name="Alternate+Setup%3A+Datasource+in+the+Application+Context"></a>
 <h2 class="boxed">Alternate Setup: Datasource in the Application Context</h2>
 <div class="section">
 <p>The datasource connection pool used by the JPetStore application can be defined in the Global context as show above or in the Application context outlined here.  Either context will support connections between  iBATIS and Derby.  The difference between the two setups is whether or not another application deployed to this Tomcat server will be able to access the datasource.  When the datasource is defined in the Global context other applications can also connect to the pool by linking to the Global datasource using a copy of the <span class="codefrag">Resource-link</span> definition found in the <span class="codefrag">JPetStoreAppGbl.xml</span> file used in the deployment above.  This is the configuration that should be used if, say, a Petstore accounting or reporting application will be deployed in a separate secured context that is available to a limited number of users.
@@ -573,7 +571,7 @@ Deploy directory or WAR file located on
 </ul>
 </div>
 
-<a name="Database+Creation+Instructions+%28optional%29"></a>
+<a name="N10170"></a><a name="Database+Creation+Instructions+%28optional%29"></a>
 <h2 class="boxed">Database Creation Instructions (optional)</h2>
 <div class="section">
 <p>The following steps show how to build the Derby database from scratch.  This is similar to the build procedure required when deploying applications using most other DBMS system except a separate database creation step is not required.  Two files (*.sql) are supplied in the zipfile to perform the schema build and data inserts.  To use this procedure you will need to download a complete set of Derby jarfiles in order to obtain the IJ scripting tool used in the following commands.  The IJ tool is used to process the SQL commands in the provided scripts.  The IJ tool is contained in the derbytools.jar file.  Place derbytools.jar in the {Derby_Jars} directory.   For simplicity the examples below place all necessary files in the same directory and specify as much a possible (including the command to create the database) on the command line.</p>
@@ -610,7 +608,7 @@ Deploy directory or WAR file located on
 </div>
  <!-- Integration Notes Section -->
 
-<a name="General+Integration+Notes"></a>
+<a name="N10199"></a><a name="General+Integration+Notes"></a>
 <h2 class="boxed">General Integration Notes</h2>
 <div class="section">
 <p>
@@ -621,7 +619,7 @@ J2EE Servers use multiple classloaders (
 </div>
 
 
-<a name="Tomcat+Integration+Notes"></a>
+<a name="N101A6"></a><a name="Tomcat+Integration+Notes"></a>
 <h2 class="boxed">Tomcat Integration Notes</h2>
 <div class="section">
 <p>Tomcat is designed so that new java components (a.k.a. shared libraries) can be easily added to the system.  This is accomplished by adding the jarfiles containing the components to the $CATALINA_HOME/common/lib directory.  
@@ -650,7 +648,7 @@ java.lang.ExceptionInInitializerError
 </div>
 </div>
 
-<a name="iBATIS+Integration+Notes"></a>
+<a name="N101D0"></a><a name="iBATIS+Integration+Notes"></a>
 <h2 class="boxed">iBATIS Integration Notes</h2>
 <div class="section">
 <p>If you wish to build your own iBATIS JPetstore war file like the one supplied in the zipfile file  you will need to download the JPetStore application source code (see the 'Related Links' section) and make the following modifications to the source files before performing a build as described in the JPetStore build instructions: </p>
@@ -685,7 +683,7 @@ java.lang.ExceptionInInitializerError
 </div>
  <!-- RELATED LINKS SECTION  -->
 
-<a name="Rlinks"></a>
+<a name="N101F3"></a><a name="Rlinks"></a>
 <h2 class="boxed">Links Section</h2>
 <div class="section">
 <p>Required Downloads to perform this deployment: </p>
@@ -778,7 +776,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%A0integrate/DerbyTomcat5512JPetStor.html">[hidden email]</a>

Modified: websites/production/db/content/derby/integrate/JPOX_Derby.html
==============================================================================
--- websites/production/db/content/derby/integrate/JPOX_Derby.html (original)
+++ websites/production/db/content/derby/integrate/JPOX_Derby.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>Using JPOX JDO with 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>Using JPOX JDO with Derby</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -356,11 +355,10 @@ document.write("Last Published: " + docu
 <a href="#Resources+and+Acknowledgements">Resources and Acknowledgements</a>
 </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>
@@ -392,7 +390,7 @@ to use the two together.
 </div>
 
 
-<a name="Step+1.+Prerequisites"></a>
+<a name="N10023"></a><a name="Step+1.+Prerequisites"></a>
 <h2 class="boxed">Step 1. Prerequisites</h2>
 <div class="section">
 <p>
@@ -477,7 +475,7 @@ source files provided in the download zi
 </div>
 
 
-<a name="Step+2.+Download+sample+code+and+configuration+files"></a>
+<a name="N100F9"></a><a name="Step+2.+Download+sample+code+and+configuration+files"></a>
 <h2 class="boxed">Step 2. Download sample code and configuration files</h2>
 <div class="section">
 <p>
@@ -492,7 +490,7 @@ to the C:/ directory on a windows machin
 </div>
 
 
-<a name="Step+3.+Examine%2FCreate+the+Database+schema"></a>
+<a name="N1010D"></a><a name="Step+3.+Examine%2FCreate+the+Database+schema"></a>
 <h2 class="boxed">Step 3. Examine/Create the Database schema</h2>
 <div class="section">
 <p>
@@ -580,7 +578,7 @@ Foreign Key (username) REFERENCES APP.US
 </div>
 
 
-<a name="Step+4.+Write+the+classes+used+to+persist+the+data"></a>
+<a name="N1011F"></a><a name="Step+4.+Write+the+classes+used+to+persist+the+data"></a>
 <h2 class="boxed">Step 4. Write the classes used to persist the data</h2>
 <div class="section">
 <p>
@@ -656,7 +654,7 @@ public class CityBean {
 </div>
 
 
-<a name="Step+5.++Create+the+JDO+meta-data+mapping+file"></a>
+<a name="N10137"></a><a name="Step+5.++Create+the+JDO+meta-data+mapping+file"></a>
 <h2 class="boxed">Step 5.  Create the JDO meta-data mapping file</h2>
 <div class="section">
 <p>
@@ -773,7 +771,7 @@ of the packages I'm using.
 </div>
 
 
-<a name="Step+6.+Create+a+log4j.properties+file+to+be+used+by+JPOX"></a>
+<a name="N10181"></a><a name="Step+6.+Create+a+log4j.properties+file+to+be+used+by+JPOX"></a>
 <h2 class="boxed">Step 6. Create a log4j.properties file to be used by JPOX</h2>
 <div class="section">
 <p>
@@ -804,7 +802,7 @@ log4j.category.JPOX.SchemaTool=INFO, A1
 </p>
 </div>
 
-<a name="Step+7.+Enhancing+the+JPOX+classes"></a>
+<a name="N10195"></a><a name="Step+7.+Enhancing+the+JPOX+classes"></a>
 <h2 class="boxed">Step 7. Enhancing the JPOX classes</h2>
 <div class="section">
 <p>
@@ -821,7 +819,7 @@ class and application class.
 </div>
 
 
-<a name="Step+8.+Code+the+class+which+makes+the+JPOX+JDO+queries"></a>
+<a name="N101A7"></a><a name="Step+8.+Code+the+class+which+makes+the+JPOX+JDO+queries"></a>
 <h2 class="boxed">Step 8. Code the class which makes the JPOX JDO queries</h2>
 <div class="section">
 <p>
@@ -1040,7 +1038,7 @@ is read at run time to initialize the <s
 </div>
 
 
-<a name="Step+9.+Code+the+application+class+which+calls+the+business+logic+class"></a>
+<a name="N101E1"></a><a name="Step+9.+Code+the+application+class+which+calls+the+business+logic+class"></a>
 <h2 class="boxed">Step 9. Code the application class which calls the business logic class</h2>
 <div class="section">
 <p>
@@ -1087,7 +1085,7 @@ public class DerbyJPox {
 </div>
 
 
-<a name="Step+10.+Compile+all+classes%2C+enhance+the+persistence+capable+ones+and+run+the+application"></a>
+<a name="N101F8"></a><a name="Step+10.+Compile+all+classes%2C+enhance+the+persistence+capable+ones+and+run+the+application"></a>
 <h2 class="boxed">Step 10. Compile all classes, enhance the persistence capable ones and run the application</h2>
 <div class="section">
 <p>
@@ -1283,7 +1281,7 @@ Shutting down JPOX persistence manager.
 </div>
 
 
-<a name="Resources+and+Acknowledgements"></a>
+<a name="N102CA"></a><a name="Resources+and+Acknowledgements"></a>
 <h2 class="boxed">Resources and Acknowledgements</h2>
 <div class="section">
 <p>
@@ -1324,7 +1322,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%A0integrate/JPOX_Derby.html">[hidden email]</a>

Modified: websites/production/db/content/derby/integrate/JPetStoreGeronimo.html
==============================================================================
--- websites/production/db/content/derby/integrate/JPetStoreGeronimo.html (original)
+++ websites/production/db/content/derby/integrate/JPetStoreGeronimo.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>Using  Apache Derby with iBATIS JPetStore 4 running on the Geronimo J2EE 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>Using  Apache Derby with iBATIS JPetStore 4 running on the Geronimo J2EE server</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -342,13 +341,12 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
-</div>
 
 <p>
 The first tasks performed when installing an application that uses a database are generally related to database setup.  These steps often involve compiling DBMS code (if the database system is not already installed) and creating and populating the physical database used by the application.  Such steps are required to create executables and files that can be used in the operating environment of the host computer.  By using a database like Derby that is implemented entirely in JAVA these build steps are not required.  Installation of the Derby DBMS can be as simple as copying a 2 Mb jarfile to a known location.  The fully initialized physical database can be bundled with the application thus reducing the database setup steps to a simple copy operation.  The following instructions demonstrate this by deploying the iBATIS JPetStore application along with a ready-to-go Derby database on a Geronimo server.   These instructions can be used on any machine with a functioning J2SE JVM using t
 he ASCII codeset.  Conversion or recreation of the supporting files (but not the database) will be required for deployment in an EBCDIC environment.
 </p>
 
-<a name="Introduction"></a>
+<a name="N10010"></a><a name="Introduction"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>
@@ -356,7 +354,7 @@ This article demonstrates the ease with
 </p>
 </div>
 
-<a name="Typographic+Conventions+Used"></a>
+<a name="N10026"></a><a name="Typographic+Conventions+Used"></a>
 <h2 class="boxed">Typographic Conventions Used</h2>
 <div class="section">
 <p> The following codes in curly braces will be used to represent installation dependant file locations as described below:</p>
@@ -373,7 +371,7 @@ This article demonstrates the ease with
 </ul>
 </div>
 
-<a name="Required+Software+%2F+Downloads"></a>
+<a name="N1004E"></a><a name="Required+Software+%2F+Downloads"></a>
 <h2 class="boxed">Required Software / Downloads</h2>
 <div class="section">
 <ul>
@@ -387,7 +385,7 @@ This article demonstrates the ease with
 </ul>
 </div>
 
-<a name="Setup+Steps%3A"></a>
+<a name="N10069"></a><a name="Setup+Steps%3A"></a>
 <h2 class="boxed">Setup Steps:</h2>
 <div class="section">
 <ul>
@@ -455,7 +453,7 @@ This article demonstrates the ease with
 </div>
 
 
-<a name="Optional+Database+Setup+Instructions"></a>
+<a name="N100BE"></a><a name="Optional+Database+Setup+Instructions"></a>
 <h2 class="boxed">Optional Database Setup Instructions</h2>
 <div class="section">
 <p>The following steps show how to build the Derby database from scratch.  Two files (*.sql) are supplied in the JPetStoreAPP4Geronimo.zip. file to perform the initial build and data inserts.  You will need to download the complete set of Derby jarfiles and use the IJ tool found in derbytools.jar to perform the build.  Place derbytools.jar in the {Derby_Jars} directory.   The IJ tool is used to process the SQL commands in the provided scripts.  For simplicity the examples below place all necessary files in the same directory and specify as much a possible (including the command to create the database) on the command line.</p>
@@ -482,7 +480,7 @@ This article demonstrates the ease with
 </div>
  <!-- Integration Notes Section -->
 
-<a name="Integration+Notes"></a>
+<a name="N100E4"></a><a name="Integration+Notes"></a>
 <h2 class="boxed">Integration Notes</h2>
 <div class="section">
 <p>
@@ -524,7 +522,7 @@ J2EE Servers use multiple classloaders (
 
  <!-- RELATED LINKS SECTION  -->
 
-<a name="Related+Links"></a>
+<a name="N10110"></a><a name="Related+Links"></a>
 <h2 class="boxed">Related Links</h2>
 <div class="section">
 <p>Required Downloads to perform this deployment: </p>
@@ -598,7 +596,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%A0integrate/JPetStoreGeronimo.html">[hidden email]</a>

Modified: websites/production/db/content/derby/integrate/JPetStoreWebSphere.html
==============================================================================
--- websites/production/db/content/derby/integrate/JPetStoreWebSphere.html (original)
+++ websites/production/db/content/derby/integrate/JPetStoreWebSphere.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>Using Apache Derby with iBATIS JPetStore 4 on the WebSphere 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>Using Apache Derby with iBATIS JPetStore 4 on the WebSphere Server</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -339,9 +338,8 @@ document.write("Last Published: " + docu
 </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>
@@ -358,7 +356,7 @@ The following outlines the steps needed
 </p>
 </div>
 
-<a name="Required+Software"></a>
+<a name="N10020"></a><a name="Required+Software"></a>
 <h2 class="boxed">Required Software</h2>
 <div class="section">
 <ul>
@@ -369,13 +367,13 @@ The following outlines the steps needed
 <li> Downloaded the <a href="../binaries/JPetStoreAPP4WebSphere.zip">JPetStoreAPP4WebSphere.zip</a> file or plan to download Derby separately and manually edit the application configuration as described in the CookBook Details section below.  The downloads URLs are also provided in  the Links section below.
   </li>
 
-<li> WebShere Application Server version 6.0.1.  You can obtain an <a class="external" href="http://www-128.ibm.com/developerworks/downloads/ws/wasexp">evaluation</a> copy of WebSphere and the 6.0.1  <a class="external" href="http://www-1.ibm.com/support/docview.wss?rs=0&amp;context=SW600&amp;dc=D420&amp;q1=WebSphere&amp;uid=swg24009071&amp;loc=en_US&amp;cs=utf-8&amp;cc=us&amp;lang=en">upgrade</a> from IBM.  The downloads URLs are also provided in  the Links section below.
+<li> WebShere Application Server version 6.0.1.  You can obtain an <a class="external" href="http://www-128.ibm.com/developerworks/downloads/ws/wasexp">evaluation</a> copy of WebSphere and the 6.0.1  <a class="external" href="http://www-1.ibm.com/support/docview.wss?rs=0&context=SW600&dc=D420&q1=WebSphere&uid=swg24009071&loc=en_US&cs=utf-8&cc=us&lang=en">upgrade</a> from IBM.  The downloads URLs are also provided in  the Links section below.
   </li>
 
 </ul>
 </div>
 
-<a name="Setup+Overview"></a>
+<a name="N10043"></a><a name="Setup+Overview"></a>
 <h2 class="boxed">Setup Overview</h2>
 <div class="section">
 <p> Details on the following steps can be found in the CookBook Details section below.
@@ -434,7 +432,7 @@ The following outlines the steps needed
 </ul>
 </div>
 
-<a name="CookBook+Details"></a>
+<a name="N1008A"></a><a name="CookBook+Details"></a>
 <h2 class="boxed">CookBook Details</h2>
 <div class="section">
 <p>
@@ -657,7 +655,7 @@ The following outlines the steps needed
    </pre>
 </div>
 
-<a name="Integration+Notes"></a>
+<a name="N1014F"></a><a name="Integration+Notes"></a>
 <h2 class="boxed">Integration Notes</h2>
 <div class="section">
 <p>
@@ -669,7 +667,7 @@ I recommend the following paper to peopl
    The zipfile provided contains a fully initialized database to demonstrate that a Derby database built and populated on one platform (in this case Windows) can be transferred to different platforms and work fine.  Try copying the database and derby jarfiles to different platforms and you will see that the system works without modification.  The text files included in the zipfile will not do well in an EBCDIC architecture but the Derby engine and supplied database will work fine. If you want to build the database from scratch you can use the SQL files supplied in the archive.  See the 'CookBook Details' section for how to use the IJ tools to build and populate the database.</p>
 </div>
 
-<a name="Related+Links"></a>
+<a name="N10163"></a><a name="Related+Links"></a>
 <h2 class="boxed">Related Links</h2>
 <div class="section">
 <ul>
@@ -697,7 +695,7 @@ I recommend the following paper to peopl
 </li>
 
 <li>
- WebSphere 6.0.1 <a class="external" href="http://www-1.ibm.com/support/docview.wss?rs=0&amp;context=SW600&amp;dc=D420&amp;q1=WebSphere&amp;uid=swg24009071&amp;loc=en_US&amp;cs=utf-8&amp;cc=us&amp;lang=en">upgrade</a>
+ WebSphere 6.0.1 <a class="external" href="http://www-1.ibm.com/support/docview.wss?rs=0&context=SW600&dc=D420&q1=WebSphere&uid=swg24009071&loc=en_US&cs=utf-8&cc=us&lang=en">upgrade</a>
 
 </li>
 
@@ -737,7 +735,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%A0integrate/JPetStoreWebSphere.html">[hidden email]</a>

Modified: websites/production/db/content/derby/integrate/SQuirreL_Derby.html
==============================================================================
--- websites/production/db/content/derby/integrate/SQuirreL_Derby.html (original)
+++ websites/production/db/content/derby/integrate/SQuirreL_Derby.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>Using SQuirreL SQL Client with 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>Using SQuirreL SQL Client with Derby</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -347,11 +346,10 @@ document.write("Last Published: " + docu
 <a href="#SQuirreL+and+Derby+Resources">SQuirreL and Derby Resources</a>
 </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>
@@ -396,7 +394,7 @@ Dropping tables
 </div>
 
 
-<a name="Prerequisites"></a>
+<a name="N10032"></a><a name="Prerequisites"></a>
 <h2 class="boxed">Prerequisites</h2>
 <div class="section">
 <p>
@@ -465,7 +463,7 @@ launch (or double-click on Windows) the
 </div>
 
 
-<a name="Configuring+SQuirreL+for+the+Derby+Embedded+JDBC+Driver"></a>
+<a name="N100B6"></a><a name="Configuring+SQuirreL+for+the+Derby+Embedded+JDBC+Driver"></a>
 <h2 class="boxed">Configuring SQuirreL for the Derby Embedded JDBC Driver </h2>
 <div class="section">
 <p>
@@ -524,7 +522,7 @@ listing in the Drivers window now.
 </div>
 
 
-<a name="Creating+an+Alias+to+a+Derby+database+using+the+Embedded+Driver"></a>
+<a name="N10115"></a><a name="Creating+an+Alias+to+a+Derby+database+using+the+Embedded+Driver"></a>
 <h2 class="boxed">Creating an Alias to a Derby database using the Embedded Driver</h2>
 <div class="section">
 <p>
@@ -559,7 +557,7 @@ the Derby Client driver first, before br
 </div>
 
 
-<a name="Configuring+the+Derby+Client+Driver+in+the+Drivers+window"></a>
+<a name="N10151"></a><a name="Configuring+the+Derby+Client+Driver+in+the+Drivers+window"></a>
 <h2 class="boxed">Configuring the Derby Client Driver in the Drivers window</h2>
 <div class="section">
 <p>
@@ -629,7 +627,7 @@ to connect to our database, <span class=
 </div>
 
 
-<a name="Creating+an+Alias+for+an+existing+Derby+database+using+the+Client+Driver"></a>
+<a name="N101C7"></a><a name="Creating+an+Alias+for+an+existing+Derby+database+using+the+Client+Driver"></a>
 <h2 class="boxed">Creating an Alias for an existing Derby database using the Client Driver</h2>
 <div class="section">
 <p>
@@ -668,7 +666,7 @@ JVMs to connect to the same database.
 </div>
 
 
-<a name="Creating+a+session+to+issue+SQL+and+browse+the+database"></a>
+<a name="N1020E"></a><a name="Creating+a+session+to+issue+SQL+and+browse+the+database"></a>
 <h2 class="boxed">Creating a session to issue SQL and browse the database</h2>
 <div class="section">
 <p>
@@ -896,7 +894,7 @@ left icon on the menu bar and set the pr
 </div>
 
 
-<a name="Modifying+data+objects+via+the+Objects+tab"></a>
+<a name="N102E5"></a><a name="Modifying+data+objects+via+the+Objects+tab"></a>
 <h2 class="boxed">Modifying data objects via the Objects tab</h2>
 <div class="section">
 <p>
@@ -1000,7 +998,7 @@ tab to see all of the data you just load
 </div>
 
 
-<a name="SQuirreL+and+Derby+Resources"></a>
+<a name="N10393"></a><a name="SQuirreL+and+Derby+Resources"></a>
 <h2 class="boxed">SQuirreL and Derby Resources</h2>
 <div class="section">
 <p>
@@ -1050,7 +1048,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%A0integrate/SQuirreL_Derby.html">[hidden email]</a>

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 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>Using DdlUtils to Migrate Databases to 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>Using DdlUtils to Migrate Databases to Derby</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -360,7 +359,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-N10229">Execute the Ant task</a>
+<a href="#Execute+the+Ant+task-N10228">Execute the Ant task</a>
 </li>
 </ul>
 </li>
@@ -374,11 +373,10 @@ document.write("Last Published: " + docu
 <a href="#Questions%3F">Questions?</a>
 </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>
@@ -414,7 +412,7 @@ you must export the schema and data beca
 an alpha database.
 DdlUtils makes this migration easier.
 </p>
-<a name="Target+Audience"></a>
+<a name="N1002F"></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
@@ -428,7 +426,7 @@ DdlUtils makes this migration easier.
       variables, and troubleshooting
       any problems that might occur.
    </p>
-<a name="Prerequisites"></a>
+<a name="N10039"></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
@@ -457,7 +455,7 @@ DdlUtils makes this migration easier.
 </div>
 
 
-<a name="Step+1%3A+Setup+a+working+directory"></a>
+<a name="N1006F"></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>
@@ -475,7 +473,7 @@ mkdir lib</p>
 </div>
 
 
-<a name="Step+2%3A+Build+and+Install+DdlUtils"></a>
+<a name="N10086"></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>
@@ -529,7 +527,7 @@ cd ..  </p>
 
 
 
-<a name="Step+3%3A+Create+a+sample+database%3A+Books1"></a>
+<a name="N100C8"></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>
@@ -595,7 +593,7 @@ Finally, exit the database:
 </div>
 
 
-<a name="Step+4%3A+Books1+--+Export+Schema+and+Data"></a>
+<a name="N10102"></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>
@@ -605,7 +603,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="Create+an+Ant+build.xml+file+with+an+export+target"></a>
+<a name="N10115"></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.
@@ -685,7 +683,7 @@ Here are a few notes about the <span cla
 </li>
 
 </ul>
-<a name="Execute+the+Ant+task"></a>
+<a name="N10173"></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>:
@@ -707,7 +705,7 @@ succeeded and there should be two new fi
 </div>
 
 
-<a name="Step+5%3A+Books2+--+Create+Database+and+Import+Schema+and+Data"></a>
+<a name="N10198"></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>
@@ -717,7 +715,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="Copy+and+%28maybe%29+modify+the+db-schema.xml+file"></a>
+<a name="N101AB"></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
@@ -753,7 +751,7 @@ for example, to change the mapping of a
 </li>
 
 </ul>
-<a name="Add+an+import+target+to+the+build.xml"></a>
+<a name="N101E9"></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
@@ -804,7 +802,7 @@ Here are a few notes about the source:
    </li>
 
 </ul>
-<a name="Execute+the+Ant+task-N10229"></a>
+<a name="N10228"></a><a name="Execute+the+Ant+task-N10228"></a>
 <h3 class="boxed">Execute the Ant task</h3>
 <p>
 Execute the task with <span class="codefrag">ant</span>:
@@ -833,7 +831,7 @@ Total time: 4 seconds </p>
 </div>
 
 
-<a name="Step+6%3A+Verify+Migration"></a>
+<a name="N10241"></a><a name="Step+6%3A+Verify+Migration"></a>
 <h2 class="boxed">Step 6: Verify Migration</h2>
 <div class="section">
 <p>
@@ -854,7 +852,7 @@ ij&gt; select * from book;
 </div>
 
 
-<a name="Caveats"></a>
+<a name="N1025D"></a><a name="Caveats"></a>
 <h2 class="boxed">Caveats</h2>
 <div class="section">
 <p>
@@ -867,7 +865,7 @@ DdlUtils database support on the
 </div>
 
 
-<a name="Questions%3F"></a>
+<a name="N1026B"></a><a name="Questions%3F"></a>
 <h2 class="boxed">Questions?</h2>
 <div class="section">
 <p>Please post questions about this example to
@@ -900,7 +898,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%A0integrate/db_ddlutils.html">[hidden email]</a>

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 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>Running the Torque Tutorial on 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>Running the Torque Tutorial on Derby</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -368,11 +367,10 @@ document.write("Last Published: " + docu
 <a href="#Got+Questions%3F">Got Questions?</a>
 </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>
@@ -404,7 +402,7 @@ Details are in
 </div>
 
 
-<a name="Step+1"></a>
+<a name="N10029"></a><a name="Step+1"></a>
 <h2 class="boxed">Step 1</h2>
 <div class="section"></div>
 
@@ -414,10 +412,10 @@ No changes to this step are required.
 </p>
 
 
-<a name="Step+2"></a>
+<a name="N10033"></a><a name="Step+2"></a>
 <h2 class="boxed">Step 2</h2>
 <div class="section">
-<a name="Torque+Generator+Properties"></a>
+<a name="N10039"></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>
@@ -459,10 +457,10 @@ No changes to this step are required.
 
 
 
-<a name="Step+3"></a>
+<a name="N1004B"></a><a name="Step+3"></a>
 <h2 class="boxed">Step 3</h2>
 <div class="section">
-<a name="Adding+the+driver+to+the+maven+repository"></a>
+<a name="N10051"></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:
@@ -476,7 +474,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="Specifying+the+driver+dependency"></a>
+<a name="N10062"></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:
@@ -500,7 +498,7 @@ Here is the complete <span class="codefr
      &lt;/dependencies&gt;
    &lt;/project&gt;
 </pre>
-<a name="Creating+the+database"></a>
+<a name="N10073"></a><a name="Creating+the+database"></a>
 <h3 class="boxed">Creating the database</h3>
 <p>
 The Torque Tutorial instructions mention that
@@ -536,7 +534,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="Creating+the+tables"></a>
+<a name="N1009B"></a><a name="Creating+the+tables"></a>
 <h3 class="boxed">Creating the tables</h3>
 <p>
 No changes to this step are required.
@@ -544,10 +542,10 @@ No changes to this step are required.
 </div>
 
 
-<a name="Step+4"></a>
+<a name="N100A6"></a><a name="Step+4"></a>
 <h2 class="boxed">Step 4</h2>
 <div class="section">
-<a name="Torque+Run-Time+Properties"></a>
+<a name="N100AC"></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:
@@ -566,7 +564,7 @@ Here is the complete <span class="codefr
 </div>
 
 
-<a name="Step+5"></a>
+<a name="N100BE"></a><a name="Step+5"></a>
 <h2 class="boxed">Step 5</h2>
 <div class="section">
 <p>
@@ -575,7 +573,7 @@ No changes to this step are required.
 </div>
 
 
-<a name="Step+6"></a>
+<a name="N100C8"></a><a name="Step+6"></a>
 <h2 class="boxed">Step 6</h2>
 <div class="section">
 <p>
@@ -602,7 +600,7 @@ Here is the command I ran on my Linux ma
 </div>
 
 
-<a name="Got+Questions%3F"></a>
+<a name="N100E8"></a><a name="Got+Questions%3F"></a>
 <h2 class="boxed">Got Questions?</h2>
 <div class="section">
 <p>
@@ -635,7 +633,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%A0integrate/db_torque.html">[hidden email]</a>

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 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>Derby Plug-in for Eclipse</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>Derby Plug-in for Eclipse</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -333,10 +332,9 @@ document.write("Last Published: " + docu
 </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>
@@ -383,7 +381,7 @@ Contained the Eclipse-Help documentation
 </div>
 
 
-<a name="Build"></a>
+<a name="N1004E"></a><a name="Build"></a>
 <h2 class="boxed">Build</h2>
 <div class="section">
 <p>
@@ -395,7 +393,7 @@ To build the ui and doc plug-ins, follow
 </div>
 
 
-<a name="Alternative"></a>
+<a name="N10063"></a><a name="Alternative"></a>
 <h2 class="boxed">Alternative</h2>
 <div class="section">
 <p>
@@ -404,7 +402,7 @@ To achieve similar functionality as the
 </div>
 
 
-<a name="Resources"></a>
+<a name="N1006D"></a><a name="Resources"></a>
 <h2 class="boxed">Resources</h2>
 <div class="section">
 <p>
@@ -438,7 +436,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%A0integrate/derby_plugin_info.html">[hidden email]</a>

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 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 and Other Products</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 and Other Products</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -332,11 +331,10 @@ document.write("Last Published: " + docu
 <a href="#eclipse">Eclipse Plug-ins</a>
 </li>
 </ul>
-</div>
 </div>
 
 
-<a name="uses"></a>
+<a name="N1000D"></a><a name="uses"></a>
 <h2 class="boxed">What works with Derby?</h2>
 <div class="section">
 <p>
@@ -349,7 +347,7 @@ so please feel free to add more entries.
 </div>
 
 
-<a name="products"></a>
+<a name="N1001B"></a><a name="products"></a>
 <h2 class="boxed">Product Writeups</h2>
 <div class="section">
 <p>
@@ -479,7 +477,7 @@ contributed to the Derby web site and ar
 </div>
 
 
-<a name="eclipse"></a>
+<a name="N10104"></a><a name="eclipse"></a>
 <h2 class="boxed">Eclipse Plug-ins</h2>
 <div class="section">
 <p>
@@ -529,7 +527,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/license.html
==============================================================================
--- websites/production/db/content/derby/license.html (original)
+++ websites/production/db/content/derby/license.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: License</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -172,7 +172,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: License</h1>
-<div id="front-matter"></div>
 
 <p>
 Derby is available under the
@@ -237,7 +236,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%A0license.html">[hidden email]</a>

Modified: websites/production/db/content/derby/linkmap.html
==============================================================================
--- websites/production/db/content/derby/linkmap.html (original)
+++ websites/production/db/content/derby/linkmap.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>Site Linkmap Table of Contents</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -484,7 +484,6 @@ 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>
@@ -1325,7 +1324,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%A0linkmap.html">[hidden email]</a>

Modified: websites/production/db/content/derby/logo.html
==============================================================================
--- websites/production/db/content/derby/logo.html (original)
+++ websites/production/db/content/derby/logo.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: Logo</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -175,7 +175,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: Logo</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -201,10 +200,9 @@ document.write("Last Published: " + docu
 </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>
@@ -228,7 +226,7 @@ to prc &lt;AT&gt; apache.org.
 </div>
 
 
-<a name="logo"></a>
+<a name="N10029"></a><a name="logo"></a>
 <h2 class="boxed"> Logo </h2>
 <div class="section">
 <p>
@@ -259,7 +257,7 @@ to prc &lt;AT&gt; apache.org.
 </div>
 
 
-<a name="logo_with_text_white"></a>
+<a name="N10069"></a><a name="logo_with_text_white"></a>
 <h2 class="boxed"> Logo with Text: White Background </h2>
 <div class="section">
 <p>
@@ -295,7 +293,7 @@ to prc &lt;AT&gt; apache.org.
 </div>
 
 
-<a name="logo_with_text_black"></a>
+<a name="N100AB"></a><a name="logo_with_text_black"></a>
 <h2 class="boxed"> Logo with Text: Black Background </h2>
 <div class="section">
 <p>
@@ -314,7 +312,7 @@ to prc &lt;AT&gt; apache.org.
 </div>
 
 
-<a name="logo_with_nimbus"></a>
+<a name="N100CA"></a><a name="logo_with_nimbus"></a>
 <h2 class="boxed"> Logo with "Powered By Apache" Nimbus </h2>
 <div class="section">
 <p>
@@ -333,7 +331,7 @@ to prc &lt;AT&gt; apache.org.
 </div>
 
 
-<a name="hat_with_nimbus"></a>
+<a name="N100EB"></a><a name="hat_with_nimbus"></a>
 <h2 class="boxed"> Hat with "Powered By Apache" Nimbus </h2>
 <div class="section">
 <p>
@@ -352,7 +350,7 @@ to prc &lt;AT&gt; apache.org.
 </div>
 
 
-<a name="tiny_buttons"></a>
+<a name="N1010C"></a><a name="tiny_buttons"></a>
 <h2 class="boxed"> Tiny Buttons </h2>
 <div class="section">
 <p>
@@ -393,7 +391,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%A0logo.html">[hidden email]</a>

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 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: DITA-sourced documentation</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -172,7 +172,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: DITA-sourced documentation</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -200,7 +199,6 @@ document.write("Last Published: " + docu
 <a href="#Committing+documentation+patches">Committing documentation patches</a>
 </li>
 </ul>
-</div>
 </div>
 
 
@@ -214,7 +212,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="Setting+up+your+environment"></a>
+<a name="N1001A"></a><a name="Setting+up+your+environment"></a>
 <h2 class="boxed">Setting up your environment</h2>
 <div class="section">
 <p>
@@ -299,7 +297,7 @@ set the
 </div>
 
 
-<a name="Locating+the+correct+DITA+file"></a>
+<a name="N100B6"></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>
@@ -333,7 +331,7 @@ Guidelines for writing Derby information
 </div>
 
 
-<a name="Editing+DITA+files"></a>
+<a name="N100F1"></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>
@@ -364,7 +362,7 @@ Guidelines for writing Derby information
 </div>
 
 
-<a name="Creating+output"></a>
+<a name="N10129"></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>
@@ -464,7 +462,7 @@ set up and configured correctly, the bui
 </table>
 </div>
 
-<a name="DITA+file+names"></a>
+<a name="N101E2"></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>
@@ -472,7 +470,7 @@ set up and configured correctly, the bui
 </div>
 
 
-<a name="Modifying+the+output+format"></a>
+<a name="N101F1"></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>
@@ -488,7 +486,7 @@ Please post feedback to the
 </p>
 
 
-<a name="Submitting+documentation+patches"></a>
+<a name="N1020A"></a><a name="Submitting+documentation+patches"></a>
 <h2 class="boxed">Submitting documentation patches</h2>
 <div class="section">
 <p>
@@ -728,7 +726,7 @@ easier.</li>
 </div>
 
 
-<a name="Committing+documentation+patches"></a>
+<a name="N102FD"></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>
@@ -892,7 +890,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%A0manuals/dita.html">[hidden email]</a>

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 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: Release Checklist for Docs</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -172,7 +172,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: Release Checklist for Docs</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -188,7 +187,6 @@ document.write("Last Published: " + docu
 <a href="#Update+the+ditamap+files">Update the ditamap files</a>
 </li>
 </ul>
-</div>
 </div>
 
 <p>
@@ -205,7 +203,7 @@ that need to be done for Derby releases<
 for more information.
 </p>
 
-<a name="Update+the+conrefs+files"></a>
+<a name="N10017"></a><a name="Update+the+conrefs+files"></a>
 <h2 class="boxed">Update the conrefs files</h2>
 <div class="section">
 <p>
@@ -243,7 +241,7 @@ new manual in the "pub" section in each
 </p>
 </div>
 
-<a name="Update+examples+in+the+manuals"></a>
+<a name="N1003E"></a><a name="Update+examples+in+the+manuals"></a>
 <h2 class="boxed">Update examples in the manuals</h2>
 <div class="section">
 <p>
@@ -304,7 +302,7 @@ The following files need to be updated:
 </ul>
 </div>
 
-<a name="Check+the+licensing+and+copyright+information"></a>
+<a name="N1008C"></a><a name="Check+the+licensing+and+copyright+information"></a>
 <h2 class="boxed">Check the licensing and copyright information</h2>
 <div class="section">
 <p>
@@ -340,7 +338,7 @@ JIRA issue <a class="external" href="htt
 </p>
 </div>
 
-<a name="Update+the+ditamap+files"></a>
+<a name="N100B2"></a><a name="Update+the+ditamap+files"></a>
 <h2 class="boxed">Update the ditamap files</h2>
 <div class="section">
 <p>
@@ -391,7 +389,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%A0manuals/docscheck.html">[hidden email]</a>

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 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: Writing FAQs</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -172,7 +172,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: Writing FAQs</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -196,9 +195,8 @@ or expression?</a>
 </li>
 </ul>
 </div>
-</div>
 
-<a name="Cross+references%3A+To+another+DITA+topic+in+the+same+Derby+manual"></a>
+<a name="N1000D"></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,
@@ -217,7 +215,7 @@ topic,  followed by the pound symbol and
 </p>
 </div>
 
-<a name="Cross+references%3A+To+a+DITA+topic+in+a+different+Derby+manual"></a>
+<a name="N10026"></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
@@ -239,7 +237,7 @@ for instructions on how to print more in
 </p>
 </div>
 
-<a name="Cross+references%3A+To+a+Web+site"></a>
+<a name="N10042"></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
@@ -257,7 +255,7 @@ for instructions on how to print more in
 </p>
 </div>
 
-<a name="Code+Examples"></a>
+<a name="N1005B"></a><a name="Code+Examples"></a>
 <h2 class="boxed">Code Examples</h2>
 <div class="section">
 <p>
@@ -295,7 +293,7 @@ CREATE TABLE x_table
 </pre>
 </div>
 
-<a name="Semi-colon+use+at+the+end+of+statements+and+commands"></a>
+<a name="N10085"></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>
@@ -321,7 +319,7 @@ SQL statement, the semi-colon should not
 </p>
 </div>
 
-<a name="SQL+terminology%3A+When+do+I+use+the+terms+statement%2C+clause%2C+parameter%2C+%0Aor+expression%3F"></a>
+<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>
 <h2 class="boxed">SQL terminology: When do I use the terms statement, clause, parameter,
 or expression?</h2>
 <div class="section">
@@ -394,7 +392,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%A0manuals/docsfaq.html">[hidden email]</a>

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 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: Writing guidelines</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -172,7 +172,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: Writing guidelines</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -200,7 +199,6 @@ 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>
@@ -210,7 +208,7 @@ for working with DITA topics and tagging
 </p>
 
 
-<a name="New+topics%3A+Choosing+the+correct+topic+type"></a>
+<a name="N10014"></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>
@@ -244,7 +242,7 @@ the task.
 </div>
 
 
-<a name="New+topics%3A+Using+a+template+to+create+a+new+topic"></a>
+<a name="N10030"></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
@@ -254,7 +252,7 @@ included with the Derby source files. Th
 </div>
 
 
-<a name="New+topics%3A+Selecting+the+best+filename"></a>
+<a name="N1003D"></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.
@@ -405,7 +403,7 @@ The following table shows some examples
 </div>
 
 
-<a name="Understanding+DITA+tags"></a>
+<a name="N1012B"></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>
@@ -425,7 +423,7 @@ ask on the <a href="../derby_mail.html">
 </div>
 
 
-<a name="Tagging+examples+-+structural+tags"></a>
+<a name="N10148"></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
@@ -595,7 +593,7 @@ features within the Derby topics.
 </div>
 
 
-<a name="Tagging+examples+-+textual+tags"></a>
+<a name="N1025D"></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
@@ -686,7 +684,7 @@ features within the Derby topics.
 
 
 
-<a name="Indexing+guidelines"></a>
+<a name="N102CE"></a><a name="Indexing+guidelines"></a>
 <h2 class="boxed">Indexing guidelines</h2>
 <div class="section">
 <p>
@@ -855,7 +853,7 @@ of the secondary entries appear under on
 </div>
 
 
-<a name="Customizing+tables+in+the+Derby+documentation"></a>
+<a name="N10374"></a><a name="Customizing+tables+in+the+Derby+documentation"></a>
 <h2 class="boxed">Customizing tables in the Derby documentation</h2>
 <div class="section">
 <p>
@@ -933,7 +931,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%A0manuals/guidelines.html">[hidden email]</a>

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 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: Documentation</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -175,7 +175,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: Documentation</h1>
-<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -185,6 +184,9 @@ document.write("Last Published: " + docu
 <a href="#latest">Latest Alpha Manuals</a>
 </li>
 <li>
+<a href="#docs_10.14">10.14 Manuals</a>
+</li>
+<li>
 <a href="#docs_10.13">10.13 Manuals</a>
 </li>
 <li>
@@ -233,11 +235,10 @@ document.write("Last Published: " + docu
 <a href="#doc_issues">Reporting Documentation Issues</a>
 </li>
 </ul>
-</div>
 </div>
 
 
-<a name="Descriptions"></a>
+<a name="N1000D"></a><a name="Descriptions"></a>
 <h2 class="boxed">Descriptions</h2>
 <div class="section">
 <p>
@@ -343,7 +344,7 @@ A description of each manual is below:
 </div>
 
 
-<a name="latest"></a>
+<a name="N1006D"></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
@@ -432,7 +433,94 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.13"></a>
+<a name="N1013A"></a><a name="docs_10.14"></a>
+<h2 class="boxed">10.14 Manuals</h2>
+<div class="section">
+<p>The 10.14 manuals are listed in this section.
+    </p>
+<table class="ForrestTable" cellspacing="1" cellpadding="4">
+    
+<tr>
+        
+<th colspan="2" rowspan="1">English</th>
+    
+</tr>
+    
+<tr>
+        
+<td colspan="1" rowspan="1">API Reference</td>
+        <td colspan="1" rowspan="1"><a target="_blank" class="fork" href="../docs/10.14/publishedapi/index.html">HTML</a></td>
+    
+</tr>
+    
+<tr>
+        
+<td colspan="1" rowspan="1"><em>Getting Started with Derby</em></td>
+        <td colspan="1" rowspan="1"> [<a target="_blank" class="fork" href="../docs/10.14/getstart/getstartderby.pdf">PDF</a>]
+             [<a target="_blank" class="fork" href="../docs/10.14/getstart/index.html">HTML Pages</a>]
+        </td>
+    
+</tr>
+    
+<tr>
+        
+<td colspan="1" rowspan="1"><em>Derby Reference Manual</em></td>
+        <td colspan="1" rowspan="1">[<a target="_blank" class="fork" href="../docs/10.14/ref/refderby.pdf">PDF</a>]
+            [<a target="_blank" class="fork" href="../docs/10.14/ref/index.html">HTML Pages</a>]
+        </td>
+    
+</tr>
+    
+<tr>
+        
+<td colspan="1" rowspan="1"><em>Derby Developer's Guide</em></td>
+        <td colspan="1" rowspan="1">[<a target="_blank" class="fork" href="../docs/10.14/devguide/derbydev.pdf">PDF</a>]
+            [<a target="_blank" class="fork" href="../docs/10.14/devguide/index.html">HTML Pages</a>]
+        </td>
+    
+</tr>
+    
+<tr>
+        
+<td colspan="1" rowspan="1"><em>Derby Security Guide</em></td>
+        <td colspan="1" rowspan="1">[<a target="_blank" class="fork" href="../docs/10.14/security/secderby.pdf">PDF</a>]
+            [<a target="_blank" class="fork" href="../docs/10.14/security/index.html">HTML Pages</a>]
+        </td>
+    
+</tr>
+    
+<tr>
+        
+<td colspan="1" rowspan="1"><em>Tuning Derby</em></td>
+        <td colspan="1" rowspan="1">[<a target="_blank" class="fork" href="../docs/10.14/tuning/tuningderby.pdf">PDF</a>]
+            [<a target="_blank" class="fork" href="../docs/10.14/tuning/index.html">HTML Pages</a>]
+        </td>
+    
+</tr>
+    
+<tr>
+        
+<td colspan="1" rowspan="1"><em>Derby Server and Administration Guide</em></td>
+        <td colspan="1" rowspan="1">[<a target="_blank" class="fork" href="../docs/10.14/adminguide/derbyadmin.pdf">PDF</a>]
+            [<a target="_blank" class="fork" href="../docs/10.14/adminguide/index.html">HTML Pages</a>]
+        </td>
+    
+</tr>
+    
+<tr>
+        
+<td colspan="1" rowspan="1"><em>Derby Tools and Utilities Guide</em></td>
+        <td colspan="1" rowspan="1">[<a target="_blank" class="fork" href="../docs/10.14/tools/derbytools.pdf">PDF</a>]
+            [<a target="_blank" class="fork" href="../docs/10.14/tools/index.html">HTML Pages</a>]
+        </td>
+    
+</tr>
+    
+</table>
+</div>
+
+
+<a name="N10207"></a><a name="docs_10.13"></a>
 <h2 class="boxed">10.13 Manuals</h2>
 <div class="section">
 <p>The 10.13 manuals are listed in this section.
@@ -519,7 +607,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.12"></a>
+<a name="N102D4"></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.
@@ -606,7 +694,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.11"></a>
+<a name="N103A1"></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.
@@ -693,7 +781,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.10"></a>
+<a name="N1046E"></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.
@@ -771,7 +859,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.9"></a>
+<a name="N10523"></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.
@@ -849,7 +937,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.8"></a>
+<a name="N105D8"></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.
@@ -927,7 +1015,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.7"></a>
+<a name="N1068D"></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.
@@ -1005,7 +1093,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.6"></a>
+<a name="N10742"></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.
@@ -1083,7 +1171,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.5"></a>
+<a name="N107F7"></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.
@@ -1161,7 +1249,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.4"></a>
+<a name="N108AC"></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.
@@ -1265,7 +1353,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.3"></a>
+<a name="N1098F"></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.
@@ -1343,7 +1431,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.2"></a>
+<a name="N10A44"></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.
@@ -1464,7 +1552,7 @@ Derby alpha codeline, are listed in this
 </div>
 
 
-<a name="docs_10.1"></a>
+<a name="N10B61"></a><a name="docs_10.1"></a>
 <h2 class="boxed">10.1 Manuals</h2>
 <div class="section">
 <p>
@@ -1549,7 +1637,7 @@ discussions about format.
 </div>
 
 
-<a name="docs_10.0"></a>
+<a name="N10C1E"></a><a name="docs_10.0"></a>
 <h2 class="boxed">10.0 Manuals</h2>
 <div class="section">
 <p>
@@ -1641,7 +1729,7 @@ to see if the problem still exists in th
 </div>
 
 
-<a name="javadoc"></a>
+<a name="N10CCA"></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>
@@ -1685,7 +1773,7 @@ to see if the problem still exists in th
 </div>
 
 
-<a name="doc_issues"></a>
+<a name="N10D1F"></a><a name="doc_issues"></a>
 <h2 class="boxed">Reporting Documentation Issues</h2>
 <div class="section">
 <p>
@@ -1712,7 +1800,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/manuals/messages.html
==============================================================================
--- websites/production/db/content/derby/manuals/messages.html (original)
+++ websites/production/db/content/derby/manuals/messages.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: Documenting messages</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -171,8 +171,7 @@ 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>
-<div id="front-matter"></div>
+<h1>Apache Derby: Documenting messages</h1>
 
 
 <p>
@@ -261,7 +260,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%A0manuals/messages.html">[hidden email]</a>