db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1527603 [2/4] - /db/derby/docs/branches/10.10/src/ref/
Date Mon, 30 Sep 2013 14:52:29 GMT
Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj15446.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj15446.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj15446.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj15446.dita Mon Sep 30 14:52:27 2013
@@ -49,10 +49,10 @@ privilege on function <codeph>user1.f_ab
 to grant the SELECT privilege cannot be revoked. If a required privilege on
 one of the underlying objects that the view references is revoked, then the
 view is dropped.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>CREATE VIEW <i><xref href="rrefviewname.dita#rrefviewname">view-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>] * ) ]
-AS <i><xref href="rrefsqlj21571.dita#rrefsqlj21571">Query</xref></i> [ <i><xref href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref></i> ]
+<refsyn><title>Syntax</title> <codeblock><b>CREATE VIEW <i><xref href="rrefviewname.dita#rrefviewname">viewName</xref></i>
+    [ ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> ]* ) ]
+AS <i><xref href="rrefsqlj21571.dita#rrefsqlj21571">query</xref></i> [ <i><xref href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref></i> ]
          [ <i><xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">result offset clause</xref></i> ]
          [ <i><xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">fetch first clause</xref></i> ]
 </b></codeblock> <p>A

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj16095.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj16095.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj16095.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj16095.dita Mon Sep 30 14:52:27 2013
@@ -19,12 +19,12 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefsqlj16095" xml:lang="en-us">
-<title>Column-level-constraint</title>
+<title>columnLevelConstraint</title>
 <refbody>
-<example> <codeblock><b>[CONSTRAINT <i><xref href="rrefconstraintname.dita#rrefconstraintname">constraint-Name</xref></i>]
+<example> <codeblock><b>[ CONSTRAINT <i><xref href="rrefconstraintname.dita#rrefconstraintname">constraintName</xref></i> ]
 {
     NOT NULL |
-    CHECK (<i><xref href="rrefsqlj91438.dita#rrefsqlj91438">searchCondition</xref></i>) |
+    CHECK ( <i><xref href="rrefsqlj91438.dita#rrefsqlj91438">searchCondition</xref></i> ) |
     PRIMARY KEY |
     UNIQUE |
     <i><xref href="rrefsqlj16357.dita#rrefsqlj16357">REFERENCES clause</xref></i>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj16357.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj16357.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj16357.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj16357.dita Mon Sep 30 14:52:27 2013
@@ -19,16 +19,16 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefsqlj16357" xml:lang="en-us">
-<title>References specification</title>
+<title>REFERENCES clause</title>
 <refbody>
-<example> <codeblock><b>REFERENCES <i><xref href="rreftablename.dita#rreftablename">table-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> ]* ) ]
-[ ON DELETE {NO ACTION | RESTRICT | CASCADE | SET NULL}]
-   [ ON UPDATE {NO ACTION | RESTRICT }]
+<example> <codeblock><b>REFERENCES <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i> [ ( <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> ]* ) ]
+[ ON DELETE { NO ACTION | RESTRICT | CASCADE | SET NULL } ]
+   [ ON UPDATE { NO ACTION | RESTRICT } ]
 |
-[ ON UPDATE {NO ACTION | RESTRICT }] [ ON DELETE
-   {NO ACTION | RESTRICT | CASCADE | SET NULL}] </b></codeblock></example>
+[ ON UPDATE { NO ACTION | RESTRICT } ] 
+   [ ON DELETE { NO ACTION | RESTRICT | CASCADE | SET NULL } ] </b></codeblock></example>
 </refbody>
 </reference>
 

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj18922.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj18922.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj18922.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj18922.dita Mon Sep 30 14:52:27 2013
@@ -27,10 +27,11 @@ limitations under the License.
 operations</xref> that allow you to specify a join clause. It preserves the
 unmatched rows from the first (left) table, joining them with a NULL row in
 the shape of the second (right) table.</p></section>
