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

Modified: db/derby/docs/trunk/src/devguide/cdevspecial28907.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevspecial28907.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial28907.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial28907.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 id="cdevspecial28907" xml:lang="en-us">
 <title>Requirements for database-side JDBC procedures using nested connections</title>
+<shortdesc>In order to preserve transactional atomicity, database-side JDBC
+procedures that use nested connections have the following limitations.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Nested connections<indexterm>limitations of</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>In order to preserve transactional atomicity, database-side JDBC procedures
-that use nested connections: <ul>
-<li>cannot issue a commit or rollback, unless called within a CALL statement.
+<p> <ul>
+<li>Cannot issue a commit or rollback, unless called within a CALL statement.
   </li>
-<li>cannot change connection attributes such as auto-commit.  </li>
-<li>cannot modify the data in a table used by the parent statement that called
+<li>Cannot change connection attributes such as auto-commit.  </li>
+<li>Cannot modify the data in a table used by the parent statement that called
 the procedure, using INSERT, UPDATE, or DELETE. For example, if a SELECT statement
 using the <i>T</i> table calls the <codeph><i>changeTables</i></codeph> procedure, <codeph><i>changeTables</i></codeph> cannot
 modify data in the <codeph><i>T</i> table.</codeph>  </li>
-<li>cannot drop a table used by the statement that called the procedure.</li>
-<li>cannot be in a class whose static initializer executes DDL statements.</li>
+<li>Cannot drop a table used by the statement that called the procedure.</li>
+<li>Cannot be in a class whose static initializer executes DDL statements.</li>
 </ul>In addition, the Connection object that represents the nested connection
 always has its auto-commit mode set to false.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevspecial29620.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevspecial29620.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial29620.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial29620.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,19 +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 id="cdevspecial29620" xml:lang="en-us">
 <title>Database-side JDBC procedures and nested connections</title>
+<shortdesc>Most database-side JDBC Procedures need to share the same transaction
+space as the statements that called them.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Nested connections<indexterm>getting</indexterm></indexterm>
 <indexterm>Database-side JDBC procedures<indexterm>using nested connections</indexterm></indexterm>
 <indexterm>Nested connections<indexterm>getting</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>Most database-side JDBC Procedures need to share the same transaction space
-as the statements that called them for the following reasons:</p>
+<p>The reasons for this are:</p>
 <ul>
 <li>to avoid blocking and deadlocks</li>
 <li>to ensure that any updates done from within the method are atomic with
@@ -45,4 +46,3 @@
 <p>Loading a JDBC driver in a database-side routine is not required.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevspecial41728.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevspecial41728.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial41728.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial41728.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,30 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevspecial41728">
+<concept id="cdevspecial41728" xml:lang="en-us">
 <title>Database-side JDBC procedures and SQLExceptions</title>
+<shortdesc>It is possible to code database-side procedures, like application-side
+methods, to catch <i>SQLExceptions</i>. SQLExceptions that are caught within
+a procedure are hidden from the calling application code.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>SQLExceptions<indexterm>importance of not catching
-within database-side procedures</indexterm></indexterm>
-<indexterm>Database-side JDBC procedures<indexterm>and SQLExceptions</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>SQLExceptions<indexterm>importance of not catching within
+database-side procedures</indexterm></indexterm><indexterm>Database-side JDBC
+procedures<indexterm>and SQLExceptions</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>It is possible to code database-side procedures, like application-side
-methods, to catch <i>SQLExceptions</i>. <codeph><i>SQLExceptions</i></codeph> that are caught within a procedure are hidden from
-the calling application code. When such <codeph><i>SQLExceptions</i></codeph> are of transaction severity (such as deadlocks), this "hiding"
-of the exception causes unexpected problems.</p>
+<p>When such <codeph><i>SQLExceptions</i></codeph> are of transaction severity
+(such as deadlocks), this "hiding" of the exception causes unexpected problems.</p>
 <p>This is because errors of transaction severity roll back work already done
 by a transaction (not just the piece executed by the called method) and silently
 begin a new transaction. When the method execution is complete, <ph conref="devconrefs.dita#prod/productshortname"></ph> detects
 that the outer statement was invalidated by a deadlock and rolls back any
-work done<i> in the new transaction</i> as well. This is
-the expected behavior, because all the statements in between explicit commits
-should be treated atomically; the new transaction implicitly begun by <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+work done<i> in the new transaction</i> as well. This is the expected behavior,
+because all the statements in between explicit commits should be treated atomically;
+the new transaction implicitly begun by <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
 rollback was not intended by the application designer.</p>
 <p>However, this is not the same behavior that would happen if the method
-were invoked in the application. In that situation, <ph conref="devconrefs.dita#prod/productshortname"></ph> would roll
-back the work done by the transaction and silently begin a new transaction.
+were invoked in the application. In that situation, <ph conref="devconrefs.dita#prod/productshortname"></ph> would
+roll back the work done by the transaction and silently begin a new transaction.
 Work in the new transaction would not be rolled back when the method returned.
 However, coding the application in that way means that the transaction did
 not end where you expected it to and is probably a programming mistake. Coding
@@ -51,8 +51,8 @@
 ensure that transactions begin and end where you expect them to.</p>
 <p>Not all database vendors handle nested deadlocks the same way. For this
 and other reasons, it is not possible to write portable SQL-invoking methods.
