You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by jt...@apache.org on 2006/03/17 22:12:03 UTC

svn commit: r386714 [4/9] - /db/derby/docs/trunk/src/devguide/

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,31 +17,35 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdeploy21645">
+<concept id="cdevdeploy21645" xml:lang="en-us">
 <title>Enable database class loading with a property</title>
-<prolog>
-</prolog>
+<shortdesc>Once you have added one or more jar files to a database, you must
+set the database jar "classpath" by including the jar file or files in the <i>derby.database.classpath</i> property
+to enable <ph conref="devconrefs.dita#prod/productshortname"></ph> to load
+classes from the jar files.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>Once you have added one or more jar files to a database, you must set the
-database jar "classpath" by including the jar file or files in the <i>derby.database.classpath</i> property to enable <ph conref="devconrefs.dita#prod/productshortname"></ph> to
-load classes from the jar files. This property, which behaves like a class
-path, specifies the jar files to be searched for classes and resources and
-the order in which they are searched. If <ph conref="devconrefs.dita#prod/productshortname"></ph> does not find a needed
-class stored in the database, it can retrieve the class from the user's
-classpath. (<ph conref="devconrefs.dita#prod/productshortname"></ph> first looks in the user's classpath before looking
-in the database.)</p>
+<p>This property, which behaves like a class path, specifies the jar files
+to be searched for classes and resources and the order in which they are searched.
+If <ph conref="devconrefs.dita#prod/productshortname"></ph> does not find
+a needed class stored in the database, it can retrieve the class from the
+user's classpath. (<ph conref="devconrefs.dita#prod/productshortname"></ph> first
+looks in the user's classpath before looking in the database.)</p>
 <ul>
 <li>Separate jar files with a colon (:).</li>
 <li>Use two-part names for the jar files (schema name and jar name). Set the
-property as a database-level property for the database. The <i>first time</i> you set the property, you must reboot to load the classes.</li>
+property as a database-level property for the database. The <i>first time</i> you
+set the property, you must reboot to load the classes.</li>
 </ul>
 <p>Example:</p>
 <codeblock><b>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.database.classpath',
     'APP.ToursLogic:APP.ACCOUNTINGLOGIC')</b></codeblock>
-<p>See <i>"derby.database.classpath"</i> in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite> for more information about the property.</p>
-<note><ph conref="devconrefs.dita#prod/productshortname"></ph>'s class loader looks first in the user's
-classpath for any needed classes, and then in the database. To ensure class
-loading with the database class loader, remove classes from the classpath.</note>
-</conbody></concept>
+<p>See <i>"derby.database.classpath"</i> in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite> for
+more information about the property.</p>
+<note><ph conref="devconrefs.dita#prod/productshortname"></ph>'s class loader
+looks first in the user's classpath for any needed classes, and then in the
+database. To ensure class loading with the database class loader, remove classes
+from the classpath.</note>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,20 +17,18 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdeploy23812">
+<concept id="cdevdeploy23812" xml:lang="en-us">
 <title>Add the jar file or files to the database</title>
+<shortdesc>Use a set of procedures to install, replace, and remove jar files
+in a database. When you install a jar file in a database, you give it a <ph
+conref="devconrefs.dita#prod/productshortname"></ph> jar name, which is an <codeph>SQL92Identifier</codeph>.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>jar files<indexterm>installing, removing, and replacing</indexterm></indexterm>
+<keywords><indexterm>jar files<indexterm>installing, removing, and replacing</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>Use a set of procedures to install, replace, and remove jar files in a
-database. When you install a jar file in a database, you give it a <ph conref="devconrefs.dita#prod/productshortname"></ph> jar
-name, which is an <codeph><i>SQL92Identifier</i></codeph>. </p>
-<note>Once a jar file has been installed, you cannot modify any
-of the individual classes or resources within the jar file. Instead, you must
-replace the entire jar file.</note>
-</conbody></concept>
+<note>Once a jar file has been installed, you cannot modify any of the individual
+classes or resources within the jar file. Instead, you must replace the entire
+jar file.</note>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy30736.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdeploy30736.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy30736.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy30736.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,11 +17,10 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
 <concept id="cdevdeploy30736" xml:lang="en-us">
 <title>Loading classes from a database</title>
+<shortdesc>You can store application logic in a database and then load classes
+from the database.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Database class loading</indexterm><indexterm>Classes<indexterm>storing
 in database</indexterm></indexterm><indexterm>Jar files<indexterm>storing
@@ -26,9 +28,8 @@
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>You can store application logic in a database and then load classes from
-the database. Application logic, which can be used by SQL functions and procedures,
-includes Java class files and other resources. Storing application code simplifies
+<p>Application logic, which can be used by SQL functions and procedures, includes
+Java class files and other resources. Storing application code simplifies
 application deployment, since it reduces the potential for problems with a
 user's classpath.</p>
 <p>In an embedded environment, when application logic is stored in the database, <ph
@@ -37,4 +38,3 @@
 from stored jar files. </p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy32171.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdeploy32171.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy32171.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy32171.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,15 +17,15 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdeploy32171">
+<concept id="cdevdeploy32171" xml:lang="en-us">
 <title>Deploying Derby applications</title>
-<prolog>
-</prolog>
+<shortdesc>Typically, once you have developed a <ph conref="devconrefs.dita#prod/productshortname"></ph> application
+and database, you package up the application, the <ph conref="devconrefs.dita#prod/productshortname"></ph> libraries,
+and the database in some means for distribution to your users. This process
+is called <i>deployment</i>.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>Typically, once you have developed a <ph conref="devconrefs.dita#prod/productshortname"></ph> application and database,
-you package up the application, the <ph conref="devconrefs.dita#prod/productshortname"></ph> libraries, and the database
-in some means for distribution to your users. This process is called <i>deployment</i>. </p>
-<p>This section discusses issues for deploying <ph conref="devconrefs.dita#prod/productshortname"></ph> applications and
-databases.</p>
-</conbody></concept>
+<p>This section discusses issues for deploying <ph conref="devconrefs.dita#prod/productshortname"></ph> applications
+and databases.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy38918.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdeploy38918.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy38918.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy38918.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,11 +17,9 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdeploy38918">
+<concept id="cdevdeploy38918" xml:lang="en-us">
 <title>Deployment issues</title>
-<prolog>
-</prolog>
-<conbody>
-<p>This section discusses deployment options and details.</p>
-</conbody></concept>
+<shortdesc>This section discusses deployment options and details.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy82529.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdeploy82529.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy82529.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy82529.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,11 +17,9 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdeploy82529">
+<concept id="cdevdeploy82529" xml:lang="en-us">
 <title>Databases on read-only media and DatabaseMetaData</title>
