db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1600717 - /db/derby/docs/trunk/src/ref/
Date Thu, 05 Jun 2014 18:14:04 GMT
Author: chaase3
Date: Thu Jun  5 18:14:03 2014
New Revision: 1600717

URL: http://svn.apache.org/r1600717
Log:
DERBY-6379  Manuals are inconsistent in their use of the <shortdesc> element

Modified 19 Reference Manual topics. I missed the scalarSubquery topic, so will include that
one in the next patch.

Patches: DERBY-6379-ref-exprs.diff

Modified:
    db/derby/docs/trunk/src/ref/crefsqlj1003454.dita
    db/derby/docs/trunk/src/ref/crefsqlj18919.dita
    db/derby/docs/trunk/src/ref/crefsqlj29911.dita
    db/derby/docs/trunk/src/ref/rrefsqlj1080779.dita
    db/derby/docs/trunk/src/ref/rrefsqlj1083019.dita
    db/derby/docs/trunk/src/ref/rrefsqlj11277.dita
    db/derby/docs/trunk/src/ref/rrefsqlj18922.dita
    db/derby/docs/trunk/src/ref/rrefsqlj19433.dita
    db/derby/docs/trunk/src/ref/rrefsqlj21571.dita
    db/derby/docs/trunk/src/ref/rrefsqlj23075.dita
    db/derby/docs/trunk/src/ref/rrefsqlj28468.dita
    db/derby/docs/trunk/src/ref/rrefsqlj29026.dita
    db/derby/docs/trunk/src/ref/rrefsqlj35034.dita
    db/derby/docs/trunk/src/ref/rrefsqlj57522.dita
    db/derby/docs/trunk/src/ref/rrefsqljcrossjoin.dita
    db/derby/docs/trunk/src/ref/rrefsqljnaturaljoin.dita
    db/derby/docs/trunk/src/ref/rrefsqljnextvaluefor.dita
    db/derby/docs/trunk/src/ref/rreftableexpression.dita
    db/derby/docs/trunk/src/ref/rreftablesubquery.dita

Modified: db/derby/docs/trunk/src/ref/crefsqlj1003454.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefsqlj1003454.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefsqlj1003454.dita (original)
+++ db/derby/docs/trunk/src/ref/crefsqlj1003454.dita Thu Jun  5 18:14:03 2014
@@ -20,14 +20,14 @@ limitations under the License.
  "../dtd/concept.dtd">
 <concept id="crefsqlj1003454" xml:lang="en-us">
 <title>Rules for SQL92 identifiers</title>
+<shortdesc>Ordinary identifiers are identifiers not surrounded by double
+quotation marks. Delimited identifiers are identifiers surrounded by double
+quotation marks.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>SQL92Identifiers<indexterm>rules for</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>Ordinary identifiers are identifiers not surrounded by double quotation
-marks. Delimited identifiers are identifiers surrounded by double quotation
-marks.</p>
 <p>An ordinary identifier must begin with a letter and contain only letters,
 underscore characters (_), and digits. The permitted letters and digits include
 all Unicode letters and digits, but <ph conref="../conrefs.dita#prod/productshortname"></ph>
does

Modified: db/derby/docs/trunk/src/ref/crefsqlj18919.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefsqlj18919.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefsqlj18919.dita (original)
+++ db/derby/docs/trunk/src/ref/crefsqlj18919.dita Thu Jun  5 18:14:03 2014
@@ -20,18 +20,25 @@ limitations under the License.
  "../dtd/concept.dtd">
 <concept id="crefsqlj18919" xml:lang="en-us">
 <title>SQL identifiers </title>
