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 [13/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/rrefsqlj30118.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj30118.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj30118.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj30118.dita Tue Jun 28 15:46:15 2005
@@ -24,7 +24,7 @@
 </metadata></prolog>
 <refbody>
 <section> <p>The LONG VARCHAR FOR BIT DATA type allows storage of bit strings
-up to 32,700 bytes. It is identical to <xref href="rrefsqlj32714.dita#rrefsqlj32714"></xref>,
+up to 32,700 bytes. It is identical to <xref href="rrefsqlj32714.dita#rrefsqlj32714">VARCHAR FOR BIT DATA</xref>,
 except that you do not have to specify a maximum length when creating columns
 of this type.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>LONG VARCHAR FOR BIT DATA</b></codeblock> </refsyn>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj30540.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj30540.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj30540.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj30540.dita Tue Jun 28 15:46:15 2005
@@ -19,15 +19,15 @@
 <reference id="rrefsqlj30540" 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 { ConstantExpression | NULL }
-       |<i><xref href="rrefsqlj37836.dita#rrefsqlj37836"></xref></i> ]
-    [ <i><xref href="rrefsqlj16095.dita#rrefsqlj16095"></xref></i> ]*
+       |<i><xref href="rrefsqlj37836.dita#rrefsqlj37836">generated-column-spec</xref></i> ]
+    [ <i><xref href="rrefsqlj16095.dita#rrefsqlj16095">Column-level-constraint</xref></i> ]*
 </b></codeblock></example>
 <section><p>The syntax of <i>Data-Type</i> is described in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p><p>The
-syntaxes of <i><xref href="rrefsqlj16095.dita#rrefsqlj16095"></xref></i> and <i><xref
-href="rrefsqlj42154.dita#rrefsqlj42154"></xref></i> are described in <xref
+syntaxes of <i><xref href="rrefsqlj16095.dita#rrefsqlj16095">Column-level-constraint</xref></i> and <i><xref
+href="rrefsqlj42154.dita#rrefsqlj42154">Table-level constraint</xref></i> are described in <xref
 href="rrefsqlj13590.dita#rrefsqlj13590"></xref>.</p></section>
 <section id="sqlj64478"><title>Column default</title><p>For the definition
 of a default value, a <i>ConstantExpression</i> is an expression that does

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj31580.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj31580.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj31580.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj31580.dita Tue Jun 28 15:46:15 2005
@@ -26,7 +26,7 @@
 <refbody>
 <section> <p>A schema is a way to logically group objects in a single collection
 and provide a unique namespace for objects. </p></section>
-<refsyn><title>Syntax</title> <codeblock><b>CREATE SCHEMA <i><xref href="rrefschemaname.dita#rrefschemaname"></xref></i></b></codeblock> <p>The
+<refsyn><title>Syntax</title> <codeblock><b>CREATE SCHEMA <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i></b></codeblock> <p>The
 CREATE SCHEMA statement is used to create a schema. A schema name cannot exceed
 128 characters. Schema names must be unique within the database.</p> </refsyn>
 <example> <codeblock><b><ph>-- Create a schema for employee-related tables</ph>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj31648.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj31648.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj31648.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj31648.dita Tue Jun 28 15:46:15 2005
@@ -27,7 +27,7 @@
 <section> <p>The DROP SCHEMA statement drops a schema. The target schema must
 be empty for the drop to succeed.</p>  <p>Neither the <i>APP</i> schema (the
 default user schema) nor the <i>SYS</i> schema can be dropped.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>DROP SCHEMA <i><xref href="rrefschemaname.dita#rrefschemaname"></xref></i> RESTRICT</b></codeblock> <p
+<refsyn><title>Syntax</title> <codeblock><b>DROP SCHEMA <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> RESTRICT</b></codeblock> <p
 >The RESTRICT keyword enforces the rule that no objects can be defined in
 the specified schema for the schema to be deleted from the database. The RESTRICT
 keyword is required</p> </refsyn>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj31783.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj31783.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj31783.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj31783.dita Tue Jun 28 15:46:15 2005
@@ -25,16 +25,16 @@
 </metadata></prolog>
 <refbody>
 <section> <p><indexterm>Cursors</indexterm><indexterm>In-place updates</indexterm>The
-FOR UPDATE clause is an optional part of a <xref href="rrefsqlj41360.dita#rrefsqlj41360"></xref>.
+FOR UPDATE clause is an optional part of a <xref href="rrefsqlj41360.dita#rrefsqlj41360">SELECT statement</xref>.
 The FOR UPDATE clause specifies whether the <i>ResultSet</i> of a simple <xref
-href="rrefsqlj41360.dita#rrefsqlj41360"></xref> that meets the requirements for a <i>cursor</i> is
+href="rrefsqlj41360.dita#rrefsqlj41360">SELECT statement</xref> that meets the requirements for a <i>cursor</i> is
 updatable or not. For more information about updatability, see <xref href="rrefsqlj41360.dita#rrefsqlj41360/sqlj15384">Requirements
 for Updatable Cursors</xref>.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>FOR
 {
     READ ONLY | FETCH ONLY |
-    UPDATE [ OF <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i> [ , <i><xref
-href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i>]* ]
+    UPDATE [ OF <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i>]* ]
 }</b></codeblock> <p><i>Simple-column-Name</i> refers to the names visible
 for the table specified in the FROM clause of the underlying query.</p> <p>Cursors
 are read-only by default. For a cursor to be updatable, you must specify FOR

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj32268.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj32268.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj32268.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj32268.dita Tue Jun 28 15:46:15 2005
@@ -33,16 +33,10 @@
 is not transactional: If the SET SCHEMA statement is part of a transaction
 that is rolled back, the schema change remains in effect.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>SET [CURRENT] SCHEMA [=]
+{ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref> </i>|
+USER | ? | '&lt;string-constant&gt;' } | SET CURRENT SQLID [=]
 {
-<i><xref href="rrefschemaname.dita#rrefschemaname"></xref> </i>|
-USER | ? | '&lt;string-constant&gt;'
-}
-|
-SET CURRENT SQLID [=]
-{
-<i><xref href="rrefschemaname.dita#rrefschemaname"></xref> </i>|
-USER | ? | '&lt;string-constant&gt;'
-}</b></codeblock> <p><i><xref href="rrefschemaname.dita#rrefschemaname"></xref></i> is
+<i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref> </i>| USER | ? | '&lt;string-constant&gt;' }</b></codeblock> <p><i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> is
 an identifier with a maximum length of 128. It is case insensitive unless
 enclosed in double quotes. (For example, SYS is equivalent to sYs, SYs, sys,
 etcetera.) </p> <p>USER is the current user. If no current user is defined,

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj32654.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj32654.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj32654.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj32654.dita Tue Jun 28 15:46:15 2005
@@ -23,18 +23,18 @@
 <keywords><indexterm>GROUP BY clause</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>A GROUP BY clause, part of a <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref>,</i> groups
+<section> <p>A GROUP BY clause, part of a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref>,</i> groups
 a result into subsets that have matching values for one or more columns. In
 each group, no two rows have the same value for the grouping column or columns.
 NULLs are considered equivalent for grouping purposes.</p>  <p>You typically
 use a GROUP BY clause in conjunction with an aggregate expression.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>GROUP BY <i><xref href="rrefcolumnname.dita#rrefcolumnname"></xref></i> [ , <i><xref
-href="rrefcolumnname.dita#rrefcolumnname"></xref></i> ] *</b></codeblock> <p><i><xref
-href="rrefcolumnname.dita#rrefcolumnname"></xref></i> must be a column from
+<refsyn><title>Syntax</title> <codeblock><b>GROUP BY <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> [ , <i><xref
+href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> ] *</b></codeblock> <p><i><xref
+href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> must be a column from
 the current scope of the query; there can be no columns from a query block
 outside the current scope. For example, if a GROUP BY clause is in a subquery,
 it cannot refer to columns in the outer query.</p> <p><i>SelectItems</i> in
-the <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i> with
+the <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> with
 a GROUP BY clause must contain only aggregates or grouping columns.</p> </refsyn>
 <example> <codeblock><b><ph>-- find the average flying_times of flights grouped by
 -- airport</ph>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj32693.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj32693.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj32693.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj32693.dita Tue Jun 28 15:46:15 2005