-However, it is possible to write SQL-invoking methods that behave identically <i>regardless of whether you invoke them in the application or
-as a procedure in the database</i>.</p>
+However, it is possible to write SQL-invoking methods that behave identically <i>regardless
+of whether you invoke them in the application or as a procedure in the database</i>.</p>
 <p>In order to ensure identical application- and database-side handling of
 nested errors, code try-catch blocks to check for the severity of exceptions
 as follows:</p>
@@ -67,5 +67,7 @@
     else { throw se; }
 }</codeblock>
 <p>Of course, users also have the choice of not wrapping SQL statements in
-try-catch blocks within methods. In that case, <i>SQLExceptions</i> are caught higher up in their applications, which is the desired behavior.</p>
-</conbody></concept>
+try-catch blocks within methods. In that case, <i>SQLExceptions</i> are caught
+higher up in their applications, which is the desired behavior.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevspecial45786.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevspecial45786.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial45786.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial45786.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,19 +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 id="cdevspecial45786" xml:lang="en-us">
 <title>User-defined SQLExceptions</title>
+<shortdesc>When the execution of a database-side method raises an error, <ph
+conref="devconrefs.dita#prod/productshortname"></ph> wraps that exception
+in an <i>SQLException</i> with an <codeph><i>SQLState</i></codeph> of 38000.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>SQLExceptions<indexterm>user-defined (38001-38999)</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>When the execution of a database-side method raises an error, <ph conref="devconrefs.dita#prod/productshortname"></ph> wraps
-that exception in an <i>SQLException</i> with an <codeph><i>SQLState</i></codeph> of
-38000. You can avoid having <ph conref="devconrefs.dita#prod/productshortname"></ph> wrap
+<p>You can avoid having <ph conref="devconrefs.dita#prod/productshortname"></ph> wrap
 the exception if:</p>
 <ul>
 <li>The exception is an <i>SQLException</i></li>
@@ -35,4 +36,3 @@
 <p>(This conforms to the SQL99 standard.)</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/devguide/cdevspecial53165.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevspecial53165.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial53165.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial53165.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,23 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevspecial53165">
+<concept id="cdevspecial53165" xml:lang="en-us">
 <title>Trigger action overview</title>
+<shortdesc>A trigger action is a simple SQL statement.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Triggers<indexterm>limitations of trigger actions</indexterm></indexterm>
-<indexterm>Triggers<indexterm>use of SQL and Java in trigger
-actions</indexterm></indexterm>
+<keywords><indexterm>Triggers<indexterm>limitations of trigger actions</indexterm></indexterm>
+<indexterm>Triggers<indexterm>use of SQL and Java in trigger actions</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>A trigger action is a simple SQL statement. For example:</p>
-<codeblock><b>CREATE TRIGGER . . .
+<p>For example:</p>
+<codeblock>CREATE TRIGGER . . .
 DELETE FROM flightavailability 
 	WHERE flight_id IN (SELECT flight_id FROM flightavailability 
-		WHERE YEAR(flight_date) &lt; 2005);) 
-</b></codeblock>
+		WHERE YEAR(flight_date) &lt; 2005);) </codeblock>
 <p>A trigger action does have some limitations, though; for example, it cannot
 contain dynamic parameters or alter the table on which the trigger is defined.
-See "TriggerAction" in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite> for details. </p>
-</conbody></concept>
+See "TriggerAction" in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite> for
+details. </p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevspecial67260.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevspecial67260.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial67260.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial67260.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="cdevspecial67260">
+<concept id="cdevspecial67260" xml:lang="en-us">
 <title>Accessing before and after rows</title>
+<shortdesc>Many trigger actions need to access the values of the rows being
+changed.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Triggers<indexterm>accessing before and after rows</indexterm></indexterm>
+<keywords><indexterm>Triggers<indexterm>accessing before and after rows</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>Many trigger actions need to access the values of the rows being changed.
-Such trigger actions need to know one or both of the following:</p>
+<p>Such trigger actions need to know one or both of the following:</p>
 <ul>
-<li>the "before" values of the rows being changed (their values before
-the database event that caused the trigger to fire)</li>
-<li>the "after" values of the rows being changed (the values to which
-the database event is setting them)</li>
+<li>the "before" values of the rows being changed (their values before the
+database event that caused the trigger to fire)</li>
+<li>the "after" values of the rows being changed (the values to which the
+database event is setting them)</li>
 </ul>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides transition variables and transition tables for a trigger
-action to access these values. See"Referencing Old and New Values: The
-Referencing Clause" in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
-</conbody></concept>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides transition
+variables and transition tables for a trigger action to access these values.
+See "Referencing Old and New Values: The Referencing Clause" in the <cite><ph
+conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevspecial76763.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevspecial76763.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial76763.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial76763.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,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="cdevspecial76763">
+<concept id="cdevspecial76763" xml:lang="en-us">
 <title>Performing referential actions</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> provides
+referential actions. Examples in this section are included to illustrate how
+to write triggers.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Referential actions<indexterm>and triggers</indexterm></indexterm>
-<indexterm>Triggers<indexterm>use of to perform referential
-actions</indexterm></indexterm>
+<keywords><indexterm>Referential actions<indexterm>and triggers</indexterm></indexterm>
+<indexterm>Triggers<indexterm>use of to perform referential actions</indexterm></indexterm>
 <indexterm>Referential integrity<indexterm>via triggers</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides referential actions. Examples in this section are included
