db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1527587 [3/4] - /db/derby/docs/trunk/src/ref/
Date Mon, 30 Sep 2013 14:23:21 GMT
Modified: db/derby/docs/trunk/src/ref/rrefsqlj43125.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj43125.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj43125.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj43125.dita Mon Sep 30 14:23:19 2013
@@ -26,7 +26,7 @@ TRIGGER</indexterm></indexterm><indexter
 <indexterm>triggers<indexterm>database events</indexterm></indexterm><indexterm>triggers<indexterm>referencing
 clause</indexterm><indexterm>referencing old and new values</indexterm></indexterm>
 <indexterm>triggers<indexterm>statement versus row triggers</indexterm></indexterm>
-<indexterm>triggers<indexterm>triggered-SQL-statement</indexterm></indexterm>
+<indexterm>triggers<indexterm>triggeredSQLStatement</indexterm></indexterm>
 <indexterm>triggers<indexterm>order of execution</indexterm></indexterm><indexterm>triggers<indexterm>recursion</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
@@ -54,13 +54,15 @@ does not need to reside in the same sche
 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">TriggerName</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">column-Name</xref></i>]* ] }
-ON <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i>
-[ <i><xref href="rrefsqlj89752.dita#rrefsqlj89752">ReferencingClause</xref></i> ]
+{ INSERT | DELETE | UPDATE [ OF <i><xref
+href="rrefcolumnname.dita#rrefcolumnname">columnName</xref></i> [ , <i><xref
+href="rrefcolumnname.dita#rrefcolumnname">columnName</xref></i> ]* ] }
+ON <i><xref href="rreftablename.dita#rreftablename">tableName</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>
+<i><xref href="rrefsqlj43125.dita#rrefsqlj43125/i1149821">triggeredSQLStatement</xref></i></b></codeblock> </refsyn>
 <section><title>Before or after: when triggers fire</title> <p>Triggers are
 defined as either <i>Before</i> or <i>After</i> triggers. <ul>
 <li><i>Before</i> triggers fire before the statement's changes are applied
