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 [1/4] - /db/derby/docs/branches/10.10/src/ref/
Date Mon, 30 Sep 2013 14:52:29 GMT
Author: chaase3
Date: Mon Sep 30 14:52:27 2013
New Revision: 1527603

URL: http://svn.apache.org/r1527603
Log:
DERBY-6121  Regularize how we refer to object names in the Reference Manual 

Merged patch DERBY-6121.diff to 10.10 doc branch from trunk revision 1527587.

Added:
    db/derby/docs/branches/10.10/src/ref/rrefaggregatename.dita
      - copied unchanged from r1527587, db/derby/docs/trunk/src/ref/rrefaggregatename.dita
    db/derby/docs/branches/10.10/src/ref/rreffunctionname.dita
      - copied unchanged from r1527587, db/derby/docs/trunk/src/ref/rreffunctionname.dita
    db/derby/docs/branches/10.10/src/ref/rrefprocedurename.dita
      - copied unchanged from r1527587, db/derby/docs/trunk/src/ref/rrefprocedurename.dita
    db/derby/docs/branches/10.10/src/ref/rrefsequencename.dita
      - copied unchanged from r1527587, db/derby/docs/trunk/src/ref/rrefsequencename.dita
    db/derby/docs/branches/10.10/src/ref/rreftypename.dita
      - copied unchanged from r1527587, db/derby/docs/trunk/src/ref/rreftypename.dita
Modified:
    db/derby/docs/branches/10.10/src/ref/crefsqlj39374.dita
    db/derby/docs/branches/10.10/src/ref/refderby.ditamap
    db/derby/docs/branches/10.10/src/ref/rrefcallprocedure.dita
    db/derby/docs/branches/10.10/src/ref/rrefcase.dita
    db/derby/docs/branches/10.10/src/ref/rrefcolumnname.dita
    db/derby/docs/branches/10.10/src/ref/rrefconstraintname.dita
    db/derby/docs/branches/10.10/src/ref/rrefcorrelationname.dita
    db/derby/docs/branches/10.10/src/ref/rrefcreatefunctionstatement.dita
    db/derby/docs/branches/10.10/src/ref/rrefcreateprocedurestatement.dita
    db/derby/docs/branches/10.10/src/ref/rrefcursorname.dita
    db/derby/docs/branches/10.10/src/ref/rrefdeclaretemptable.dita
    db/derby/docs/branches/10.10/src/ref/rrefdropfunctionstatement.dita
    db/derby/docs/branches/10.10/src/ref/rrefdropprocedurestatement.dita
    db/derby/docs/branches/10.10/src/ref/rrefindexname.dita
    db/derby/docs/branches/10.10/src/ref/rrefjdbc37244.dita
    db/derby/docs/branches/10.10/src/ref/rrefnewtablename.dita
    db/derby/docs/branches/10.10/src/ref/rrefrauthid.dita
    db/derby/docs/branches/10.10/src/ref/rrefrolename.dita
    db/derby/docs/branches/10.10/src/ref/rrefscalarsubquery.dita
    db/derby/docs/branches/10.10/src/ref/rrefschemaname.dita
    db/derby/docs/branches/10.10/src/ref/rrefselectexpression.dita
    db/derby/docs/branches/10.10/src/ref/rrefsetrole.dita
    db/derby/docs/branches/10.10/src/ref/rrefsimplecolumnname.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj1080779.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj11277.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj13083.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj13590.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj13658.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj14854.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj15309.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj15446.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj16095.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj16357.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj18922.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj19433.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj20937.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj21571.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj21583.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj23075.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj24513.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj26498.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj27781.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj28468.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj29840.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj30540.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj31580.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj31648.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj31783.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj32268.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj32654.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj33215.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj33520.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj33602.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj33923.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj34148.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj35034.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj35981.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj37836.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj40506.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj40774.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj41180.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj41360.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj42082.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj42154.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj43125.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj57522.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj59893.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj61102.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj81859.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj89752.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj91438.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj95598.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljcreateaggregate.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljcreatesequence.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljcreatesynonym.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljcreatetype.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljcrossjoin.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljdropaggregate.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljdropsequence.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljdropsynonym.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljdroptype.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljgenerationclause.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljgrant.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljnaturaljoin.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljnextvaluefor.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljoffsetfetch.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljrenamecolumnstatement.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljrenametablestatement.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljrevoke.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljtfinvoke.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljtruncatetable.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljusing.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljwindow.dita
    db/derby/docs/branches/10.10/src/ref/rrefsynonymname.dita
    db/derby/docs/branches/10.10/src/ref/rreftableexpression.dita
    db/derby/docs/branches/10.10/src/ref/rreftablename.dita
    db/derby/docs/branches/10.10/src/ref/rreftablesubquery.dita
    db/derby/docs/branches/10.10/src/ref/rreftriggername.dita
    db/derby/docs/branches/10.10/src/ref/rrefviewname.dita

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

Modified: db/derby/docs/branches/10.10/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/refderby.ditamap?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/refderby.ditamap (original)
+++ db/derby/docs/branches/10.10/src/ref/refderby.ditamap Mon Sep 30 14:52:27 2013
@@ -589,21 +589,26 @@ limitations under the License.
 <topicref href="crefsqlj1004091.dita" navtitle="Qualifying dictionary objects">
 </topicref>
 </topicref>
-<topicref href="rrefcolumnname.dita" navtitle="column-Name"></topicref>
-<topicref href="rrefcorrelationname.dita" navtitle="correlation-Name"></topicref>
-<topicref href="rrefnewtablename.dita" navtitle="new-table-Name"></topicref>
+<topicref href="rrefaggregatename.dita" navtitle="aggregateName"></topicref>
+<topicref href="rrefrauthid.dita" navtitle="authorizationIdentifier"></topicref>
+<topicref href="rrefcolumnname.dita" navtitle="columnName"></topicref>
+<topicref href="rrefconstraintname.dita" navtitle="constraintName"></topicref>
+<topicref href="rrefcorrelationname.dita" navtitle="correlationName"></topicref>
+<topicref href="rrefcursorname.dita" navtitle="cursorName"></topicref>
+<topicref href="rreffunctionname.dita" navtitle="functionName"></topicref>
+<topicref href="rrefindexname.dita" navtitle="indexName"></topicref>
+<topicref href="rrefnewtablename.dita" navtitle="newTableName"></topicref>
+<topicref href="rrefprocedurename.dita" navtitle="procedureName"></topicref>
+<topicref href="rrefrolename.dita" navtitle="roleName"></topicref>
 <topicref href="rrefschemaname.dita" navtitle="schemaName"></topicref>
-<topicref href="rrefsimplecolumnname.dita" navtitle="Simple-column-Name">
+<topicref href="rrefsequencename.dita" navtitle="sequenceName"></topicref>
+<topicref href="rrefsimplecolumnname.dita" navtitle="simpleColumnName">
 </topicref>
-<topicref href="rrefsynonymname.dita" navtitle="synonym-Name"></topicref>
-<topicref href="rreftablename.dita" navtitle="table-Name"></topicref>
-<topicref href="rrefviewname.dita" navtitle="view-Name"></topicref>
-<topicref href="rrefindexname.dita" navtitle="index-Name"></topicref>
-<topicref href="rrefconstraintname.dita" navtitle="constraint-Name"></topicref>
-<topicref href="rrefcursorname.dita" navtitle="cursor-Name"></topicref>
-<topicref href="rreftriggername.dita" navtitle="TriggerName"></topicref>
-<topicref href="rrefrauthid.dita" navtitle="AuthorizationIdentifier"></topicref>
-<topicref href="rrefrolename.dita" navtitle="RoleName"></topicref>
+<topicref href="rrefsynonymname.dita" navtitle="synonymName"></topicref>
+<topicref href="rreftablename.dita" navtitle="tableName"></topicref>
+<topicref href="rreftriggername.dita" navtitle="triggerName"></topicref>
+<topicref href="rreftypename.dita" navtitle="typeName"></topicref>
+<topicref href="rrefviewname.dita" navtitle="viewName"></topicref>
 </topicref>
 <topicref href="crefsqlj39374.dita" navtitle="Statements">
 <topicref href="crefsqlj22771.dita" navtitle="Interaction with the dependency system">
@@ -625,15 +630,15 @@ limitations under the License.
 <topicref href="rrefsqljcreatesynonym.dita" navtitle="CREATE SYNONYM statement">
 </topicref>
 <topicref collection-type="family" href="rrefsqlj24513.dita" navtitle="CREATE TABLE statement">
-<topicref href="rrefsqlj30540.dita" navtitle="column-definition">
+<topicref href="rrefsqlj30540.dita" navtitle="columnDefinition">
 </topicref>
-<topicref href="rrefsqlj37836.dita" navtitle="generated-column-spec">
+<topicref href="rrefsqlj37836.dita" navtitle="generatedColumnSpec">
 </topicref>
-<topicref href="rrefsqljgenerationclause.dita" navtitle="generation-clause">
+<topicref href="rrefsqljgenerationclause.dita" navtitle="generationClause">
 </topicref>
 </topicref>
 <topicref collection-type="family" href="rrefsqlj43125.dita" navtitle="CREATE TRIGGER statement">