-to illustrate how to write triggers. You can choose to use standard SQL referential
-integrity to obtain this functionality, rather than writing triggers. See
-the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite> for more information on referential integrity.</p>
-</conbody></concept>
+<p>You can choose to use standard SQL referential integrity to obtain this
+functionality, rather than writing triggers. See the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite> for
+more information on referential integrity.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevspecial847513.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevspecial847513.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial847513.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial847513.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,16 +19,16 @@
 -->
 <concept id="cdevspecial847513" xml:lang="en-us">
 <title>Invoking a procedure using the CALL command</title>
+<shortdesc>If a procedure uses only IN parameters, <ph conref="devconrefs.dita#prod/productshortname"></ph> can
+execute the procedure by using the SQL CALL command. A stored procedure with
+IN, OUT, or INOUT parameters can be invoked from a client application by using
+the CallableStatement method.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Database-side JDBC procedures<indexterm>example of connecting
 to different database</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>If a procedure uses only IN parameters, <ph conref="devconrefs.dita#prod/productshortname"></ph> can
-execute the procedure by using the SQL CALL command. A stored procedure with
-IN, OUT, or INOUT parameters can be invoked from a client application by using
-the CallableStatement method. You can invoke the procedure in an SQL statement
-such as the following:</p>
+<p>You can invoke the procedure in an SQL statement such as the following:</p>
 <codeblock><b>CALL MYPROC()</b></codeblock>
 <note>You cannot roll back this statement, because commits occur within the
 procedure itself. Procedures that use nested connections, on the other hand,

Modified: db/derby/docs/trunk/src/devguide/cdevspecial93497.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevspecial93497.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial93497.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial93497.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,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="cdevspecial93497">
+<concept id="cdevspecial93497" xml:lang="en-us">
 <title>Aborting statements and transactions</title>
-<prolog>
-</prolog>
+<shortdesc>You might want a trigger action to be able to abort the triggering
+statement or even the entire transaction.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>You might want a trigger action to be able to abort the triggering statement
-or even the entire transaction. Triggers that use the current connection are
-not permitted to commit or roll back the connection, so how do you do that?
-The answer is: have the trigger throw an exception, which is by default a
-statement-level exception (which rolls back the statement). The application-side
-code that contains the statement that caused the trigger to fire can then
-roll back the entire connection if desired. Programming triggers in this respect
-is no different from programming any database-side JDBC method.</p>
-</conbody></concept>
+<p>Triggers that use the current connection are not permitted to commit or
+roll back the connection, so how do you do that? The answer is: have the trigger
+throw an exception, which is by default a statement-level exception (which
+rolls back the statement). The application-side code that contains the statement
+that caused the trigger to fire can then roll back the entire connection if
+desired. Programming triggers in this respect is no different from programming
+any database-side JDBC method.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards805644.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards805644.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards805644.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards805644.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,12 +17,10 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevstandards805644">
+<concept id="cdevstandards805644" xml:lang="en-us">
 <title>Dynamic SQL</title>
-<prolog>
-</prolog>
-<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> uses JDBC's Prepared Statement, and does not provide SQL commands
-for dynamic SQL. </p>
-</conbody></concept>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> uses JDBC's
+Prepared Statement, and does not provide SQL commands for dynamic SQL.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards805664.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards805664.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards805664.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards805664.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="cdevstandards805664">
+<concept id="cdevstandards805664" xml:lang="en-us">
 <title>Cursors</title>
-<prolog>
-</prolog>
-<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> uses JDBC's Result Sets, and does not provide SQL for manipulating
-cursors except for positioned update and delete. <ph conref="devconrefs.dita#prod/productshortname"></ph>'s scrolling
-insensitive cursors are provided through JDBC, not through SQL commands. </p>
-</conbody></concept>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> uses JDBC's
+Result Sets, and does not provide SQL for manipulating cursors except for
+positioned update and delete. <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+scrolling insensitive cursors are provided through JDBC, not through SQL commands.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards805690.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards805690.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards805690.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards805690.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="cdevstandards805690" xml:lang="en-us">
 <title>Information schema</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> uses its
+own system catalog that can be accessed using standard JDBC DatabaseMetadata
+calls. <ph conref="devconrefs.dita#prod/productshortname"></ph> does not provide
+the standard Information Schema views.</shortdesc>
 <prolog></prolog>
-<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> uses its own system
-catalog that can be accessed using standard JDBC DatabaseMetadata calls. <ph
-conref="devconrefs.dita#prod/productshortname"></ph> does not provide the
-standard Information Schema views.</p>
-</conbody>
+<conbody></conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards805716.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards805716.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards805716.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards805716.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="cdevstandards805716" xml:lang="en-us">
 <title>Transactions</title>
-<prolog></prolog>
-<conbody>
-<p>All operations in <ph conref="devconrefs.dita#prod/productshortname"></ph> are
+<shortdesc>All operations in <ph conref="devconrefs.dita#prod/productshortname"></ph> are
 transactional. <ph conref="devconrefs.dita#prod/productshortname"></ph> supports
 transaction control using JDBC 3.0 Connection methods. This includes support
 for savepoints and for the four JDBC transaction isolation levels. The only