@@ -80,27 +82,27 @@ you define it (see <xref href="rrefsqlj4
 </ul></p> <p>You can define any number of triggers for a given event on a
 given table. For update, you can specify columns.</p> </section>
 <section id="sqlj67748"><title>Referencing old and new values: the referencing
-clause</title> <p>Many triggered-SQL-statements need to refer to data that
+clause</title> <p>Many <i>triggeredSQLStatement</i>s need to refer to data that
 is currently being changed by the database event that caused them to fire.
-The triggered-SQL-statement might need to refer to the new (post-change or
+The <i>triggeredSQLStatement</i> might need to refer to the new (post-change or
 "after") values. </p> <p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides
 you with a number of ways to refer to data that is currently being changed
 by the database event that caused the trigger to fire. Changed data can be
-referred to in the triggered-SQL-statement using <i>transition variables</i> or <i>transition
+referred to in the <i>triggeredSQLStatement</i> using <i>transition variables</i> or <i>transition
 tables</i>. The referencing clause allows you to provide a correlation name
-or alias for these transition variables by specifying OLD/NEW AS <i>correlation-Name </i>.</p> <p>For
+or alias for these transition variables by specifying OLD/NEW AS <i>correlationName </i>.</p> <p>For
 example, if you add the following clause to the trigger definition:   <codeblock><b>REFERENCING OLD AS DELETEDROW</b></codeblock></p> <p>you
-can then refer to this correlation name in the triggered-SQL-statement:   <codeblock><b>DELETE FROM HotelAvailability WHERE hotel_id = DELETEDROW.hotel_id</b
+can then refer to this correlation name in the <i>triggeredSQLStatement</i>:   <codeblock><b>DELETE FROM HotelAvailability WHERE hotel_id = DELETEDROW.hotel_id</b
 ></codeblock></p> <p>The OLD and NEW transition variables map to a <i>java.sql.ResultSet</i> with
 a single row.   <note>Only row triggers (see <xref href="rrefsqlj43125.dita#rrefsqlj43125/sqlj54276"></xref>)
 can use the transition variables. INSERT row triggers cannot reference an
 OLD row. DELETE row triggers cannot reference a NEW row.</note></p> <p>For
 statement triggers, transition <i>tables</i> serve as a table identifier for
-the triggered-SQL-statement or the trigger qualification. The referencing
+the <i>triggeredSQLStatement</i> or the trigger qualification. The referencing
 clause allows you to provide a correlation name or alias for these transition
-tables by specifying OLD_TABLE/NEW_TABLE AS correlation-Name</p> <p>For example:
+tables by specifying OLD_TABLE/NEW_TABLE AS correlationName</p> <p>For example:
   <codeblock><b>REFERENCING OLD_TABLE AS DeletedHotels</b></codeblock></p> <p>allows
-you to use that new identifier (<i>DeletedHotels</i>) in the triggered-SQL-statement:
+you to use that new identifier (<i>DeletedHotels</i>) in the <i>triggeredSQLStatement</i>:
   <codeblock><b>DELETE FROM HotelAvailability WHERE hotel_id IN
     (SELECT hotel_id FROM DeletedHotels)</b></codeblock></p> <p>The old and
 new transition tables map to a <i>java.sql.ResultSet</i> with cardinality
@@ -126,8 +128,8 @@ by the triggering event. If no rows are 
 contained (for example, UPDATE T SET C = C) causes a row trigger to fire,
 even though the value of the column is the same as it was prior to the triggering
 event.</note></p> </section>
-<section id="i1149821"><title>Triggered-SQL-statement</title> <p>The action
-defined by the trigger is called the triggered-SQL-statement (in <xref href="rrefsqlj43125.dita#rrefsqlj43125/syn001"></xref> above,
+<section id="i1149821"><title>triggeredSQLStatement</title> <p>The action
+defined by the trigger is called the <i>triggeredSQLStatement</i> (in <xref href="rrefsqlj43125.dita#rrefsqlj43125/syn001"></xref> above,
 see the last line). It has the following limitations:   <ul>
 <li>It must not contain any dynamic parameters (?).</li>
 <li>It must not create, alter, or drop the table upon which the trigger is
@@ -143,12 +145,12 @@ action.</li>
 <li>Before triggers cannot call procedures that modify SQL data as their action.</li>
 <li>The NEW variable of a Before trigger cannot reference a generated column.
 </li>
-</ul></p><p>The triggered-SQL-statement can reference database objects other
+</ul></p><p>The <i>triggeredSQLStatement</i> can reference database objects other
 than the table upon which the trigger is declared. If any of these database
 objects is dropped, the trigger is invalidated. If the trigger cannot be successfully
 recompiled upon the next execution, the invocation throws an exception and
 the statement that caused it to fire will be rolled back.</p><p>For more information
-on triggered-SQL-statements, see the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite>.</p> </section>
+on <i>triggeredSQLStatement</i>s, see the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite>.</p> </section>
 <section><title>Order of execution</title> <p>When a database event occurs
 that fires a trigger, <ph conref="../conrefs.dita#prod/productshortname"></ph> performs
 actions in this order:   <ul>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj57522.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj57522.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj57522.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj57522.dita Mon Sep 30 14:23:19 2013
@@ -28,10 +28,11 @@ operations</xref> that allow you to spec
 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 the columns in a different order.</p></section>
-<refsyn><title>Syntax</title><codeblock><b><i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> RIGHT [ OUTER ] JOIN <i
-><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i>
+<refsyn><title>Syntax</title><codeblock><b><i><xref href="rreftableexpression.dita#rreftableexpression">tableExpression</xref></i> RIGHT [ OUTER ] JOIN <i
+><xref href="rreftableexpression.dita#rreftableexpression">tableExpression</xref></i>
 {
-    ON <i>booleanExpression</i> |
+    ON <i><xref
+href="rrefsqlj23075.dita#rrefsqlj23075">booleanExpression</xref></i> |
     <i><xref href="rrefsqljusing.dita#rrefsqljusing">USING clause</xref></i>
 }</b></codeblock>
 
@@ -65,7 +66,7 @@ RIGHT JOIN COUNTRIES 
 ON CITIES.COUNTRY_ISO_CODE = COUNTRIES.COUNTRY_ISO_CODE
 WHERE Countries.region = 'Africa'
 </codeblock> </example>
-<example><title>Example 2</title><codeblock><b>-- a TableExpression can be a joinOperation. Therefore
+<example><title>Example 2</title><codeblock><b>-- a tableExpression can be a join operation. Therefore
 -- you can have multiple join operations in a FROM clause
 -- List every employee number and last name 
 -- with the employee number and last name of their manager

Modified: db/derby/docs/trunk/src/ref/rrefsqlj59893.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj59893.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj59893.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj59893.dita Mon Sep 30 14:23:19 2013
@@ -25,7 +25,7 @@ limitations under the License.
 </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">index-Name</xref></i></b></codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><b>DROP INDEX <i><xref href="rrefindexname.dita#rrefindexname">indexName</xref></i></b></codeblock> </refsyn>
 <example><title>Examples</title>
 <codeblock><b>DROP INDEX OrigIndex
 

Modified: db/derby/docs/trunk/src/ref/rrefsqlj61102.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj61102.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj61102.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj61102.dita Mon Sep 30 14:23:19 2013
@@ -26,7 +26,8 @@ limitations under the License.
 </metadata></prolog>
 <refbody>
 <section> <p>Drops the specified view.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>DROP VIEW <xref href="rrefviewname.dita#rrefviewname">view-Name</xref></b></codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><b>DROP VIEW <i><xref
+href="rrefviewname.dita#rrefviewname">viewName</xref></i></b></codeblock> </refsyn>
 <example><title>Example</title>
 <codeblock><b>DROP VIEW AnIdentifier</b></codeblock> </example>
 <section><title>Statement dependency system</title> <p>Any statements

Modified: db/derby/docs/trunk/src/ref/rrefsqlj81859.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj81859.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj81859.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj81859.dita Mon Sep 30 14:23:19 2013
@@ -32,56 +32,65 @@ tables</indexterm><indexterm>Tables<inde
 </metadata></prolog>
 <refbody>
 <section><p>The ALTER TABLE statement allows you to:   <ul>
-<li>add a column to a table</li>
-<li>add a constraint to a table</li>
-<li>drop a column from a table</li>
-<li>drop an existing constraint from a table</li>
-<li>increase the width of a VARCHAR or VARCHAR FOR BIT DATA column</li>
-<li>override row-level locking for the table (or drop the override)</li>
-<li>change the increment value and start value of the identity column</li>
-<li>change the nullability constraint for a column</li>
-<li>change the default value for a column</li>
+<li>Add a column to a table</li>
+<li>Add a constraint to a table</li>
+<li>Drop a column from a table</li>
+<li>Drop an existing constraint from a table</li>
+<li>Increase the width of a VARCHAR or VARCHAR FOR BIT DATA column</li>
+<li>Override row-level locking for the table (or drop the override)</li>
+<li>Change the increment value and start value of the identity column</li>
+<li>Change the nullability constraint for a column</li>
+<li>Change the default value for a column</li>
 </ul></p></section>
-<section><title>Syntax</title><codeblock><b>ALTER TABLE <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i>
+<section><title>Syntax</title><codeblock><b>ALTER TABLE <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i>
 {
-    ADD COLUMN <i><xref href="rrefsqlj81859.dita#rrefsqlj81859/rrefaltercolumndef">column-definition</xref></i> |
+    ADD COLUMN <i><xref href="rrefsqlj81859.dita#rrefsqlj81859/rrefaltercolumndef">columnDefinition</xref></i> |
     ADD <i><xref href="rrefsqlj13590.dita#rrefsqlj13590">CONSTRAINT clause</xref></i> |
-    DROP [ COLUMN ] column-name [ CASCADE | RESTRICT ]
-    DROP { PRIMARY KEY | FOREIGN KEY constraint-name | UNIQUE 
-	 constraint-name | CHECK constraint-name | CONSTRAINT constraint-name }
-    ALTER [ COLUMN ] <i><xref href="rrefsqlj81859.dita#rrefsqlj81859/rrefsqlj37860">column-alteration</xref></i> |
+    DROP [ COLUMN ] <i><xref
+href="rrefcolumnname.dita#rrefcolumnname">columnName</xref></i> [ CASCADE | RESTRICT ] |
+    DROP { PRIMARY KEY |
+           FOREIGN KEY <i><xref
+href="rrefconstraintname.dita#rrefconstraintname">constraintName</xref></i> |
+           UNIQUE <i><xref
+href="rrefconstraintname.dita#rrefconstraintname">constraintName</xref></i> |
+           CHECK <i><xref
+href="rrefconstraintname.dita#rrefconstraintname">constraintName</xref></i> |
+           CONSTRAINT <i><xref
+href="rrefconstraintname.dita#rrefconstraintname">constraintName</xref></i> } |
+    ALTER [ COLUMN ] <i><xref href="rrefsqlj81859.dita#rrefsqlj81859/rrefsqlj37860">columnAlteration</xref></i> |
     LOCKSIZE { ROW | TABLE }
 }</b></codeblock></section>
-<example id="rrefaltercolumndef"> <title>column-definition</title><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 <varname>DefaultConstantExpression</varname>
-  | <i><xref href="rrefsqljgenerationclause.dita#rrefsqljgenerationclause">generation-clause</xref></i>
+<example id="rrefaltercolumndef"> <title>columnDefinition</title><codeblock><b><i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ <i>dataType</i> ]
+[ <i><xref href="rrefsqlj16095.dita#rrefsqlj16095">columnLevelConstraint</xref></i> ]*
+[ [ WITH ] DEFAULT <varname>defaultConstantExpression</varname>
+  | <i><xref href="rrefsqljgenerationclause.dita#rrefsqljgenerationclause">generationClause</xref></i>
 ]</b></codeblock>
-<p>The syntax for the <i>column-definition</i> for a new column is a subset of
+<p>The syntax for the <i>columnDefinition</i> for a new column is a subset of
 the syntax for a column in a
 <xref href="rrefsqlj24513.dita#rrefsqlj24513">CREATE TABLE statement</xref>.</p>
 <p>The syntax of <i>DataType</i> is described in
 <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>. The <i>DataType</i> can
-be omitted only if you specify a <i>generation-clause</i>. If you omit the
+be omitted only if you specify a <i>generationClause</i>. If you omit the
 <i>DataType</i>, the type of the generated column is the type of the
-<i>generation-clause</i>. If you specify both a <i>DataType</i> and a
-<i>generation-clause</i>, the type of the <i>generation-clause</i> must be
+<i>generationClause</i>. If you specify both a <i>DataType</i> and a
+<i>generationClause</i>, the type of the <i>generationClause</i> must be
 assignable to <i>DataType</i>.</p>
-<p>For details on <varname>DefaultConstantExpression</varname>, see 
-<xref href="rrefsqlj30540.dita#sqlj64478">Column default</xref>.</p></example>
-<example id="rrefsqlj37860"><title>column-alteration</title><codeblock><b><i>column-Name</i> SET DATA TYPE VARCHAR(integer) |
-<i>column-Name</i> SET DATA TYPE VARCHAR FOR BIT DATA(integer) |
-<i>column-name</i> SET INCREMENT BY integer-constant |
-<i>column-name</i> RESTART WITH integer-constant |
-<i>column-name</i> [ NOT ] NULL |
-<i>column-name</i> [ WITH | SET ] DEFAULT default-value |
-<i>column-name</i> DROP DEFAULT</b> </codeblock></example>
-<section><p>In the column-alteration, SET INCREMENT BY integer-constant, specifies
+<p>For details on <varname>defaultConstantExpression</varname>, see 
+<xref href="rrefsqlj30540.dita#rrefsqlj30540/sqlj64478">Column default</xref>.</p></example>
+<example id="rrefsqlj37860"><title>columnAlteration</title>
+<codeblock><b><i>columnName</i> SET DATA TYPE VARCHAR( <i>integer</i> ) |
+<i>columnName</i> SET DATA TYPE VARCHAR FOR BIT DATA( <i>integer</i> ) |
+<i>columnName</i> SET INCREMENT BY <i>integerConstant</i> |
+<i>columnName</i> RESTART WITH <i>integerConstant</i> |
+<i>columnName</i> [ NOT ] NULL |
+<i>columnName</i> [ WITH | SET ] DEFAULT <i>defaultValue</i> |
+<i>columnName</i> DROP DEFAULT</b> </codeblock></example>
+<section><p>In the <i>columnAlteration</i>, SET INCREMENT BY <i>integerConstant</i> specifies
 the interval between consecutive values of the identity column. The next value
 to be generated for the identity column will be determined from the last assigned
 value with the increment applied. The column must already be defined with
-the IDENTITY attribute.</p><p>RESTART WITH integer-constant specifies the
+the IDENTITY attribute.</p><p>RESTART WITH <i>integerConstant</i> specifies the
 next value to be generated for the identity column. RESTART WITH is useful
 for a table that has an identity column that was defined as GENERATED BY DEFAULT
 and that has a unique key defined on that identity column. Because GENERATED
@@ -107,10 +116,11 @@ includes views that have an "*" in their
 those views if you wish them to return the new columns.</p>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> raises an error if
 you try to change the <i>DataType</i> of a generated column to a type which is
-not assignable from the type of the <i>generation-clause</i>.
+not assignable from the type of the <i>generationClause</i>.
 <ph conref="../conrefs.dita#prod/productshortname"></ph> also raises an error if
 you try to add a DEFAULT clause to a generated column.</p></section>
-<section><title>Adding columns</title><p>The syntax for the <i><xref href="rrefsqlj81859.dita#rrefsqlj81859/rrefaltercolumndef">column-definition</xref
+<section><title>Adding columns</title><p>The syntax for the <i><xref
+href="rrefsqlj81859.dita#rrefsqlj81859/rrefaltercolumndef">columnDefinition</xref
 ></i> for a new column is almost the same as for a column in a CREATE TABLE
 statement. This syntax allows a column constraint to be placed on the new column within
 the ALTER TABLE ADD COLUMN statement. However, a column with a NOT NULL constraint
@@ -169,7 +179,7 @@ RESTRICT will reject the statement.</p>
 <p>
 <ph conref="../conrefs.dita#prod/productshortname"></ph> also raises an error if
 you specify RESTRICT when you drop a column referenced by the
-<i>generation-clause</i> of a generated column. However, if you specify CASCADE,
+<i>generationClause</i> of a generated column. However, if you specify CASCADE,
 the generated column is also dropped with CASCADE semantics.</p>
 <p>
 You may not drop the last (only) column in a table.</p>
@@ -185,7 +195,7 @@ must specify the generated constraint na
 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="rrefsqlj81859.dita#rrefsqlj81859/rrefsqlj37860">column-alteration</xref></i> allows
+<section><title>Modifying columns</title><p>The <i><xref href="rrefsqlj81859.dita#rrefsqlj81859/rrefsqlj37860">columnAlteration</xref></i> allows
 you to alter the named column in the following ways:   <ul>
 <li>Increasing the width of an existing VARCHAR or VARCHAR FOR BIT DATA column. CHARACTER VARYING
 or CHAR VARYING can be used as synonyms for the VARCHAR keyword. <p>To increase
@@ -196,7 +206,7 @@ is part of a primary or unique key refer
 or that is part of a foreign key constraint.</p></li>
 <li>Specifying the interval between consecutive values of the identity column.<p>To
 set an interval between consecutive values of the identity column, specify
-the integer-constant. You must previously define the column with the IDENTITY
+the <i>integerConstant</i>. You must previously define the column with the IDENTITY
 attribute (SQLSTATE 42837). If there are existing rows in the table, the values
 in the column for which the SET INCREMENT default was added do not change.</p></li>
 <li>Modifying the nullability constraint of a column.
@@ -205,9 +215,9 @@ in the column for which the SET INCREMEN
     <p>You can remove the NOT NULL constraint from an existing column. To do
         so the column must not be used in a PRIMARY KEY constraint.</p></li>
 <li>Changing the default value for a column.
-<p>You can use DEFAULT default-value to change a column default. To disable a
+<p>You can use DEFAULT <i>default-value</i> to change a column default. To disable a
 previously set default, use DROP DEFAULT (alternatively, you can specify NULL as
-the default-value).</p></li>
+the <i>default-value</i>).</p></li>
 </ul></p></section>
 <section><title>Setting defaults</title><p>You can specify a default value
 for a new column. A default value is the value that is inserted into a column

Modified: db/derby/docs/trunk/src/ref/rrefsqlj89752.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj89752.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj89752.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj89752.dita Mon Sep 30 14:23:19 2013
@@ -19,13 +19,17 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefsqlj89752" xml:lang="en-us">
-<title>ReferencingClause</title>
+<title>referencingClause</title>
 <refbody>
 <example> <codeblock><b>REFERENCING
 {
-{ OLD | NEW } [ ROW ] [ AS ] correlation-Name [ { OLD | NEW } [ ROW ] [ AS ] correlation-Name ] | 
-{ OLD TABLE | NEW TABLE } [ AS ] Identifier [ { OLD TABLE | NEW TABLE } [AS] Identifier ]  |
-{ OLD_TABLE | NEW_TABLE } [ AS ] Identifier [ { OLD_TABLE | NEW_TABLE } [AS] Identifier ] 
+    { OLD | NEW } [ ROW ] [ AS ] <i><xref
+href="rrefcorrelationname.dita#rrefcorrelationname">correlationName</xref></i> 
+        [ { OLD | NEW } [ ROW ] [ AS ] <i><xref
+href="rrefcorrelationname.dita#rrefcorrelationname">correlationName</xref></i> ]
+  | 
+    { OLD_TABLE | NEW_TABLE } [ AS ] <i>identifier</i> 
+        [ { OLD_TABLE | NEW_TABLE } [ AS ] <i>identifier</i> ] 
 }</b></codeblock>
 <note>
 The <codeph><b>OLD_TABLE | NEW_TABLE</b></codeph> syntax is deprecated since it 

Modified: db/derby/docs/trunk/src/ref/rrefsqlj91438.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj91438.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj91438.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj91438.dita Mon Sep 30 14:23:19 2013
@@ -23,8 +23,12 @@ limitations under the License.
 <refbody>
 <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="../conrefs.dita#prod/productshortname"></ph> generates
-a unique constraint name (for either column or table constraints).</p></section>
+<section>
+<p>If a <i><xref
+href="rrefconstraintname.dita#rrefconstraintname">constraintName</xref></i> is
+not specified, <ph conref="../conrefs.dita#prod/productshortname"></ph>
+generates a unique constraint name (for either column or table constraints).</p>
+</section>
 </refbody>
 </reference>
 

Modified: db/derby/docs/trunk/src/ref/rrefsqlj95598.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj95598.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj95598.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj95598.dita Mon Sep 30 14:23:19 2013
@@ -26,7 +26,8 @@ limitations under the License.
 <refbody>
 <section> <p>This statement allows you to rename an index in the current schema.
 Users cannot rename indexes in the <i>SYS</i> schema.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>RENAME INDEX <i>index-Name</i> TO <i>new-index-Name</i></b></codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><b>RENAME INDEX <i><xref
+href="rrefindexname.dita#rrefindexname">indexName</xref></i> TO <i>newIndexName</i></b></codeblock> </refsyn>
 <example><title>Example</title>
 <codeblock><b>RENAME INDEX DESTINDEX TO ARRIVALINDEX</b></codeblock> </example>
 <section><title>Statement dependency system</title> <p>RENAME

Modified: db/derby/docs/trunk/src/ref/rrefsqljcreateaggregate.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljcreateaggregate.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljcreateaggregate.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljcreateaggregate.dita Mon Sep 30 14:23:19 2013
@@ -31,16 +31,15 @@ limitations under the License.
 <section><p>The CREATE DERBY AGGREGATE statement creates a user-defined
 aggregate (UDA). A UDA is a custom aggregate operator.</p></section>
 <refsyn><title>Syntax</title>
-<codeblock><b>CREATE DERBY AGGREGATE [ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i>
-FOR <i>ValueDataType</i>
-[ RETURNS <i>ReturnDataType</i> ]
-EXTERNAL NAME <i>ClassNameString</i></b></codeblock>
-<p>The aggregate name is composed of an optional <i>schemaName</i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
-schema is the default schema. If a qualified aggregate name is specified, the
-schema name cannot begin with SYS.</p>
+<codeblock><b>CREATE DERBY AGGREGATE <i><xref 
+href="rrefaggregatename.dita#rrefaggregatename">aggregateName</xref></i> FOR <i>valueDataType</i>
+[ RETURNS <i>returnDataType</i> ]
+EXTERNAL NAME <i>classNameString</i></b></codeblock>
+<p>The aggregate name is composed of an optional <i><xref
+href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i>
+and a <i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the
+current schema is the default schema. If a qualified aggregate name is
+specified, the schema name cannot begin with SYS.</p>
 <p>In general, UDAs live in the same namespace as one-argument user-defined
 functions (see
 <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement"></xref>).
@@ -66,14 +65,14 @@ VAR_SAMP</codeblock>
 <p>In addition, an unqualified UDA name may not be the name of any of the
 <ph conref="../conrefs.dita#prod/productshortname"></ph> built-in functions
 which take one argument.</p>
-<p>The <i>ValueDataType</i> can be any valid nullable
+<p>The <i>valueDataType</i> can be any valid nullable
 <ph conref="../conrefs.dita#prod/productshortname"></ph> data type except for
 XML, including user-defined types.</p>
-<p>The <i>ReturnDataType</i> can be any valid nullable
+<p>The <i>returnDataType</i> can be any valid nullable
 <ph conref="../conrefs.dita#prod/productshortname"></ph> data type except for
-XML. If the <i>ReturnDataType</i> is omitted, it defaults to be the same as
-<i>ValueDataType</i>.</p>
-<p>The <i>ClassNameString</i> is a single-quoted string. It is the full name of
+XML. If the <i>returnDataType</i> is omitted, it defaults to be the same as
+<i>valueDataType</i>.</p>
+<p>The <i>classNameString</i> is a single-quoted string. It is the full name of
 a Java class which implements the <i>org.apache.derby.agg.Aggregator</i>
 interface. That contract is not checked until a statement is compiled which
 invokes the UDA.</p>

Modified: db/derby/docs/trunk/src/ref/rrefsqljcreatesequence.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljcreatesequence.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljcreatesequence.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljcreatesequence.dita Mon Sep 30 14:23:19 2013
@@ -39,11 +39,11 @@ privilege cannot be revoked from the sch
 <xref href="rrefsqljrevoke.dita#rrefsqljrevoke"></xref> for more information.
 </p></section>
 <refsyn><title>Syntax</title>
-<codeblock><b>CREATE SEQUENCE [ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> [ <i><xref
+<codeblock><b>CREATE SEQUENCE <i><xref 
+href="rrefsequencename.dita#rrefsequencename">sequenceName</xref></i> [ <i><xref
 href="rrefsqljcreatesequence.dita#rrefsqljcreatesequence/rrefsqljcrseqsequenceelement">sequenceElement</xref></i> ]*</b></codeblock>
-<p>The sequence name is composed of an optional <i>schemaName</i> and a
+<p>The sequence name is composed of an optional <i><xref
+href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> and a
 <i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
 schema is the default schema. If a qualified sequence name is specified, the
 schema name cannot begin with SYS.</p></refsyn>
@@ -59,18 +59,18 @@ schema name cannot begin with SYS.</p></
 <p>If specified, the <i>dataType</i> must be an integer type (SMALLINT, INT, or
 BIGINT). If not specified, the default data type is INT.</p>
 <p>If specified, the INCREMENT value is a non-zero number which fits in a
-<i>DataType</i> value. If not specified, the INCREMENT defaults to 1. INCREMENT
+<i>dataType</i> value. If not specified, the INCREMENT defaults to 1. INCREMENT
 is the step by which the sequence generator advances. If INCREMENT is positive,
 the sequence numbers get larger over time. If INCREMENT is negative, the
 sequence numbers get smaller.</p>
-<p>If specified, MINVALUE must be an integer which fits in a <i>DataType</i>
+<p>If specified, MINVALUE must be an integer which fits in a <i>dataType</i>
 value. If MINVALUE is not specified, or if NO MINVALUE is specified, MINVALUE
-defaults to the smallest negative number which fits in a <i>DataType</i> value.
+defaults to the smallest negative number which fits in a <i>dataType</i> value.
 </p>
 <p>If specified, MAXVALUE may not be greater than the largest positive integer
-that fits in a <i>DataType</i> value. If MAXVALUE is not specified, or if
+that fits in a <i>dataType</i> value. If MAXVALUE is not specified, or if
 NO MAXVALUE is specified, MAXVALUE defaults to the largest positive integer
-which fits in a <i>DataType</i> value. MAXVALUE must be greater than MINVALUE.
+which fits in a <i>dataType</i> value. MAXVALUE must be greater than MINVALUE.
 </p>
 <p>The START WITH clause specifies the initial value of the sequence generator.
 This value must fall between MINVALUE and MAXVALUE. If the START WITH clause is

Modified: db/derby/docs/trunk/src/ref/rrefsqljcreatesynonym.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljcreatesynonym.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljcreatesynonym.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljcreatesynonym.dita Mon Sep 30 14:23:19 2013
@@ -41,12 +41,13 @@ use a synonym in a DML statement.</p><p>
 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="../conrefs.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>
+table will return an error message (SQLSTATE XCL51).</p></section>
+<section><title>Syntax</title>
+<codeblock><b>CREATE SYNONYM <i><xref href="rrefsynonymname.dita#rrefsynonymname">synonymName</xref></i> FOR { <i><xref
+href="rrefviewname.dita#rrefviewname">viewName</xref></i> | <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i> }</b></codeblock>
+<p>The <i>synonymName</i> in the statement represents the synonym name you are
+giving the target table or view, while the <i>viewName</i> or <i>tableName</i>
+represents the original name of the target table or view.</p></section>
 <example><title>Example</title>
 <codeblock><b>CREATE SYNONYM SAMP.T1 FOR SAMP.TABLEWITHLONGNAME</b></codeblock>
 </example>

Modified: db/derby/docs/trunk/src/ref/rrefsqljcreatetype.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljcreatetype.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljcreatetype.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljcreatetype.dita Mon Sep 30 14:23:19 2013
@@ -33,15 +33,15 @@ The CREATE TYPE statement creates a user
 serializable Java class whose instances are stored in columns. The class must
 implement the <i>java.io.Serializable</i> interface.</p></section>
 <refsyn><title>Syntax</title>
-<codeblock><b>CREATE TYPE [ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i>
+<codeblock><b>CREATE TYPE <i><xref 
+href="rreftypename.dita#rreftypename">typeName</xref></i>
 EXTERNAL NAME <i>singleQuotedJavaClassName</i>
 LANGUAGE JAVA</b></codeblock>
-<p>The type name is composed of an optional <i>schemaName</i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
-schema is the default schema. If a qualified type name is specified, the schema
-name cannot begin with SYS.</p>
+<p>The type name is composed of an optional <i><xref
+href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> and a
+<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided,
+the current schema is the default schema. If a qualified type name is specified,
+the schema name cannot begin with SYS.</p>
 <p>If the Java class does not implement <i>java.io.Serializable</i>, or if it is
 not public and visible on the classpath,
 <ph conref="../conrefs.dita#prod/productshortname"></ph> raises an exception

Modified: db/derby/docs/trunk/src/ref/rrefsqljcrossjoin.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljcrossjoin.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljcrossjoin.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljcrossjoin.dita Mon Sep 30 14:23:19 2013
@@ -30,7 +30,11 @@ produces the Cartesian product of two ta
 does not let you specify a join clause. You may, however, specify a WHERE clause
 in the SELECT statement.</p></section>
 <refsyn><title>Syntax</title>
-<codeblock><b><i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> CROSS JOIN { <xref href="rrefsqlj33215.dita#rrefsqlj33215">TableViewOrFunctionExpression</xref> | ( <i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> ) }</b></codeblock>
+<codeblock><b><i><xref href="rreftableexpression.dita#rreftableexpression">tableExpression</xref></i> CROSS JOIN
+{
+    <i><xref href="rrefsqlj33215.dita#rrefsqlj33215">tableViewOrFunctionExpression</xref></i> |
+    ( <i><xref href="rreftableexpression.dita#rreftableexpression">tableExpression</xref></i> )
+}</b></codeblock>
 </refsyn>
 <example><title>Examples</title>
 <p>The following SELECT statements are equivalent:</p>

Modified: db/derby/docs/trunk/src/ref/rrefsqljdropaggregate.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljdropaggregate.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljdropaggregate.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljdropaggregate.dita Mon Sep 30 14:23:19 2013
@@ -33,13 +33,8 @@ limitations under the License.
 <xref href="rrefsqljcreateaggregate.dita#rrefsqljcreateaggregate"></xref>.</p>
 </section>
 <refsyn><title>Syntax</title>
-<codeblock><b>DROP DERBY AGGREGATE [ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> RESTRICT</b></codeblock>
-<p>The aggregate name is composed of an optional <i>schemaName</i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
-schema is the default schema. If a qualified aggregate name is specified, the
-schema name cannot begin with SYS.</p>
+<codeblock><b>DROP DERBY AGGREGATE <i><xref 
+href="rrefaggregatename.dita#rrefaggregatename">aggregateName</xref></i> RESTRICT</b></codeblock>
 <p>The RESTRICT keyword is required. CASCADE semantics are not supported. That
 is, <ph conref="../conrefs.dita#prod/productshortname"></ph> will not track down
 and drop orphaned objects.</p>

Modified: db/derby/docs/trunk/src/ref/rrefsqljdropsequence.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljdropsequence.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljdropsequence.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljdropsequence.dita Mon Sep 30 14:23:19 2013
@@ -30,14 +30,9 @@ limitations under the License.
 <section><p>The DROP SEQUENCE statement removes a sequence generator that was
 created using a <xref href="rrefsqljcreatesequence.dita#rrefsqljcreatesequence"></xref>.</p></section>
 <refsyn><title>Syntax</title>
-<codeblock><b>DROP SEQUENCE [ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> RESTRICT
+<codeblock><b>DROP SEQUENCE <i><xref 
+href="rrefsequencename.dita#rrefsequencename">sequenceName</xref></i> RESTRICT
 </b></codeblock>
-<p>The sequence name is composed of an optional <i>schemaName</i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
-schema is the default schema. If a qualified sequence name is specified, the
-schema name cannot begin with SYS.</p>
 <p>The RESTRICT keyword is required. If a trigger or view references the
 sequence generator, <ph conref="../conrefs.dita#prod/productshortname"></ph>
 throws an exception.</p>

Modified: db/derby/docs/trunk/src/ref/rrefsqljdropsynonym.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljdropsynonym.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljdropsynonym.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljdropsynonym.dita Mon Sep 30 14:23:19 2013
@@ -26,7 +26,8 @@ limitations under the License.
 </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>
+<refsyn><title>Syntax</title> <codeblock><b>DROP SYNONYM <i><xref
+href="rrefsynonymname.dita#rrefsynonymname">synonymName</xref></i></b></codeblock> </refsyn>
 </refbody>
 </reference>
 

Modified: db/derby/docs/trunk/src/ref/rrefsqljdroptype.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljdroptype.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljdroptype.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljdroptype.dita Mon Sep 30 14:23:19 2013
@@ -33,13 +33,8 @@ created using a
 <xref href="rrefsqljcreatetype.dita#rrefsqljcreatetype"></xref>.</p>
 </section>
 <refsyn><title>Syntax</title>
-<codeblock><b>DROP TYPE [ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> RESTRICT</b></codeblock>
-<p>The type name is composed of an optional <i>schemaName</i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
-schema is the default schema. If a qualified type name is specified, the schema
-name cannot begin with SYS.</p>
+<codeblock><b>DROP TYPE <i><xref 
+href="rreftypename.dita#rreftypename">typeName</xref></i> RESTRICT</b></codeblock>
 <p>The RESTRICT keyword is required. CASCADE semantics are not supported. That
 is, <ph conref="../conrefs.dita#prod/productshortname"></ph> will not track down
 and drop orphaned objects.</p>

Modified: db/derby/docs/trunk/src/ref/rrefsqljgenerationclause.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljgenerationclause.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljgenerationclause.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljgenerationclause.dita Mon Sep 30 14:23:19 2013
@@ -18,22 +18,22 @@ See the License for the specific languag
 limitations under the License.
 -->
 <reference id="rrefsqljgenerationclause" xml:lang="en-us">
-<title>generation-clause</title>
+<title>generationClause</title>
 <refbody>
 <example>
-<codeblock><b>GENERATED ALWAYS AS ( <i>value-expression</i> )</b></codeblock>
-<p>A <i>value-expression</i> is an <i>Expression</i> that resolves to a single
+<codeblock><b>GENERATED ALWAYS AS ( <i>valueExpression</i> )</b></codeblock>
+<p>A <i>valueExpression</i> is an <i>expression</i> that resolves to a single
 value, with some limitations that are described here. See
 <xref href="rrefsqlj19433.dita#rrefsqlj19433"></xref> for more information
-about <i>Expression</i>s.
+about <i>expression</i>s.
 </p></example>
 <section><title>References</title>
-<p>The <i>generation-clause</i> may reference other non-generated columns in
+<p>The <i>generationClause</i> may reference other non-generated columns in
 the table, but it must not reference any generated column. The
-<i>generation-clause</i> must not reference a column in another table.</p>
+<i>generationClause</i> must not reference a column in another table.</p>
 </section>
 <section><title>Functions</title>
-<p>The <i>generation-clause</i> may invoke user-coded functions, if the
+<p>The <i>generationClause</i> may invoke user-coded functions, if the
 functions meet the following requirements:</p>
 <ul>
 <li>The functions must not read or write SQL data.</li>
@@ -54,7 +54,7 @@ non-deterministic system functions:
 </ul>
 </section>
 <section><title>Subqueries</title>
-<p>The <i>generation-clause</i> must not include subqueries.</p>
+<p>The <i>generationClause</i> must not include subqueries.</p>
 </section>
 <section><title>Foreign keys</title>
 <p>If the generated column is part of a foreign key that references another

Modified: db/derby/docs/trunk/src/ref/rrefsqljgrant.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljgrant.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljgrant.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljgrant.dita Mon Sep 30 14:23:19 2013
@@ -43,8 +43,8 @@ from a table.</li>
 <li>Use a sequence generator, a user-defined type, or a user-defined
 aggregate.</li>
 </ul></p><p>Before you issue a GRANT statement, check that the
-<codeph><xref href="rrefpropersqlauth.dita#rrefpropersqlauth">derby.database.sqlAuthorization</xref></codeph> property
-is set to <codeph>true</codeph>. The <codeph>derby.database.sqlAuthorization</codeph> property
+<i><xref href="rrefpropersqlauth.dita#rrefpropersqlauth">derby.database.sqlAuthorization</xref></i> property
+is set to <codeph>true</codeph>. The <i>derby.database.sqlAuthorization</i> property
 enables the SQL Authorization mode.</p><p>You can grant privileges on an
 object if you are the owner of the object or the
 <xref href="rrefattrib26867.dita#rrefattrib26867">database owner</xref>. See the
@@ -55,52 +55,47 @@ privileges to a schema object or grantin
 <p>For more information on using the GRANT statement, see "Using SQL standard
 authorization" in the <ph conref="../conrefs.dita#pub/citdevelop"></ph>.</p>
 </section>
-<section><title>Syntax for tables</title><codeblock><b>GRANT <i><xref href="rrefsqljgrant.dita#rrefsqljgrant/grantprivtype">privilege-type</xref></i
-> ON [TABLE] { <i><xref href="rreftablename.dita#rreftablename"></xref></i> | <i><xref
+<section><title>Syntax for tables</title><codeblock><b>GRANT <i><xref href="rrefsqljgrant.dita#rrefsqljgrant/grantprivtype">privilegeType</xref></i
+> ON [ TABLE ] { <i><xref href="rreftablename.dita#rreftablename"></xref></i> | <i><xref
 href="rrefviewname.dita#rrefviewname"></xref></i> } TO <i><xref href="rrefsqljgrant.dita#rrefsqljgrant/grantgrantees">grantees</xref></i></b></codeblock
 ></section>
-<section><title>Syntax for routines</title><codeblock><b>GRANT EXECUTE ON { FUNCTION | PROCEDURE } <i><xref
-href="rrefsqljgrant.dita#rrefsqljgrant/grantroutinename">routine-designator</xref></i> TO <i><xref
-href="rrefsqljgrant.dita#rrefsqljgrant/grantgrantees">grantees</xref></i></b></codeblock></section>
+<section><title>Syntax for routines</title>
+<codeblock><b>GRANT EXECUTE ON FUNCTION <i><xref
+href="rreffunctionname.dita#rreffunctionname">functionName</xref></i> TO <i><xref
+href="rrefsqljgrant.dita#rrefsqljgrant/grantgrantees">grantees</xref></i></b>
+</codeblock>
+<codeblock><b>GRANT EXECUTE ON PROCEDURE <i><xref
+href="rrefprocedurename.dita#rrefprocedurename.dita">procedureName</xref></i> TO <i><xref
+href="rrefsqljgrant.dita#rrefsqljgrant/grantgrantees">grantees</xref></i></b>
+</codeblock>
+</section>
 <section id="grantsequencesyn"><title>Syntax for sequence generators</title>
-<codeblock><b>GRANT USAGE ON SEQUENCE [ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> TO <i><xref href="rrefsqljgrant.dita#rrefsqljgrant/grantgrantees">grantees</xref></i></b></codeblock>
+<codeblock><b>GRANT USAGE ON SEQUENCE <i><xref 
+href="rrefsequencename.dita#rrefsequencename">sequenceName</xref></i> TO <i><xref href="rrefsqljgrant.dita#rrefsqljgrant/grantgrantees">grantees</xref></i></b></codeblock>
 <p>In order to use a sequence generator, you must have the USAGE privilege on
 it. This privilege can be granted to users and to roles. See 
 <xref href="rrefsqljcreatesequence.dita#rrefsqljcreatesequence"></xref> for more
 information.</p>
-<p>The sequence name is composed of an optional <i>schemaName</i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
-schema is the default schema. If a qualified sequence name is specified, the
-schema name cannot begin with SYS.</p></section>
+</section>
 <section id="granttypesyn"><title>Syntax for user-defined types</title>
-<codeblock><b>GRANT USAGE ON TYPE [ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> TO <i><xref href="rrefsqljgrant.dita#rrefsqljgrant/grantgrantees">grantees</xref></i></b></codeblock>
+<codeblock><b>GRANT USAGE ON TYPE <i><xref 
+href="rreftypename.dita#rreftypename">typeName</xref></i> TO <i><xref href="rrefsqljgrant.dita#rrefsqljgrant/grantgrantees">grantees</xref></i></b></codeblock>
 <p>In order to use a user-defined type, you must have the USAGE privilege on
 it. This privilege can be granted to users and to roles. See 
 <xref href="rrefsqljcreatetype.dita#rrefsqljcreatetype"></xref> for more
 information.</p>
-<p>The type name is composed of an optional <i>schemaName</i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
-schema is the default schema. If a qualified type name is specified, the schema
-name cannot begin with SYS.</p></section>
+</section>
 <section id="grantaggsyn"><title>Syntax for user-defined aggregates</title>
-<codeblock><b>GRANT USAGE ON DERBY AGGREGATE [ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> TO <i><xref href="rrefsqljgrant.dita#rrefsqljgrant/grantgrantees">grantees</xref></i></b></codeblock>
+<codeblock><b>GRANT USAGE ON DERBY AGGREGATE <i><xref 
+href="rrefaggregatename.dita#rrefaggregatename">aggregateName</xref></i> TO <i><xref href="rrefsqljgrant.dita#rrefsqljgrant/grantgrantees">grantees</xref></i></b></codeblock>
 <p>In order to use a user-defined aggregate, you must have the USAGE privilege
 on it. This privilege can be granted to users and to roles. See 
 <xref href="rrefsqljcreateaggregate.dita#rrefsqljcreateaggregate"></xref> for
 more information.</p>
-<p>The aggregate name is composed of an optional <i>schemaName</i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
-schema is the default schema. If a qualified aggregate name is specified, the
-schema name cannot begin with SYS.</p></section>
+</section>
 <section id="grantrolesyn"><title>Syntax for roles</title>
-<codeblock><b>GRANT <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> [ {, <i><xref
-href="rrefrolename.dita#rrefrolename">roleName</xref></i> }* ] TO <i><xref 
+<codeblock><b>GRANT <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> [ , <i><xref
+href="rrefrolename.dita#rrefrolename">roleName</xref></i> ]* TO <i><xref 
 href="rrefsqljgrant.dita#rrefsqljgrant/grantgrantees">grantees</xref></i></b></codeblock>
 <p>Before you can grant a role to a user or to another role, you must create the
 role using the <xref href="rrefcreaterole.dita#rrefcreaterole">CREATE ROLE
@@ -113,38 +108,47 @@ are inherited by the containing roles. S
 role A is the union of the privileges granted to role A and the privileges
 granted to any contained roles of role A.</p>
 </section>
-<section id="grantprivtype"><title>privilege-types</title><codeblock><b>  ALL PRIVILEGES |
-  privilege-list
+<section id="grantprivtype"><title>privilegeType</title>
+<codeblock><b> { ALL PRIVILEGES | <i><xref
+href="rrefsqljgrant.dita#rrefsqljgrant/grantprivlist">privilegeList</xref></i> }
 </b></codeblock></section>
-<section id="grantprivlist"><title>privilege-list</title><codeblock><b> table-privilege {, table-privilege }*
+<section id="grantprivlist"><title>privilegeList</title>
+<codeblock><b> <i><xref
+href="rrefsqljgrant.dita#rrefsqljgrant/granttablepriv">tablePrivilege</xref></i> [ , <i><xref
+href="rrefsqljgrant.dita#rrefsqljgrant/granttablepriv">tablePrivilege</xref></i> ]*
 </b></codeblock></section>
-<section id="granttablepriv"><title>table-privilege</title><codeblock><b>  DELETE |
+<section id="granttablepriv"><title>tablePrivilege</title>
+<codeblock><b>  DELETE |
   INSERT |
-  REFERENCES [<i>column list</i>] |
-  SELECT [<i>column list</i>] |
+  REFERENCES [ <i><xref
+href="rrefsqljgrant.dita#rrefsqljgrant/grantcollist">columnList</xref></i> ] |
+  SELECT [ <i><xref
+href="rrefsqljgrant.dita#rrefsqljgrant/grantcollist">columnList</xref></i> ] |
   TRIGGER |
-  UPDATE [<i>column list</i>]
+  UPDATE [ <i><xref
+href="rrefsqljgrant.dita#rrefsqljgrant/grantcollist">columnList</xref></i> ]
 </b></codeblock></section>
-<section id="grantcollist"><title>column list</title><codeblock><b>  ( column-identifier {, column-identifier}* )
+<section id="grantcollist"><title>columnList</title>
+<codeblock><b>  ( <i>columnIdentifier</i> [ , <i>columnIdentifier</i> ]* )
 </b></codeblock></section>
 <section><p>Use the ALL PRIVILEGES privilege type to grant all of the privileges
 to the user or role for the specified table. You can also grant one or more table
-privileges by specifying a privilege-list.</p><p>Use the DELETE privilege
+privileges by specifying a <i>privilegeList</i>.</p><p>Use the DELETE privilege
 type to grant permission to delete rows from the specified table.</p><p>Use
 the INSERT privilege type to grant permission to insert rows into the specified
 table.</p><p>Use the REFERENCES privilege type to grant permission to create
-a foreign key reference to the specified table. If a column list is specified
+a foreign key reference to the specified table. If a <i>columnList</i> is specified
 with the REFERENCES privilege, the permission is valid on only the foreign
 key reference to the specified columns.</p><p>Use the SELECT privilege type
 to grant permission to perform
 <xref href="rrefsqlj41360.dita#rrefsqlj41360">SELECT statements</xref> or
-<i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpressions</xref></i>
+<i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpressions</xref></i>
 on a table or view. If a
 column list is specified with the SELECT privilege, the permission is valid
 on only those columns. If no column list is specified, then the privilege
 is valid on all of the columns in the table.</p>
 <p>For queries that do not select a specific column from the tables involved in
-a SELECT statement or <i>SelectExpression</i> (for example, queries that use
+a SELECT statement or <i>selectExpression</i> (for example, queries that use
 <codeph>COUNT(*)</codeph>), the user must have at least one column-level SELECT
 privilege or table-level SELECT privilege.</p>
 <p>Use the TRIGGER privilege
@@ -155,8 +159,8 @@ only to the specified columns. To update
 a WHERE clause, you must have the SELECT privilege on the columns in the row
 that you want to update. </p></section>
 <section id="grantgrantees"><title>grantees</title>
-<codeblock><b>{ <i><xref href="rrefrauthid.dita#rrefrauthid">AuthorizationIdentifier</xref></i> | <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> | PUBLIC } 
-[, { <i><xref href="rrefrauthid.dita#rrefrauthid">AuthorizationIdentifier</xref></i> | <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> | PUBLIC } ] *</b></codeblock>
+<codeblock><b>{ <i><xref href="rrefrauthid.dita#rrefrauthid">authorizationIdentifier</xref></i> | <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> | PUBLIC } 
+[ , { <i><xref href="rrefrauthid.dita#rrefrauthid">authorizationIdentifier</xref></i> | <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> | PUBLIC } ]*</b></codeblock>
 <p>You can grant privileges or roles to specific users or roles or to all users.
 Use the keyword PUBLIC to specify all users. When PUBLIC is specified, the
 privileges or roles affect all current and future users. The privileges granted
@@ -168,9 +172,6 @@ access the table <codeph>t</codeph> thro
 <p>Either the object owner or the database owner can grant privileges to a user
 or to a role. Only the database owner can grant a role to a user or to another
 role.</p></section>
-<section id="grantroutinename"><title>routine-designator</title><codeblock><b>{
-	<i>function-name</i> | <i>procedure-name</i>
-}</b></codeblock></section>
 <example id="grantexamples"><title>Examples</title><p>To grant the SELECT
 privilege on table <codeph>t</codeph> to the authorization IDs <codeph>maria</codeph> and <codeph>harry</codeph>,
 use the following syntax:<codeblock><b>GRANT SELECT ON TABLE t TO maria,harry</b> </codeblock></p><p>To

Modified: db/derby/docs/trunk/src/ref/rrefsqljnaturaljoin.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljnaturaljoin.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljnaturaljoin.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljnaturaljoin.dita Mon Sep 30 14:23:19 2013
@@ -68,7 +68,12 @@ the column in the second (right) table.
 
 <refsyn>
 <title>Syntax</title>
-<codeblock><b><i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> NATURAL [ { LEFT | RIGHT } [ OUTER ] | INNER ] JOIN { <xref href="rrefsqlj33215.dita#rrefsqlj33215">TableViewOrFunctionExpression</xref> | ( <i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> ) }</b></codeblock>
+<codeblock><b><i><xref
+href="rreftableexpression.dita#rreftableexpression">tableExpression</xref></i> NATURAL [ { LEFT | RIGHT } [ OUTER ] | INNER ] JOIN
+{ 
+    <i><xref href="rrefsqlj33215.dita#rrefsqlj33215">tableViewOrFunctionExpression</xref></i> |
+    ( <i><xref href="rreftableexpression.dita#rreftableexpression">tableExpression</xref></i> )
+}</b></codeblock>
 </refsyn>
 
 <example>

Modified: db/derby/docs/trunk/src/ref/rrefsqljnextvaluefor.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljnextvaluefor.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljnextvaluefor.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljnextvaluefor.dita Mon Sep 30 14:23:19 2013
@@ -31,7 +31,7 @@ limitations under the License.
 sequence generator that was created with a
 <xref href="rrefsqljcreatesequence.dita#rrefsqljcreatesequence"></xref>.</p></section>
 <refsyn><title>Syntax</title>
-<codeblock><b>NEXT VALUE FOR <i><xref href="rrefsqljnextvaluefor.dita#rrefsqljnextvaluefor/rrefsqljnvfsequencename">sequenceName</xref></i></b></codeblock>
+<codeblock><b>NEXT VALUE FOR <i><xref href="rrefsequencename.dita#rrefsequencenamerrefsequencename">sequenceName</xref></i></b></codeblock>
 <p>If this is the first use of the sequence generator, the generator returns its
 START value. Otherwise, the INCREMENT value is added to the previous value
 returned by the sequence generator. The data type of the value is the
@@ -72,13 +72,6 @@ commits or rolls back a transaction whic
 <li>DISTINCT select list</li>
 </ul>
 </refsyn>
-<section id="rrefsqljnvfsequencename"><title>sequenceName</title>
-<codeblock><b>[ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
-<p>If <i>schemaName</i> is not provided, the current schema is the default
-schema. If a qualified sequence name is specified, the schema name cannot
-begin with SYS.</p></section>
 <example><title>Examples</title>
 <codeblock><b>VALUES (NEXT VALUE FOR order_id);</b></codeblock>
 <codeblock><b>INSERT INTO re_order_table

Modified: db/derby/docs/trunk/src/ref/rrefsqljoffsetfetch.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljoffsetfetch.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljoffsetfetch.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljoffsetfetch.dita Mon Sep 30 14:23:19 2013
@@ -47,11 +47,9 @@ limitations under the License.
 
 <refsyn>
   <title>Syntax</title> 
-  <codeblock><b>OFFSET { <i>integer-literal</i> | ? } {ROW | ROWS}
-    </b></codeblock> 
+  <codeblock><b>OFFSET { <i>integerLiteral</i> | ? } { ROW | ROWS }</b></codeblock> 
 
-  <codeblock><b>FETCH { FIRST | NEXT } [<i>integer-literal</i> | ? ] {ROW | ROWS} ONLY
-    </b></codeblock> 
+  <codeblock><b>FETCH { FIRST | NEXT } [ <i>integerLiteral</i> | ? ] { ROW | ROWS } ONLY</b></codeblock> 
 <p>
 ROW is synonymous with ROWS and FIRST is synonymous with NEXT.
 </p>

Modified: db/derby/docs/trunk/src/ref/rrefsqljrenamecolumnstatement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljrenamecolumnstatement.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljrenamecolumnstatement.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljrenamecolumnstatement.dita Mon Sep 30 14:23:19 2013
@@ -36,7 +36,7 @@ see <xref href="rrefsqlj81859.dita#rrefs
 for more information.</p>
 </section>
 <refsyn><title>Syntax</title>
-    <codeblock><b>RENAME COLUMN <i><xref href="rreftablename.dita">table-Name</xref></i>.<i><xref href="rrefsimplecolumnname.dita">simple-Column-Name</xref></i> TO <i><xref href="rrefsimplecolumnname.dita">simple-Column-Name</xref></i></b></codeblock>
+    <codeblock><b>RENAME COLUMN <i><xref href="rreftablename.dita">tableName</xref></i>.<i><xref href="rrefsimplecolumnname.dita">simpleColumnName</xref></i> TO <i><xref href="rrefsimplecolumnname.dita">simpleColumnName</xref></i></b></codeblock>
 </refsyn>
 <example id="renamecolumnexamples">
 <title>Examples</title>
@@ -56,7 +56,9 @@ new data type <i>NEWTYPE</i>:
 </example>
 <section><title>Usage notes</title>
 <note type="restriction">If a view, trigger, check constraint, foreign key
-constraint, or <i>generation-clause</i> of a generated column references the
+constraint, or <i><xref
+href="rrefsqljgenerationclause.dita#rrefsqljgenerationclause">generationClause</xref></i>
+of a generated column references the
 column, an attempt to rename it will generate an error.</note>
 <note type="restriction">The RENAME COLUMN statement
 is not allowed if there are any open cursors that reference the column that

Modified: db/derby/docs/trunk/src/ref/rrefsqljrenametablestatement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljrenametablestatement.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljrenametablestatement.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljrenametablestatement.dita Mon Sep 30 14:23:19 2013
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY 
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<reference id="rrefsqljrenamestatements" xml:lang="en-us">
+<reference id="rrefsqljrenametablestatement" xml:lang="en-us">
 <title>RENAME TABLE statement </title>
 <prolog><metadata>
 <keywords><indexterm>RENAME TABLE statement</indexterm><indexterm><indexterm>SQL
@@ -30,8 +30,9 @@ statements</indexterm>RENAME TABLE</inde
 be the 
 <xref href="rrefattrib26867.dita#rrefattrib26867">database owner</xref>
 or the table owner.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>RENAME TABLE <i>table-Name</i> TO <i><xref
-href="rrefnewtablename.dita#rrefnewtablename">new-Table-Name</xref></i></b></codeblock> <p>If
+<refsyn><title>Syntax</title> <codeblock><b>RENAME TABLE <i><xref
+href="rreftablename.dita#rreftablename">tableName</xref></i> TO <i><xref
+href="rrefnewtablename.dita#rrefnewtablename">newTableName</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: db/derby/docs/trunk/src/ref/rrefsqljrevoke.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljrevoke.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljrevoke.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljrevoke.dita Mon Sep 30 14:23:19 2013
@@ -42,10 +42,10 @@ from a table.</li>
 <li>Use a sequence generator, a user-defined type, or a user-defined
 aggregate.</li>
 </ul></p><p>The
-<codeph><xref href="rrefpropersqlauth.dita#rrefpropersqlauth">derby.database.sqlAuthorization</xref></codeph>
+<i><xref href="rrefpropersqlauth.dita#rrefpropersqlauth">derby.database.sqlAuthorization</xref></i>
 property must be set to <codeph>true</codeph> before you can use the GRANT
 statement or the REVOKE statement. The
-<codeph>derby.database.sqlAuthorization</codeph> property
+<i>derby.database.sqlAuthorization</i> property
 enables SQL Authorization mode.</p><p>You can revoke privileges for an
 object if you are the owner of the object or the  <xref href="rrefattrib26867.dita#rrefattrib26867">database
 owner</xref>.</p><p>The syntax that you use for the REVOKE statement depends
@@ -54,22 +54,26 @@ role.</p>
 <p>For more information on using the REVOKE statement, see "Using SQL standard
 authorization" in the <ph conref="../conrefs.dita#pub/citdevelop"></ph>.</p>
 </section>
-<section><title>Syntax for tables</title><codeblock><b>REVOKE <i><xref href="rrefsqljrevoke.dita#rrefsqljrevoke/revokeprivtype">privilege-type</xref
+<section><title>Syntax for tables</title><codeblock><b>REVOKE <i><xref href="rrefsqljrevoke.dita#rrefsqljrevoke/revokeprivtype">privilegeType</xref
 ></i> ON [ TABLE ] { <i><xref href="rreftablename.dita#rreftablename"></xref></i> | <i><xref
-href="rrefviewname.dita#rrefviewname"></xref></i> } FROM <i><xref href="rrefsqljrevoke.dita#rrefsqljrevoke/revokegrantees">grantees</xref></i></b
+href="rrefviewname.dita#rrefviewname"></xref></i> } FROM <i><xref href="rrefsqljrevoke.dita#rrefsqljrevoke/revokerevokees">revokees</xref></i></b
 ></codeblock><p>Revoking a privilege without specifying a column list revokes
 the privilege for all of the columns in the table. </p></section>
-<section><title>Syntax for routines</title><codeblock><b>REVOKE EXECUTE ON { FUNCTION | PROCEDURE } <i><xref
-href="rrefsqljrevoke.dita#rrefsqljrevoke/revokeroutinename">routine-designator</xref></i> FROM <i><xref
-href="rrefsqljrevoke.dita#rrefsqljrevoke/revokegrantees">grantees</xref> </i> RESTRICT</b></codeblock><p>You
+<section><title>Syntax for routines</title>
+<codeblock><b>REVOKE EXECUTE ON FUNCTION <i><xref
+href="rreffunctionname.dita#rreffunctionname">functionName</xref></i> FROM <i><xref
+href="rrefsqljrevoke.dita#rrefsqljrevoke/revokerevokees">revokees</xref></i> RESTRICT</b></codeblock>
+<codeblock><b>REVOKE EXECUTE ON PROCEDURE <i><xref
+href="rrefprocedurename.dita#rrefprocedurename.dita">procedureName</xref></i> FROM <i><xref
+href="rrefsqljrevoke.dita#rrefsqljrevoke/revokerevokees">revokees</xref></i> RESTRICT</b></codeblock>
+<p>You
 must use the RESTRICT clause on REVOKE statements for routines. The RESTRICT
 clause specifies that the EXECUTE privilege cannot be revoked if the specified
 routine is used in a view, trigger, or constraint, and the privilege is being
 revoked from the owner of the view, trigger, or constraint.</p></section>
 <section id="revokesequencesyn"><title>Syntax for sequence generators</title>
-<codeblock><b>REVOKE USAGE ON SEQUENCE [ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> FROM <i><xref href="rrefsqljrevoke.dita#rrefsqljrevoke/revokegrantees">grantees</xref></i> RESTRICT</b></codeblock>
+<codeblock><b>REVOKE USAGE ON SEQUENCE <i><xref 
+href="rrefsequencename.dita#rrefsequencename">sequenceName</xref></i> FROM <i><xref href="rrefsqljrevoke.dita#rrefsqljrevoke/revokerevokees">revokees</xref></i> RESTRICT</b></codeblock>
 <p>In order to use a sequence generator, you must have the USAGE privilege on
 it. This privilege can be revoked from users and roles. Only RESTRICTed revokes
 are allowed. This means that the REVOKE statement cannot make a view, trigger,
@@ -77,14 +81,10 @@ or constraint unusable by its owner. The
 the schema owner. See
 <xref href="rrefsqljcreatesequence.dita#rrefsqljcreatesequence"></xref> for more
 information.</p>
-<p>The sequence name is composed of an optional <i>schemaName</i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
-schema is the default schema. If a qualified sequence name is specified, the
-schema name cannot begin with SYS.</p></section>
+</section>
 <section id="revoketypesyn"><title>Syntax for user-defined types</title>
-<codeblock><b>REVOKE USAGE ON TYPE  [ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> FROM <i><xref href="rrefsqljrevoke.dita#rrefsqljrevoke/revokegrantees">grantees</xref></i> RESTRICT</b></codeblock>
+<codeblock><b>REVOKE USAGE ON TYPE <i><xref 
+href="rreftypename.dita#rreftypename">typeName</xref></i> FROM <i><xref href="rrefsqljrevoke.dita#rrefsqljrevoke/revokerevokees">revokees</xref></i> RESTRICT</b></codeblock>
 <p>In order to use a user-defined type, you must have the USAGE privilege on
 it. This privilege can be revoked from users and roles. Only RESTRICTed revokes
 are allowed. This means that the REVOKE statement cannot make a view, trigger,
@@ -92,14 +92,10 @@ or constraint unusable by its owner. The
 the schema owner. See
 <xref href="rrefsqljcreatetype.dita#rrefsqljcreatetype"></xref> for more
 information.</p>
-<p>The type name is composed of an optional <i>schemaName</i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
-schema is the default schema. If a qualified type name is specified, the schema
-name cannot begin with SYS.</p></section>
+</section>
 <section id="revokeaggsyn"><title>Syntax for user-defined aggregates</title>
-<codeblock><b>REVOKE USAGE ON DERBY AGGREGATE  [ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> FROM <i><xref href="rrefsqljrevoke.dita#rrefsqljrevoke/revokegrantees">grantees</xref></i> RESTRICT</b></codeblock>
+<codeblock><b>REVOKE USAGE ON DERBY AGGREGATE <i><xref 
+href="rrefaggregatename.dita#rrefaggregatename">aggregateName</xref></i> FROM <i><xref href="rrefsqljrevoke.dita#rrefsqljrevoke/revokerevokees">revokees</xref></i> RESTRICT</b></codeblock>
 <p>In order to use a user-defined aggregate, you must have the USAGE privilege
 on it. This privilege can be revoked from users and roles. Only RESTRICTed
 revokes are allowed. This means that the REVOKE statement cannot make a view or
@@ -107,30 +103,39 @@ trigger unusable by its owner. The USAGE
 schema owner. See
 <xref href="rrefsqljcreateaggregate.dita#rrefsqljcreateaggregate"></xref> for
 more information.</p>
-<p>The aggregate name is composed of an optional <i>schemaName</i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
-schema is the default schema. If a qualified aggregate name is specified, the
-schema name cannot begin with SYS.</p></section>
+</section>
 <section><title>Syntax for roles</title>
-<codeblock><b>REVOKE <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> [ {, <i><xref
-href="rrefrolename.dita#rrefrolename">roleName</xref></i> }* ] FROM <i><xref 
-href="rrefsqljrevoke.dita#rrefsqljrevoke/revokegrantees">grantees</xref></i></b></codeblock>
+<codeblock><b>REVOKE <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> [ , <i><xref
+href="rrefrolename.dita#rrefrolename">roleName</xref></i> ]* FROM <i><xref 
+href="rrefsqljrevoke.dita#rrefsqljrevoke/revokerevokees">revokees</xref></i></b></codeblock>
 <p>Only the <xref href="rrefattrib26867.dita#rrefattrib26867">database
 owner</xref> can revoke a role.</p>
 </section>
-<section id="revokeprivtype"><title>privilege-types</title><codeblock><b>  ALL PRIVILEGES |
-  privilege-list </b></codeblock></section>
-<section id="revokeprivlist"><title>privilege-list</title><codeblock><b>  table-privilege {, table-privilege }* </b></codeblock></section>
-<section id="revoketablepriv"><title>table-privilege</title><codeblock><b>  DELETE |
+<section id="revokeprivtype"><title>privilegeType</title>
+<codeblock><b>  ALL PRIVILEGES | <i><xref
+href="rrefsqljrevoke.dita#rrefsqljrevoke/revokeprivlist">privilegeList</xref></i>
+</b></codeblock></section>
+<section id="revokeprivlist"><title>privilegeList</title>
+<codeblock><b> <i><xref
+href="rrefsqljrevoke.dita#rrefsqljrevoke/revoketablepriv">tablePrivilege</xref></i> [ , <i><xref
+href="rrefsqljrevoke.dita#rrefsqljrevoke/revoketablepriv">tablePrivilege</xref></i> ]*
+</b></codeblock></section>
+<section id="revoketablepriv"><title>tablePrivilege</title>
+<codeblock><b>  DELETE |
   INSERT |
-  REFERENCES [<i>column list</i>] |
-  SELECT [<i>column list</i>] |
+  REFERENCES [ <i><xref
+href="rrefsqljrevoke.dita#rrefsqljrevoke/revokecollist">columnList</xref></i> ] |
+  SELECT [ <i><xref
+href="rrefsqljrevoke.dita#rrefsqljrevoke/revokecollist">columnList</xref></i> ] |
   TRIGGER |
-  UPDATE [<i>column list</i>] </b></codeblock></section>
-<section id="revokecollist"><title>column list</title><codeblock><b>  ( column-identifier {, column-identifier}* ) </b></codeblock></section>
+  UPDATE [ <i><xref
+href="rrefsqljrevoke.dita#rrefsqljrevoke/revokecollist">columnList</xref></i> ]
+</b></codeblock></section>
+<section id="revokecollist"><title>columnList</title>
+<codeblock><b>  ( <i>columnIdentifier</i> [ , <i>columnIdentifier</i> ]* ) </b></codeblock></section>
 <section><p>Use the ALL PRIVILEGES privilege type to revoke all of the privileges
 from the user or role for the specified table. You can also revoke one or more table
-privileges by specifying a privilege-list.</p><p>Use the DELETE privilege
+privileges by specifying a <i>privilegeList</i>.</p><p>Use the DELETE privilege
 type to revoke permission to delete rows from the specified table.</p><p>Use
 the INSERT privilege type to revoke permission to insert rows into the specified
 table.</p><p>Use the REFERENCES privilege type to revoke permission to create
@@ -145,13 +150,13 @@ type to revoke permission to create a tr
 the UPDATE privilege type to revoke permission to use the UPDATE statement
 on the specified table. If a column list is specified, the privilege is revoked
 only on the specified columns.</p></section>
-<section id="revokegrantees"><title>grantees</title>
-<codeblock><b>{ <i><xref href="rrefrauthid.dita#rrefrauthid">AuthorizationIdentifier</xref></i> | <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> | PUBLIC } 
-[,{ <i><xref href="rrefrauthid.dita#rrefrauthid">AuthorizationIdentifier</xref></i> | <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> | PUBLIC } ] *</b
+<section id="revokerevokees"><title>revokees</title>
+<codeblock><b>{ <i><xref href="rrefrauthid.dita#rrefrauthid">authorizationIdentifier</xref></i> | <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> | PUBLIC } 
+[ , { <i><xref href="rrefrauthid.dita#rrefrauthid">authorizationIdentifier</xref></i> | <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> | PUBLIC } ]*</b
 ></codeblock><p>You can revoke the privileges from specific users or roles or from
 all users. Use the keyword PUBLIC to specify all users. The privileges revoked
 from PUBLIC and from individual users or roles are independent privileges. For example,
-a SELECT privilege on table <codeph>t</codeph> is granted to both PUBLIC and
+a SELECT privilege on table <codeph>t</codeph> is revokeed to both PUBLIC and
 to the authorization ID <codeph>harry</codeph>. The SELECT privilege is later
 revoked from the authorization ID <codeph>harry</codeph>, but the authorization
 ID <codeph>harry</codeph> can access the table <codeph>t</codeph> through
@@ -159,16 +164,6 @@ the PUBLIC privilege.</p>
 <p>You can revoke a role from a role, from a user, or from PUBLIC.</p>
 <note type="restriction">You cannot revoke the privileges
 of the owner of an object.</note></section>
-<section id="revokeroutinename"><title>routine-designator</title><codeblock><b>  {
-   <i>qualified-name</i> [ signature ]
-  }</b></codeblock></section>
-<section id="rrefsqljrevseqsequencename"><title>sequenceName</title>
-<codeblock><b>[ <i><xref 
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
-<p>If <i>schemaName</i> is not provided, the current schema is the default
-schema. If a qualified sequence name is specified, the schema name cannot
-begin with SYS.</p></section>
 <section>
   <title>Prepared statements and open result sets/cursors</title>
   <p>
@@ -196,13 +191,13 @@ authorization" and "Privileges on views,
 <section><title>Limitations</title><p>The following limitations apply to the
 REVOKE statement:</p><dl><dlentry>
 <dt>Table-level privileges</dt>
-<dd>All of the table-level privilege types for a specified grantee and table
+<dd>All of the table-level privilege types for a specified revokeee and table
 ID are stored in one row in the SYSTABLEPERMS system table. For example, when <codeph>user2</codeph> is
-granted the SELECT and DELETE privileges on table <codeph>user1.t1</codeph>,
+revokeed the SELECT and DELETE privileges on table <codeph>user1.t1</codeph>,
 a row is added to the SYSTABLEPERMS table. The GRANTEE field contains <codeph>user2</codeph> and
 the TABLEID contains <codeph>user1.t1</codeph>. The SELECTPRIV and DELETEPRIV
 fields are set to Y. The remaining privilege type fields are set to N.<p>When
-a grantee creates an object that relies on one of the privilege types, the <ph
+a revokeee creates an object that relies on one of the privilege types, the <ph
 conref="../conrefs.dita#prod/productshortname"></ph> engine tracks the dependency
 of the object on the specific row in the SYSTABLEPERMS table. For example, <codeph>user2</codeph> creates
 the view <codeph>v1</codeph> by using the statement <codeph>SELECT * FROM
@@ -211,8 +206,8 @@ the row in SYSTABLEPERMS for GRANTEE(<co
 The dependency manager knows only that the view is dependent on a privilege
 type in that specific row, but does not track exactly which privilege type
 the view is dependent on.</p><p>When a REVOKE statement for a table-level
-privilege is issued for a grantee and table ID, all of the objects that are
-dependent on the grantee and table ID are dropped. For example, if <codeph>user1</codeph> revokes
+privilege is issued for a revokeee and table ID, all of the objects that are
+dependent on the revokeee and table ID are dropped. For example, if <codeph>user1</codeph> revokes
 the DELETE privilege on table <codeph>t1</codeph> from <codeph>user2</codeph>,
 the row in SYSTABLEPERMS for GRANTEE(<codeph>user2</codeph>), TABLEID(<codeph>user1.t1</codeph>)
 is modified by the REVOKE statement. The dependency manager sends a revoke
@@ -221,12 +216,12 @@ dropped even though the view is not depe
 GRANTEE(<codeph>user2</codeph>), TABLEID(<codeph>user1.t1</codeph>).</p></dd>
 </dlentry><dlentry>
 <dt>Column-level privileges</dt>
-<dd>Only one type of privilege for a specified grantee and table ID are stored
+<dd>Only one type of privilege for a specified revokeee and table ID are stored
 in one row in the SYSCOLPERMS system table. For example, when <codeph>user2</codeph> is
-granted the SELECT privilege on table <codeph>user1.t1</codeph> for columns
+revokeed the SELECT privilege on table <codeph>user1.t1</codeph> for columns
 c12 and c13, a row is added to the SYSCOLPERMS. The GRANTEE field contains <codeph>user2</codeph>,
 the TABLEID contains <codeph>user1.t1</codeph>, the TYPE field contains <codeph>S</codeph>,
-and the COLUMNS field contains <codeph>c12, c13</codeph>.<p>When a grantee
+and the COLUMNS field contains <codeph>c12, c13</codeph>.<p>When a revokeee
 creates an object that relies on the privilege type and the subset of columns
 in a table ID, the <ph conref="../conrefs.dita#prod/productshortname"></ph> engine
 tracks the dependency of the object on the specific row in the SYSCOLPERMS
@@ -236,8 +231,8 @@ manager tracks the dependency of view <c
 for GRANTEE(<codeph>user2</codeph>), TABLEID(<codeph>user1.t1</codeph>), TYPE(S).
 The dependency manager knows that the view is dependent on the SELECT privilege
 type, but does not track exactly which columns the view is dependent on.</p><p>When
-a REVOKE statement for a column-level privilege is issued for a grantee, table
-ID, and type, all of the objects that are dependent on the grantee, table
+a REVOKE statement for a column-level privilege is issued for a revokeee, table
+ID, and type, all of the objects that are dependent on the revokeee, table
 ID, and type are dropped. For example, if <codeph>user1</codeph> revokes the
 SELECT privilege on column <codeph>c12</codeph> on table <codeph>user1.t1</codeph> from <codeph>user2</codeph>,
 the row in SYSCOLPERMS for GRANTEE(<codeph>user2</codeph>), TABLEID(<codeph>user1.t1</codeph>),

Modified: db/derby/docs/trunk/src/ref/rrefsqljtfinvoke.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljtfinvoke.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljtfinvoke.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljtfinvoke.dita Mon Sep 30 14:23:19 2013
@@ -19,11 +19,11 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefsqljtfinvoke" xml:lang="en-us">
-<title>TableFunctionInvocation</title>
+<title>tableFunctionInvocation</title>
 <refbody>
 <example>
 <codeblock>
-<b>TABLE <i>function-name</i>( [ [ function-arg ] [, function-arg ]* ] )
+<b>TABLE <i>tableFunctionName</i>( [ [ <i>functionArg</i> ] [, <i>functionArg</i> ]* ] )
 </b></codeblock>
 <p>
 Note that when you invoke a table function, you must bind it to a

Modified: db/derby/docs/trunk/src/ref/rrefsqljtruncatetable.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljtruncatetable.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljtruncatetable.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljtruncatetable.dita Mon Sep 30 14:23:19 2013
@@ -34,7 +34,7 @@ be the 
 or the table owner.</p>
 <p>You cannot truncate system tables or global temporary tables with this statement.</p>
 </section>
-<refsyn><title>Syntax</title> <codeblock><b>TRUNCATE TABLE <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i></b></codeblock>
+<refsyn><title>Syntax</title> <codeblock><b>TRUNCATE TABLE <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i></b></codeblock>
 </refsyn>
 <example><title>Examples</title>
 <p>To truncate the entire <codeph>Flights</codeph> table,

Modified: db/derby/docs/trunk/src/ref/rrefsqljusing.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljusing.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljusing.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljusing.dita Mon Sep 30 14:23:19 2013
@@ -46,7 +46,9 @@ that have an explicit join clause.
 <refsyn>
 <title>Syntax</title>
 
-<codeblock><b>USING ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> [ , <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> ]* )</b></codeblock>
+<codeblock><b>USING ( <i><xref 
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> ]* )</b></codeblock>
 
 <p>
 The columns listed in the USING clause must be present in both of the

Modified: db/derby/docs/trunk/src/ref/rrefsqljwindow.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljwindow.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljwindow.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljwindow.dita Mon Sep 30 14:23:19 2013
@@ -31,10 +31,10 @@ limitations under the License.
 </section>
 <refsyn>
 <title>Syntax</title>
-<codeblock><b>WINDOW <i>WindowName</i> AS <i>WindowSpecification</i></b></codeblock>
-<p>In a WINDOW clause, <i>WindowName</i> is a
+<codeblock><b>WINDOW <i>windowName</i> AS <i>windowSpecification</i></b></codeblock>
+<p>In a WINDOW clause, <i>windowName</i> is a
 <xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref>.</p>
-<p>Currently, the only valid <i>WindowSpecification</i> is a set of empty
+<p>Currently, the only valid <i>windowSpecification</i> is a set of empty
 parentheses (<codeph>()</codeph>), which indicates that the function is
 evaluated over the entire result set.</p>
 </refsyn>

Modified: db/derby/docs/trunk/src/ref/rrefsynonymname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsynonymname.dita?rev=1527587&r1=1527586&r2=1527587&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsynonymname.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsynonymname.dita Mon Sep 30 14:23:19 2013
@@ -18,11 +18,17 @@ See the License for the specific languag
 limitations under the License.
 -->
 <reference id="rrefsynonymname" xml:lang="en-us">
-<title>synonym-Name</title>
+<title>synonymName</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>
+<section><p>A <i>synonymName</i> represents a synonym for a table or a view.
+To create a synonym, use the
+<xref href="rrefsqljcreatesynonym.dita#rrefsqljcreatesynonym"></xref>.</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>
+<p>You can qualify a synonym name with a <i>schemaName</i>. If a qualified
+synonym name is specified, the schema name cannot begin with SYS.</p>
+</section>
 </refbody>
 </reference>



Mime
View raw message