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 [5/9] - /db/derby/docs/trunk/src/devguide/

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp25889.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp25889.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp25889.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp25889.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,21 +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="cdevdvlp25889">
+<concept id="cdevdvlp25889" xml:lang="en-us">
 <title>The error log</title>
+<shortdesc>Once you create or connect to a database within a system, <ph conref="devconrefs.dita#prod/productshortname"></ph> begins
+outputting information and error messages, if any.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Error log<indexterm>description</indexterm></indexterm>
+<keywords><indexterm>Error log<indexterm>description</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>Once you create or connect to a database within a system, <ph conref="devconrefs.dita#prod/productshortname"></ph> begins
-outputting information and error messages, if any. Typically, <ph conref="devconrefs.dita#prod/productshortname"></ph> writes
-this information to a log called <i>derby.log</i> in the
-system directory, although you can also have <ph conref="devconrefs.dita#prod/productshortname"></ph> send messages to
-a stream, using a property. By default, <ph conref="devconrefs.dita#prod/productshortname"></ph> overwrites <i>derby.log</i> when you start the system. You can configure <ph conref="devconrefs.dita#prod/productshortname"></ph> to
+<p>Typically, <ph conref="devconrefs.dita#prod/productshortname"></ph> writes
+this information to a log called <i>derby.log</i> in the system directory,
+although you can also have <ph conref="devconrefs.dita#prod/productshortname"></ph> send
+messages to a stream, using a property. By default, <ph conref="devconrefs.dita#prod/productshortname"></ph> overwrites <i>derby.log</i> when
+you start the system. You can configure <ph conref="devconrefs.dita#prod/productshortname"></ph> to
 append to the log with the  <codeph><i>derby.infolog.append</i></codeph> property.
 For information on setting this and other properties, see <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp27610.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp27610.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp27610.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp27610.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="cdevdvlp27610" xml:lang="en-us">
 <title>Derby system</title>
+<shortdesc>A <ph conref="devconrefs.dita#prod/productshortname"></ph> database
+exists within a <i>system</i>.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Derby system</indexterm><indexterm>System directory</indexterm>
 <indexterm>System<indexterm>description</indexterm></indexterm><indexterm>derby.properties
@@ -26,8 +28,6 @@
 <indexterm>Error log</indexterm><indexterm>derby.log</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>A <ph conref="devconrefs.dita#prod/productshortname"></ph> database exists
-within a <i>system</i>.</p>
 <p>A <ph conref="devconrefs.dita#prod/productshortname"></ph> system is a
 single instance of the <ph conref="devconrefs.dita#prod/productshortname"></ph> database
 engine and the environment in which it runs. It consists of a system directory,
@@ -41,9 +41,9 @@
 <p>However, the system - as well as its directory, which you name - is an
 essential part of a running database or databases. Understanding the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
 is essential to successful development and deployment of <ph conref="devconrefs.dita#prod/productshortname"></ph> applications.</p>
-<fig expanse="column" id="rdevdvlp17155"><title>Derby databases
-live in a system, which includes system-wide properties, an error log, and
-one or more databases.</title>
+<fig expanse="column" id="rdevdvlp17155"><title>Derby databases live in a
+system, which includes system-wide properties, an error log, and one or more
+databases.</title>
 <image href="system_os.gif" placement="break"><alt>Derby databases live in
 a system, which includes system-wide properties, an error log, and one or
 more databases.</alt></image>
@@ -59,4 +59,3 @@
 automatically becomes part of the current system.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp27715.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,33 @@
 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="cdevdvlp27715">
+<concept id="cdevdvlp27715" xml:lang="en-us">
 <title>Booting databases</title>
+<shortdesc>The default configuration for <ph conref="devconrefs.dita#prod/productshortname"></ph> is
+to <i>boot</i> (or start) a database when an application first makes a connection
+to it. When <ph conref="devconrefs.dita#prod/productshortname"></ph> boots
+a database, it checks to see if recovery needs to be run on the database,
+so in some unusual cases booting can take some time.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Automatic booting<indexterm>of databases in system</indexterm></indexterm>
+<keywords><indexterm>Automatic booting<indexterm>of databases in system</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>The default configuration for <ph conref="devconrefs.dita#prod/productshortname"></ph> is to <i>boot</i> (or start) a database when an application first makes a connection to
-it. When <ph conref="devconrefs.dita#prod/productshortname"></ph> boots a database, it checks to see if recovery needs
-to be run on the database, so in some unusual cases booting can take some
-time.</p>
 <p>You can also configure your system to automatically boot all databases
-in the system when it starts up; see <i>derby.system.bootAll</i> in the <ph conref="devconrefs.dita#pub/cittuning"></ph> manual. Because of the time needed to boot a database,
-the number of databases in the system directory affects startup performance
-if you use that configuration. </p>
-<p>Once a database has been booted within a <ph conref="devconrefs.dita#prod/productshortname"></ph> system, it remains
-active until the <ph conref="devconrefs.dita#prod/productshortname"></ph> system has been shut down or until you shut down
-the database individually.</p>
-<p>When <ph conref="devconrefs.dita#prod/productshortname"></ph> boots a database, it prints a message in the error log:</p>
-<codeblock>2005-06-10 03:54:06.196 GMT: Booting <ph conref="devconrefs.dita#prod/productshortname"></ph> version <ph conref="devconrefs.dita#prod/productlongname"></ph>
+in the system when it starts up; see <i>derby.system.bootAll</i> in the <ph
+conref="devconrefs.dita#pub/cittuning"></ph> manual. Because of the time needed
+to boot a database, the number of databases in the system directory affects
+startup performance if you use that configuration. </p>
+<p>Once a database has been booted within a <ph conref="devconrefs.dita#prod/productshortname"></ph> system,
+it remains active until the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
+has been shut down or until you shut down the database individually.</p>
+<p>When <ph conref="devconrefs.dita#prod/productshortname"></ph> boots a database,
+it prints a message in the error log:</p>
+<codeblock>2005-06-10 03:54:06.196 GMT: Booting <ph conref="devconrefs.dita#prod/productshortname"></ph> version <ph
+conref="devconrefs.dita#prod/productlongname"></ph>
 - 10.0.0.1 - (29612): instance c013800d-00fd-0cb0-e736-ffffd1025a25 on
 database directory sample</codeblock>
-<p>The number of databases running in a <ph conref="devconrefs.dita#prod/productshortname"></ph> system is limited only
-by the amount of memory available in the JVM.</p>
-</conbody></concept>
+<p>The number of databases running in a <ph conref="devconrefs.dita#prod/productshortname"></ph> system
+is limited only by the amount of memory available in the JVM.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp30653.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp30653.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp30653.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp30653.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,35 +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="cdevdvlp30653">
+<concept id="cdevdvlp30653" xml:lang="en-us">
 <title>Database limitations</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> databases