+<shortdesc>An <i>identifier</i> is the representation within the language
of
+items created by the user, as opposed to language keywords or
+commands.</shortdesc>
+<prolog><metadata>
+<keywords>
+<indexterm>SQL identifiers<indexterm>definition</indexterm></indexterm>
+<indexterm>identifiers<indexterm>definition</indexterm></indexterm>
+<indexterm>dictionary objects<indexterm>definition</indexterm></indexterm>
+<indexterm>SQL92Identifiers<indexterm>definition</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <conbody>
-<p><indexterm>SQL identifiers<indexterm>definition</indexterm></indexterm><indexterm>Identifiers<indexterm>definition</indexterm></indexterm>An
<i
->identifier</i> is the representation within the language of items created
-by the user, as opposed to language keywords or commands.  <indexterm>Dictionary
-objects<indexterm>definition</indexterm></indexterm>Some identifiers stand
-for <i>dictionary objects</i>, which are the objects you create- such as tables,
-views, indexes, columns, and constraints- that are stored in a database. They
+<p>Some identifiers stand
+for <i>dictionary objects</i>, which are the objects you create -- such as tables,
+views, indexes, columns, and constraints -- that are stored in a database. They
 are called dictionary objects because <ph conref="../conrefs.dita#prod/productshortname"></ph>
stores
 information about them in the system tables, sometimes known as a data dictionary.
 SQL also defines ways to alias these objects within certain statements.</p>
-<p><indexterm>SQL92Identifiers<indexterm>definition</indexterm></indexterm><indexterm>JavaIdentifiers<indexterm>definition</indexterm></indexterm
->Each kind of identifier must conform to a different set of rules. Identifiers
+<p>Each kind of identifier must conform to a different set of rules. Identifiers
 representing dictionary objects must conform to SQL-92 identifier rules and
 are thus called <i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref>s</i>.</p>
 </conbody>

Modified: db/derby/docs/trunk/src/ref/crefsqlj29911.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefsqlj29911.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefsqlj29911.dita (original)
+++ db/derby/docs/trunk/src/ref/crefsqlj29911.dita Thu Jun  5 18:14:03 2014
@@ -20,6 +20,11 @@ limitations under the License.
  "../dtd/concept.dtd">
 <concept id="crefsqlj29911" xml:lang="en-us">
 <title>Dynamic parameters</title>
+<shortdesc>You can prepare statements that are allowed to have parameters for
+which the value is not specified when the statement is prepared using
+<i>PreparedStatement</i> methods in the JDBC API. These parameters are called
+dynamic parameters and are represented by a question mark
+(<codeph>?</codeph>).</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Dynamic parameters</indexterm><indexterm>IN
(? or dynamic)
 parameters</indexterm><indexterm>Prepared statements<indexterm>use of dynamic
@@ -27,18 +32,10 @@ parameters in</indexterm></indexterm><in
 prepared statements</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>You can prepare statements that are allowed to have parameters for which
-the value is not specified when the statement is prepared using <i>PreparedStatement</i>
methods
-in the JDBC API. These parameters are called dynamic parameters and are represented
-by a ?.</p>
-<p>The JDBC API documents refer to dynamic parameters as IN, INOUT, or OUT
+<p>The JDBC API documentation refers to dynamic parameters as IN, INOUT, or OUT
 parameters. In SQL, they are always IN parameters.</p>
-<note othertype="New" type="other"><ph conref="../conrefs.dita#prod/productshortname"></ph>
supports
-the interface <i>ParameterMetaData</i>, new in JDBC 3.0. This interface describes
-the number, type, and properties of prepared statement parameters. See the <cite><ph
-conref="../conrefs.dita#pub/citdevelop"></ph></cite> for more information.</note>
-<p>You must specify values for them before executing the statement. The values
-specified must match the types expected.</p>
+<p>You must specify values for dynamic parameters before executing the
+statement. The values specified must match the types expected.</p>
 </conbody>
 </concept>
 

Modified: db/derby/docs/trunk/src/ref/rrefsqlj1080779.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj1080779.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj1080779.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj1080779.dita Thu Jun  5 18:14:03 2014
@@ -20,24 +20,26 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj1080779" xml:lang="en-us">
 <title>Expression precedence</title>
+<shortdesc>Precedence of operations from highest to lowest is as
+follows.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Expressions<indexterm>hierarchy of</indexterm><indexterm>precedence
 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>,