-<refsyn><title>Syntax</title><codeblock><b><i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> LEFT [ 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> LEFT [ 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>
 

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj19433.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj19433.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj19433.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj19433.dita Mon Sep 30 14:52:27 2013
@@ -20,8 +20,8 @@ limitations under the License.
 -->
 <reference id="rrefsqlj19433" xml:lang="en-us">
 <title>SQL expressions</title>
-<shortdesc>Syntax for many statements and expressions includes the term <term>Expression</term>,
-or a term for a specific kind of expression such as <varname>TableSubquery</varname>.
+<shortdesc>Syntax for many statements and expressions includes the term <term>expression</term>,
+or a term for a specific kind of expression such as <varname>tableSubquery</varname>.
 Expressions are allowed in these specified places within statements. </shortdesc>
 <prolog><metadata>
 <keywords><indexterm>SQL expressions<indexterm>column reference</indexterm></indexterm>
@@ -57,13 +57,13 @@ function</indexterm></indexterm></keywor
 <refbody>
 <section><p>Some locations allow only a specific type of expression or one
 with a specific property. If not otherwise specified, an expression is permitted
-anywhere the word <i>Expression</i> appears in the syntax. This includes:
+anywhere the word <i>expression</i> appears in the syntax. This includes:
   <ul>
 <li><xref href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref></li>
-<li><i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i></li>
+<li><i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref></i></li>
 <li><xref href="rrefsqlj26498.dita#rrefsqlj26498">UPDATE statement</xref> (SET
 portion)</li>
-<li><xref href="rrefsqlj11277.dita#rrefsqlj11277">VALUES Expression</xref></li>
+<li><xref href="rrefsqlj11277.dita#rrefsqlj11277">VALUES expression</xref></li>
 <li><xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref></li>
 </ul></p><p>Of course, many other statements include these elements as building
 blocks, and so allow expressions as part of these elements. </p><p>The following
@@ -87,15 +87,15 @@ The following table lists the types of g
 <tbody>
 <row>
 <entry colname="2"> Column reference  </entry>
-<entry colname="3">A <xref href="rrefcolumnname.dita#rrefcolumnname"><varname>column-Name</varname></xref> that
+<entry colname="3">A <xref href="rrefcolumnname.dita#rrefcolumnname"><varname>columnName</varname></xref> that
 references the value of the column made visible to the expression containing
-the Column reference.   <p>You must qualify the <varname>column-Name</varname> by
+the Column reference.   <p>You must qualify the <varname>columnName</varname> by
 the table name or correlation name if it is ambiguous.</p>  <p>The qualifier
-of a <varname>column-Name</varname> must be the correlation name, if a correlation
+of a <varname>columnName</varname> must be the correlation name, if a correlation
 name is given to a table that is in a <xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM
-clause</xref>. The table name is no longer visible as a <i>column-Name</i> qualifier
+clause</xref>. The table name is no longer visible as a <i>columnName</i> qualifier
 once it has been aliased by a correlation name.</p><p>Allowed in <i><xref
-href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref>s</i>,
+href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref></i>s,
 UPDATE statements, and the WHERE clauses of data manipulation statements.</p></entry>
 </row>
 <row>
@@ -133,8 +133,8 @@ See <i><xref href="rrefscalarsubquery.di
 <row>
 <entry colname="2"> Table subquery </entry>
 <entry colname="3">Subquery that returns more than one column and more than
-one row. See <i><xref href="rreftablesubquery.dita#rreftablesubquery">TableSubquery</xref>.</i><p>Allowed
-as a tableExpression in a FROM clause and with EXISTS, IN, and quantified
+one row. See <i><xref href="rreftablesubquery.dita#rreftablesubquery">tableSubquery</xref>.</i><p>Allowed
+as a <i>tableExpression</i> in a FROM clause and with EXISTS, IN, and quantified
 comparisons.</p></entry>
 </row>
 <row>
@@ -193,11 +193,13 @@ effectively changing its sign.</p></entr
 </row>
 <row>
 <entry colname="2"> AVG</entry>
-<entry colname="3">Returns the average of a set of numeric values. <xref href="rrefsqlj32693.dita#rrefsqlj32693"></xref></entry>
+<entry colname="3">Returns the average of a set of numeric values. See
+<xref href="rrefsqlj32693.dita#rrefsqlj32693"></xref>.</entry>
 </row>
 <row>
 <entry colname="2"> SUM</entry>
-<entry colname="3">Returns the sum of a set of numeric values. <xref href="rrefsqlj13083.dita#rrefsqlj13083"></xref></entry>
+<entry colname="3">Returns the sum of a set of numeric values. See
+<xref href="rrefsqlj13083.dita#rrefsqlj13083"></xref>.</entry>
 </row>
 <row>
 <entry colname="2"> LENGTH</entry>
@@ -255,7 +257,7 @@ href="rrefsqlj93082.dita#rrefsqlj93082">
 <entry colname="2"> USER functions</entry>
 <entry colname="3">User functions return information about the current user
 as a String. See <xref href="rrefsqlj42324.dita#rrefsqlj42324"></xref>, <xref
-href="rrefsqlj25228.dita#rrefsqlj25228"></xref>, and <xref href="rrefsqlj42476.dita#rrefsqlj42476">.</xref></entry>
+href="rrefsqlj25228.dita#rrefsqlj25228"></xref>, and <xref href="rrefsqlj42476.dita#rrefsqlj42476"></xref>.</entry>
 </row>
 </tbody>
 </tgroup>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj20937.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj20937.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj20937.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj20937.dita Mon Sep 30 14:52:27 2013
@@ -31,11 +31,11 @@ creation of for primary key, unique, and
 <refbody>
 <section id="i1013640"> <p id="sqlj31027">A CREATE INDEX statement creates
 an index on a table. Indexes can be on one or more columns in the table.</p></section>
-<refsyn><title>Syntax</title><codeblock><b>CREATE [UNIQUE] INDEX <i><xref
-href="rrefindexname.dita#rrefindexname">index-Name</xref></i>
-ON <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i> ( <i><xref
-href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> [ ASC | DESC ]
-    [ , <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> [ ASC | DESC ]] * )</b></codeblock><p>The
+<refsyn><title>Syntax</title><codeblock><b>CREATE [ UNIQUE ] INDEX <i><xref
+href="rrefindexname.dita#rrefindexname">indexName</xref></i>
+ON <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i> ( <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ ASC | DESC ]
+    [ , <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ ASC | DESC ] ]* )</b></codeblock><p>The
 maximum number of columns for an index key in <ph conref="../conrefs.dita#prod/productshortname"></ph> is
 16.</p><p>An index name cannot exceed 128 characters.</p><p>A column must
 not be named more than once in a single CREATE INDEX statement. Different

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj21571.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj21571.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj21571.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj21571.dita Mon Sep 30 14:52:27 2013
@@ -18,7 +18,7 @@ See the License for the specific languag
 limitations under the License.
 -->
 <reference id="rrefsqlj21571" xml:lang="en-us">
-<title>Query</title>
+<title>query</title>
 <prolog><metadata>
 <keywords><indexterm>UNION</indexterm><indexterm>UNION ALL</indexterm></keywords>
 </metadata></prolog>