-<prolog>
-</prolog>
-<conbody>
-<p>Databases on read-only media return true for <i>DatabaseMetaData.isReadOnly</i>.</p>
-</conbody></concept>
+<shortdesc>Databases on read-only media return true for <i>DatabaseMetaData.isReadOnly</i>.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy855655.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdeploy855655.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy855655.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy855655.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,30 +17,30 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdeploy855655">
+<concept id="cdevdeploy855655" xml:lang="en-us">
 <title>Deploying Derby in an embedded environment</title>
+<shortdesc>You can "embed" <ph conref="devconrefs.dita#prod/productshortname"></ph> in
+any Java application (single- or multi-user) by deploying the following packages.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>derby.jar</indexterm>
-<indexterm>Embedded environments</indexterm>
+<keywords><indexterm>derby.jar</indexterm><indexterm>Embedded environments</indexterm>
 <indexterm>Embedded environments<indexterm>how to deploy Derby</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>You can "embed" <ph conref="devconrefs.dita#prod/productshortname"></ph> in any Java application (single- or
-multi-user) by deploying the following package:</p>
 <ul>
-<li>the <ph conref="devconrefs.dita#prod/productshortname"></ph> library (<i>derby.jar</i>)</li>
-<li>the application's libraries  
-<p>You have the option of storing these
-libraries in the database. (See <xref href="cdevdeploy30736.dita#cdevdeploy30736"/>.)</p></li>
-<li>the database or databases used by the application, in the context of their
-system directory (see <xref href="cdevdeploy18639.dita#cdevdeploy18639"/>)  
-<fig id="cdevdeploy21165" expanse="column">
-<title>Deploying an application, embedded Derby software,
-and the database. Storing the application in the database and setting properties
-as database-wide properties simplify deployment.</title><image placement="break" href="edeploy_os.gif"><alt>Graphic 1; A slightly more complicated deployment with the application and properties outside of the database. Graphic 2; A simplified deployment with application and properties stored in the database.</alt></image></fig></li>
+<li>The <ph conref="devconrefs.dita#prod/productshortname"></ph> library (<i>derby.jar</i>).</li>
+<li>The application's libraries. You have the option of storing these libraries
+in the database.</li>
+<li>The database or databases used by the application, in the context of their
+system directory.<fig expanse="column" id="cdevdeploy21165"><title>Deploying
+an application, embedded Derby software, and the database. Storing the application
+in the database and setting properties as database-wide properties simplify
+deployment.</title>
+<image href="edeploy_os.gif" placement="break"><alt>Graphic 1; A slightly
+more complicated deployment with the application and properties outside of
+the database. Graphic 2; A simplified deployment with application and properties
+stored in the database.</alt></image>
+</fig></li>
 </ul>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy856333.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdeploy856333.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy856333.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy856333.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,25 +17,21 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdeploy856333">
+<concept id="cdevdeploy856333" xml:lang="en-us">
 <title>Connecting to databases when the path is ambiguous because of databases
 in the classpath</title>
+<shortdesc>To connect to a database in the file system when the connection
+URL that you would use would be ambiguous with a database in the classpath,
+use the following form of the connection URL.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Connecting to databases<indexterm>when path is ambiguous
-because of databases in classpath</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Connecting to databases<indexterm>when path is ambiguous
+because of databases in classpath</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>To connect to a database in the file system when the connection URL that you would
-use would be ambiguous with a database in the classpath, use the following
-form of the connection URL:</p>
 <codeblock>jdbc:derby:directory:<i>databasePathInFileSystem</i></codeblock>
-<p>For example,</p>
-<codeblock>jdbc:derby:directory:/products/boiledfood</codeblock>
-<p>Apart from the connection URL, databases in archives in the classpath behave just
-like databases in archives accessed through the file system. However, databases
-in archives are read-only.</p>
-</conbody></concept>
+<p>For example,<codeblock>jdbc:derby:directory:/products/boiledfood</codeblock></p>
+<p>Apart from the connection URL, databases in archives in the classpath behave
+just like databases in archives accessed through the file system. However,
+databases in archives are read-only.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy856753.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdeploy856753.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy856753.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy856753.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,24 +17,15 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdeploy856753">
+<concept id="cdevdeploy856753" xml:lang="en-us">
 <title>Class loading overview</title>
-<prolog>
-</prolog>
+<shortdesc>You store application classes and resources by storing one or more
+jar files in the database. Then your application can access classes loaded
+by <ph conref="devconrefs.dita#prod/productshortname"></ph> from the jar file
+and does not need to be coded in a particular way. The only difference is
+the way in which you invoke the application.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>You store application classes and resources by storing one or more jar
-files in the database. Then your application can access classes loaded by <ph conref="devconrefs.dita#prod/productshortname"></ph> from
-the jar file and does not need to be coded in a particular way. The only difference
-is the way in which you invoke the application.</p>
-<p>Here are the basic steps:</p>
-<ol>
-<li><xref href="cdevdeploy15818.dita#cdevdeploy15818">Create jar files for your application</xref></li>
-<li><xref href="cdevdeploy23812.dita#cdevdeploy23812">Add the jar file or files to the database</xref></li>
-<li><xref href="cdevdeploy21645.dita#cdevdeploy21645">Enable database class loading with a property</xref></li>
-<li><xref href="cdevdeploy12748.dita#cdevdeploy12748">Code your applications</xref></li>
-</ol>
-<note>If you are interested in making changes to jar files stored
-in the database or changing the database jar "classpath" of your
-application without having to re-boot, read <xref href="cdevdeploy17604.dita#cdevdeploy17604"/>.</note>
-</conbody></concept>
+<p>Here are the basic steps.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy857611.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdeploy857611.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy857611.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy857611.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,20 +17,20 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdeploy857611">
+<concept id="cdevdeploy857611" xml:lang="en-us">
 <title>Requirements for dynamic changes</title>
-<prolog>
-</prolog>
+<shortdesc>Certain conditions must be met for <ph conref="devconrefs.dita#prod/productshortname"></ph> to
+be able to load the new classes right away without you having to reboot.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>Certain conditions must be met for <ph conref="devconrefs.dita#prod/productshortname"></ph> to be able to load the new
-classes right away without you having to reboot:</p>
 <ul>
