db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r202296 [7/16] - in /incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Tue, 28 Jun 2005 22:46:37 GMT
Modified: incubator/derby/docs/trunk/src/ref/crefjavstateautogen.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/crefjavstateautogen.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/crefjavstateautogen.dita (original)
+++ incubator/derby/docs/trunk/src/ref/crefjavstateautogen.dita Tue Jun 28 15:46:15 2005
@@ -30,13 +30,14 @@
 system automatically assigns increasing integer values. In JDBC 3.0, the method <i>Statement.getGeneratedKeys</i> can
 be called to retrieve the value of such a column. This method returns a <i>ResultSet</i> object
 with a column for the automatically generated key. Calling <i>ResultSet.getMetaData</i> on
-the <i>ResultSet</i> object returned by <i>getGeneratedKeys</i> produces a <i>ResultSetMetaData</i> object that is similar to that returned by <xref href="rrefidentityvallocal.dita#rrefidentityvallocal"></xref>.
+the <i>ResultSet</i> object returned by <i>getGeneratedKeys</i> produces a <i>ResultSetMetaData</i> object that is similar to that returned by <xref href="rrefidentityvallocal.dita#rrefidentityvallocal">IDENTITY_VAL_LOCAL</xref>.
 A flag indicating that any auto-generated columns should be returned is passed
 to the methods <i>execute</i>, <i>executeUpdate</i>, or <i>prepareStatement</i> when
 the statement is executed or prepared.</p>
 <p>Here's an example that returns a ResultSet with values for auto-generated
 columns in TABLE1:   <codeblock expanse="column"><b>Statement stmt = conn.createStatement();
-int rows = stmt.executeUpdate("INSERT INTO TABLE1 (C11, C12) VALUES (1,1)", Statement.RETURN_GENERATED_KEYS);
+int rows = stmt.executeUpdate("INSERT INTO TABLE1 (C11, C12) VALUES (1,1)",
+  Statement.RETURN_GENERATED_KEYS);
 ResultSet rs = stmt.getGeneratedKeys();</b></codeblock></p>
 <p>To use Autogenerated Keys in INSERT statements, pass the <codeph>Statement.RETURN_GENERATED_KEYS</codeph> flag
 to the <i>execute</i> or <i>executeUpdate</i> method. <ph

Modified: incubator/derby/docs/trunk/src/ref/crefjdbc12657.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/crefjdbc12657.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/crefjdbc12657.dita (original)
+++ incubator/derby/docs/trunk/src/ref/crefjdbc12657.dita Tue Jun 28 15:46:15 2005
@@ -49,10 +49,7 @@
 JDBC driver return an <i>SQLException</i> with a message stating "Feature
 not implemented" and an <i>SQLState</i> of XJZZZ. These unimplemented parts
 are for features not supported by <ph conref="refconrefs.dita#prod/productshortname"></ph>.
-  <ul>
-<li><xref href="crefjdbc25142.dita#crefjdbc25142"></xref></li>
-<li><xref href="rrefjdbc32593.dita#rrefjdbc32593"></xref></li>
-</ul></p>
+</p>
 </conbody>
 </concept>
 

Modified: incubator/derby/docs/trunk/src/ref/crefmpref1002477.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/crefmpref1002477.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/crefmpref1002477.dita (original)
+++ incubator/derby/docs/trunk/src/ref/crefmpref1002477.dita Tue Jun 28 15:46:15 2005
@@ -18,13 +18,8 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <concept id="crefmpref1002477" xml:lang="en-us">
-<title>About this document</title>
+<title>About this guide</title>
 <conbody>
-<ul>
-<li><xref href="crefmpref11181.dita#crefmpref11181"></xref></li>
-<li><xref href="crefmpref23223.dita#crefmpref23223"></xref></li>
-<li><xref href="crefmpref23947.dita#crefmpref23947"></xref></li>
-</ul>
 <p>For general information about the <ph conref="refconrefs.dita#prod/productshortname"></ph> documentation,
 such as a complete list of books, conventions, and further reading, see <cite><ph
 conref="refconrefs.dita#pub/citgetstart"></ph></cite>.</p>

Modified: incubator/derby/docs/trunk/src/ref/crefmpref23947.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/crefmpref23947.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/crefmpref23947.dita (original)
+++ incubator/derby/docs/trunk/src/ref/crefmpref23947.dita Tue Jun 28 15:46:15 2005
@@ -18,9 +18,9 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <concept id="crefmpref23947" xml:lang="en-us">
-<title>How this document is organized</title>
+<title>How this guide is organized</title>
 <conbody>
-<p>This document includes the following chapters:   <ul>
+<p>This guide includes the following sections:   <ul>
 <li><i><xref href="crefsqlj23296.dita#crefsqlj23296"></xref></i>   <p>Reference information
 about <ph conref="refconrefs.dita#prod/productshortname"></ph>'s SQL language,
 including manual pages for statements, functions, and other syntax elements.</p></li>

Modified: incubator/derby/docs/trunk/src/ref/crefsqlj18919.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/crefsqlj18919.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/crefsqlj18919.dita (original)
+++ incubator/derby/docs/trunk/src/ref/crefsqlj18919.dita Tue Jun 28 15:46:15 2005
@@ -32,7 +32,7 @@
 <p><indexterm>SQL92Identifiers<indexterm>definition</indexterm></indexterm><indexterm>JavaIdentifiers<indexterm>definition</indexterm></indexterm
 >Each kind of identifier must conform to a different set of rules. Identifiers
 representing dictionary objects must conform to SQL-92 identifier rules and
-are thus called <i><xref href="crefsqlj34834.dita#crefsqlj34834"></xref>s</i>.</p>
+are thus called <i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref>s</i>.</p>
 </conbody>
 </concept>
 

Modified: incubator/derby/docs/trunk/src/ref/crefsqlj21305.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/crefsqlj21305.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/crefsqlj21305.dita (original)
+++ incubator/derby/docs/trunk/src/ref/crefsqlj21305.dita Tue Jun 28 15:46:15 2005
@@ -40,13 +40,12 @@
 <li><xref href="rrefsqlj30435.dita#rrefsqlj30435"></xref></li>
 <li><xref href="rrefsqlj57924.dita#rrefsqlj57924"></xref></li>
 <li><xref href="rrefsqlj32714.dita#rrefsqlj32714"></xref></li>
-<li><xref href="rrefblob.dita#blob"></xref></li>
+<li><xref href="rrefblob.dita#rrefblob"></xref></li>
 <li><xref href="rrefsqlj13733.dita#rrefsqlj13733"></xref></li>
-<li><xref href="rrefclob.dita#clob"></xref></li>
+<li><xref href="rrefclob.dita#rrefclob"></xref></li>
 <li><xref href="rrefsqlj18730.dita#rrefsqlj18730"></xref></li>
 <li><xref href="rrefsqlj15260.dita#rrefsqlj15260"></xref></li>
-<li><xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE
-PRECISION</xref></li>
+<li><xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision"></xref></li>
 <li><xref href="rrefsqlj27281.dita#rrefsqlj27281"></xref></li>
 <li><xref href="rrefsqlj10696.dita#rrefsqlj10696"></xref></li>
 <li><xref href="rrefsqlj30118.dita#rrefsqlj30118"></xref></li>

Modified: incubator/derby/docs/trunk/src/ref/crefsqlj28138.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/crefsqlj28138.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/crefsqlj28138.dita (original)
+++ incubator/derby/docs/trunk/src/ref/crefsqlj28138.dita Tue Jun 28 15:46:15 2005
@@ -23,23 +23,23 @@
 <p>Numeric types include the following types, which provide storage of varying
 sizes:   <ul>
 <li>Integer numerics   <ul>
-<li><xref href="rrefsqlj16221.dita#rrefsqlj16221"></xref> (2 bytes)</li>
-<li><xref href="rrefsqlj10696.dita#rrefsqlj10696"></xref> (4 bytes)</li>
-<li><xref href="rrefsqlj30435.dita#rrefsqlj30435"></xref> (8 bytes)</li>
+<li><xref href="rrefsqlj16221.dita#rrefsqlj16221">SMALLINT</xref> (2 bytes)</li>
+<li><xref href="rrefsqlj10696.dita#rrefsqlj10696">INTEGER</xref> (4 bytes)</li>
+<li><xref href="rrefsqlj30435.dita#rrefsqlj30435">BIGINT</xref> (8 bytes)</li>
 </ul></li>
 <li>Approximate or floating-point numerics   <ul>
-<li><xref href="rrefsqlj14122.dita#rrefsqlj14122"></xref> (4 bytes)</li>
+<li><xref href="rrefsqlj14122.dita#rrefsqlj14122">REAL</xref> (4 bytes)</li>
 <li><xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE PRECISION</xref> (8
 bytes)</li>
-<li><xref href="rrefsqlj27281.dita#rrefsqlj27281"></xref> (an alias for <xref
+<li><xref href="rrefsqlj27281.dita#rrefsqlj27281">FLOAT</xref> (an alias for <xref
 href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE PRECISION</xref> or <xref
-href="rrefsqlj14122.dita#rrefsqlj14122"></xref>)</li>
+href="rrefsqlj14122.dita#rrefsqlj14122">REAL</xref>)</li>
 </ul></li>
 <li>Exact numeric   <ul>