@@ -31,7 +31,7 @@
 The ALL qualifier retains duplicates. ALL is the default value if neither
 ALL nor DISTINCT is specified. For example, if a column contains the values
 1.0, 1.0, 1.0, 1.0, and 2.0, AVG(col) returns a smaller value than AVG(DISTINCT
-col).</p> <p>Only one DISTINCT aggregate expression per <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i> is
+col).</p> <p>Only one DISTINCT aggregate expression per <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> is
 allowed. For example, the following query is not valid:   <codeblock><b>SELECT AVG (DISTINCT flying_time), SUM (DISTINCT miles)
 FROM Flights</b></codeblock></p> <p>The expression can contain multiple column
 references or expressions, but it cannot contain another aggregate or subquery.

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj33215.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj33215.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj33215.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj33215.dita Tue Jun 28 15:46:15 2005
@@ -20,11 +20,11 @@
 <reference id="rrefsqlj33215" xml:lang="en-us">
 <title>TableOrViewExpression</title>
 <refbody>
-<example> <codeblock><b>{<i> <xref href="rreftablename.dita#rreftablename"></xref></i> |<i> <xref
-href="rrefviewname.dita#rrefviewname"></xref></i>}
-    [ [ AS ] <i><xref href="rrefcorrelationname.dita#rrefcorrelationname"></xref></i>
-        [ (<i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i> [ , <i><xref
-href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i>]* ) ] ] ]
+<example> <codeblock><b>{<i> <xref href="rreftablename.dita#rreftablename">table-Name</xref></i> |<i> <xref
+href="rrefviewname.dita#rrefviewname">view-Name</xref></i>}
+    [ [ AS ] <i><xref href="rrefcorrelationname.dita#rrefcorrelationname">correlation-Name</xref></i>
+        [ (<i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i>]* ) ] ] ]
 </b></codeblock></example>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj33520.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj33520.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj33520.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj33520.dita Tue Jun 28 15:46:15 2005
@@ -30,7 +30,7 @@
 <refsyn><title>Syntax</title> <codeblock><b>MIN ( [ DISTINCT | ALL ] <i>Expression</i> )</b></codeblock> <p>The
 DISTINCT and ALL qualifiers eliminate or retain duplicates, but these qualifiers
 have no effect in a MIN expression. Only one DISTINCT aggregate expression
-per <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i> is
+per <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> is
 allowed. For example, the following query is not allowed:   <codeblock><b>SELECT COUNT (DISTINCT flying_time), MIN (DISTINCT miles)
 FROM Flights</b></codeblock></p> <p>The expression can contain multiple column
 references or expressions, but it cannot contain another aggregate or subquery.
@@ -38,7 +38,7 @@
 evaluate to built-in data types. (For example, a method that returns a <i>java.lang.Integer</i> or <i>int</i> evaluates
 to an INTEGER.) If an expression evaluates to NULL, the aggregate skips that
 value.</p> <p>The type's comparison rules determine the maximum value. For
-CHAR, VARCHAR, and <xref href="rrefsqlj15147.dita#rrefsqlj15147"></xref>,
+CHAR, VARCHAR, and <xref href="rrefsqlj15147.dita#rrefsqlj15147">LONG VARCHAR</xref>,
 the number of blank spaces at the end of the value can affect the result.</p> <p>The
 resulting data type is the same as the expression on which it operates (it
 will never overflow).</p> </refsyn>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj33562.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj33562.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj33562.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj33562.dita Tue Jun 28 15:46:15 2005
@@ -39,7 +39,7 @@
 conversions between data types are valid. The first column on the table lists
 the source types, while the first row lists the target types. A "Y" indicates
 that the source to the target is a valid conversion.</desc>
-<tgroup cols="19"><colspec colname="colspec0" colwidth="307*"/><colspec colname="col2"
+<tgroup cols="19"><colspec colname="colspec0" colwidth="330*"/><colspec colname="col2"
 colwidth="84*"/><colspec colname="col3" colwidth="84*"/><colspec colname="col4"
 colwidth="84*"/><colspec colname="col5" colwidth="84*"/><colspec colname="col6"
 colwidth="81*"/><colspec colname="colspec1" colwidth="84*"/><colspec colname="colspec9"
@@ -566,7 +566,7 @@
 <entry colname="colspec11">Y</entry>
 </row>
 <row>
-<entry colname="colspec0">TIMESTAMP</entry>
+<entry colname="colspec0">TIME STAMP</entry>
 <entry colname="col2">-</entry>
 <entry colname="col3">-</entry>
 <entry colname="col4">-</entry>
@@ -597,8 +597,8 @@
 <li>approximate numeric (FLOAT, REAL, DOUBLE PRECISION)</li>
 </ul></li>
 <li><i>string</i>   <ul>
-<li>character string (CLOB, CHAR, VARCHAR, <xref href="rrefsqlj15147.dita#rrefsqlj15147"></xref>)</li>
-<li>bit string (BLOB, CHAR FOR BIT DATA, VARCHAR FOR BIT DATA, <xref href="rrefsqlj30118.dita#rrefsqlj30118"></xref>)</li>
+<li>character string (CLOB, CHAR, VARCHAR, <xref href="rrefsqlj15147.dita#rrefsqlj15147">LONG VARCHAR</xref>)</li>
+<li>bit string (BLOB, CHAR FOR BIT DATA, VARCHAR FOR BIT DATA, <xref href="rrefsqlj30118.dita#rrefsqlj30118">LONG VARCHAR FOR BIT DATA</xref>)</li>
 </ul></li>
 <li><i>date/time</i>   <ul>
 <li><xref href="rrefsqlj18730.dita#rrefsqlj18730"></xref></li>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj33602.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj33602.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj33602.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj33602.dita Tue Jun 28 15:46:15 2005
@@ -23,13 +23,13 @@
 <keywords><indexterm>WHERE clause</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>A WHERE clause is an optional part of a <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref>,</i> <xref
-href="rrefsqlj35981.dita#rrefsqlj35981"></xref>, or <xref href="rrefsqlj26498.dita#rrefsqlj26498"></xref>.
+<section> <p>A WHERE clause is an optional part of a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref>,</i> <xref
+href="rrefsqlj35981.dita#rrefsqlj35981">DELETE statement</xref>, or <xref href="rrefsqlj26498.dita#rrefsqlj26498">UPDATE statement</xref>.
 The WHERE clause lets you select rows based on a boolean expression. Only
 rows for which the expression evaluates to TRUE are returned in the result,
 or, in the case of a DELETE statement, deleted, or, in the case of an UPDATE
 statement, updated.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>WHERE <i><xref href="rrefsqlj23075.dita#rrefsqlj23075"></xref></i></b></codeblock> <p><indexterm>WHERE
+<refsyn><title>Syntax</title> <codeblock><b>WHERE <i><xref href="rrefsqlj23075.dita#rrefsqlj23075">Boolean expression</xref></i></b></codeblock> <p><indexterm>WHERE
 clause<indexterm>SQL extensions to</indexterm></indexterm>Boolean expressions
 are allowed in the WHERE clause. Most of the general expressions listed in <xref
 href="rrefsqlj19433.dita#rrefsqlj19433/sqlj18370"></xref>, can result in a

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj33923.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj33923.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj33923.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj33923.dita Tue Jun 28 15:46:15 2005
@@ -73,17 +73,17 @@
 </table></p></section>
 <section><p><indexterm>Aggregates<indexterm>requirements for</indexterm></indexterm>Aggregates
 are permitted only in the following:   <ul>