-SQL command provided for transaction control is SET TRANSACTION ISOLATION.</p>
-</conbody>
+SQL command provided for transaction control is SET TRANSACTION ISOLATION.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards805742.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards805742.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards805742.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards805742.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,11 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevstandards805742">
+<concept id="cdevstandards805742" xml:lang="en-us">
 <title>Stored routines and PSM</title>
-<prolog>
-</prolog>
-<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> supports external procedures using the Java programming language.
-Procedures are managed using the CREATE PROCEDURE and DROP PROCEDURE statements. </p>
-</conbody></concept>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> supports
+external procedures using the Java programming language. Procedures are managed
+using the CREATE PROCEDURE and DROP PROCEDURE statements.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards805768.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards805768.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards805768.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards805768.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,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="cdevstandards805768">
+<concept id="cdevstandards805768" xml:lang="en-us">
 <title>Calling functions and procedures</title>
-<prolog>
-</prolog>
-<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> supports the CALL (procedure) statement for calling external procedures declared by the CREATE PROCEDURE statement. Built-in functions and user-defined functions declared with the CREATE FUNCTION command can be called as part of an SQL select statement or by using either a VALUES clause or VALUES expression. </p>
-</conbody></concept>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> supports
+the CALL (procedure) statement for calling external procedures declared by
+the CREATE PROCEDURE statement. Built-in functions and user-defined functions
+declared with the CREATE FUNCTION command can be called as part of an SQL
+select statement or by using either a VALUES clause or VALUES expression.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards805841.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards805841.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards805841.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards805841.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,13 +17,11 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevstandards805841">
+<concept id="cdevstandards805841" xml:lang="en-us">
 <title>Unique constraints and nulls</title>
-<prolog>
-</prolog>
-<conbody>
-<p>The SQL standard defines that unique constraints on nullable columns allow
-any number of nulls; <ph conref="devconrefs.dita#prod/productshortname"></ph> does not permit unique constraints on nullable
-columns. </p>
-</conbody></concept>
+<shortdesc>The SQL standard defines that unique constraints on nullable columns
+allow any number of nulls; <ph conref="devconrefs.dita#prod/productshortname"></ph> does
+not permit unique constraints on nullable columns.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards805893.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards805893.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards805893.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards805893.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,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="cdevstandards805893">
+<concept id="cdevstandards805893" xml:lang="en-us">
 <title>NOT NULL characteristic</title>
-<prolog>
-</prolog>
-<conbody>
-<p>The SQL standard says NOT NULL is a constraint, and can be named and viewed
-in the information schema as such. <ph conref="devconrefs.dita#prod/productshortname"></ph> does not provide naming for
-NOT NULL, nor does it present it as a constraint in the information schema,
-only as a characteristic of the column. </p>
-</conbody></concept>
+<shortdesc>The SQL standard says NOT NULL is a constraint, and can be named
+and viewed in the information schema as such. <ph conref="devconrefs.dita#prod/productshortname"></ph> does
+not provide naming for NOT NULL, nor does it present it as a constraint in
+the information schema, only as a characteristic of the column.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards805949.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards805949.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards805949.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards805949.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="cdevstandards805949">
+<concept id="cdevstandards805949" xml:lang="en-us">
 <title>DECIMAL max precision</title>
-<prolog>
-</prolog>
-<conbody>
-<p>For <ph conref="devconrefs.dita#prod/productshortname"></ph>, the maximum precision for DECIMAL columns is 31 digits.
-SQL99 does not require a specific maximum precision for decimals, but most
-products have a maximum precision of 15-32 digits.</p>
-</conbody></concept>
+<shortdesc>For <ph conref="devconrefs.dita#prod/productshortname"></ph>, the
+maximum precision for DECIMAL columns is 31 digits. SQL99 does not require
+a specific maximum precision for decimals, but most products have a maximum
+precision of 15-32 digits.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards805975.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards805975.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards805975.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards805975.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,10 +19,9 @@
 -->
 <concept id="cdevstandards805975" xml:lang="en-us">
 <title>CLOB, and BLOB</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> supports
+the standard CLOB and BLOB data types. BLOB and CLOB values are limited to
+a maximum of 2,147,483,647 characters.</shortdesc>
 <prolog></prolog>
-<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> supports the standard
-CLOB and BLOB data types. BLOB and CLOB values are limited to a maximum of
-2,147,483,647 characters.</p>
-</conbody>
+<conbody></conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards806001.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards806001.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards806001.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards806001.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,14 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevstandards806001">
+<concept id="cdevstandards806001" xml:lang="en-us">
 <title>Expressions on LONGs</title>
-<prolog>
-</prolog>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> permits
+expressions on LONG VARCHAR; however LONG VARCHAR data types are not allowed
+in the following clauses, operations, constraints, functions, and predicates.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> permits expressions on LONG VARCHAR; however LONG VARCHAR data
-types are not allowed in:
-<ul>
+<p> <ul>
 <li>GROUP BY clauses</li>
 <li>ORDER BY clauses</li>
 <li>JOIN operations</li>
@@ -34,4 +36,5 @@
 <li>[NOT] IN predicate</li>
 <li>UNION, INTERSECT, and EXCEPT operators</li>
 </ul>SQL99 also places some restrictions on expressions on LONG types.</p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards806027.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards806027.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards806027.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards806027.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="cdevstandards806027">
+<concept id="cdevstandards806027" xml:lang="en-us">
 <title>ALTER TABLE</title>