-<li>You <i>originally configured</i> database-level class
-loading for the database correctly. Turning on the database-level class loading
-property requires setting the <codeph><i>derby.database.classpath</i></codeph> property with valid two-part names, then rebooting.</li>
-<li>If changes to the <i>derby.database.classpath</i> property
-are needed to reflect new jar files, you change the property to a valid value.</li>
+<li>You <i>originally configured</i> database-level class loading for the
+database correctly. Turning on the database-level class loading property requires
+setting the <codeph><i>derby.database.classpath</i></codeph> property with
+valid two-part names, then rebooting.</li>
+<li>If changes to the <i>derby.database.classpath</i> property are needed
+to reflect new jar files, you change the property to a valid value.</li>
 </ul>
 <p>If these requirements are not met, you will have to reboot to see the changes.</p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy857648.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdeploy857648.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy857648.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy857648.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,20 +17,19 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdeploy857648">
-<title>Notes</title>
-<prolog>
-</prolog>
+<concept id="cdevdeploy857648" xml:lang="en-us">
+<title>Notes on dynamic changes</title>
+<prolog></prolog>
 <conbody>
-<p>When you are changing the <i>derby.database.classpath</i> property,
-all classes loaded from database jar files are reloaded, even for a jar file
-that has not changed.</p>
+<p>When you are changing the <i>derby.database.classpath</i> property, all
+classes loaded from database jar files are reloaded, even for a jar file that
+has not changed.</p>
 <p>Remember that the user's classpath is searched first.</p>
 <p>Any existing prepared statements will use the previously loaded classes
 unless they require class loading, in which case they will fail with a <i>ClassNotFound</i> error.</p>
 <p>Cached objects do not match objects created with newly loaded classes.
-For example, an in-memory <i>Customer</i> object will not
-match a new <codeph><i>Customer</i></codeph> object if the <codeph><i>Customer</i></codeph> class has been reloaded, and it will raise
-a <codeph><i>ClassCastException.</i></codeph> </p>
-</conbody></concept>
+For example, an in-memory <i>Customer</i> object will not match a new <codeph><i>Customer</i></codeph> object
+if the <codeph><i>Customer</i></codeph> class has been reloaded, and it will
+raise a <codeph><i>ClassCastException.</i></codeph> </p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy92419.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdeploy92419.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy92419.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy92419.dita Fri Mar 17 13:11:50 2006
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
-
-Licensed under the Apache License, Version 2.0 (the "License");  
-you may not use this file except in compliance with the License.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdeploy92419">
-<title>Signed jar files</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Jar files<indexterm>loading signed</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
-<conbody>
-<p>For information about how <ph conref="devconrefs.dita#prod/productshortname"></ph> handles signed jar files, see <xref href="cdevcsecure90988.dita#cdevcsecure90988"/></p>
-</conbody></concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdgpref11181.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdgpref11181.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdgpref11181.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdgpref11181.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,14 +17,14 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdgpref11181">
+<concept id="cdevdgpref11181" xml:lang="en-us">
 <title>Purpose of this guide</title>
-<prolog>
-</prolog>
+<shortdesc>This guide explains how to use the core <ph conref="devconrefs.dita#prod/productshortname"></ph> technology
+and is for developers building <ph conref="devconrefs.dita#prod/productshortname"></ph> applications.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>This book explains how to use the core <ph conref="devconrefs.dita#prod/productshortname"></ph> technology and is for
-developers building <ph conref="devconrefs.dita#prod/productshortname"></ph> applications. It describes basic <ph conref="devconrefs.dita#prod/productshortname"></ph> concepts,
-such as how you create and access <ph conref="devconrefs.dita#prod/productshortname"></ph> databases through JDBC procedures
-and how you can deploy <ph conref="devconrefs.dita#prod/productshortname"></ph> applications.</p>
-</conbody></concept>
+<p>It describes basic <ph conref="devconrefs.dita#prod/productshortname"></ph> concepts,
+such as how you create and access <ph conref="devconrefs.dita#prod/productshortname"></ph> databases
+through JDBC procedures and how you can deploy <ph conref="devconrefs.dita#prod/productshortname"></ph> applications.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdgpref23947.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdgpref23947.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdgpref23947.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdgpref23947.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,33 +17,31 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdgpref23947">
-<title>How this guide Is Organized</title>
-<prolog>
-</prolog>
+<concept id="cdevdgpref23947" xml:lang="en-us">
+<title>How this guide is organized</title>
+<shortdesc>This document includes the following sections.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>This document includes the following chapters:</p>
 <ul>
-<li><i><xref href="cdevdvlp19524.dita#cdevdvlp19524"/></i>  
-<p>Basic
-details for using <ph conref="devconrefs.dita#prod/productshortname"></ph>, including loading the JDBC driver, specifying
-a database URL, and starting <ph conref="devconrefs.dita#prod/productshortname"></ph>.</p></li>
-<li><i><xref href="cdevstart19524.dita#cdevstart19524"/></i>  
-<p>Explains the installation layout.</p></li>
-<li><i><xref href="cdevdeploy32171.dita#cdevdeploy32171"/></i>  
-<p>An overview of different deployment scenarios, and tips for getting the details
+<li><i><xref href="cdevdvlp19524.dita#cdevdvlp19524"></xref></i>   <p>Basic
+details for using <ph conref="devconrefs.dita#prod/productshortname"></ph>,
+including loading the JDBC driver, specifying a database URL, and starting <ph
+conref="devconrefs.dita#prod/productshortname"></ph>.</p></li>
+<li><i><xref href="cdevstart19524.dita#cdevstart19524"></xref></i>   <p>Explains
+the installation layout.</p></li>
+<li><i><xref href="cdevdeploy32171.dita#cdevdeploy32171"></xref></i>   <p>An
+overview of different deployment scenarios, and tips for getting the details
 right when deploying applications.</p></li>
-<li><i><xref href="cdevconcepts19524.dita#cdevconcepts19524"/></i>  
-<p>JDBC, cursors, locking and isolation levels, and multiple connections.</p></li>
-<li><i><xref href="cdevresman19524.dita#cdevresman19524"/></i>  
-<p>Information for programmers developing back-end components in a J2EE system.</p></li>
-<li><i><xref href="cdevadvjdbc35053.dita#cdevadvjdbc35053"/></i>  
-<p>Tips for tool designers.</p></li>
-<li><i><xref href="cdevtricks32436.dita#cdevtricks32436"/></i>  
-<p>Insiders' tricks of the trade for using SQL.</p></li>
-<li><i><xref href="cdevin10613.dita#cdevin10613"/></i> 
-<p>An
-overview of database localization.</p></li>
+<li><i><xref href="cdevconcepts19524.dita#cdevconcepts19524"></xref></i> 
+ <p>JDBC, cursors, locking and isolation levels, and multiple connections.</p></li>
+<li><i><xref href="cdevresman19524.dita#cdevresman19524"></xref></i>   <p>Information
+for programmers developing back-end components in a J2EE system.</p></li>
+<li><i><xref href="cdevadvjdbc35053.dita#cdevadvjdbc35053"></xref></i>   <p>Tips
+for tool designers.</p></li>
+<li><i><xref href="cdevtricks32436.dita#cdevtricks32436"></xref></i>   <p>Insiders'
+tricks of the trade for using SQL.</p></li>
+<li><i><xref href="cdevin10613.dita#cdevin10613"></xref></i>  <p>An overview
+of database localization.</p></li>
 </ul>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdgpref24290.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdgpref24290.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdgpref24290.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdgpref24290.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,14 +17,14 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdgpref24290">