-<li>A <i>SelectItem</i> in a <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref>.</i></li>
-<li>A <xref href="rrefsqlj14854.dita#rrefsqlj14854"></xref>.</li>
-<li>An <xref href="rrefsqlj13658.dita#rrefsqlj13658"></xref> (using an alias
+<li>A <i>SelectItem</i> in a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref>.</i></li>
+<li>A <xref href="rrefsqlj14854.dita#rrefsqlj14854">HAVING clause</xref>.</li>
+<li>An <xref href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref> (using an alias
 name) if the aggregate appears in the result of the relevant query block.
-That is, an alias for an aggregate is permitted in an <xref href="rrefsqlj13658.dita#rrefsqlj13658"></xref> if
-and only if the aggregate appears in a <i>SelectItem</i> in a <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref>.</i></li>
+That is, an alias for an aggregate is permitted in an <xref href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref> if
+and only if the aggregate appears in a <i>SelectItem</i> in a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref>.</i></li>
 </ul></p></section>
-<section><p>All expressions in <i>SelectItems</i> in the <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i> must
+<section><p>All expressions in <i>SelectItems</i> in the <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> must
 be either aggregates or grouped columns (see <xref href="rrefsqlj32654.dita#rrefsqlj32654"></xref>).
 (The same is true if there is a HAVING clause without a GROUP BY clause.)
-This is because the <i>ResultSet</i> of a <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i> must
+This is because the <i>ResultSet</i> of a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> must
 be either a scalar (single value) or a vector (multiple values), but not a
 mixture of both. (Aggregates evaluate to a scalar value, and the reference
 to a column can evaluate to a vector.) For example, the following query mixes

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj34148.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj34148.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj34148.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj34148.dita Tue Jun 28 15:46:15 2005
@@ -25,7 +25,7 @@
 </metadata></prolog>
 <refbody>
 <section> <p>DROP TABLE removes the specified table.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>DROP TABLE <i><xref href="rreftablename.dita#rreftablename"></xref></i></b></codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><b>DROP TABLE <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i></b></codeblock> </refsyn>
 <section id="sqlj38361"><title>Statement dependency system</title> <p>Triggers,
 constraints (primary, unique, check and references from the table being dropped)
 and indexes on the table are silently dropped. The existence of an open cursor

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj35034.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj35034.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj35034.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj35034.dita Tue Jun 28 15:46:15 2005
@@ -23,13 +23,10 @@
 <keywords><indexterm>INNER JOIN expression</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>An INNER JOIN is a <xref href="rrefsqlj29840.dita#rrefsqlj29840"></xref> that
+<section> <p>An INNER JOIN is a <xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref> that
 allows you to specify an explicit join clause. </p></section>
 <refsyn><title>Syntax</title> <codeblock><b><i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> [ INNER ] JOIN <i
-><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i>
-{
-    ON <i>booleanExpression</i> }
-    }</b></codeblock> <p>You can specify the join clause by specifying ON
+><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> { ON <i>booleanExpression</i> }</b></codeblock> <p>You can specify the join clause by specifying ON
 with a boolean expression.  </p> <p><indexterm>ON clause<indexterm>part of
 INNER JOIN expression</indexterm></indexterm>The scope of expressions in the
 ON clause includes the current tables and any tables in outer query blocks

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj35981.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj35981.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj35981.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj35981.dita Tue Jun 28 15:46:15 2005
@@ -26,7 +26,7 @@
 <refbody>
 <section><title>Syntax</title> <codeblock><b>{
     DELETE FROM table-Name
-        [<i><xref href="rrefsqlj33602.dita#rrefsqlj33602"></xref></i>] |
+        [<i><xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref></i>] |
     DELETE FROM table-Name <xref href="rrefsqlj15309.dita#rrefsqlj15309">WHERE CURRENT OF</xref>
 }</b></codeblock></section>
 <section><p>The first syntactical form, called a searched delete, removes

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj38716.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj38716.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj38716.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj38716.dita Tue Jun 28 15:46:15 2005
@@ -31,14 +31,14 @@
 eliminates duplicates. The ALL qualifier retains duplicates. ALL is assumed
 if neither ALL nor DISTINCT is specified. For example, if a column contains
 the values 1, 1, 1, 1, and 2, COUNT(col) returns a greater value than COUNT(DISTINCT
-col).</p> <p>Only one DISTINCT aggregate expression per <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i> is
+col).</p> <p>Only one DISTINCT aggregate expression per <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> is
 allowed. For example, the following query is not allowed:</p> <codeblock><b><ph>-- query not allowed</ph>
 SELECT COUNT (DISTINCT flying_time), SUM (DISTINCT miles)
 FROM Flights</b></codeblock> <p>An <i>Expression</i> can contain multiple
 column references or expressions, but it cannot contain another aggregate
 or subquery. If an <i>Expression</i> evaluates to NULL, the aggregate is not
 processed for that value.</p> <p>The resulting data type of COUNT is <xref
-href="rrefsqlj30435.dita#rrefsqlj30435"></xref>.</p> </refsyn>
+href="rrefsqlj30435.dita#rrefsqlj30435">BIGINT</xref>.</p> </refsyn>
 <example> <codeblock><b><ph>-- Count the number of countries in each region,
 -- show only regions that have at least 2</ph>
 SELECT COUNT (country), region

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj40506.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj40506.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj40506.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj40506.dita Tue Jun 28 15:46:15 2005
@@ -31,7 +31,7 @@
 user-initiated lock escalation)</li>
 <li>avoiding deadlocks</li>
 </ul></p><p>You cannot lock system tables with this statement.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>LOCK TABLE <i><xref href="rreftablename.dita#rreftablename"></xref></i> IN { SHARE | EXCLUSIVE } MODE</b
+<refsyn><title>Syntax</title> <codeblock><b>LOCK TABLE <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i> IN { SHARE | EXCLUSIVE } MODE</b
 ></codeblock><p>Once a table is locked in either mode, a transaction does
 not acquire any subsequent row-level locks on a table. Replace line 13 with
 this: For example, if a transaction locks the entire Flights table in share

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj40774.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj40774.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj40774.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj40774.dita Tue Jun 28 15:46:15 2005
@@ -28,17 +28,17 @@
 The number of values assigned in an INSERT statement must be the same as the
 number of specified or implied columns.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>INSERT INTO table-Name
-    [ (<i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i> [ , <i><xref
-href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i>]* ) ]
+    [ (<i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i>]* ) ]
 	  Query</b></codeblock> <p><i>Query</i> can be:   <ul>
-<li>a <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i></li>
+<li>a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i></li>
 <li>a VALUES list</li>
 <li>a multiple-row VALUES expression   <p>Single-row and multiple-row lists
 can include the keyword DEFAULT. Specifying DEFAULT for a column inserts the
 column's default value into the column. Another way to insert the default
 value into the column is to omit the column from the column list and only
 insert values into other columns in the table. For more information see <xref
-href="rrefsqlj11277.dita#rrefsqlj11277"></xref>.</p></li>
+href="rrefsqlj11277.dita#rrefsqlj11277">VALUES Expression</xref>.</p></li>
 <li>UNION expressions</li>
 </ul></p> <p>For more information about Query, see <xref href="rrefsqlj21571.dita#rrefsqlj21571"></xref>.</p> </refsyn>
 <example> <codeblock><b>INSERT INTO COUNTRIES

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj41360.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj41360.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj41360.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj41360.dita Tue Jun 28 15:46:15 2005
@@ -25,18 +25,18 @@
 </metadata></prolog>
 <refbody>
 <section> <p>A SELECT statement consists of a query with an optional <xref
-href="rrefsqlj13658.dita#rrefsqlj13658"></xref> and an optional <xref href="rrefsqlj31783.dita#rrefsqlj31783"></xref>.
+href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref> and an optional <xref href="rrefsqlj31783.dita#rrefsqlj31783">FOR UPDATE clause</xref>.
 The SELECT statement is so named because the typical first word of the query
 construct is SELECT. (<i>Query</i> includes the VALUES expression and UNION, INTERSECT, and EXCEPT
-expressions as well as SELECT expressions).</p> <p>The <xref href="rrefsqlj13658.dita#rrefsqlj13658"></xref> guarantees
-the ordering of the <i>ResultSet</i>. The <xref href="rrefsqlj31783.dita#rrefsqlj31783"></xref> makes
+expressions as well as SELECT expressions).</p> <p>The <xref href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref> guarantees
+the ordering of the <i>ResultSet</i>. The <xref href="rrefsqlj31783.dita#rrefsqlj31783">FOR UPDATE clause</xref> makes
 the result an updatable cursor. The SELECT statement supports the FOR FETCH
 ONLY clause. The FOR FETCH ONLY clause is synonymous with the FOR READ ONLY
 clause.</p><note type="remember">In order to get an updatable ResultSet, you
 must include a FOR UPDATE clause with the SELECT clause.</note></section>
