db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r386714 [1/9] - /db/derby/docs/trunk/src/devguide/
Date Fri, 17 Mar 2006 21:12:03 GMT
Author: jta
Date: Fri Mar 17 13:11:50 2006
New Revision: 386714

URL: http://svn.apache.org/viewcvs?rev=386714&view=rev
Log:
DERBY-1077: Applied Jeff Levitt's patch that improves HTML topic linking in 
the Developer's Guide. It adds more related links and each topic now gets a 
summary from the first sentence or two of each topic. This change does not 
affect PDF output; it only affects HTML. 

Modified:
    db/derby/docs/trunk/src/devguide/cdevadvjdbc18939.dita
    db/derby/docs/trunk/src/devguide/cdevadvjdbc32436.dita
    db/derby/docs/trunk/src/devguide/cdevadvjdbc35053.dita
    db/derby/docs/trunk/src/devguide/cdevadvjdbc41138.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts10914.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts14433.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts15366.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts16400.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts19173.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts19524.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts22300.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts22641.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts23499.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts23810.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts23987.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts24019.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts24927.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts26633.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts28351.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts28436.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts29416.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts30291.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts30811.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts32861.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts34828.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts36402.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts36881.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts38375.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts41275.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts50894.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts53677.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts65864.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts838179.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts838315.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts838850.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts839085.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts840995.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts842279.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts842304.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts842385.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts842613.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts844813.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts89097.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts89498.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts95005.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure10983.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure12392.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure21547.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure21561.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure24458.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure31493.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure36127.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure36595.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure37241.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure37817.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure38522.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure41285.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure42374.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure51876.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure55054.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure60146.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure67151.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure79358.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure863446.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure863546.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure863611.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure863676.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure864242.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure864642.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure864692.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure865580.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure865818.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure865880.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure866060.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure866716.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure876908.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure88690.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure90988.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure96815.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure97760.dita
    db/derby/docs/trunk/src/devguide/cdevcsecuree.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy11201.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy12748.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy15818.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy17604.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy18639.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy18716.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy30736.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy32171.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy38918.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy82529.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy855655.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy856333.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy856753.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy857611.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy857648.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy92419.dita
    db/derby/docs/trunk/src/devguide/cdevdgpref11181.dita
    db/derby/docs/trunk/src/devguide/cdevdgpref23947.dita
    db/derby/docs/trunk/src/devguide/cdevdgpref24290.dita
    db/derby/docs/trunk/src/devguide/cdevdgpref29520.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp10252.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp13018.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp18166.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp19297.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp19524.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp19619.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp19700.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp20458.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp21955.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp22619.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp25174.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp25820.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp25889.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp27610.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp30653.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp34964.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp39409.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp39943.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp40170.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp40724.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp42173.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp84026.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp845973.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp846110.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp846369.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp846402.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp96597.dita
    db/derby/docs/trunk/src/devguide/cdevin10613.dita
    db/derby/docs/trunk/src/devguide/cdevin38113.dita
    db/derby/docs/trunk/src/devguide/cdevin55108.dita
    db/derby/docs/trunk/src/devguide/cdevin71274.dita
    db/derby/docs/trunk/src/devguide/cdevresman19524.dita
    db/derby/docs/trunk/src/devguide/cdevresman89722.dita
    db/derby/docs/trunk/src/devguide/cdevresman92946.dita
    db/derby/docs/trunk/src/devguide/cdevspecial13670.dita
    db/derby/docs/trunk/src/devguide/cdevspecial16181.dita
    db/derby/docs/trunk/src/devguide/cdevspecial27163.dita
    db/derby/docs/trunk/src/devguide/cdevspecial28907.dita
    db/derby/docs/trunk/src/devguide/cdevspecial29620.dita
    db/derby/docs/trunk/src/devguide/cdevspecial41728.dita
    db/derby/docs/trunk/src/devguide/cdevspecial45786.dita
    db/derby/docs/trunk/src/devguide/cdevspecial53165.dita
    db/derby/docs/trunk/src/devguide/cdevspecial67260.dita
    db/derby/docs/trunk/src/devguide/cdevspecial76763.dita
    db/derby/docs/trunk/src/devguide/cdevspecial847513.dita
    db/derby/docs/trunk/src/devguide/cdevspecial93497.dita
    db/derby/docs/trunk/src/devguide/cdevstandards805644.dita
    db/derby/docs/trunk/src/devguide/cdevstandards805664.dita
    db/derby/docs/trunk/src/devguide/cdevstandards805690.dita
    db/derby/docs/trunk/src/devguide/cdevstandards805716.dita
    db/derby/docs/trunk/src/devguide/cdevstandards805742.dita
    db/derby/docs/trunk/src/devguide/cdevstandards805768.dita
    db/derby/docs/trunk/src/devguide/cdevstandards805841.dita
    db/derby/docs/trunk/src/devguide/cdevstandards805893.dita
    db/derby/docs/trunk/src/devguide/cdevstandards805949.dita
    db/derby/docs/trunk/src/devguide/cdevstandards805975.dita
    db/derby/docs/trunk/src/devguide/cdevstandards806001.dita
    db/derby/docs/trunk/src/devguide/cdevstandards806027.dita
    db/derby/docs/trunk/src/devguide/cdevstandards806118.dita
    db/derby/docs/trunk/src/devguide/cdevstart16043.dita
    db/derby/docs/trunk/src/devguide/cdevstart18978.dita
    db/derby/docs/trunk/src/devguide/cdevstart19524.dita
    db/derby/docs/trunk/src/devguide/cdevstart39409.dita
    db/derby/docs/trunk/src/devguide/cdevstart41260.dita
    db/derby/docs/trunk/src/devguide/cdevstart813142.dita
    db/derby/docs/trunk/src/devguide/cdevstart813545.dita
    db/derby/docs/trunk/src/devguide/cdevstart98282.dita
    db/derby/docs/trunk/src/devguide/cdevtricks13019.dita
    db/derby/docs/trunk/src/devguide/cdevtricks19707.dita
    db/derby/docs/trunk/src/devguide/cdevtricks21248.dita
    db/derby/docs/trunk/src/devguide/cdevtricks23426.dita
    db/derby/docs/trunk/src/devguide/cdevtricks32436.dita
    db/derby/docs/trunk/src/devguide/cdevtricks39584.dita
    db/derby/docs/trunk/src/devguide/cdevtricks807337.dita
    db/derby/docs/trunk/src/devguide/cdevtricks807365.dita
    db/derby/docs/trunk/src/devguide/cdevtricks807400.dita
    db/derby/docs/trunk/src/devguide/derbydev.ditamap
    db/derby/docs/trunk/src/devguide/rdevadvjdbc034.dita
    db/derby/docs/trunk/src/devguide/rdevconcepts1119.dita
    db/derby/docs/trunk/src/devguide/rdevconcepts2462.dita
    db/derby/docs/trunk/src/devguide/rdevconcepts600.dita
    db/derby/docs/trunk/src/devguide/rdevconcepts713.dita
    db/derby/docs/trunk/src/devguide/rdevconcepts8424.dita
    db/derby/docs/trunk/src/devguide/rdevconcepts88082.dita
    db/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure125.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure131.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure13713.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure190.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure26537.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure305.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure379.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure557.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure608.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure622.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure766.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure935.dita
    db/derby/docs/trunk/src/devguide/rdevdeploy856845.dita
    db/derby/docs/trunk/src/devguide/rdevdeploy856880.dita
    db/derby/docs/trunk/src/devguide/rdevdeploy856912.dita
    db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita
    db/derby/docs/trunk/src/devguide/rdevdvlp38881.dita
    db/derby/docs/trunk/src/devguide/rdevdvlp847152.dita
    db/derby/docs/trunk/src/devguide/rdevexudclass.dita
    db/derby/docs/trunk/src/devguide/rdevprocsqle.dita
    db/derby/docs/trunk/src/devguide/rdevresman79556.dita
    db/derby/docs/trunk/src/devguide/tdevconcepts41704.dita
    db/derby/docs/trunk/src/devguide/tdevconcepts839040.dita
    db/derby/docs/trunk/src/devguide/tdevcsecure81850.dita
    db/derby/docs/trunk/src/devguide/tdevcsecure82556.dita
    db/derby/docs/trunk/src/devguide/tdevdeploy19136.dita
    db/derby/docs/trunk/src/devguide/tdevdeploy26887.dita
    db/derby/docs/trunk/src/devguide/tdevdeploy33704.dita
    db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp12233.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp14496.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp36289.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp38381.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp39090.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp40140.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp40464.dita
    db/derby/docs/trunk/src/devguide/tdevpreupgrade.dita