@@ -26,16 +26,16 @@ limitations under the License.
 <section> <p>A query creates a virtual table based on existing tables or constants
 built into tables.</p></section>
 <refsyn><title>Syntax</title><codeblock><b>{
-    ( <i>Query</i> 
+    ( <i>query</i> 
          [ <i><xref href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref></i> ]
          [ <i><xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">result offset clause</xref></i> ]
          [ <i><xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">fetch first clause</xref></i> ]
     ) |
-    <i>Query</i> INTERSECT [ ALL | DISTINCT ] <i>Query</i> |
-    <i>Query</i> EXCEPT [ ALL | DISTINCT ] <i>Query</i> |
-    <i>Query</i> UNION [ ALL | DISTINCT ] <i>Query</i> |
-    <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> | <i><xref
-href="rrefsqlj11277.dita#rrefsqlj11277">VALUES Expression</xref></i>
+    <i>query</i> INTERSECT [ ALL | DISTINCT ] <i>query</i> |
+    <i>query</i> EXCEPT [ ALL | DISTINCT ] <i>query</i> |
+    <i>query</i> UNION [ ALL | DISTINCT ] <i>query</i> |
+    <i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref></i> | <i><xref
+href="rrefsqlj11277.dita#rrefsqlj11277">VALUES expression</xref></i>
 }</b></codeblock><p>You can arbitrarily put parentheses around queries, or
 use the parentheses to control the order of evaluation of the INTERSECT, EXCEPT,
 or UNION operations. These operations are evaluated from left to right when

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj21583.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj21583.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj21583.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj21583.dita Mon Sep 30 14:52:27 2013
@@ -24,15 +24,15 @@ limitations under the License.
 <keywords><indexterm>FROM clause</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The FROM clause is a mandatory clause in a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref>.</i> It
-specifies the tables (<i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i>)
+<section> <p>The FROM clause is a mandatory clause in a <i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref>.</i> It
+specifies the tables (<i><xref href="rreftableexpression.dita#rreftableexpression">tableExpression</xref></i>)
 from which the other clauses of the query can access columns for use in expressions. </p></section>
-<refsyn><title>Syntax</title> <codeblock><b>FROM TableExpression [ , TableExpression ] *</b></codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><b>FROM <i>tableExpression</i> [ , <i>tableExpression</i> ]*</b></codeblock> </refsyn>
 <example><title>Examples</title>
 <codeblock><b>SELECT Cities.city_id
 FROM Cities
 WHERE city_id &lt; 5
-<ph>-- other types of TableExpressions</ph>
+<ph>-- other types of tableExpressions</ph>
 SELECT TABLENAME, ISINDEX 
 FROM SYS.SYSTABLES T, SYS.SYSCONGLOMERATES C
 WHERE T.TABLEID = C.TABLEID
@@ -43,7 +43,7 @@ FROM Flights, FlightAvailability
 WHERE FlightAvailability.flight_id = Flights.flight_id
 AND FlightAvailability.segment_number = Flights.segment_number
 AND Flights.flight_id &lt; 'AA1115'
-<ph>-- a TableExpression can be a joinOperation. Therefore
+<ph>-- a tableExpression can be a join operation. Therefore
 -- you can have multiple join operations in a FROM clause</ph>
 SELECT COUNTRIES.COUNTRY, CITIES.CITY_NAME, FLIGHTS.DEST_AIRPORT
 FROM COUNTRIES LEFT OUTER JOIN CITIES

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj23075.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj23075.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj23075.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj23075.dita Mon Sep 30 14:52:27 2013
@@ -61,11 +61,11 @@ These operators are listed in the follow
     (dest_airport = 'GRU')
 <ph>    -- returns true</ph></b></codeblock></entry>
 <entry colname="3"> <codeblock><b>{
-<b><i>  Expression</i></b> AND
-<b><i>    Expression </i></b>|
-<b><i>  Expression</i></b> OR
-<b><i>    Expression</i></b> |
-  NOT <b><i>Expression</i></b>
+<i>  expression</i> AND
+<i>    expression</i> |
+<i>  expression</i> OR
+<i>    expression</i> |
+  NOT <i>expression</i>
 }</b></codeblock></entry>
 </row>
 <row>
@@ -76,7 +76,7 @@ all of the built-in types.   <codeblock>
 <ph>-- returns true</ph></b></codeblock>
 <note><ph conref="../conrefs.dita#prod/productshortname"></ph> also accepts
 the != operator, which is not included in the SQL standard.</note></entry>
-<entry colname="3"> <codeblock><b><b><i>Expression</i></b>
+<entry colname="3"> <codeblock><b><i>expression</i>
 {
   &lt; |
   = |
@@ -85,13 +85,13 @@ the != operator, which is not included i
   &gt;= |
   &lt;&gt;
 }
-<b><i>Expression</i></b></b></codeblock></entry>
+<i>expression</i></b></codeblock></entry>
 </row>
 <row>
 <entry colname="1">IS NULL, IS NOT NULL</entry>
 <entry colname="2">Test whether the result of an expression is null or not.
   <codeblock><b>WHERE MiddleName IS NULL</b></codeblock></entry>
-<entry colname="3"> <codeblock><b><b><i>Expression</i></b> IS [ NOT ]
+<entry colname="3"> <codeblock><b><i>expression</i> IS [ NOT ]
   NULL</b></codeblock></entry>
 </row>
 <row>
@@ -110,12 +110,12 @@ conref="../conrefs.dita#prod/productshor
 at a time for non-metacharacters. This is different than the way <ph conref="../conrefs.dita#prod/productshortname"></ph> processes
 = comparisons. The comparisons with the = operator compare the entire character
 string on left side of the = operator with the entire character string on
-the right side of the = operator. For more information, see <b>Character-based
-collation in <ph conref="../conrefs.dita#prod/productshortname"></ph></b> in
+the right side of the = operator. For more information, see "Character-based
+collation in <ph conref="../conrefs.dita#prod/productshortname"></ph>" in
 the <ph conref="../conrefs.dita#pub/citdevelop"></ph>.</note></entry>
-<entry colname="3"> <codeblock><b><b><i>CharacterExpression</i></b>
+<entry colname="3"> <codeblock><b><b><i>characterExpression</i></b>
   [ NOT ] LIKE
-<b><i>  CharacterExpression
+<b><i>  characterExpression
   WithWildCard</i></b>
   [ ESCAPE
 
@@ -128,9 +128,9 @@ third operands. The second operand must 
 only to types to which &lt;= and &gt;= can be applied.   <codeblock><b>WHERE booking_date BETWEEN
     DATE('1998-02-26') AND
     DATE('1998-03-01')</b></codeblock></entry>
-<entry colname="3"> <codeblock><b><b><i>Expression</i></b> [ NOT ]
-BETWEEN <b><i>Expression</i></b>
-  AND <b><i>Expression</i></b></b></codeblock></entry>
+<entry colname="3"> <codeblock><b><i>expression</i> [ NOT ]
+BETWEEN <i>expression</i>
+  AND <i>expression</i></b></codeblock></entry>
 </row>
 <row>
 <entry colname="1">IN</entry>
@@ -141,12 +141,12 @@ a single column.   <codeblock><b>WHERE b
     (SELECT booking_date FROM
 HotelBookings WHERE rooms_available = 0)</b></codeblock></entry>
 <entry colname="3"> <codeblock><b>{
-<b><i>  Expression</i></b> [ NOT ]
+<i>  expression</i> [ NOT ]
     IN
-    <b><i><xref href="rreftablesubquery.dita#rreftablesubquery">TableSubquery</xref></i></b> |
-<b><i>  Expression</i></b> [ NOT ]
-    IN ( <b><i>Expression</i></b>
-    [, <b><i>Expression</i></b> ]* )
+    <i><xref href="rreftablesubquery.dita#rreftablesubquery">tableSubquery</xref></i> |
+<i>  expression</i> [ NOT ]
+    IN ( <i>expression</i>
+    [, <i>expression</i> ]* )
 }</b></codeblock></entry>
 </row>
 <row>
@@ -158,7 +158,7 @@ can return multiple columns and rows.   
   FROM Flights
   WHERE dest_airport = 'SFO'
   AND orig_airport = 'GRU')</b></codeblock></entry>
-<entry colname="3"> <codeblock><b>[NOT] EXISTS <b><i><xref href="rreftablesubquery.dita#rreftablesubquery">TableSubquery</xref></i></b></b></codeblock
+<entry colname="3"> <codeblock><b>[NOT] EXISTS <b><i><xref href="rreftablesubquery.dita#rreftablesubquery">tableSubquery</xref></i></b></b></codeblock
 ></entry>
 </row>
 <row>
@@ -171,14 +171,14 @@ returned by the table subquery. If ANY o
 be true for at least one value of the table subquery. ANY and SOME are equivalent.
   <codeblock><b>WHERE normal_rate &lt; ALL
 (SELECT budget/550 FROM Groups) </b></codeblock></p></entry>
-<entry colname="3"> <codeblock><b><b><i>Expression</i></b>
-  ComparisonOperator
+<entry colname="3"> <codeblock><b><i>expression</i>
+  <i>comparisonOperator</i>
   {
     ALL |
     ANY |
     SOME
   }
-  <b><i><xref href="rreftablesubquery.dita#rreftablesubquery">TableSubquery</xref></i></b></b></codeblock></entry>
+  <i><xref href="rreftablesubquery.dita#rreftablesubquery">tableSubquery</xref></i></b></codeblock></entry>
 </row>
 </tbody>
 </tgroup>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj24513.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj24513.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj24513.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj24513.dita Mon Sep 30 14:52:27 2013
@@ -51,18 +51,19 @@ begin with <i>SYS</i>.</p></section>
         depending on whether you are specifying the column definitions and
         constraints, or whether you are modeling the columns after the
         results of a query expression:</p>
-    <codeblock><b>CREATE TABLE <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i></b>
-  {
-      ( {<i><xref href="rrefsqlj30540.dita#rrefsqlj30540">column-definition</xref></i> | <i><xref
-href="rrefsqlj42154.dita#rrefsqlj42154">Table-level constraint</xref></i>}
-      [ , {<i><xref href="rrefsqlj30540.dita#rrefsqlj30540">column-definition</xref></i> | <i><xref
-              href="rrefsqlj42154.dita#rrefsqlj42154">Table-level constraint</xref></i>} ] * )
+<codeblock><b>CREATE TABLE <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i>
+{
+    ( { <i><xref href="rrefsqlj30540.dita#rrefsqlj30540">columnDefinition</xref></i> | <i><xref
+href="rrefsqlj42154.dita#rrefsqlj42154">tableLevelConstraint</xref></i> }
+    [ , { <i><xref href="rrefsqlj30540.dita#rrefsqlj30540">columnDefinition</xref></i> | <i><xref
+              href="rrefsqlj42154.dita#rrefsqlj42154">tableLevelConstraint</xref></i> } ] * )
   |
-      [ ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">column-name</xref></i> [ , <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">column-name</xref></i> ] * ) ]
-      <b>AS</b> <i>query-expression</i>
-      <b>WITH NO DATA</b>
-   }
-</codeblock></refsyn>
+    [ ( <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> ] * ) ]
+    AS <i>queryExpression</i>
+    WITH NO DATA
+}</b></codeblock></refsyn>
 <example><title>Example</title><codeblock><b>CREATE TABLE HOTELAVAILABILITY
      (HOTEL_ID INT NOT NULL, BOOKING_DATE DATE NOT NULL,
 	ROOMS_TAKEN INT DEFAULT 0, PRIMARY KEY (HOTEL_ID, BOOKING_DATE));

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj26498.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj26498.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj26498.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj26498.dita Mon Sep 30 14:52:27 2013
@@ -25,17 +25,19 @@ limitations under the License.
 </metadata></prolog>
 <refbody>
 <refsyn><title>Syntax</title> <codeblock><b>{
-    UPDATE <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i> [[AS] correlation-Name]
-        SET <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> = <i>Value</i>
-        [ , <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> = <i>Value</i>} ]*
-        [<i><xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref></i>] |
-    UPDATE <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i>
-        SET <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> = <i>Value</i>
-        [ , <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> = <i>Value</i> ]*
+    UPDATE <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i> [ [ AS ] <i><xref
+href="rrefcorrelationname.dita#rrefcorrelationname">correlationName</xref></i> ] ]
+        SET <i><xref href="rrefcolumnname.dita#rrefcolumnname">columnName</xref></i> = <i>value</i>
+        [ , <i><xref href="rrefcolumnname.dita#rrefcolumnname">columnName</xref></i> = <i>value</i> ]*
+        [ <i><xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref></i> ] 
+  |
+    UPDATE <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i>
+        SET <i><xref href="rrefcolumnname.dita#rrefcolumnname">columnName</xref></i> = <i>value</i>
+        [ , <i><xref href="rrefcolumnname.dita#rrefcolumnname">columnName</xref></i> = <i>value</i> ]*
         <i><xref href="rrefsqlj15309.dita#rrefsqlj15309">WHERE CURRENT OF</xref></i>
 }</b></codeblock> 