+<concept id="cdevdgpref24290" xml:lang="en-us">
 <title>Audience</title>
-<prolog>
-</prolog>
+<shortdesc>This guide is intended for software developers who already know
+some SQL and Java.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>This book is intended for software developers who already know some SQL
-and Java. <ph conref="devconrefs.dita#prod/productshortname"></ph> users who are not familiar with the SQL standard or
-the Java programming language will benefit from consulting books on those
-subjects.</p>
-</conbody></concept>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> users who are
+not familiar with the SQL standard or the Java programming language will benefit
+from consulting books on those subjects.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdgpref29520.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdgpref29520.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdgpref29520.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdgpref29520.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,16 +17,12 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
 <concept id="cdevdgpref29520" xml:lang="en-us">
 <title>About this guide</title>
 <prolog></prolog>
 <conbody>
-<p>For general information about the <ph conref="devconrefs.dita#prod/productshortname"></ph> documentation, such
-as a complete list of books, conventions, and further reading, see <cite><ph
+<p>For general information about the <ph conref="devconrefs.dita#prod/productshortname"></ph> documentation,
+such as a complete list of books, conventions, and further reading, see <cite><ph
 conref="devconrefs.dita#pub/citgetstart"></ph></cite>.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp10252.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp10252.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp10252.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp10252.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,27 +17,22 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp10252">
+<concept id="cdevdvlp10252" xml:lang="en-us">
 <title>Getting a nested connection</title>
+<shortdesc>When you are executing a method within SQL, that method might need
+to reuse the current connection to the database in order to execute more SQL
+statements. Such a connection is called a<i> nested connection</i>. The way
+for a method to get a nested connection is to issue a connection request using
+the connection URL.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Getting a nested connection<indexterm>using database
-connection URL attribute</indexterm></indexterm>
-<indexterm>Nested connections<indexterm>getting</indexterm></indexterm>
-<indexterm>Nested connections<indexterm>getting</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Getting a nested connection<indexterm>using database
+connection URL attribute</indexterm></indexterm><indexterm>Nested connections<indexterm>getting</indexterm></indexterm>
+<indexterm>Nested connections<indexterm>getting</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>When you are executing a method within SQL, that method might need
-to reuse the current connection to the database in order to execute more SQL statements.
-Such a connection is called a<i> nested connection</i>. The
-way for a method to get a nested connection is to issue a connection request
-using the connection URL.</p>
 <codeblock>jdbc:default:connection</codeblock>
 <p>URL attributes are not supported as part of this connection URL. Any URL
 attributes specified in a Properties object, user name, or password that are
-passed to a <i>java.sql.DriverManager.getConnection()</i> call
-will be ignored.</p>
-</conbody></concept>
+passed to a <i>java.sql.DriverManager.getConnection()</i> call will be ignored.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp13018.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp13018.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp13018.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp13018.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,26 +17,20 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
 <concept id="cdevdvlp13018" xml:lang="en-us">
 <title>Defining the system directory</title>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
+<shortdesc>You define the system directory when <ph conref="devconrefs.dita#prod/productshortname"></ph> starts
+up by specifying a Java <i>system property</i> called <codeph><i>derby.system.home</i></codeph>.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>You define the system directory when <ph conref="devconrefs.dita#prod/productshortname"></ph> starts
-up by specifying a Java <i>system property</i> called <codeph><i>derby.system.home</i></codeph>.
-If you do not specify the system directory when starting up <ph conref="devconrefs.dita#prod/productshortname"></ph>,
+<p>If you do not specify the system directory when starting up <ph conref="devconrefs.dita#prod/productshortname"></ph>,
 the current directory becomes the system directory.</p>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> uses
-the <i>derby.system.home</i> property to determine which directory is its
-system directory - and thus what databases are in its system, where to create
-new databases, and what configuration parameters to use. See <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite> for
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> uses the <i>derby.system.home</i> property
+to determine which directory is its system directory - and thus what databases
+are in its system, where to create new databases, and what configuration parameters
+to use. See <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite> for
 more information on setting this property.</p>
 <p>If you specify a system directory at startup that does not exist, <ph conref="devconrefs.dita#prod/productshortname"></ph> creates
 this new directory - and thus a new system with no databases-automatically.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,45 +17,47 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
-
 <concept id="cdevdvlp14839" xml:lang="en-us">
 <title>Application development overview</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> application
+developers use JDBC, the application programming interface that makes it possible
+to access relational databases from Java programs.</shortdesc>
 <prolog></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> application developers use JDBC, the application programming interface
-that makes it possible to access relational databases from Java programs.
-The JDBC API is part of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
+<p>The JDBC API is part of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
 tmtype="tm" trademark="Java">Java</tm> 2 Platform, Standard Edition and is
-not specific to <ph conref="devconrefs.dita#prod/productshortname"></ph>. It consists of the <i>java.sql</i> and <i>javax.sql</i> packages,
-which is a set of classes and interfaces that make it possible to access databases
-(from a number of different vendors, not just <ph conref="devconrefs.dita#prod/productshortname"></ph>) from a Java
-application.</p>
-<p>To develop <ph conref="devconrefs.dita#prod/productshortname"></ph> applications successfully, you will need to learn JDBC.
-This section does not teach you how to program with the JDBC API.</p>
+not specific to <ph conref="devconrefs.dita#prod/productshortname"></ph>.
+It consists of the <i>java.sql</i> and <i>javax.sql</i> packages, which is
+a set of classes and interfaces that make it possible to access databases
+(from a number of different vendors, not just <ph conref="devconrefs.dita#prod/productshortname"></ph>)
+from a Java application.</p>
+<p>To develop <ph conref="devconrefs.dita#prod/productshortname"></ph> applications
+successfully, you will need to learn JDBC. This section does not teach you
+how to program with the JDBC API.</p>
 <p>This section covers the details of application programming that are specific