Modified: db/derby/docs/trunk/src/devguide/cdevadvjdbc18939.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevadvjdbc18939.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevadvjdbc18939.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevadvjdbc18939.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="cdevadvjdbc18939">
+<concept id="cdevadvjdbc18939" xml:lang="en-us">
 <title>IDEs and multiple JVMs</title>
-<prolog>
-</prolog>
+<shortdesc>When you use an integrated development environment (IDE) to build
+a Java application, you can launch the application from within the IDE at
+any point in the development process. Typically, the IDE launches a JVM dedicated
+to the application. When the application completes, the JVM exits. Any database
+connections established by the application are closed.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>When you use an integrated development environment (IDE) to build a Java
-application, you can launch the application from within the IDE at any point
-in the development process. Typically, the IDE launches a JVM dedicated to
-the application. When the application completes, the JVM exits. Any database
-connections established by the application are closed. </p>
 <p>During the development of a database application, most IDEs allow you to
 test individual database connections and queries without running the entire
 application. When you test an individual database connection or query (which
@@ -32,16 +33,17 @@
 specialized testing environment. In this case, when a test completes, the
 JVM remains active and available for further testing, and the database connection
 established during the test remains open.</p>
-<p>Because of the behaviors of the IDE described above, if you use the embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC
-driver, you may encounter errors connecting in the following situations:</p>
+<p>Because of the behaviors of the IDE described above, if you use the embedded <ph
+conref="devconrefs.dita#prod/productshortname"></ph> JDBC driver, you may
+encounter errors connecting in the following situations:</p>
 <ul>
 <li>You test an individual query or database connection and then try to run
-an application that uses the same database as the tested feature.  
-<p>The
+an application that uses the same database as the tested feature.   <p>The
 database connection established by testing the connection or query stays open,
 and prevents the application from establishing a connection to the same database.</p></li>
 <li>You run an application, and before it completes (for example, while it
 waits for user input), you attempt to run a second application or to test
 a connection or query that uses the same database as the first application.</li>
 </ul>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevadvjdbc32436.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevadvjdbc32436.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevadvjdbc32436.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevadvjdbc32436.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,27 @@
 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="cdevadvjdbc32436">
+<concept id="cdevadvjdbc32436" xml:lang="en-us">
 <title>Using Derby with IDEs</title>
+<shortdesc>When you use an integrated development environment (IDE) to develop
+an embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> application,
+you might need to run <ph conref="devconrefs.dita#prod/productshortname"></ph> within
+a server framework.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>IDEs<indexterm>using Derby with</indexterm><indexterm>and need to use server framework</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>IDEs<indexterm>using Derby with</indexterm><indexterm>and
+need to use server framework</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>When you use an integrated development environment (IDE) to develop an
-embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> application, you might need to run <ph conref="devconrefs.dita#prod/productshortname"></ph> within
-a server framework. This is because an IDE might try connecting to the database
-from two different JVMs, whereas only a single JVM instance should connect
-to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database at one time, as described in <xref href="cdevdvlp96597.dita#cdevdvlp96597"/> (multiple connections from the same JVM are allowed). </p>
-<p>An "embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> application" is one which runs in the
-same JVM as the application. Such an application uses the embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> driver
-(<i>org.apache.derby.jdbc.EmbeddedDriver</i>; see <xref href="cdevdvlp40170.dita#cdevdvlp40170"/>) and connection URL (<codeph><i>jdbc:derby:databaseName</i></codeph>; see <xref href="rdevdvlp38881.dita#rdevdvlp38881"/>). If you use this
-driver name or connection URL from the IDE, when the IDE tries to open a second connection
-to the same database with the embedded <ph conref="devconrefs.dita#prod/productshortname"></ph>, the attempt fails. Two
-JVMs cannot connect to the same database in embedded mode.</p>
-</conbody></concept>
+<p>This is because an IDE might try connecting to the database from two different
+JVMs, whereas only a single JVM instance should connect to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database
+at one time (multiple connections from the same JVM are allowed). </p>
+<p>An "embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> application"
+is one which runs in the same JVM as the application. Such an application
+uses the embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> driver
+(<i>org.apache.derby.jdbc.EmbeddedDriver</i>) and connection URL (<codeph><i>jdbc:derby:databaseName</i></codeph>).
+If you use this driver name or connection URL from the IDE, when the IDE tries
+to open a second connection to the same database with the embedded <ph conref="devconrefs.dita#prod/productshortname"></ph>,
+the attempt fails. Two JVMs cannot connect to the same database in embedded
+mode.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevadvjdbc35053.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevadvjdbc35053.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevadvjdbc35053.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevadvjdbc35053.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 xml:lang="en-us" id="cdevadvjdbc35053">
-<title>Developing Tools and Using Derby with an IDE</title>
-<conbody>
-<p>Applications such as database tools are designed to work with databases
+<concept id="cdevadvjdbc35053" xml:lang="en-us">
+<title>Developing tools and using Derby with an IDE</title>
+<shortdesc>Applications such as database tools are designed to work with databases
 whose schemas and contents are unknown in advance. This section discusses
-a few topics useful for such applications.</p>
-</conbody></concept>
+a few topics useful for such applications.</shortdesc>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevadvjdbc41138.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevadvjdbc41138.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevadvjdbc41138.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevadvjdbc41138.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,40 +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="cdevadvjdbc41138">
-<title>Offering Connection Choices to the User</title>
+<concept id="cdevadvjdbc41138" xml:lang="en-us">
+<title>Offering connection choices to the user</title>
+<shortdesc>JDBC's <i>java.sql.Driver.getPropertyInfo</i> method allows a generic
+GUI tool to determine the properties for which it should prompt a user in
+order to get enough information to connect to a database. Depending on the
+values the user has supplied so far, additional values might become necessary.
+It might be necessary to iterate though several calls to <codeph><i>getPropertyInfo</i></codeph>.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>java.sql.Driver.getPropertyInfo</indexterm>
-<indexterm>Available databases<indexterm>list of provided by
-databaseName attribute</indexterm></indexterm>
+<keywords><indexterm>java.sql.Driver.getPropertyInfo</indexterm><indexterm>Available
+databases<indexterm>list of provided by databaseName attribute</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>JDBC's <i>java.sql.Driver.getPropertyInfo</i> method
-allows a generic GUI tool to determine the properties for which it should
-prompt a user in order to get enough information to connect to a database.
-Depending on the values the user has supplied so far, additional values might
-become necessary. It might be necessary to iterate though several calls to <codeph><i>getPropertyInfo</i></codeph>. If no more properties are necessary,
-the call returns an array of zero length.</p>
-<p>In a <ph conref="devconrefs.dita#prod/productshortname"></ph> system, do not use the method against an instance of <i>org.apache.derby.jdbc.EmbeddedDriver</i>. Instead, request
-the JDBC driver from the driver manager:</p>
+<p>If no more properties are necessary, the call returns an array of zero
+length.</p>
+<p>In a <ph conref="devconrefs.dita#prod/productshortname"></ph> system, do
+not use the method against an instance of <i>org.apache.derby.jdbc.EmbeddedDriver</i>.
+Instead, request the JDBC driver from the driver manager:</p>
 <codeblock>java.sql.DriverManager.getDriver(
     "jdbc:derby:").getPropertyInfo(<i>URL</i>, <i>Prop</i>)</codeblock>
-<p>In a <ph conref="devconrefs.dita#prod/productshortname"></ph> system, the properties returned in the <i>DriverPropertyInfo</i> object are connection URL attributes, including a list of booted
-databases in a system (the <codeph><i>databaseName</i></codeph> attribute).</p>
+<p>In a <ph conref="devconrefs.dita#prod/productshortname"></ph> system, the
+properties returned in the <i>DriverPropertyInfo</i> object are connection
+URL attributes, including a list of booted databases in a system (the <codeph><i>databaseName</i></codeph> attribute).</p>
 <p>Databases in a system are not automatically booted until you connect with
 them. You can configure your system to retain the former behavior, in which
-case the steps described in this section will continue to work. See <i>"derby.system.bootAll" </i> in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
-<p><i>getPropertyInfo</i> requires a connection URL and a <codeph><i>Properties</i></codeph> object as parameters. Typically, what
-you pass are values that you will use in a future call to <codeph><i>java.sql.DriverManager.getConnection</i></codeph> when you actually connect
-to the database. For information about setting attributes in calls to <codeph><i>java.sql.DriverManager.getConnection</i></codeph>, see <xref href="rdevdvlp22102.dita#rdevdvlp22102"/>.</p>
-<p>A call to <i>getPropertyInfo</i> with parameters that
-contain sufficient information to connect successfully returns an array of
-zero length. (Receiving this zero-length array does not <i>guarantee</i> that the <codeph><i>getConnection</i></codeph> call
+case the steps described in this section will continue to work. See <i>"derby.system.bootAll" </i> in <cite><ph
+conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
+<p><i>getPropertyInfo</i> requires a connection URL and a <codeph><i>Properties</i></codeph> object
+as parameters. Typically, what you pass are values that you will use in a
+future call to <codeph><i>java.sql.DriverManager.getConnection</i></codeph> when
+you actually connect to the database.</p>
+<p>A call to <i>getPropertyInfo</i> with parameters that contain sufficient
+information to connect successfully returns an array of zero length. (Receiving
+this zero-length array does not <i>guarantee</i> that the <codeph><i>getConnection</i></codeph> call
 will succeed, because something else could go wrong.)</p>
-<p>Repeat calls to <i>getPropertyInfo</i> until it returns
-a zero-length array or none of the properties remaining are desired.</p>
-</conbody></concept>
+<p>Repeat calls to <i>getPropertyInfo</i> until it returns a zero-length array
+or none of the properties remaining are desired.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts10914.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts10914.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts10914.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts10914.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,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="cdevconcepts10914">
+<concept id="cdevconcepts10914" xml:lang="en-us">
 <title>Multi-user database access</title>
+<shortdesc>Multi-user database access is possible if <ph conref="devconrefs.dita#prod/productshortname"></ph> is
+running inside a server framework.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Multi-user database access<indexterm>programming
-for</indexterm></indexterm>
+<keywords><indexterm>Multi-user database access<indexterm>programming for</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>Multi-user database access is possible if <ph conref="devconrefs.dita#prod/productshortname"></ph> is running inside
-a server framework.</p>
 <p>If more than one client application tries to modify the same data, the
 connection that gets the table first gets the lock on the data (either specific
 rows or the entire table). The second connection has to wait until the first
 connection commits or rolls back the transaction in order to access the data.
 If two connections are only querying and not modifying data, they can both
-access the same data at the same time because they can each get a shared lock.
-For more information, see <xref href="cdevconcepts30291.dita#cdevconcepts30291"/>.</p>
-</conbody></concept>
+access the same data at the same time because they can each get a shared lock.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts14433.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts14433.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts14433.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts14433.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,29 @@
 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="cdevconcepts14433">
+<concept id="cdevconcepts14433" xml:lang="en-us">
 <title>Statement versus transaction runtime rollback</title>
+<shortdesc>When an SQL statement generates an exception, this exception results
+in a <i>runtime rollback</i>. A runtime rollback is a system-generated rollback
+of a statement or transaction by <ph conref="devconrefs.dita#prod/productshortname"></ph>,
+as opposed to an explicit <codeph><i>rollback</i></codeph> call from your
+application.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Rollback<indexterm>implicit versus explicit</indexterm></indexterm>
+<keywords><indexterm>Rollback<indexterm>implicit versus explicit</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>When an SQL statement generates an exception, this exception results
-in a <i>runtime rollback</i>. A runtime rollback is a system-generated
-rollback of a statement or transaction by <ph conref="devconrefs.dita#prod/productshortname"></ph>, as opposed to an explicit <codeph><i>rollback</i></codeph> call from your application.</p>
 <p>Extremely severe exceptions, such as disk-full errors, shut down the system,
 and the transaction is rolled back when the database is next booted. Severe
 exceptions, such as deadlock, cause transaction rollback; <ph conref="devconrefs.dita#prod/productshortname"></ph> rolls
 back all changes since the beginning of the transaction and implicitly begins
 a new transaction. Less severe exceptions, such as syntax errors, result in
-statement rollback; <ph conref="devconrefs.dita#prod/productshortname"></ph> rolls back only changes made by the statement
-that caused the error. The application developer can insert code to explicitly
-roll back the entire transaction if desired.</p>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> supports partial rollback through the use of savepoints. See the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite> for more information.</p>
-</conbody></concept>
+statement rollback; <ph conref="devconrefs.dita#prod/productshortname"></ph> rolls
+back only changes made by the statement that caused the error. The application
+developer can insert code to explicitly roll back the entire transaction if
+desired.</p>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> supports partial
+rollback through the use of savepoints. See the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite> for
+more information.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts15366.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts15366.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts15366.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts15366.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,28 +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 id="cdevconcepts15366" xml:lang="en-us">
 <title>Isolation levels and concurrency</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> provides
+four transaction isolation levels. Setting the transaction isolation level
+for a connection allows a user to specify how severely the user's transaction
+should be isolated from other transactions.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Transaction anomalies in generic database systems<indexterm>description</indexterm></indexterm>
-<indexterm>Dirty
-reads<indexterm>definition</indexterm></indexterm><indexterm>Non-repeatable
+<indexterm>Dirty reads<indexterm>definition</indexterm></indexterm><indexterm>Non-repeatable
 reads<indexterm>definition</indexterm></indexterm><indexterm>Phantom reads<indexterm>definition</indexterm></indexterm>
-<indexterm>TRANSACTION_SERIALIZABLE isolation level</indexterm><indexterm>TRANSACTION_REPEATABLE _READ
-isolation level</indexterm><indexterm>TRANSACTION_READ _COMMITTED isolation
+<indexterm>TRANSACTION_SERIALIZABLE isolation level</indexterm><indexterm>TRANSACTION_REPEATABLE
+_READ isolation level</indexterm><indexterm>TRANSACTION_READ _COMMITTED isolation
 level</indexterm><indexterm>TRANSACTION_READ _UNCOMMITTED isolation level</indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides four
-transaction isolation levels. Setting the transaction isolation level for
-a connection allows a user to specify how severely the user's transaction
-should be isolated from other transactions. For example, it allows you to
-specify whether transaction A is allowed to make changes to data that have
-been viewed by transaction B before transaction B has committed.</p>
+<p>For example, it allows you to specify whether transaction A is allowed
+to make changes to data that have been viewed by transaction B before transaction
+B has committed.</p>
 <p>A connection determines its own isolation level, so JDBC provides an application
 with a way to specify a level of transaction isolation. It specifies four
 levels of transaction isolation. The higher the transaction isolation, the
@@ -136,8 +136,9 @@
 schema might also affect whether these anomalies are allowed. A DBMS can lock
 either the entire table or only specific rows in order to prevent transaction
 anomalies.</p>
-<p><xref href="cdevconcepts15366.dita#cdevconcepts15366/cdevconcepts28076"></xref> shows which anomalies
-are possible under the various locking schemas and isolation levels.</p>
+<p><xref href="cdevconcepts15366.dita#cdevconcepts15366/cdevconcepts28076"></xref> shows
+which anomalies are possible under the various locking schemas and isolation
+levels.</p>
 <table frame="all" id="cdevconcepts28076"><title>When Transaction Anomalies
 Are Possible</title>
 <tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="55*"/>
@@ -182,8 +183,7 @@
 as if they occurred serially (one after the other) instead of concurrently. <ph
 conref="devconrefs.dita#prod/productshortname"></ph> issues locks to prevent
 all the transaction anomalies listed in <xref href="cdevconcepts15366.dita#cdevconcepts15366/cdevconcepts17741"></xref> from
-occurring. The type of lock it issues is sometimes called a <i>range lock</i>.
-For more information about range locks, see <xref href="rdevconcepts8424.dita#rdevconcepts8424"></xref>.</p></li>
+occurring. The type of lock it issues is sometimes called a <i>range lock</i>.</p></li>
 <li><codeph>TRANSACTION_REPEATABLE_READ</codeph>   <p><codeph>RS</codeph> from
 SQL.</p> <p><i>TRANSACTION_REPEATABLE_READ</i> means that <ph conref="devconrefs.dita#prod/productshortname"></ph> issues
 locks to prevent only dirty reads and non-repeatable reads, but not phantoms.
@@ -203,9 +203,8 @@
 processes.</li>
 <li>Any row that was changed by another application process to be read even
 if the change has not been committed by the application process.</li>
-</ul> <p>For other operations, the rules that apply to READ COMMITTED also
+</ul><p>For other operations, the rules that apply to READ COMMITTED also
 apply to READ UNCOMMITTED.</p></li>
 </ul>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts16400.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts16400.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts16400.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts16400.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,46 @@
 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="cdevconcepts16400">
+<concept id="cdevconcepts16400" xml:lang="en-us">
 <title>Configuring deadlock detection and lock wait timeouts</title>
-<prolog>
-</prolog>
+<shortdesc>You configure the amount of time a transaction waits before <ph
+conref="devconrefs.dita#prod/productshortname"></ph> does any deadlock checking
+with the <i>derby.locks.deadlockTimeout</i> property.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>You configure the amount of time a transaction waits before <ph conref="devconrefs.dita#prod/productshortname"></ph> does
-any deadlock checking with the <i>derby.locks.deadlockTimeout</i> property. You configure the amount of time a transaction waits before
-timing out with the <codeph><i>derby.locks.waitTimeout</i></codeph> property.
-When configuring your database or system, you should consider these properties
-together. For example, in order for any deadlock checking to occur, the <codeph><i>derby.locks.deadlockTimeout</i></codeph> property must be set
-to a value lower than the <codeph><i>derby.locks.waitTimeout</i></codeph> property. If it is set to a value equal to or higher than the <codeph><i>derby.locks.waitTimeout</i></codeph>, the transaction times out
-before <ph conref="devconrefs.dita#prod/productshortname"></ph> does any deadlock checking.</p>
-<p><indexterm>Deadlocks<indexterm>detecting</indexterm></indexterm>By
-default, <i>derby.locks.waitTimeout</i> is set to 60 seconds.
--1 is the equivalent of no wait timeout. This means that transactions never
-time out, although <ph conref="devconrefs.dita#prod/productshortname"></ph> can choose a transaction as a deadlock victim.</p>
-<fig id="cdevconcepts27089" expanse="column">
-<title>One possible configuration: deadlock
-checking occurs when a transaction has waited 30 seconds; no lock wait timeouts
-occur.</title><image placement="break" href="lockwa3.gif"><alt>This illustration depicts one possible configuration: deadlock checking occurs when a transaction has waited 30 seconds; no lock wait timeouts occur.</alt></image></fig>
-<fig id="cdevconcepts91443" expanse="column">
-<title>Another typical configuration:
+<p>You configure the amount of time a transaction waits before timing out
+with the <codeph><i>derby.locks.waitTimeout</i></codeph> property. When configuring
+your database or system, you should consider these properties together. For
+example, in order for any deadlock checking to occur, the <codeph><i>derby.locks.deadlockTimeout</i></codeph> property
+must be set to a value lower than the <codeph><i>derby.locks.waitTimeout</i></codeph> property.
+If it is set to a value equal to or higher than the <codeph><i>derby.locks.waitTimeout</i></codeph>,
+the transaction times out before <ph conref="devconrefs.dita#prod/productshortname"></ph> does
+any deadlock checking.</p>
+<p><indexterm>Deadlocks<indexterm>detecting</indexterm></indexterm>By default, <i>derby.locks.waitTimeout</i> is
+set to 60 seconds. -1 is the equivalent of no wait timeout. This means that
+transactions never time out, although <ph conref="devconrefs.dita#prod/productshortname"></ph> can
+choose a transaction as a deadlock victim.</p>
+<fig expanse="column" id="cdevconcepts27089"><title>One possible configuration:
+deadlock checking occurs when a transaction has waited 30 seconds; no lock
+wait timeouts occur.</title>
+<image href="lockwa3.gif" placement="break"><alt>This illustration depicts
+one possible configuration: deadlock checking occurs when a transaction has
+waited 30 seconds; no lock wait timeouts occur.</alt></image>
+</fig>
+<fig expanse="column" id="cdevconcepts91443"><title>Another typical configuration:
 deadlock checking occurs after a transaction has waited 60 seconds for a lock;
-after 90 seconds, the transaction times out and is rolled back. </title><image placement="break" href="lockwa1.gif"><alt>This illustration depicts another typical configuration: deadlock checking occurs after a transaction has waited 60 seconds for a lock; after 90 seconds, the transaction times out and is rolled back.</alt></image></fig>
-<fig id="cdevconcepts14875" expanse="column">
-<title>A configuration in which no deadlock
-checking occurs: transactions time out after they have waited 50 seconds.
-No deadlock checking occurs. </title><image placement="break" href="lockwa2.gif"><alt>This illustration depicts a configuration in which no deadlock checking occurs: transactions time out after they have waited 50 seconds. No deadlock checking occurs.</alt></image></fig>
-</conbody></concept>
+after 90 seconds, the transaction times out and is rolled back. </title>
+<image href="lockwa1.gif" placement="break"><alt>This illustration depicts
+another typical configuration: deadlock checking occurs after a transaction
+has waited 60 seconds for a lock; after 90 seconds, the transaction times
+out and is rolled back.</alt></image>
+</fig>
+<fig expanse="column" id="cdevconcepts14875"><title>A configuration in which
+no deadlock checking occurs: transactions time out after they have waited
+50 seconds. No deadlock checking occurs. </title>
+<image href="lockwa2.gif" placement="break"><alt>This illustration depicts
+a configuration in which no deadlock checking occurs: transactions time out
+after they have waited 50 seconds. No deadlock checking occurs.</alt></image>
+</fig>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts19173.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts19173.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts19173.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts19173.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,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="cdevconcepts19173">
+<concept id="cdevconcepts19173" xml:lang="en-us">
 <title>Transactions</title>
+<shortdesc>A <i>transaction</i> is a set of one or more SQL statements that
+make up a logical unit of work that you can either commit or roll back and
+that will be recovered in the event of a system failure.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Transactions<indexterm>definition</indexterm></indexterm>
+<keywords><indexterm>Transactions<indexterm>definition</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>A <i>transaction</i> is a set of one or more SQL statements
-that make up a logical unit of work that you can either commit or roll back
-and that will be recovered in the event of a system failure. All the statements
-in the transaction are <i>atomic</i>. A transaction is associated
-with a single <codeph><i>Connection</i></codeph> object (and database).
-A transaction cannot span <i>Connections</i> (or databases).</p>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> permits schema and data manipulation statements (DML) to be
-intermixed within a single transaction. If you create a table in one transaction,
-you can also insert into it in that same transaction. A schema manipulation
-statement (DDL) is not automatically committed when it is performed, but participates
-in the transaction within which it is issued. Because DDL requires exclusive
-locks on system tables, keep transactions that involve DDL short.</p>
-</conbody></concept>
+<p>All the statements in the transaction are <i>atomic</i>. A transaction
+is associated with a single <codeph><i>Connection</i></codeph> object (and
+database). A transaction cannot span <i>Connections</i> (or databases).</p>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> permits schema
+and data manipulation statements (DML) to be intermixed within a single transaction.
+If you create a table in one transaction, you can also insert into it in that
+same transaction. A schema manipulation statement (DDL) is not automatically
+committed when it is performed, but participates in the transaction within
+which it is issued. Because DDL requires exclusive locks on system tables,
+keep transactions that involve DDL short.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts19524.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts19524.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts19524.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts19524.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,9 +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="cdevconcepts19524">
+<concept id="cdevconcepts19524" xml:lang="en-us">
 <title>Controlling Derby application behavior</title>
-<conbody>
-<p>This section looks at some advanced <ph conref="devconrefs.dita#prod/productshortname"></ph> application concepts.</p>
-</conbody></concept>
+<shortdesc>This section looks at some advanced <ph conref="devconrefs.dita#prod/productshortname"></ph> application
+concepts.</shortdesc>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts22300.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts22300.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts22300.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts22300.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,32 +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="cdevconcepts22300">
+<concept id="cdevconcepts22300" xml:lang="en-us">
 <title>Configuring isolation levels</title>
+<shortdesc>If a connection does not specify its isolation level, it inherits
+the default isolation level for the <ph conref="devconrefs.dita#prod/productshortname"></ph> system.
+The default value is <codeph>CS</codeph>.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Isolation levels<indexterm>configuring</indexterm></indexterm>
+<keywords><indexterm>Isolation levels<indexterm>configuring</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>If a connection does not specify its isolation level, it inherits the default
-isolation level for the <ph conref="devconrefs.dita#prod/productshortname"></ph> system, The default value is <codeph>CS</codeph>.
-When set to <codeph>CS</codeph>, the connection inherits the TRANSACTION_READ_COMMITTED
-isolation level. When set to <codeph>RR</codeph>, the connection inherits the TRANSACTION_SERIALIZABLE
-isolation level, when set to <codeph>RS</codeph>, the connection inherits the TRANSACTION_REPEATABLE_READ
-isolation level, and when set to <codeph>UR</codeph>, the connection inherits the
-TRANSACTION_READ_UNCOMMITTED isolation level.</p>
+<p>When set to <codeph>CS</codeph>, the connection inherits the TRANSACTION_READ_COMMITTED
+isolation level. When set to <codeph>RR</codeph>, the connection inherits
+the TRANSACTION_SERIALIZABLE isolation level, when set to <codeph>RS</codeph>,
+the connection inherits the TRANSACTION_REPEATABLE_READ isolation level, and
+when set to <codeph>UR</codeph>, the connection inherits the TRANSACTION_READ_UNCOMMITTED
+isolation level.</p>
 <p>To override the inherited default, use the methods of <i>java.sql.Connection</i>.</p>
 <p>In addition, a connection can change the isolation level of the transaction
-within an SQL statement. For more information, see "SET ISOLATION
-statement" in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>. You can use the WITH clause to
-change the isolation level for the current statement only, not the transaction.
-For information about the"WITH clause," see the "SELECT statement"in
-the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>. </p>
+within an SQL statement. For more information, see "SET ISOLATION statement"
+in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>. You can
+use the WITH clause to change the isolation level for the current statement
+only, not the transaction. For information about the"WITH clause," see the
+"SELECT statement"in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>. </p>
 <p> In all cases except when you change the isolation level using the WITH
 clause, changing the isolation level commits the current transaction.</p>
-<note>For information about how to choose a particular isolation
-level, see <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</note>
-</conbody></concept>
+<note>For information about how to choose a particular isolation level, see <cite><ph
+conref="devconrefs.dita#pub/cittuning"></ph></cite>.</note>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts22641.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts22641.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts22641.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts22641.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,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="cdevconcepts22641">
+<concept id="cdevconcepts22641" xml:lang="en-us">
 <title>Scrolling insensitive ResultSets</title>
+<shortdesc>JDBC 2.0 adds a new kind of <codeph><i>ResultSet</i></codeph>,
+one that allows you to scroll in either direction or to move the cursor to
+a particular row. <ph conref="devconrefs.dita#prod/productshortname"></ph> implements
+scrolling insensitive <codeph><i>ResultSets</i></codeph>.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Scrolling insensitive cursors</indexterm>
-<indexterm>ResultSets<indexterm>scrolling insensitive (JDBC
-2.0)</indexterm></indexterm>
-<indexterm>Cursors<indexterm>scrolling insensitive</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Scrolling insensitive cursors</indexterm><indexterm>ResultSets<indexterm>scrolling
+insensitive (JDBC 2.0)</indexterm></indexterm><indexterm>Cursors<indexterm>scrolling
+insensitive</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>JDBC 2.0 adds a new kind of <codeph><i>ResultSet</i></codeph>,
-one that allows you to scroll in either direction or to move the cursor to
-a particular row. <ph conref="devconrefs.dita#prod/productshortname"></ph> implements scrolling insensitive <codeph><i>ResultSets</i></codeph>. When you use a scroll insensitive <codeph><i>ResultSets</i></codeph> cursor to facilitate the insensitive scrolling action,
-<ph conref="devconrefs.dita#prod/productshortname"></ph> materializes in memory all rows from the first one in the result set
-up to the one with the biggest row number.</p>
+<p>When you use a scroll insensitive <codeph><i>ResultSets</i></codeph> cursor
+to facilitate the insensitive scrolling action, <ph conref="devconrefs.dita#prod/productshortname"></ph> materializes
+in memory all rows from the first one in the result set up to the one with
+the biggest row number.</p>
 <codeblock><b>//autocommit does not have to be off because even if 
 //we accidentally scroll past the last row, the implicit commit
 //on the the statement will not close the result set because result sets
@@ -68,4 +69,5 @@
 conn.commit()
 conn.close();
 System.out.println("Closed connection");</codeblock>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts23499.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts23499.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts23499.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts23499.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,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="cdevconcepts23499">
+<concept id="cdevconcepts23499" xml:lang="en-us">
 <title>Working with multiple threads sharing a single connection</title>
+<shortdesc>JDBC allows you to share a single <i>Connection</i> among multiple
+threads.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Multiple threads sharing single connection</indexterm>
+<keywords><indexterm>Multiple threads sharing single connection</indexterm>
 </keywords>
-</metadata>
-</prolog>
-<conbody>
-<p>JDBC allows you to share a single <i>Connection</i> among
-multiple threads.</p>
-</conbody></concept>
+</metadata></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts23810.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts23810.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts23810.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts23810.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="cdevconcepts23810">
+<concept id="cdevconcepts23810" xml:lang="en-us">
 <title>Lock granularity</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> can be
+configured for <i>table-level</i> locking. With table-level locking, when
+a transaction locks data in order to prevent any transaction anomalies, it
+always locks the entire table, not just those rows being accessed.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Lock granularity</indexterm>
-<indexterm>Locking<indexterm>table-level</indexterm><indexterm>row-level</indexterm></indexterm>
+<keywords><indexterm>Lock granularity</indexterm><indexterm>Locking<indexterm>table-level</indexterm><indexterm>row-level</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p id="cdevconcepts18383"><ph conref="devconrefs.dita#prod/productshortname"></ph> can be configured for <i>table-level</i> locking. With table-level locking, when a transaction locks
-data in order to prevent any transaction anomalies, it always locks the entire
-table, not just those rows being accessed.</p>
-<p>By default, <ph conref="devconrefs.dita#prod/productshortname"></ph> is configured for row-level locking. Row-level
-locking uses more memory but allows greater concurrency, which works better
-in multi-user systems. Table-level locking works best with single-user applications
-or read-only applications. </p>
-<p>You typically set lock granularity for the entire <ph conref="devconrefs.dita#prod/productshortname"></ph> system, not
-for a particular application. However, at runtime, <ph conref="devconrefs.dita#prod/productshortname"></ph> may escalate
-the lock granularity for a particular transaction from row-level locking to
-table-level locking for performance reasons. You have some control over the
-threshold at which this occurs. For information on turning off row-level locking,
-see <i>"derby.storage.rowLocking" </i> in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>. For more information about automatic lock escalation, see "About
-the System's Selection of Lock Granularity" and "Transaction-Based
-Lock Escalation" in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite><cite>. </cite>For more information
-on tuning your <ph conref="devconrefs.dita#prod/productshortname"></ph> system, see "Tuning Databases and Applications".</p>
-</conbody></concept>
+<p>By default, <ph conref="devconrefs.dita#prod/productshortname"></ph> is
+configured for row-level locking. Row-level locking uses more memory but allows
+greater concurrency, which works better in multi-user systems. Table-level
+locking works best with single-user applications or read-only applications. </p>
+<p>You typically set lock granularity for the entire <ph conref="devconrefs.dita#prod/productshortname"></ph> system,
+not for a particular application. However, at runtime, <ph conref="devconrefs.dita#prod/productshortname"></ph> may
+escalate the lock granularity for a particular transaction from row-level
+locking to table-level locking for performance reasons. You have some control
+over the threshold at which this occurs. For information on turning off row-level
+locking, see <i>"derby.storage.rowLocking" </i> in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.
+For more information about automatic lock escalation, see "About the System's
+Selection of Lock Granularity" and "Transaction-Based Lock Escalation" in <cite><ph
+conref="devconrefs.dita#pub/cittuning"></ph></cite><cite>. </cite>For more
+information on tuning your <ph conref="devconrefs.dita#prod/productshortname"></ph> system,
+see "Tuning Databases and Applications".</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts23987.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts23987.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts23987.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts23987.dita Fri Mar 17 13:11:50 2006
@@ -19,17 +19,14 @@
 -->
 <concept id="cdevconcepts23987" xml:lang="en-us">
 <title>ResultSets and auto-commit</title>
+<shortdesc>Except for the result sets associated with holdable cursors, issuing
+a commit will cause all result sets on your connection to be closed.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ResultSets<indexterm>behavior of with auto-commit</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>Except for the result sets associated with holdable cursors (see <xref
-href="rdevconceptsholdablecursors.dita#rdevconceptsholdablecursors"></xref> for
-more information), issuing a commit will cause all result sets on your connection
-to be closed.</p>
 <p>The JDBC program is not required to have auto-commit off when using updatable
 ResultSets.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts24019.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts24019.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts24019.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts24019.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,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="cdevconcepts24019">
+<concept id="cdevconcepts24019" xml:lang="en-us">
 <title>Multiple connections from a single application</title>
-<prolog>
-</prolog>
+<shortdesc>A single application can work with multiple <i>Connections</i> to
+the same database and assign them to different threads.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>A single application can work with multiple <i>Connections</i> to the same database and assign them to different threads. The application
-programmer can avoid concurrency and deadlock problems in several ways:</p>
+<p>You can avoid concurrency and deadlock problems in your application in
+several ways:</p>
 <ul>
-<li>Use the <i>TRANSACTION_READ_COMMITTED</i> isolation level
-and turn on row-level locking (the defaults).</li>
-<li>Beware of deadlocks caused by using more than one <i>Connection</i> in a single thread (the most obvious case). For example, if
-the thread tries to update the same table from two different <codeph><i>Connections</i></codeph>, a deadlock can occur.</li>
-<li>Assign <i>Connections</i> to threads that handle discrete
-tasks. For example, do not have two threads update the <i>Hotels</i> table. Have one thread update the <i>Hotels</i> table
-and a different one update the <i>Groups</i> table.</li>
+<li>Use the <i>TRANSACTION_READ_COMMITTED</i> isolation level and turn on
+row-level locking (the defaults).</li>
+<li>Beware of deadlocks caused by using more than one <i>Connection</i> in
+a single thread (the most obvious case). For example, if the thread tries
+to update the same table from two different <codeph><i>Connections</i></codeph>,
+a deadlock can occur.</li>
+<li>Assign <i>Connections</i> to threads that handle discrete tasks. For example,
+do not have two threads update the <i>Hotels</i> table. Have one thread update
+the <i>Hotels</i> table and a different one update the <i>Groups</i> table.</li>
 <li>If threads access the same tables, commit transactions often.</li>
 <li>Multi-threaded Java applications have the ability to self-deadlock without
 even accessing a database, so beware of that too.</li>
 <li>Use nested connections to share the same lock space.</li>
 </ul>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts24927.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts24927.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts24927.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts24927.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,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="cdevconcepts24927">
-<title>Working with Derby SQLExceptions in an Application</title>
+<concept id="cdevconcepts24927" xml:lang="en-us">
+<title>Working with Derby SQLExceptions in an application</title>
+<shortdesc>JDBC generates exceptions of the type <i>java.sql.SQLException</i>.
+To see the exceptions generated by <ph conref="devconrefs.dita#prod/productshortname"></ph>,
+retrieve and process the <codeph><i>SQLExceptions</i></codeph> in a catch
+block.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>SQLExceptions<indexterm>working with</indexterm></indexterm>
+<keywords><indexterm>SQLExceptions<indexterm>working with</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
-<conbody>
-<p>JDBC generates exceptions of the type <i>java.sql.SQLException</i>. To see the exceptions generated by <ph conref="devconrefs.dita#prod/productshortname"></ph>, retrieve and process
-the <codeph><i>SQLExceptions</i></codeph> in a catch block.</p>
-</conbody></concept>
+</metadata></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts26633.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts26633.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts26633.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts26633.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,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="cdevconcepts26633">
+<concept id="cdevconcepts26633" xml:lang="en-us">
 <title>Nested connections</title>
+<shortdesc>SQL statements can include routine invocations. If these routines
+interact with the database, they must use a <i>Connection</i>.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Nested connections<indexterm>definition</indexterm></indexterm>
+<keywords><indexterm>Nested connections<indexterm>definition</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
-<conbody>
-<p>SQL statements can include routine invocations. If these routines
-interact with the database, they must use a <i>Connection</i>.</p>
-<p>For more information, see <xref href="cdevspecial42117.dita#cdevspecial42117"/>.</p>
-</conbody></concept>
+</metadata></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts28351.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts28351.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts28351.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts28351.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,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="cdevconcepts28351">
+<concept id="cdevconcepts28351" xml:lang="en-us">
 <title>Updatable cursors</title>
-<prolog>
-</prolog>
+<shortdesc>Cursors are read-only by default. For a cursor to be updatable,
+you must specify <codeph>SELECT . . . FOR UPDATE</codeph>.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>Cursors are read-only by default. For a cursor to be updatable, you must
-specify SELECT . . . FOR UPDATE. Use FOR UPDATE only when you will be modifying
-rows to avoid excessive locking of tables.</p>
-</conbody></concept>
+<p>Use <codeph>FOR UPDATE</codeph> only when you will be modifying rows to
+avoid excessive locking of tables.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts28436.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts28436.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts28436.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts28436.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,27 @@
 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="cdevconcepts28436">
+<concept id="cdevconcepts28436" xml:lang="en-us">
 <title>Deadlocks</title>
+<shortdesc>In a database, a deadlock is a situation in which two or more transactions
+are waiting for one another to give up locks.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Deadlocks<indexterm>description</indexterm></indexterm>
+<keywords><indexterm>Deadlocks<indexterm>description</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>In a database, a deadlock is a situation in which two or more transactions
-are waiting for one another to give up locks.</p>
-<p>For example, Transaction A might hold a lock on some rows in the <i>Accounts</i> table and needs to update some rows in the <i>Orders</i> table to finish. Transaction B holds locks on those very rows
-in the <i>Orders</i> table but needs to update the rows in
-the <i>Accounts</i> table held by Transaction A. Transaction
-A cannot complete its transaction because of the lock on <i>Orders</i>. Transaction B cannot complete its transaction because of the
-lock on <i>Accounts</i>. All activity comes to a halt and
-remains at a standstill forever unless the DBMS detects the deadlock and aborts
-one of the transactions.</p>
-<fig expanse="column">
-<title>A deadlock.</title><image placement="break" href="dead.gif"><alt>This figure depicts a deadlock, where two transactions are waiting for one another to give up locks.</alt></image></fig>
-</conbody></concept>
+<p>For example, Transaction A might hold a lock on some rows in the <i>Accounts</i> table
+and needs to update some rows in the <i>Orders</i> table to finish. Transaction
+B holds locks on those very rows in the <i>Orders</i> table but needs to update
+the rows in the <i>Accounts</i> table held by Transaction A. Transaction A
+cannot complete its transaction because of the lock on <i>Orders</i>. Transaction
+B cannot complete its transaction because of the lock on <i>Accounts</i>.
+All activity comes to a halt and remains at a standstill forever unless the
+DBMS detects the deadlock and aborts one of the transactions.</p>
+<fig expanse="column"><title>A deadlock.</title>
+<image href="dead.gif" placement="break"><alt>This figure depicts a deadlock,
+where two transactions are waiting for one another to give up locks.</alt>
+</image>
+</fig>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts29416.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts29416.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts29416.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts29416.dita Fri Mar 17 13:11:50 2006
@@ -19,13 +19,13 @@
 -->
 <concept id="cdevconcepts29416" xml:lang="en-us">
 <title>Using auto-commit</title>
+<shortdesc>A new connection to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database
+is in auto-commit mode by default, as specified by the JDBC standard.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Auto-commit<indexterm>using</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>A new connection to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database
-is in auto-commit mode by default, as specified by the JDBC standard. Auto-commit
-mode means that when a statement is completed, the method <i>commit</i> is
+<p>Auto-commit mode means that when a statement is completed, the method <i>commit</i> is
 called on that statement automatically. Auto-commit in effect makes every
 SQL statement a transaction. The commit occurs when the statement completes
 or the next statement is executed, whichever comes first. In the case of a
@@ -42,11 +42,10 @@
 OF" clause) on cursors which have the <i>close cursors on commit</i> option
 set.</p><p>Auto-commit automatically closes cursors, which are explicitly
 opened with the <i>close on commit</i> option, when you do any in-place updates
-or deletes. For more information about cursors, see <xref href="cdevconcepts41275.dita#cdevconcepts41275"></xref>.</p><p>A
-cursor declared to be held across commit can execute updates and issue multiple
-commits before closing the cursor, but the cursor must be repositioned before
-any statement following the commit. If this is attempted with auto-commit
-on, an error is generated. </p></li>
+or deletes.</p><p>A cursor declared to be held across commit can execute updates
+and issue multiple commits before closing the cursor, but the cursor must
+be repositioned before any statement following the commit. If this is attempted
+with auto-commit on, an error is generated. </p></li>
 <li><i>Database-side JDBC Procedures (procedures using nested connections)</i> 
  <p>You cannot execute procedures within SQL statements if those procedures
 perform a commit or rollback on the current connection. Since in the auto-commit
@@ -60,8 +59,8 @@
 locks prevent other transactions that update data from accessing the table.
 A transaction holds a lock on a table until the transaction commits. <i>So
 even a SELECT statement holds a shared lock on a table until its connection
-commits and a new transaction begins. </i></p><table frame="all">
-<title>Summary of Application Behavior with Auto-Commit On or Off</title>
+commits and a new transaction begins. </i></p><table frame="all"><title>Summary
+of Application Behavior with Auto-Commit On or Off</title>
 <tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="46*"/>
 <colspec colname="2" colnum="2" colwidth="24*"/><colspec colname="3" colnum="3"
 colwidth="25*"/>
@@ -105,4 +104,3 @@
 </ul>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts30291.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts30291.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts30291.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts30291.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="cdevconcepts30291">
+<concept id="cdevconcepts30291" xml:lang="en-us">
 <title>Locking, concurrency, and isolation</title>
+<shortdesc>This section discusses topics pertinent to multi-user systems,
+in which concurrency is important.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Transaction isolation levels</indexterm>
-<indexterm>Isolation levels</indexterm>
-<indexterm>Locking</indexterm>
-<indexterm>Concurrency</indexterm>
+<keywords><indexterm>Transaction isolation levels</indexterm><indexterm>Isolation
+levels</indexterm><indexterm>Locking</indexterm><indexterm>Concurrency</indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>This section discusses topics pertinent to multi-user systems, in which
-concurrency is important. <ph conref="devconrefs.dita#prod/productshortname"></ph> is configured by default to work well
-for multi-user systems. For single-user systems, you might want to tune your
-system so that it uses fewer resources; see <xref href="cdevconcepts23810.dita#cdevconcepts23810"/>.</p>
-</conbody></concept>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> is configured
+by default to work well for multi-user systems. For single-user systems, you
+might want to tune your system so that it uses fewer resources; see <xref
+href="cdevconcepts23810.dita#cdevconcepts23810"></xref>.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts30811.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts30811.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts30811.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts30811.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,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 id="cdevconcepts30811" xml:lang="en-us">
 <title>Requirements for updatable cursors</title>
+<shortdesc>Only specific SELECT statements- simple accesses of a single table-allow
+you to update or delete rows as you step through them.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Cursors<indexterm>requirements for being updatable</indexterm></indexterm>
 <indexterm>Cursors<indexterm>updatable</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>Only specific SELECT statements- simple accesses of a single
-table-allow you to update or delete rows as you step through them.</p>
 <p>For more information, see "SELECT statement" and "FOR UPDATE clause" in
 the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts32861.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts32861.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts32861.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts32861.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,14 +19,15 @@
 -->
 <concept id="cdevconcepts32861" xml:lang="en-us">
 <title>Programming applications to handle deadlocks</title>
+<shortdesc>When you configure your system for deadlock and lockwait timeouts
+and an application could be chosen as a victim when the transaction times
+out, you should program your application to handle them.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Deadlocks<indexterm>programming an application to handle</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>When you configure your system for deadlock and lockwait timeouts and an
-application could be chosen as a victim when the transaction times out, you
-should program your application to handle this. To do this, test for <i>SQLExceptions</i> with <codeph><i>SQLStates</i></codeph> of
+<p>To do this, test for <i>SQLExceptions</i> with <codeph><i>SQLStates</i></codeph> of
 40001 (deadlock timeout) or 40XL1 or 40XL2 (lockwait timeout).</p>
 <p>In the case of a deadlock you might want to re-try the transaction that
 was chosen as a victim. In the case of a lock wait timeout, you probably do

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts34828.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts34828.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts34828.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts34828.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,12 +19,11 @@
 -->
 <concept id="cdevconcepts34828" xml:lang="en-us">
 <title>Working with multiple connections to a single database</title>
+<shortdesc>This section discusses deploying <ph conref="devconrefs.dita#prod/productshortname"></ph> so
+that many connections can exist to a single database.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Multiple connections<indexterm>in single application</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
-<conbody>
-<p>This section discusses deploying <ph conref="devconrefs.dita#prod/productshortname"></ph> so
-that many connections can exist to a single database.</p>
-</conbody>
+<conbody></conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts36402.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts36402.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts36402.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts36402.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,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="cdevconcepts36402">
+<concept id="cdevconcepts36402" xml:lang="en-us">
 <title>Types and scope of locks in Derby systems</title>
+<shortdesc>There are several types of locks available in <ph conref="devconrefs.dita#prod/productshortname"></ph> systems,
+including exclusive, shared, and update locks.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Locks<indexterm>exclusive</indexterm><indexterm>shared</indexterm><indexterm>update</indexterm></indexterm>
+<keywords><indexterm>Locks<indexterm>exclusive</indexterm><indexterm>shared</indexterm><indexterm>update</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
-<conbody>
-<p>There are several types of locks available in <ph conref="devconrefs.dita#prod/productshortname"></ph> systems, including
-exclusive, shared, and update locks.</p>
-</conbody></concept>
+</metadata></prolog>
+<conbody></conbody>
+</concept>



Mime
View raw message