-<refsyn><title>Syntax</title> <codeblock><b><i><xref href="rrefsqlj21571.dita#rrefsqlj21571"></xref></i>
-[<i><xref href="rrefsqlj13658.dita#rrefsqlj13658"></xref></i>]
-[<i><xref href="rrefsqlj31783.dita#rrefsqlj31783"></xref></i>]
+<refsyn><title>Syntax</title> <codeblock><b><i><xref href="rrefsqlj21571.dita#rrefsqlj21571">Query</xref></i>
+[<i><xref href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref></i>]
+[<i><xref href="rrefsqlj31783.dita#rrefsqlj31783">FOR UPDATE clause</xref></i>]
 WITH {RR|RS|CS|UR}</b></codeblock> <p>You can set the isolation level in a
 SELECT statement using the WITH {RR|RS|CS|UR} syntax.</p> </refsyn>
 <example> <codeblock><b><ph>-- lists the names of the expression SAL+BONUS+COMM as TOTAL_PAY and
@@ -71,8 +71,8 @@
 has the same syntax as the SELECT statement for updatable cursors. To generate
 updatable cursors:   <ul>
 <li>The SELECT statement must not include an ORDER BY clause.</li>
-<li>The underlying <i>Query</i> must be a <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref>.</i></li>
-<li>The <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i> in
+<li>The underlying <i>Query</i> must be a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref>.</i></li>
+<li>The <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> in
 the underlying Query must not include:   <ul>
 <li>DISTINCT</li>
 <li>Aggregates</li>
@@ -82,7 +82,7 @@
 <li>The FROM clause in the underlying <i>Query</i> must not have:   <ul>
 <li>more than one table in its FROM clause</li>
 <li>anything other than one table name</li>
-<li><i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref>s</i></li>
+<li><i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref>s</i></li>
 <li>subqueries</li>
 </ul></li>
 </ul></p> <p>There is no SQL language statement to <i>assign</i> a name to

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj42082.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj42082.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj42082.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj42082.dita Tue Jun 28 15:46:15 2005
@@ -25,7 +25,7 @@
 </metadata></prolog>
 <refbody>
 <section> <p>DROP TRIGGER removes the specified trigger.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>DROP TRIGGER <i><xref href="rreftriggername.dita#rreftriggername"></xref></i></b></codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><b>DROP TRIGGER <i><xref href="rreftriggername.dita#rreftriggername">TriggerName</xref></i></b></codeblock> </refsyn>
 <example> <codeblock><b>DROP TRIGGER TRIG1</b></codeblock> </example>
 <section><title>Statement dependency system</title> <p>When a
 table is dropped, all triggers on that table are automatically dropped. (You

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj42154.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj42154.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj42154.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj42154.dita Tue Jun 28 15:46:15 2005
@@ -20,17 +20,17 @@
 <reference id="rrefsqlj42154" xml:lang="en-us">
 <title>Table-level constraint</title>
 <refbody>
-<example> <codeblock><b>[CONSTRAINT <i><xref href="rrefconstraintname.dita#rrefconstraintname"></xref></i>]
+<example> <codeblock><b>[CONSTRAINT <i><xref href="rrefconstraintname.dita#rrefconstraintname">constraint-Name</xref></i>]
 {
-    CHECK (<i><xref href="rrefsqlj91438.dita#rrefsqlj91438"></xref></i>) |
+    CHECK (<i><xref href="rrefsqlj91438.dita#rrefsqlj91438">searchCondition</xref></i>) |
     {
-        PRIMARY KEY ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i> [ , <i><xref
-href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i> ]* ) |
-        UNIQUE ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i> [ , <i><xref
-href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i> ]* ) |
-        FOREIGN KEY ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i> [ , <i><xref
-href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i> ]* )
-<i>            <xref href="rrefsqlj16357.dita#rrefsqlj16357"></xref></i>
+        PRIMARY KEY ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> ]* ) |
+        UNIQUE ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> ]* ) |
+        FOREIGN KEY ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> ]* )
+<i>            <xref href="rrefsqlj16357.dita#rrefsqlj16357">REFERENCES clause</xref></i>
     }
 }</b></codeblock></example>
 </refbody>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj42324.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj42324.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj42324.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj42324.dita Tue Jun 28 15:46:15 2005
@@ -25,7 +25,7 @@
 <refbody>
 <section> <p>CURRENT_USER returns the authorization identifier of the current
 user (the name of the user passed in when the user connected to the database).
-If there is no current user, it returns <i>APP.</i></p>  <p><xref href="rrefsqlj42476.dita#rrefsqlj42476"></xref> and <xref href="rrefsqlj25228.dita#rrefsqlj25228"></xref> are
+If there is no current user, it returns <i>APP.</i></p>  <p><xref href="rrefsqlj42476.dita#rrefsqlj42476">USER</xref> and <xref href="rrefsqlj25228.dita#rrefsqlj25228">SESSION_USER</xref> are
 synonyms.</p>  <p>These functions return a string of up to 128 characters.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>CURRENT_USER</b></codeblock> </refsyn>
 <example> <codeblock><b>VALUES CURRENT_USER</b></codeblock> </example>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj42476.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj42476.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj42476.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj42476.dita Tue Jun 28 15:46:15 2005
@@ -24,8 +24,8 @@
 </metadata></prolog>
 <refbody>
 <section> <p>USER returns the authorization identifier or name of the current
-user. If there is no current user, it returns <i>APP.</i></p><p>USER, <xref href="rrefsqlj42324.dita#rrefsqlj42324"></xref>,
-and <xref href="rrefsqlj25228.dita#rrefsqlj25228"></xref> are synonyms.</p></section>
+user. If there is no current user, it returns <i>APP.</i></p><p>USER, <xref href="rrefsqlj42324.dita#rrefsqlj42324">CURRENT_USER</xref>,
+and <xref href="rrefsqlj25228.dita#rrefsqlj25228">SESSION_USER</xref> are synonyms.</p></section>
 <refsyn><title>Syntax</title><codeblock><b>USER</b></codeblock> </refsyn>
 <example> <codeblock><b>VALUES USER</b></codeblock> </example>
 </refbody>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj43125.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj43125.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj43125.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj43125.dita Tue Jun 28 15:46:15 2005
@@ -44,11 +44,11 @@
 the table on which it is defined.</p> <p>If a qualified trigger name is specified,
 the schema name cannot begin with <i>SYS</i>.</p></section>
 <refsyn id="syn001"><title>Syntax</title> <codeblock><b>CREATE TRIGGER <i><xref
-href="rreftriggername.dita#rreftriggername"></xref></i>
+href="rreftriggername.dita#rreftriggername">TriggerName</xref></i>
 { AFTER | NO CASCADE BEFORE } 
-{ INSERT | DELETE | UPDATE } [ OF <i>column-Name</i> [, <i><xref href="rrefcolumnname.dita#rrefcolumnname"></xref></i>]* ]
-ON <i><xref href="rreftablename.dita#rreftablename"></xref></i>
-[ <i><xref href="rrefsqlj89752.dita#rrefsqlj89752"></xref></i> ]
+{ INSERT | DELETE | UPDATE } [ OF <i>column-Name</i> [, <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i>]* ]
+ON <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i>
+[ <i><xref href="rrefsqlj89752.dita#rrefsqlj89752">ReferencingClause</xref></i> ]
 FOR EACH { ROW | STATEMENT } MODE DB2SQL 
 <i><xref href="rrefsqlj43125.dita#rrefsqlj43125/i1149821">Triggered-SQL-statement</xref></i></b></codeblock> </refsyn>
 <section><title>Before or after: when triggers fire</title> <p>Triggers are

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj57522.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj57522.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj57522.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj57522.dita Tue Jun 28 15:46:15 2005
@@ -23,7 +23,7 @@
 <keywords><indexterm>RIGHT OUTER JOIN expression</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>A RIGHT OUTER JOIN is one of the <xref href="rrefsqlj29840.dita#rrefsqlj29840"></xref>s
