db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1541663 - /db/derby/docs/branches/10.10/src/ref/
Date Wed, 13 Nov 2013 19:17:40 GMT
Author: chaase3
Date: Wed Nov 13 19:17:39 2013
New Revision: 1541663

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

Merged DERBY-6379-reffuncs.diff to 10.10 doc branch from trunk revision 1541660.

Modified:
    db/derby/docs/branches/10.10/src/ref/rrefbuiltbigint.dita
    db/derby/docs/branches/10.10/src/ref/rrefbuiltdouble.dita
    db/derby/docs/branches/10.10/src/ref/rrefbuiltinteger.dita
    db/derby/docs/branches/10.10/src/ref/rrefbuiltsmallint.dita
    db/derby/docs/branches/10.10/src/ref/rrefbuiltvarchar.dita
    db/derby/docs/branches/10.10/src/ref/rrefcurrentisolation.dita
    db/derby/docs/branches/10.10/src/ref/rrefcurrentrole.dita
    db/derby/docs/branches/10.10/src/ref/rreffuncceil.dita
    db/derby/docs/branches/10.10/src/ref/rrefidentityvallocal.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj1055824.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj13083.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj15866.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj16762.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj25228.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj27781.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj29930.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj32613.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj32693.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj33520.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj33772.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj33923.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj34177.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj40899.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj42049.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj42324.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj42476.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj55788.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj61998.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj66113.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj73147.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj93082.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj97870.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqlj98067.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentdate.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentschema.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljcurrenttimestamp.dita
    db/derby/docs/branches/10.10/src/ref/rrefsqljmod.dita
    db/derby/docs/branches/10.10/src/ref/rreftrimfunc.dita
    db/derby/docs/branches/10.10/src/ref/rrefyearfunc.dita

Modified: db/derby/docs/branches/10.10/src/ref/rrefbuiltbigint.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefbuiltbigint.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefbuiltbigint.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefbuiltbigint.dita Wed Nov 13 19:17:39 2013
@@ -18,13 +18,13 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rrefbuiltbigint">
 <title>BIGINT function</title>
+<shortdesc>The BIGINT function returns a 64-bit integer representation of a
+number or character string in the form of an integer constant.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>BIGINT function</indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>
-<section>The BIGINT function returns a 64-bit integer representation of a number
-or character string in the form of an integer constant.</section>
 <refsyn><title>Syntax</title>
 <codeblock><b>BIGINT ( <i>characterExpression</i> | <i>numericExpression</i> )</b></codeblock>
 <dl>

Modified: db/derby/docs/branches/10.10/src/ref/rrefbuiltdouble.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefbuiltdouble.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefbuiltdouble.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefbuiltdouble.dita Wed Nov 13 19:17:39 2013
@@ -20,16 +20,18 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefbuiltdouble" xml:lang="en-us">
 <title>DOUBLE function</title>
+<shortdesc>The DOUBLE function returns a floating-point number corresponding
+to a number or a character string.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>DOUBLE function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>The DOUBLE function returns a floating-point number corresponding
-to a: <ul>
-<li>number if the argument is a numeric expression.</li>
-<li>character string representation of a number if the argument is a string
-expression.</li>
-</ul></section>
+<section>
+<p>The returned value corresponds to a number if the argument is a numeric
+expression.</p>
+<p>The returned value corresponds to a character string representation of a
+number if the argument is a string expression.</p>
+</section>
 <section><title>Numeric to double</title>
 <codeblock><b>DOUBLE [ PRECISION ] ( <i>numericExpression</i> )</b></codeblock>
 <dl>

Modified: db/derby/docs/branches/10.10/src/ref/rrefbuiltinteger.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefbuiltinteger.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefbuiltinteger.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefbuiltinteger.dita Wed Nov 13 19:17:39 2013
@@ -19,12 +19,12 @@ limitations under the License.
 -->
 <reference id="rrefbuiltinteger" xml:lang="en-us">
 <title>INTEGER function</title>
+<shortdesc>The INTEGER function returns an integer representation of a number or
+character string in the form of an integer constant.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>INTEGER function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>The INTEGER function returns an integer representation of a number or
-character string in the form of an integer constant.</section>
 <refsyn><title>Syntax</title>
 <codeblock><b>INT[EGER] ( <i>numericExpression</i> | <i>characterExpression</i> ) </b></codeblock> <dl>
 <dlentry>

Modified: db/derby/docs/branches/10.10/src/ref/rrefbuiltsmallint.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefbuiltsmallint.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefbuiltsmallint.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefbuiltsmallint.dita Wed Nov 13 19:17:39 2013
@@ -20,13 +20,13 @@ limitations under the License.
 -->
 <reference id="rrefbuiltsmallint" xml:lang="en-us">
 <title>SMALLINT function</title>
+<shortdesc>The SMALLINT function returns a small integer representation of a
+number or character string in the form of a small integer constant.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>functions<indexterm>SMALLINT</indexterm></indexterm>
 <indexterm>SMALLINT function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>The SMALLINT function returns a small integer representation of a
-number or character string in the form of a small integer constant.</section>
 <refsyn><title>Syntax</title>
 <codeblock><b>SMALLINT ( <i>numericExpression</i> | <i>characterExpression</i> )</b></codeblock>
 <dl>

Modified: db/derby/docs/branches/10.10/src/ref/rrefbuiltvarchar.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefbuiltvarchar.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefbuiltvarchar.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefbuiltvarchar.dita Wed Nov 13 19:17:39 2013
@@ -18,13 +18,13 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rrefbuiltvarchar">
 <title>VARCHAR function</title>