-<p>where <varname>Value</varname> is defined as follows:</p>
-<codeblock><b><i>Expression</i> | DEFAULT</b></codeblock>
+<p>where <varname>value</varname> is defined as follows:</p>
+<codeblock><b><i>expression</i> | DEFAULT</b></codeblock>
 <p>The first syntactical form, called a searched update, updates the value of
 one or more columns for all rows of the table for which the WHERE clause evaluates to TRUE.</p>
 <p>The second syntactical form, called a positioned update, updates one or more columns on the
@@ -48,7 +50,9 @@ DEFAULT for the update value sets the va
 for that table.</p>
 <p>The DEFAULT literal is the only value which you can directly assign to a
 generated column. Whenever you alter the value of a column referenced by the
-<i>generation-clause</i> of a generated column,
+<i><xref 
+href="rrefsqljgenerationclause.dita#rrefsqljgenerationclause">generationClause</xref></i>
+of a generated column,
 <ph conref="../conrefs.dita#prod/productshortname"></ph> recalculates the value
 of the generated column.</p> </refsyn>
 <example><title>Example</title> <codeblock><b><ph>-- All the employees except the manager of

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj27781.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj27781.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj27781.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj27781.dita Mon Sep 30 14:52:27 2013
@@ -32,12 +32,12 @@ by <ph conref="../conrefs.dita#prod/prod
 <xref href="rrefsqlj58560.dita#rrefsqlj58560"></xref>). This means that MAX
 cannot be used with expressions that evaluate to BLOB, CLOB, LONG VARCHAR, LONG
 VARCHAR FOR BIT DATA, XML, or user-defined types.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>MAX ( [ DISTINCT | ALL ] <i>Expression</i> )</b></codeblock> <p>The