+<section> <p>A RIGHT OUTER JOIN is one of the <xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref>s
 that allow you to specify a JOIN clause. It preserves the unmatched rows from
 the second (right) table, joining them with a NULL in the shape of the first
 (left) table. A LEFT OUTER JOIN B is equivalent to B RIGHT OUTER JOIN A, with

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj59893.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj59893.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj59893.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj59893.dita Tue Jun 28 15:46:15 2005
@@ -24,7 +24,7 @@
 </metadata></prolog>
 <refbody>
 <section> <p>DROP INDEX removes the specified index.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>DROP INDEX <i><xref href="rrefindexname.dita#rrefindexname"></xref></i></b></codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><b>DROP INDEX <i><xref href="rrefindexname.dita#rrefindexname">index-Name</xref></i></b></codeblock> </refsyn>
 <example> <codeblock><b>DROP INDEX OrigIndex
 
 DROP INDEX DestIndex</b></codeblock> </example>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj61102.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj61102.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj61102.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj61102.dita Tue Jun 28 15:46:15 2005
@@ -25,7 +25,7 @@
 </metadata></prolog>
 <refbody>
 <section> <p>Drops the specified view.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>DROP VIEW <xref href="rrefviewname.dita#rrefviewname"></xref></b></codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><b>DROP VIEW <xref href="rrefviewname.dita#rrefviewname">view-Name</xref></b></codeblock> </refsyn>
 <example> <codeblock><b>DROP VIEW AnIdentifier</b></codeblock> </example>
 <section><title>Statement dependency system</title> <p>Any statements
 referencing the view are invalidated on a DROP VIEW statement. DROP VIEW is

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj66113.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj66113.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj66113.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj66113.dita Tue Jun 28 15:46:15 2005
@@ -27,7 +27,7 @@
 accessed. No NULLs or duplicates are eliminated. COUNT(*) does not operate
 on an expression.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>COUNT(*)</b></codeblock> <p>The
-resulting data type is <xref href="rrefsqlj30435.dita#rrefsqlj30435"></xref>.</p> </refsyn>
+resulting data type is <xref href="rrefsqlj30435.dita#rrefsqlj30435">BIGINT</xref>.</p> </refsyn>
 <example> <codeblock><b><ph>-- Count the number of rows in the Flights table</ph>
 SELECT COUNT(*)
 FROM Flights</b></codeblock> </example>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj73147.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj73147.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj73147.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj73147.dita Tue Jun 28 15:46:15 2005
@@ -24,8 +24,8 @@
 </metadata></prolog>
 <refbody>
 <section> <p>Returns the square root of a floating point number; only the
-built-in types <xref href="rrefsqlj14122.dita#rrefsqlj14122"></xref>, <xref
-href="rrefsqlj27281.dita#rrefsqlj27281"></xref>, and <xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE
+built-in types <xref href="rrefsqlj14122.dita#rrefsqlj14122">REAL</xref>, <xref
+href="rrefsqlj27281.dita#rrefsqlj27281">FLOAT</xref>, and <xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE
 PRECISION</xref> are supported. The return type for SQRT is the type of the
 parameter.</p> <note>To execute SQRT on other data types, you must cast them
 to floating point types. </note></section>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj81859.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj81859.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj81859.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj81859.dita Tue Jun 28 15:46:15 2005
@@ -36,16 +36,16 @@
 <li>increase the width of a VARCHAR, CHAR VARYING, and CHARACTER VARYING column</li>
 <li>override row-level locking for the table (or drop the override)</li>
 </ul></p></section>
-<section><title>Syntax</title><codeblock><b>ALTER TABLE <i><xref href="rreftablename.dita#rreftablename"></xref></i>
+<section><title>Syntax</title><codeblock><b>ALTER TABLE <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i>
 {
-    ADD COLUMN <i><xref href="rrefaltercolumndef.dita#rrefaltercolumndef"></xref></i> |
-    ADD <i><xref href="rrefsqlj13590.dita#rrefsqlj13590"></xref></i> |
+    ADD COLUMN <i><xref href="rrefaltercolumndef.dita#rrefaltercolumndef">column-definition</xref></i> |
+    ADD <i><xref href="rrefsqlj13590.dita#rrefsqlj13590">CONSTRAINT clause</xref></i> |
     DROP { PRIMARY KEY | FOREIGN KEY constraint-name | UNIQUE 
 	 constraint-name | CHECK constraint-name | CONSTRAINT constraint-name }
-    ALTER <i><xref href="rrefsqlj37860.dita#rrefsqlj37860"></xref></i> |
+    ALTER <i><xref href="rrefsqlj37860.dita#rrefsqlj37860">column-alteration</xref></i> |
     LOCKSIZE { ROW | TABLE }
 }</b></codeblock></section>
-<section><title>Adding columns</title><p>The syntax for the <i><xref href="rrefsqlj30540.dita#rrefsqlj30540"></xref></i> for
+<section><title>Adding columns</title><p>The syntax for the <i><xref href="rrefaltercolumndef.dita#rrefaltercolumndef">column-definition</xref></i> for
 a new column is the same as for a column in a CREATE TABLE statement. This
 means that a column constraint can be placed on the new column within the
 ALTER TABLE ADD COLUMN statement. However, a column with a NOT NULL constraint
@@ -81,7 +81,7 @@
 a delimited identifier.</p><p>Dropping a primary key, unique, or foreign key
 constraint drops the physical index that enforces the constraint (also known
 as a <i>backing index</i>).</p></section>
-<section><title>Modifying columns</title><p>The <i><xref href="rrefsqlj37860.dita#rrefsqlj37860"></xref></i> allows
+<section><title>Modifying columns</title><p>The <i><xref href="rrefsqlj37860.dita#rrefsqlj37860">column-alteration</xref></i> allows
 you to alter the named column in the following ways:   <ul>
 <li>Increasing the length of an existing VARCHAR column. CHARACTER VARYING
 or CHAR VARYING can be used as synonyms for the VARCHAR keyword. <p>To increase
@@ -145,7 +145,8 @@
 ALTER TABLE Activities ADD PRIMARY KEY (city_id, activity);
 
 <ph>-- Drop a primary key constraint from the CITIES table
-</ph>ALTER TABLE Cities DROP CONSTRAINT Cities_PK;
+</ph>
+ALTER TABLE Cities DROP CONSTRAINT Cities_PK;
 <ph>-- Drop a foreign key constraint from the CITIES table</ph>
 ALTER TABLE Cities DROP CONSTRAINT COUNTRIES_FK;
 <ph>-- add a DEPTNO column with a default value of 1</ph>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj91438.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj91438.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj91438.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj91438.dita Tue Jun 28 15:46:15 2005
@@ -20,7 +20,7 @@
 <reference id="rrefsqlj91438" xml:lang="en-us">
 <title>searchCondition</title>
 <refbody>
-<section><p>A <i>searchCondition</i> is any <xref href="rrefsqlj23075.dita#rrefsqlj23075"></xref> that
+<section><p>A <i>searchCondition</i> is any <xref href="rrefsqlj23075.dita#rrefsqlj23075">Boolean expression</xref> that
 meets the requirements specified in <xref href="rrefsqlj13590.dita#rrefsqlj13590/sqlj57077"></xref>.</p></section>
 <section><p>If a <i>constraint-Name</i> is not specified, <ph conref="refconrefs.dita#prod/productshortname"></ph> generates
 a unique constraint name (for either column or table constraints).</p></section>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj93082.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj93082.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj93082.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj93082.dita Tue Jun 28 15:46:15 2005
@@ -24,8 +24,8 @@
 </metadata></prolog>
 <refbody>
 <section> <p>The SUBSTR function acts on a character string expression or