-CAST</li>
+<section><ul>
+<li><codeph>()</codeph>, <codeph>?</codeph>, constants (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>
-<li>*, /, || (concatenation)</li>
-<li>binary + and -</li>
-<li>comparisons, quantified comparisons, EXISTS, IN, IS NULL, LIKE, BETWEEN,
+<li>Unary <codeph>+</codeph> and <codeph>-</codeph></li>
+<li><codeph>*</codeph>, <codeph>/</codeph>, <codeph>||</codeph>
(concatenation)</li>
+<li>Binary <codeph>+</codeph> and<codeph> -</codeph></li>
+<li>Comparisons, quantified comparisons, EXISTS, IN, IS NULL, LIKE, BETWEEN,
 IS</li>
 <li>NOT</li>
 <li>AND</li>
 <li>OR</li>
-</ul></p></section>
+</ul></section>
 <section><p>You can explicitly specify precedence by placing expressions within
 parentheses. An expression within parentheses is evaluated before any operations
 outside the parentheses are applied to it.</p></section>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj1083019.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj1083019.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj1083019.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj1083019.dita Thu Jun  5 18:14:03 2014
@@ -20,9 +20,10 @@ limitations under the License.
 -->
 <reference id="rrefsqlj1083019" xml:lang="en-us">
 <title>Where dynamic parameters are allowed</title>
+<shortdesc>You can use dynamic parameters anywhere in an expression where
+their data type can be easily deduced.</shortdesc>
 <refbody>
-<section><p>You can use dynamic parameters anywhere in an expression where
-their data type can be easily deduced.   <ol>
+<section><ol>
 <li>Use as the first operand of BETWEEN is allowed if one of the second and
 third operands is not also a dynamic parameter. The type of the first operand
 is assumed to be the type of the non-dynamic parameter, or the union result
@@ -112,7 +113,7 @@ length VARCHAR type.   <codeblock><b>SEL
 <ph>-- is valid. Dynamic parameter assumed to be INTEGER type.</ph></b></codeblock></li>
 <li>A dynamic parameter is allowed as the left operand of an IS expression
 and is assumed to be a boolean.</li>
-</ol></p></section>
+</ol></section>
 <section><p>Once the type of a dynamic parameter is determined based on the
 expression it is in, that expression is allowed anywhere it would normally
 be allowed if it did not include a dynamic parameter.</p></section>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj11277.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj11277.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj11277.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj11277.dita Thu Jun  5 18:14:03 2014
@@ -20,13 +20,14 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj11277" xml:lang="en-us">
 <title>VALUES expression</title>
+<shortdesc>The VALUES expression allows construction of a row or a table from
+other values.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>VALUES expression</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The VALUES expression allows construction of a row or a table
-from other values. A VALUES expression can be used in all the places where a
-query can, and thus can be used in any of the following ways:
+<section> <p>A VALUES expression can be used in all the places where a query
+can, and thus can be used in any of the following ways:
 <ul>
 <li>As a statement that returns a <i>ResultSet</i></li>
 <li>Within expressions and statements wherever subqueries are permitted</li>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj18922.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj18922.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj18922.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj18922.dita Thu Jun  5 18:14:03 2014
@@ -19,14 +19,14 @@ limitations under the License.
 -->
 <reference id="rrefsqlj18922" xml:lang="en-us">
 <title>LEFT OUTER JOIN operation</title>
+<shortdesc>A LEFT OUTER JOIN is one of the JOIN operations 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.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>LEFT OUTER JOIN operation</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>A LEFT OUTER JOIN is one of the <xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN
-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>
 {

Modified: db/derby/docs/trunk/src/ref/rrefsqlj19433.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj19433.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj19433.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj19433.dita Thu Jun  5 18:14:03 2014
@@ -20,6 +20,10 @@ 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>. Expressions are allowed in these specified
+places within statements.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>SQL expressions<indexterm>column reference</indexterm></indexterm>
 <indexterm>SQL expressions<indexterm>constant</indexterm></indexterm><indexterm>SQL
@@ -53,10 +57,7 @@ function</indexterm></indexterm></keywor
 </metadata></prolog>
 <refbody>
 <section>
-<p>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.</p>
+<p></p>
 <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:

Modified: db/derby/docs/trunk/src/ref/rrefsqlj21571.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj21571.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj21571.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj21571.dita Thu Jun  5 18:14:03 2014
@@ -19,12 +19,12 @@ limitations under the License.
 -->
 <reference id="rrefsqlj21571" xml:lang="en-us">
 <title>query</title>
+<shortdesc>A query creates a virtual table based on existing tables or constants
+built into tables.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>UNION</indexterm><indexterm>UNION ALL</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<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><xref href="rrefsqlj13658.dita#rrefsqlj13658">ORDER BY clause</xref></i>
]

Modified: db/derby/docs/trunk/src/ref/rrefsqlj23075.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj23075.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj23075.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj23075.dita Thu Jun  5 18:14:03 2014
@@ -20,6 +20,8 @@ limitations under the License.
 -->
 <reference id="rrefsqlj23075" xml:lang="en-us">
 <title>Boolean expressions</title>
+<shortdesc>Boolean expressions are expressions that result in boolean
+values.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Boolean expressions</indexterm><indexterm>Boolean
operators<indexterm>part
 of WHERE clause</indexterm></indexterm><indexterm>AND boolean operator</indexterm>
@@ -32,8 +34,7 @@ boolean operator</indexterm><indexterm>L
 boolean operator</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p>Boolean expressions are expressions that result in boolean values.
-Most of the expressions listed in the table 
+<section><p>Most of the expressions listed in the table 
 <xref href="rrefsqlj19433.dita#rrefsqlj19433/sqlj18370"/> can result in boolean
 values.</p>
 <p>Boolean expressions are allowed in the following clauses and operations:

Modified: db/derby/docs/trunk/src/ref/rrefsqlj28468.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj28468.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj28468.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj28468.dita Thu Jun  5 18:14:03 2014
@@ -20,6 +20,10 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj28468" xml:lang="en-us">
 <title>Capitalization and special characters</title>
+<shortdesc>Using the classes and methods of JDBC, you submit SQL statements to
+<ph conref="../conrefs.dita#prod/productshortname"></ph> as strings. The
+character set permitted for strings containing SQL statements is
+Unicode.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Case sensitivity of keywords and identifiers</indexterm>
 <indexterm>Keywords<indexterm>case insensitivity of</indexterm></indexterm>
@@ -35,10 +39,7 @@ as wildcard within SQL</indexterm><index
 delimiters within SQL)</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p>Using the classes and methods of JDBC, you submit SQL statements