+<refsyn><title>Syntax</title> <codeblock><b>MAX ( [ 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 MAX expression. Only one DISTINCT aggregate
-expression per <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> is
+expression 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), MAX (DISTINCT miles)
-FROM Flights</b></codeblock></p> <p>The <i>Expression</i> can contain multiple
+FROM Flights</b></codeblock></p> <p>The <i>expression</i> can contain multiple
 column references or expressions, but it cannot contain another aggregate
 or subquery. It must evaluate to a built-in data type. You can therefore call
 methods that evaluate to built-in data types. (For example, a method that

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj28468.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj28468.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj28468.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj28468.dita Mon Sep 30 14:52:27 2013
@@ -61,7 +61,7 @@ SELECT as SELECT, Select, select, or sEL
 <li>SQL-92-style identifiers are case-insensitive (see <i><xref href="crefsqlj34834.dita#crefsqlj34834"></xref></i>),
 unless they are delimited.</li>
 <li>Java-style identifiers are always case-sensitive.</li>
-<li>* is a wildcard within a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref>.</i> See <xref
+<li>* is a wildcard within a <i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref>.</i> See <xref
 href="rrefselectexpression.dita#rrefselectexpression/sqlj38441"></xref>. It
 can also be the multiplication operator. In all other cases, it is a syntactical
 metasymbol that flags items you can repeat 0 or more times.</li>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj29840.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj29840.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj29840.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj29840.dita Mon Sep 30 14:52:27 2013
@@ -24,13 +24,12 @@ limitations under the License.
 </keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The JOIN operations, which are among the possible <i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref
+<section> <p>The JOIN operations, which are among the possible <i><xref href="rreftableexpression.dita#rreftableexpression">tableExpression</xref
 >s</i> in a <xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM clause</xref>,
 perform joins between two tables. (You can also perform a join between two
-tables using an explicit equality test in a WHERE clause, such as "WHERE t1.col1
-= t2.col2".)</p></section>
-<refsyn><title>Syntax</title> <codeblock><b><i>JOIN Operation</i></b></codeblock> <p>The
-JOIN operations are:</p>  <ul>
+tables using an explicit equality test in a WHERE clause, such as
+<codeph>WHERE t1.col1 = t2.col2</codeph>.)</p></section>
+<section><p>The JOIN operations are:</p>  <ul>
 <li><xref href="rrefsqlj35034.dita#rrefsqlj35034"></xref>   <p>Specifies a
 join between two tables with an explicit join clause.</p></li>
 <li><xref href="rrefsqlj18922.dita#rrefsqlj18922"></xref>   <p>Specifies a
@@ -48,7 +47,7 @@ explicit join clause. Instead, one is cr
 common columns from the two tables.</p></li>
 </ul> <p>In all cases, you can specify additional restrictions on one
 or both of the tables being joined in outer join clauses or in the <xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE
-clause</xref>.</p> </refsyn>
+clause</xref>.</p> </section>
 <section><title>JOIN expressions and query optimization</title> <p>For information
 on which types of joins are optimized, see <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p> </section>
 </refbody>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj30540.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj30540.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj30540.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj30540.dita Mon Sep 30 14:52:27 2013
@@ -18,31 +18,31 @@ See the License for the specific languag
 limitations under the License.
 -->
 <reference id="rrefsqlj30540" xml:lang="en-us">
-<title>column-definition</title>
+<title>columnDefinition</title>
 <refbody>
-<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 <varname>DefaultConstantExpression</varname>
-       | <i><xref href="rrefsqlj37836.dita#rrefsqlj37836">generated-column-spec</xref></i> 
-       | <i><xref href="rrefsqljgenerationclause.dita#rrefsqljgenerationclause">generation-clause</xref></i> 
+<example> <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 <i><xref href="rrefsqlj30540.dita#rrefsqlj30540/sqlj64478">defaultConstantExpression</xref></i>
+       | <i><xref href="rrefsqlj37836.dita#rrefsqlj37836">generatedColumnSpec</xref></i> 
+       | <i><xref href="rrefsqljgenerationclause.dita#rrefsqljgenerationclause">generationClause</xref></i> 
     ]
-    [ <i><xref href="rrefsqlj16095.dita#rrefsqlj16095">Column-level-constraint</xref></i> ]*
+    [ <i><xref href="rrefsqlj16095.dita#rrefsqlj16095">columnLevelConstraint</xref></i> ]*
 </b></codeblock></example>
-<section><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
-<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
-assignable to <i>DataType</i>.</p><p>The
-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
+<section><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>generationClause</i>. If you omit the
+<i>dataType</i>, the type of the generated column is the type of the
+<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>The
+syntaxes of <i><xref href="rrefsqlj16095.dita#rrefsqlj16095">columnLevelConstraint</xref></i> and <i><xref
+href="rrefsqlj42154.dita#rrefsqlj42154">tableLevelConstraint</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 <varname>DefaultConstantExpression</varname> is an 
+of a default value, a <varname>defaultConstantExpression</varname> is an 
 expression that does not refer to any table. It can include constants, 
 date-time special registers, current schemas, users, roles, and null: </p>
-<codeblock><b><varname>DefaultConstantExpression</varname>:
+<codeblock><b><varname>defaultConstantExpression</varname>:
           NULL
         | CURRENT { SCHEMA | SQLID }
         | USER | CURRENT_USER | SESSION_USER | CURRENT_ROLE
@@ -56,9 +56,9 @@ date-time special registers, current sch
 </b></codeblock>
 <p>For details about Derby <varname>literal</varname> values, see 
 <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p>
-<p>The values in a <varname>DefaultConstantExpression</varname> must be 
+<p>The values in a <varname>defaultConstantExpression</varname> must be 
 compatible in type with the column, but a 
-<varname>DefaultConstantExpression</varname> has the following additional type 
+<varname>defaultConstantExpression</varname> has the following additional type 
 restrictions:</p>
 <ul>
 <li>If you specify USER, CURRENT_USER, SESSION_USER, or CURRENT_ROLE, the column must be a

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj31580.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj31580.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj31580.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj31580.dita Mon Sep 30 14:52:27 2013
@@ -28,25 +28,27 @@ statements</indexterm>CREATE SCHEMA</ind
 <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">schemaName</xref></i> AUTHORIZATION <i
->user-name</i> ] | [ <i>schemaName</i> ] | 
-[ AUTHORIZATION <i>user-name</i> ] }</b>
-</codeblock> <p>The CREATE SCHEMA statement is used to create a schema. A
+<refsyn><title>Syntax</title> 
+<codeblock><b>CREATE SCHEMA
+{ 
+    [ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> AUTHORIZATION <i>userName</i> ] |
+    [ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> ] | 
+    [ AUTHORIZATION <i>userName</i> ]
+}</b></codeblock>
+<p>The CREATE SCHEMA statement is used to create a schema. 
 schema name cannot exceed 128 characters. Schema names must be unique within
 the database.</p> 
 <p>A schema name cannot start with the prefix SYS (after case normalization).
 Use of the prefix SYS raises a <i>SQLException</i>.</p>
 <p>The CREATE SCHEMA statement is subject to access control when the 
-<codeph><xref href="rrefpropersqlauth.dita#rrefpropersqlauth">derby.database.sqlAuthorization</xref></codeph> property is set to 
+<i><xref href="rrefpropersqlauth.dita#rrefpropersqlauth">derby.database.sqlAuthorization</xref></i> property is set to 
 <codeph>true</codeph> for the database or system. Only the database owner can create a schema with a name 
 different from the current user name, and only the the database owner can 
 specify 
-<codeblock>AUTHORIZATION <i>user-name</i></codeblock>
-with a user name other than the current user name. See 
-"<xref href="rrefpropersqlauth.dita#rrefpropersqlauth">derby.database.sqlAuthorization</xref>" for information about the 
-<codeph>derby.database.sqlAuthorization</codeph> property.</p>
+<codeblock>AUTHORIZATION <i>userName</i></codeblock>
+with a user name other than the current user name.</p>
 <note>Although the SQL standard allows you to specify any
-<i><xref href="rrefrauthid.dita#rrefrauthid">AuthorizationIdentifier</xref></i>
+<i><xref href="rrefrauthid.dita#rrefrauthid">authorizationIdentifier</xref></i>
 as an AUTHORIZATION argument,
 <ph conref="../conrefs.dita#prod/productshortname"></ph> allows you to specify
 only a user, not a role.</note>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj31648.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj31648.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj31648.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj31648.dita Mon Sep 30 14:52:27 2013
@@ -28,10 +28,11 @@ limitations under the License.
 <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">schemaName</xref></i> RESTRICT</b></codeblock> <p