+have a few limitations.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Limitations<indexterm>in current version</indexterm></indexterm>
-<indexterm>Indexes<indexterm>limitations of</indexterm><indexterm>not supported for CLOB, BLOB, and LONG VARCHAR data types</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Limitations<indexterm>in current version</indexterm></indexterm>
+<indexterm>Indexes<indexterm>limitations of</indexterm><indexterm>not supported
+for CLOB, BLOB, and LONG VARCHAR data types</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> databases have these limitations:</p>
 <ul>
-<li><i>Indexes are not supported for columns defined on CLOB,
-BLOB, and LONG VARCHAR data types.</i>  
-<p>If the length of the key columns
-in an index is larger than half the page size of the index, creating an index
-on those key columns for the table fails. For existing indexes, an insert
-of new rows for which the key columns are larger than half of the index page
-size causes the insert to fail.</p>
-<p>It is generally not recommended to create
-indexes on long columns. It is best to create indexes on small columns that
-provide a quick look-up to larger, unwieldy data in the row. You might not
-see performance improvements if you index long columns. For information about
-indexes, see <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>. </p></li>
-<li><i>The system shuts down if the database log cannot allocate
-more disk space.</i>  
-<p>A "LogFull" error or some sort of <codeph><i>IOException</i></codeph> will occur in the <i>derby.log </i> if the system runs out of space. If the system has no more
-disk space to append to the <i>derby.log</i>, you might not
-see the error messages.</p></li>
+<li><i>Indexes are not supported for columns defined on CLOB, BLOB, and LONG
+VARCHAR data types.</i>   <p>If the length of the key columns in an index
+is larger than half the page size of the index, creating an index on those
+key columns for the table fails. For existing indexes, an insert of new rows
+for which the key columns are larger than half of the index page size causes
+the insert to fail.</p> <p>It is generally not recommended to create indexes
+on long columns. It is best to create indexes on small columns that provide
+a quick look-up to larger, unwieldy data in the row. You might not see performance
+improvements if you index long columns. For information about indexes, see <cite><ph
+conref="devconrefs.dita#pub/cittuning"></ph></cite>. </p></li>
+<li><i>The system shuts down if the database log cannot allocate more disk
+space.</i>   <p>A "LogFull" error or some sort of <codeph><i>IOException</i></codeph> will
+occur in the <i>derby.log </i> if the system runs out of space. If the system
+has no more disk space to append to the <i>derby.log</i>, you might not see
+the error messages.</p></li>
 </ul>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp34964.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp34964.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp34964.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp34964.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,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 xml:lang="en-us" id="cdevdvlp34964">
+<concept id="cdevdvlp34964" xml:lang="en-us">
 <title>Connecting to databases</title>
-<prolog>
-</prolog>
+<shortdesc>You connect to a database using a form of the <ph conref="devconrefs.dita#prod/productshortname"></ph> connection
+URL as an argument to the <i>DriverManager.getConnection</i> call.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>You connect to a database using a form of the <ph conref="devconrefs.dita#prod/productshortname"></ph> connection URL as an argument
-to the <i>DriverManager.getConnection</i> call (see <xref href="cdevdvlp17453.dita#cdevdvlp17453"/>). You specify a path to the database within
-this connection URL.</p>
-</conbody></concept>
+<p>You specify a path to the database within this connection URL.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp39409.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp39409.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp39409.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp39409.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="cdevdvlp39409">
+<concept id="cdevdvlp39409" xml:lang="en-us">
 <title>Derby embedded basics</title>
-<prolog>
-</prolog>
-<conbody>
-<p>This section discusses the basics of the <ph conref="devconrefs.dita#prod/productshortname"></ph> database.</p>
-</conbody></concept>
+<shortdesc>This section discusses the basics of the <ph conref="devconrefs.dita#prod/productshortname"></ph> database.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp39943.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp39943.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp39943.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp39943.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="cdevdvlp39943">
+<concept id="cdevdvlp39943" xml:lang="en-us">
 <title>derby.properties</title>
+<shortdesc>The text file <i>derby.properties</i> contains the definition of
+properties, or configuration parameters valid for the entire system.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>derby.properties file</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>derby.properties file</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>The text file <i>derby.properties</i> contains the definition
-of properties, or configuration parameters valid for the entire system. This
-file is not automatically created; if you wish to set <ph conref="devconrefs.dita#prod/productshortname"></ph> properties
+<p>This file is not automatically created; if you wish to set <ph conref="devconrefs.dita#prod/productshortname"></ph> properties
 with this file, you need to create it yourself. The file should be in the
 format created by the <codeph><i>java.util.Properties.save</i></codeph> method.
-For more information about properties and the <ph conref="devconrefs.dita#prod/productshortname"></ph>.properties file, see <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
-</conbody></concept>
+For more information about properties and the <ph conref="devconrefs.dita#prod/productshortname"></ph>.properties
+file, see <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp40170.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp40170.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp40170.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp40170.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,17 @@
 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="cdevdvlp40170">
+<concept id="cdevdvlp40170" xml:lang="en-us">
 <title>Embedded Derby JDBC driver</title>
+<shortdesc>The <ph conref="devconrefs.dita#prod/productshortname"></ph> driver
+class name for the embedded environment is <i>org.apache.derby.jdbc.EmbeddedDriver</i>.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>JDBC driver (embedded)</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>JDBC driver (embedded)</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>The <ph conref="devconrefs.dita#prod/productshortname"></ph> driver class name for the embedded environment is <i>org.apache.derby.jdbc.EmbeddedDriver</i>. In a Java application, you typically load the driver with the static <codeph><i>Class.forName</i></codeph> method or with the <codeph><i>jdbc.drivers</i></codeph> system property. For more information, see "Starting
-<ph conref="devconrefs.dita#prod/productshortname"></ph> as an Embedded Database".</p>
-<p>For detailed information about loading the <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC driver, see <i>"java.sql.Driver"</i> in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite><cite>.</cite></p>
-</conbody></concept>
+<p>In a Java application, you typically load the driver with the static <codeph><i>Class.forName</i></codeph> method
+or with the <codeph><i>jdbc.drivers</i></codeph> system property.</p>
+<p>For detailed information about loading the <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC
+driver, see <i>"java.sql.Driver"</i> in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp40350.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,43 +17,42 @@
 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="cdevdvlp40350">
+<concept id="cdevdvlp40350" xml:lang="en-us">
 <title>Conventions for specifying the database path</title>