+<shortdesc>The VARCHAR function returns a varying-length character string
+representation of a character string.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>VARCHAR function</indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>
-<section>The VARCHAR function returns a varying-length character string representation
-of a character string.</section>
 <section><title>Character to varchar syntax</title>
 <codeblock><b>VARCHAR ( <i>characterStringExpression</i> )</b></codeblock>
 <dl>

Modified: db/derby/docs/branches/10.10/src/ref/rrefcurrentisolation.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefcurrentisolation.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefcurrentisolation.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefcurrentisolation.dita Wed Nov 13 19:17:39 2013
@@ -18,15 +18,13 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rrefcurrentisolation">
 <title>CURRENT ISOLATION function</title>
+<shortdesc>The CURRENT ISOLATION function returns the current isolation level
+as a CHAR(2) value of either "" (blank), "UR", "CS", "RS", or "RR".</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CURRENT ISOLATION function</indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>
-<section>
-<p>CURRENT ISOLATION returns the current isolation level as a CHAR(2)
-value of either "" (blank), "UR", "CS", "RS",
-or "RR".</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>CURRENT ISOLATION</b></codeblock>
 </refsyn>

Modified: db/derby/docs/branches/10.10/src/ref/rrefcurrentrole.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefcurrentrole.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefcurrentrole.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefcurrentrole.dita Wed Nov 13 19:17:39 2013
@@ -19,13 +19,13 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference id="rrefcurrentrole" xml:lang="en-us">
 <title>CURRENT_ROLE function</title>
+<shortdesc>The CURRENT_ROLE function returns the authorization identifier of the
+current role. If there is no current role, it returns NULL.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CURRENT_ROLE function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
 <section>
-<p>CURRENT_ROLE returns the authorization identifier of the current
-role. If there is no current role, it returns NULL.</p>
 <p>This function returns a string of up to 258 characters. This is twice the
 length of an identifier (128*2) + 2, to allow for quoting.</p>
 </section>

Modified: db/derby/docs/branches/10.10/src/ref/rreffuncceil.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rreffuncceil.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rreffuncceil.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rreffuncceil.dita Wed Nov 13 19:17:39 2013
@@ -20,8 +20,8 @@ limitations under the License.
 -->
 <reference id="rreffuncceil" xml:lang="en-us">
 <title>CEIL or CEILING function</title>
-<shortdesc>The CEIL and CEILING functions round the specified number up, and
-return the smallest number that is greater than or equal to the specified
+<shortdesc>The CEIL or CEILING function rounds the specified number up, and
+returns the smallest number that is greater than or equal to the specified
 number.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CEIL function</indexterm><indexterm>functions<indexterm>CEIL</indexterm></indexterm>
@@ -31,18 +31,18 @@ number.</shortdesc>
 <refbody>
 <section> <p>The specified number must be a <xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE
 PRECISION</xref> number.  <ul>
-<li>If the specified number is NULL, the result of these functions is NULL.</li>
-<li>If the specified number is equal to a mathematical integer, the result
-of these functions is the same as the specified number.</li>
-<li>If the specified number is zero (0), the result of these functions is
-zero.</li>
-<li>If the specified number is less than zero but greater than -1.0, then
-the result of these functions is zero.</li>
+<li>If the specified number is NULL, the returned value is NULL.</li>
+<li>If the specified number is equal to a mathematical integer, the returned
+value is the same as the specified number.</li>
+<li>If the specified number is zero (0), the returned value is zero.</li>
+<li>If the specified number is less than zero but greater than -1.0, the
+returned value is zero.</li>
 </ul></p><p>The returned value is the smallest (closest to negative infinity)
-double floating point value that is greater than or equal to the specified
+double floating-point value that is greater than or equal to the specified
 number. The returned value is equal to a mathematical integer. The data type
 of the returned value is a DOUBLE PRECISION number.</p> </section>
-<refsyn><title>Syntax</title> <codeblock><b>CEIL ( <varname>number</varname> )</b></codeblock><codeblock><b>CEILING ( <varname>number</varname> )</b
-></codeblock> </refsyn>
+<refsyn><title>Syntax</title>
+<codeblock><b>CEIL ( <varname>number</varname> )</b></codeblock>
+<codeblock><b>CEILING ( <varname>number</varname> )</b></codeblock> </refsyn>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.10/src/ref/rrefidentityvallocal.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefidentityvallocal.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefidentityvallocal.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefidentityvallocal.dita Wed Nov 13 19:17:39 2013
@@ -19,15 +19,13 @@ limitations under the License.
 -->
 <reference id="rrefidentityvallocal" xml:lang="en-us">
 <title>IDENTITY_VAL_LOCAL function</title>
+<shortdesc>The IDENTITY_VAL_LOCAL function is a non-deterministic function that
+returns the most recently assigned value of an identity column for a connection,
+where the assignment occurred as a result of a single row INSERT statement using
+a VALUES clause.</shortdesc>
 <refbody>
-<section><p><ph conref="../conrefs.dita#prod/productshortname"></ph> supports
-the IDENTITY_VAL_LOCAL function. </p></section>
-<refsyn><title>Syntax:</title>
+<refsyn><title>Syntax</title>
 <codeblock><b>IDENTITY_VAL_LOCAL ( )</b></codeblock>