-<li><xref href="rrefsqlj15260.dita#rrefsqlj15260"></xref> (storage based on
+<li><xref href="rrefsqlj15260.dita#rrefsqlj15260">DECIMAL</xref> (storage based on
 precision)</li>
-<li><xref href="rrefsqlj12362.dita#rrefsqlj12362"></xref> (an alias for <xref
-href="rrefsqlj15260.dita#rrefsqlj15260"></xref>)</li>
+<li><xref href="rrefsqlj12362.dita#rrefsqlj12362">NUMERIC</xref> (an alias for <xref
+href="rrefsqlj15260.dita#rrefsqlj15260">DECIMAL</xref>)</li>
 </ul></li>
 </ul></p>
 </conbody>

Modified: incubator/derby/docs/trunk/src/ref/crefsqlj31068.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/crefsqlj31068.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/crefsqlj31068.dita (original)
+++ incubator/derby/docs/trunk/src/ref/crefsqlj31068.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,12 +16,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 id="crefsqlj31068" xml:lang="en-us">
 <title>Data types</title>
 <conbody>
-This section describes the data types used in <ph conref="refconrefs.dita#prod/productshortname"></ph>.</conbody>
+<p>This section describes the data types used in <ph conref="refconrefs.dita#prod/productshortname"></ph>.</p>
+</conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/ref/crefsqlj39374.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/crefsqlj39374.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/crefsqlj39374.dita (original)
+++ incubator/derby/docs/trunk/src/ref/crefsqlj39374.dita Tue Jun 28 15:46:15 2005
@@ -27,8 +27,8 @@
 execute directly but only as part of a high-level statement. The ORDER BY
 and WHERE clauses are examples of this kind of clause. Finally, this section
 also includes some syntactically complex portions of statements called expressions,
-for example <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i> and <i><xref
-href="rreftablesubquery.dita#rreftablesubquery"></xref>.</i> These clauses
+for example <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> and <i><xref
+href="rreftablesubquery.dita#rreftablesubquery">TableSubquery</xref>.</i> These clauses
 and expressions receive their own manual pages for ease of reference.</p>
 <p>Unless it is explicitly stated otherwise, you can execute or prepare and
 then execute all the high-level statements, which are all marked with the

Modified: incubator/derby/docs/trunk/src/ref/crefsqlj41507.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/crefsqlj41507.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/crefsqlj41507.dita (original)
+++ incubator/derby/docs/trunk/src/ref/crefsqlj41507.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,13 +16,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 id="crefsqlj41507" xml:lang="en-us">
 <title>Numeric types</title>
 <conbody>
-Numeric types used in <ph conref="refconrefs.dita#prod/productshortname"></ph>.
+<p>Numeric types used in <ph conref="refconrefs.dita#prod/productshortname"></ph>.</p>
 </conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/refderby.ditamap?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ incubator/derby/docs/trunk/src/ref/refderby.ditamap Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE map PUBLIC "-//IBM//DTD DITA Map//EN"
+ "../dtd/map.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,10 +16,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE map PUBLIC "-//IBM//DTD DITA Map//EN"
- "../dtd/map.dtd">
-
 <map title="Reference Manual">
 <topicmeta>
 <copyright>
@@ -30,28 +28,29 @@
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
 <topicref href="rrefcopyright.dita" navtitle="Copyright"></topicref>
-<topicref href="crefmpref1002477.dita" navtitle="About This Document">
-<topicref href="crefmpref11181.dita" navtitle="Purpose of This Document">
+<topicref collection-type="family" href="crefmpref1002477.dita" navtitle="About this guide">
+<topicref href="crefmpref11181.dita" navtitle="Purpose of this document">
 </topicref>
 <topicref href="crefmpref23223.dita" navtitle="Audience"></topicref>
-<topicref href="crefmpref23947.dita" navtitle="How This Document Is Organized">
+<topicref href="crefmpref23947.dita" navtitle="How this guide is organized">
 </topicref>
 </topicref>
-<topicref href="crefsqlj23296.dita" navtitle="SQL Language Reference">
+<topicref collection-type="family" href="crefsqlj23296.dita" navtitle="SQL language reference">
 <topicref href="rrefsqlj28468.dita" navtitle="Capitalization and special characters">
 </topicref>
-<topicref href="crefsqlj18919.dita" navtitle="SQL Identifiers">
-<topicref href="crefsqlj1003454.dita" navtitle="Rules for SQL92Identifiers">
+<topicref collection-type="family" href="crefsqlj18919.dita" navtitle="SQL identifiers ">
+<topicref href="crefsqlj1003454.dita" navtitle="Rules for SQL92 identifiers">
 </topicref>
 <topicref href="crefsqlj34834.dita" navtitle="SQL92Identifier">
-<topicref href="crefsqlj1004091.dita" navtitle="Qualifying Dictionary Objects">
+<topicref href="crefsqlj1004091.dita" navtitle="Qualifying dictionary objects">
 </topicref>
 </topicref>
 <topicref href="rrefcolumnname.dita" navtitle="column-Name"></topicref>
 <topicref href="rrefcorrelationname.dita" navtitle="correlation-Name"></topicref>
 <topicref href="rrefnewtablename.dita" navtitle="new-table-Name"></topicref>
-<topicref href="rrefschemaname.dita" navtitle="schema-Name"></topicref>
-<topicref href="rrefsimplecolumnname.dita" navtitle="Simple-column-Name"></topicref>
+<topicref href="rrefschemaname.dita" navtitle="schemaName"></topicref>
+<topicref href="rrefsimplecolumnname.dita" navtitle="Simple-column-Name">
+</topicref>
 <topicref href="rrefsynonymname.dita" navtitle="synonym-Name"></topicref>
 <topicref href="rreftablename.dita" navtitle="table-Name"></topicref>
 <topicref href="rrefviewname.dita" navtitle="view-Name"></topicref>
@@ -61,15 +60,16 @@
 <topicref href="rreftriggername.dita" navtitle="TriggerName"></topicref>
 <topicref href="rrefrauthid.dita" navtitle="AuthorizationIdentifier"></topicref>
 </topicref>
-<topicref href="crefsqlj39374.dita" navtitle="Statements">
-<topicref href="crefsqlj22771.dita" navtitle="Interaction with the Dependency System">
+<topicref collection-type="family" href="crefsqlj39374.dita" navtitle="Statements">
+<topicref href="crefsqlj22771.dita" navtitle="Interaction with the dependency system">
 </topicref>
-<topicref href="rrefsqlj81859.dita" navtitle="ALTER TABLE statement">
+<topicref collection-type="family" href="rrefsqlj81859.dita" navtitle="ALTER TABLE statement">
 <topicref href="rrefaltercolumndef.dita" navtitle="column-definition"></topicref>
-<topicref href="rrefsqlj37860.dita" navtitle="column-alteration"></topicref>
+<topicref href="rrefsqlj37860.dita" navtitle="column-alteration "></topicref>
 </topicref>
-<topicref href="crefsqlj95081.dita" navtitle="CREATE Statements">
-<topicref href="rrefcreatefunctionstatement.dita" navtitle="CREATE FUNCTION Statement">
+<topicref collection-type="family" href="crefsqlj95081.dita" navtitle="CREATE statements">
+<topicref collection-type="family" href="rrefcreatefunctionstatement.dita"
+navtitle="CREATE FUNCTION statement">
 <topicref href="rrefcrprofunctionname.dita" navtitle="function-Name" toc="no">
 </topicref>
 <topicref href="rrefcrprofunctionparameter.dita" navtitle="FunctionParameter"
@@ -78,7 +78,8 @@
 toc="no"></topicref>
 </topicref>
 <topicref href="rrefsqlj20937.dita" navtitle="CREATE INDEX statement"></topicref>
-<topicref href="rrefcreateprocedurestatement.dita" navtitle="CREATE PROCEDURE Statement">
+<topicref collection-type="family" href="rrefcreateprocedurestatement.dita"
+navtitle="CREATE PROCEDURE statement">
 <topicref href="rrefcrproprocedurename.dita" navtitle="procedure-Name" toc="no">
 </topicref>
 <topicref href="rrefcrproprocedureparameter.dita" navtitle="ProcedureParameter"
@@ -87,49 +88,51 @@
 toc="no"></topicref>
 </topicref>
 <topicref href="rrefsqlj31580.dita" navtitle="CREATE SCHEMA statement"></topicref>
-<topicref href="rrefsqljcreatesynonym.dita" navtitle="CREATE SYNONYM statement"></topicref>
-<topicref href="rrefsqlj24513.dita" navtitle="CREATE TABLE statement">
+<topicref href="rrefsqljcreatesynonym.dita" navtitle="CREATE SYNONYM statement">
+</topicref>
+<topicref collection-type="family" href="rrefsqlj24513.dita" navtitle="CREATE TABLE statement">
 <topicref href="rrefsqlj30540.dita" navtitle="column-definition" toc="no">
 </topicref>
 <topicref href="rrefsqlj37836.dita" navtitle="generated-column-spec" toc="no">
 </topicref>
 </topicref>
-<topicref href="rrefsqlj43125.dita" navtitle="CREATE TRIGGER statement">
+<topicref collection-type="family" href="rrefsqlj43125.dita" navtitle="CREATE TRIGGER statement">
 <topicref href="rrefsqlj89752.dita" navtitle="ReferencingClause" toc="no">
 </topicref>
 </topicref>
 <topicref href="rrefsqlj15446.dita" navtitle="CREATE VIEW statement"></topicref>
 </topicref>
-<topicref href="crefsqlj80721.dita" navtitle="DROP Statements">
+<topicref collection-type="family" href="crefsqlj80721.dita" navtitle="DROP Statements">
 <topicref href="rrefdropfunctionstatement.dita" navtitle="DROP FUNCTION statement">
 </topicref>
 <topicref href="rrefsqlj59893.dita" navtitle="DROP INDEX statement"></topicref>
 <topicref href="rrefdropprocedurestatement.dita" navtitle="DROP PROCEDURE statement">
 </topicref>
 <topicref href="rrefsqlj31648.dita" navtitle="DROP SCHEMA statement"></topicref>
-<topicref href="rrefsqljdropsynonym.dita" navtitle="DROP SYNONYM statement"></topicref>
+<topicref href="rrefsqljdropsynonym.dita" navtitle="DROP SYNONYM statement">
+</topicref>
 <topicref href="rrefsqlj34148.dita" navtitle="DROP TABLE statement"></topicref>
 <topicref href="rrefsqlj42082.dita" navtitle="DROP TRIGGER statement"></topicref>
 <topicref href="rrefsqlj61102.dita" navtitle="DROP VIEW statement"></topicref>
 </topicref>
-<topicref href="crefsqljrenamestatements.dita" navtitle="RENAME Statements">
+<topicref collection-type="family" href="crefsqljrenamestatements.dita" navtitle="RENAME statements">
 <topicref href="rrefsqlj95598.dita" navtitle="RENAME INDEX statement"></topicref>
-<topicref href="rrefsqljrenametablestatement.dita" navtitle="RENAME TABLE statement">
+<topicref href="rrefsqljrenametablestatement.dita" navtitle="RENAME TABLE statement ">
 </topicref>
 </topicref>
-<topicref href="crefsqlj35312.dita" navtitle="SET Statements">
+<topicref collection-type="family" href="crefsqlj35312.dita" navtitle="SET statements">
 <topicref href="rrefsqlj32268.dita" navtitle="SET SCHEMA statement"></topicref>
 <topicref href="rrefsqlj41180.dita" navtitle="SET CURRENT ISOLATION statement">
 </topicref>
 </topicref>
 <topicref href="rrefcallprocedure.dita" navtitle="CALL (PROCEDURE)"></topicref>
-<topicref href="rrefsqlj13590.dita" navtitle="CONSTRAINT clause">
-<topicref href="rrefsqlj16095.dita" navtitle="Column-Level-Constraint"></topicref>
-<topicref href="rrefsqlj42154.dita" navtitle="Table-Level Constraint"></topicref>
-<topicref href="rrefsqlj16357.dita" navtitle="ReferencesSpecification"></topicref>
+<topicref collection-type="family" href="rrefsqlj13590.dita" navtitle="CONSTRAINT clause">
+<topicref href="rrefsqlj16095.dita" navtitle="Column-level-constraint"></topicref>
+<topicref href="rrefsqlj42154.dita" navtitle="Table-level constraint"></topicref>
+<topicref href="rrefsqlj16357.dita" navtitle="References specification"></topicref>
 <topicref href="rrefsqlj91438.dita" navtitle="searchCondition"></topicref>
 </topicref>
-<topicref href="rrefdeclaretemptable.dita" navtitle="DECLARE GLOBAL TEMPORARY TABLE statement">
+<topicref collection-type="family" href="rrefdeclaretemptable.dita" navtitle="DECLARE GLOBAL TEMPORARY TABLE statement">
 <topicref href="rreftemptabledatatype.dita" navtitle="Data-type"></topicref>
 <topicref href="rreftemptableoncommit.dita" navtitle="ON COMMIT"></topicref>
 <topicref href="rreftemptablenotlogged.dita" navtitle="NOT LOGGED"></topicref>
@@ -139,7 +142,7 @@
 <topicref href="rrefsqlj21583.dita" navtitle="FROM clause"></topicref>
 <topicref href="rrefsqlj32654.dita" navtitle="GROUP BY clause"></topicref>
 <topicref href="rrefsqlj14854.dita" navtitle="HAVING clause"></topicref>
-<topicref href="rrefsqlj35034.dita" navtitle="INNER JOIN"></topicref>
+<topicref href="rrefsqlj35034.dita" navtitle="INNER JOIN "></topicref>
 <topicref href="rrefsqlj40774.dita" navtitle="INSERT statement"></topicref>
 <topicref href="rrefsqlj29840.dita" navtitle="JOIN operation"></topicref>
 <topicref href="rrefsqlj18922.dita" navtitle="LEFT OUTER JOIN"></topicref>
@@ -150,23 +153,23 @@
 <topicref href="rrefscalarsubquery.dita" navtitle="ScalarSubquery"></topicref>
 <topicref href="rrefselectexpression.dita" navtitle="SelectExpression"></topicref>
 <topicref href="rrefsqlj41360.dita" navtitle="SELECT statement"></topicref>
-<topicref href="rreftableexpression.dita" navtitle="TableExpression">
+<topicref collection-type="family" href="rreftableexpression.dita" navtitle="TableExpression">
 <topicref href="rrefsqlj33215.dita" navtitle="TableOrViewExpression"></topicref>
 </topicref>
 <topicref href="rreftablesubquery.dita" navtitle="TableSubquery"></topicref>
-<topicref href="rrefsqlj26498.dita" navtitle="UPDATE statement">
+<topicref collection-type="family" href="rrefsqlj26498.dita" navtitle="UPDATE statement">
 <topicref href="rrefsqlj76354.dita" navtitle="Value"></topicref>
 </topicref>
-<topicref href="rrefsqlj11277.dita" navtitle="VALUES expression">
+<topicref collection-type="family" href="rrefsqlj11277.dita" navtitle="VALUES expression">
 <topicref href="rrefsqlj87167.dita" navtitle="Value"></topicref>
 </topicref>
 <topicref href="rrefsqlj33602.dita" navtitle="WHERE clause"></topicref>
 <topicref href="rrefsqlj15309.dita" navtitle="WHERE CURRENT OF clause"></topicref>
 </topicref>
-<topicref href="rrefsqlj29026.dita" navtitle="Built-In Functions">
-<topicref href="rrefsqlj55788.dita" navtitle="Standard Built-In Functions">
+<topicref href="rrefsqlj29026.dita" navtitle="Built-in functions">
+<topicref href="rrefsqlj55788.dita" navtitle="Standard built-in functions">
 </topicref>
-<topicref href="rrefsqlj33923.dita" navtitle="Aggregates (Set Functions)">
+<topicref href="rrefsqlj33923.dita" navtitle="Aggregates (set functions)">
 </topicref>
 <topicref href="rrefsqlj98067.dita" navtitle="ABS or ABSVAL"></topicref>
 <topicref href="rrefsqlj32693.dita" navtitle="AVG"></topicref>
@@ -218,7 +221,8 @@
 <topicref href="rrefbuiltvarchar.dita" navtitle="VARCHAR"></topicref>
 <topicref href="rrefyearfunc.dita" navtitle="YEAR"></topicref>
 </topicref>
-<topicref href="crefsqlbuiltinsystemfunctions.dita" navtitle="Built-in system functions">
+<topicref collection-type="family" href="crefsqlbuiltinsystemfunctions.dita"
+navtitle="Built-in system functions">
 <topicref href="rrefsyscschecktablefunc.dita" navtitle="SYSCS_UTIL.SYSCS_CHECK_TABLE">
 </topicref>
 <topicref href="rrefsyscsruntimestatsfunc.dita" navtitle="SYSCS_UTIL.SYSCS_GET_RUNTIMESTATISTICS">
@@ -226,7 +230,8 @@
 <topicref href="rrefgetdbpropfunc.dita" navtitle="SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY">
 </topicref>
 </topicref>
-<topicref href="crefsqlbuiltinsystemprocedures.dita" navtitle="Built-in system procedures">
+<topicref collection-type="family" href="crefsqlbuiltinsystemprocedures.dita"
+navtitle="Built-in system procedures">
 <topicref href="rrefaltertablecompress.dita" navtitle="SYSCS_UTIL.SYSCS_COMPRESS_TABLE">
 </topicref>
 <topicref href="rrefproceduresinplacecompress.dita" navtitle="SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE">
@@ -254,15 +259,15 @@
 <topicref href="rrefimportdataproc.dita" navtitle="SYSCS_UTIL.SYSCS_IMPORT_DATA">
 </topicref>
 </topicref>
-<topicref href="crefsqlj31068.dita" navtitle="Data Types">
-<topicref href="crefsqlj21305.dita" navtitle="Built-In Type Overview"></topicref>
-<topicref href="crefsqlj41507.dita" navtitle="Numeric Types">
-<topicref href="crefsqlj28138.dita" navtitle="Numeric Type Overview"></topicref>
-<topicref href="rrefsqlj27767.dita" navtitle="Numeric Type Promotion in Expressions">
-</topicref>
-<topicref href="rrefsqlj20204.dita" navtitle="Storing Values of One Numeric Data Type in Columns of Another Numeric Data Type">
-</topicref>
-<topicref href="rrefsqlj36146.dita" navtitle="Scale for Decimal Arithmetic">
+<topicref collection-type="family" href="crefsqlj31068.dita" navtitle="Data types">
+<topicref href="crefsqlj21305.dita" navtitle="Built-In type overview"></topicref>
+<topicref collection-type="family" href="crefsqlj41507.dita" navtitle="Numeric types">
+<topicref href="crefsqlj28138.dita" navtitle="Numeric type overview"></topicref>
+<topicref href="rrefsqlj27767.dita" navtitle="Numeric type promotion in expressions">
+</topicref>
+<topicref href="rrefsqlj20204.dita" navtitle="Storing values of one numeric data type in columns of another numeric
+data type"></topicref>
+<topicref href="rrefsqlj36146.dita" navtitle="Scale for decimal arithmetic">
 </topicref>
 </topicref>
 <topicref href="rrefsqlj58560.dita" navtitle="Data type assignments and comparison, sorting, and ordering">
@@ -274,7 +279,7 @@
 <topicref href="rrefclob.dita" navtitle="CLOB"></topicref>
 <topicref href="rrefsqlj18730.dita" navtitle="DATE"></topicref>
 <topicref href="rrefsqlj15260.dita" navtitle="DECIMAL"></topicref>
-<topicref href="rrefsqlj42002.dita" navtitle="DOUBLE"></topicref>
+<topicref href="rrefsqlj42002.dita" navtitle="DOUBLE "></topicref>
 <topicref href="rrefsqljdoubleprecision.dita" navtitle="DOUBLE PRECISION">
 </topicref>
 <topicref href="rrefsqlj27281.dita" navtitle="FLOAT"></topicref>
@@ -290,23 +295,23 @@
 <topicref href="rrefsqlj41207.dita" navtitle="VARCHAR"></topicref>
 <topicref href="rrefsqlj32714.dita" navtitle="VARCHAR FOR BIT DATA"></topicref>
 </topicref>
-<topicref href="rrefsqlj19433.dita" navtitle="SQL Expressions">
-<topicref href="rrefsqlj1080779.dita" navtitle="Expression Precedence">
+<topicref collection-type="family" href="rrefsqlj19433.dita" navtitle="SQL expressions">
+<topicref collection-type="family" href="rrefsqlj1080779.dita" navtitle="Expression precedence">
 <topicref href="rrefsqlj1080962.dita" navtitle="Example"></topicref>
 </topicref>
 <topicref href="rrefsqlj23075.dita" navtitle="Boolean expression"></topicref>
-<topicref href="crefsqlj29911.dita" navtitle="Dynamic Parameters">
-<topicref href="rrefsqlj1082953.dita" navtitle="Dynamic Parameters Example">
-</topicref>
-<topicref href="rrefsqlj1083019.dita" navtitle="Where Dynamic Parameters Are Allowed">
+<topicref collection-type="family" href="crefsqlj29911.dita" navtitle="Dynamic parameters">
+<topicref href="rrefsqlj1082953.dita" navtitle="Dynamic parameters example ">
 </topicref>
+<topicref href="rrefsqlj1083019.dita" navtitle="Where dynamic parameters are allowed">
 </topicref>
 </topicref>
 </topicref>
-<topicref href="rrefkeywords29722.dita" navtitle="SQL Reserved Words"></topicref>
-<topicref href="rrefsql9241891.dita" navtitle="Derby support for SQL-92 features">
 </topicref>
-<topicref href="rrefsistabs38369.dita" navtitle="Derby system tables">
+<topicref href="rrefkeywords29722.dita" navtitle="SQL reserved words"></topicref>
+<topicref href="rrefsql9241891.dita" navtitle="Derby support for
+SQL-92 features "></topicref>
+<topicref collection-type="family" href="rrefsistabs38369.dita" navtitle="Derby System Tables">
 <topicref href="rrefsistabs28114.dita" navtitle="SYSALIASES"></topicref>
 <topicref href="rrefsistabs26665.dita" navtitle="SYSCHECKS"></topicref>
 <topicref href="rrefsistabs22441.dita" navtitle="SYSCOLUMNS"></topicref>
@@ -324,84 +329,78 @@
 <topicref href="rrefsistabs79888.dita" navtitle="SYSTRIGGERS"></topicref>
 <topicref href="rrefsistabs24045.dita" navtitle="SYSVIEWS"></topicref>
 </topicref>
-<topicref href="rrefexcept16677.dita" navtitle="Derby exception messages and SQL states">
-<topicref href="rrefexcept75154.dita" navtitle="Understanding SQLExceptions">
+<topicref collection-type="family" href="rrefexcept16677.dita" navtitle="Derby exception messages and SQL states">
+<topicref href="rrefexcept71493.dita" navtitle="SQLState and error message reference">
 </topicref>
-<topicref href="rrefexcept71493.dita" navtitle="SQLState and Error Message Reference">
-<topicref href="rrefexcept13113.dita" navtitle="Common Exceptions"></topicref>
 </topicref>
-</topicref>
-<topicref href="crefjdbc12657.dita" navtitle="JDBC Reference">
+<topicref collection-type="family" href="crefjdbc12657.dita" navtitle="JDBC Reference">
 <topicref href="crefjdbc25142.dita" navtitle="Core JDBC java.sql Classes, Interfaces, and Methods">
 </topicref>
-<topicref href="rrefjdbc32052.dita" navtitle="java.sql.Driver">
-<topicref href="rrefjdbc29973.dita" navtitle="Embedded Databases"></topicref>
-</topicref>
-<topicref href="rrefjdbc34565.dita" navtitle="java.sql.DriverManager.getConnection">
-<topicref href="rrefjdbc27433.dita" navtitle="Derby database connection URL syntax">
+<topicref href="rrefjdbc32052.dita" navtitle="java.sql.Driver"></topicref>
+<topicref collection-type="family" href="rrefjdbc34565.dita" navtitle="java.sql.DriverManager.getConnection">
+<topicref href="rrefjdbc27433.dita" navtitle="Derby database connection
+URL syntax"></topicref>
+<topicref href="rrefjdbc37352.dita" navtitle="Syntax of database connection URLs for applications with embedded databases ">
 </topicref>
-<topicref href="rrefjdbc37352.dita" navtitle="Embedded databases"></topicref>
-<topicref href="crefjavgcasyn.dita" navtitle="Additional Syntax"></topicref>
-<topicref href="rrefjdbc10889.dita" navtitle="Attributes of the Derby database connection URL">
+<topicref href="crefjavgcasyn.dita" navtitle="Additional SQL syntax"></topicref>
+<topicref href="rrefjdbc10889.dita" navtitle="Attributes of the Derby database
+connection URL "></topicref>
 </topicref>
+<topicref href="rrefjdbc34954.dita" navtitle="java.sql.Driver.getPropertyInfo ">
 </topicref>
-<topicref href="rrefjdbc34954.dita" navtitle="java.sql.Driver.getPropertyInfo">
+<topicref collection-type="family" href="rrefjdbc27734.dita" navtitle="java.sql.Connection ">
+<topicref href="rrefjavcsti.dita" navtitle="java.sql.Connection.setTransactionIsolation ">
 </topicref>
-<topicref href="rrefjdbc27734.dita" navtitle="java.sql.Connection">
-<topicref href="rrefjavcsti.dita" navtitle="java.sql.Connection.setTransactionIsolation">
+<topicref href="rrefjavcsro.dita" navtitle="java.sql.Connection.setReadOnly ">
 </topicref>
-<topicref href="rrefjavcsro.dita" navtitle="java.sql.Connection.setReadOnly">
+<topicref href="rrefjavciro.dita" navtitle="java.sql.Connection.isReadOnly ">
 </topicref>
-<topicref href="rrefjavciro.dita" navtitle="java.sql.Connection.isReadOnly">
+<topicref href="crefjavccns.dita" navtitle="Connection functionality not supported">
 </topicref>
-<topicref href="crefjavccns.dita" navtitle="Connection Functionality Not Supported">
 </topicref>
+<topicref collection-type="family" href="rrefjdbc15905.dita" navtitle="java.sql.DatabaseMetaData ">
+<topicref href="rrefdmrs.dita" navtitle="DatabaseMetaData result sets"></topicref>
+<topicref href="rrefgpc1.dita" navtitle="getProcedureColumns DatabaseMetaData.getProcedureColumns">
 </topicref>
-<topicref href="rrefjdbc15905.dita" navtitle="java.sql.DatabaseMetaData">
-<topicref href="rrefdmrs.dita" navtitle="DatabaseMetaData Result Sets"></topicref>
-<topicref href="rrefgpc1.dita" navtitle="getProcedureColumns"></topicref>
 <topicref href="rrefpgc1.dita" navtitle="Parameters to getProcedureColumns">
 </topicref>
-<topicref href="rrefcrsrgpc1.dita" navtitle="Columns in the ResultSet Returned by getProcedureColumns">
+<topicref href="rrefcrsrgpc1.dita" navtitle="Columns in the ResultSet returned by getProcedureColumns">
 </topicref>
 <topicref href="rrefdmdfns1.dita" navtitle="DatabaseMetaData functionality not supported">
 </topicref>
 </topicref>
-<topicref href="rrefjdbc40794.dita" navtitle="java.sql.Statement">
-<topicref href="rrefso2.dita" navtitle="ResultSet Objects"></topicref>
-<topicref href="rrefjssfns2.dita" navtitle="java.sql.Statement functionality not supported">
-</topicref>
+<topicref collection-type="family" href="rrefjdbc40794.dita" navtitle="java.sql.Statement ">
+<topicref href="rrefso2.dita" navtitle="ResultSet objects "></topicref>
 </topicref>
-<topicref href="rrefjdbc29874.dita" navtitle="java.sql.PreparedStatement">
-<topicref href="rrefjavsqlprst.dita" navtitle="Prepared statements and streaming columns">
+<topicref collection-type="family" href="rrefjdbc29874.dita" navtitle="java.sql.PreparedStatement ">
+<topicref href="rrefjavsqlprst.dita" navtitle="Prepared statements and streaming columns ">
 </topicref>
 </topicref>
-<topicref href="rrefjdbc20485.dita" navtitle="java.sql.CallableStatement">
-<topicref href="rrefjavcallstatout.dita" navtitle="CallableStatements and OUT Parameters">
+<topicref collection-type="family" href="rrefjdbc20485.dita" navtitle="java.sql.CallableStatement ">
+<topicref href="rrefjavcallstatout.dita" navtitle="CallableStatements and OUT Parameters ">
 </topicref>
-<topicref href="rrefjdbc75719.dita" navtitle="CallableStatements and INOUT Parameters">
+<topicref href="rrefjdbc75719.dita" navtitle="CallableStatements and INOUT Parameters ">
 </topicref>
 </topicref>
-<topicref href="rrefjdbc23502.dita" navtitle="java.sql.ResultSet">
-<topicref href="rrefjavsqlrssc.dita" navtitle="ResultSets and streaming columns">
+<topicref collection-type="family" href="rrefjdbc23502.dita" navtitle="java.sql.ResultSet ">
+<topicref href="rrefjavsqlrssc.dita" navtitle="ResultSets and streaming columns ">
 </topicref>
 </topicref>
-<topicref href="rrefjdbc38274.dita" navtitle="java.sql.ResultSetMetaData">
-<topicref href="rrefsauadt3.dita" navtitle="Source and updatability (all data types)">
+<topicref href="rrefjdbc38274.dita" navtitle="java.sql.ResultSetMetaData ">
 </topicref>
+<topicref href="rrefjdbc16643.dita" navtitle="java.sql.SQLException "></topicref>
+<topicref href="rrefjdbc30469.dita" navtitle="java.sql.SQLWarning "></topicref>
+<topicref href="rrefjdbc20377.dita" navtitle="Mapping of java.sql.Types to SQL types">
 </topicref>
-<topicref href="rrefjdbc16643.dita" navtitle="java.sql.SQLException"></topicref>
-<topicref href="rrefjdbc30469.dita" navtitle="java.sql.SQLWarning"></topicref>
-<topicref href="rrefjdbc20377.dita" navtitle="java.sql.Types"></topicref>
-<topicref href="rrefjdbc96386.dita" navtitle="java.sql.Blob and java.sql.Clob">
+<topicref collection-type="family" href="rrefjdbc96386.dita" navtitle="java.sql.Blob and java.sql.Clob">
 <topicref href="crefjavbclobnot.dita" navtitle="Notes"></topicref>
 </topicref>
-<topicref href="rrefjdbc80004.dita" navtitle="java.sql.Connection"></topicref>
+<topicref href="rrefjdbc80004.dita" navtitle="java.sql.Connection "></topicref>
 <topicref href="rrefjdbc77156.dita" navtitle="java.sql.ResultSet"></topicref>
-<topicref href="rrefjdbc59162.dita" navtitle="java.sql.Statement"></topicref>
-<topicref href="rrefjdbc99392.dita" navtitle="java.sql.PreparedStatement">
+<topicref href="rrefjdbc59162.dita" navtitle="java.sql.Statement "></topicref>
+<topicref href="rrefjdbc99392.dita" navtitle="java.sql.PreparedStatement ">
 </topicref>
-<topicref href="rrefjdbc52637.dita" navtitle="java.sql.CallableStatement">
+<topicref href="rrefjdbc52637.dita" navtitle="java.sql.CallableStatement ">
 </topicref>
 <topicref href="rrefjdbc66688.dita" navtitle="java.sql.DatabaseMetaData">
 </topicref>
@@ -409,38 +408,46 @@
 </topicref>
 <topicref href="rrefjdbc87220.dita" navtitle="java.sql.BatchUpdateException">
 </topicref>
-<topicref href="rrefjdbcjsr169.dita" navtitle="JDBC Package for Connected Device Configuration/Foundation Profile (JSR169)"></topicref>
-<topicref href="rrefjdbc32593.dita" navtitle="JDBC 3.0-Only Features"></topicref>
-<topicref href="rrefjdbcjavasqlconnection30.dita" navtitle="java.sql.Connection">
+<topicref href="rrefjdbcjsr169.dita" navtitle="JDBC Package for Connected Device Configuration/Foundation Profile
+(JSR169)"></topicref>
+<topicref href="rrefjdbc32593.dita" navtitle="JDBC 3.0-only features "></topicref>
+<topicref href="rrefjdbcjavasqlconnection30.dita" navtitle="java.sql.Connection ">
 </topicref>
-<topicref href="rrefjdbcdatabasemetadata30.dita" navtitle="java.sql.DatabaseMetaData">
+<topicref href="rrefjdbcdatabasemetadata30.dita" navtitle="java.sql.DatabaseMetaData ">
 </topicref>
-<topicref href="rrefjdbcparametermetadata30.dita" navtitle="java.sql.ParameterMetaData">
+<topicref href="rrefjdbcparametermetadata30.dita" navtitle="java.sql.ParameterMetaData ">
 </topicref>
 <topicref href="rrefjdbcjavasqlpreparedstatement30.dita" navtitle="java.sql.PreparedStatement">
 </topicref>
-<topicref href="rrefjdbcjavasqlsavepoint.dita" navtitle="java.sql.Savepoint">
-<topicref href="crefjavsavesetroll.dita" navtitle="Setting and rolling back to a savepoint">
+<topicref collection-type="family" href="rrefjdbcjavasqlsavepoint.dita" navtitle="java.sql.Savepoint ">
+<topicref href="crefjavsavesetroll.dita" navtitle="Setting and rolling back to a savepoint ">
 </topicref>
-<topicref href="crefjavsaverel.dita" navtitle="Releasing a savepoint"></topicref>
+<topicref href="crefjavsaverel.dita" navtitle="Releasing a savepoint "></topicref>
 <topicref href="crefjavsaverules.dita" navtitle="Rules for savepoints"></topicref>
 <topicref href="rrefjavsaverestrict.dita" navtitle="Restrictions on savepoints">
 </topicref>
 </topicref>
-<topicref href="rrefjdbcjavasqlstatement30.dita" navtitle="java.sql.Statement">
-<topicref href="crefjavstateautogen.dita" navtitle="Autogenerated Keys"></topicref>
+<topicref collection-type="family" href="rrefjdbcjavasqlstatement30.dita"
+navtitle="java.sql.Statement">
+<topicref href="crefjavstateautogen.dita" navtitle="Autogenerated keys"></topicref>
+</topicref>
+<topicref collection-type="family" href="rrefjdbc1020262.dita" navtitle="JDBC escape syntax ">
+<topicref href="rrefjdbc70824.dita" navtitle="JDBC escape keyword for call statements">
+</topicref>
+<topicref href="rrefjdbc27768.dita" navtitle="JDBC escape syntax"></topicref>
+<topicref href="rrefjdbc28456.dita" navtitle="JDBC escape syntax for LIKE clauses">
+</topicref>
+<topicref href="rrefjdbc88908.dita" navtitle="JDBC escape syntax for fn keyword">
 </topicref>
-<topicref href="rrefjdbc1020262.dita" navtitle="JDBC Escape Syntax">
-<topicref href="rrefjdbc70824.dita" navtitle="call"></topicref>
-<topicref href="rrefjdbc27768.dita" navtitle="d"></topicref>
-<topicref href="rrefjdbc28456.dita" navtitle="escape"></topicref>
-<topicref href="rrefjdbc88908.dita" navtitle="fn"></topicref>
-<topicref href="rrefjdbc37244.dita" navtitle="oj"></topicref>
-<topicref href="rrefjdbc12124.dita" navtitle="t"></topicref>
-<topicref href="rrefjdbc41784.dita" navtitle="ts"></topicref>
+<topicref href="rrefjdbc37244.dita" navtitle="JDBC escape syntax for outer joins">
 </topicref>
+<topicref href="rrefjdbc12124.dita" navtitle="JDBC espace syntax for time formats">
 </topicref>
-<topicref href="rrefattrib24612.dita" navtitle="Database Connection URL Attributes">
+<topicref href="rrefjdbc41784.dita" navtitle="JDBC escape syntax for timestamp formats">
+</topicref>
+</topicref>
+</topicref>
+<topicref collection-type="family" href="rrefattrib24612.dita" navtitle="Setting attributes for the database connection URL ">
 <topicref href="rrefattrib42100.dita" navtitle="bootPassword=key"></topicref>
 <topicref href="rrefattrib26867.dita" navtitle="create=true"></topicref>
 <topicref href="rrefattrib17246.dita" navtitle="databaseName=nameofDatabase">
@@ -462,43 +469,40 @@
 <topicref href="rrefattrib10035.dita" navtitle="user=userName"></topicref>
 <topicref href="rrefattrib34183.dita" navtitle="(no attributes)"></topicref>
 </topicref>
-<topicref href="rrefjta16677.dita" navtitle="J2EE Compliance: Java Transaction API and javax.sql Extensions">
-<topicref href="rrefjta37588.dita" navtitle="J2EE Overview">
-<topicref href="rrefjta94396.dita" navtitle="JVM and Libraries for J2EE Features">
+<topicref collection-type="family" href="rrefjta16677.dita" navtitle="J2EE Compliance: Java Transaction API and javax.sql Extensions">
+<topicref href="rrefjta94396.dita" navtitle="JVM and libraries for J2EE features">
 </topicref>
-</topicref>
-<topicref href="rrefjta51021.dita" navtitle="The JTA API">
-<topicref href="rrefjta1003392.dita" navtitle="Notes on Product Behavior">
+<topicref collection-type="family" href="rrefjta51021.dita" navtitle="The JTA API ">
+<topicref collection-type="family" href="rrefjta1003392.dita" navtitle="Notes on Product Behavior">
 <topicref href="rrefjta1003415.dita" navtitle="Recovered Global Transactions">
 </topicref>
-<topicref href="rrefjta1003463.dita" navtitle="XAConnections and User Names and Passwords">
+<topicref href="rrefjta1003463.dita" navtitle="XAConnections, user names and passwords">
 </topicref>
 </topicref>
 </topicref>
-<topicref href="rrefjta18596.dita" navtitle="javax.sql: JDBC Extensions">
+<topicref href="rrefjta18596.dita" navtitle="javax.sql: JDBC Extensions ">
 </topicref>
 </topicref>
-<topicref href="rrefapi10613.dita" navtitle="Derby API">
-<topicref href="rrefapi24806.dita" navtitle="Stand-Alone Tools and Utilities">
+<topicref collection-type="family" href="rrefapi10613.dita" navtitle="Derby API">
+<topicref href="rrefapi24806.dita" navtitle="Stand-alone tools and utilities">
 </topicref>
-<topicref href="rrefapi19690.dita" navtitle="JDBC Implementation Classes">
-<topicref href="rrefapi33761.dita" navtitle="JDBC Driver"></topicref>
+<topicref collection-type="family" href="rrefapi19690.dita" navtitle="JDBC implementation classes">
+<topicref href="rrefapi33761.dita" navtitle="JDBC driver"></topicref>
 <topicref href="rrefapi1003363.dita" navtitle="Data Source Classes"></topicref>
 </topicref>
-<topicref href="rrefapi1005026.dita" navtitle="Miscellaneous Utilities and Interfaces">
+<topicref href="rrefapi1005026.dita" navtitle="Miscellaneous utilities and interfaces">
 </topicref>
 </topicref>
-<topicref href="rrefsqlj75638.dita" navtitle="Supported territories"></topicref>
-<topicref href="rreflimits.dita" navtitle="Derby limitations">
-<topicref href="rrefidlengthlimits.dita" navtitle="Identifier length limitations">
+<topicref href="rrefsqlj75638.dita" navtitle="Supported territories "></topicref>
+<topicref collection-type="family" href="rreflimits.dita" navtitle="Derby limitations">
+<topicref href="rrefidlengthlimits.dita" navtitle="Limitations on identifier length ">
 </topicref>
 <topicref href="rrefnumericlimits.dita" navtitle="Numeric limitations"></topicref>
 <topicref href="rrefstringlimits.dita" navtitle="String limitations"></topicref>
 <topicref href="rrefdttlimits.dita" navtitle="DATE, TIME, and TIMESTAMP limitations">
 </topicref>
-<topicref href="rrefdbmlimits.dita" navtitle="Database Manager limitations">
+<topicref href="rrefdbmlimits.dita" navtitle="Limitations for database manager values">
 </topicref>
 </topicref>
 <topicref href="rreftrademderby.dita" navtitle="Trademarks"></topicref>
 </map>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefaltercolumndef.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefaltercolumndef.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefaltercolumndef.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefaltercolumndef.dita Tue Jun 28 15:46:15 2005
@@ -20,8 +20,8 @@
 <reference id="rrefaltercolumndef" xml:lang="en-us">
 <title>column-definition</title>
 <refbody>
-<example> <codeblock><b><i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i> <i>DataType</i>
-[ <i><xref href="rrefsqlj16095.dita#rrefsqlj16095"></xref></i> ]*
+<example> <codeblock><b><i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> <i>DataType</i>
+[ <i><xref href="rrefsqlj16095.dita#rrefsqlj16095">Column-level-constraint</xref></i> ]*
 [ [ WITH ] DEFAULT {<i>ConstantExpression</i> | NULL } ]</b></codeblock></example>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/ref/rrefaltertablecompress.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefaltertablecompress.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefaltertablecompress.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefaltertablecompress.dita Tue Jun 28 15:46:15 2005
@@ -19,8 +19,8 @@
 <reference id="rrefaltertablecompress" xml:lang="en-us">
 <title>SYSCS_UTIL.SYSCS_COMPRESS_TABLE</title>
 <prolog><metadata>
-<keywords><indexterm>Compressing Tables</indexterm><indexterm>System procedures<indexterm>SYSCS_UTIL.SYSCS_COMPRESS_TABLE</indexterm></indexterm>
-<indexterm>SYSCS_UTIL.SYSCS_COMPRESS_TABLE system procedure</indexterm></keywords>
+<keywords><indexterm>Compressing Tables</indexterm><indexterm>System procedures<indexterm>SYSCS_COMPRESS_TABLE</indexterm></indexterm>
+</keywords>
 </metadata></prolog>
 <refbody>
 <section><p>Use the <codeph>SYSCS_UTIL.SYSCS_COMPRESS_TABLE</codeph> system

Modified: incubator/derby/docs/trunk/src/ref/rrefapi1003363.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefapi1003363.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefapi1003363.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefapi1003363.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,21 +16,21 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefapi1003363" xml:lang="en-us">
 <title>Data Source Classes</title>
+<prolog><metadata>
+<keywords><indexterm>org.apache.derby.jdbc. EmbeddedConnection PoolDataSource</indexterm>
+<indexterm>org.apache.derby.jdbc. EmbeddedXADataSource</indexterm><indexterm>org.apache.derby.jdbc. EmbeddedDataSource</indexterm></keywords>
+</metadata></prolog>
 <refbody>
 <section><p>These classes are all related to <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
 implementation of <i>javax.sql.DataSource</i> and related APIs. For more information,
 see Chapter 6, "Using <ph conref="refconrefs.dita#prod/productshortname"></ph> as
 a J2EE Resource Manager" <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.
   <ul>
-<li><i>org.apache.derby.jdbc.EmbeddedDataSource</i><indexterm>org.apache.derby.jdbc.EmbeddedDataSource</indexterm></li>
-<li><i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</i><indexterm>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</indexterm></li>
-<li><i>org.apache.derby.jdbc.EmbeddedXADataSource</i><indexterm>org.apache.derby.jdbc.EmbeddedXADataSource</indexterm></li>
-</ul></p></section>
+<li><i>org.apache.derby.jdbc.EmbeddedDataSource</i></li>
+<li><i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</i></li>
+<li><i>org.apache.derby.jdbc.EmbeddedXADataSource</i></li>
+</ul> </p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefapi1005026.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefapi1005026.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefapi1005026.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefapi1005026.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,20 +16,20 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefapi1005026" xml:lang="en-us">
 <title>Miscellaneous utilities and interfaces</title>
+<prolog><metadata>
+<keywords><indexterm>org.apache.derby. authentication.UserAuthenticator</indexterm>
+</keywords>
+</metadata></prolog>
 <refbody>
 <section> <ul>
-<li><i>org.apache.derby.authentication.UserAuthenticator<ph><indexterm>org.apache.derby.authentication.UserAuthenticator</indexterm></ph></i></li>
+<li><i>org.apache.derby.authentication.UserAuthenticator<ph></ph></i></li>
 <li>An interface provided by <ph conref="refconrefs.dita#prod/productshortname"></ph>.
 Classes that provide an alternate user authentication scheme must implement
 this interface. For information about users, see "Working with User Authentication"
 in Chapter 7 of the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.
  </li>
-</ul></section>
+</ul> </section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefapi10613.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefapi10613.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefapi10613.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefapi10613.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,27 +16,20 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefapi10613" xml:lang="en-us">
 <title>Derby API</title>
+<shortdesc><ph conref="refconrefs.dita#prod/productshortname"></ph> provides
+Javadoc HTML files of API classes and interfaces in the <i>javadoc</i> subdirectory.</shortdesc>
 <refbody>
-<section><p><ph conref="refconrefs.dita#prod/productshortname"></ph> provides
-Javadoc HTML files of API classes and interfaces in the <i>javadoc</i> subdirectory.
-This appendix provides a brief overview of the API. <ph conref="refconrefs.dita#prod/productshortname"></ph> does
+<section><p>This appendix provides a brief overview of the API. <ph conref="refconrefs.dita#prod/productshortname"></ph> does
 not provide the Javadoc for the <i>java.sql</i> packages, the main API for
 working with <ph conref="refconrefs.dita#prod/productshortname"></ph>, because
 it is included in the JDBC API. For information about <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
 implementation of JDBC, see <xref href="crefjdbc12657.dita#crefjdbc12657"></xref>.</p></section>
-<section><p>This document divides the API classes and interfaces into three
-categories:   <ul>
-<li><xref href="rrefapi24806.dita#rrefapi24806"></xref>   <p>These are Java classes
-that stand on their own and are invoked in a command window.</p></li>
-<li><xref href="rrefapi19690.dita#rrefapi19690"></xref>   <p>You do not invoke these
-on the command-line, only within a specified context within another application.
-These classes are standard JDBC APIs.</p></li>
-</ul></p></section>
+<section><p>This document divides the API classes and interfaces into several
+categories.   The stand-alone tools and utilities are java classes that stand
+on their own and are invoked in a command window. The JDBC implementation
+classes are standard JDBC APIs, and are not invoked on the command-line. Instead,
+you invoke these only within a specified context within another application.</p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefapi33761.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefapi33761.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefapi33761.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefapi33761.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,18 +16,17 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefapi33761" xml:lang="en-us">
 <title>JDBC driver</title>
+<prolog><metadata>
+<keywords><indexterm>org.apache.derby.jdbc. EmbeddedDriver</indexterm></keywords>
+</metadata></prolog>
 <refbody>
 <section><p>This is the JDBC driver for <ph conref="refconrefs.dita#prod/productshortname"></ph>:
   <ul>
-<li><i>org.apache.derby.jdbc.EmbeddedDriver<ph><indexterm>org.apache.derby.jdbc.EmbeddedDriver</indexterm></ph></i> 
- <p>Used to boot the embedded built-in JDBC driver and the <ph conref="refconrefs.dita#prod/productshortname"></ph> system.
+<li><i>org.apache.derby.jdbc.EmbeddedDriver<ph></ph></i>   <p>Used to boot
+the embedded built-in JDBC driver and the <ph conref="refconrefs.dita#prod/productshortname"></ph> system.
 See the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</p></li>
-</ul></p></section>
+</ul> </p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefattrib24612.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefattrib24612.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefattrib24612.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefattrib24612.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,39 +16,18 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefattrib24612" xml:lang="en-us">
 <title>Setting attributes for the database connection URL </title>
-<refbody>
-<section><p><ph conref="refconrefs.dita#prod/productshortname"></ph> allows
+<shortdesc><ph conref="refconrefs.dita#prod/productshortname"></ph> allows
 you to supply a list of attributes to its database connection URL, which is
-a JDBC feature. The attributes are specific to <ph conref="refconrefs.dita#prod/productshortname"></ph>.</p></section>
+a JDBC feature.</shortdesc>
+<refbody>
+<section><p>The attributes are specific to <ph conref="refconrefs.dita#prod/productshortname"></ph>.</p></section>
 <section><p>You typically set attributes in a semicolon-separated list following
 the protocol and subprotocol. For information on how you set attributes, see <xref
-href="rrefjdbc10889.dita#rrefjdbc10889"></xref>. This chapter provides reference information
-only.</p></section>
-<section><p>The core attributes of the <ph conref="refconrefs.dita#prod/productshortname"></ph> database
-connection URL are:   <ul>
-<li><i><xref href="rrefattrib42100.dita#rrefattrib42100"></xref></i></li>
-<li><i><xref href="rrefattrib26867.dita#rrefattrib26867"></xref></i></li>
-<li><i><xref href="rrefattrib17246.dita#rrefattrib17246"></xref></i></li>
-<li><i><xref href="rrefattrib15290.dita#rrefattrib15290"></xref></i></li>
-<li><i><xref href="rrefattrib88843.dita#rrefattrib88843"></xref></i></li>
-<li><i><xref href="rrefattrib60346.dita#rrefattrib60346"></xref></i></li>
-<li><i><xref href="rrefattrib56769.dita#rrefattrib56769"></xref></i></li>
-<li><i><xref href="rrefattrib72457.dita#rrefattrib72457"></xref></i></li>
-<li><i><xref href="rrefattrib42686.dita#rrefattrib42686"></xref></i></li>
-<li><i><xref href="rrefrollforward.dita#rrefrollforward"></xref></i></li>
-<li><i><xref href="rrefcreatefrom.dita#rrefcreatefrom"></xref></i></li>
-<li><i><xref href="rrefrestorefrom.dita#rrefrestorefrom"></xref></i></li>
-<li><i><xref href="rrefattrib16471.dita#rrefattrib16471"></xref></i></li>
-<li><i><xref href="rrefattrib10035.dita#rrefattrib10035"></xref></i></li>
-<li><xref href="rrefattrib34183.dita#rrefattrib34183"></xref></li>
-</ul></p></section>
+href="rrefjdbc10889.dita#rrefjdbc10889"></xref>. This chapter provides reference
+information only.</p></section>
 <section> <note>Attributes are not parsed for correctness. If you pass in
 an incorrect attribute or corresponding value, it is simply ignored.</note></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefattrib26867.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefattrib26867.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefattrib26867.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefattrib26867.dita Tue Jun 28 15:46:15 2005
@@ -37,9 +37,9 @@
 before the next attempt to create the database.</p> </section>
 <section><title>Combining with other attributes</title> <p>You
 must specify a <i>databaseName</i> (after the subprotocol in the database
-connection URL) or a <i><xref href="rrefattrib17246.dita#rrefattrib17246"></xref></i> attribute
+connection URL) or a <i><xref href="rrefattrib17246.dita#rrefattrib17246">databaseName=nameofDatabase</xref></i> attribute
 with this attribute.</p> <p>You can combine this attribute with other attributes.