-to <ph conref="devconrefs.dita#prod/productshortname"></ph> applications. For example, all JDBC applications typically start
-their DBMS's JDBC driver and use a connection URL to connect to a database.
-This chapter gives you the details of how to start <ph conref="devconrefs.dita#prod/productshortname"></ph>'s JDBC driver and
-how to work with <ph conref="devconrefs.dita#prod/productshortname"></ph>'s connection URL to accomplish various tasks. It also
-covers essential <ph conref="devconrefs.dita#prod/productshortname"></ph> concepts such as the <ph conref="devconrefs.dita#prod/productshortname"></ph> system.</p>
-<p>You will find reference information about the particulars of <ph conref="devconrefs.dita#prod/productshortname"></ph>'s implementation
-of JDBC in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>. </p>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> application developers will need to learn SQL. <i>SQL</i> is the
-standard query language used with relational databases and is not tied to
-a particular programming language. No matter how a particular RDBMS has been
-implemented, the user can design databases and insert, modify, and retrieve
-data using the standard SQL statements and well-defined data types. SQL-92
-is the version of SQL standardized by ANSI and ISO in 1992; <ph conref="devconrefs.dita#prod/productshortname"></ph> supports
+to <ph conref="devconrefs.dita#prod/productshortname"></ph> applications.
+For example, all JDBC applications typically start their DBMS's JDBC driver
+and use a connection URL to connect to a database. This chapter gives you
+the details of how to start <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+JDBC driver and how to work with <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+connection URL to accomplish various tasks. It also covers essential <ph conref="devconrefs.dita#prod/productshortname"></ph> concepts
+such as the <ph conref="devconrefs.dita#prod/productshortname"></ph> system.</p>
+<p>You will find reference information about the particulars of <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+implementation of JDBC in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>. </p>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> application developers
+will need to learn SQL. <i>SQL</i> is the standard query language used with
+relational databases and is not tied to a particular programming language.
+No matter how a particular RDBMS has been implemented, the user can design
+databases and insert, modify, and retrieve data using the standard SQL statements
+and well-defined data types. SQL-92 is the version of SQL standardized by
+ANSI and ISO in 1992; <ph conref="devconrefs.dita#prod/productshortname"></ph> supports
 entry-level SQL-92 as well as some higher-level features. Entry-level SQL-92
 is a subset of full SQL-92 specified by ANSI and ISO that is supported by
 nearly all major DBMSs today. This chapter does not teach you SQL. You will
-find reference information about the particulars of <ph conref="devconrefs.dita#prod/productshortname"></ph>'s implementation
-of SQL in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> implements JDBC that allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to serve a resource manager in
-a J2EE compliant system.</p>
+find reference information about the particulars of <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+implementation of SQL in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> implements JDBC
+that allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to serve
+a resource manager in a J2EE compliant system.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,39 +17,37 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp17453">
+<concept id="cdevdvlp17453" xml:lang="en-us">
 <title>Derby JDBC database connection URL</title>
+<shortdesc>A Java application using the JDBC API establishes a connection
+to a database by obtaining a <i>Connection</i> object.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Database connection URL<indexterm>description</indexterm></indexterm>
-<indexterm>Database connection URL<indexterm>features common
-to embedded and client/server versions</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Database connection URL<indexterm>description</indexterm></indexterm>
+<indexterm>Database connection URL<indexterm>features common to embedded and
+client/server versions</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>A Java application using the JDBC API establishes a connection to a database
-by obtaining a <i>Connection</i> object. The standard way
-to obtain a <codeph><i>Connection</i></codeph> object is to call
-the method <codeph><i>DriverManager.getConnection</i></codeph>,
-which takes a String containing a connection URL (uniform resource locator). A JDBC connection URL provides
-a way of identifying a database. It also allows you to perform a number of
-high-level tasks, such as creating a database or shutting down the system.</p>
+<p>The standard way to obtain a <codeph><i>Connection</i></codeph> object
+is to call the method <codeph><i>DriverManager.getConnection</i></codeph>,
+which takes a String containing a connection URL (uniform resource locator).
+A JDBC connection URL provides a way of identifying a database. It also allows
+you to perform a number of high-level tasks, such as creating a database or
+shutting down the system.</p>
 <p>An application in an embedded environment uses a different connection URL
-from that used by applications using the <ph conref="devconrefs.dita#prod/productshortname"></ph> Network Server in a client/server
-environment. See the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite> for more information on the Network
-Server. </p>
-<p>However, all versions of the connection URL (which you can use for tasks besides
-connecting to a database) have common features:</p>
+from that used by applications using the <ph conref="devconrefs.dita#prod/productshortname"></ph> Network
+Server in a client/server environment. See the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite> for
+more information on the Network Server. </p>
+<p>However, all versions of the connection URL (which you can use for tasks
+besides connecting to a database) have common features:</p>
 <ul>
 <li>you can specify the name of the database you want to connect to</li>
 <li>you can specify a number of attributes and values that allow you to accomplish
-tasks. For more information about what you can specify with the <ph conref="devconrefs.dita#prod/productshortname"></ph> connection URL,
-see "Examples". For detailed reference about attributes and values,
-as well as syntax of the database connection URL, see the "<ph conref="devconrefs.dita#prod/productshortname"></ph> Database
+tasks. For more information about what you can specify with the <ph conref="devconrefs.dita#prod/productshortname"></ph> connection
+URL, see "Examples". For detailed reference about attributes and values, as
+well as syntax of the database connection URL, see the "<ph conref="devconrefs.dita#prod/productshortname"></ph> Database
 Connection URL Syntax" in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>. </li>
 </ul>
 <p>An example use of the connection URL:</p>
 <codeblock>Connection conn=DriverManager.getConnection("jdbc:derby:sample");</codeblock>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp18166.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp18166.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp18166.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp18166.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,36 +17,38 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp18166">
+<concept id="cdevdvlp18166" xml:lang="en-us">
 <title>Storage and recovery</title>