-<topicref href="rrefsqlj89752.dita" navtitle="ReferencingClause">
+<topicref href="rrefsqlj89752.dita" navtitle="referencingClause">
 </topicref>
 </topicref>
 <topicref href="rrefsqljcreatetype.dita" navtitle="CREATE TYPE statement">
@@ -685,9 +690,9 @@ limitations under the License.
 </topicref>
 <topicref href="rrefclauses.dita" navtitle="SQL Clauses">
 <topicref collection-type="family" href="rrefsqlj13590.dita" navtitle="CONSTRAINT clause">
-<topicref href="rrefsqlj16095.dita" navtitle="Column-level-constraint"></topicref>
-<topicref href="rrefsqlj42154.dita" navtitle="Table-level constraint"></topicref>
-<topicref href="rrefsqlj16357.dita" navtitle="References specification"></topicref>
+<topicref href="rrefsqlj16095.dita" navtitle="columnLevelConstraint"></topicref>
+<topicref href="rrefsqlj42154.dita" navtitle="tableLevelConstraint"></topicref>
+<topicref href="rrefsqlj16357.dita" navtitle="REFERENCES clause"></topicref>
 <topicref href="rrefsqlj91438.dita" navtitle="searchCondition"></topicref>
 </topicref>
 <topicref href="rrefsqlj31783.dita" navtitle="FOR UPDATE clause"></topicref>
@@ -702,10 +707,10 @@ limitations under the License.
 <topicref href="rrefsqlj15309.dita" navtitle="WHERE CURRENT OF clause"></topicref>
 </topicref>
 <topicref collection-type="family" href="rrefsqlj19433.dita" navtitle="SQL expressions">
-<topicref href="rrefselectexpression.dita" navtitle="SelectExpression"></topicref>
-<topicref collection-type="family" href="rreftableexpression.dita" navtitle="TableExpression">
-<topicref href="rrefsqlj33215.dita" navtitle="TableViewOrFunctionExpression">
-<topicref href="rrefsqljtfinvoke.dita" navtitle="TableFunctionInvocation">
+<topicref href="rrefselectexpression.dita" navtitle="selectExpression"></topicref>
+<topicref collection-type="family" href="rreftableexpression.dita" navtitle="tableExpression">
+<topicref href="rrefsqlj33215.dita" navtitle="tableViewOrFunctionExpression">
+<topicref href="rrefsqljtfinvoke.dita" navtitle="tableFunctionInvocation">
 </topicref>
 </topicref>
 </topicref>
@@ -732,9 +737,9 @@ limitations under the License.
 <topicref href="rrefsqljnaturaljoin.dita" navtitle="NATURAL JOIN operation"/>
 </topicref>
 <topicref href="rrefqueries.dita" navtitle="SQL queries">
-<topicref href="rrefsqlj21571.dita" navtitle="Query"></topicref>
-<topicref href="rrefscalarsubquery.dita" navtitle="ScalarSubquery"></topicref>
-<topicref href="rreftablesubquery.dita" navtitle="TableSubquery"></topicref>
+<topicref href="rrefsqlj21571.dita" navtitle="query"></topicref>
+<topicref href="rrefscalarsubquery.dita" navtitle="scalarSubquery"></topicref>
+<topicref href="rreftablesubquery.dita" navtitle="tableSubquery"></topicref>
 </topicref>
 <topicref href="rrefsqlj29026.dita" navtitle="Built-in functions">
 <topicref href="rrefsqlj55788.dita" navtitle="Standard built-in functions">