-To specify a territory when creating a database, use the <i><xref href="rrefattrib56769.dita#rrefattrib56769"></xref></i> attribute.
+To specify a territory when creating a database, use the <i><xref href="rrefattrib56769.dita#rrefattrib56769">territory=ll_CC</xref></i> attribute.
   <note>If you specify <i>create=true</i> and the database already exists,
 an <i>SQLWarning</i> is raised.</note></p> </section>
 <example> <codeblock><b>jdbc:derby:sampleDB;create=true

Modified: incubator/derby/docs/trunk/src/ref/rrefblob.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefblob.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefblob.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefblob.dita Tue Jun 28 15:46:15 2005
@@ -39,7 +39,8 @@
 handle to the underlying data.</p> </section>
 <section><title>Related information</title> <p>see <xref href="rrefjdbc96386.dita#rrefjdbc96386"></xref></p> </section>
 <example> <codeblock><ph>create table pictures(name varchar(32) not null primary key, pic blob(16M));
-</ph>--find all logotype pictures
+</ph>
+--find all logotype pictures
 select length(pic), name from pictures where name like '%logo%';
 
 --find all image doubles (blob comparsions)

Modified: incubator/derby/docs/trunk/src/ref/rrefcallprocedure.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcallprocedure.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcallprocedure.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcallprocedure.dita Tue Jun 28 15:46:15 2005
@@ -26,7 +26,7 @@
 <section><p>The CALL (PROCEDURE) statement is used to call procedures. A call to a
 procedure does not return any value.</p></section>
 <section><title>Syntax</title>