-<prolog>
-</prolog>
-<conbody>
-<p>Slightly different ALTER TABLE syntax for altering column defaults. SQL99
-uses DROP and SET, we use DEFAULT.</p>
-</conbody></concept>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> uses a
+slightly different ALTER TABLE syntax for altering column defaults. While
+SQL99 uses DROP and SET, <ph conref="devconrefs.dita#prod/productshortname"></ph> uses
+DEFAULT.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandards806118.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstandards806118.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards806118.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards806118.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,20 +17,19 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevstandards806118">
+<concept id="cdevstandards806118" xml:lang="en-us">
 <title>Derby and standards</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> adheres
+to SQL99 standards wherever possible. Below you will find a guide to those
+features currently in <ph conref="devconrefs.dita#prod/productshortname"></ph> that
+are not standard; these features are currently being evaluated and might be
+removed in future releases.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>SQL99 standards<indexterm>and Derby</indexterm></indexterm>
+<keywords><indexterm>SQL99 standards<indexterm>and Derby</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> adheres to SQL99 standards wherever possible. Below you will
-find a guide to those features currently in <ph conref="devconrefs.dita#prod/productshortname"></ph> that are not standard;
-these features are currently being evaluated and might be removed in future
-releases.</p>
-<p>This section describes those parts of <ph conref="devconrefs.dita#prod/productshortname"></ph> that are non-standard
-or not typical for a database system:</p>
-</conbody></concept>
+<p>This section describes those parts of <ph conref="devconrefs.dita#prod/productshortname"></ph> that
+are non-standard or not typical for a database system.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstart16043.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstart16043.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstart16043.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstart16043.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,52 +17,47 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevstart16043">
+<concept id="cdevstart16043" xml:lang="en-us">
 <title>The installation directory</title>
+<shortdesc>The installation program installs the <ph conref="devconrefs.dita#prod/productshortname"></ph> software
+in a directory of your choice.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Installation directory<indexterm>layout of</indexterm></indexterm>
-<indexterm>DERBY_INSTALL environment variable</indexterm>
-<indexterm>Sample applications and databases<indexterm>description</indexterm></indexterm>
-<indexterm>APIs for public classes and interfaces</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Installation directory<indexterm>layout of</indexterm></indexterm>
+<indexterm>DERBY_INSTALL environment variable</indexterm><indexterm>Sample
+applications and databases<indexterm>description</indexterm></indexterm><indexterm>APIs
+for public classes and interfaces</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>The installation program installs the <ph conref="devconrefs.dita#prod/productshortname"></ph> software in a directory
-of your choice. See the<codeph> install.html</codeph> file for information on how
-to install <ph conref="devconrefs.dita#prod/productshortname"></ph>.</p>
+<p>See the <codeph>install.html</codeph> file for information on how to install <ph
+conref="devconrefs.dita#prod/productshortname"></ph>.</p>
 <p>The installer automatically creates setup scripts that include an environment
-variable called <ph conref="devconrefs.dita#prod/productinstallpath"></ph>. The installer's value is set to the <ph conref="devconrefs.dita#prod/productshortname"></ph>
-base directory.</p>
+variable called <ph conref="devconrefs.dita#prod/productinstallpath"></ph>.
+The installer's value is set to the <ph conref="devconrefs.dita#prod/productshortname"></ph> base
+directory.</p>
 <codeblock>C:&gt;echo %<ph conref="devconrefs.dita#prod/productinstallpath"></ph>%
 C:\<ph conref="devconrefs.dita#prod/productinstallpath"></ph></codeblock>
 <p>If you want to set your own environment, <cite><ph conref="devconrefs.dita#pub/citgetstart"></ph></cite> instructs
-you on setting its value to the directory in which you installed the <ph conref="devconrefs.dita#prod/productshortname"></ph>
-software.</p>
-<p>The installer for <ph conref="devconrefs.dita#prod/productshortname"></ph> installs all the files you need,
-including the documentation set, some example applications, and a sample database.</p>
+you on setting its value to the directory in which you installed the <ph conref="devconrefs.dita#prod/productshortname"></ph> software.</p>
+<p>The installer for <ph conref="devconrefs.dita#prod/productshortname"></ph> installs
+all the files you need, including the documentation set, some example applications,
+and a sample database.</p>
 <p>Details about the installation:</p>
 <ul>
-<li><i>index.html </i>in the top-level directory is the top
-page for the on-line documentation.</li>
+<li><i>index.html </i>in the top-level directory is the top page for the on-line
+documentation.</li>
 <li><i>release_notes.html</i>, in the top-level <ph conref="devconrefs.dita#prod/productshortname"></ph> base
 directory, contains important last-minute information. <i>Read it first</i>.</li>
-<li><i>/demo</i> contains some sample applications, useful
-scripts, and prebuilt databases.  
-<ul>
+<li><i>/demo</i> contains some sample applications, useful scripts, and prebuilt
+databases.   <ul>
 <li><i>/databases</i> includes prebuilt sample databases.</li>
 <li><i>/programs</i> includes sample applications.</li>
 </ul></li>