->The RESTRICT keyword enforces the rule that no objects can be defined in
+<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>
+keyword is required.</p> </refsyn>
 <example><title>Example</title>
 <codeblock><b><ph>-- Drop the SAMP schema
 -- The SAMP schema may only be deleted from the database

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj31783.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj31783.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj31783.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj31783.dita Mon Sep 30 14:52:27 2013
@@ -34,11 +34,14 @@ For more information about updatability,
 <xref href="rrefsqlj41360.dita#rrefsqlj41360/sqlj15384"></xref>.</p> </section>
 <refsyn><title>Syntax</title> <codeblock><b>FOR
 {
-    READ ONLY | FETCH ONLY |
-    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> 
+    READ ONLY |
+    FETCH ONLY |
+    UPDATE [ OF <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> ]* ]
+}</b></codeblock> <p><i>simpleColumnName</i> refers to the names visible
+for the table specified in the FROM clause of the underlying query.</p>
+<p>Instead of FOR UPDATE, you can specify FOR READ ONLY or its synonym,
+FOR FETCH ONLY, to indicate that the result set is not updatable. </p>
 </refsyn>
 <section>
 <p><note>The use of the FOR UPDATE clause is not mandatory to obtain an updatable 

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj32268.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj32268.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj32268.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj32268.dita Mon Sep 30 14:52:27 2013
@@ -33,15 +33,15 @@ statement to succeed. If the schema does
 href="rrefsqlj31580.dita#rrefsqlj31580"></xref>.</p> <p>The SET SCHEMA statement
 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">schemaName</xref> </i>| USER | ? | '&lt;string-constant&gt;' }</b></codeblock> <p><i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> is
+<refsyn><title>Syntax</title> <codeblock><b>SET [ CURRENT ] SCHEMA [ = ] { <i><xref
+href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> | USER | ? | '<i>stringConstant</i>' } |
+SET CURRENT SQLID [ = ] { <i><xref
+href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> | USER | ? | '<i>stringConstant</i>' }</b></codeblock>
+<p>The <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,
-the current schema defaults the <i>APP</i> schema. (If a user name was specified
+enclosed in double quotes. (For example, SYS is equivalent to sYs, SYs, and
+sys.) </p> <p>USER is the current user. If no current user is defined,
+the current schema defaults to the <i>APP</i> schema. (If a user name was specified
 upon connection, the user's name is the default schema for the connection,
 if a schema with that name exists.) </p> <p>? is a dynamic parameter specification
 that can be used in prepared statements. The SET SCHEMA statement can be prepared

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj32654.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj32654.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj32654.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj32654.dita Mon Sep 30 14:52:27 2013
@@ -24,7 +24,7 @@ limitations under the License.
 <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">SelectExpression</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
@@ -36,15 +36,17 @@ use a GROUP BY clause in conjunction wit
     <codeblock><b>
 GROUP BY 
 {
-    <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> [ , <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> ]*  
-|
-    ROLLUP ( <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> [ , <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> ]* )
+    <i><xref href="rrefcolumnname.dita#rrefcolumnname">columnName</xref></i> [ , <i><xref
+href="rrefcolumnname.dita#rrefcolumnname">columnName</xref></i> ]* |
+    ROLLUP ( <i><xref href="rrefcolumnname.dita#rrefcolumnname">columnName</xref></i> [ , <i><xref
+href="rrefcolumnname.dita#rrefcolumnname">columnName</xref></i> ]* )
 }</b></codeblock>
-        <p><i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> must be a column from
+<p>The <i><xref href="rrefcolumnname.dita#rrefcolumnname">columnName</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">SelectExpression</xref></i> with
+it cannot refer to columns in the outer query.</p> <p>The <i>selectItems</i> in
+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><title>Examples</title>
 <codeblock><b><ph>-- find the average flying_times of flights grouped by

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj33215.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj33215.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj33215.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj33215.dita Mon Sep 30 14:52:27 2013
@@ -19,19 +19,21 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefsqlj33215" xml:lang="en-us">
-<title>TableViewOrFunctionExpression</title>
+<title>tableViewOrFunctionExpression</title>
 <refbody>
 <example><codeblock><b>{
-    { <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i> | <i><xref href="rrefviewname.dita#rrefviewname">view-Name</xref></i> }
-    [ <i>CorrelationClause</i> ]
+    { <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i> | <i><xref href="rrefviewname.dita#rrefviewname">viewName</xref></i> }
+    [ <i>correlationClause</i> ]
 |
-    { <i><xref href="rreftablesubquery.dita#rreftablesubquery">TableSubquery</xref></i> | <i><xref href="rrefsqljtfinvoke.dita#rrefsqljtfinvoke">TableFunctionInvocation</xref></i> }
-    <i>CorrelationClause</i>
+    { <i><xref href="rreftablesubquery.dita#rreftablesubquery">tableSubquery</xref></i> | <i><xref
+href="rrefsqljtfinvoke.dita#rrefsqljtfinvoke">tableFunctionInvocation</xref></i> }
+    <i>correlationClause</i>
 }</b></codeblock>
-<p>where <i>CorrelationClause</i> is</p>
+<p>where <i>correlationClause</i> is</p>
 <codeblock><b>[ 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> ]* ) ] 
+<i><xref href="rrefcorrelationname.dita#rrefcorrelationname">correlationName</xref></i>
+[ ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> ]* ) ] 
 </b></codeblock>
 </example>
 </refbody>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj33520.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj33520.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj33520.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj33520.dita Mon Sep 30 14:52:27 2013
@@ -32,12 +32,12 @@ by <ph conref="../conrefs.dita#prod/prod
 <xref href="rrefsqlj58560.dita#rrefsqlj58560"></xref>). This means that MIN
 cannot be used with expressions that evaluate to BLOB, CLOB, LONG VARCHAR, LONG
 VARCHAR FOR BIT DATA, XML, or user-defined types.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>MIN ( [ DISTINCT | ALL ] <i>Expression</i> )</b></codeblock> <p>The