-<codeblock><b>CALL <xref href="rrefcrproprocedurename.dita#rrefcrproprocedurename"/> ( [ ? [, ?]* ] )
+<codeblock><b>CALL <xref href="rrefcrproprocedurename.dita#rrefcrproprocedurename">procedure-Name</xref> ( [ ? [, ?]* ] )
 </b></codeblock></section>
 <section><title>Example</title>
 <codeblock><b>CREATE PROCEDURE SALES.TOTAL_REVENUE(IN S_MONTH INTEGER,

Modified: incubator/derby/docs/trunk/src/ref/rrefcolumnname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcolumnname.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcolumnname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcolumnname.dita Tue Jun 28 15:46:15 2005
@@ -24,25 +24,25 @@
 a column by qualifying it with a <i>table-Name</i> or <i>correlation-Name</i>. </p></section>
 <section><p>In some situations, you cannot qualify a <i>column-Name</i> with
 a <i>table-Name</i> or a <i>correlation-Name,</i> but must use a <i><xref
-href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i> instead.
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> instead.
 Those situations are:</p></section>
 <section> <ul>
 <li>creating a table (<xref href="rrefsqlj24513.dita#rrefsqlj24513"></xref>)</li>
 <li>specifying updatable columns in a cursor</li>
 <li>in a column's correlation name in a SELECT expression (see <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i>)</li>
 <li>in a column's correlation name in a <i>TableExpression</i> (see <i><xref
-href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i>)</li>
+href="rreftableexpression.dita#rreftableexpression"></xref></i>)</li>
 </ul><p>You cannot use correlation-Names for updatable columns; using correlation-Names
 in this way will cause an SQL exception. For example:<codeblock>SELECT c11 AS col1, c12 AS col2, c13 FROM t1 FOR UPDATE of c11,c13
 </codeblock>In this example, the correlation-Name <codeph>col1 FOR c11</codeph> is
 not permitted because <codeph>c11</codeph> is listed in the FOR UPDATE list
 of columns. You can use the correlation-Name <codeph>FOR c12</codeph> because
 it is not in the FOR UPDATE list.</p></section>