-<li><i>/doc</i> contains the on-line documentation (including
-this document).</li>
-<li><i>/frameworks</i> contains utilities and scripts for
-running <ph conref="devconrefs.dita#prod/productshortname"></ph>. </li>
-<li><i>/javadoc</i> contains the documented APIs for the
-public classes and interfaces. Typically, you use the JDBC interface to interact
-with <ph conref="devconrefs.dita#prod/productshortname"></ph>; however, you can use some of these additional classes in
-certain situations.</li>
+<li><i>/doc</i> contains the on-line documentation (including this document).</li>
+<li><i>/frameworks</i> contains utilities and scripts for running <ph conref="devconrefs.dita#prod/productshortname"></ph>. </li>
+<li><i>/javadoc</i> contains the documented APIs for the public classes and
+interfaces. Typically, you use the JDBC interface to interact with <ph conref="devconrefs.dita#prod/productshortname"></ph>;
+however, you can use some of these additional classes in certain situations.</li>
 <li><i>/lib</i> contains the <ph conref="devconrefs.dita#prod/productshortname"></ph> libraries.</li>
 </ul>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstart18978.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstart18978.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstart18978.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstart18978.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,14 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevstart18978">
+<concept id="cdevstart18978" xml:lang="en-us">
 <title>Derby and JVMs</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> is a database
+engine written completely in Java; it will run in any JVM, version 1.3 or
+higher.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>JVMs (Java Virtual Machines)<indexterm>verified for
-Derby</indexterm></indexterm>
+<keywords><indexterm>JVMs (Java Virtual Machines)<indexterm>verified for Derby</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
-<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> is a database engine written completely in Java; it will run
-in any JVM, version 1.3 or higher.</p>
-</conbody></concept>
+</metadata></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstart19524.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstart19524.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstart19524.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstart19524.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,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="cdevstart19524">
+<concept id="cdevstart19524" xml:lang="en-us">
 <title>After installing</title>
-<prolog>
-</prolog>
+<shortdesc>This section provides reference information about the installation
+directory, JVMs, classpath, upgrades, and platform-specific issues.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>This chapter provides reference information about the installation directory,
-JVMs, classpath, upgrades, and platform-specific issues.</p>
-<p>Review the <codeph>install.html</codeph> file that is installed with <ph conref="devconrefs.dita#prod/productshortname"></ph> for
-information on installing the <ph conref="devconrefs.dita#prod/productshortname"></ph> development environment. See the Release
-Notes for information on platform support, changes that may affect your existing
-applications, defect information, and recent documentation updates. See <cite><ph conref="devconrefs.dita#pub/citgetstart"></ph></cite> for basic product descriptions, information
-on getting started, and directions for setting the path and the classpath. </p>
-</conbody></concept>
+<p>Review the <codeph>install.html</codeph> file that is installed with <ph
+conref="devconrefs.dita#prod/productshortname"></ph> for information on installing
+the <ph conref="devconrefs.dita#prod/productshortname"></ph> development environment.
+See the Release Notes for information on platform support, changes that may
+affect your existing applications, defect information, and recent documentation
+updates. See <cite><ph conref="devconrefs.dita#pub/citgetstart"></ph></cite> for
+basic product descriptions, information on getting started, and directions
+for setting the path and the classpath. </p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstart39409.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstart39409.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstart39409.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstart39409.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,20 +17,19 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevstart39409">
+<concept id="cdevstart39409" xml:lang="en-us">
 <title>Configuring file descriptors</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> databases
+create one file per table or index. Some operating systems limit the number
+of files an application can open at one time.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>File descriptors<indexterm>configuring to run Derby</indexterm></indexterm>
-<indexterm>IOExceptions<indexterm>indicating need to relax file
-descriptors limit</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>File descriptors<indexterm>configuring to run Derby</indexterm></indexterm>
+<indexterm>IOExceptions<indexterm>indicating need to relax file descriptors
+limit</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> databases create one file per table or index. Some operating
-systems limit the number of files an application can open at one time. If
-the default is a low number, such as 64, you might run into unexpected <i>IOExceptions</i> (wrapped in <codeph><i>SQLExceptions</i></codeph>). If your operating system lets you configure the number of file
-descriptors, set this number to a higher value.</p>
-</conbody></concept>
+<p>If the default is a low number, such as 64, you might run into unexpected <i>IOExceptions</i> (wrapped
+in <codeph><i>SQLExceptions</i></codeph>). If your operating system lets you
+configure the number of file descriptors, set this number to a higher value.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstart41260.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstart41260.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstart41260.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstart41260.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,10 +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="cdevstart41260">
+<concept id="cdevstart41260" xml:lang="en-us">
 <title>UNIX-specific issues</title>
-<prolog>
-</prolog>
-<conbody>
-</conbody></concept>
+<shortdesc>This section discusses <ph conref="devconrefs.dita#prod/productshortname"></ph> issues
+specifically related to UNIX platforms.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstart813142.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstart813142.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstart813142.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstart813142.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,20 +17,19 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevstart813142">
+<concept id="cdevstart813142" xml:lang="en-us">
 <title>Batch files and shell scripts</title>
+<shortdesc>The <i>/frameworks/embedded/bin</i> directory contains scripts
+for running some of the <ph conref="devconrefs.dita#prod/productshortname"></ph> tools
+and utilities. To customize your environment, put the directory first in your
+path.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Shell scripts</indexterm>
+<keywords><indexterm>Shell scripts</indexterm><indexterm>Batch files</indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p><indexterm>Batch files</indexterm>The <i>/frameworks/embedded/bin</i> directory contains scripts for running some of the <ph conref="devconrefs.dita#prod/productshortname"></ph> tools
-and utilities. To customize your environment, put the directory first in your
-path.</p>
 <p>These scripts serve as examples to help you get started with these tools
 and utilities on any platform. However, they can require modification in order
 to run properly on certain platforms.</p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstart813545.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstart813545.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstart813545.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstart813545.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,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="cdevstart813545">