-to <ph conref="../conrefs.dita#prod/productshortname"></ph> as strings. The
-character set permitted for strings containing SQL statements is Unicode.
-Within these strings, the following rules apply:   <ul>
+<section><p>Within these strings, the following rules apply:   <ul>
 <li>Double quotation marks delimit special identifiers referred to in SQL-92
 as <i>delimited identifiers</i>. </li>
 <li>Single quotation marks delimit character strings.</li>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj29026.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj29026.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj29026.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj29026.dita Thu Jun  5 18:14:03 2014
@@ -19,11 +19,13 @@ limitations under the License.
 -->
 <reference id="rrefsqlj29026" xml:lang="en-us">
 <title>Built-in functions</title>
+<shortdesc>A built-in function is an expression in which an SQL keyword or
+special operator executes some operation.</shortdesc>
 <refbody>
-<section><p>A built-in function is an expression in which an SQL keyword or
-special operator executes some operation. Built-in functions use keywords
-or special built-in operators. Built-ins are SQL92Identifiers and are case-insensitive.
-Note that escaped functions like TIMESTAMPADD and TIMESTAMPDIFF are only accessible
-using the JDBC escape function syntax, and can be found in <xref href="rrefjdbc1020262.dita#rrefjdbc1020262"></xref>.</p></section>
+<section><p>Built-in functions use keywords or special built-in operators.
+Built-ins are SQL92Identifiers and are case-insensitive. Note that escaped
+functions like TIMESTAMPADD and TIMESTAMPDIFF are only accessible using the
+JDBC escape function syntax, and can be found in
+<xref href="rrefjdbc1020262.dita#rrefjdbc1020262"></xref>.</p></section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj35034.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj35034.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj35034.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj35034.dita Thu Jun  5 18:14:03 2014
@@ -20,12 +20,13 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj35034" xml:lang="en-us">
 <title>INNER JOIN operation</title>