+<shortdesc>When accessing databases from the file system (instead of from
+classpath or a jar file), any path that is not absolute is interpreted as
+relative to the system directory.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Databases<indexterm>convention for specifying connection
-path when outside system</indexterm></indexterm>
-<indexterm>directory subsubprotocol</indexterm>
+<keywords><indexterm>Databases<indexterm>convention for specifying connection
+path when outside system</indexterm></indexterm><indexterm>directory subsubprotocol</indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>When accessing databases from the file system (instead of from classpath
-or a jar file), any path that is not absolute is interpreted as relative to
-the system directory. </p>
 <p>The path must do one of the following:</p>
 <ul>
 <li>refer to a previously created <ph conref="devconrefs.dita#prod/productshortname"></ph> database</li>
 <li>specify the <i>create=true</i> attribute</li>
 </ul>
-<p>The path separator in the connection URL is / (forward slash), as in the standard <i>file:// </i>URL protocol.</p>
+<p>The path separator in the connection URL is / (forward slash), as in the
+standard <i>file:// </i>URL protocol.</p>
 <p>You can specify only databases that are local to the machine on which the
 JVM is running. NFS file systems on UNIX and remote shared files on Windows
-(//<i>machine/directory</i>) are not guaranteed to work.
-Using <i>derby.system.home</i> and forward slashes is recommended
-practice for platform independent applications.</p>
+(//<i>machine/directory</i>) are not guaranteed to work. Using <i>derby.system.home</i> and
+forward slashes is recommended practice for platform independent applications.</p>
 <p>If two different database name values, relative or absolute, refer to the
 same actual directory, they are considered equivalent. This means that connections
 to a database through its absolute path and its relative path are connections
-to the same database. Within <ph conref="devconrefs.dita#prod/productshortname"></ph>, the name of the database is defined
-by the canonical path of its directory from <cite>java.io.File.getCanonicalPath</cite>.</p>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> automatically creates any intermediate directory that does
-not already exist when creating a new database. If it cannot create the intermediate
-directory, the database creation fails.</p>
+to the same database. Within <ph conref="devconrefs.dita#prod/productshortname"></ph>,
+the name of the database is defined by the canonical path of its directory
+from <cite>java.io.File.getCanonicalPath</cite>.</p>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> automatically
+creates any intermediate directory that does not already exist when creating
+a new database. If it cannot create the intermediate directory, the database
+creation fails.</p>
 <p>If the path to the database is ambiguous, i.e., potentially the same as
 that to a database that is available on the classpath (see "Special Database
-Access"), use the <i>directory:</i> subsubprotocol to
-specify the one in the file system. For example:</p>
+Access"), use the <i>directory:</i> subsubprotocol to specify the one in the
+file system. For example:</p>
 <codeblock>jdbc:derby:directory:myDB</codeblock>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp40653.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,25 @@
 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="cdevdvlp40653">
+<concept id="cdevdvlp40653" xml:lang="en-us">
 <title>Derby JDBC driver</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> consists
+of both the database engine and an embedded JDBC driver. Applications use
+JDBC to interact with a database. Applications must load the driver in order
+to work with the database.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>JDBC driver<indexterm>description</indexterm></indexterm>
+<keywords><indexterm>JDBC driver<indexterm>description</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> consists of both the database engine and an embedded JDBC driver.
-Applications use JDBC to interact with a database. Applications must load
-the driver in order to work with the database.</p>
 <p>In an embedded environment, loading the driver also starts <ph conref="devconrefs.dita#prod/productshortname"></ph>.</p>
-<p>In a Java application, you typically load the driver with the static <i>Class.forName</i> method or with the <codeph><i>jdbc.drivers</i></codeph> system property. For example:</p>
+<p>In a Java application, you typically load the driver with the static <i>Class.forName</i> method
+or with the <codeph><i>jdbc.drivers</i></codeph> system property. For example:</p>
 <codeblock>
 Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
 </codeblock>
-<p>For detailed information about loading the <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC driver, see <i>"java.sql.Driver" </i> in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite><cite>.</cite><ph> See also javadoc for org.apache.derby.util.DriverUtil.</ph></p>
-</conbody></concept>
+<p>For detailed information about loading the <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC
+driver, see <i>"java.sql.Driver" </i> in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite><cite>.</cite><ph> See
+also javadoc for org.apache.derby.util.DriverUtil.</ph></p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp40724.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp40724.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp40724.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp40724.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -18,6 +19,9 @@
 -->
 <concept id="cdevdvlp40724" xml:lang="en-us">
 <title>The database directory</title>
+<shortdesc>A <ph conref="devconrefs.dita#prod/productshortname"></ph> database
+is stored in files that live in a directory of the same name as the database.
+Database directories typically live in <i>system</i> directories.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>log directory<indexterm>function</indexterm></indexterm>
 <indexterm>seg0 directory</indexterm><indexterm>service.properties file</indexterm>
@@ -31,9 +35,6 @@
 limitations</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>A <ph conref="devconrefs.dita#prod/productshortname"></ph> database is
-stored in files that live in a directory of the same name as the database.
-Database directories typically live in <i>system</i> directories.</p>
 <p>A database directory contains the following, as shown in <xref href="cdevdvlp40724.dita#cdevdvlp40724/rdevdvlp31476"></xref>:</p>
 <ul>
 <li><i>log</i> directory <p>Contains files that make up the database transaction
@@ -56,15 +57,15 @@
 information, see <xref href="cdevdeploy11201.dita#cdevdeploy11201"></xref>.</p>
 <fig expanse="column" id="rdevdvlp31476"><title><ph conref="devconrefs.dita#prod/productshortname"></ph> database
 directories contain files and directories used by the software.</title>
-<image href="dbcont.gif" placement="break"><alt>A Derby database
-directory containing files and directories.</alt></image>
+<image href="dbcont.gif" placement="break"><alt>A Derby database directory
+containing files and directories.</alt></image>
 </fig>
 <p><ph conref="devconrefs.dita#prod/productshortname"></ph> imposes relatively
 few limitations on the number and size of databases and database objects.
 The following table shows some size limitations of <ph conref="devconrefs.dita#prod/productshortname"></ph> databases
 and database objects:</p>
-<table id="cdevdvlp85623" rowheader="firstcol"><title>Size Limits
-to Derby Database Objects</title>
+<table id="cdevdvlp85623" rowheader="firstcol"><title>Size Limits to Derby
+Database Objects</title>
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="40*"/>
 <colspec colname="2" colnum="2" colwidth="60*"/>
 <thead>
@@ -113,4 +114,3 @@
 and database objects, see the <i><ph conref="devconrefs.dita#pub/citref"></ph></i>.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp42173.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp42173.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp42173.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp42173.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,29 +17,26 @@
 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="cdevdvlp42173">
+<concept id="cdevdvlp42173" xml:lang="en-us">
 <title>Creating, dropping, and backing up databases</title>
+<shortdesc>You create new databases and access existing ones by specifying
+attributes to the <ph conref="devconrefs.dita#prod/productshortname"></ph> connection
+URL.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Databases<indexterm>dropping</indexterm></indexterm>
-<indexterm>Dropping databases</indexterm>
-<indexterm>Backing up databases</indexterm>
-<indexterm>Databases<indexterm>backing up</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Databases<indexterm>dropping</indexterm></indexterm>
+<indexterm>Dropping databases</indexterm><indexterm>Backing up databases</indexterm>
+<indexterm>Databases<indexterm>backing up</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>You create new databases and access existing ones by specifying attributes
-to the <ph conref="devconrefs.dita#prod/productshortname"></ph> connection URL (see <xref href="rdevdvlp22102.dita#rdevdvlp22102"/>).</p>
 <p>There is no drop database command. To drop a database, delete the database
 directory with operating system commands. The database must not be booted
-when you remove a database. You can get a list of booted databases with <i>getPropertyInfo</i> (see <xref href="cdevadvjdbc41138.dita#cdevadvjdbc41138"/>).</p>
+when you remove a database. You can get a list of booted databases with <i>getPropertyInfo</i>.</p>
 <p>To back up a database, you can use the online backup utility. For information
 on this utility, see the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite>.</p>
-<p>You can also use <i>roll-forward recovery</i> to recover
-a damaged database. <ph conref="devconrefs.dita#prod/productshortname"></ph> accomplishes roll-forward recovery by using a full
-backup copy of the database, archived logs, and active logs from the most
-recent time before a failure. For more information on roll-forward recovery
-see the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite>.</p>
-</conbody></concept>
+<p>You can also use <i>roll-forward recovery</i> to recover a damaged database. <ph
+conref="devconrefs.dita#prod/productshortname"></ph> accomplishes roll-forward
+recovery by using a full backup copy of the database, archived logs, and active
+logs from the most recent time before a failure. For more information on roll-forward
+recovery see the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite>.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp51654.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,25 @@
 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="cdevdvlp51654">
+<concept id="cdevdvlp51654" xml:lang="en-us">
 <title>Working with the database connection URL attributes</title>
+<shortdesc>You specify attributes on the <ph conref="devconrefs.dita#prod/productshortname"></ph> connection
+URL.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Attributes to database connection URL</indexterm>
-<indexterm>Attributes to database connection URL<indexterm>setting</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Attributes to database connection URL</indexterm><indexterm>Attributes
+to database connection URL<indexterm>setting</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>You specify attributes on the <ph conref="devconrefs.dita#prod/productshortname"></ph> connection URL (see <xref href="cdevdvlp17453.dita#cdevdvlp17453"/>). The examples in this section use the syntax of the connection URL for
-use in an embedded environment. You can also specify these same attributes
-and values on the client connection URL if you are using <ph conref="devconrefs.dita#prod/productshortname"></ph> as a database
-server. For more information, see the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite>.</p>
-<p>You can also set these attributes by passing a <i>Properties</i> object along with a connection URL to <codeph><i>DriverManager.getConnection</i></codeph> when obtaining a connection; see "Specifying Attributes in
-a Properties Object".</p>
-<p>All attributes are optional. For detailed information about the connection URL syntax
-and attributes, see "<ph conref="devconrefs.dita#prod/productshortname"></ph> Database Connection URL Syntax"in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
+<p>The examples in this section use the syntax of the connection URL for use
+in an embedded environment. You can also specify these same attributes and
+values on the client connection URL if you are using <ph conref="devconrefs.dita#prod/productshortname"></ph> as
+a database server. For more information, see the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite>.</p>
+<p>You can also set these attributes by passing a <i>Properties</i> object
+along with a connection URL to <codeph><i>DriverManager.getConnection</i></codeph> when
+obtaining a connection; see "Specifying Attributes in a Properties Object".</p>
+<p>All attributes are optional. For detailed information about the connection
+URL syntax and attributes, see "<ph conref="devconrefs.dita#prod/productshortname"></ph> Database
+Connection URL Syntax"in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
 <p>You can specify the following attributes:</p>
 <ul>
 <li><i>bootPassword=key</i>  </li>
@@ -50,4 +53,5 @@
 <li><i>shutdown=true</i>  </li>
 <li><i>user=userName</i>  </li>
 </ul>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp84026.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp84026.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp84026.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp84026.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,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 xml:lang="en-us" id="cdevdvlp84026">
+<concept id="cdevdvlp84026" xml:lang="en-us">
 <title>Log on separate device</title>
-<prolog>
-</prolog>
+<shortdesc>You can put a database's log on a separate device when you create
+it.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>You can put a database's log on a separate device when you create it.
-For more information, see the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite>.</p>
-</conbody></concept>
+<p>For more information, see the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite>.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp845973.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp845973.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp845973.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp845973.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -18,11 +19,10 @@
 -->
 <concept id="cdevdvlp845973" xml:lang="en-us">
 <title>Single database shutdown</title>
+<shortdesc>An application can shut down a single database within a <ph conref="devconrefs.dita#prod/productshortname"></ph> system
+and leave the rest of the system running.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Shutting down a single database</indexterm></keywords>
 </metadata></prolog>
-<conbody>
-<p>An application can shut down a single database within a <ph conref="devconrefs.dita#prod/productshortname"></ph> system
-and leave the rest of the system running. See <xref href="tdevdvlp40464.dita#tdevdvlp40464"></xref>.</p>
-</conbody>
+<conbody></conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp846110.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp846110.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp846110.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp846110.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,17 @@
 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="cdevdvlp846110">
+<concept id="cdevdvlp846110" xml:lang="en-us">
 <title>Database-wide properties</title>
+<shortdesc>You can set many <ph conref="devconrefs.dita#prod/productshortname"></ph> properties
+as database-level properties. When set in this way, they are stored in the
+database and "travel" with the database unless overridden by a system property.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Databases<indexterm>configuring</indexterm></indexterm>
+<keywords><indexterm>Databases<indexterm>configuring</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>You can set many <ph conref="devconrefs.dita#prod/productshortname"></ph> properties as database-level properties. When
-set in this way, they are stored in the database and "travel" with
-the database unless overridden by a system property. For more information,
-see "Database-Wide Properties" in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
-<note>You should work with database-level properties
-wherever possible.</note>
-</conbody></concept>
+<p>For more information, see "Database-Wide Properties" in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
+<note>You should work with database-level properties wherever possible.</note>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp846369.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp846369.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp846369.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp846369.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="cdevdvlp846369">
+<concept id="cdevdvlp846369" xml:lang="en-us">
 <title>Connecting to databases within the system</title>
+<shortdesc>The standard way to access databases is in the file system by specifying
+the path to the database, either absolute or relative to the system directory.
+In a client/server environment, this path is always on the <i>server</i> machine.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Databases<indexterm>connecting to within system</indexterm></indexterm>
+<keywords><indexterm>Databases<indexterm>connecting to within system</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>The standard way to access databases is in the file system by specifying
-the path to the database, either absolute or relative to the system directory.
-In a client/server environment, this path is always on the <i>server</i> machine.</p>
 <p>By default, you can connect to databases within the current system directory
-(see <xref href="cdevdvlp13018.dita#cdevdvlp13018"/>). To connect to databases within
-the current system, just specify the database name on the connection URL. For example,
-if your system directory contains a database called <i>myDB</i>, you can connect to that database with the following connection URL:</p>
+(see <xref href="cdevdvlp13018.dita#cdevdvlp13018"></xref>). To connect to
+databases within the current system, just specify the database name on the
+connection URL. For example, if your system directory contains a database
+called <i>myDB</i>, you can connect to that database with the following connection
+URL:</p>
 <codeblock>jdbc:derby:myDB</codeblock>
 <p>The full call within a Java program would be:</p>
 <codeblock>Connection conn =DriverManager.getConnection("jdbc:derby:myDB");</codeblock>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp846402.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp846402.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp846402.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp846402.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,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="cdevdvlp846402">
+<concept id="cdevdvlp846402" xml:lang="en-us">
 <title>Connecting to databases outside the system directory</title>
+<shortdesc>You can also connect to databases in other directories (including
+subdirectories of the system directory) by specifying a relative or absolute
+path name to identify the database. The way you specify an absolute path is
+defined by the host operating system.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Databases<indexterm>connecting to outside system</indexterm></indexterm>
+<keywords><indexterm>Databases<indexterm>connecting to outside system</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>You can also connect to databases in other directories (including subdirectories
-of the system directory) by specifying a relative or absolute path name to
-identify the database. The way you specify an absolute path is defined by
-the host operating system (see <cite>java.io.File.isAbsolute</cite>).
-You must specify a path for a database in a directory other than the system
-directory even if you have defined the <codeph><i>derby.service</i></codeph> property to have <ph conref="devconrefs.dita#prod/productshortname"></ph> boot the database automatically (see <i>"derby.service"</i> in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>).</p>
-<p>Using the connection URL as described here, you can connect to databases in more
-than one directory at a time.</p>
+<p>You must specify a path for a database in a directory other than the system
+directory even if you have defined the <codeph><i>derby.service</i></codeph> property
+to have <ph conref="devconrefs.dita#prod/productshortname"></ph> boot the
+database automatically (see <i>"derby.service"</i> in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>).</p>
+<p>Using the connection URL as described here, you can connect to databases
+in more than one directory at a time.</p>
 <p>Two examples:</p>
 <codeblock>jdbc:derby:../otherDirectory/myDB
 
 jdbc:<ph conref="devconrefs.dita#prod/productlowercase"></ph>:c:/otherDirectory/myDB</codeblock>
-<note>Once connected to, such a database becomes a part of the <ph conref="devconrefs.dita#prod/productshortname"></ph> system,
+<note>Once connected, such a database becomes a part of the <ph conref="devconrefs.dita#prod/productshortname"></ph> system,
 even though it is not in the system directory. This means that it takes on
-the system-wide properties of the system and that no other instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> should
-access that database, among other things. It is recommended that you connect
-to databases only in the system directory. See <xref href="cdevdvlp19297.dita#cdevdvlp19297"/> for suggestions about working with a <ph conref="devconrefs.dita#prod/productshortname"></ph> system.</note>
-</conbody></concept>
+the system-wide properties of the system and no other instance of <ph conref="devconrefs.dita#prod/productshortname"></ph> should
+access that database. It is recommended that you connect to databases only
+in the system directory.</note>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp91854.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,33 @@
 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="cdevdvlp91854">
+<concept id="cdevdvlp91854" xml:lang="en-us">
 <title>Accessing databases from the classpath</title>
+<shortdesc>In most cases, you access databases from the file system. However,
+it is also possible to access databases from the classpath. The databases
+can be archived into a jar or zip file or left as is.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Classpath<indexterm>accessing databases from</indexterm></indexterm>
+<keywords><indexterm>Classpath<indexterm>accessing databases from</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>In most cases, you access databases from the file system as described above.
-However, it is also possible to access databases from the classpath. The
-databases can be archived into a jar or zip file or left as is.</p>
 <p>All such databases are read-only.</p>
-<p>To access an unarchived database from the classpath, specify the name
-of the database relative to the directory in the classpath. You can use the
-classpath subprotocol if such a database is ambiguous within the directory
-system. See <xref href="rdevdvlp38881.dita#rdevdvlp38881"/> for more information.</p>
-<p>For example, for a database called <i>sample</i> in <i>C:\<ph conref="devconrefs.dita#prod/productlowercase"></ph>\demo\databases</i>, you can put the <i>C:\<ph conref="devconrefs.dita#prod/productlowercase"></ph>\demo\databases</i> directory in the
-classpath and access <i>sample</i> like this:</p>
+<p>To access an unarchived database from the classpath, specify the name of
+the database relative to the directory in the classpath. You can use the classpath
+subprotocol if such a database is ambiguous within the directory system. See <xref
+href="rdevdvlp38881.dita#rdevdvlp38881"></xref> for more information.</p>
+<p>For example, for a database called <i>sample</i> in <i>C:\<ph conref="devconrefs.dita#prod/productlowercase"></ph>\demo\databases</i>,
+you can put the <i>C:\<ph conref="devconrefs.dita#prod/productlowercase"></ph>\demo\databases</i> directory
+in the classpath and access <i>sample</i> like this:</p>
 <codeblock>
 jdbc:derby:/sample
 </codeblock>
-<p>The forward slash is required before <i>sample</i> to
-indicate that it is relative to <i>C:\<ph conref="devconrefs.dita#prod/productlowercase"></ph>\demo\databases</i> directory.</p>
-<p>If only <i>C:\<ph conref="devconrefs.dita#prod/productlowercase"></ph></i> were in the class
-path, you could access <i>sample</i> (read-only) like this:</p>
+<p>The forward slash is required before <i>sample</i> to indicate that it
+is relative to <i>C:\<ph conref="devconrefs.dita#prod/productlowercase"></ph>\demo\databases</i> directory.</p>
+<p>If only <i>C:\<ph conref="devconrefs.dita#prod/productlowercase"></ph></i> were
+in the class path, you could access <i>sample</i> (read-only) like this:</p>
 <codeblock>
 jdbc:derby:/demo/databases/sample
 </codeblock>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp96597.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevdvlp96597.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp96597.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp96597.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,21 +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="cdevdvlp96597">
+<concept id="cdevdvlp96597" xml:lang="en-us">
 <title>One Derby instance for each Java Virtual Machine</title>
+<shortdesc>You could potentially have two instances of a <ph conref="devconrefs.dita#prod/productshortname"></ph> system
+(JVM) running on the same machine at the same time. Each instance must run
+in a different JVM. Two separate instances of <ph conref="devconrefs.dita#prod/productshortname"></ph> must
+not access the same database.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Multiple JVMs accessing<indexterm>prohibition of</indexterm></indexterm><indexterm> single system<indexterm>prohibition of</indexterm></indexterm>
+<keywords><indexterm>Multiple JVMs accessing<indexterm>prohibition of</indexterm></indexterm>
+<indexterm> single system<indexterm>prohibition of</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>You could potentially have two instances of a <ph conref="devconrefs.dita#prod/productshortname"></ph> system (JVM)
-running on the same machine at the same time. Each instance must run in a
-different JVM. Two separate instances of <ph conref="devconrefs.dita#prod/productshortname"></ph> must not access the same
-database. For example, in an embedded environment, an application that accesses <ph conref="devconrefs.dita#prod/productshortname"></ph> databases
-starts up the local JDBC driver, which starts up an instance of <ph conref="devconrefs.dita#prod/productshortname"></ph>.
+<p>For example, in an embedded environment, an application that accesses <ph
+conref="devconrefs.dita#prod/productshortname"></ph> databases starts up the
+local JDBC driver, which starts up an instance of <ph conref="devconrefs.dita#prod/productshortname"></ph>.
 If you start another application, such as ij, and connect to the same database,
-severe database corruption can result. See <xref href="cdevdvlp20458.dita#cdevdvlp20458"/>.</p>
-</conbody></concept>
+severe database corruption can result. See <xref href="cdevdvlp20458.dita#cdevdvlp20458"></xref>.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevin10613.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevin10613.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevin10613.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevin10613.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,21 +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="cdevin10613">
+<concept id="cdevin10613" xml:lang="en-us">
 <title>Localizing Derby</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> offers
+support for locales.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Localization</indexterm>
-<indexterm>Internationalization</indexterm>
-<indexterm>Locales<indexterm>definition</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Localization</indexterm><indexterm>Internationalization</indexterm>
+<indexterm>Locales<indexterm>definition</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> offers support for locales. The word <i>locale</i> in the Java platform refers to an instance of a class that identifies
-a particular combination of language and region. If a Java class varies its
-behavior according to <i>locale</i>, it is said to be locale-sensitive. <ph conref="devconrefs.dita#prod/productshortname"></ph> provides
+<p>The word <i>locale</i> in the Java platform refers to an instance of a
+class that identifies a particular combination of language and region. If
+a Java class varies its behavior according to <i>locale</i>, it is said to
+be locale-sensitive. <ph conref="devconrefs.dita#prod/productshortname"></ph> provides
 some support for locales for databases and other components such as the tools
 and the installer.</p>
 <p>It also provides a feature to support databases in many different languages,
@@ -36,4 +37,5 @@
 <p>When you create or upgrade a database, you can use the territory attribute
 to associate a non-default territory with the database. For information about
 how to use the territory attribute, see the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevin38113.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevin38113.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevin38113.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevin38113.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,49 @@
 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="cdevin38113">
+<concept id="cdevin38113" xml:lang="en-us">
 <title>Messages libraries</title>
+<shortdesc>The following list describes the items required in order for <ph
+conref="devconrefs.dita#prod/productshortname"></ph> to provide localized
+messages.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Locales<indexterm>special library requirements</indexterm></indexterm>
+<keywords><indexterm>Locales<indexterm>special library requirements</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>For <ph conref="devconrefs.dita#prod/productshortname"></ph> to provide localized messages:</p>
 <ul>
-<li>You must have the locale-specific <ph conref="devconrefs.dita#prod/productshortname"></ph> jar file. <ph conref="devconrefs.dita#prod/productshortname"></ph> provides
-such jars for only some locales. You will find the locale jar files in the
-/lib directory in your <ph conref="devconrefs.dita#prod/productshortname"></ph> installation.</li>
-<li>The locale-specific <ph conref="devconrefs.dita#prod/productshortname"></ph> jar file must be in the classpath.</li>
+<li>You must have the locale-specific <ph conref="devconrefs.dita#prod/productshortname"></ph> jar
+file. <ph conref="devconrefs.dita#prod/productshortname"></ph> provides such
+jars for only some locales. You will find the locale jar files in the /lib
+directory in your <ph conref="devconrefs.dita#prod/productshortname"></ph> installation.</li>
+<li>The locale-specific <ph conref="devconrefs.dita#prod/productshortname"></ph> jar
+file must be in the classpath.</li>
 </ul>
-<p>The locale-specific <ph conref="devconrefs.dita#prod/productshortname"></ph> jar file is named <i><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_ll_CC.jar</i>, where<i> ll</i> is the two-letter code for language,
-and <i>CC</i> is the two-letter code for country. For example,
-the name of the jar file for error messages for the German locale is <codeph><i><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_de_DE.jar.</i></codeph></p>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> supports the following locales:
-<ul>
-<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_de_DE.jar German </li>
-<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_es.jar - Spanish </li>
-<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_fr.jar - French </li>
-<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_it.jar - Italian </li>
-<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_ja_JP.jar - Japanese </li>
-<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_ko_KR.jar - Korean </li>
-<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_pt_BR.jar - Brazilian Portuguese </li>
-<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_zh_CN.jar - Simplified Chinese </li>
-<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_zh_TW.jar - Traditional Chinese</li>
+<p>The locale-specific <ph conref="devconrefs.dita#prod/productshortname"></ph> jar
+file is named <i><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_ll_CC.jar</i>,
+where<i> ll</i> is the two-letter code for language, and <i>CC</i> is the
+two-letter code for country. For example, the name of the jar file for error
+messages for the German locale is <codeph><i><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_de_DE.jar.</i></codeph></p>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> supports the following
+locales: <ul>
+<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_de_DE.jar
+German </li>
+<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_es.jar
+- Spanish </li>
+<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_fr.jar
+- French </li>
+<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_it.jar
+- Italian </li>
+<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_ja_JP.jar
+- Japanese </li>
+<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_ko_KR.jar
+- Korean </li>
+<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_pt_BR.jar
+- Brazilian Portuguese </li>
+<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_zh_CN.jar
+- Simplified Chinese </li>
+<li><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_zh_TW.jar
+- Traditional Chinese</li>
 </ul></p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevin55108.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevin55108.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevin55108.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevin55108.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -18,13 +19,13 @@
 -->
 <concept id="cdevin55108" xml:lang="en-us">
 <title>Other components</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> also provides
+locale support for the following components.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Error messages<indexterm>localized</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> also provides
-locale support for the following: </p>
 <ul>
 <li>Database error messages are in the language of the locale, if support
 is explicitly provided for that locale with a special library.   <p>For example, <ph
@@ -38,7 +39,7 @@
 localization of the <ph conref="devconrefs.dita#prod/productshortname"></ph> tools,
 see the <cite><ph conref="devconrefs.dita#pub/citutilities"></ph></cite>. </p></li>
 </ul>
-<p>Localized messages require special libraries. See <xref href="cdevin38113.dita#cdevin38113"></xref>.</p>
+<p>Localized messages require special libraries.</p>
 <p>The locale of the error messages and of the tools is not determined by
 the database's localle set by the <i>locale=ll_CC</i> attribute when the database
 is created but instead by the default system locale. This means that it is

Modified: db/derby/docs/trunk/src/devguide/cdevin71274.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevin71274.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevin71274.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevin71274.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,18 +17,16 @@
 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="cdevin71274">
+<concept id="cdevin71274" xml:lang="en-us">
 <title>SQL parser support for Unicode</title>
+<shortdesc>To support users in many different languages, <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+SQL parser understands all Unicode characters and allows any Unicode character
+or number to be used in an identifier.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Unicode support</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Unicode support</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>To support users in many different languages, <ph conref="devconrefs.dita#prod/productshortname"></ph>'s SQL parser
-understands all Unicode characters and allows any Unicode character or number
-to be used in an identifier. <ph conref="devconrefs.dita#prod/productshortname"></ph> does not attempt to ensure that the
-characters in identifiers are valid in the database's locale.</p>
-</conbody></concept>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> does not attempt
+to ensure that the characters in identifiers are valid in the database's locale.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevresman19524.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevresman19524.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevresman19524.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevresman19524.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -18,22 +19,23 @@
 -->
 <concept id="cdevresman19524" xml:lang="en-us">
 <title>Using Derby as a J2EE resource manager</title>
+<shortdesc>J2EE, or the Java 2 Platform, Enterprise Edition, is a standard
+for development of enterprise applications based on reusable components in
+a multi-tier environment. In addition to the features of the Java 2 Platform,
+Standard Edition (J2SE), J2EE adds support for Enterprise Java Beans (EJBs),
+Java Server Pages (JSPs), Servlets, XML and many more. The J2EE architecture
+is used to bring together existing technologies and enterprise applications
+in a single, manageable environment.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Resource manager<indexterm>Derby as in J2EE system</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>J2EE, or the Java 2 Platform, Enterprise Edition, is a standard for development
-of enterprise applications based on reusable components in a multi-tier environment.
-In addition to the features of the Java 2 Platform, Standard Edition (J2SE),
-J2EE adds support for Enterprise Java Beans (EJBs), Java Server Pages (JSPs),
-Servlets, XML and many more. The J2EE architecture is used to bring together
-existing technologies and enterprise applications in a single, manageable
-environment.</p>
 <p><ph conref="devconrefs.dita#prod/productshortname"></ph> is a J2EE-conformant
 component in a distributed J2EE system. As such, it is one part of a larger
 system that includes, among other things, a JNDI server, a connection pool
-module, a transaction manager, a resource manager, and user applications. Within this system, <ph conref="devconrefs.dita#prod/productshortname"></ph> can
+module, a transaction manager, a resource manager, and user applications.
+Within this system, <ph conref="devconrefs.dita#prod/productshortname"></ph> can
 serve as the resource manager.</p>
 <p>For more information on J2EE and how to work in this environment, see the
 J2EE specification available at <synph><var>http://java.sun.com/j2ee/docs.html</var></synph>.</p>

Modified: db/derby/docs/trunk/src/devguide/cdevresman89722.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevresman89722.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevresman89722.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevresman89722.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,13 @@
 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="cdevresman89722">
+<concept id="cdevresman89722" xml:lang="en-us">
 <title>Getting a DataSource</title>
-<prolog>
-</prolog>
+<shortdesc>Normally, you can simply work with the interfaces for <i>javax.sql.DataSource</i>, <codeph><i>javax.sql.ConnectionPoolDataSource</i></codeph
+>, and <codeph><i>javax.sql.XADataSource</i></codeph>, as shown in the following
+examples.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>Normally, you can simply work with the interfaces for <i>javax.sql.DataSource</i>, <codeph><i>javax.sql.ConnectionPoolDataSource</i></codeph>, and <codeph><i>javax.sql.XADataSource</i></codeph>,
-as shown in the following examples.</p>
 <codeblock>import org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource;
 import org.apache.derby.jdbc.EmbeddedDataSource;
 import org.apache.derby.jdbc.EmbeddedXADataSource; 
@@ -29,32 +31,32 @@
 javax.sql.ConnectionPoolDataSource cpds = new EmbeddedConnectionPoolDataSource(); 
 javax.sql.DataSource ds = new EmbeddedDataSource(); 
 javax.sql.XADataSource xads = new EmbeddedXADataSource();</codeblock>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides six properties for a <i>DataSource</i>. These properties are in <i>org.apache.derby.jdbc.EmbeddedDataSource</i>. They are:</p>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides six properties
+for a <i>DataSource</i>. These properties are in <i>org.apache.derby.jdbc.EmbeddedDataSource</i>.
+They are:</p>
 <ul>
-<li><i>DatabaseName</i>  
-<p>This mandatory property must
-be set. It identifies which database to access. If a database named wombat
-located at /local1/db/wombat is to be accessed, then one should call <i>setDatabaseName</i>("/local1/db/wombat") on the data source object. </p></li>
-<li><i>CreateDatabase</i>  
-<p>Optional. Sets a property to
-create a database the next time the <i>XADataSource.getXAConection()</i> method is called. The string <i>createString</i> is
-always "create" (or possibly null). (Use the method <codeph><i>setDatabaseName()</i></codeph> to define the name of the database.)</p></li>
-<li><i>ShutdownDatabase</i>  
-<p>Optional. Sets a property
-to shut down a database. The string <i>shutDownString</i> is
-always "shutdown" (or possibly null). Shuts down the database the
-next time <codeph><i>XADataSource.getXAConnection().getConnection()</i></codeph> method is called.</p></li>
-<li><i>DataSourceName</i>  
-<p>Optional. Name for ConnectionPooledDataSource
+<li><i>DatabaseName</i>   <p>This mandatory property must be set. It identifies
+which database to access. If a database named wombat located at /local1/db/wombat
+is to be accessed, then one should call <i>setDatabaseName</i>("/local1/db/wombat")
+on the data source object. </p></li>
+<li><i>CreateDatabase</i>   <p>Optional. Sets a property to create a database
+the next time the <i>XADataSource.getXAConection()</i> method is called. The
+string <i>createString</i> is always "create" (or possibly null). (Use the
+method <codeph><i>setDatabaseName()</i></codeph> to define the name of the
+database.)</p></li>
+<li><i>ShutdownDatabase</i>   <p>Optional. Sets a property to shut down a
+database. The string <i>shutDownString</i> is always "shutdown" (or possibly
+null). Shuts down the database the next time <codeph><i>XADataSource.getXAConnection().getConnection()</i></codeph> method
+is called.</p></li>
+<li><i>DataSourceName</i>   <p>Optional. Name for ConnectionPooledDataSource
 or XADataSource. Not used by the data source object. Used for informational
 purpose only. </p></li>
-<li><i>Description</i>  
-<p>Optional. Description of the data
-source. Not used by the data source object. Used for informational purpose
-only. </p></li>
-<li><i>connectionAttributes</i>  
-<p>Optional. Connection
-attributes specific to <ph conref="devconrefs.dita#prod/productshortname"></ph>. See the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite> for a more
-information about the attributes. </p></li>
+<li><i>Description</i>   <p>Optional. Description of the data source. Not
+used by the data source object. Used for informational purpose only. </p></li>
+<li><i>connectionAttributes</i>   <p>Optional. Connection attributes specific
+to <ph conref="devconrefs.dita#prod/productshortname"></ph>. See the <cite><ph
+conref="devconrefs.dita#pub/citref"></ph></cite> for a more information about
+the attributes. </p></li>
 </ul>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevresman92946.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevresman92946.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevresman92946.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevresman92946.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,13 @@
 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="cdevresman92946">
+<concept id="cdevresman92946" xml:lang="en-us">
 <title>Shutting down or creating a database</title>
-<prolog>
-</prolog>
+<shortdesc>If you need to shut down or create a database, it is easiest just
+to work with the <ph conref="devconrefs.dita#prod/productshortname"></ph>-specific
+implementations of interfaces, as shown in these examples.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>If you need to shut down or create a database, it is easiest just to work
-with the <ph conref="devconrefs.dita#prod/productshortname"></ph>-specific implementations of interfaces, as shown in the
-following examples.</p>
 <codeblock>javax.sql.XADataSource xads = makeXADataSource(mydb, true);
 
 
@@ -43,4 +44,5 @@
 }</codeblock>
 <p>Setting the property does not create or shut down the database. The database
 is not actually created or shut down until the next connection request. </p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevspecial13670.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevspecial13670.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial13670.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial13670.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,20 +17,17 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="cdevspecial13670">
-<title>Examples</title>
+<reference id="cdevspecial13670" xml:lang="en-us">
+<title>Examples of trigger actions</title>
 <prolog><metadata>
-<keywords>
-<indexterm>Triggers<indexterm>example of trigger actions</indexterm></indexterm>
+<keywords><indexterm>Triggers<indexterm>example of trigger actions</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <refbody>
-<section><p>The following trigger action copies a row from the <i>flights</i> table into the <i>flight_history</i> table whenever
-any row gets inserted into <i>flights</i> and adds the comment "inserted
-from trig1" in the <i>status</i> column of the<i>flight_history</i> table.</p></section><example>
-<codeblock><b>CREATE TRIGGER trig1 
+<section><p>The following trigger action copies a row from the <i>flights</i> table
+into the <i>flight_history</i> table whenever any row gets inserted into <i>flights</i> and
+adds the comment "inserted from trig1" in the <i>status</i> column of the<i>flight_history</i> table.</p></section>
+<example> <codeblock><b>CREATE TRIGGER trig1 
 AFTER UPDATE ON flights 
 REFERENCING OLD AS UPDATEDROW 
 FOR EACH ROW MODE DB2SQL 
@@ -37,4 +37,5 @@
 UPDATED ROW.DEST_AIRPORT, UPDATEDROW.ARRIVE_TIME,
 UPDATEDROW.MEAL, UPDATEDROW.FLYING_TIME, UPDATEDROW.MILES,
 UPDATEDROW.AIRCRAFT,'INSERTED FROM trig1');</b></codeblock></example>
-</refbody></reference>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/cdevspecial16181.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevspecial16181.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial16181.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial16181.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,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="cdevspecial16181">
+<concept id="cdevspecial16181" xml:lang="en-us">
 <title>Database-side JDBC procedures using non-nested connections</title>
+<shortdesc>A database-side JDBC procedure can create a new connection instead
+of using a nested connection. Statements executed in the procedure will be
+part of a different transaction, and so can issue commits and rollbacks.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Database-side JDBC procedures<indexterm>using non-nested
-connections</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Database-side JDBC procedures<indexterm>using non-nested
+connections</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>A database-side JDBC procedure can create a new connection instead of using
-a nested connection. Statements executed in the procedure will be part of
-a different transaction, and so can issue commits and rollbacks.</p>
 <p>Such procedures can connect to a database different from the one to which
-the parent SQL statement that called it is connected. The procedure
-does not use the same transaction or <i>Connection</i>. It
-establishes a new <codeph><i>Connection</i></codeph> and transaction.</p>
-<note>If database-side JDBC procedures do not use nested connections,
-this means that they are operating outside of the normal DBMS transaction
-control, so it is not good practice to use them indiscriminately.</note>
-</conbody></concept>
+the parent SQL statement that called it is connected. The procedure does not
+use the same transaction or <i>Connection</i>. It establishes a new <codeph><i>Connection</i></codeph> and
+transaction.</p>
+<note>If database-side JDBC procedures do not use nested connections, this
+means that they are operating outside of the normal DBMS transaction control,
+so it is not good practice to use them indiscriminately.</note>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevspecial27163.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevspecial27163.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial27163.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial27163.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,25 @@
 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="cdevspecial27163">
+<concept id="cdevspecial27163" xml:lang="en-us">
 <title>Programming trigger actions</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> allows
+you to create triggers. When you create a trigger, you define an action or
+set of actions that are executed when a database event occurs on a specified
+table. A <i>database event</i> is a delete, insert, or update operation.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Triggers<indexterm>programming trigger actions</indexterm></indexterm>
+<keywords><indexterm>Triggers<indexterm>programming trigger actions</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> allows you to create triggers. When you create a trigger, you
-define an action or set of actions that are executed when a database event
-occurs on a specified table. A <i>database event</i> is a
-delete, insert, or update operation. For example, if you define a trigger
-for a delete on a particular table, the trigger action is executed whenever
-someone deletes a row or rows from the table.</p>
+<p>For example, if you define a trigger for a delete on a particular table,
+the trigger action is executed whenever someone deletes a row or rows from
+the table.</p>
 <p>The <codeph>CREATE TRIGGER</codeph> statement in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite> goes
 into detail of the complete <codeph>CREATE TRIGGER</codeph> syntax. This section
 provides information on defining the trigger action itself, which is only
 one aspect of creating triggers.</p>
-<p>This section refers to the <codeph>CREATE TRIGGER</codeph> statement as the <i>trigger actions</i>.</p>
-</conbody></concept>
+<p>This section refers to the <codeph>CREATE TRIGGER</codeph> statement as
+the <i>trigger actions</i>.</p>
+</conbody>
+</concept>