+<concept id="cdevstart813545" xml:lang="en-us">
 <title>Scripts</title>
-<prolog>
-</prolog>
+<shortdesc>Your installation contains executable script files that simplify
+invoking the <ph conref="devconrefs.dita#prod/productshortname"></ph> tools.
+On UNIX systems, these files might need to have their default protections
+set to include execute privilege.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>Your installation contains executable script files that simplify invoking
-the <ph conref="devconrefs.dita#prod/productshortname"></ph> tools. On UNIX systems, these files might need to have their
-default protections set to include execute privilege. A typical way to do
-this is with the command <i>chmod +x *.ksh</i>.</p>
+<p>A typical way to do this is with the command <i>chmod +x *.ksh</i>.</p>
 <p>Consult the documentation for your operating system for system-specific
 details.</p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstart98282.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevstart98282.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstart98282.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstart98282.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,15 +17,15 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevstart98282">
+<concept id="cdevstart98282" xml:lang="en-us">
 <title>Derby libraries and classpath</title>
-<prolog>
-</prolog>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> libraries
+are located in the /<i>lib</i> subdirectory of the <ph conref="devconrefs.dita#prod/productshortname"></ph> base
+directory. You must set the classpath on your development machine to include
+the appropriate libraries.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> libraries are located in the /<i>lib</i> subdirectory
-of the <ph conref="devconrefs.dita#prod/productshortname"></ph> base directory. You must set the classpath on your development
-machine to include the appropriate libraries.</p>
-<p><cite><ph conref="devconrefs.dita#pub/citgetstart"></ph></cite><cite> </cite> explains how to set the
-classpath in a development environment.</p>
-</conbody></concept>
+<p><cite><ph conref="devconrefs.dita#pub/citgetstart"></ph></cite><cite> </cite> explains
+how to set the classpath in a development environment.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevtricks13019.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevtricks13019.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevtricks13019.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevtricks13019.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,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="cdevtricks13019">
+<concept id="cdevtricks13019" xml:lang="en-us">
 <title>Tricks of the VALUES clause</title>
+<shortdesc>This section contains some tips to use with the VALUES clause.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>VALUES clause<indexterm>power of</indexterm></indexterm>
+<keywords><indexterm>VALUES clause<indexterm>power of</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
-<conbody>
-</conbody></concept>
+</metadata></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevtricks19707.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevtricks19707.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevtricks19707.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevtricks19707.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="cdevtricks19707">
+<concept id="cdevtricks19707" xml:lang="en-us">
 <title>Retrieving the database connection URL</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> does not
+have a built-in function that returns the name of the database. However, you
+can use <codeph>DatabaseMetaData</codeph> to return the connection URL of
+any local <codeph>Connection</codeph>.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Database connection URL<indexterm>retrieving from
-database</indexterm></indexterm>
+<keywords><indexterm>Database connection URL<indexterm>retrieving from database</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> does not have a built-in function that returns the name of
-the database. However, you can use <i>DatabaseMetaData</i> to
-return the connection URL of any local <codeph><i>Connection</i></codeph>.</p>
 <codeblock><b>/* in java */</b>
 String myURL = conn.getMetaData().getURL();
 </codeblock>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevtricks21248.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevtricks21248.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevtricks21248.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevtricks21248.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="cdevtricks21248">
+<concept id="cdevtricks21248" xml:lang="en-us">
 <title>Defining an identity column</title>
+<shortdesc>An identity column is a column that stores numbers that increment
+by one with each insertion. Identity columns are sometimes called autoincrement
+columns.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Identity column<indexterm>defining</indexterm></indexterm>
-<indexterm>Identity column<indexterm>definition</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Identity column<indexterm>defining</indexterm></indexterm>
+<indexterm>Identity column<indexterm>definition</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>An identity column is a column that stores numbers that increment by one
-with each insertion. Identity columns are sometimes called autoincrement columns. <ph conref="devconrefs.dita#prod/productshortname"></ph> provides
-autoincrement as a built-in feature; see CREATE TABLE statement in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides autoincrement
+as a built-in feature; see CREATE TABLE statement in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
 <p>Below is an example that shows how to use an identity column to create
 the MAP_ID column of the MAPS table in the <i>toursDB database</i>.</p>
 <codeblock>CREATE TABLE MAPS
@@ -40,4 +41,5 @@
 PICTURE BLOB(102400),
 UNIQUE (MAP_ID, MAP_NAME)
 )</codeblock>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevtricks23426.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevtricks23426.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevtricks23426.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevtricks23426.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,11 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevtricks23426">
+<concept id="cdevtricks23426" xml:lang="en-us">
 <title>Using third-party tools</title>
-<prolog>
-</prolog>
-<conbody>
-<p>You can hook into any JDBC tool with just our JDBC Driver class name (<i>org.apache.derby.jdbc.EmbeddedDriver</i>) and <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
-JDBC connection URL. </p>
-</conbody></concept>
+<shortdesc>You can hook into any JDBC tool with just our JDBC Driver class
+name (<i>org.apache.derby.jdbc.EmbeddedDriver</i>) and <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+JDBC connection URL.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevtricks32436.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevtricks32436.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevtricks32436.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevtricks32436.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,12 +17,10 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevtricks32436">
+<concept id="cdevtricks32436" xml:lang="en-us">
 <title>SQL tips</title>