+<shortdesc>A <ph conref="devconrefs.dita#prod/productshortname"></ph> database
+provides persistent storage and recovery. <ph conref="devconrefs.dita#prod/productshortname"></ph> ensures
+that all committed transactions are durable, even if the system fails, through
+the use of a database transaction log.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Recovery</indexterm>
-<indexterm>Start-up<indexterm>description</indexterm></indexterm>
-<indexterm>Shutdown<indexterm>description</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Recovery</indexterm><indexterm>Start-up<indexterm>description</indexterm></indexterm>
+<indexterm>Shutdown<indexterm>description</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>A <ph conref="devconrefs.dita#prod/productshortname"></ph> database provides persistent storage and recovery. <ph conref="devconrefs.dita#prod/productshortname"></ph> ensures
-that all committed transactions are durable, even if the system fails, through
-the use of a database transaction log. Whereas inserts, updates, and deletes
-may be cached before being written to disk, log entries tracking all those
-changes are never cached but always forced to disk when a transaction commits.
-If the system or operating system fails unexpectedly, when <ph conref="devconrefs.dita#prod/productshortname"></ph> next starts
-up it can use the log to perform recovery, recovering the "lost" transactions
-from the log and rolling back uncommitted transactions. <i>Recovery</i> ensures that all committed transactions at the time the system
-failed are applied to the database, and all transactions that were active
-are rolled back. Thus the databases are left in a consistent, valid state.</p>
-<p>In normal operation, <ph conref="devconrefs.dita#prod/productshortname"></ph> keeps the log small through periodic checkpoints.
-Checkpointing marks the portions of the log that are no longer useful, writes
-changed pages to disk, then truncates the log.</p>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> checkpoints the log file as it fills. It also checkpoints the
-log when a shutdown command is issued. Shutting down the JVM in which <ph conref="devconrefs.dita#prod/productshortname"></ph> is
+<p>Whereas inserts, updates, and deletes may be cached before being written
+to disk, log entries tracking all those changes are never cached but always
+forced to disk when a transaction commits. If the system or operating system
+fails unexpectedly, when <ph conref="devconrefs.dita#prod/productshortname"></ph> next
+starts up it can use the log to perform recovery, recovering the "lost" transactions
+from the log and rolling back uncommitted transactions. <i>Recovery</i> ensures
+that all committed transactions at the time the system failed are applied
+to the database, and all transactions that were active are rolled back. Thus
+the databases are left in a consistent, valid state.</p>
+<p>In normal operation, <ph conref="devconrefs.dita#prod/productshortname"></ph> keeps
+the log small through periodic checkpoints. Checkpointing marks the portions
+of the log that are no longer useful, writes changed pages to disk, then truncates
+the log.</p>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> checkpoints the
+log file as it fills. It also checkpoints the log when a shutdown command
+is issued. Shutting down the JVM in which <ph conref="devconrefs.dita#prod/productshortname"></ph> is
 running without issuing the proper shutdown command is equivalent to a system
-failure from <ph conref="devconrefs.dita#prod/productshortname"></ph>'s point of view.</p>
-<p>Booting a database means that <ph conref="devconrefs.dita#prod/productshortname"></ph> checks to see if recovery needs
-to be run on a database. Recovery can be costly, so using the proper shutdown
-command improves connection or startup performance.</p>
-</conbody></concept>
+failure from <ph conref="devconrefs.dita#prod/productshortname"></ph>'s point
+of view.</p>
+<p>Booting a database means that <ph conref="devconrefs.dita#prod/productshortname"></ph> checks
+to see if recovery needs to be run on a database. Recovery can be costly,
+so using the proper shutdown command improves connection or startup performance.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp19297.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp19297.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp19297.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp19297.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,34 +17,31 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp19297">
+<concept id="cdevdvlp19297" xml:lang="en-us">
 <title>Recommended practices</title>
+<shortdesc>When developing <ph conref="devconrefs.dita#prod/productshortname"></ph> applications,
+create a single directory to hold your database or databases.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>System directory<indexterm>creating and naming directory
-for</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>System directory<indexterm>creating and naming directory
+for</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>When developing <ph conref="devconrefs.dita#prod/productshortname"></ph> applications, create a single directory to
-hold your database or databases. Give this directory a unique name, to help
-you remember that:
-<ul>
+<p>Give this directory a unique name, to help you remember that: <ul>
 <li>All databases exist within a system.</li>
 <li>System-wide properties affect the entire system, and persistent system-wide
 properties live in the system directory.</li>
 <li>You can boot all the databases in the system, and the boot-up times of
 all databases affect the performance of the system.</li>
 <li>You can preboot databases only if they are within the system. (Databases
-do not necessarily have to live inside the system <i>directory</i>, but keeping your databases there is the recommended practice.)</li>
+do not necessarily have to live inside the system <i>directory</i>, but keeping
+your databases there is the recommended practice.)</li>
 <li>Once you connect to a database, it is part of the current system and thus
 inherits all system-wide properties.</li>
-<li>Only one instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> can run in a JVM at a single time, and
-only one instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> should boot a database at one time. Keeping
-databases in the system directory makes it less likely that you would use
-more than one instance of <ph conref="devconrefs.dita#prod/productshortname"></ph>.</li>
+<li>Only one instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> can
+run in a JVM at a single time, and only one instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> should
+boot a database at one time. Keeping databases in the system directory makes
+it less likely that you would use more than one instance of <ph conref="devconrefs.dita#prod/productshortname"></ph>.</li>
 <li>The error log is located inside the system directory.</li>
 </ul></p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp19524.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp19524.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp19524.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp19524.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,13 +17,11 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp19524">
+<concept id="cdevdvlp19524" xml:lang="en-us">
 <title>JDBC applications and Derby basics</title>
-<prolog>
-</prolog>
-<conbody>
-<p>This chapter describes the core <ph conref="devconrefs.dita#prod/productshortname"></ph> functionality. In addition,
-it details the most basic <ph conref="devconrefs.dita#prod/productshortname"></ph> deployment, <ph conref="devconrefs.dita#prod/productshortname"></ph> embedded in
-a Java application.</p>
-</conbody></concept>
+<shortdesc>This section describes the core <ph conref="devconrefs.dita#prod/productshortname"></ph> functionality.
+In addition, it details the most basic <ph conref="devconrefs.dita#prod/productshortname"></ph> deployment, <ph
+conref="devconrefs.dita#prod/productshortname"></ph> embedded in a Java application.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp19619.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp19619.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp19619.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp19619.dita Fri Mar 17 13:11:50 2006
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
-
-Licensed under the Apache License, Version 2.0 (the "License");  
-you may not use this file except in compliance with the License.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp19619">
-<title>Standard connections</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Databases<indexterm>connecting</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
-<conbody>
-</conbody></concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp19700.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp19700.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp19700.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp19700.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,12 +17,10 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp19700">
+<concept id="cdevdvlp19700" xml:lang="en-us">
 <title>Special database access</title>
-<prolog>
-</prolog>
-<conbody>
-<p>You can also access databases from the classpath or from a jar file (in
-the classpath or not) as read-only databases.</p>
-</conbody></concept>
+<shortdesc>You can also access databases from the classpath or from a jar
+file (in the classpath or not) as read-only databases.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp20458.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp20458.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp20458.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp20458.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,33 +17,32 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp20458">
+<concept id="cdevdvlp20458" xml:lang="en-us">
 <title>Double-booting system behavior</title>