-<p>The IDENTITY_VAL_LOCAL function is a non-deterministic function
-that returns the most recently assigned value of an identity column for a
-connection, where the assignment occurred as a result of a single row INSERT
-statement using a  VALUES clause. </p>
 <p>The IDENTITY_VAL_LOCAL function has no input parameters. The result
 is a DECIMAL (31,0), regardless of the actual data type of the  corresponding
 identity column.</p>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj1055824.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj1055824.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj1055824.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj1055824.dita Wed Nov 13 19:17:39 2013
@@ -20,11 +20,13 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj1055824" xml:lang="en-us">
 <title>CURRENT TIME function</title>
+<shortdesc>CURRENT TIME is a synonym for CURRENT_TIME.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CURRENT TIME function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>CURRENT TIME is a synonym for <xref href="rrefsqlj33772.dita#rrefsqlj33772">CURRENT_TIME</xref>.</p></section>
+<section><p>See <xref href="rrefsqlj33772.dita#rrefsqlj33772"></xref> for
+details.</p></section>
 </refbody>
 </reference>
 

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=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj13083.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj13083.dita Wed Nov 13 19:17:39 2013
@@ -20,13 +20,16 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj13083" xml:lang="en-us">
 <title>SUM function</title>
+<shortdesc>SUM is an aggregate function that evaluates the sum of the expression
+over a set of rows.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>SUM aggregate function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<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>
+<section><p>See <xref href="rrefsqlj33923.dita#rrefsqlj33923"></xref> for more
+information about these functions.</p>
+<p>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
 DISTINCT and ALL qualifiers eliminate or retain duplicates. ALL is assumed
 if neither ALL nor DISTINCT is specified. For example, if a column contains

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj15866.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj15866.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj15866.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj15866.dita Wed Nov 13 19:17:39 2013
@@ -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="rrefsqlj15866">
 <title>CURRENT_TIMESTAMP function</title>
+<shortdesc>The CURRENT_TIMESTAMP function returns the current timestamp; the
+value returned does not change if it is executed more than once in a single
+statement.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CURRENT_TIMESTAMP function</indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>
-<section>
-<p>CURRENT_TIMESTAMP returns the current timestamp; the value returned
-does not change if it is executed more than once in a single statement. This
-means the value is fixed even if there is a long delay between fetching rows
-in a cursor.</p></section>
+<section><p>This means the value is fixed even if there is a long delay between
+fetching rows in a cursor.</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>CURRENT_TIMESTAMP</b></codeblock>
 <p>or, alternately</p>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj16762.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj16762.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj16762.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj16762.dita Wed Nov 13 19:17:39 2013
@@ -20,14 +20,15 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj16762" xml:lang="en-us">
 <title>LENGTH function</title>
+<shortdesc>The LENGTH function is applied to either a character string
+expression or a bit string expression and returns the number of characters in
+the result.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>LENGTH function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>LENGTH is applied to either a character string expression or
-a bit string expression and returns the number of characters in the result.</p> <p>Because
-all built-in data types are implicitly converted to strings, this function
-can act on all built-in data types.</p></section>
+<section><p>Because all built-in data types are implicitly converted to strings,
+this function can act on all built-in data types.</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>LENGTH ( <i>characterExpression</i> | <i>bitExpression</i> )</b></codeblock> </refsyn>
 <example><title>Examples</title>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj25228.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj25228.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj25228.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj25228.dita Wed Nov 13 19:17:39 2013
@@ -20,15 +20,16 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj25228" xml:lang="en-us">
 <title>SESSION_USER function</title>
+<shortdesc>When used outside stored routines, the SESSION_USER, USER, and 
+CURRENT_USER functions all return the authorization identifier of the user that
+created the SQL session.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>SESSION_USER function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>When used outside stored routines, SESSION_USER,
-<xref href="rrefsqlj42476.dita#rrefsqlj42476">USER</xref>, and 
-<xref href="rrefsqlj42324.dita#rrefsqlj42324">CURRENT_USER</xref> all
-return the authorization identifier of the user that created the SQL
-session.</p>
+<section> <p>See <xref href="rrefsqlj42476.dita#rrefsqlj42476"></xref> and 
+<xref href="rrefsqlj42324.dita#rrefsqlj42324"></xref> for details on those
+functions.</p>
 <p>SESSION_USER also always returns this value when used within stored
 routines.</p>
 <p>If used within a stored routine created with EXTERNAL SECURITY DEFINER,

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj27781.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj27781.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj27781.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj27781.dita Wed Nov 13 19:17:39 2013
@@ -20,13 +20,15 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj27781" xml:lang="en-us">
 <title>MAX function</title>
+<shortdesc>MAX is an aggregate function that evaluates the maximum of an
+expression over a set of rows.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>MAX aggregate function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>MAX is an aggregate function that evaluates the maximum of an
-expression over a set of rows (see <xref href="rrefsqlj33923.dita#rrefsqlj33923"></xref>).
-MAX is allowed only on expressions that evaluate to indexable data types
+<section><p>See <xref href="rrefsqlj33923.dita#rrefsqlj33923"></xref> for more
+information about these functions.</p>
+<p>MAX is allowed only on expressions that evaluate to indexable data types
 (specifically, those marked with a Y in the second table, "Comparisons allowed
 by <ph conref="../conrefs.dita#prod/productshortname"></ph>", in
 <xref href="rrefsqlj58560.dita#rrefsqlj58560"></xref>). This means that MAX

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj29930.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj29930.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj29930.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj29930.dita Wed Nov 13 19:17:39 2013
@@ -20,23 +20,24 @@ limitations under the License.
 -->
 <reference id="rrefsqlj29930" xml:lang="en-us">
 <title>UCASE or UPPER function</title>