-a bit string expression. The type of the result is a <xref href="rrefsqlj41207.dita#rrefsqlj41207"></xref> in
-the first case and <xref href="rrefsqlj32714.dita#rrefsqlj32714"></xref> in
+a bit string expression. The type of the result is a <xref href="rrefsqlj41207.dita#rrefsqlj41207">VARCHAR</xref> in
+the first case and <xref href="rrefsqlj32714.dita#rrefsqlj32714">VARCHAR FOR BIT DATA</xref> in
 the second case. The length of the result is the maximum length of the source
 type.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>SUBSTR({ <i>CharacterExpression</i> },

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj98067.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj98067.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj98067.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj98067.dita Tue Jun 28 15:46:15 2005
@@ -25,8 +25,7 @@
 <refbody>
 <section> <p>ABS or ABSVAL returns the absolute value of a numeric expression.
 The return type is the type of parameter. All built-in numeric types are supported
-(<xref href="rrefsqlj15260.dita#rrefsqlj15260"></xref>, <xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE
-PRECISION</xref>, <xref href="rrefsqlj27281.dita#rrefsqlj27281"></xref>, <xref
+(<xref href="rrefsqlj15260.dita#rrefsqlj15260"></xref>, <xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision"></xref>, <xref href="rrefsqlj27281.dita#rrefsqlj27281"></xref>, <xref
 href="rrefsqlj10696.dita#rrefsqlj10696"></xref>, <xref href="rrefsqlj30435.dita#rrefsqlj30435"></xref>, <xref
 href="rrefsqlj12362.dita#rrefsqlj12362"></xref>, <xref href="rrefsqlj14122.dita#rrefsqlj14122"></xref>,
 and <xref href="rrefsqlj16221.dita#rrefsqlj16221"></xref>).</p></section>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqljcreatesynonym.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqljcreatesynonym.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqljcreatesynonym.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqljcreatesynonym.dita Tue Jun 28 15:46:15 2005
@@ -1,52 +1,51 @@
-<?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.  
-
-Licensed under the Apache License, Version 2.0 (the "License");  
-you may not use this file except in compliance with the License.  
-You may obtain a copy of the License at      
-
-http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<reference id="rrefsqljcreatesynonym" xml:lang="en-us">
-<title>CREATE SYNONYM statement</title>
-<prolog><metadata>
-<keywords><indexterm>CREATE SYNONYM statement</indexterm><indexterm>Synonyms<indexterm>creating</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<refbody>
-<section><p>Use the CREATE SYNONYM statement to provide an alternate name
-for a table or a view that is present in the same schema or another schema.
-You can also create synonyms for other synonyms, resulting in nested synonyms.
-A synonym can be used instead of the original qualified table or view name
-in SELECT, INSERT, UPDATE, DELETE or LOCK TABLE statements. You can create
-a synonym for a table or a view that doesn't exist, but the target table or
-view must be present before the synonym can be used.</p><p>Synonyms share
-the same namespace as tables or views. You cannot create a synonym with the
-same name as a table that already exists in the same schema. Similarly, you
-cannot create a table or view with a name that matches a synonym already present.</p><p>A
-synonym can be defined for a table/view that does not exist when you create
-the synonym. If the table or view doesn't exist, you will receive a warning
-message (SQLSTATE  01522). The referenced object must be present when you
-use a synonym in a DML statement.</p><p>You can create a nested synonym (a
-synonym for another synonym), but any attempt to create a synonym that results
-in a circular reference will return an error message (SQLSTATE 42916).</p><p>Synonyms cannot be defined in system schemas. All schemas starting with 'SYS' are considered system schemas and are reserved by <ph conref="refconrefs.dita#prod/productshortname"></ph>.</p><p>A synonym cannot
-be defined on a temporary table. Attempting to define a synonym on a temporary
-table will return an error message (SQLSTATE XCL51).</p></section>
-<section><title>Syntax</title><codeblock><b>CREATE SYNONYM <xref href="rrefsynonymname.dita#rrefsynonymname"></xref> FOR { <xref
-href="rrefviewname.dita#rrefviewname"></xref> | <xref href="rreftablename.dita#rreftablename"></xref> }</b></codeblock>The <xref
-href="rrefsynonymname.dita#rrefsynonymname"></xref> in the statement represents
-the synonym name you are giving the target table or view, while the <xref
-href="rrefviewname.dita#rrefviewname"></xref> or <xref href="rreftablename.dita#rreftablename"></xref> represents
-the original name of the target table or view.</section>
-<example><title>Example</title>CREATE SYNONYM SAMP.T1 FOR SAMP.TABLEWITHLONGNAME</example>
-</refbody>
-</reference>
+<?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.  
+
+Licensed under the Apache License, Version 2.0 (the "License");  
+you may not use this file except in compliance with the License.  
+You may obtain a copy of the License at      
+
+http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<reference id="rrefsqljcreatesynonym" xml:lang="en-us">
+<title>CREATE SYNONYM statement</title>
+<prolog><metadata>
+<keywords><indexterm>CREATE SYNONYM statement</indexterm><indexterm>Synonyms<indexterm>creating</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<refbody>
+<section><p>Use the CREATE SYNONYM statement to provide an alternate name
+for a table or a view that is present in the same schema or another schema.
+You can also create synonyms for other synonyms, resulting in nested synonyms.
+A synonym can be used instead of the original qualified table or view name
+in SELECT, INSERT, UPDATE, DELETE or LOCK TABLE statements. You can create
+a synonym for a table or a view that doesn't exist, but the target table or
+view must be present before the synonym can be used.</p><p>Synonyms share
+the same namespace as tables or views. You cannot create a synonym with the
+same name as a table that already exists in the same schema. Similarly, you
+cannot create a table or view with a name that matches a synonym already present.</p><p>A
+synonym can be defined for a table/view that does not exist when you create
+the synonym. If the table or view doesn't exist, you will receive a warning
+message (SQLSTATE  01522). The referenced object must be present when you
+use a synonym in a DML statement.</p><p>You can create a nested synonym (a
+synonym for another synonym), but any attempt to create a synonym that results
+in a circular reference will return an error message (SQLSTATE 42916).</p><p>Synonyms cannot be defined in system schemas. All schemas starting with 'SYS' are considered system schemas and are reserved by <ph conref="refconrefs.dita#prod/productshortname"></ph>.</p><p>A synonym cannot
+be defined on a temporary table. Attempting to define a synonym on a temporary
+table will return an error message (SQLSTATE XCL51).</p></section><section><title>Syntax</title><codeblock><b>CREATE SYNONYM <xref href="rrefsynonymname.dita#rrefsynonymname">synonym-Name</xref> FOR { <xref
+href="rrefviewname.dita#rrefviewname">view-Name</xref> | <xref href="rreftablename.dita#rreftablename">table-Name</xref> }</b></codeblock>The <xref
+href="rrefsynonymname.dita#rrefsynonymname">synonym-Name</xref> in the statement represents
+the synonym name you are giving the target table or view, while the <xref
+href="rrefviewname.dita#rrefviewname">view-Name</xref> or <xref href="rreftablename.dita#rreftablename">table-Name</xref> represents
+the original name of the target table or view.</section>
+<example><title>Example</title>CREATE SYNONYM SAMP.T1 FOR SAMP.TABLEWITHLONGNAME</example>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqljcurrenttimestamp.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqljcurrenttimestamp.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqljcurrenttimestamp.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqljcurrenttimestamp.dita Tue Jun 28 15:46:15 2005
@@ -23,7 +23,7 @@
 <keywords><indexterm>CURRENT TIMESTAMP function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>CURRENT TIMESTAMP is a synonym for <xref href="rrefsqlj15866.dita#rrefsqlj15866"></xref>.</p></section>
+<section> <p>CURRENT TIMESTAMP is a synonym for <xref href="rrefsqlj15866.dita#rrefsqlj15866">CURRENT_TIMESTAMP</xref>.</p></section>
 </refbody>
 </reference>
 

Modified: incubator/derby/docs/trunk/src/ref/rrefsqljdropsynonym.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqljdropsynonym.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqljdropsynonym.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqljdropsynonym.dita Tue Jun 28 15:46:15 2005
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
-
-Licensed under the Apache License, Version 2.0 (the "License");  
-you may not use this file except in compliance with the License.  
-You may obtain a copy of the License at      
-
-http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<reference id="rrefsqljdropsynonym" xml:lang="en-us">
-<title>DROP SYNONYM statement</title>
-<prolog><metadata>
-<keywords><indexterm>DROP SYNONYM statement</indexterm><indexterm>Synonyms<indexterm>dropping</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<refbody>
-<section> <p>Drops the specified synonym from a table or view.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>DROP SYNONYM <xref href="rrefsynonymname.dita#rrefsynonymname"></xref></b></codeblock> </refsyn>
-</refbody>
-</reference>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+
+Licensed under the Apache License, Version 2.0 (the "License");  
+you may not use this file except in compliance with the License.  
+You may obtain a copy of the License at      
+
+http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
+<reference id="rrefsqljdropsynonym" xml:lang="en-us">
+<title>DROP SYNONYM statement</title>
+<prolog><metadata>
+<keywords><indexterm>DROP SYNONYM statement</indexterm><indexterm>Synonyms<indexterm>dropping</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<refbody>
+<section> <p>Drops the specified synonym from a table or view.</p></section>
+<refsyn><title>Syntax</title> <codeblock><b>DROP SYNONYM <xref href="rrefsynonymname.dita#rrefsynonymname">synonym-Name</xref></b></codeblock> </refsyn>
+</refbody>
+</reference>
+

Modified: incubator/derby/docs/trunk/src/ref/rrefsqljrenametablestatement.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqljrenametablestatement.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqljrenametablestatement.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqljrenametablestatement.dita Tue Jun 28 15:46:15 2005
@@ -26,7 +26,7 @@
 <section> <p>RENAME TABLE allows you to rename an existing table in any schema
 (except the schema <i>SYS</i>).</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>RENAME TABLE <i>table-Name</i> TO <i><xref
-href="rrefnewtablename.dita#rrefnewtablename"></xref></i></b></codeblock> <p>If
+href="rrefnewtablename.dita#rrefnewtablename">new-Table-Name</xref></i></b></codeblock> <p>If
 there is a view or foreign key that references the table, attempts to rename
 it will generate an error. In addition, if there are any check constraints
 or triggers on the table, attempts to rename it will also generate an error.</p> </refsyn>

Modified: incubator/derby/docs/trunk/src/ref/rrefsynonymname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsynonymname.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsynonymname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsynonymname.dita Tue Jun 28 15:46:15 2005
@@ -1,27 +1,27 @@
-<?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.  
-
-Licensed under the Apache License, Version 2.0 (the "License");  
-you may not use this file except in compliance with the License.  
-You may obtain a copy of the License at      
-
-http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<reference id="rrefsynonymname" xml:lang="en-us">
-<title>synonym-Name</title>
-<refbody>
-<section><p>A <i>synonym-Name</i> represents a synonym for a table or a view.
-You can qualify a <i>synonym-Name</i> with a <i>schema-Name</i>.</p></section>
-<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname"></xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>
-</refbody>
-</reference>
+<?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.  
+
+Licensed under the Apache License, Version 2.0 (the "License");  
+you may not use this file except in compliance with the License.  
+You may obtain a copy of the License at      
+
+http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<reference id="rrefsynonymname" xml:lang="en-us">
+<title>synonym-Name</title>
+<refbody>
+<section><p>A <i>synonym-Name</i> represents a synonym for a table or a view.
+You can qualify a <i>synonym-Name</i> with a <i>schema-Name</i>.</p></section>
+<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/ref/rreftableexpression.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rreftableexpression.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rreftableexpression.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rreftableexpression.dita Tue Jun 28 15:46:15 2005
@@ -24,8 +24,8 @@
 </prolog><refbody>
 <section>
 <p>A <i>TableExpression</i> specifies a table or
-view in a <xref href="rrefsqlj21583.dita#rrefsqlj21583"/>. It is the source from which
-a <i><xref href="rrefselectexpression.dita#rrefselectexpression"/></i> selects
+view in a <xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM clause</xref>. It is the source from which
+a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> selects
 a result.</p>
 <p>A correlation name can be applied to a table in a <i>TableExpression</i> so that its columns can be qualified with that name.
 If you do not supply a correlation name, the table name qualifies the column
@@ -39,13 +39,13 @@
 of the table new names in the AS clause. Some situations in which this is
 useful:  
 <ul>
-<li>When a <xref href="rrefsqlj11277.dita#rrefsqlj11277"/> is used as a <i><xref href="rreftablesubquery.dita#rreftablesubquery"/>,</i> since there is no other way to name
-the columns of a <xref href="rrefsqlj11277.dita#rrefsqlj11277"/>.</li>
+<li>When a <xref href="rrefsqlj11277.dita#rrefsqlj11277">VALUES expression</xref> is used as a <i><xref href="rreftablesubquery.dita#rreftablesubquery">TableSubquery</xref>,</i> since there is no other way to name
+the columns of a <xref href="rrefsqlj11277.dita#rrefsqlj11277">VALUES expression</xref>.</li>
 <li>When column names would otherwise be the same as those of columns in other
 tables; renaming them means you don't have to qualify them.</li>
 </ul></p>
-<p>The Query in a <i><xref href="rreftablesubquery.dita#rreftablesubquery"/></i> appearing in a <i>FromItem</i> can contain
-multiple columns and return multiple rows. See <i><xref href="rreftablesubquery.dita#rreftablesubquery"/>.</i></p>
+<p>The Query in a <i><xref href="rreftablesubquery.dita#rreftablesubquery">TableSubquery</xref></i> appearing in a <i>FromItem</i> can contain
+multiple columns and return multiple rows. See <i><xref href="rreftablesubquery.dita#rreftablesubquery"></xref>.</i></p>
 <p>For information about the optimizer overrides you
 can specify, see <cite><ph conref="refconrefs.dita#pub/cittuning"></ph></cite>.</p></section>
 <refsyn><title>Syntax</title>

Modified: incubator/derby/docs/trunk/src/ref/rreftablename.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rreftablename.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rreftablename.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rreftablename.dita Tue Jun 28 15:46:15 2005
@@ -21,10 +21,10 @@
 <title>table-Name</title>
 <refbody>
 <section><p>A <i>table-Name</i> represents a table. You can qualify a <i>table-Name</i> with
-a <i>schema-Name</i>.</p></section>
-<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname"></xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>
-<section><title>Example</title> <codeblock><b><ph>-- SAMP.PROJECT is a table-Name that includes a schema-Name</ph>
+a <i>schemaName</i>.</p></section>
+<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
+<section><title>Example</title> <codeblock><b><ph>-- SAMP.PROJECT is a table-Name that includes a schemaName</ph>
 SELECT COUNT(*) FROM SAMP.PROJECT</b></codeblock></section>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/ref/rreftablesubquery.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rreftablesubquery.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rreftablesubquery.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rreftablesubquery.dita Tue Jun 28 15:46:15 2005
@@ -25,20 +25,20 @@
 <section>
 <p>A <i>TableSubquery</i> is a subquery that returns
 multiple rows.</p> 
-<p>Unlike a <i><xref href="rrefscalarsubquery.dita#rrefscalarsubquery"/>,</i> a <i>TableSubquery</i> is allowed only:
+<p>Unlike a <i><xref href="rrefscalarsubquery.dita#rrefscalarsubquery">ScalarSubquery</xref>,</i> a <i>TableSubquery</i> is allowed only:
  
 <ul>
 <li>as a <i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> in
-a <xref href="rrefsqlj21583.dita#rrefsqlj21583"/></li>
+a <xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM clause</xref></li>
 <li>with EXISTS, IN, or quantified comparisons.</li>
 </ul></p> 
-<p>When used as a <i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> in a <xref href="rrefsqlj21583.dita#rrefsqlj21583"/>, it can return
+<p>When used as a <i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> in a <xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM clause</xref>, it can return
 multiple columns. When used with EXISTS, it returns multiple columns only
 if you use * to return the multiple columns.</p>
 <p>When used with IN or quantified
 comparisons, it must return a single column.</p></section>
 <refsyn><title>Syntax</title>
-<codeblock><b>(<i><xref href="rrefsqlj21571.dita#rrefsqlj21571"/></i>)</b></codeblock>
+<codeblock><b>(<i><xref href="rrefsqlj21571.dita#rrefsqlj21571">Query</xref></i>)</b></codeblock>
 </refsyn>
 <example>
 <codeblock><b><ph>-- a subquery used as a TableExpression in a FROM clause</ph>

Modified: incubator/derby/docs/trunk/src/ref/rreftriggername.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rreftriggername.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rreftriggername.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rreftriggername.dita Tue Jun 28 15:46:15 2005
@@ -21,8 +21,8 @@
 <title>TriggerName</title>
 <refbody>
 <section><p>A<i> TriggerName</i> refers to a trigger created by a user.</p></section>
-<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname"></xref></i> . ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> . ] <i><xref
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
 <section><title>Example</title> <codeblock><b>DROP TRIGGER TRIG1</b></codeblock></section>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/ref/rrefviewname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefviewname.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefviewname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefviewname.dita Tue Jun 28 15:46:15 2005
@@ -22,8 +22,8 @@
 <refbody>
 <section><p>A <i>view-Name</i> represents a table or a view. You can qualify
 a <i>view-Name</i> with a <i>schema-Name</i>.</p></section>
-<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname"></xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
 <section><title>Example</title> <codeblock><b><ph>-- This is a View qualified by a schema-Name</ph>
 SELECT COUNT(*) FROM SAMP.EMP_RESUME</b></codeblock></section>
 </refbody>

Modified: incubator/derby/docs/trunk/src/tools/ctoolsij32837.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ctoolsij32837.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ctoolsij32837.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ctoolsij32837.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,18 +16,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="ctoolsij32837">
+<concept id="ctoolsij32837" xml:lang="en-us">
 <title>Getting started with ij</title>
 <prolog><metadata>
-<keywords>
-</keywords>
-</metadata>
-</prolog>
+<keywords></keywords>
+</metadata></prolog>
 <conbody>
-<ul>
-<li><xref href="ttoolsij97656.dita#ttoolsij97656"/></li>
-<li><xref href="ctoolsij25986.dita#ctoolsij25986"/></li>
-<li><xref href="ttoolsij98878.dita#ttoolsij98878"/></li>
-</ul>
-</conbody></concept>
+<p>This section discusses the use of the ij tool.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/tools/ctoolsij34525.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ctoolsij34525.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ctoolsij34525.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ctoolsij34525.dita Tue Jun 28 15:46:15 2005
@@ -17,23 +17,15 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="ctoolsij34525">
 <title>Using ij</title>
+<shortdesc>ij is <ph conref="toolsconrefs.dita#prod/productshortname"></ph>'s interactive JDBC scripting tool. It is a simple utility for running scripts against a <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database.</shortdesc>
 <prolog><metadata>
 <keywords>
 </keywords>
 </metadata>
 </prolog>
 <conbody>
-<p>ij is <ph conref="toolsconrefs.dita#prod/productshortname"></ph>'s interactive JDBC scripting tool. It is a simple
-utility for running scripts against a <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database. ij is a Java application,
+<p>ij is a Java application,
 which you start from a command window such as an MS-DOS Command Window or
-the UNIX* shell. ij provides several commands for ease in accessing a variety
+the UNIX shell. ij provides several commands for ease in accessing a variety
 of JDBC features through scripts.</p>
-<p>This chapter includes the following sections:  
-<ul>
-<li><xref href="ttoolsij11815.dita#ttoolsij11815"/></li>
-<li><xref href="ttoolsij30600.dita#ttoolsij30600"/></li>
-<li><xref href="ctoolsij32837.dita#ctoolsij32837"/></li>
-<li><xref href="ctoolsij25986.dita#ctoolsij25986"/></li>
-<li><xref href="ctoolsij12001.dita#ctoolsij12001"/></li>
-</ul></p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tools/ctoolsijcomref15645.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ctoolsijcomref15645.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ctoolsijcomref15645.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ctoolsijcomref15645.dita Tue Jun 28 15:46:15 2005
@@ -31,7 +31,7 @@
 <p><codeph>ij</codeph> uses the result of the JDBC execute request to determine
 whether it should print a number-of-rows message or display a result set.</p>
 <p>If a JDBC execute request causes an exception, it displays the <i>SQLState</i>, if any, and error message.</p>
-<p>Setting the <codeph>ij</codeph> property <i><xref href="rtoolsijpropref25589.dita#rtoolsijpropref25589"/></i> to <i>true</i> displays the <i>SQLException</i>'s error code (see <xref href="rtoolsijpropref29864.dita#rtoolsijpropref29864"/>).</p>
+<p>Setting the <codeph>ij</codeph> property <i><xref href="rtoolsijpropref25589.dita#rtoolsijpropref25589">ij.showErrorCode</xref></i> to <i>true</i> displays the <i>SQLException</i>'s error code (see <xref href="rtoolsijpropref29864.dita#rtoolsijpropref29864"/>).</p>
 <p>The number-of-rows message for inserts, updates, and deletes conforms to
 the JDBC specification for any SQL statement that does not have a result set.
 DDL (data definition language) commands typically report "0 rows inserted/updated/deleted"

Modified: incubator/derby/docs/trunk/src/tools/ctoolsijcomref18998.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ctoolsijcomref18998.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ctoolsijcomref18998.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ctoolsijcomref18998.dita Tue Jun 28 15:46:15 2005
@@ -20,13 +20,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p><codeph>ij</codeph> issues the following messages to inform the user of errors
-during processing of statements:  
-<ul>
-<li><xref href="ctoolsijcomref36744.dita#ctoolsijcomref36744"/></li>
-<li><xref href="ctoolsijcomref21190.dita#ctoolsijcomref21190"/></li>
-<li><xref href="ctoolsijcomref30411.dita#ctoolsijcomref30411"/></li>
-<li><xref href="ctoolsijcomref32407.dita#ctoolsijcomref32407"/></li>
-<li><xref href="ctoolsijcomref14191.dita#ctoolsijcomref14191"/></li>
-</ul></p>
+<p>ij might issue messages to inform the user of errors
+during processing of statements.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tools/ctoolsijtools11318.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ctoolsijtools11318.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ctoolsijtools11318.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ctoolsijtools11318.dita Tue Jun 28 15:46:15 2005
@@ -17,19 +17,12 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="ctoolsijtools11318">
 <title>Tools and localization</title>
+<shortdesc>The <ph conref="toolsconrefs.dita#prod/productshortname"></ph> tools provide support for common localization features such as localized message files and GUI, locale-appropriate formatting of data, codesets, unicode identifiers and data, and database territories.</shortdesc>
 <prolog><metadata>
 <keywords>
 </keywords>
 </metadata>
 </prolog>
 <conbody>
-<p>The <ph conref="toolsconrefs.dita#prod/productshortname"></ph> tools provide support for common localization features
-(such as localized message files and GUI, locale-appropriate formatting of
-data, codesets, unicode identifiers and data, and database territories). For
-general information about international <ph conref="toolsconrefs.dita#prod/productshortname"></ph> systems, see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.  
-<ul>
-<li><xref href="ctoolsijtools45180.dita#ctoolsijtools45180"/></li>
-<li><xref href="ctoolsijtools70959.dita#ctoolsijtools70959"/></li>
-<li><xref href="ctoolsijtools90477.dita#ctoolsijtools90477"/></li>
-</ul></p>
+<p>For general information about international <ph conref="toolsconrefs.dita#prod/productshortname"></ph> systems, see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tools/ctoolsijtools20118.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ctoolsijtools20118.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ctoolsijtools20118.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ctoolsijtools20118.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,21 +16,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="ctoolsijtools20118">
+<concept id="ctoolsijtools20118" xml:lang="en-us">
 <title>JDBC basics</title>
+<shortdesc>Most of the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> tools
+are JDBC applications. A JDBC application is one that uses the classes in
+the <i>java.sql</i> package to interact with a DBMS.</shortdesc>
 <prolog><metadata>
-<keywords>
-</keywords>
-</metadata>
-</prolog>
+<keywords></keywords>
+</metadata></prolog>
 <conbody>
-<p>Most of the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> tools are JDBC applications. A JDBC application
-is one that uses the classes in the <i>java.sql</i> package
-to interact with a DBMS. When you work with JDBC applications, you need to
-know about the following two JDBC concepts:  
-<ul>
-<li><xref href="rtoolsijtools16879.dita#rtoolsijtools16879"/></li>
-<li><xref href="ctoolsijtools16011.dita#ctoolsijtools16011"/></li>
-</ul></p>
-</conbody></concept>
+<p>When you work with JDBC applications, you need to know about several concepts.</p>
+</conbody>
+</concept>



Mime
View raw message