-<prolog>
-</prolog>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> attempts
+to prevent two instances of <ph conref="devconrefs.dita#prod/productshortname"></ph> from
+booting the same database by using a file called <i>db.lck</i> inside the
+database directory.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> attempts to prevent two instances of <ph conref="devconrefs.dita#prod/productshortname"></ph> from booting
-the same database by using a file called <i>db.lck</i> inside
-the database directory (see "The Database Directory").</p>
-<p>On all platforms running with a JDK of 1.4 or higher, <ph conref="devconrefs.dita#prod/productshortname"></ph> can successfully
-prevent a second instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> from booting the database and thus prevents
-corruption.</p>
-<p>On some platforms running with a JDK lower than 1.4, <ph conref="devconrefs.dita#prod/productshortname"></ph> may prevent
-a second instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> from booting the database (previous to JDK 1.4
-the ability to do this was OS dependent).</p>
-<p>If this is the case, you will see an <i>SQLException</i> like
-the following:</p>
+<p>On all platforms running with a JDK of 1.4 or higher, <ph conref="devconrefs.dita#prod/productshortname"></ph> can
+successfully prevent a second instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> from
+booting the database and thus prevents corruption.</p>
+<p>On some platforms running with a JDK lower than 1.4, <ph conref="devconrefs.dita#prod/productshortname"></ph> may
+prevent a second instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> from
+booting the database (previous to JDK 1.4 the ability to do this was OS dependent).</p>
+<p>If this is the case, you will see an <i>SQLException</i> like the following:</p>
 <codeblock>ERROR XJ040: Failed to start database 'sample', see the next exception for details.
 ERROR XSDB6: Another instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> might have already booted
 the databaseC:\databases\sample. 
 </codeblock>
 <p>The error is also written to the error log.</p>
-<p>If you are running a JVM prior to 1.4, <ph conref="devconrefs.dita#prod/productshortname"></ph> issues a warning message on
-some platforms if an instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> attempts to boot a database that already
-has a running instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> attached to it. However, it does not prevent
-the second instance from booting, and thus potentially corrupting, the database.
-(You can change this behavior with the property <codeph><i>derby.database.forceDatabaseLock</i></codeph>.)</p>
+<p>If you are running a JVM prior to 1.4, <ph conref="devconrefs.dita#prod/productshortname"></ph> issues
+a warning message on some platforms if an instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> attempts
+to boot a database that already has a running instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> attached
+to it. However, it does not prevent the second instance from booting, and
+thus potentially corrupting, the database. (You can change this behavior with
+the property <codeph><i>derby.database.forceDatabaseLock</i></codeph>.)</p>
 <p>If a warning message has been issued, corruption might already have occurred.
 Corruption can occur even if one of the two booting systems has "readonly"
 access to the database.</p>
@@ -57,30 +59,35 @@
 <p>The warning is also written to the error log.</p>
 <p> If you see this warning, you should close the connection and exit the
 JVM, minimizing the risk of a corruption. Close all instances of <ph conref="devconrefs.dita#prod/productshortname"></ph>,
-then restart one instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> and shut down the database properly
-so that the <i>db.lck</i> file can be removed. The warning
-message continues to appear until a proper shutdown of the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
-can delete the <i>db.lck</i> file.</p>
+then restart one instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> and
+shut down the database properly so that the <i>db.lck</i> file can be removed.
+The warning message continues to appear until a proper shutdown of the <ph
+conref="devconrefs.dita#prod/productshortname"></ph> system can delete the <i>db.lck</i> file.</p>
 <p>When developing applications, you might want to configure <ph conref="devconrefs.dita#prod/productshortname"></ph> to
 append to the log. Doing so will help you detect when you have inadvertently
-started more than one instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> in the same system. For example,
-when the <i>derby.infolog.append</i> property is set to true
-for a system, booting two instances of <ph conref="devconrefs.dita#prod/productshortname"></ph> in the same system produces
-the following in the log:</p>
+started more than one instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> in
+the same system. For example, when the <i>derby.infolog.append</i> property
+is set to true for a system, booting two instances of <ph conref="devconrefs.dita#prod/productshortname"></ph> in
+the same system produces the following in the log:</p>
 <codeblock>Sat Aug 14 09:42:51 PDT 2005:
-Booting <ph conref="devconrefs.dita#prod/productshortname"></ph> version <ph conref="devconrefs.dita#prod/productlongname"></ph> - 10.0.0.1 - (29612): 
+Booting <ph conref="devconrefs.dita#prod/productshortname"></ph> version <ph
+conref="devconrefs.dita#prod/productlongname"></ph> - 10.0.0.1 - (29612): 
 
 instance 80000000-00d2-1c87-7586-000a0a0b1300 on database at
 directory C:\tutorial_system\sample
 ------------------------------------------------------------
 Sat Aug 14 09:42:59 PDT 2005:
-Booting <ph conref="devconrefs.dita#prod/productshortname"></ph> version <ph conref="devconrefs.dita#prod/productlongname"></ph> - 10.0.0.1 - (29612):
+Booting <ph conref="devconrefs.dita#prod/productshortname"></ph> version <ph
+conref="devconrefs.dita#prod/productlongname"></ph> - 10.0.0.1 - (29612):
 instance 80000000-00d2-1c87-9143-000a0a0b1300 on database at
 directory C:\tutorial_system\HelloWorldDB</codeblock>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> allows you to boot databases that are not in the system directory.
-While this might seem more convenient, check that you do not boot the same
-database with two JVMs. If you need to access a single database from more
-than one JVM, you will need to put a server solution in place. You can allow
-multiple JVMs that need to access that database to connect to the server.
-The <ph conref="devconrefs.dita#prod/productshortname"></ph> Network Server is provided as a server solution. See the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite> for more information on the Network Server.</p>
-</conbody></concept>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> allows you to
+boot databases that are not in the system directory. While this might seem
+more convenient, check that you do not boot the same database with two JVMs.
+If you need to access a single database from more than one JVM, you will need
+to put a server solution in place. You can allow multiple JVMs that need to
+access that database to connect to the server. The <ph conref="devconrefs.dita#prod/productshortname"></ph> Network
+Server is provided as a server solution. See the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite> for
+more information on the Network Server.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp21955.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp21955.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp21955.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp21955.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,17 +17,15 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp21955">
+<concept id="cdevdvlp21955" xml:lang="en-us">
 <title>A Derby database</title>