+<shortdesc>The UCASE or UPPER function takes a character expression as a
+parameter and returns a string in which all alphabetical characters have been
+converted to uppercase.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>functions<indexterm>UPPER</indexterm></indexterm><indexterm>functions<indexterm>UCASE</indexterm></indexterm>
 <indexterm>UPPER function</indexterm><indexterm>UCASE function</indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>UCASE or UPPER takes a character expression as a parameter and
-returns a string in which all alpha characters have been converted to uppercase.</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>UCASE ( <i>characterExpression</i> )</b></codeblock>
 <codeblock><b>UPPER ( <i>characterExpression</i> )</b></codeblock>
-<p>If
-the parameter type is CHAR , the return type is CHAR. Otherwise, the return
-type is VARCHAR.   <note>UPPER and LOWER follow the database locale. See <i><xref
-href="rrefattrib56769.dita#rrefattrib56769"></xref></i> for more information
-about specifying locale.</note></p><p>The length and maximum length of the
-returned value are the same as the length and maximum length of the parameter. </p> </refsyn>
+<p>If the parameter type is CHAR, the return type is CHAR. Otherwise, the return
+type is VARCHAR.   <note>UPPER and LOWER follow the database locale. See
+<i><xref href="rrefattrib56769.dita#rrefattrib56769"></xref></i> for more
+information about specifying locale.</note></p><p>The length and maximum length of the
+returned value are the same as the length and maximum length of the
+parameter.</p> </refsyn>
 <example><title>Example</title><p>To return the string <codeph>aSD1#w</codeph> in
 uppercase, use the following clause:
 <codeblock><b>VALUES UPPER('aSD1#w')</b></codeblock>The

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj32613.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj32613.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj32613.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj32613.dita Wed Nov 13 19:17:39 2013
@@ -20,11 +20,12 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj32613" xml:lang="en-us">
 <title>RTRIM function</title>
+<shortdesc>The RTRIM function removes blanks from the end of a character string
+expression.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>RTRIM function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>RTRIM removes blanks from the end of a character string expression.</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>RTRIM ( <i>characterExpression</i> )</b></codeblock> <p>A
 <i>characterExpression</i> is a CHAR, VARCHAR, or LONG VARCHAR data type, any built-in

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj32693.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj32693.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj32693.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj32693.dita Wed Nov 13 19:17:39 2013
@@ -20,15 +20,19 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj32693" xml:lang="en-us">
 <title>AVG function</title>