+<shortdesc>An INNER JOIN is a JOIN operation that allows you to specify an
+explicit join clause.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>INNER JOIN operation</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>An INNER JOIN is a <xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN
operation</xref> that
-allows you to specify an explicit join clause. </p></section>
+<section> <p> </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>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj57522.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj57522.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj57522.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj57522.dita Thu Jun  5 18:14:03 2014
@@ -19,15 +19,16 @@ limitations under the License.
 -->
 <reference id="rrefsqlj57522" xml:lang="en-us">
 <title>RIGHT OUTER JOIN operation</title>
+<shortdesc>A RIGHT OUTER JOIN is one of the JOIN operations that allow you to
+specify a JOIN clause. It preserves the unmatched rows from the second (right)
+table, joining them with a NULL in the shape of the first (left)
+table.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>RIGHT OUTER JOIN operation</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>A RIGHT OUTER JOIN is one of the <xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN
-operations</xref> that allow you to specify a JOIN clause. It preserves the
-unmatched rows from the second (right) table, joining them with a NULL in
-the shape of the first (left) table. A LEFT OUTER JOIN B is equivalent to
-B RIGHT OUTER JOIN A, with the columns in a different order.</p></section>
+<section> <p>B LEFT OUTER JOIN A is equivalent to A RIGHT OUTER JOIN B, with
the
+columns in a different order.</p></section>
 <refsyn><title>Syntax</title><codeblock><b><i><xref