+<shortdesc>A <ph conref="devconrefs.dita#prod/productshortname"></ph> database
+contains dictionary objects such as tables, columns, indexes, and jar files.
+A <ph conref="devconrefs.dita#prod/productshortname"></ph> database can also
+store its own configuration information.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Databases<indexterm>description of in Derby system</indexterm></indexterm>
+<keywords><indexterm>Databases<indexterm>description of in Derby system</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
-<conbody>
-<p>A <ph conref="devconrefs.dita#prod/productshortname"></ph> database contains dictionary objects such as tables, columns,
-indexes, and jar files. A <ph conref="devconrefs.dita#prod/productshortname"></ph> database can also store its own configuration
-information.</p>
-</conbody></concept>
+</metadata></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp22619.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp22619.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp22619.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp22619.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,23 +17,23 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp22619">
+<concept id="cdevdvlp22619" xml:lang="en-us">
 <title>Working with database threads in an embedded environment</title>
+<shortdesc>Do not use <codeph><i>interrupt</i></codeph> calls to notify threads
+that are accessing a database, because <ph conref="devconrefs.dita#prod/productshortname"></ph> will
+catch the <codeph><i>interrupt</i></codeph> call and close the connection
+to the database. Use <codeph><i>wait</i></codeph> and <codeph><i>notify</i></codeph> calls
+instead.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Threads<indexterm>sleep and interrupt calls</indexterm><indexterm>notifying</indexterm></indexterm>
+<keywords><indexterm>Threads<indexterm>sleep and interrupt calls</indexterm><indexterm>notifying</indexterm></indexterm>
 <indexterm>interrupt calls<indexterm>caught by Derby</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>Do not use <codeph><i>interrupt</i></codeph> calls to notify
-threads that are accessing a database, because <ph conref="devconrefs.dita#prod/productshortname"></ph> will catch the <codeph><i>interrupt</i></codeph> call and close the connection to the database.
-Use <codeph><i>wait</i></codeph> and <codeph><i>notify</i></codeph> calls instead.</p>
 <p>This will not happen in a client/server environment, but if you want your
 application to work in either environment it is good practice to follow this
 rule.</p>
-<p>There are special considerations when working with more than one database
-thread in an application. See <i><xref href="cdevconcepts34828.dita#cdevconcepts34828"/></i> and <i><xref href="cdevconcepts23499.dita#cdevconcepts23499"/></i>.</p>
-</conbody></concept>
+<p>There are also special considerations when working with more than one database
+thread in an application.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,27 +17,28 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp24155">
+<concept id="cdevdvlp24155" xml:lang="en-us">
 <title>Accessing databases from a jar or zip file</title>
-<prolog>
-</prolog>
+<shortdesc>It is possible to access databases from a jar file. The jar file
+does not have to be on the classpath.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>It is possible to access databases from a jar file. The jar file can be,
-but does not have to be, on the classpath.</p>
 <note>All such databases are read-only.</note>
-<p>For example, suppose you have archived the database <i>jarDB1</i> into a file called <i>jar1.jar</i>. This archive
-is in the classpath before you start up <ph conref="devconrefs.dita#prod/productshortname"></ph>. You can access <i>jarDB1</i> with the following connection URL</p>
+<p>For example, suppose you have archived the database <i>jarDB1</i> into
+a file called <i>jar1.jar</i>. This archive is in the classpath before you
+start up <ph conref="devconrefs.dita#prod/productshortname"></ph>. You can
+access <i>jarDB1</i> with the following connection URL</p>
 <codeblock>jdbc:derby:/jarDB1</codeblock>
 <p>To access a database in a jar file that is not on the classpath, use the
 jar subprotocol. </p>
-<p>For example, suppose you have archived the database <i>jarDB2</i> into a file called <i>jar2.jar</i>. This archive
-is not in the classpath. You can access <i>jarDB2</i> by
-specifying the path to the jar file along with the jar subsubprotocol, like
-this:</p>
+<p>For example, suppose you have archived the database <i>jarDB2</i> into
+a file called <i>jar2.jar</i>. This archive is not in the classpath. You can
+access <i>jarDB2</i> by specifying the path to the jar file along with the
+jar subsubprotocol, like this:</p>
 <codeblock>
 jdbc:derby:jar:(c:/<ph conref="devconrefs.dita#prod/productlowercase"></ph>/lib/jar2.jar)jarDB2
 </codeblock>
 <p>For complete instructions and examples of accessing databases in jar files,
-see <xref href="cdevdeploy11201.dita#cdevdeploy11201"/>.</p>
-</conbody></concept>
+see <xref href="cdevdeploy11201.dita#cdevdeploy11201"></xref>.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp25174.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp25174.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp25174.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp25174.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,13 +17,14 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp25174">
+<concept id="cdevdvlp25174" xml:lang="en-us">
 <title>Derby embedded basics</title>
-<prolog>
-</prolog>
+<shortdesc>This section explains how to use and configure <ph conref="devconrefs.dita#prod/productshortname"></ph> in
+an embedded environment.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>This section explains how to use and configure <ph conref="devconrefs.dita#prod/productshortname"></ph> in an embedded
-environment. Included in the installation is a sample application program, <i>/demo/programs/simple</i>, which illustrates how to run <ph conref="devconrefs.dita#prod/productshortname"></ph> embedded
+<p>Included in the installation is a sample application program, <i>/demo/programs/simple</i>,
+which illustrates how to run <ph conref="devconrefs.dita#prod/productshortname"></ph> embedded
 in the calling program.</p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp25820.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp25820.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp25820.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp25820.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,24 +17,24 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevdvlp25820">
-<title>Database Pages</title>
+<concept id="cdevdvlp25820" xml:lang="en-us">
+<title>Database pages</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> tables
+and indexes, known as conglomerates, consist of two or more pages.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Database pages<indexterm>description</indexterm></indexterm>
+<keywords><indexterm>Database pages<indexterm>description</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> tables and indexes, known as conglomerates, consist of two
-or more pages. A page is a unit of storage whose size is configurable on a
-system-wide, database-wide, or conglomerate-specific basis. By default, a
-conglomerate grows one page at a time until eight pages of user data (or nine
-pages of total disk use, which includes one page of internal information)
-have been allocated. (You can configure this behavior; see <i>"derby.storage.initialPages" </i> in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.)
-After that, it grows eight pages at a time.</p>
+<p>A page is a unit of storage whose size is configurable on a system-wide,
+database-wide, or conglomerate-specific basis. By default, a conglomerate
+grows one page at a time until eight pages of user data (or nine pages of
+total disk use, which includes one page of internal information) have been
+allocated. (You can configure this behavior; see <i>"derby.storage.initialPages" </i> in <cite><ph
+conref="devconrefs.dita#pub/cittuning"></ph></cite>.) After that, it grows
+eight pages at a time.</p>
 <p>The size of a row or column is not limited by the page size. Rows or columns
-that are longer than the table's page size are automatically wrapped to
-overflow pages. </p>
-</conbody></concept>
+that are longer than the table's page size are automatically wrapped to overflow
+pages. </p>
+</conbody>
+</concept>