+<shortdesc>AVG is an aggregate function that evaluates the average of an
+expression over a set of rows.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>AVG aggregate function</indexterm></keywords>
+<keywords><indexterm>AVG aggregate function</indexterm>
+<indexterm>DISTINCT<indexterm>qualifier in AVG function</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>AVG is an aggregate function that evaluates the average of an
-expression over a set of rows (see <xref href="rrefsqlj33923.dita#rrefsqlj33923"></xref>).
-AVG is allowed only on expressions that evaluate to numeric data types.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>AVG ( [ DISTINCT | ALL ] <i>expression</i> )</b></codeblock> <p><indexterm>DISTINCT<indexterm>qualifier
-in AVG function</indexterm></indexterm>The DISTINCT qualifier eliminates duplicates.
+<section> <p>AVG is allowed only on expressions that evaluate to numeric data
+types.</p>
+<p>See <xref href="rrefsqlj33923.dita#rrefsqlj33923"></xref> for more
+information about these functions.</p></section>
+<refsyn><title>Syntax</title> <codeblock><b>AVG ( [ DISTINCT | ALL ] <i>expression</i> )</b></codeblock>
+<p>The DISTINCT qualifier eliminates duplicates.
 The ALL qualifier retains duplicates. ALL is the default value if neither
 ALL nor DISTINCT is specified. For example, if a column contains the values
 1.0, 1.0, 1.0, 1.0, and 2.0, AVG(col) returns a smaller value than AVG(DISTINCT

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj33520.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj33520.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj33520.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj33520.dita Wed Nov 13 19:17:39 2013
@@ -20,13 +20,15 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj33520" xml:lang="en-us">
 <title>MIN function</title>
+<shortdesc>MIN is an aggregate function that evaluates the minimum of an
+expression over a set of rows.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>MIN aggregate function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>MIN is an aggregate function that evaluates the minimum of
-an expression over a set of rows (see <xref href="rrefsqlj33923.dita#rrefsqlj33923"></xref>).
-MIN is allowed only on expressions that evaluate to indexable data types
+<section><p>See <xref href="rrefsqlj33923.dita#rrefsqlj33923"></xref> for more
+information about these functions.</p>
+<p>MIN is allowed only on expressions that evaluate to indexable data types
 (specifically, those marked with a Y in the second table, "Comparisons allowed
 by <ph conref="../conrefs.dita#prod/productshortname"></ph>", in
 <xref href="rrefsqlj58560.dita#rrefsqlj58560"></xref>). This means that MIN

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj33772.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj33772.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj33772.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj33772.dita Wed Nov 13 19:17:39 2013
@@ -20,14 +20,15 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj33772" xml:lang="en-us">
 <title>CURRENT_TIME function</title>
+<shortdesc>The CURRENT_TIME function returns the current time; the value
+returned does not change if it is executed more than once in a single
+statement.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CURRENT_TIME function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>CURRENT_TIME returns the current time; the value returned does
-not change if it is executed more than once in a single statement. This means
-the value is fixed even if there is a long delay between fetching rows in
-a cursor.</p></section>
+<section><p>This means the value is fixed even if there is a long delay between
+fetching rows in a cursor.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>CURRENT_TIME</b></codeblock> <p>or,
 alternately</p> <codeblock><b>CURRENT TIME</b></codeblock> </refsyn>
 <example><title>Examples</title>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj33923.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj33923.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj33923.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj33923.dita Wed Nov 13 19:17:39 2013
@@ -20,6 +20,9 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj33923" xml:lang="en-us">
 <title>Aggregates (set functions)</title>
+<shortdesc>This section describes aggregates (also described as
+<i>set functions</i> in ANSI SQL-92 and as <i>column functions</i> in some
+database literature).</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>Aggregates<indexterm>and data types</indexterm></indexterm>
@@ -27,13 +30,11 @@ limitations under the License.
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p>This section describes aggregates (also described as <i>set functions</i> in
-ANSI SQL-92 and as <i>column functions</i> in some database literature). They
-provide a means of evaluating an expression over a set of rows. Whereas the
-other built-in functions operate on a single expression, aggregates operate
-on a set of values and reduce them to a single scalar value. Built-in aggregates
-can calculate the minimum, maximum, sum, count, and average of an expression
-over a set of values as well as count rows.</p></section>
+<section><p>Aggregates provide a means of evaluating an expression over a set of
+rows. Whereas the other built-in functions operate on a single expression,
+aggregates operate on a set of values and reduce them to a single scalar value.
+Built-in aggregates can calculate the minimum, maximum, sum, count, and average
+of an expression over a set of values as well as count rows.</p></section>
 <section><p>In addition to the built-in aggregates,
 <ph conref="../conrefs.dita#prod/productshortname"></ph> allows you to create
 custom aggregate operators, called user-defined aggregates (UDAs). For

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj34177.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj34177.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj34177.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj34177.dita Wed Nov 13 19:17:39 2013
@@ -20,14 +20,15 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj34177" xml:lang="en-us">
 <title>CURRENT_DATE function</title>
+<shortdesc>The CURRENT_DATE function returns the current date; the value
+returned does not change if it is executed more than once in a single
+statement.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CURRENT_DATE function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>CURRENT_DATE returns the current date; the value returned does
-not change if it is executed more than once in a single statement. This means
-the value is fixed even if there is a long delay between fetching rows in
-a cursor.</p></section>
+<section><p>This means the value is fixed even if there is a long delay between
+fetching rows in a cursor.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>CURRENT_DATE</b></codeblock> <p>or,
 alternately</p> <codeblock><b>CURRENT DATE</b></codeblock> </refsyn>
 <example><title>Example</title>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita Wed Nov 13 19:17:39 2013
@@ -19,14 +19,16 @@ limitations under the License.
 -->
 <reference id="rrefsqlj38716" xml:lang="en-us">
 <title>COUNT function</title>
+<shortdesc>COUNT is an aggregate function that counts the number of rows
+accessed in an expression. COUNT is allowed on all types of
+expressions.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>COUNT aggregate function</indexterm><indexterm>DISTINCT<indexterm>qualifier
 in COUNT aggregate function</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>COUNT is an aggregate function that counts the number of rows
-accessed in an expression (see <xref href="rrefsqlj33923.dita#rrefsqlj33923"></xref>).
-COUNT is allowed on all types of expressions.</p></section>
+<section><p>See <xref href="rrefsqlj33923.dita#rrefsqlj33923"></xref> for more
+information about these functions.</p></section>
 <refsyn><title>Syntax</title><codeblock><b>COUNT ( [ DISTINCT | ALL ] <i>expression</i> ) </b></codeblock><p>The
 DISTINCT qualifier eliminates duplicates. The ALL qualifier retains duplicates.
 ALL is assumed if neither ALL nor DISTINCT is specified. For example, if a

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj40899.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj40899.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj40899.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj40899.dita Wed Nov 13 19:17:39 2013
@@ -20,15 +20,16 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj40899" xml:lang="en-us">
 <title>Concatenation operator</title>
+<shortdesc>The concatenation operator, <codeph>||</codeph>, concatenates its
+right operand to the end of its left operand. It operates on character or bit
+expressions.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Concatenation operator</indexterm></keywords>
 </metadata></prolog>
 <refbody>
 <section>
-<p>The concatenation operator, <codeph>||</codeph>, concatenates its right operand
-to the end of its left operand. It operates on character or bit expressions.</p> <p>Because
-all built-in data types are implicitly converted to strings, this function
-can act on all built-in data types.</p></section>
+<p>Because all built-in data types are implicitly converted to strings, this
+function can act on all built-in data types.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>{
     <i>characterExpression</i> || <i>characterExpression</i> |
     <i>bitExpression</i> || <i>bitExpression</i>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj42049.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj42049.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj42049.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj42049.dita Wed Nov 13 19:17:39 2013
@@ -20,12 +20,13 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj42049" xml:lang="en-us">
 <title>LCASE or LOWER function</title>
+<shortdesc>The LCASE or LOWER function takes a character expression as a
+parameter and returns a string in which all alphabetical characters have been
+converted to lowercase.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>LCASE or LOWER function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>LCASE or LOWER takes a character expression as a parameter and
-returns a string in which all alpha characters have been converted to lowercase.</p> </section>
 <refsyn><title>Syntax</title>
 <codeblock><b>LCASE ( <i>characterExpression</i> )</b></codeblock>
 <codeblock><b>LOWER ( <i>characterExpression</i> )</b></codeblock>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj42324.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj42324.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj42324.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj42324.dita Wed Nov 13 19:17:39 2013
@@ -20,15 +20,16 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj42324" xml:lang="en-us">
 <title>CURRENT_USER function</title>
+<shortdesc>When used outside stored routines, the CURRENT_USER, USER, and
+SESSION_USER functions all return the authorization identifier of the user that
+created the SQL session.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CURRENT_USER function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>When used outside stored routines, CURRENT_USER,
-<xref href="rrefsqlj42476.dita#rrefsqlj42476">USER</xref>, and 
-<xref href="rrefsqlj25228.dita#rrefsqlj25228">SESSION_USER</xref> all
-return the authorization identifier of the user that created the SQL
-session.</p>
+<section><p>See <xref href="rrefsqlj42476.dita#rrefsqlj42476"></xref> and
+<xref href="rrefsqlj25228.dita#rrefsqlj25228"></xref> for details on those
+functions.</p>
 <p>SESSION_USER also always returns this value when used within stored
 routines.</p>
 <p>If used within a stored routine created with EXTERNAL SECURITY DEFINER,
@@ -40,7 +41,8 @@ although the database owner could be the
 or
 <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement"></xref>.
 </p>  
-<p>These functions return a string of up to 128 characters.</p></section>
+<p>These functions return a string of up to 128 characters.</p>
+</section>
 <refsyn><title>Syntax</title> <codeblock><b>CURRENT_USER</b></codeblock> </refsyn>
 <example><title>Example</title>
 <codeblock><b>VALUES CURRENT_USER</b></codeblock> </example>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj42476.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj42476.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj42476.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj42476.dita Wed Nov 13 19:17:39 2013
@@ -20,15 +20,16 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj42476" xml:lang="en-us">
 <title>USER function</title>
+<shortdesc>When used outside stored routines, the USER, CURRENT_USER, and 
+SESSION_USER functions all return the authorization identifier of the user that
+created the SQL session.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>USER function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>When used outside stored routines, USER,
-<xref href="rrefsqlj42324.dita#rrefsqlj42324">CURRENT_USER</xref>, and 
-<xref href="rrefsqlj25228.dita#rrefsqlj25228">SESSION_USER</xref> all
-return the authorization identifier of the user that created the SQL
-session.</p>
+<section> <p>See <xref href="rrefsqlj42324.dita#rrefsqlj42324"></xref> and 
+<xref href="rrefsqlj25228.dita#rrefsqlj25228"></xref> for details on those
+functions.</p>
 <p>SESSION_USER also always returns this value when used within stored
 routines.</p>
 <p>If used within a stored routine created with EXTERNAL SECURITY DEFINER,

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj55788.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj55788.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj55788.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj55788.dita Wed Nov 13 19:17:39 2013
@@ -20,12 +20,15 @@ limitations under the License.
 -->
 <reference id="rrefsqlj55788" xml:lang="en-us">
 <title>Standard built-in functions</title>
+<shortdesc>The standard built-in functions supported in
+<ph conref="../conrefs.dita#prod/productshortname"></ph> are as
+follows.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>functions<indexterm>standard built-in, list of</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The standard built-in functions supported in Derby are as follows:</p><ul>
+<section><ul>
 <li><xref href="rrefsqlj98067.dita#rrefsqlj98067"></xref></li>
 <li><xref href="rreffuncacos.dita#rreffuncacos"></xref></li>
 <li><xref href="rreffuncasin.dita#rreffuncasin"></xref></li>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj61998.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj61998.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj61998.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj61998.dita Wed Nov 13 19:17:39 2013
@@ -20,15 +20,13 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj61998" xml:lang="en-us">
 <title>LOCATE function</title>
+<shortdesc>The LOCATE function is used to search for a string within another
+string. If the desired string is found, LOCATE returns the index at which it is
+found. If the desired string is not found, LOCATE returns 0.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>LOCATE function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-    <section>
-        <p>The LOCATE function is used to search for a string within
-            another string. If the desired string is found,
-LOCATE returns the index at which it is found.
-If the desired string is not found, LOCATE returns 0. </p></section>
 <refsyn><title>Syntax</title>
 <codeblock id="i1195050"><b>LOCATE ( <i>characterExpression</i>, <i>characterExpression</i> [ , <i>startPosition</i> ] )</b></codeblock>
         <p>There are two required arguments to the LOCATE function,

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj66113.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj66113.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj66113.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj66113.dita Wed Nov 13 19:17:39 2013
@@ -19,13 +19,15 @@ limitations under the License.
 -->
 <reference id="rrefsqlj66113" xml:lang="en-us">
 <title>COUNT(*) function</title>
+<shortdesc>COUNT(*) is an aggregate function that counts the number of rows
+accessed. No NULLs or duplicates are eliminated. COUNT(*) does not operate
+on an expression.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>COUNT(*) aggregate function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>COUNT(*) is an aggregate function that counts the number of rows
-accessed. No NULLs or duplicates are eliminated. COUNT(*) does not operate
-on an expression.</p></section>
+<section><p>See <xref href="rrefsqlj33923.dita#rrefsqlj33923"></xref> for more
+information about these functions.</p></section>
 <refsyn><title>Syntax</title><codeblock><b>COUNT(*)</b></codeblock><p>The
 resulting data type is <xref href="rrefsqlj10696.dita#rrefsqlj10696">INTEGER</xref>.</p> </refsyn>
 <example><title>Example</title>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj73147.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj73147.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj73147.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj73147.dita Wed Nov 13 19:17:39 2013
@@ -20,16 +20,16 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj73147" xml:lang="en-us">
 <title>SQRT function</title>
+<shortdesc>The SQRT function returns the square root of a floating-point number;
+only the built-in types REAL, FLOAT, and DOUBLE PRECISION are
+supported.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>SQRT function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>Returns the square root of a floating point number; only the
-built-in types <xref href="rrefsqlj14122.dita#rrefsqlj14122">REAL</xref>, <xref
-href="rrefsqlj27281.dita#rrefsqlj27281">FLOAT</xref>, and <xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE
-PRECISION</xref> are supported. The return type for SQRT is the type of the
-parameter.</p> <note>To execute SQRT on other data types, you must cast them
-to floating point types. </note></section>
+<section><p>The return type for SQRT is the type of the parameter.</p>
+<note>To execute SQRT on other data types, you must cast them to floating-point
+types.</note></section>
 <refsyn><title>Syntax</title>
 <codeblock id="i1195048"><b>SQRT ( <i>number</i> )</b></codeblock> </refsyn>
 <example><title>Examples</title>
@@ -37,7 +37,7 @@ to floating point types. </note></sectio
 VALUES SQRT(3421E+09)
 
 -- returns the square root of an INTEGER after casting it as a
--- floating point data type:
+-- floating-point data type:
 SELECT SQRT(myDoubleColumn) FROM MyTable
 
 VALUES SQRT (CAST(25 AS FLOAT));</b></codeblock> </example>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj93082.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj93082.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj93082.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj93082.dita Wed Nov 13 19:17:39 2013
@@ -20,16 +20,18 @@ limitations under the License.
 -->
 <reference id="rrefsqlj93082" xml:lang="en-us">
 <title>SUBSTR function</title>
+<shortdesc>The SUBSTR function acts on a character string expression or a bit
+string expression.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>functions<indexterm>SUBSTR</indexterm></indexterm><indexterm>SUBSTR
 function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The SUBSTR function acts on a character string expression or
-a bit string expression. The type of the result is a <xref href="rrefsqlj41207.dita#rrefsqlj41207">VARCHAR</xref> in
-the first case and <xref href="rrefsqlj32714.dita#rrefsqlj32714">VARCHAR FOR
-BIT DATA</xref> in the second case. The length of the result is the maximum
-length of the source type.</p></section>
+<section><p>The type of the result is a
+<xref href="rrefsqlj41207.dita#rrefsqlj41207">VARCHAR</xref> in the first case
+and a <xref href="rrefsqlj32714.dita#rrefsqlj32714">VARCHAR FOR BIT DATA</xref>
+in the second case. The length of the result is the maximum length of the source
+type.</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>SUBSTR( <i>characterExpression</i>, <i>startPosition</i> [, <i>lengthOfString</i> ] )</b></codeblock>
 <p>The parameter <i>startPosition</i> and

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj97870.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj97870.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj97870.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj97870.dita Wed Nov 13 19:17:39 2013
@@ -20,12 +20,12 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj97870" xml:lang="en-us">
 <title>LTRIM function</title>
+<shortdesc>The LTRIM function removes blanks from the beginning of a character
+string expression.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>LTRIM function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>LTRIM removes blanks from the beginning of a character string
-expression.</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>LTRIM ( <i>characterExpression</i> )</b></codeblock>
 <p>A <i>characterExpression</i> is

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj98067.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj98067.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqlj98067.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqlj98067.dita Wed Nov 13 19:17:39 2013
@@ -20,16 +20,22 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqlj98067" xml:lang="en-us">
 <title>ABS or ABSVAL function</title>
+<shortdesc>The ABS or ABSVAL function returns the absolute value of a numeric
+expression.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ABS or ABSVAL function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>ABS or ABSVAL returns the absolute value of a numeric expression.
-The return type is the type of parameter. All built-in numeric types are supported
-(<xref href="rrefsqlj15260.dita#rrefsqlj15260">DECIMAL</xref>, <xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE PRECISION</xref>, <xref href="rrefsqlj27281.dita#rrefsqlj27281">FLOAT</xref>, <xref
-href="rrefsqlj10696.dita#rrefsqlj10696">INTEGER</xref>, <xref href="rrefsqlj30435.dita#rrefsqlj30435">BIGINT</xref>, <xref
-href="rrefsqlj12362.dita#rrefsqlj12362">NUMERIC</xref>, <xref href="rrefsqlj14122.dita#rrefsqlj14122">REAL</xref>,
-and <xref href="rrefsqlj16221.dita#rrefsqlj16221">SMALLINT</xref>).</p></section>
+<section><p>The return type is the type of the parameter. All built-in numeric
+types are supported
+(<xref href="rrefsqlj15260.dita#rrefsqlj15260">DECIMAL</xref>,
+<xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE PRECISION</xref>,
+<xref href="rrefsqlj27281.dita#rrefsqlj27281">FLOAT</xref>,
+<xref href="rrefsqlj10696.dita#rrefsqlj10696">INTEGER</xref>,
+<xref href="rrefsqlj30435.dita#rrefsqlj30435">BIGINT</xref>,
+<xref href="rrefsqlj12362.dita#rrefsqlj12362">NUMERIC</xref>,
+<xref href="rrefsqlj14122.dita#rrefsqlj14122">REAL</xref>, and
+<xref href="rrefsqlj16221.dita#rrefsqlj16221">SMALLINT</xref>).</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>ABS ( <i>numericExpression</i> )</b></codeblock>
 <codeblock><b>ABSVAL ( <i>numericExpression</i> )</b></codeblock> </refsyn>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentdate.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentdate.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentdate.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentdate.dita Wed Nov 13 19:17:39 2013
@@ -20,11 +20,13 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqljcurrentdate" xml:lang="en-us">
 <title>CURRENT DATE function</title>
+<shortdesc>CURRENT DATE is a synonym for CURRENT_DATE.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CURRENT DATE function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>CURRENT DATE is a synonym for <xref href="rrefsqlj34177.dita#rrefsqlj34177">CURRENT_DATE</xref>.</p></section>
+<section><p>See <xref href="rrefsqlj34177.dita#rrefsqlj34177"></xref> for
+details.</p></section>
 </refbody>
 </reference>
 

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentschema.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentschema.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentschema.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentschema.dita Wed Nov 13 19:17:39 2013
@@ -20,13 +20,15 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqljcurrentschema" xml:lang="en-us">
 <title>CURRENT SCHEMA function</title>
+<shortdesc>The CURRENT SCHEMA function returns the schema name used to qualify
+unqualified database object references.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CURRENT SCHEMA function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>CURRENT SCHEMA returns the schema name used to qualify unqualified
-database object references.</p> <note>CURRENT SCHEMA and CURRENT SQLID are
-synonyms.</note> <p>These functions return a string of up to 128 characters. </p></section>
+<section>
+<note>CURRENT SCHEMA and CURRENT SQLID are synonyms.</note>
+<p>These functions return a string of up to 128 characters.</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>CURRENT SCHEMA</b></codeblock>
 <p>or, alternately</p>

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqljcurrenttimestamp.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqljcurrenttimestamp.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqljcurrenttimestamp.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqljcurrenttimestamp.dita Wed Nov 13 19:17:39 2013
@@ -20,11 +20,13 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqljcurrenttimestamp" xml:lang="en-us">
 <title>CURRENT TIMESTAMP function</title>
+<shortdesc>CURRENT TIMESTAMP is a synonym for CURRENT_TIMESTAMP.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CURRENT TIMESTAMP function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>CURRENT TIMESTAMP is a synonym for <xref href="rrefsqlj15866.dita#rrefsqlj15866">CURRENT_TIMESTAMP</xref>.</p></section>
+<section><p>See <xref href="rrefsqlj15866.dita#rrefsqlj15866"></xref> for
+details.</p></section>
 </refbody>
 </reference>
 

Modified: db/derby/docs/branches/10.10/src/ref/rrefsqljmod.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqljmod.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefsqljmod.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefsqljmod.dita Wed Nov 13 19:17:39 2013
@@ -20,12 +20,13 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefsqljmod" xml:lang="en-us">
 <title>MOD function</title>
+<shortdesc>The MOD function returns the remainder (modulus) of argument 1
+divided by argument 2. The result is negative only if argument 1 is
+negative.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>MOD function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>MOD returns the remainder (modulus) of argument 1 divided by
-argument 2. The result is negative only if argument 1 is negative. </p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>MOD ( <i>integerExpression</i>, <i>integerExpression</i> )</b></codeblock> <p>The
 result of the function is:   <ul>

Modified: db/derby/docs/branches/10.10/src/ref/rreftrimfunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rreftrimfunc.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rreftrimfunc.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rreftrimfunc.dita Wed Nov 13 19:17:39 2013
@@ -20,12 +20,16 @@ limitations under the License.
 -->
 <reference id="rreftrimfunc" xml:lang="en-us">
 <title>TRIM function</title>
+<shortdesc>The TRIM function takes a character expression and returns that
+expression with leading and/or trailing pad characters removed.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>functions<indexterm>TRIM</indexterm></indexterm>
 <indexterm>TRIM function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>TRIM is a function that takes a character expression and returns that expression with leading and/or trailing pad characters removed. Optional parameters indicate whether leading, or trailing, or both leading and trailing pad characters should be removed, and specify the pad character that is to be removed.</section>
+<section><p>Optional parameters indicate whether leading, or trailing, or both
+leading and trailing pad characters should be removed, and specify the pad
+character that is to be removed.</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>TRIM( [ <xref
 href="rreftrimfunc.dita#rreftrimfunc/trimOp"><i>trimOperands</i></xref> ] <i>trimSource</i> )</b></codeblock> 

Modified: db/derby/docs/branches/10.10/src/ref/rrefyearfunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefyearfunc.dita?rev=1541663&r1=1541662&r2=1541663&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/ref/rrefyearfunc.dita (original)
+++ db/derby/docs/branches/10.10/src/ref/rrefyearfunc.dita Wed Nov 13 19:17:39 2013
@@ -20,17 +20,15 @@ limitations under the License.
  "../dtd/reference.dtd">
 <reference id="rrefyearfunc" xml:lang="en-us">
 <title>YEAR function</title>
+<shortdesc>The YEAR function returns the year part of a value.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>YEAR function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The YEAR function returns the year part of a value. The argument
-must be a date, timestamp, or a valid character string representation of a
-date or timestamp. The result of the function is an integer between 1 and 9 999.
-If the argument
-can be null, the result can be null; if the argument is null, the result is
-the null value.
-</p></section>
+<section><p>The argument must be a date, timestamp, or a valid character string
+representation of a date or timestamp. The result of the function is an integer
+between 1 and 9,999. If the argument can be null, the result can be null; if the
+argument is null, the result is the null value.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>YEAR ( <i>expression</i> )</b></codeblock> </refsyn>
 <example>  <title>Example</title>
 <p>Select all the projects in the PROJECT table  that are scheduled



Mime
View raw message