Modified: db/derby/docs/branches/10.10/src/ref/rrefcallprocedure.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefcallprocedure.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefcallprocedure.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefcallprocedure.dita Mon Sep 30 14:52:27 2013
@@ -44,7 +44,8 @@ current schema (and current role, if rel
 </p>
 </section>
 <section><title>Syntax</title>
-<codeblock><b>CALL <i><xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedurename">procedure-Name</xref></i> ( [ <varname>expression</varname> [, <varname>expression</varname>]* ] )
+<codeblock><b>CALL <i><xref
+href="rrefprocedurename.dita#rrefprocedurename">procedureName</xref></i> ( [ <varname>expression</varname> [ , <varname>expression</varname> ]* ] )
 </b></codeblock></section>
 <section><title>Example</title>
 <codeblock><b>CREATE PROCEDURE SALES.TOTAL_REVENUE(IN S_MONTH INTEGER,

Modified: db/derby/docs/branches/10.10/src/ref/rrefcase.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefcase.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefcase.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefcase.dita Mon Sep 30 14:52:27 2013
@@ -28,13 +28,15 @@ limitations under the License.
 <refsyn><title>Syntax</title><p>You can place a CASE expression
 anywhere an expression is allowed. It chooses an expression to evaluate based
 on a boolean test.</p> <codeblock><b>CASE 
-  WHEN <i>booleanExpression</i> THEN <i>thenExpression</i> 
-  [ WHEN <i>booleanExpression</i> THEN <i>thenExpression</i> ]...
+  WHEN <i><xref
+href="rrefsqlj23075.dita#rrefsqlj23075">booleanExpression</xref></i> THEN <i>thenExpression</i> 
+  [ WHEN <i><xref
+href="rrefsqlj23075.dita#rrefsqlj23075">booleanExpression</xref></i> THEN <i>thenExpression</i> ]*
   ELSE <i>elseExpression</i> 
-END</b></codeblock> <p><i>ThenExpression</i> and <i>elseExpression</i> are
+END</b></codeblock> <p>The <i>thenExpression</i> and <i>elseExpression</i> are
 both expressions that must be type-compatible. For built-in types, this means
-that the types must be the same or a built-in broadening conversion must exist
-between the types.</p></refsyn>
+that the types must be the same or that a built-in broadening conversion must
+exist between the types.</p></refsyn>
 <example><title>Example</title><codeblock><b>-- returns 3
 VALUES CASE WHEN 1=1 THEN 3 ELSE 4 END
 

Modified: db/derby/docs/branches/10.10/src/ref/rrefcolumnname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefcolumnname.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefcolumnname.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefcolumnname.dita Mon Sep 30 14:52:27 2013
@@ -19,33 +19,37 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefcolumnname" xml:lang="en-us">
-<title>column-Name</title>
+<title>columnName</title>
 <refbody>
 <section><p>In many places in the SQL syntax, you can represent the name of
-a column by qualifying it with a <i>table-Name</i> or <i>correlation-Name</i>. </p></section>
-<section><p>In some situations, you cannot qualify a <i>column-Name</i> with
-a <i>table-Name</i> or a <i>correlation-Name,</i> but must use a <i><xref
-href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> instead.
+a column by qualifying it with a <i>tableName</i> or <i><xref
+href="rrefcorrelationname.dita#rrefcorrelationname">correlationName</xref></i>.</p>
+</section>
+<section><p>In some situations, you cannot qualify a <i>columnName</i> with
+a <i>tableName</i> or a <i>correlationName</i>, but must use a <i><xref
+href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i> instead.
 Those situations are:</p></section>
 <section> <ul>
-<li>creating a table (<xref href="rrefsqlj24513.dita#rrefsqlj24513"></xref>)</li>
-<li>specifying updatable columns in a cursor</li>
-<li>in a column's correlation name in a SELECT expression (see <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i>)</li>
-<li>in a column's correlation name in a <i>TableExpression</i> (see <i><xref
+<li>Creating a table (<xref href="rrefsqlj24513.dita#rrefsqlj24513"></xref>)</li>
+<li>Specifying updatable columns in a cursor</li>
+<li>In a column's correlation name in a SELECT expression (see <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i>)</li>
+<li>In a column's correlation name in a <i>tableExpression</i> (see <i><xref
 href="rreftableexpression.dita#rreftableexpression"></xref></i>)</li>
-</ul><p>You cannot use correlation-Names for updatable columns; using correlation-Names
-in this way will cause an SQL exception. For example:<codeblock>SELECT c11 AS col1, c12 AS col2, c13 FROM t1 FOR UPDATE of c11,c13
-</codeblock>In this example, the correlation-Name <codeph>col1 FOR c11</codeph> is
+</ul><p>You cannot use <i>correlationName</i>s for updatable columns; using
+<i>correlationName</i>s in this way will cause an SQL exception. For example:
+<codeblock>SELECT c11 AS col1, c12 AS col2, c13 FROM t1 FOR UPDATE of c11,c13
+</codeblock>
+In this example, the <i>correlationName</i> <codeph>col1 FOR c11</codeph> is
 not permitted because <codeph>c11</codeph> is listed in the FOR UPDATE list
-of columns. You can use the correlation-Name <codeph>FOR c12</codeph> because
-it is not in the FOR UPDATE list.</p></section>
-<section><title>Syntax</title> <codeblock><b>[ { <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i> | <i><xref
-href="rrefcorrelationname.dita#rrefcorrelationname">correlation-Name</xref></i> } . ] <i><xref
+of columns. You can use the <i>correlationName</i> <codeph>FOR c12</codeph>
+because it is not in the FOR UPDATE list.</p></section>
+<section><title>Syntax</title> <codeblock><b>[ { <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i> | <i><xref
+href="rrefcorrelationname.dita#rrefcorrelationname">correlationName</xref></i> } . ] <i><xref
 href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
-<section><title>Example</title> <codeblock><ph>-- C.Country is a column-Name qualified with a
--- <xref href="rrefcorrelationname.dita#rrefcorrelationname">correlation-Name</xref>.</ph>
+<section><title>Example</title>
+<codeblock><b><ph>-- C.Country is a columnName qualified with a correlationName.</ph>
 SELECT C.Country
-FROM APP.Countries C</codeblock></section>
+FROM APP.Countries C</b></codeblock></section>
 </refbody>
 </reference>
 

Modified: db/derby/docs/branches/10.10/src/ref/rrefconstraintname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefconstraintname.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefconstraintname.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefconstraintname.dita Mon Sep 30 14:52:27 2013
@@ -19,9 +19,13 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefconstraintname" xml:lang="en-us">
-<title>constraint-Name</title>
+<title>constraintName</title>
 <refbody>
-<section><p>You cannot qualify constraint-names.</p></section>
+<section><p>A <i>constraintName</i> represents a constraint (see 
+<xref href="rrefsqlj13590.dita#rrefsqlj13590">CONSTRAINT clause</xref>).</p>
+<p>You cannot qualify a <i>constraintName</i> with a <i><xref
+href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i>.</p>
+</section>
 <section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
 <section><title>Example</title> <codeblock><b><ph>-- country_fk2 is a constraint name</ph>
 CREATE TABLE DETAILED_MAPS (COUNTRY_ISO_CODE CHAR(2)

Modified: db/derby/docs/branches/10.10/src/ref/rrefcorrelationname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefcorrelationname.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefcorrelationname.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefcorrelationname.dita Mon Sep 30 14:52:27 2013
@@ -19,21 +19,24 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefcorrelationname" xml:lang="en-us">
-<title>correlation-Name</title>
+<title>correlationName</title>
 <refbody>
-<section><p>A <i>correlation-Name</i> is given to a table expression in a
-FROM clause as a new name or alias for that table. You do not qualify a <i>correlation-Name</i> with
-a <i>schema-Name</i>.</p><p>You cannot use correlation-Names for updatable
-columns; using correlation-Names in this way will cause an SQL exception.
-For example:<codeblock>SELECT c11 AS col1, c12 AS col2, c13 FROM t1 FOR UPDATE of c11,c13
-</codeblock>In this example, the correlation-Name <codeph>col1 FOR c11</codeph> is
+<section><p>A <i>correlationName</i> is given to a table expression in a
+FROM clause as a new name or alias for that table. You cannot qualify a
+<i>correlationName</i> with a <i><xref
+href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i>.</p>
+<p>You cannot use <i>correlationName</i>s for updatable columns; using
+<i>correlationName</i>s in this way will cause an SQL exception. For example:
+<codeblock>SELECT c11 AS col1, c12 AS col2, c13 FROM t1 FOR UPDATE of c11,c13
+</codeblock>
+In this example, the <i>correlationName</i> <codeph>col1 FOR c11</codeph> is
 not permitted because <codeph>c11</codeph> is listed in the FOR UPDATE list
-of columns. You can use the correlation-Name <codeph>FOR c12</codeph> because
-it is not in the FOR UPDATE list.</p></section>
+of columns. You can use the <i>correlationName</i> <codeph>FOR c12</codeph>
+because it is not in the FOR UPDATE list.</p></section>
 <section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
-<section><title>Example</title> <codeblock><ph>-- C is a correlation-Name
+<section><title>Example</title> <codeblock><b><ph>-- C is a correlationName
 </ph>SELECT C.NAME
-FROM SAMP.STAFF C</codeblock></section>
+FROM SAMP.STAFF C</b></codeblock></section>
 </refbody>
 </reference>
 

Modified: db/derby/docs/branches/10.10/src/ref/rrefcreatefunctionstatement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefcreatefunctionstatement.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefcreatefunctionstatement.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefcreatefunctionstatement.dita Mon Sep 30 14:52:27 2013
@@ -34,45 +34,43 @@ automatically gain the
 EXECUTE privilege on the function, and are able to grant this privilege to
 other users. The EXECUTE privileges cannot be revoked from the function and
 database owners.</p>
-
-<p>
-For details on how Derby matches functions to Java methods,
-see <xref href="rrefsqljargmatching.dita#rrefsqljargmatching"></xref>.
-</p>
-
-</section>
-<refsyn><title>Syntax</title> <codeblock><b>CREATE FUNCTION <i><xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionname"
->function-name</xref></i> ( [ <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionparameter">FunctionParameter</xref> 
-   [, <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionparameter">FunctionParameter</xref>]* [...] ]  ) RETURNS <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctionreturntype">ReturnDataType</xref>
-[ <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionelement">FunctionElement</xref> ]*</b></codeblock>
+<p>For details on how <ph conref="../conrefs.dita#prod/productshortname"></ph>
+matches procedures to Java methods, see
+<xref href="rrefsqljargmatching.dita#rrefsqljargmatching"></xref>.</p>
+</section>
+<refsyn><title>Syntax</title> <codeblock><b>CREATE FUNCTION <i><xref
+href="rreffunctionname.dita#rreffunctionname">functionName</xref></i> ( [ <i><xref
+href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionparameter">functionParameter</xref></i> 
+   [ , <i><xref
+href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionparameter">functionParameter</xref></i> ]* [...] ] ) RETURNS <i><xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctionreturntype">returnDataType</xref></i>
+[ <i><xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionelement">functionElement</xref></i> ]*</b></codeblock>
 <p>An ellipsis (<codeph>...</codeph>) after the last parameter indicates that
 the Java method supports trailing optional arguments, called
 <term>varargs</term>. The ellipsis indicates that the method may be invoked
 with zero or more trailing values, all having the data type of the last
 argument.</p></refsyn>
-<example id="rrefcrprofunctionname"><title>function-Name</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
-schema-Name is not provided, the current schema is the default schema. If
-a qualified procedure name is specified, the schema name cannot begin with
-SYS.</p></example>
-<example id="rrefcrprofunctionparameter"><title>FunctionParameter</title><codeblock><b>[ parameter-Name ] <i>DataType</i></b></codeblock></example>
-<section><p>PararameterName must be unique within a function.</p><p>The syntax
-of <i>DataType</i> is described in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p>
+<example id="rrefcrprofunctionparameter"><title>functionParameter</title>
+<codeblock><b>[ <i>parameterName</i> ] <i>dataType</i></b></codeblock></example>
+<section><p>A <i>parameterName</i> must be unique within a function.</p><p>The syntax
+of <i>dataType</i> is described in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p>
 <note>The data types BLOB, CLOB, LONG VARCHAR, LONG VARCHAR FOR BIT DATA, and
 XML are not allowed as parameters in a CREATE FUNCTION statement.</note></section>
 
-<example id="rrefcrfunctionreturntype"><title>ReturnDataType</title>
-<codeblock><b><xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctiontabletype">TableType</xref> | <i>DataType</i></b></codeblock></example>
+<example id="rrefcrfunctionreturntype"><title>returnDataType</title>
+<codeblock><b><i><xref
+href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctiontabletype">tableType</xref></i> | <i>dataType</i></b></codeblock></example>
 <section><p>The syntax
-of <i>DataType</i> is described in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p></section>
+of <i>dataType</i> is described in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p></section>
 
-<example id="rrefcrfunctiontabletype"><title>TableType</title>
-<codeblock><b>TABLE( <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctioncolelement">ColumnElement</xref> [, <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctioncolelement">ColumnElement</xref> ]* )</b></codeblock></example>
-<section><p>This is the return type of a table function. Currently, only Derby-style table functions are supported.
-They are functions which return JDBC <i>ResultSet</i>s. For more information, see
-"Programming Derby-style table functions" in the
-<cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite>.
+<example id="rrefcrfunctiontabletype"><title>tableType</title>
+<codeblock><b>TABLE( <i><xref
+href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctioncolelement">columnElement</xref></i> [, <i>columnElement</i> ]* )</b></codeblock></example>
+<section><p>This is the return type of a table function. Currently, only
+<ph conref="../conrefs.dita#prod/productshortname"></ph>-style table functions
+are supported. They are functions which return JDBC <i>ResultSet</i>s. For more
+information, see "Programming
+<ph conref="../conrefs.dita#prod/productshortname"></ph>-style table functions"
+in the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite>.
 </p>
 
 <p>
@@ -89,52 +87,64 @@ length.
 
 </section>
 
-<example id="rrefcrfunctioncolelement"><title>ColumnElement</title>
-<codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> <i>DataType</i></b></codeblock></example>
-<section><p>The syntax
-of <i>DataType</i> is described in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p><note>XML is not
+<example id="rrefcrfunctioncolelement"><title>columnElement</title>
+<codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> <i>dataType</i></b></codeblock></example>
+<section><p>The syntax of <i>dataType</i> is described in
+<xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p><note>XML is not
 allowed as the type of a column in the dataset returned by a table function.</note></section>
 
-<example id="rrefcrprofunctionelement"> <title>FunctionElement</title><codeblock><b> {
-| LANGUAGE { JAVA }
-| <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctiondetchar">DeterministicCharacteristic</xref>
-| EXTERNAL NAME <i>string</i>
-| PARAMETER STYLE <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctionparameterstyle">ParameterStyle</xref>
-| EXTERNAL SECURITY { DEFINER | INVOKER }
-| { NO SQL | CONTAINS SQL | READS SQL DATA }
-| { RETURNS NULL ON NULL INPUT | CALLED ON NULL INPUT }
- }</b></codeblock></example>
+<example id="rrefcrprofunctionelement"> <title>functionElement</title>
+<codeblock><b>{
+    LANGUAGE { JAVA } |
+    <i><xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctiondetchar">deterministicCharacteristic</xref></i> |
+    EXTERNAL NAME <i>string</i> |
+    PARAMETER STYLE <i><xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctionparameterstyle">parameterStyle</xref></i> |
+    EXTERNAL SECURITY { DEFINER | INVOKER } |
+    { NO SQL | CONTAINS SQL | READS SQL DATA } |
+    { RETURNS NULL ON NULL INPUT | CALLED ON NULL INPUT }
+}</b></codeblock></example>
 <section><title>LANGUAGE</title><p><b>JAVA</b>- the database manager will
 call the function as a public static method in a Java class.</p></section>
 <section><title>EXTERNAL NAME <i>string</i></title><p><i>String</i> describes
 the Java method to be called when the function is executed, and takes the
 following form: <codeblock>class_name.method_name</codeblock>The External
 Name cannot have any extraneous spaces.</p></section>
-<section id="rrefcrfunctiondetchar"><title>DeterministicCharacteristic</title>
+<section id="rrefcrfunctiondetchar"><title>deterministicCharacteristic</title>
 <codeblock><b>DETERMINISTIC | NOT DETERMINISTIC</b></codeblock>
 <p>Declares that the function is deterministic, meaning that with the same
 set of input values, it always computes the same result. The default is NOT
 DETERMINISTIC. <ph conref="../conrefs.dita#prod/productshortname"></ph> cannot
 recognize whether an operation is actually deterministic, so you must take care
-to specify the <codeph>DeterministicCharacteristic</codeph> correctly.</p>
+to specify the <i>deterministicCharacteristic</i> correctly.</p>
 </section>
-<example id="rrefcrfunctionparameterstyle"><title>ParameterStyle</title>
+<example id="rrefcrfunctionparameterstyle"><title>parameterStyle</title>
 <codeblock><b>JAVA | DERBY_JDBC_RESULT_SET | DERBY</b></codeblock></example>
-<section><p><b>JAVA</b> - The function will
-use a parameter-passing convention that conforms to the Java language and
-SQL Routines specification. INOUT and OUT parameters will be passed as single
-entry arrays to facilitate returning values. Result sets can be returned through
-additional parameters to the Java method of type <i>java.sql.ResultSet[]</i> that
-are passed single entry arrays.</p><p><ph conref="../conrefs.dita#prod/productshortname"></ph> does
+<section><dl>
+<dlentry>
+<dt>JAVA</dt>
+<dd>The function will use a parameter-passing convention that conforms to the
+Java language and SQL Routines specification. INOUT and OUT parameters will be
+passed as single entry arrays to facilitate returning values. Result sets can be
+returned through additional parameters to the Java method of type
+<i>java.sql.ResultSet[]</i> that are passed single entry arrays.
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> does
 not support long column types (for example, LONG VARCHAR, BLOB, and so on).
-An error will occur if you try to use one of these long column types. </p>
-<p><b>DERBY_JDBC_RESULT_SET</b> - The PARAMETER STYLE is DERBY_JDBC_RESULT_SET
-if and only if this is a Derby-style table function, that is, a function which
-returns
-<xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctiontabletype">TableType</xref>
-and which is mapped to a method which returns a JDBC <i>ResultSet</i>.</p>
-<p><b>DERBY</b> - The parameter style must be DERBY if and only if an ellipsis
-(<codeph>...</codeph>) appears at the end of the argument list.</p>
+An error will occur if you try to use one of these long column types.</p></dd>
+</dlentry>
+<dlentry>
+<dt>DERBY_JDBC_RESULT_SET</dt>
+<dd>The PARAMETER STYLE is DERBY_JDBC_RESULT_SET if and only if this is a
+<ph conref="../conrefs.dita#prod/productshortname"></ph>-style table function,
+that is, a function which returns
+<i><xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrfunctiontabletype">tableType</xref></i>
+and which is mapped to a method which returns a JDBC <i>ResultSet</i>.</dd>
+</dlentry>
+<dlentry>
+<dt>DERBY</dt>
+<dd>The parameter style must be DERBY if and only if an ellipsis
+(<codeph>...</codeph>) appears at the end of the argument list.</dd>
+</dlentry>
+</dl>
 </section>
 <section id="rrefcrfunctiondefrts"><title>EXTERNAL SECURITY</title>
 <p>If SQL authorization mode is enabled, a function runs by default with the

Modified: db/derby/docs/branches/10.10/src/ref/rrefcreateprocedurestatement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefcreateprocedurestatement.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefcreateprocedurestatement.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefcreateprocedurestatement.dita Mon Sep 30 14:52:27 2013
@@ -33,43 +33,39 @@ procedure owner and the 
 automatically gain the EXECUTE privilege
 on the procedure, and are able to grant this privilege to other users. The
 EXECUTE privileges cannot be revoked from the procedure and database owners.</p>
-
-<p>
-For details on how Derby matches procedures to Java methods,
-see <xref href="rrefsqljargmatching.dita#rrefsqljargmatching"></xref>.
-</p>
-
+<p>For details on how <ph conref="../conrefs.dita#prod/productshortname"></ph>
+matches procedures to Java methods, see
+<xref href="rrefsqljargmatching.dita#rrefsqljargmatching"></xref>.</p>
 </section>
-<refsyn><title>Syntax</title><codeblock><b>CREATE PROCEDURE <i><xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedurename"
->procedure-Name</xref></i> ( [ <xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedureparameter">ProcedureParameter</xref>
-   [, <xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedureparameter">ProcedureParameter</xref>]* [...] ]  )
-[ <xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedureelement">ProcedureElement</xref> ]*</b></codeblock>
+<refsyn><title>Syntax</title>
+<codeblock><b>CREATE PROCEDURE <i><xref
+href="rrefprocedurename.dita#rrefprocedurename.dita">procedureName</xref></i> ( [ <i><xref
+href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedureparameter">procedureParameter</xref></i>
+   [ , <i><xref
+href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedureparameter">procedureParameter</xref></i> ]* [...] ] )
+[ <i><xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedureelement">procedureElement</xref></i> ]*</b>
+</codeblock>
 <p>An ellipsis (<codeph>...</codeph>) after the last parameter indicates that
 the Java method supports trailing optional arguments, called
 <term>varargs</term>. The ellipsis indicates that the method may be invoked
 with zero or more trailing values, all having the data type of the last
 argument.</p></refsyn>
-<example id="rrefcrproprocedurename"><title>procedure-Name</title><codeblock><b>[ <i><xref
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></example>
-<section><p>If schema-Name is not provided, the current schema is the default
-schema. If a qualified procedure name is specified, the schema name cannot
-begin with SYS.</p></section>
-<example id="rrefcrproprocedureparameter"> <title>ProcedureParameter</title><codeblock><b>[ { IN | OUT | INOUT } ] [ parameter-Name ] <i>DataType</i
+<example id="rrefcrproprocedureparameter"> <title>procedureParameter</title><codeblock><b>[ { IN | OUT | INOUT } ] [ <i>parameterName</i> ] <i>dataType</i
 ></b></codeblock></example>
-<section><p>The default value for a parameter is IN. ParameterName must be
-unique within a procedure.</p><p>The syntax of <i>DataType</i> is described
+<section><p>The default value for a parameter is IN. A <i>parameterName</i> must be
+unique within a procedure.</p><p>The syntax of <i>dataType</i> is described
 in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p><note>The data
 types BLOB, CLOB, LONG VARCHAR, LONG VARCHAR FOR BIT DATA, and XML are not
 allowed as parameters in a CREATE PROCEDURE statement.</note></section>
-<example id="rrefcrproprocedureelement"> <title>ProcedureElement</title><codeblock><b> { 
-| [ DYNAMIC ] RESULT SETS <i><xref href="rrefsqlj10696.dita#rrefsqlj10696">INTEGER</xref></i>
-| LANGUAGE { JAVA }
-| <xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproceduredetchar">DeterministicCharacteristic</xref>
-| EXTERNAL NAME <i>string</i>
-| PARAMETER STYLE { JAVA | DERBY }
-| EXTERNAL SECURITY { DEFINER | INVOKER }
-| { NO SQL | MODIFIES SQL DATA | CONTAINS SQL | READS SQL DATA }
+<example id="rrefcrproprocedureelement"> <title>procedureElement</title>
+<codeblock><b>{ 
+    [ DYNAMIC ] RESULT SETS <i><xref href="rrefsqlj10696.dita#rrefsqlj10696">integer</xref></i> |
+    LANGUAGE { JAVA } |
+    <i><xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproceduredetchar">deterministicCharacteristic</xref></i> |
+    EXTERNAL NAME <i>string</i> |
+    PARAMETER STYLE { JAVA | DERBY } |
+    EXTERNAL SECURITY { DEFINER | INVOKER } |
+    { NO SQL | MODIFIES SQL DATA | CONTAINS SQL | READS SQL DATA }
  }
 </b></codeblock></example>
 <section><title>DYNAMIC RESULT SETS <i>integer</i></title> <p>Indicates the
@@ -82,23 +78,33 @@ call the procedure as a public static me
 the Java method to be called when the procedure is executed, and takes the
 following form: <codeblock>class_name.method_name</codeblock>The External
 Name cannot have any extraneous spaces.</p></section>
-<section id="rrefcrproceduredetchar"><title>DeterministicCharacteristic</title>
+<section id="rrefcrproceduredetchar"><title>deterministicCharacteristic</title>
 <codeblock><b>DETERMINISTIC | NOT DETERMINISTIC</b></codeblock>
 <p>Declares that the procedure is deterministic, meaning that with the same
 set of input values, it always computes the same result. The default is NOT
 DETERMINISTIC. <ph conref="../conrefs.dita#prod/productshortname"></ph> cannot
 recognize whether an operation is actually deterministic, so you must take care
-to specify the <codeph>DeterministicCharacteristic</codeph> correctly. </p>
+to specify the <i>deterministicCharacteristic</i> correctly. </p>
 </section>
-<section><title>PARAMETER STYLE</title> <p><b>JAVA</b> - The procedure will
-use a parameter-passing convention that conforms to the Java language and
-SQL Routines specification. INOUT and OUT parameters will be passed as single
-entry arrays to facilitate returning values. Result sets are returned through
-additional parameters to the Java method of type <i>java.sql.ResultSet[]</i> that are passed single entry arrays.</p> <p><ph conref="../conrefs.dita#prod/productshortname"></ph> does
+<section><title>PARAMETER STYLE</title>
+<dl>
+<dlentry>
+<dt>JAVA</dt>
+<dd>The procedure will use a parameter-passing convention that conforms to the
+Java language and SQL Routines specification. INOUT and OUT parameters will be
+passed as single entry arrays to facilitate returning values. Result sets are
+returned through additional parameters to the Java method of type
+<i>java.sql.ResultSet[]</i> that are passed single entry arrays.
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> does
 not support long column types (for example, LONG VARCHAR, BLOB, and so on).
-An error will occur if you try to use one of these long column types. </p>
-<p><b>DERBY</b> - The parameter style must be DERBY if and only if an ellipsis
-(<codeph>...</codeph>) appears at the end of the argument list.</p>
+An error will occur if you try to use one of these long column types.</p></dd>
+</dlentry>
+<dlentry>
+<dt>DERBY</dt>
+<dd>The parameter style must be DERBY if and only if an ellipsis
+(<codeph>...</codeph>) appears at the end of the argument list.</dd>
+</dlentry>
+</dl>
 </section>
 <section id="rrefcrprodefrts"><title>EXTERNAL SECURITY</title>
 <p>If SQL authorization mode is enabled, a procedure runs by default with the

Modified: db/derby/docs/branches/10.10/src/ref/rrefcursorname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefcursorname.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefcursorname.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefcursorname.dita Mon Sep 30 14:52:27 2013
@@ -19,15 +19,15 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefcursorname" xml:lang="en-us">
-<title>cursor-Name</title>
+<title>cursorName</title>
 <refbody>
-<section><p>A <i>cursor-Name</i> refers to a cursor. No SQL language command
+<section><p>A <i>cursorName</i> refers to a cursor. No SQL language command
 exists to <i>assign</i> a name to a cursor. Instead, you use the JDBC API
 to assign names to cursors or to retrieve system-generated names. For more
 information, see the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite>.
 If you assign a name to a cursor, you can refer to that name from within SQL
 statements.</p></section>
-<section><p>You cannot qualify a <i>cursor-Name</i>.</p></section>
+<section><p>You cannot qualify a <i>cursorName</i>.</p></section>
 <section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
 <section><title>Example</title> <codeblock><b>stmt.executeUpdate("UPDATE SAMP.STAFF SET COMM = " +
 "COMM + 20 " + "WHERE CURRENT OF " + ResultSet.getCursorName());</b></codeblock></section>

Modified: db/derby/docs/branches/10.10/src/ref/rrefdeclaretemptable.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefdeclaretemptable.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefdeclaretemptable.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefdeclaretemptable.dita Mon Sep 30 14:52:27 2013
@@ -41,24 +41,27 @@ the temporary table is dropped.</p></sec
 system catalog.</li>
 </ul></p></section>
 <section><title>Syntax</title> <codeblock><b>DECLARE GLOBAL TEMPORARY TABLE <i><xref
-href="rrefdeclaretemptable.dita#rrefdeclaretemptable/tempcoltablename">table-Name</xref></i>
-    { column-definition [ , column-definition ] * }
-[ ON COMMIT {DELETE | PRESERVE} ROWS ]  
-NOT LOGGED [ON ROLLBACK DELETE ROWS]
+href="rrefdeclaretemptable.dita#rrefdeclaretemptable/tempcoltablename">tempTableName</xref></i>
+    { <i><xref
+href="rrefdeclaretemptable.dita#rrefdeclaretemptable/tempcolcolumndef">columnDefinition</xref></i> [ , <i><xref
+href="rrefdeclaretemptable.dita#rrefdeclaretemptable/tempcolcolumndef">columnDefinition</xref></i> ]* }
+[ ON COMMIT { DELETE | PRESERVE } ROWS ]  
+NOT LOGGED [ ON ROLLBACK DELETE ROWS ]
  </b></codeblock></section>
-<section id="tempcoltablename"><title>table-Name</title><p>Names the temporary
-table. If a schema-Name other than SESSION is specified, an error will occur
-(SQLSTATE 428EK). If the schema-Name is not specified, SESSION is assigned.
+<section id="tempcoltablename"><title>tempTableName</title><p>Names the temporary
+table. If a <i><xref 
+href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> other than SESSION is specified, an error will occur
+(SQLSTATE 428EK). If the <i>schemaName</i> is not specified, SESSION is assigned.
 Multiple connections can define declared global temporary tables with the
 same name because each connection has its own unique table descriptor for
 it.</p><p>Using SESSION as the schema name of a physical table will not cause
 an error, but is discouraged. The SESSION schema name should be reserved for
 the temporary table schema.</p></section>
-<section id="tempcolcolumndef"><title>column-definition</title><p>See <xref
-href="rrefsqlj30540.dita#rrefsqlj30540"></xref> for <codeph>CREATE TABLE</codeph> for
-more information on <codeph>column-definition</codeph>. <codeph>DECLARE GLOBAL
-TEMPORARY TABLE</codeph> does not allow <codeph>generated-column-spec</codeph> in
-the <codeph>column-definition</codeph>.</p></section>
+<section id="tempcolcolumndef"><title>columnDefinition</title><p>See <i><xref
+href="rrefsqlj30540.dita#rrefsqlj30540"></xref></i> for CREATE TABLE for more
+information on <i>columnDefinition</i>. DECLARE GLOBAL TEMPORARY TABLE does not
+allow <i>generatedColumnSpec</i> in the <i>columnDefinition</i>.</p>
+</section>
 <section id="rreftemptabledatatype"><title>Data type</title><p>Supported data
 types are: <ul>
 <li>BIGINT</li>

Modified: db/derby/docs/branches/10.10/src/ref/rrefdropfunctionstatement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefdropfunctionstatement.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefdropfunctionstatement.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefdropfunctionstatement.dita Mon Sep 30 14:52:27 2013
@@ -21,10 +21,11 @@ limitations under the License.
 <reference id="rrefdropfunctionstatement" xml:lang="en-us">
 <title>DROP FUNCTION statement</title>
 <refbody>
-<section><title>Syntax</title> <codeblock><b>DROP FUNCTION <i>function-name</i></b></codeblock> <p>Identifies
-the particular function to be dropped, and is valid only if there is exactly
-one function instance with the <i>function-name</i> in the schema. The identified
-function can have any number of parameters defined for it.</p>
+<section><title>Syntax</title> <codeblock><b>DROP FUNCTION <i><xref
+href="rreffunctionname.dita#rreffunctionname">functionName</xref></i></b></codeblock>
+<p>Identifies the particular function to be dropped, and is valid only if there
+is exactly one function instance with the <i>functionName</i> in the schema.
+The identified function can have any number of parameters defined for it.</p>
 <p>An error will occur in any of the following circumstances:</p>
 <ul>
 <li>If no function with the indicated name exists in the named or implied schema
@@ -32,7 +33,9 @@ function can have any number of paramete
 <li>If there is more than one specific instance of the function in the named or
 implied schema</li>
 <li>If you try to drop a user-defined function that is invoked in the
-<i>generation-clause</i> of a generated column</li>
+<i><xref
+href="rrefsqljgenerationclause.dita#rrefsqljgenerationclause">generationClause</xref></i>
+of a generated column</li>
 <li>If you try to drop a user-defined function that is invoked in a view</li>
 </ul>
 </section>

Modified: db/derby/docs/branches/10.10/src/ref/rrefdropprocedurestatement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefdropprocedurestatement.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefdropprocedurestatement.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefdropprocedurestatement.dita Mon Sep 30 14:52:27 2013
@@ -20,13 +20,16 @@ limitations under the License.
 <reference id="rrefdropprocedurestatement" xml:lang="en-us">
 <title>DROP PROCEDURE statement</title>
 <refbody>
-<section><title>Syntax</title> <codeblock><b>DROP PROCEDURE <i><xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedurename">procedure-Name</xref></i></b></codeblock> <p>Identifies
-the particular procedure to be dropped, and is valid only if there is exactly
-one procedure instance with the <i>procedure-name</i> in the schema. The identified
-procedure can have any number of parameters defined for it. If no procedure
-with the indicated name in the named or implied schema, an error (SQLSTATE
-42704) will occur. An error will also occur if there is more than one specific
-instance of the procedure in the named or implied schema.</p></section>
+<section><title>Syntax</title> <codeblock><b>DROP PROCEDURE <i><xref
+href="rrefprocedurename.dita#rrefprocedurename.dita">procedureName</xref></i></b>
+</codeblock>
+<p>Identifies the particular procedure to be dropped, and is valid only if there
+is exactly one procedure instance with the <i>procedureName</i> in the schema.
+The identified procedure can have any number of parameters defined for it. If no
+procedure with the indicated name in the named or implied schema, an error
+(SQLSTATE 42704) will occur. An error will also occur if there is more than one
+specific instance of the procedure in the named or implied schema.</p>
+</section>
 </refbody>
 </reference>
 

Modified: db/derby/docs/branches/10.10/src/ref/rrefindexname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefindexname.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefindexname.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefindexname.dita Mon Sep 30 14:52:27 2013
@@ -19,15 +19,19 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefindexname" xml:lang="en-us">
-<title>index-Name</title>
+<title>indexName</title>
 <refbody>
-<section><p>An <i>index-Name</i> represents an index. Indexes live in schemas,
-so you can qualify their names with <i>schema-Names</i>. Indexes on system
-tables are in the <i>SYS</i> schema.</p></section>
+<section><p>An <i>indexName</i> represents an index. To create an index, use
+the <xref
+href="rrefsqlj20937.dita#rrefsqlj20937">CREATE INDEX statement</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></section>
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
+<p>You can qualify an index name with a <i>schemaName</i>. If a qualified
+index name is specified, the schema name cannot begin with SYS.</p>
+</section>
 <section><title>Example</title> <codeblock><b>DROP INDEX APP.ORIGINDEX;
-<ph>-- OrigIndex is an index-Name without a schema-Name </ph>
+<ph>-- OrigIndex is an indexName without a schemaName </ph>
 CREATE INDEX ORIGINDEX ON FLIGHTS (ORIG_AIRPORT)</b></codeblock></section>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.10/src/ref/rrefjdbc37244.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefjdbc37244.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefjdbc37244.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefjdbc37244.dita Mon Sep 30 14:52:27 2013
@@ -44,7 +44,7 @@ FROM
 SELECT *
 FROM
 {oj Countries JOIN Cities ON (Countries.country_ISO_code=Cities.country_ISO_code)}
-<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 E.EMPNO, E.LASTNAME, M.EMPNO, M.LASTNAME
 FROM {oj EMPLOYEE E INNER JOIN DEPARTMENT

Modified: db/derby/docs/branches/10.10/src/ref/rrefnewtablename.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefnewtablename.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefnewtablename.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefnewtablename.dita Mon Sep 30 14:52:27 2013
@@ -19,12 +19,16 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefnewtablename" xml:lang="en-us">
-<title>new-table-Name</title>
+<title>newTableName</title>
 <refbody>
-<section><p>A <i>new-table-Name</i> represents a renamed table. You cannot
-qualify a <i>new-table-Name</i> with a <i>schema-Name</i>.</p></section>
+<section><p>A <i>newTableName</i> represents a renamed table (see
+<xref
+href="rrefsqljrenametablestatement.dita#rrefsqljrenametablestatement"></xref>).
+You cannot qualify a <i>newTableName</i> with a <i>schemaName</i>.</p>
+</section>
 <section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
-<section><title>Example</title> <codeblock><b><ph>-- FlightBooks is a new-table-Name that does not include a schema-Name</ph>
+<section><title>Example</title>
+<codeblock><b><ph>-- FLIGHTAVAILABLE is a newTableName</ph>
 RENAME TABLE FLIGHTAVAILABILITY TO FLIGHTAVAILABLE</b></codeblock></section>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.10/src/ref/rrefrauthid.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefrauthid.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefrauthid.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefrauthid.dita Mon Sep 30 14:52:27 2013
@@ -19,7 +19,7 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefrauthid" xml:lang="en-us">
-<title>AuthorizationIdentifier</title>
+<title>authorizationIdentifier</title>
 <refbody>
 <section><p>User names within the <ph conref="../conrefs.dita#prod/productshortname"></ph> system
 are known as <i>authorization identifiers</i>. The authorization identifier

Modified: db/derby/docs/branches/10.10/src/ref/rrefrolename.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefrolename.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefrolename.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefrolename.dita Mon Sep 30 14:52:27 2013
@@ -18,10 +18,10 @@ limitations under the License.
 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference id="rrefrolename" xml:lang="en-us">
-<title>RoleName</title>
+<title>roleName</title>
 <refbody>
 <section>
-<p>A <i>RoleName</i> refers to an SQL role. A role in a database is uniquely
+<p>A <i>roleName</i> refers to an SQL role. A role in a database is uniquely
 identified by its role name.</p>
 </section>
 <refsyn><title>Syntax</title> 
@@ -31,7 +31,7 @@ identified by its role name.</p>
 </refsyn>
 <section>
 <p>In terms of SQL, a role name is also technically an 
-<i><xref href="rrefrauthid.dita#rrefrauthid">AuthorizationIdentifier</xref></i>,
+<i><xref href="rrefrauthid.dita#rrefrauthid">authorizationIdentifier</xref></i>,
 but that term is often used for user names in
 <ph conref="../conrefs.dita#prod/productshortname"></ph> for historical reasons.
 </p>

Modified: db/derby/docs/branches/10.10/src/ref/rrefscalarsubquery.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefscalarsubquery.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefscalarsubquery.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefscalarsubquery.dita Mon Sep 30 14:52:27 2013
@@ -18,25 +18,25 @@ See the License for the specific languag
 limitations under the License.
 -->
 <reference id="rrefscalarsubquery" xml:lang="en-us">
-<title>ScalarSubquery</title>
+<title>scalarSubquery</title>
 <prolog><metadata>
-<keywords><indexterm>ScalarSubquery</indexterm></keywords>
+<keywords><indexterm>scalarSubquery</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>You can place a <i>ScalarSubquery</i> anywhere an <i>Expression</i> is
-permitted. A <i>ScalarSubquery</i> turns a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> result
+<section> <p>You can place a <i>scalarSubquery</i> anywhere an <i>expression</i> is
+permitted. A <i>scalarSubquery</i> turns a <i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref></i> result
 into a scalar value because it returns only a single row and column value.</p> <p>The
 query must evaluate to a single row with a single column.</p> <p><indexterm>Expression
 subquery</indexterm>Sometimes also called an expression subquery.</p></section>
 <refsyn><title>Syntax</title>
-<codeblock><b>( <i><xref href="rrefsqlj21571.dita#rrefsqlj21571">Query</xref></i>
+<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> ]
 )</b></codeblock>
 </refsyn>
 <example><title>Examples</title><codeblock><b><ph>-- avg always returns a single value, so the subquery is
--- a ScalarSubquery</ph>
+-- a scalarSubquery</ph>
 SELECT NAME, COMM
   FROM STAFF
   WHERE EXISTS

Modified: db/derby/docs/branches/10.10/src/ref/rrefschemaname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefschemaname.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefschemaname.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefschemaname.dita Mon Sep 30 14:52:27 2013
@@ -27,16 +27,21 @@ to name a subset of tables and other dic
 is the <i>APP</i> schema (if no user name is specified at connection time).
 You cannot create objects in schemas starting with SYS.</p></section>
 <section><p>Thus, you can qualify references to tables with the schema name.
-When a schemaName is not specified, the default schema name is implicitly
-inserted. System tables are placed in the <i>SYS</i> schema. You must qualify
-all references to system tables with the <i>SYS</i> schema identifier. For
+When a <i>schemaName</i> is not specified, the default schema name is implicitly
+inserted. System tables are placed in the SYS schema. You must qualify
+all references to system tables with the SYS schema identifier. For
 more information about system tables, see <xref href="rrefsistabs38369.dita#rrefsistabs38369"></xref>.</p></section>
 <section><p>A schema is hierarchically the highest level of dictionary object,
-so you cannot qualify a schemaName.</p></section>
-<section><title>Syntax</title><codeblock><i>SQL92Identifier</i></codeblock></section>
-<section><title>Example</title><codeblock>-- SAMP.EMPLOYEE is a table-Name qualified by a schemaName
+so you cannot qualify a <i>schemaName</i>.</p></section>
+<section><title>Syntax</title>
+<codeblock>
+<b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b>
+</codeblock>
+</section>
+<section><title>Example</title>
+<codeblock><b>-- SAMP.EMPLOYEE is a tableName qualified by a schemaName
 SELECT COUNT(*) FROM SAMP.EMPLOYEE
--- You must qualify system catalog names with their schema, SYS
-SELECT COUNT(*) FROM SYS.SysColumns</codeblock></section>
+-- You must qualify system table names with their schema, SYS
+SELECT COUNT(*) FROM SYS.SysColumns</b></codeblock></section>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.10/src/ref/rrefselectexpression.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefselectexpression.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefselectexpression.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefselectexpression.dita Mon Sep 30 14:52:27 2013
@@ -18,17 +18,17 @@ See the License for the specific languag
 limitations under the License.
 -->
 <reference id="rrefselectexpression" xml:lang="en-us">
-<title>SelectExpression</title>
+<title>selectExpression</title>
 <prolog><metadata>
 <keywords><indexterm>Select expression</indexterm><indexterm>DISTINCT clause<indexterm>part
-of SelectExpression</indexterm><indexterm>* as wildcard in SQL SELECT</indexterm></indexterm>
+of selectExpression</indexterm><indexterm>* as wildcard in SQL SELECT</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>A <i>SelectExpression</i> is the basic SELECT-FROM-WHERE construct
+<section> <p>A <i>selectExpression</i> is the basic SELECT-FROM-WHERE construct
 used to build a table value based on filtering and projecting values from
 other tables.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>SELECT [ DISTINCT | ALL ] <i>SelectItem</i> [ , <i>SelectItem </i>]*
+<refsyn><title>Syntax</title> <codeblock><b>SELECT [ DISTINCT | ALL ] <i>selectItem</i> [ , <i>selectItem </i>]*
 <i><xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM clause</xref></i>
 [ <i><xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref> </i>]
 [ <i><xref href="rrefsqlj32654.dita#rrefsqlj32654">GROUP BY clause</xref></i> ]
@@ -38,21 +38,21 @@ other tables.</p></section>
 [ <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><b>SelectItem:</b></p> <codeblock><b>{
+<p><b>selectItem:</b></p> <codeblock><b>{
     * |
-    { <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i> | <i><xref
-href="rrefcorrelationname.dita#rrefcorrelationname">correlation-Name</xref></i> } .* |
-    <i>Expression</i> [AS <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref> </i>]
+    { <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i> | <i><xref
+href="rrefcorrelationname.dita#rrefcorrelationname">correlationName</xref></i> } .* |
+    <i>expression</i> [AS <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref> </i>]
 }</b></codeblock> <p>The SELECT clause contains a list of expressions and
 an optional quantifier that is applied to the results of the <xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM
 clause</xref> and the <xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE
 clause</xref>. If DISTINCT is specified, only one copy of any row value is
 included in the result. Nulls are considered duplicates of one another for
 the purposes of DISTINCT. If no quantifier, or ALL, is specified, no rows
-are removed from the result in applying the SELECT clause (ALL is the default).</p> <p>A<i> SelectItem</i> projects
-one or more result column values for a table result being constructed in a <i>SelectExpression</i>.</p> 
+are removed from the result in applying the SELECT clause (ALL is the default).</p> <p>A <i>selectItem</i> projects
+one or more result column values for a table result being constructed in a <i>selectExpression</i>.</p> 
 <p>For queries that do not select a specific column from the tables involved in
-the <i>SelectExpression</i> (for example, queries that use
+the <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. See
 <xref href="rrefsqljgrant.dita#rrefsqljgrant"></xref> for more information.</p>
@@ -75,7 +75,7 @@ SELECT COUNT(*),WORK_DEPT,AVG(SALARY)
      FROM EMPLOYEE
      GROUP BY WORK_DEPT
      ORDER BY 3</b></codeblock></p> <p>If there is no GROUP BY clause, but
-a <i>SelectItem</i> contains an aggregate not in a subquery, the query is
+a <i>selectItem</i> contains an aggregate not in a subquery, the query is
 implicitly grouped. The entire table is the single group.</p> <p>The HAVING
 clause restricts a grouped table, specifying a search condition (much like
 a WHERE clause) that can refer only to grouping columns or aggregates from
@@ -86,7 +86,7 @@ If there is a HAVING clause but no GROUP
 into one group for the entire table.</p>
 <p>The WINDOW clause allows you to refer to a window by name when you use a
 <xref href="rreffuncrownumber.dita#rreffuncrownumber"></xref> in a
-<i>SelectExpression</i>.
+<i>selectExpression</i>.
 </p>
 <p>The ORDER BY clause allows you to specify the order in which rows appear in
 the result set. In subqueries, the ORDER BY clause is meaningless unless it is
@@ -97,7 +97,7 @@ set before starting to return any rows. 
 combined with the result offset clause if desired, limits the number of rows
 returned in the result set.</p>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> processes
-a <i>SelectExpression</i> in the following order:   <ul>
+a <i>selectExpression</i> in the following order:   <ul>
 <li>FROM clause</li>
 <li>WHERE clause</li>
 <li>GROUP BY (or implicit GROUP BY)</li>
@@ -107,9 +107,9 @@ a <i>SelectExpression</i> in the followi
 <li>Result offset clause</li>
 <li>Fetch first clause</li>
 <li>SELECT clause</li>
-</ul></p> <p>The result of a <i>SelectExpression</i> is always a table.</p> <p>When
+</ul></p> <p>The result of a <i>selectExpression</i> is always a table.</p> <p>When
 a query does not have a FROM clause (when you are constructing a value, not
-getting data out of a table), you use a VALUES expression, not a <i>SelectExpression</i>.
+getting data out of a table), you use a VALUES expression, not a <i>selectExpression</i>.
 For example:   <codeblock><b>VALUES CURRENT_TIMESTAMP</b></codeblock></p> <p>See <xref
 href="rrefsqlj11277.dita#rrefsqlj11277"></xref>.</p> </refsyn>
 <section id="sqlj38441"><title>The * wildcard</title> <p>* expands to all
@@ -117,13 +117,13 @@ columns in the tables in the associated 
 href="rrefcorrelationname.dita#rrefcorrelationname">correlation-Name</xref>.*</i> expand
 to all columns in the identified table. That table must be listed in the associated
 FROM clause.</p> </section>
-<section><title>Naming columns</title> <p>You can name a <i>SelectItem</i> column
-using the AS clause. If a column of a <i>SelectItem</i> is not a simple <i>ColumnReference</i> expression
+<section><title>Naming columns</title> <p>You can name a <i>selectItem</i> column
+using the AS clause. If a column of a <i>selectItem</i> is not a simple <i>columnReference</i> expression
 or named with an AS clause, it is given a generated unique name.</p><p>These
 column names are useful in several cases:   <ul>
 <li>They are made available on the JDBC <i>ResultSetMetaData</i>.</li>
 <li>They are used as the names of the columns in the resulting table when
-the <i>SelectExpression</i> is used as a table subquery in a FROM clause.</li>
+the <i>selectExpression</i> is used as a table subquery in a FROM clause.</li>
 <li>They are used in the ORDER BY clause as the column names available for
 sorting.</li>
 </ul></p> </section>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsetrole.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsetrole.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsetrole.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsetrole.dita Mon Sep 30 14:52:27 2013
@@ -36,7 +36,7 @@ if the role has been granted to PUBLIC.<
 </section>
 <refsyn><title>Syntax</title> 
 <codeblock>
-<b>SET ROLE { <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> | 'string-constant' | ? | NONE }
+<b>SET ROLE { <i><xref href="rrefrolename.dita#rrefrolename">roleName</xref></i> | '<i>stringConstant</i>' | ? | NONE }
 </b></codeblock>
 </refsyn>
 <section>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsimplecolumnname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsimplecolumnname.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsimplecolumnname.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsimplecolumnname.dita Mon Sep 30 14:52:27 2013
@@ -19,14 +19,14 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefsimplecolumnname" xml:lang="en-us">
-<title>Simple-column-Name</title>
+<title>simpleColumnName</title>
 <refbody>
-<section><p>A <i>Simple-column-Name</i> is used to represent a column when
-it cannot be qualified by a <i>table-Name</i> or<i> correlation-Name</i>.
+<section><p>A <i>simpleColumnName</i> is used to represent a column when
+it cannot be qualified by a <i>tableName</i> orb<i>correlationName</i>.
 This is the case when the qualification is fixed, as it is in a column definition
 within a CREATE TABLE statement.</p></section>
 <section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
-<section><title>Example</title> <codeblock><b><ph>-- country is a Simple-column-Name</ph>
+<section><title>Example</title> <codeblock><b><ph>-- country is a simpleColumnName</ph>
 CREATE TABLE CONTINENT (COUNTRY VARCHAR(26) NOT NULL PRIMARY KEY,
 COUNTRY_ISO_CODE CHAR(2), REGION VARCHAR(26))</b></codeblock></section>
 </refbody>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj1080779.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj1080779.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj1080779.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj1080779.dita Mon Sep 30 14:52:27 2013
@@ -26,7 +26,7 @@ of</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
 <section><p>Precedence of operations from highest to lowest is:   <ul>
-<li>(), ?, Constant (including sign), NULL, <i>ColumnReference</i>, <i>ScalarSubquery</i>,
+<li>(), ?, Constant (including sign), NULL, <i>columnReference</i>, <i>scalarSubquery</i>,
 CAST</li>
 <li>LENGTH, CURRENT_DATE, CURRENT_TIME, CURRENT_TIMESTAMP, and other built-ins</li>
 <li>unary + and -</li>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj11277.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj11277.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj11277.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj11277.dita Mon Sep 30 14:52:27 2013
@@ -35,15 +35,16 @@ you normally use a VALUES expression whe
 <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i>)</li>
 </ul></p> </section>
 <refsyn><title>Syntax</title> <codeblock><b>{
-    VALUES ( <i>Value</i> {, <i>Value</i> }* )
-        [ , ( <i>Value</i> {, <i>Value</i> }* ) ]* |
-    VALUES <i>Value</i> [ , <i>Value</i> ]*
+    VALUES ( <i>value</i> [ , <i>value</i> ]* )
+        [ , ( <i>value</i> [ , <i>value</i> ]* ) ]*
+  |
+    VALUES <i>value</i> [ , <i>value</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>where <i>Value</i> is defined as</p>
-<codeblock><b><i>Expression</i> | DEFAULT</b></codeblock>
+<p>where <i>value</i> is defined as</p>
+<codeblock><b><i>expression</i> | DEFAULT</b></codeblock>
 <p>The first form constructs multi-column rows. The second
 form constructs single-column rows, each expression being the value of the
 column of the row.</p> <p>The DEFAULT keyword is allowed only if the VALUES

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj13083.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj13083.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj13083.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj13083.dita Mon Sep 30 14:52:27 2013
@@ -27,13 +27,13 @@ limitations under the License.
 <section> <p>SUM is an aggregate function that evaluates the sum of the
 expression over a set of rows (see <xref href="rrefsqlj33923.dita#rrefsqlj33923"></xref>).
 SUM is allowed only on expressions that evaluate to numeric data types.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>SUM ( [ DISTINCT | ALL ] <i>Expression</i> )</b></codeblock> <p>The
+<refsyn><title>Syntax</title> <codeblock><b>SUM ( [ DISTINCT | ALL ] <i>expression</i> )</b></codeblock> <p>The
 DISTINCT and ALL qualifiers eliminate or retain 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, SUM(col) returns a greater value than SUM(DISTINCT
-col).</p> <p>Only one DISTINCT aggregate expression per <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> is
+col).</p> <p>Only one DISTINCT aggregate expression per <i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref></i> is
 allowed. For example, the following query is not allowed:   <codeblock><b>SELECT AVG (DISTINCT flying_time), SUM (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 numeric data type. If an expression
 evaluates to NULL, the aggregate skips that value.</p> <p>The resulting data

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj13590.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj13590.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj13590.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj13590.dita Mon Sep 30 14:52:27 2013
@@ -32,12 +32,14 @@ page size for</indexterm><indexterm>spec
 href="rrefsqlj81859.dita#rrefsqlj81859">ALTER TABLE statement</xref>. A constraint is a rule to which data
 must conform. Constraint names are optional.</p> <p>A CONSTRAINT can be one
 of the following:   <ul>
-<li><indexterm>Column-level constraints</indexterm><indexterm>Constraints<indexterm>column-level</indexterm></indexterm>a
-column-level constraint   <p>Column-level constraints refer to a single column
+<li><indexterm>Column-level constraints</indexterm><indexterm>Constraints<indexterm>column-level</indexterm></indexterm>
+A <i><xref href="rrefsqlj16095.dita#rrefsqlj16095">columnLevelConstraint</xref></i>
+<p>Column-level constraints refer to a single column
 in the table and do not specify a column name (except check constraints).
 They refer to the column that they follow.</p></li>
-<li><indexterm>Table-level constraints</indexterm><indexterm>Constraints<indexterm>table-level</indexterm></indexterm>a
-table-level constraint   <p>Table-level constraints refer to one or more columns
+<li><indexterm>Table-level constraints</indexterm><indexterm>Constraints<indexterm>table-level</indexterm></indexterm>
+A <i><xref href="rrefsqlj42154.dita#rrefsqlj42154">tableLevelConstraint</xref></i>
+<p>Table-level constraints refer to one or more columns
 in the table. Table-level constraints specify the names of the columns to
 which they apply. Table-level CHECK constraints can refer to 0 or more columns
 in the table.</p></li>
@@ -166,8 +168,9 @@ for a check constraint. This search cond
 in the table. The search condition is applied to each row that is modified
 on an INSERT or UPDATE at the time of the row modification. The entire statement
 is aborted if any check constraint is violated.</p> </section>
-<section id="sqlj57077"><title>Requirements for search condition</title> <p>If
-a check constraint is specified as part of a column-definition, a column reference
+<section id="sqlj57077"><title>Requirements for search conditions</title> <p>If
+a check constraint is specified as part of a <i><xref
+href="rrefsqlj30540.dita#rrefsqlj30540">columnDefinition</xref></i>, a column reference
 can only be made to the same column. Check constraints specified as part of
 a table definition can have column references identifying columns previously
 defined in the CREATE TABLE statement.</p> <p>The search condition must always

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj13658.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj13658.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj13658.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj13658.dita Mon Sep 30 14:52:27 2013
@@ -49,31 +49,33 @@ fetch first clauses</xref> or in conjunc
 guarantee that the order is retained in the outer result set. It is permissible
 to combine ORDER BY on the outer query with ORDER BY in subqueries.</p>
 </section>
-<refsyn><title>Syntax</title><codeblock><b>ORDER BY { <i><xref href="rrefcolumnname.dita#rrefcolumnname"></xref></i> | <i>ColumnPosition</i> | <i
->Expression</i> }
+<refsyn><title>Syntax</title><codeblock><b>ORDER BY { <i><xref
+href="rrefcolumnname.dita#rrefcolumnname"></xref></i> | <i>columnPosition</i> | <i>expression</i> }
     [ ASC | DESC ]
     [ NULLS FIRST | NULLS LAST ]
-    [ , <i><xref href="rrefcolumnname.dita#rrefcolumnname"></xref></i> | <i>ColumnPosition</i> | <i>Expression</i> 
-    [ ASC | DESC ]
-    [ NULLS FIRST | NULLS LAST ]
-    ] * </b></codeblock><dl><dlentry>
-<dt>column-Name</dt>
-<dd>Refers to the names visible from the <varname>SelectItems</varname> in
+    [ , <i><xref href="rrefcolumnname.dita#rrefcolumnname"></xref></i> | <i>columnPosition</i> | <i>expression</i> 
+        [ ASC | DESC ]
+        [ NULLS FIRST | NULLS LAST ]
+    ]* </b></codeblock><dl><dlentry>
+<dt><i>columnName</i></dt>
+<dd>Refers to the names visible from the <varname>selectItems</varname> in
 the underlying query of the <xref href="rrefsqlj41360.dita#rrefsqlj41360"></xref>.
-The column-Name that you specify in the ORDER BY clause does not need to be
+The <i>columnName</i> that you specify in the ORDER BY clause does not need to be
 the SELECT list.</dd>
 </dlentry><dlentry>
-<dt>ColumnPosition</dt>
-<dd>An integer that identifies the number of the column in the <varname>SelectItems</varname> in
-the underlying query of the <xref href="rrefsqlj41360.dita#rrefsqlj41360"></xref>. <parmname>ColumnPosition</parmname> must
+<dt><i>columnPosition</i></dt>
+<dd>An integer that identifies the number of the column in the <varname>selectItems</varname> in
+the underlying query of the <xref
+href="rrefsqlj41360.dita#rrefsqlj41360"></xref>. The <i>columnPosition</i> must
 be greater than 0 and not greater than the number of columns in the result
 table. In other words, if you want to order by a column, that column must
 be specified in the SELECT list.</dd>
 </dlentry><dlentry>
-<dt>Expression</dt>
-<dd>A sort key expression, such as numeric, string, and datetime expressions. <i>Expression</i> can
-also be a row value expression such as a scalar subquery or case expression.
- </dd>
+<dt><i>expression</i></dt>
+<dd>A sort key expression, such as numeric, string, and datetime expressions. An
+<i>expression</i> can also be a row value expression such as a <i><xref
+href="rrefscalarsubquery.dita#rrefscalarsubquery">scalarSubquery</xref></i> or
+case expression.</dd>
 </dlentry><dlentry>
 <dt>ASC</dt>
 <dd>Specifies that the results should be returned in ascending order. If the

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj14854.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj14854.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj14854.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj14854.dita Mon Sep 30 14:52:27 2013
@@ -31,7 +31,8 @@ to the entire result as a single group. 
 to any column that does not have a GROUP BY clause. It can, however, refer
 to constants, aggregates, and special registers.</p></section>
 <refsyn><title>Syntax</title>
-<codeblock><b>HAVING <i>searchCondition</i></b></codeblock>
+<codeblock><b>HAVING <i><xref
+href="rrefsqlj91438.dita#rrefsqlj91438">searchCondition</xref></i></b></codeblock>
 <p>The <i>searchCondition</i>, which is a specialized <i>booleanExpression</i>, can contain only grouping columns (see <xref href="rrefsqlj32654.dita#rrefsqlj32654"/>), columns that are part of aggregate expressions,
 and columns that are part of a subquery. For example, the following query
 is illegal, because the column SALARY is not a grouping column, it does not

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj15309.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj15309.dita?rev=1527603&r1=1527602&r2=1527603&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj15309.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj15309.dita Mon Sep 30 14:52:27 2013
@@ -28,7 +28,7 @@ limitations under the License.
 statements. It allows you to perform positioned updates and deletes on updatable
 cursors. For more information about updatable cursors, see <xref href="rrefsqlj41360.dita#rrefsqlj41360"/>.</p></section>
 <refsyn><title>Syntax</title>
-<codeblock><b>WHERE CURRENT OF <i><xref href="rrefcursorname.dita#rrefcursorname">cursor-Name</xref></i></b></codeblock>
+<codeblock><b>WHERE CURRENT OF <i><xref href="rrefcursorname.dita#rrefcursorname">cursorName</xref></i></b></codeblock>
 </refsyn>
 <example><title>Example</title>
 <codeblock expanse="column">Statement s = conn.createStatement();



Mime
View raw message