+<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">SelectExpression</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 <i>Expression</i> can contain multiple column
+FROM Flights</b></codeblock></p> <p>The <i>expression</i> can contain multiple column
 references or expressions, but it cannot contain another aggregate or subquery.
 It must evaluate to a built-in data type. You can therefore call methods that
 evaluate to built-in data types. (For example, a method that returns a <i>java.lang.Integer</i> or <i>int</i> evaluates

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj33602.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj33602.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj33602.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj33602.dita Mon Sep 30 14:52:27 2013
@@ -24,13 +24,13 @@ limitations under the License.
 <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">SelectExpression</xref>,</i> <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">Boolean expression</xref></i></b></codeblock> <p><indexterm>WHERE
+<refsyn><title>Syntax</title> <codeblock><b>WHERE <i><xref href="rrefsqlj23075.dita#rrefsqlj23075">booleanExpression</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: db/derby/docs/branches/10.10/src/ref/rrefsqlj33923.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj33923.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj33923.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj33923.dita Mon Sep 30 14:52:27 2013
@@ -86,17 +86,17 @@ the data types shown in the following ta
 </tgroup>
 </table></section>
 <section><p>Aggregates are permitted only in the following:   <ul>
-<li>A <i>SelectItem</i> in a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref>.</i></li>
+<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">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>
+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">SelectExpression</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">SelectExpression</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: db/derby/docs/branches/10.10/src/ref/rrefsqlj34148.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj34148.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj34148.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj34148.dita Mon Sep 30 14:52:27 2013
@@ -26,7 +26,7 @@ limitations under the License.
 </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">table-Name</xref></i></b></codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><b>DROP TABLE <i><xref href="rreftablename.dita#rreftablename">tableName</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: db/derby/docs/branches/10.10/src/ref/rrefsqlj35034.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj35034.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj35034.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj35034.dita Mon Sep 30 14:52:27 2013
@@ -28,9 +28,10 @@ limitations under the License.
 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>
+<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> |
+    ON <i><xref
+href="rrefsqlj23075.dita#rrefsqlj23075">booleanExpression</xref></i> |
     <i><xref href="rrefsqljusing.dita#rrefsqljusing">USING clause</xref></i>
 }</b></codeblock>
 

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj35981.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj35981.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj35981.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj35981.dita Mon Sep 30 14:52:27 2013
@@ -26,9 +26,12 @@ DELETES</indexterm></indexterm></keyword
 </metadata></prolog>
 <refbody>
 <section><title>Syntax</title> <codeblock><b>{
-    DELETE FROM <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i> [[AS] <i><xref href="rrefcorrelationname.dita#rrefcorrelationname">correlation-Name</xref></i>]
-        [<i><xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref></i>] |
-    DELETE FROM table-Name <i><xref href="rrefsqlj15309.dita#rrefsqlj15309">WHERE CURRENT OF clause</xref></i>
+    DELETE FROM <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i> [ [ AS ] <i><xref
+href="rrefcorrelationname.dita#rrefcorrelationname">correlationName</xref></i> ]
+        [ <i><xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref></i> ]
+  |
+    DELETE FROM <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i> <i><xref
+href="rrefsqlj15309.dita#rrefsqlj15309">WHERE CURRENT OF clause</xref></i>
 }</b></codeblock></section>
 <section><p>The first syntactical form, called a searched delete, removes
 all rows identified by the table name and WHERE clause.</p></section>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj37836.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj37836.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj37836.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj37836.dita Mon Sep 30 14:52:27 2013
@@ -18,15 +18,15 @@ See the License for the specific languag
 limitations under the License.
 -->
 <reference id="rrefsqlj37836" xml:lang="en-us">
-<title>generated-column-spec</title>
+<title>generatedColumnSpec</title>
 <prolog><metadata>
-<keywords><indexterm>Identity column attributes</indexterm><indexterm>generated-column-spec</indexterm>
+<keywords><indexterm>Identity column attributes</indexterm><indexterm>generatedColumnSpec</indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
 <example> <codeblock><b>[ GENERATED { ALWAYS | BY DEFAULT } AS IDENTITY 
-[ ( START WITH IntegerConstant 
-[ ,INCREMENT BY IntegerConstant] ) ]  ]  ]
+[ ( START WITH <i>integerConstant</i> 
+[ , INCREMENT BY <i>integerConstant</i> ] ) ]  ]  ]
 </b></codeblock></example>
 <section id="sqlj69411"><title>Identity column attributes</title>
 <p>A table can have at most one identity column.</p><p>For SMALLINT,
@@ -136,11 +136,12 @@ upper case unless you used delimited ide
 objects.</note><p><ph conref="../conrefs.dita#prod/productshortname"></ph> keeps
 track of the last increment value for a column in a cache. It also stores
 the value of what the next increment value will be for the column on disk
-in the <i>AUTOINCREMENTVALUE</i> column of the <i>SYS.SYSCOLUMNS</i> system
-table. Rolling back a transaction does not undo this value, and thus rolled-back
+in the AUTOINCREMENTVALUE column of the <xref
+href="rrefsistabs22441.dita#rrefsistabs22441">SYS.SYSCOLUMNS system
+table</xref>. Rolling back a transaction does not undo this value, and thus rolled-back
 transactions can leave "gaps" in the values automatically inserted into an
 identity column. <ph conref="../conrefs.dita#prod/productshortname"></ph> behaves
-this way to avoid locking a row in <i>SYS.SYSCOLUMNS</i> for the duration
+this way to avoid locking a row in SYS.SYSCOLUMNS for the duration
 of a transaction and keeping concurrency high. </p><p><indexterm>Identity
 columns <indexterm>and triggers</indexterm></indexterm>When an insert happens
 within a triggered-SQL-statement, the value inserted by the triggered-SQL-statement

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita Mon Sep 30 14:52:27 2013
@@ -27,17 +27,17 @@ in COUNT aggregate function</indexterm><
 <section> <p>COUNT is an aggregate function that counts the number of rows
 accessed in an expression (see <xref href="rrefsqlj33923.dita#rrefsqlj33923"></xref>).
 COUNT is allowed on all types of expressions.</p></section>
-<refsyn><title>Syntax</title><codeblock><b>COUNT ( [ DISTINCT | ALL ] <i>Expression</i> ) </b></codeblock><p>The
+<refsyn><title>Syntax</title><codeblock><b>COUNT ( [ DISTINCT | ALL ] <i>expression</i> ) </b></codeblock><p>The
 DISTINCT qualifier 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">SelectExpression</xref></i> is
+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
+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="rrefsqlj10696.dita#rrefsqlj10696">INTEGER</xref>.</p> </refsyn>
 <example><title>Example</title>
 <codeblock><b><ph>-- Count the number of countries in each region,

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj40506.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj40506.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj40506.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj40506.dita Mon Sep 30 14:52:27 2013
@@ -37,7 +37,7 @@ is useful to:   <ul>
 lock escalation)</li>
 <li>Avoid 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">table-Name</xref></i> IN { SHARE | EXCLUSIVE } MODE</b
+<refsyn><title>Syntax</title> <codeblock><b>LOCK TABLE <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i> IN { SHARE | EXCLUSIVE } MODE</b
 ></codeblock><p>After a table is locked in either mode, a transaction does
 not acquire any subsequent row-level locks on a table.  For example, if a
 transaction locks the entire <codeph>Flights</codeph> table in share mode

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj40774.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj40774.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj40774.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj40774.dita Mon Sep 30 14:52:27 2013
@@ -31,14 +31,16 @@ number of specified or implied columns.<
 <p>Whenever you insert into a table which has generated columns,
 <ph conref="../conrefs.dita#prod/productshortname"></ph> calculates the values
 of those columns.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>INSERT INTO table-Name