href="rreftableexpression.dita#rreftableexpression">tableExpression</xref></i>
RIGHT [ OUTER ] JOIN <i
 ><xref href="rreftableexpression.dita#rreftableexpression">tableExpression</xref></i>
 {

Modified: db/derby/docs/trunk/src/ref/rrefsqljcrossjoin.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljcrossjoin.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljcrossjoin.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljcrossjoin.dita Thu Jun  5 18:14:03 2014
@@ -20,15 +20,14 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqljcrossjoin" xml:lang="en-us">
 <title>CROSS JOIN operation</title>
+<shortdesc>A CROSS JOIN is a JOIN operation that produces the Cartesian product
+of two tables. Unlike other JOIN operators, it does not let you specify a join
+clause. You may, however, specify a WHERE clause in the SELECT
+statement.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CROSS JOIN operation</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p>A CROSS JOIN is a
-<xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operation</xref> that
-produces the Cartesian product of two tables. Unlike other JOIN operators, it
-does not let you specify a join clause. You may, however, specify a WHERE clause
-in the SELECT statement.</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b><i><xref href="rreftableexpression.dita#rreftableexpression">tableExpression</xref></i>
CROSS JOIN
 {

Modified: db/derby/docs/trunk/src/ref/rrefsqljnaturaljoin.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljnaturaljoin.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljnaturaljoin.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljnaturaljoin.dita Thu Jun  5 18:14:03 2014
@@ -20,20 +20,15 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqljnaturaljoin" xml:lang="en-us">
 <title>NATURAL JOIN operation</title>
+<shortdesc>A NATURAL JOIN is a JOIN operation that creates an implicit join
+clause for you based on the common columns in the two tables being joined.
+Common columns are columns that have the same name in both tables.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>NATURAL JOIN operation</indexterm></keywords>
 </metadata></prolog>
 <refbody>
 
 <section>
-
-<p>
-A NATURAL JOIN is a <xref href="rrefsqlj29840.dita#rrefsqlj29840">
-JOIN operation</xref> that creates an implicit join clause for you
-based on the common columns in the two tables being joined. Common
-columns are columns that have the same name in both tables.
-</p>
-
 <p>
 A NATURAL JOIN can be an INNER join, a LEFT OUTER join, or a RIGHT
 OUTER join. The default is INNER join.

Modified: db/derby/docs/trunk/src/ref/rrefsqljnextvaluefor.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljnextvaluefor.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljnextvaluefor.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljnextvaluefor.dita Thu Jun  5 18:14:03 2014
@@ -20,6 +20,8 @@ limitations under the License.
 -->
 <reference id="rrefsqljnextvaluefor" xml:lang="en-us">
 <title>NEXT VALUE FOR expression</title>
+<shortdesc>The NEXT VALUE FOR expression retrieves the next value from a
+sequence generator.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>NEXT VALUE FOR expression</indexterm>
 <indexterm>expressions<indexterm>NEXT VALUE FOR</indexterm></indexterm>
@@ -27,8 +29,7 @@ limitations under the License.
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p>The NEXT VALUE FOR expression retrieves the next value from a
-sequence generator that was created with a
+<section><p>A sequence generator is created with a
 <xref href="rrefsqljcreatesequence.dita#rrefsqljcreatesequence"></xref>.</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>NEXT VALUE FOR <i><xref href="rrefsequencename.dita#rrefsequencenamerrefsequencename">sequenceName</xref></i></b></codeblock>

Modified: db/derby/docs/trunk/src/ref/rreftableexpression.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreftableexpression.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreftableexpression.dita (original)
+++ db/derby/docs/trunk/src/ref/rreftableexpression.dita Thu Jun  5 18:14:03 2014
@@ -18,30 +18,33 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rreftableexpression">
 <title>tableExpression</title>
+<shortdesc>A <i>tableExpression</i> specifies a table, view, or function
in a
+FROM clause.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>tableExpression</indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>
 <section>
-<p>A <i>tableExpression</i> specifies a table, view, or
-function in a <xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM clause</xref>.
It is the source from which
-a <i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref></i>
selects
+<p>A <i>tableExpression</i> is the source from which a
+<i><xref href="rrefselectexpression.dita">selectExpression</xref></i>
selects
 a result.</p>
-<p>A correlation name can be applied to a table in a <i>tableExpression</i>
so that its columns can be qualified with that name.
+<p>A correlation name can be applied to a table in a <i>tableExpression</i>
so
+that its columns can be qualified with that name.
 If you do not supply a correlation name, the table name qualifies the column
 name. When you give a table a correlation name, you cannot use the table name
 to qualify columns. You must use the correlation name when qualifying column
 names.</p>
-<p>No two items in the FROM clause can have the same correlation
-name, and no correlation name can be the same as an unqualified table name
-specified in that FROM clause.</p>
+<p>No two items in the <xref href="rrefsqlj21583.dita">FROM clause</xref>
can
+have the same correlation name, and no correlation name can be the same as an
+unqualified table name specified in that FROM clause.</p>
 <p>In addition, you can give the columns
 of the table new names in the AS clause. Some situations in which this is
 useful:  
 <ul>
-<li>When a <xref href="rrefsqlj11277.dita#rrefsqlj11277">VALUES expression</xref>
is used as a <i><xref href="rreftablesubquery.dita#rreftablesubquery">tableSubquery</xref>,</i>
since there is no other way to name
-the columns of a <xref href="rrefsqlj11277.dita#rrefsqlj11277">VALUES expression</xref>.</li>
+<li>When a <xref href="rrefsqlj11277.dita">VALUES expression</xref> is
used as a
+<i><xref href="rreftablesubquery.dita">tableSubquery</xref></i>,
since there is
+no other way to name the columns of a VALUES expression.</li>
 <li>When column names would otherwise be the same as those of columns in other
 tables; renaming them means you don't have to qualify them.</li>
 </ul></p>

Modified: db/derby/docs/trunk/src/ref/rreftablesubquery.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreftablesubquery.dita?rev=1600717&r1=1600716&r2=1600717&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreftablesubquery.dita (original)
+++ db/derby/docs/trunk/src/ref/rreftablesubquery.dita Thu Jun  5 18:14:03 2014
@@ -18,16 +18,16 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rreftablesubquery">
 <title>tableSubquery</title>
+<shortdesc>A <i>tableSubquery</i> is a subquery that returns multiple
+rows.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>tableSubquery</indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>
 <section>
-<p>A <i>tableSubquery</i> is a subquery that returns
-multiple rows.</p> 
-<p>Unlike a <i><xref href="rrefscalarsubquery.dita#rrefscalarsubquery">scalarSubquery</xref>,</i>
a <i>tableSubquery</i> is allowed only:
- 
+<p>Unlike a <i><xref href="rrefscalarsubquery.dita">scalarSubquery</xref></i>,
+a <i>tableSubquery</i> is allowed only:
 <ul>
 <li>As a <i><xref href="rreftableexpression.dita#rreftableexpression">tableExpression</xref></i>
in
 a <xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM clause</xref></li>



Mime
View raw message