-<section><title>Syntax</title> <codeblock><b>[ { <i><xref href="rreftablename.dita#rreftablename"></xref></i> | <i><xref
-href="rrefcorrelationname.dita#rrefcorrelationname"></xref></i> } . ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b>[ { <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i> | <i><xref
+href="rrefcorrelationname.dita#rrefcorrelationname">correlation-Name</xref></i> } . ] <i><xref
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
 <section><title>Example</title> <codeblock><ph>-- C.Country is a column-Name qualified with a
--- <xref href="rrefcorrelationname.dita#rrefcorrelationname"></xref>.</ph>
+-- <xref href="rrefcorrelationname.dita#rrefcorrelationname">correlation-Name</xref>.</ph>
 SELECT C.Country
 FROM APP.Countries C</codeblock></section>
 </refbody>

Modified: incubator/derby/docs/trunk/src/ref/rrefconstraintname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefconstraintname.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefconstraintname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefconstraintname.dita Tue Jun 28 15:46:15 2005
@@ -21,7 +21,7 @@
 <title>constraint-Name</title>
 <refbody>
 <section><p>You cannot qualify constraint-names.</p></section>
-<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
 <section><title>Example</title> <codeblock><b><ph>-- country_fk2 is a constraint name</ph>
 CREATE TABLE DETAILED_MAPS (COUNTRY_ISO_CODE CHAR(2)
 CONSTRAINT country_fk2 REFERENCES COUNTRIES)</b></codeblock></section>

Modified: incubator/derby/docs/trunk/src/ref/rrefcorrelationname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcorrelationname.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcorrelationname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcorrelationname.dita Tue Jun 28 15:46:15 2005
@@ -29,7 +29,7 @@
 not permitted because <codeph>c11</codeph> is listed in the FOR UPDATE list
 of columns. You can use the correlation-Name <codeph>FOR c12</codeph> because
 it is not in the FOR UPDATE list.</p></section>
-<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
 <section><title>Example</title> <codeblock><ph>-- C is a correlation-Name
 </ph>SELECT C.NAME
 FROM SAMP.STAFF C</codeblock></section>

Modified: incubator/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita Tue Jun 28 15:46:15 2005
@@ -25,10 +25,8 @@
 <refbody>
 <section><p>The CREATE FUNCTION statement allows you to create Java functions,
 which you can then use in an expression.</p></section>
-<section><title>Syntax</title> <codeblock><b>CREATE FUNCTION <i><xref href="rrefcrprofunctionname.dita#rrefcrprofunctionname"></xref></i> ( [ <xref
-href="rrefcrprofunctionparameter.dita#rrefcrprofunctionparameter"></xref> [, <xref
-href="rrefcrprofunctionparameter.dita#rrefcrprofunctionparameter"></xref>] ] * )
-RETURNS DataType [ <xref href="rrefcrprofunctionelement.dita#rrefcrprofunctionelement"></xref> ] *</b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b>CREATE FUNCTION <i><xref href="rrefcrprofunctionname.dita#rrefcrprofunctionname">function-name</xref></i> ( [ <xref href="rrefcrprofunctionparameter.dita#rrefcrprofunctionparameter">FunctionParameter</xref> 
+   [, <xref href="rrefcrprofunctionparameter.dita#rrefcrprofunctionparameter">FunctionParameter</xref>] ] * ) RETURNS DataType [ <xref href="rrefcrprofunctionelement.dita#rrefcrprofunctionelement">FunctionElement</xref> ] *</b></codeblock></section>
 </refbody>
 </reference>
 

Modified: incubator/derby/docs/trunk/src/ref/rrefcreateprocedurestatement.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcreateprocedurestatement.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcreateprocedurestatement.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcreateprocedurestatement.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,18 +16,13 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefcreateprocedurestatement" xml:lang="en-us">
 <title>CREATE PROCEDURE statement</title>
 <refbody>
 <section><p>The CREATE PROCEDURE statement allows you to create Java stored
 procedures, which you can then call using the CALL PROCEDURE statement.</p></section>
-<section><title>Syntax</title> <codeblock><b>CREATE PROCEDURE <i><xref href="rrefcrproprocedurename.dita#rrefcrproprocedurename"></xref></i> ( [ <xref
-href="rrefcrproprocedureparameter.dita#rrefcrproprocedureparameter"></xref> [, <xref
-href="rrefcrproprocedureparameter.dita#rrefcrproprocedureparameter"></xref>] ] * )
-[ <xref href="rrefcrproprocedureelement.dita#rrefcrproprocedureelement"></xref> ] *</b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b>CREATE PROCEDURE <i><xref href="rrefcrproprocedurename.dita#rrefcrproprocedurename">procedure-Name</xref></i> ( [ <xref href="rrefcrproprocedureparameter.dita#rrefcrproprocedureparameter">ProcedureParameter</xref>
+   [, <xref href="rrefcrproprocedureparameter.dita#rrefcrproprocedureparameter">ProcedureParameter</xref>] ] * )
+[ <xref href="rrefcrproprocedureelement.dita#rrefcrproprocedureelement">ProcedureElement</xref> ] *</b></codeblock></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefcrprofunctionelement.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcrprofunctionelement.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcrprofunctionelement.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcrprofunctionelement.dita Tue Jun 28 15:46:15 2005
@@ -21,8 +21,8 @@
 <title>FunctionElement</title>
 <refbody>
 <example> <codeblock><b> { 
-<b>[ <i><xref href="rrefschemaname.dita#rrefschemaname"></xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b>
+<b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b>
 | LANGUAGE { JAVA }
 | EXTERNAL NAME <i>string</i>
 | PARAMETER STYLE JAVA

Modified: incubator/derby/docs/trunk/src/ref/rrefcrprofunctionname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcrprofunctionname.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcrprofunctionname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcrprofunctionname.dita Tue Jun 28 15:46:15 2005
@@ -20,8 +20,8 @@
 <reference id="rrefcrprofunctionname" xml:lang="en-us">
 <title>function-Name</title>
 <refbody>
-<example> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname"></xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></example>
+<example> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></example>
 <section><p>If schema-Name is not provided, the current schema is the default
 schema. If a qualified procedure name is specified, the schema name cannot
 begin with SYS.</p></section>

Modified: incubator/derby/docs/trunk/src/ref/rrefcrproprocedureelement.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcrproprocedureelement.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcrproprocedureelement.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcrproprocedureelement.dita Tue Jun 28 15:46:15 2005
@@ -21,9 +21,9 @@
 <title>ProcedureElement</title>
 <refbody>
 <example> <codeblock><b> { 
-<b>[ <i><xref href="rrefschemaname.dita#rrefschemaname"></xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b>
-| [ DYNAMIC ] RESULT SETS <i><xref href="rrefsqlj10696.dita#rrefsqlj10696"></xref></i>
+<b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b>
+| [ DYNAMIC ] RESULT SETS <i><xref href="rrefsqlj10696.dita#rrefsqlj10696">INTEGER</xref></i>
 | LANGUAGE { JAVA }
 | EXTERNAL NAME <i>string</i>
 | PARAMETER STYLE JAVA

Modified: incubator/derby/docs/trunk/src/ref/rrefcrproprocedurename.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcrproprocedurename.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcrproprocedurename.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcrproprocedurename.dita Tue Jun 28 15:46:15 2005
@@ -20,8 +20,8 @@
 <reference id="rrefcrproprocedurename" xml:lang="en-us">
 <title>procedure-Name</title>
 <refbody>
-<example> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname"></xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></example>
+<example> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></example>
 <section><p>If schema-Name is not provided, the current schema is the default
 schema. If a qualified procedure name is specified, the schema name cannot
 begin with SYS.</p></section>

Modified: incubator/derby/docs/trunk/src/ref/rrefcursorname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcursorname.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcursorname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcursorname.dita Tue Jun 28 15:46:15 2005
@@ -27,7 +27,7 @@
 If you assign a name to a cursor, you can refer to that name from within SQL
 statements.</p></section>
 <section><p>You cannot qualify a <i>cursor-Name</i>.</p></section>
-<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
 <section><title>Example</title> <codeblock><b>stmt.executeUpdate("UPDATE SAMP.STAFF SET COMM = "
 "COMM + 20 " + "WHERE CURRENT OF " + ResultSet.getCursorName());</b></codeblock></section>
 </refbody>



Mime
View raw message