-    [ (<i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> [ , <i><xref
-href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i>]* ) ]
-          Query [ <i><xref href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref></i> ]
+<refsyn><title>Syntax</title> <codeblock><b>INSERT INTO <i><xref
+href="rreftablename.dita#rreftablename">tableName</xref></i>
+    [ ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> ]* ) ]
+          <i><xref
+href="rrefsqlj21571.dita#rrefsqlj21571">query</xref></i> [ <i><xref href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref></i> ]
                 [ <i><xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">result offset clause</xref></i> ]
                 [ <i><xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">fetch first clause</xref></i> ]
-</b></codeblock> <p><i>Query</i> can be:   <ul>
-<li>A <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i></li>
+</b></codeblock> <p>The <i>query</i> can be:   <ul>
+<li>A <i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref></i></li>
 <li>A single-row or multiple-row VALUES expression
 <p>Single-row and multiple-row VALUES expressions
 can include the keyword DEFAULT. Specifying DEFAULT for a column inserts the
@@ -53,12 +55,12 @@ insert into a generated column.</p></li>
 <p>When you want insertion to happen with a specific ordering (for example, in
 conjunction with auto-generated keys), it can be useful to specify an ORDER BY
 clause on the result set to be inserted.</p>
-<p>If the Query is a VALUES expression, it cannot contain or be followed by an
+<p>If the <i>query</i> is a VALUES expression, it cannot contain or be followed by an
 ORDER BY, result offset, or fetch first clause. However, if the VALUES
 expression does not contain the DEFAULT keyword, the VALUES clause can be put
 in a subquery and ordered, as in the following statement:</p>
 <codeblock><b>INSERT INTO t SELECT * FROM (VALUES 'a','c','b') t ORDER BY 1;</b></codeblock>
-<p>For more information about Query, see <xref href="rrefsqlj21571.dita#rrefsqlj21571"></xref>.</p> </refsyn>
+</refsyn>
 <example><title>Examples</title> <codeblock><b>INSERT INTO COUNTRIES
       VALUES ('Taiwan', 'TW', 'Asia')
 

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj41180.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj41180.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj41180.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj41180.dita Mon Sep 30 14:52:27 2013
@@ -41,11 +41,11 @@ information about the JDBC <i>java.sql.C
 method, see <xref href="rrefjavcsti.dita#rrefjavcsti"></xref>.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>SET [ CURRENT ] ISOLATION [ = ]
 {
-UR | DIRTY READ | READ UNCOMMITTED
-CS | READ COMMITTED | CURSOR STABILITY
-RS |
-RR | REPEATABLE READ | SERIALIZABLE
-RESET 
+    UR | DIRTY READ | READ UNCOMMITTED |
+    CS | READ COMMITTED | CURSOR STABILITY |
+    RS |
+    RR | REPEATABLE READ | SERIALIZABLE |
+    RESET 
 }
 </b></codeblock> </refsyn>
 <example><title>Example</title>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj41360.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj41360.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj41360.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj41360.dita Mon Sep 30 14:52:27 2013
@@ -25,16 +25,20 @@ limitations under the License.
 to guarantee order of results</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<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="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">result offset clause</xref></i>]
-[<i><xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">fetch first clause</xref></i>]
-[<i><xref href="rrefsqlj31783.dita#rrefsqlj31783">FOR UPDATE clause</xref></i>]
-[WITH {RR|RS|CS|UR}]</b></codeblock></refsyn>
+<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="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">result offset clause</xref></i> ]
+[ <i><xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">fetch first clause</xref></i> ]
+[ <i><xref href="rrefsqlj31783.dita#rrefsqlj31783">FOR UPDATE clause</xref></i> ]
+[ WITH { RR | RS | CS | UR } ]</b></codeblock></refsyn>
 <section> <p>A SELECT statement consists of a query with an optional <xref
-href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref>, an optional <xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">result offset clause</xref>, an optional <xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">fetch first clause</xref>, an optional <xref href="rrefsqlj31783.dita#rrefsqlj31783">FOR UPDATE clause</xref> and optionally isolation level.
+href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref>, an optional
+<xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">result offset clause</xref>,
+an optional <xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">fetch first clause</xref>,
+an optional <xref href="rrefsqlj31783.dita#rrefsqlj31783">FOR UPDATE clause</xref>,
+and an optional isolation level.
 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
+construct is SELECT. (A <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">ORDER BY clause</xref> guarantees
 the ordering of the <i>ResultSet</i>. 
 The <xref href="rrefsqljoffsetfetch.dita#rrefsqljoffsetfetch">result offset clause</xref> and the
@@ -45,7 +49,7 @@ The <xref href="rrefsqlj31783.dita#rrefs
 the result set's cursor updatable. The SELECT statement supports the FOR FETCH
 ONLY clause. The FOR FETCH ONLY clause is synonymous with the FOR READ ONLY
 clause.</p> <p>You can set the isolation level in a
-SELECT statement using the WITH {RR|RS|CS|UR} syntax.</p>
+SELECT statement using the <codeph>WITH { RR | RS | CS | UR }</codeph> syntax.</p>
 <p>For queries that do not select a specific column from the tables involved in
 the SELECT statement (for example, queries that use <codeph>COUNT(*)</codeph>),
 the user must have at least one column-level SELECT privilege or table-level
@@ -87,22 +91,22 @@ can be updatable. The SELECT statement f
 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">SelectExpression</xref>.</i></li>
-<li>The <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> in
-the underlying Query must not include:   <ul>
+<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 <i>query</i> must not include:   <ul>
 <li>DISTINCT</li>
 <li>Aggregates</li>
 <li>GROUP BY clause</li>
 <li>HAVING clause</li>
 <li>ORDER BY clause</li>
 </ul></li>
-<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">SelectExpression</xref>s</i></li>
-<li>subqueries</li>
+<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">selectExpression</xref></i>s</li>
+<li>Subqueries</li>
 </ul></li>
-<li>If the underlying <i>Query</i> has a WHERE clause, the WHERE clause must not
+<li>If the underlying <i>query</i> has a WHERE clause, the WHERE clause must not
 have subqueries.</li>
 </ul></p> 
 <note>Cursors are read-only by default. To produce an updatable 

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj42082.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj42082.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj42082.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj42082.dita Mon Sep 30 14:52:27 2013
@@ -26,7 +26,7 @@ limitations under the License.
 </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">TriggerName</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><title>Example</title>
 <codeblock><b>DROP TRIGGER TRIG1</b></codeblock> </example>
 <section><title>Statement dependency system</title> <p>When a

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj42154.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj42154.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj42154.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj42154.dita Mon Sep 30 14:52:27 2013
@@ -19,18 +19,18 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefsqlj42154" xml:lang="en-us">
-<title>Table-level constraint</title>
+<title>tableLevelConstraint</title>
 <refbody>
-<example> <codeblock><b>[CONSTRAINT <i><xref href="rrefconstraintname.dita#rrefconstraintname">constraint-Name</xref></i>]
+<example> <codeblock><b>[ CONSTRAINT <i><xref href="rrefconstraintname.dita#rrefconstraintname">constraintName</xref></i> ]
 {
-    CHECK (<i><xref href="rrefsqlj91438.dita#rrefsqlj91438">searchCondition</xref></i>) |
+    CHECK ( <i><xref href="rrefsqlj91438.dita#rrefsqlj91438">searchCondition</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> ]* )
+        PRIMARY KEY ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> ]* ) |
+        UNIQUE ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> ]* ) |
+        FOREIGN KEY ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> [ , <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> ]* )
 <i>            <xref href="rrefsqlj16357.dita#rrefsqlj16357">REFERENCES clause</xref></i>
     }
 }</b></codeblock></example>



Mime
View raw message