-<prolog>
-</prolog>
-<conbody>
-<p>This section provides some examples of interesting SQL features. It also
-includes a few non-SQL tips.</p>
-</conbody></concept>
+<shortdesc>This section provides some examples of interesting SQL features.
+It also includes a few non-SQL tips.</shortdesc>
+<prolog></prolog>
+<conbody></conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevtricks39584.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevtricks39584.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevtricks39584.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevtricks39584.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,19 +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="cdevtricks39584">
+<concept id="cdevtricks39584" xml:lang="en-us">
 <title>Supplying a parameter only once</title>
+<shortdesc>If you want to supply a parameter value once and use it multiple
+times within a query, put it in the FROM clause with an appropriate CAST.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>VALUES clause<indexterm>power of</indexterm></indexterm>
+<keywords><indexterm>VALUES clause<indexterm>power of</indexterm></indexterm>
 <indexterm>Using a supplied parameter multiple times in a query</indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>If you want to supply a parameter value once and use it multiple times
-within a query, put it in the FROM clause with an appropriate CAST:</p>
 <codeblock>SELECT  phonebook.* 
 	FROM phonebook, (VALUES (CAST(? AS INT), CAST(? AS VARCHAR(255))))  
 						AS Choice(choice, search_string)
@@ -37,6 +37,7 @@
 on the value in the first parameter. Putting the parameters in the FROM clause
 means that they need to be applied only once to the query, and you can give
 them names so that you can refer to them elsewhere in the query. In the example
-above, the first parameter is given the name <i>choice</i>,
-and the second parameter is given the name <i>search_string</i>.</p>
-</conbody></concept>
+above, the first parameter is given the name <i>choice</i>, and the second
+parameter is given the name <i>search_string</i>.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevtricks807337.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevtricks807337.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevtricks807337.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevtricks807337.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,19 +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="cdevtricks807337">
+<concept id="cdevtricks807337" xml:lang="en-us">
 <title>Multiple rows</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> supports
+the complete SQL-92 VALUES clause; this is very handy in several cases.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Multiple rows VALUES clause</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Multiple rows VALUES clause</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> supports the complete SQL-92 VALUES clause; this is very handy
-in several cases. The first useful case is that it can be used to insert multiple
-rows:</p>
+<p>The first useful case is that it can be used to insert multiple rows:</p>
 <codeblock><b>INSERT INTO OneColumnTable VALUES 1,2,3,4,5,6,7,8
 
 INSERT INTO TwoColumnTable VALUES
@@ -40,4 +39,5 @@
 (?,?,?), (?,?,?), (?,?,?), (?,?,?), (?,?,?)
 EXECUTE p1 USING 'VALUES (''1st'',1,1,''2nd'',2,2''3rd'',
 3,3,''4th'',4,4,''5th'',5,5)'</b></codeblock>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevtricks807365.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevtricks807365.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevtricks807365.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevtricks807365.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,27 +17,23 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevtricks807365">
+<concept id="cdevtricks807365" xml:lang="en-us">
 <title>Mapping column values to return values</title>
+<shortdesc>Multiple-row VALUES tables are useful in mapping column values
+to desired return values in queries.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Mapping column values to return values</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Mapping column values to return values</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>Multiple-row VALUES tables are useful in mapping column values to desired
-return values in queries:</p>
-<codeblock><b><b>-- get the names of all departments in Ohio</b>
-SELECT DeptName
+<codeblock><b>-- get the names of all departments in Ohio</b>SELECT DeptName
 FROM Depts,
 (VALUES (1, 'Shoe'),
     (2, 'Laces'),
     (4, 'Polish'))
 AS DeptMap(DeptCode,DeptDesc)
 WHERE Depts.DeptCode = DeptMap.DeptCode
-AND Depts.DeptLocn LIKE '%Ohio%'</b></codeblock>
+AND Depts.DeptLocn LIKE '%Ohio%'</codeblock>
 <p>You might also find it useful to store values used often for mapping in
 a persistent table and then using that table in the query.</p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/trunk/src/devguide/cdevtricks807400.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevtricks807400.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevtricks807400.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevtricks807400.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,22 +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="cdevtricks807400">
+<concept id="cdevtricks807400" xml:lang="en-us">
 <title>Creating empty queries</title>
+<shortdesc>You may need <ph conref="devconrefs.dita#prod/productshortname"></ph> to
+create "empty" queries in existing applications for filling in bits of functionality
+that <ph conref="devconrefs.dita#prod/productshortname"></ph> does not supply.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Creating empty queries</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Creating empty queries</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>Developers using <ph conref="devconrefs.dita#prod/productshortname"></ph> in existing applications might need to create "empty"
-queries with the right result shape for filling in bits of functionality <ph conref="devconrefs.dita#prod/productshortname"></ph> does
-not supply. Empty queries of the right size and shape can be formed off a
-single values table and a "WHERE FALSE" condition:</p>
+<p>Empty queries of the right size and shape can be formed off a single values
+table and a "WHERE FALSE" condition:</p>
 <codeblock><b>SELECT *
 FROM (VALUES ('',1,"TRUE")) AS ProcedureInfo(ProcedureName,NumParameters, 
 ProcedureValid)
 WHERE 1=0</b></codeblock>
-</conbody></concept>
+</conbody>
+</concept>