db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1528945 [2/2] - /db/derby/docs/trunk/src/ref/
Date Thu, 03 Oct 2013 17:14:58 GMT
Modified: db/derby/docs/trunk/src/ref/rrefjdbc88908.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc88908.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc88908.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc88908.dita Thu Oct  3 17:14:57 2013
@@ -69,7 +69,7 @@ limitations under the License.
 <section> <p>You can specify functions in JDBC escape syntax by using the
 <codeph>fn</codeph> keyword.</p></section>
 <refsyn><title>Syntax</title>
-<codeblock><b>{fn <i>functionCall</i>}</b></codeblock>
+<codeblock><b>{ fn <i>functionCall</i> }</b></codeblock>
 <p>where <i>functionCall</i> is the name of one of the scalar functions listed
 below. The functions are of the following types:</p>
 <ul>
@@ -83,35 +83,35 @@ below. The functions are of the followin
 <dl><dlentry>
 <dt>abs</dt>
 <dd>Returns the absolute value of a number.
-<codeblock><b>abs(<i>NumericExpression</i>)</b></codeblock>
-<p>The JDBC escape syntax <codeph>{fn abs(<i>NumericExpression</i>)}</codeph> is
-equivalent to the built-in syntax <codeph>ABS(<i>NumericExpression</i>)</codeph>.
+<codeblock><b>abs ( <i>numericExpression</i> )</b></codeblock>
+<p>The JDBC escape syntax <codeph>{fn abs(<i>numericExpression</i>)}</codeph> is
+equivalent to the built-in syntax <codeph>ABS(<i>numericExpression</i>)</codeph>.
 For more information, see <xref href="rrefsqlj98067.dita#rrefsqlj98067"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>acos</dt>
 <dd>Returns the arc cosine of a specified number.
-<codeblock><b>acos(<i>number</i>)</b></codeblock>
+<codeblock><b>acos ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn acos(<i>number</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>ACOS(<i>number</i>)</codeph>. For more
 information, see <xref href="rreffuncacos.dita#rreffuncacos"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>asin</dt>
 <dd>Returns the arc sine of a specified number.
-<codeblock><b>asin(<i>number</i>)</b></codeblock>
+<codeblock><b>asin ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn asin(<i>number</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>ASIN(<i>number</i>)</codeph>. For more
 information, see <xref href="rreffuncasin.dita#rreffuncasin"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>atan</dt>
 <dd>Returns the arc tangent of a specified number.
-<codeblock><b>atan(<i>number</i>)</b></codeblock>
+<codeblock><b>atan ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn atan(<i>number</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>ATAN(<i>number</i>)</codeph>. For more
 information, see <xref href="rreffuncatan.dita#rreffuncatan"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>atan2</dt>
 <dd>Returns the arc tangent in radians of <codeph><i>y</i>/<i>x</i></codeph>.
-<codeblock><b>atan2(<i>y</i>, <i>x</i>)</b></codeblock>
+<codeblock><b>atan2 ( <i>y</i>, <i>x</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn atan2(<i>y</i>, <i>x</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>ATAN2(<i>y</i>, <i>x</i>)</codeph>.
 For more information, see <xref href="rreffuncatan2.dita#rreffuncatan2"></xref>.</p></dd>
@@ -119,35 +119,35 @@ For more information, see <xref href="rr
 <dt>ceiling</dt>
 <dd>Rounds the specified number up, and returns the smallest number that is
 greater than or equal to the specified number.
-<codeblock><b>ceiling(<i>number</i>)</b></codeblock>
+<codeblock><b>ceiling ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn ceiling(<i>number</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>CEILING(<i>number</i>)</codeph>. For
 more information, see <xref href="rreffuncceil.dita#rreffuncceil"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>cos</dt>
 <dd>Returns the cosine of a specified number.
-<codeblock><b>cos(<i>number</i>)</b></codeblock>
+<codeblock><b>cos ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn cos(<i>number</i>)}</codeph> is equivalent
 to the built-in syntax <codeph>COS(<i>number</i>)</codeph>. For more
 information, see <xref href="rreffunccos.dita#rreffunccos"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>cot</dt>
 <dd>Returns the cotangent of a specified number.
-<codeblock><b>cot(<i>number</i>)</b></codeblock>
+<codeblock><b>cot ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn cot(<i>number</i>)}</codeph> is equivalent
 to the built-in syntax <codeph>COT(<i>number</i>)</codeph>. For more
 information, see <xref href="rreffunccot.dita#rreffunccot"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>degrees</dt>
 <dd>Converts a specified number from radians to degrees.
-<codeblock><b>degrees(<i>number</i>)</b></codeblock>
+<codeblock><b>degrees ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn degrees(<i>number</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>DEGREES(<i>number</i>)</codeph>. For
 more information, see <xref href="rreffuncdegrees.dita#rreffuncdegrees"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>exp</dt>
 <dd>Returns <term>e</term> raised to the power of the specified number.
-<codeblock><b>exp(<i>number</i>)</b></codeblock>
+<codeblock><b>exp ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn exp(<i>number</i>)}</codeph> is equivalent
 to the built-in syntax <codeph>EXP(<i>number</i>)</codeph>. For more
 information, see <xref href="rreffuncexp.dita#rreffuncexp"></xref>.</p></dd>
@@ -155,21 +155,21 @@ information, see <xref href="rreffuncexp
 <dt>floor</dt>
 <dd>Rounds the specified number down, and returns the largest number that
 is less than or equal to the specified number.
-<codeblock><b>floor(<i>number</i>)</b></codeblock>
+<codeblock><b>floor ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn floor(<i>number</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>FLOOR(<i>number</i>)</codeph>. For
 more information, see <xref href="rreffuncfloor.dita#rreffuncfloor"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>log</dt>
 <dd>Returns the natural logarithm (base <term>e</term>) of the specified number.
-<codeblock><b>log(<i>number</i>)</b></codeblock>
+<codeblock><b>log ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn log(<i>number</i>)}</codeph> is equivalent
 to the built-in syntax <codeph>LOG(<i>number</i>)</codeph>. For more
 information, see <xref href="rreffunclog.dita#rreffunclog"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>log10</dt>
 <dd>Returns the base-10 logarithm of the specified number.
-<codeblock><b>log10(<i>number</i>)</b></codeblock>
+<codeblock><b>log10 ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn log10(<i>number</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>LOG10(<i>number</i>)</codeph>. For
 more information, see <xref href="rreffunclog10.dita#rreffunclog10"></xref>.</p></dd>
@@ -177,30 +177,30 @@ more information, see <xref href="rreffu
 <dt>mod</dt>
 <dd> Returns the remainder (modulus) of argument 1 divided by argument 2.
 The result is negative only if argument 1 is negative.
-<codeblock><b>mod(<i>integer_type</i>, <i>integer_type</i>)</b></codeblock>
+<codeblock><b>mod ( <i>integerExpression</i>, <i>integerExpression</i> )</b></codeblock>
 <p>The JDBC escape syntax
-<codeph>{fn mod(<i>integer_type</i>, <i>integer_type</i>)}</codeph> is
+<codeph>{fn mod(<i>integerExpression</i>, <i>integerExpression</i>)}</codeph> is
 equivalent to the built-in syntax
-<codeph>MOD(<i>integer_type</i>, <i>integer_type</i>)</codeph>. For more
+<codeph>MOD(<i>integerExpression</i>, <i>integerExpression</i>)</codeph>. For more
 information, see <xref href="rrefsqljmod.dita#rrefsqljmod"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>pi</dt>
 <dd>Returns a value that is closer than any other value to <term>pi</term>.
-<codeblock><b>pi()</b></codeblock>
+<codeblock><b>pi ( )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn pi()}</codeph> is equivalent to the
 built-in syntax <codeph>PI()</codeph>. For more information, see
 <xref href="rreffuncpi.dita#rreffuncpi"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>radians</dt>
 <dd>Converts a specified number from degrees to radians.
-<codeblock><b>radians(<i>number</i>)</b></codeblock>
+<codeblock><b>radians ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn radians(<i>number</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>RADIANS(<i>number</i>)</codeph>. For
 more information, see <xref href="rreffuncradians.dita#rreffuncradians"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>rand</dt>
 <dd>Returns a random number given a seed number.
-<codeblock><b>rand(<i>seed</i>)</b></codeblock>
+<codeblock><b>rand ( <i>seed</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn rand(<i>seed</i>)}</codeph> is equivalent
 to the built-in syntax <codeph>RAND(<i>seed</i>)</codeph>. For more
 information, see <xref href="rreffuncrand.dita#rreffuncrand"></xref>.</p></dd>
@@ -208,29 +208,29 @@ information, see <xref href="rreffuncran
 <dt>sign</dt>
 <dd>Returns an integer that represents the sign of a specified number (+1 if the
 number is positive, -1 if it is negative, 0 if it is 0).
-<codeblock><b>sign(<i>number</i>)</b></codeblock>
+<codeblock><b>sign ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn sign(<i>number</i>)}</codeph> is equivalent
 to the built-in syntax <codeph>SIGN(<i>number</i>)</codeph>. For more
 information, see <xref href="rreffuncsign.dita#rreffuncsign"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>sin</dt>
 <dd>Returns the sine of a specified number.
-<codeblock><b>sin(<i>number</i>)</b></codeblock>
+<codeblock><b>sin ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn sin(<i>number</i>)}</codeph> is equivalent
 to the built-in syntax <codeph>SIN(<i>number</i>)</codeph>. For more
 information, see <xref href="rreffuncsin.dita#rreffuncsin"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>sqrt</dt>
 <dd>Returns the square root of a floating-point number.
-<codeblock><b>sqrt(<i>FloatingPointExpression</i>)</b></codeblock>
+<codeblock><b>sqrt ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax
-<codeph>{fn sqrt(<i>FloatingPointExpression</i>)}</codeph> is equivalent to the
-built-in syntax <codeph>SQRT(<i>FloatingPointExpression</i>)</codeph>. For more
+<codeph>{fn sqrt(<i>number</i>)}</codeph> is equivalent to the
+built-in syntax <codeph>SQRT(<i>number</i>)</codeph>. For more
 information, see <xref href="rrefsqlj73147.dita#rrefsqlj73147"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>tan</dt>
 <dd>Returns the tangent of a specified number.
-<codeblock><b>tan(<i>number</i>)</b></codeblock>
+<codeblock><b>tan ( <i>number</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn tan(<i>number</i>)}</codeph> is equivalent
 to the built-in syntax <codeph>TAN(<i>number</i>)</codeph>. For more
 information, see <xref href="rreffunctan.dita#rreffunctan"></xref>.</p></dd>
@@ -241,78 +241,78 @@ information, see <xref href="rreffunctan
 <dd>Returns the concatenation of character strings; that is, the character
 string formed by appending the second string to the first string. If either
 string is null, the result is NULL. 
-<codeblock><b>concat(<i>CharacterExpression</i>, <i>CharacterExpression</i>)</b></codeblock>
+<codeblock><b>concat ( <i>characterExpression</i>, <i>characterExpression</i> )</b></codeblock>
 <p>The JDBC escape syntax
-<codeph>{fn concat(<i>CharacterExpression</i>,
-<i>CharacterExpression</i>)}</codeph> is equivalent to the built-in syntax
-<codeph><i>CharacterExpression</i> || <i>CharacterExpression</i></codeph>. For more
+<codeph>{fn concat(<i>characterExpression</i>,
+<i>characterExpression</i>)}</codeph> is equivalent to the built-in syntax
+<codeph><i>characterExpression</i> || <i>characterExpression</i></codeph>. For more
 information, see <xref href="rrefsqlj40899.dita#rrefsqlj40899"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>lcase</dt>
 <dd>Returns a string in which all alphabetic characters in the argument have
 been converted to lowercase. 
-<codeblock><b>lcase(<i>CharacterExpression</i>)</b></codeblock>
+<codeblock><b>lcase ( <i>characterExpression</i> )</b></codeblock>
 <p>The JDBC escape syntax
-<codeph>{fn lcase(<i>CharacterExpression</i>)}</codeph> is equivalent to the
-built-in syntax <codeph>LCASE(<i>CharacterExpression</i>)</codeph>. For more
+<codeph>{fn lcase(<i>characterExpression</i>)}</codeph> is equivalent to the
+built-in syntax <codeph>LCASE(<i>characterExpression</i>)</codeph>. For more
 information, see <xref href="rrefsqlj42049.dita#rrefsqlj42049"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>length</dt>
 <dd>Returns the number of characters in a character string expression. 
-<codeblock><b>length(<i>CharacterExpression</i>)</b></codeblock>
+<codeblock><b>length ( <i>characterExpression</i> )</b></codeblock>
 <p>The JDBC escape syntax
-<codeph>{fn length(<i>CharacterExpression</i>)}</codeph> is equivalent to the
-built-in syntax <codeph>LENGTH(<i>CharacterExpression</i>)</codeph>. For more
+<codeph>{fn length(<i>characterExpression</i>)}</codeph> is equivalent to the
+built-in syntax <codeph>LENGTH(<i>characterExpression</i>)</codeph>. For more
 information, see <xref href="rrefsqlj16762.dita#rrefsqlj16762"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>locate</dt>
-<dd>Returns the position in the second <i>CharacterExpression</i> of the first
-occurrence of the first <i>CharacterExpression</i>. Searches from the beginning
-of the second <i>CharacterExpression</i>, unless the <i>startIndex</i> parameter
+<dd>Returns the position in the second <i>characterExpression</i> of the first
+occurrence of the first <i>characterExpression</i>. Searches from the beginning
+of the second <i>characterExpression</i>, unless the <i>startIndex</i> parameter
 is specified.
-<codeblock><b>locate(<i>CharacterExpression</i>,<i>CharacterExpression</i> [, <i>startIndex</i>] )</b></codeblock>
+<codeblock><b>locate ( <i>characterExpression</i>, <i>characterExpression</i> [ , <i>startIndex</i> ] )</b></codeblock>
 <p>The JDBC escape syntax
-<codeph>{fn locate(<i>CharacterExpression</i>, <i>CharacterExpression</i>
+<codeph>{fn locate(<i>characterExpression</i>, <i>characterExpression</i>
 [, <i>startIndex</i>] )}</codeph> is equivalent to the built-in syntax
-<codeph>LOCATE(<i>CharacterExpression</i>, <i>CharacterExpression</i>
-[, <i>StartPosition]</i> )</codeph>. For more information, see
+<codeph>LOCATE(<i>characterExpression</i>, <i>characterExpression</i>
+[, <i>startPosition</i>] )</codeph>. For more information, see
 <xref href="rrefsqlj61998.dita#rrefsqlj61998"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>ltrim</dt>
 <dd>Removes blanks from the beginning of a character string expression.
-<codeblock><b>ltrim(<i>CharacterExpression</i>)</b></codeblock>
+<codeblock><b>ltrim ( <i>characterExpression</i> )</b></codeblock>
 <p>The JDBC escape syntax
-<codeph>{fn ltrim(<i>CharacterExpression</i>)}</codeph> is equivalent to the
-built-in syntax <codeph>LTRIM(<i>CharacterExpression</i>)</codeph>. For more
+<codeph>{fn ltrim(<i>characterExpression</i>)}</codeph> is equivalent to the
+built-in syntax <codeph>LTRIM(<i>characterExpression</i>)</codeph>. For more
 information, see <xref href="rrefsqlj97870.dita#rrefsqlj97870"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>rtrim</dt>
 <dd>Removes blanks from the end of a character string expression.
-<codeblock><b>rtrim(<i>CharacterExpression</i>)</b></codeblock>
+<codeblock><b>rtrim ( <i>characterExpression</i> )</b></codeblock>
 <p>The JDBC escape syntax
-<codeph>{fn rtrim(<i>CharacterExpression</i>)}</codeph> is equivalent to the
-built-in syntax <codeph>RTRIM(<i>CharacterExpression</i>)</codeph>. For more
+<codeph>{fn rtrim(<i>characterExpression</i>)}</codeph> is equivalent to the
+built-in syntax <codeph>RTRIM(<i>characterExpression</i>)</codeph>. For more
 information, see <xref href="rrefsqlj32613.dita#rrefsqlj32613"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>substring</dt>
 <dd>Forms a character string by extracting <i>length</i> characters from the
-<i>CharacterExpression</i> beginning at <i>startIndex</i>. The index of the
-first character in the <i>CharacterExpression</i> is 1.
-<codeblock><b>substring(<i>CharacterExpression</i>, <i>startIndex</i>, <i>length</i>)</b></codeblock>
+<i>characterExpression</i> beginning at <i>startIndex</i>. The index of the
+first character in the <i>characterExpression</i> is 1.
+<codeblock><b>substring ( <i>characterExpression</i>, <i>startIndex</i>, <i>length</i> )</b></codeblock>
 <p>The JDBC escape syntax
-<codeph>{fn substring(<i>CharacterExpression</i>, <i>startIndex</i>,
+<codeph>{fn substring(<i>characterExpression</i>, <i>startIndex</i>,
 <i>length</i>)}</codeph> is equivalent to the built-in syntax
-<codeph>SUBSTR(<i>CharacterExpression</i>, <i>startIndex</i>,
+<codeph>SUBSTR(<i>characterExpression</i>, <i>startIndex</i>,
 <i>length</i>)</codeph>. For more information, see
 <xref href="rrefsqlj93082.dita#rrefsqlj93082"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>ucase</dt>
 <dd>Returns a string in which all alphabetic characters in the argument have
 been converted to uppercase. 
-<codeblock><b>ucase(<i>CharacterExpression</i>)</b></codeblock>
+<codeblock><b>ucase ( <i>characterExpression</i> )</b></codeblock>
 <p>The JDBC escape syntax
-<codeph>{fn ucase(<i>CharacterExpression</i>)}</codeph> is equivalent to the
-built-in syntax <codeph>UCASE(<i>CharacterExpression</i>)</codeph>. For more
+<codeph>{fn ucase(<i>characterExpression</i>)}</codeph> is equivalent to the
+built-in syntax <codeph>UCASE(<i>characterExpression</i>)</codeph>. For more
 information, see <xref href="rrefsqlj29930.dita#rrefsqlj29930"></xref>.</p></dd>
 </dlentry>
 </dl>
@@ -321,28 +321,28 @@ information, see <xref href="rrefsqlj299
 <dl><dlentry>
 <dt>curdate</dt>
 <dd>Returns the current date.
-<codeblock><b>curdate()</b></codeblock>
+<codeblock><b>curdate ( )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn curdate()}</codeph> is equivalent to the
 built-in syntax <codeph>CURRENT_DATE</codeph>. For more information, see
 <xref href="rrefsqlj34177.dita#rrefsqlj34177"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>curtime</dt>
 <dd>Returns the current time.
-<codeblock><b>curtime()</b></codeblock>
+<codeblock><b>curtime ( )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn curtime()}</codeph> is equivalent to the
 built-in syntax <codeph>CURRENT_TIME</codeph>. For more information, see
 <xref href="rrefsqlj33772.dita#rrefsqlj33772"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>hour</dt>
 <dd>Returns the hour part of a time value.
-<codeblock><b>hour(<i>expression</i>)</b></codeblock>
+<codeblock><b>hour ( <i>expression</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn hour(<i>expression</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>HOUR(<i>expression</i>)</codeph>. For
 more information, see <xref href="rrefhourfunc.dita#rrefhourfunc"></xref>.</p></dd>
 </dlentry><dlentry>
 <dt>minute</dt>
 <dd>Returns the minute part of a time value.
-<codeblock><b>minute(<i>expression</i>)</b></codeblock>
+<codeblock><b>minute ( <i>expression</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn minute(<i>expression</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>MINUTE(<i>expression</i>)</codeph>.
 For more information, see
@@ -350,7 +350,7 @@ For more information, see
 </dlentry><dlentry>
 <dt>month</dt>
 <dd>Returns the month part of a date value.
-<codeblock><b>month(<i>expression</i>)</b></codeblock>
+<codeblock><b>month ( <i>expression</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn month(<i>expression</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>MONTH(<i>expression</i>)</codeph>.
 For more information, see
@@ -358,7 +358,7 @@ For more information, see
 </dlentry><dlentry>
 <dt>second</dt>
 <dd>Returns the seconds part of a time value.
-<codeblock><b>second(<i>expression</i>)</b></codeblock>
+<codeblock><b>second ( <i>expression</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn second(<i>expression</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>SECOND(<i>expression</i>)</codeph>.
 For more information, see
@@ -371,7 +371,7 @@ timestamp based on the interval type and
 You can subtract from the timestamp by using negative integers.
 <p><codeph>TIMESTAMPADD</codeph> is a JDBC escaped function and is accessible
 only by using the JDBC escape function syntax.</p>
-<codeblock><b>TIMESTAMPADD( <i>interval</i>, <i>integerExpression</i>, <i>timestampExpression</i> )</b></codeblock>
+<codeblock><b>TIMESTAMPADD ( <i>interval</i>, <i>integerExpression</i>, <i>timestampExpression</i> )</b></codeblock>
 <p>To perform <codeph>TIMESTAMPADD</codeph> on dates and times, it is necessary
 to convert the dates and times to timestamps. Dates are converted to timestamps
 by putting 00:00:00.0 in the time-of-day fields. Times are converted to
@@ -385,7 +385,7 @@ between two timestamp values at a specif
 can return the number of minutes between two specified timestamps.
 <p>The <codeph>TIMESTAMPDIFF</codeph> is a JDBC escaped function and is
 accessible only by using the JDBC escape function syntax.</p>
-<codeblock><b>TIMESTAMPDIFF( <i>interval</i>, <i>timestampExpression1</i>, <i>timestampExpression2</i> )</b></codeblock>
+<codeblock><b>TIMESTAMPDIFF ( <i>interval</i>, <i>timestampExpression1</i>, <i>timestampExpression2</i> )</b></codeblock>
 <p>To perform <codeph>TIMESTAMPDIFF</codeph> on dates and times, it is necessary
 to convert the dates and times to timestamps. Dates are converted to timestamps
 by putting 00:00:00.0 in the time-of-day fields. Times are converted to
@@ -395,7 +395,7 @@ clauses, because the optimizer will not 
 </dlentry><dlentry>
 <dt>year</dt>
 <dd>Returns the year part of a date value.
-<codeblock><b>year(<i>expression</i>)</b></codeblock>
+<codeblock><b>year ( <i>expression</i> )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn year(<i>expression</i>)}</codeph> is
 equivalent to the built-in syntax <codeph>YEAR(<i>expression</i>)</codeph>.
 For more information, see
@@ -430,7 +430,7 @@ the following syntax:</p>
 <dt>user</dt>
 <dd>Returns the authorization identifier or name of the current user. If there
 is no current user, it returns APP.
-<codeblock><b>user()</b></codeblock>
+<codeblock><b>user ( )</b></codeblock>
 <p>The JDBC escape syntax <codeph>{fn user()}</codeph> is equivalent to the
 built-in syntax <codeph>USER</codeph>. For more information, see
 <xref href="rrefsqlj42476.dita#rrefsqlj42476"></xref>.</p></dd>

Modified: db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita Thu Oct  3 17:14:57 2013
@@ -28,9 +28,10 @@ limitations under the License.
 <section> <p><ph conref="../conrefs.dita#prod/productshortname"></ph> interprets
 the JDBC escape syntax for dates as equivalent to the correct SQL syntax for
 dates.</p></section>
-<refsyn><title>Syntax</title><codeblock><b>{d 'yyyy-mm-dd'}</b></codeblock> </refsyn>
+<refsyn><title>Syntax</title>
+<codeblock><b>{ d '<i>yyyy</i>-<i>mm</i>-<i>dd</i>' }</b></codeblock> </refsyn>
 <section><title>Equivalent to</title>
-<codeblock><b>DATE('yyyy-mm-dd')</b></codeblock> </section>
+<codeblock><b>DATE('<i>yyyy</i>-<i>mm</i>-<i>dd</i>')</b></codeblock> </section>
 <example><title>Example</title>
 <codeblock><b>VALUES {d '2010-10-19'}</b></codeblock> </example>
 </refbody>

Modified: db/derby/docs/trunk/src/ref/rrefpgc1.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefpgc1.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefpgc1.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefpgc1.dita Thu Oct  3 17:14:57 2013
@@ -24,11 +24,11 @@ limitations under the License.
 <section><p>The JDBC API defines the following parameters for this method
 call:</p></section>
 <section> <ul>
-<li><i>catalog</i>   <p>always use <i>null</i> for this parameter in <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p></li>
+<li><i>catalog</i>   <p>Always use <i>null</i> for this parameter in <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p></li>
 <li><i>schemaPattern</i>   <p>Java procedures have a schema.</p></li>
-<li><i>procedureNamePattern</i>   <p>a String object representing a procedure
+<li><i>procedureNamePattern</i>   <p>A <i>String</i> object representing a procedure
 name pattern.</p></li>
-<li id="i1024753"><i id="jdbc95532">column-Name-Pattern</i>   <p>a String
+<li id="i1024753"><i id="jdbc95532">columnNamePattern</i>   <p>A <i>String</i>
 object representing the name pattern of the parameter names or return value
 names. Java procedures have parameter names matching those defined in the
 CREATE PROCEDURE statement. Use "%" to find all parameter names.</p></li>

Modified: db/derby/docs/trunk/src/ref/rrefsecondfunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsecondfunc.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsecondfunc.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsecondfunc.dita Thu Oct  3 17:14:57 2013
@@ -33,7 +33,7 @@ If the argument
 can be null, the result can be null. If the argument is null, the result is
 0.
 </p></section>
-<refsyn><title>Syntax</title><codeblock>SECOND ( <i>expression</i> )</codeblock> </refsyn>
+<refsyn><title>Syntax</title><codeblock><b>SECOND ( <i>expression</i> )</b></codeblock> </refsyn>
 <example> <title>Example</title><p>
 The RECEIVED column contains a timestamp that has an internal value
 equivalent to 2005-12-25-17.12.30.000000.

Modified: db/derby/docs/trunk/src/ref/rrefsqlj16762.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj16762.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj16762.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj16762.dita Thu Oct  3 17:14:57 2013
@@ -28,7 +28,8 @@ limitations under the License.
 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>
-<refsyn><title>Syntax</title> <codeblock><b>LENGTH ( { <i>CharacterExpression</i> | <i>BitExpression</i> } )</b></codeblock> </refsyn>
+<refsyn><title>Syntax</title>
+<codeblock><b>LENGTH ( <i>characterExpression</i> | <i>bitExpression</i> )</b></codeblock> </refsyn>
 <example><title>Examples</title>
 <codeblock><b><ph>-- returns 20</ph>
 VALUES LENGTH('supercalifragilistic')

Modified: db/derby/docs/trunk/src/ref/rrefsqlj29930.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj29930.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj29930.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj29930.dita Thu Oct  3 17:14:57 2013
@@ -28,14 +28,18 @@ limitations under the License.
 <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>UCASE or UPPER ( <i>CharacterExpression</i> ) </codeblock><p>If
+<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>
 <example><title>Example</title><p>To return the string <codeph>aSD1#w</codeph> in
-uppercase, use the following clause:<codeblock>VALUES UPPER('aSD1#w')</codeblock>The
+uppercase, use the following clause:
+<codeblock><b>VALUES UPPER('aSD1#w')</b></codeblock>The
 value returned is <codeph>ASD1#W</codeph>.</p> </example>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj32613.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj32613.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj32613.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj32613.dita Thu Oct  3 17:14:57 2013
@@ -25,9 +25,11 @@ limitations under the License.
 </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
-CharacterExpression is a CHAR, VARCHAR, or LONG VARCHAR data type, any built-in
-type that is implicitly converted to a string.</p> <p>RTRIM returns NULL if <i>CharacterExpression</i> evaluates
+<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
+type that is implicitly converted to a string.</p>
+<p>RTRIM returns NULL if <i>characterExpression</i> evaluates
 to null. </p> </refsyn>
 <example><title>Examples</title>
 <codeblock><b><ph>-- returns ' asdf'</ph>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj32693.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj32693.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj32693.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj32693.dita Thu Oct  3 17:14:57 2013
@@ -27,12 +27,12 @@ limitations under the License.
 <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
+<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.
 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
-col).</p> <p>Only one DISTINCT aggregate expression per <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> is
+col).</p> <p>Only one DISTINCT aggregate expression per <i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref></i> is
 allowed. For example, the following query is not valid:   <codeblock><b>SELECT AVG (DISTINCT flying_time), SUM (DISTINCT miles)
 FROM Flights</b></codeblock></p> <p>The expression can contain multiple column
 references or expressions, but it cannot contain another aggregate or subquery.

Modified: db/derby/docs/trunk/src/ref/rrefsqlj33562.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj33562.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj33562.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj33562.dita Thu Oct  3 17:14:57 2013
@@ -29,8 +29,8 @@ function (explicit)</indexterm></indexte
 </metadata></prolog>
 <refbody>
 <section> <p>CAST expressions are permitted anywhere expressions are permitted.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>CAST ( [ <i>Expression</i> | NULL | ? ]
-    AS <i>Datatype</i>)</b></codeblock> <p>The data type to which you are
+<refsyn><title>Syntax</title> <codeblock><b>CAST ( [ <i>expression</i> | NULL | ? ]
+    AS <i>dataType</i> )</b></codeblock> <p>The data type to which you are
 casting an expression is the <i>target type</i>. The data type of the expression
 from which you are casting is the <i>source type</i>.</p> </refsyn>
 <section><title>CAST conversions among SQL-92 data types</title> <p>The following

Modified: db/derby/docs/trunk/src/ref/rrefsqlj38716.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj38716.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj38716.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj38716.dita Thu Oct  3 17:14:57 2013
@@ -35,7 +35,7 @@ value than COUNT(DISTINCT col).</p><p>On
 per <i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref></i> is
 allowed. For example, the following query is not allowed:</p><codeblock><b><ph>-- query not allowed</ph>
 SELECT COUNT (DISTINCT flying_time), SUM (DISTINCT miles)
-FROM Flights</b></codeblock><p>An <i>Expression</i> can contain multiple column
+FROM Flights</b></codeblock><p>An <i>expression</i> can contain multiple column
 references or expressions, but it cannot contain another aggregate or subquery.
 If an <i>expression</i> evaluates to NULL, the aggregate is not processed
 for that value.</p><p>The resulting data type of COUNT is <xref href="rrefsqlj10696.dita#rrefsqlj10696">INTEGER</xref>.</p> </refsyn>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj40899.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj40899.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj40899.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj40899.dita Thu Oct  3 17:14:57 2013
@@ -24,13 +24,14 @@ limitations under the License.
 <keywords><indexterm>Concatenation operator</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The concatenation operator, ||, concatenates its right operand
-to the end of its left operand. It operates on a character or bit expression.</p> <p>Because
+<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>
 <refsyn><title>Syntax</title> <codeblock><b>{
-    { <i>CharacterExpression</i> || <i>CharacterExpression</i> } |
-    <i>{ BitExpression</i> || <i>BitExpression</i> }
+    <i>characterExpression</i> || <i>characterExpression</i> |
+    <i>bitExpression</i> || <i>bitExpression</i>
 }</b></codeblock> <p>For character strings, if both the left and right operands
 are of type CHAR, the resulting type is CHAR; otherwise, it is VARCHAR. The
 normal blank padding/trimming rules for CHAR and VARCHAR apply to the result

Modified: db/derby/docs/trunk/src/ref/rrefsqlj42049.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj42049.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj42049.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj42049.dita Thu Oct  3 17:14:57 2013
@@ -26,13 +26,16 @@ limitations under the License.
 <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 or LOWER ( <i>CharacterExpression</i> ) </b></codeblock> <p>A <i>CharacterExpression</i> is
+<refsyn><title>Syntax</title>
+<codeblock><b>LCASE ( <i>characterExpression</i> )</b></codeblock>
+<codeblock><b>LOWER ( <i>characterExpression</i> )</b></codeblock>
+<p>A <i>characterExpression</i> is
 a CHAR, VARCHAR, or LONG VARCHAR data type or any built-in type that is implicitly
 converted to a string (except a bit expression).</p> <p>If the parameter type
 is CHAR or LONG VARCHAR, the return type is CHAR or LONG VARCHAR. Otherwise,
 the return type is VARCHAR.</p> <p>The length and maximum length of the returned
 value are the same as the length and maximum length of the parameter. </p> <p>If
-the <i>CharacterExpression</i> evaluates to null, this function returns null.
+the <i>characterExpression</i> evaluates to null, this function returns null.
  </p> </refsyn>
 <example><title>Examples</title>
 <codeblock><b><ph>-- returns 'asd1#w'</ph>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj61998.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj61998.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj61998.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj61998.dita Thu Oct  3 17:14:57 2013
@@ -29,16 +29,16 @@ limitations under the License.
             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>
+<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,
         and a third optional argument.
         <ul>
-            <li>The first CharacterExpression specifies the string to
+            <li>The first <i>characterExpression</i> specifies the string to
                 search <b>for</b>.</li>
-            <li>The second CharacterExpression specifies
+            <li>The second <i>characterExpression</i> specifies
                 the string <b>in which</b> to search.</li>
-            <li>The third argument is the startPosition, and specifies
+            <li>The third argument is the <i>startPosition</i>, which specifies
                 the position in the second argument at which the search is
                 to start. If the third argument is not provided, the LOCATE
                 function starts its search at the beginning of the second
@@ -49,10 +49,10 @@ If the desired string is not found, LOCA
         second argument at which the first argument was first located. Index
         positions start with 1.
         If the first argument is not found in the second argument, LOCATE
-        returns 0. If the first argument is an empty string (''), LOCATE
+        returns 0. If the first argument is an empty string (<codeph>''</codeph>), LOCATE
         returns the value of the third argument (or 1 if it was not provided),
         even if the second argument is also an empty string. If a NULL
-        value is passed for either of the CharacterExpression arguments,
+        value is passed for either of the <i>characterExpression</i> arguments,
         NULL is returned.</p>
 </refsyn>
 <example><title>Examples</title>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj73147.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj73147.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj73147.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj73147.dita Thu Oct  3 17:14:57 2013
@@ -30,7 +30,8 @@ href="rrefsqlj27281.dita#rrefsqlj27281">
 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>
-<refsyn><title>Syntax</title> <codeblock id="i1195048"><b>SQRT(<i>FloatingPointExpression</i>)</b></codeblock> </refsyn>
+<refsyn><title>Syntax</title>
+<codeblock id="i1195048"><b>SQRT ( <i>number</i> )</b></codeblock> </refsyn>
 <example><title>Examples</title>
 <codeblock><b>-- throws an exception if any row stores a negative number:
 VALUES SQRT(3421E+09)

Modified: db/derby/docs/trunk/src/ref/rrefsqlj93082.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj93082.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj93082.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj93082.dita Thu Oct  3 17:14:57 2013
@@ -30,8 +30,9 @@ a bit string expression. The type of the
 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>
-<refsyn><title>Syntax</title><codeblock>SUBSTR({ <i>CharacterExpression</i> },
-   <i>StartPosition</i> [, <i>LengthOfString</i> ] )</codeblock><p>The parameter <i>startPosition</i> and
+<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
 the optional parameter <i>lengthOfString</i> are both integer expressions.
 The first character or bit has a <i>startPosition</i> of 1. If you specify
 0, <ph conref="../conrefs.dita#prod/productshortname"></ph> assumes that you
@@ -49,10 +50,10 @@ The SUBSTR function returns an error if 
 the parameter <i>lengthOfString</i>.</p> </refsyn>
 <example><title>Examples</title><p>To return a substring of the word <codeph>hello</codeph>,
 starting at the second character and continuing until the end of the word,
-use the following clause:<codeblock>VALUES SUBSTR('hello', 2)</codeblock>The
+use the following clause:<codeblock><b>VALUES SUBSTR('hello', 2)</b></codeblock>The
 result is '<codeph>ello</codeph>'.</p><p>To return a substring of the word <codeph>hello</codeph>,
 starting at the first character and continuing for two characters, use the
-following clause:<codeblock>VALUES SUBSTR('hello',1,2)</codeblock>The result
+following clause:<codeblock><b>VALUES SUBSTR('hello',1,2)</b></codeblock>The result
 is '<codeph>he</codeph>'.</p></example>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj97870.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj97870.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj97870.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj97870.dita Thu Oct  3 17:14:57 2013
@@ -26,9 +26,11 @@ limitations under the License.
 <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
+<refsyn><title>Syntax</title>
+<codeblock><b>LTRIM ( <i>characterExpression</i> )</b></codeblock>
+<p>A <i>characterExpression</i> is
 a CHAR, VARCHAR, or LONG VARCHAR data type, any built-in type that is implicitly
-converted to a string.</p> <p>LTRIM returns NULL if <i>CharacterExpression</i> evaluates
+converted to a string.</p> <p>LTRIM returns NULL if <i>characterExpression</i> evaluates
 to null. </p> </refsyn>
 <example><title>Example</title>
 <codeblock><b><ph>-- returns 'asdf  '</ph>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj98067.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj98067.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj98067.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj98067.dita Thu Oct  3 17:14:57 2013
@@ -30,7 +30,9 @@ The return type is the type of parameter
 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 id="i1195049"><b>ABS(<i>NumericExpression</i>)</b></codeblock> </refsyn>
+<refsyn><title>Syntax</title>
+<codeblock><b>ABS ( <i>numericExpression</i> )</b></codeblock>
+<codeblock><b>ABSVAL ( <i>numericExpression</i> )</b></codeblock> </refsyn>
 <example><title>Example</title>
 <codeblock><b><ph>-- returns 3</ph>
 VALUES ABS(-3)</b></codeblock> </example>

Modified: db/derby/docs/trunk/src/ref/rrefsqljcurrentschema.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljcurrentschema.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljcurrentschema.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljcurrentschema.dita Thu Oct  3 17:14:57 2013
@@ -27,11 +27,10 @@ limitations under the License.
 <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>
-<refsyn><title>Syntax</title> <codeblock><b>CURRENT SCHEMA
-
-<b>-- or, alternately:</b>
-
-CURRENT SQLID</b></codeblock> </refsyn>
+<refsyn><title>Syntax</title>
+<codeblock><b>CURRENT SCHEMA</b></codeblock>
+<p>or, alternately</p>
+<codeblock><b>CURRENT SQLID</b></codeblock> </refsyn>
 <example><title>Example</title>
 <codeblock><b><ph>-- Set the name column default to the current schema:</ph>
 CREATE TABLE mytable (id int, name VARCHAR(128) DEFAULT CURRENT SQLID)

Modified: db/derby/docs/trunk/src/ref/rrefsqljmod.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljmod.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljmod.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljmod.dita Thu Oct  3 17:14:57 2013
@@ -26,7 +26,8 @@ limitations under the License.
 <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(integer_type, integer_type) </b></codeblock> <p>The
+<refsyn><title>Syntax</title>
+<codeblock><b>MOD ( <i>integerExpression</i>, <i>integerExpression</i> )</b></codeblock> <p>The
 result of the function is:   <ul>
 <li>SMALLINT if both arguments are SMALLINT.</li>
 <li>INTEGER if one argument is INTEGER and the other is INTEGER or SMALLINT.</li>

Modified: db/derby/docs/trunk/src/ref/rrefsqljtfinvoke.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljtfinvoke.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljtfinvoke.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljtfinvoke.dita Thu Oct  3 17:14:57 2013
@@ -23,7 +23,8 @@ limitations under the License.
 <refbody>
 <example>
 <codeblock>
-<b>TABLE <i>tableFunctionName</i>( [ [ <i>functionArg</i> ] [, <i>functionArg</i> ]* ] )
+<b>TABLE <i><xref
+href="rreffunctionname.dita#rreffunctionname">functionName</xref></i>( [ [ <i>functionArg</i> ] [, <i>functionArg</i> ]* ] )
 </b></codeblock>
 <p>
 Note that when you invoke a table function, you must bind it to a

Modified: db/derby/docs/trunk/src/ref/rreftimestampfunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreftimestampfunc.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreftimestampfunc.dita (original)
+++ db/derby/docs/trunk/src/ref/rreftimestampfunc.dita Thu Oct  3 17:14:57 2013
@@ -48,14 +48,16 @@ that timestamp.</li>
 timestamp represented by that string. If the argument is a string of length
 14, the timestamp has a microsecond part of zero. </li>
 </ul></p></section>
-<refsyn><title>Syntax</title><codeblock>TIMESTAMP ( <i>expression</i> [, <i>expression</i> ] )</codeblock> </refsyn>
+<refsyn><title>Syntax</title>
+<codeblock><b>TIMESTAMP ( <i>expression</i> [ , <i>expression</i> ] )</b></codeblock> </refsyn>
 <example><title>Examples</title><p>The second column in table <codeph>records_table</codeph> contains
 dates (such as 1998-12-25) and the third column contains times of day (such
-as 17:12:30). You can return the timestamp with this statement:<codeblock>SELECT TIMESTAMP(col2, col3) FROM records_table</codeblock></p><p>The
-following clause returns the value <codeph>1998-12-25-17:12:30.0</codeph>:<codeblock>VALUES TIMESTAMP('1998-12-25', '17.12.30'); 
+as 17:12:30). You can return the timestamp with this statement:
+<codeblock><b>SELECT TIMESTAMP(col2, col3) FROM records_table</b></codeblock></p><p>The
+following clause returns the value <codeph>1998-12-25-17:12:30.0</codeph>:
+<codeblock><b>VALUES TIMESTAMP('1998-12-25', '17.12.30'); 
 1 
 -------------------------- 
-1998-12-25 17:12:30.0 
-</codeblock></p> </example>
+1998-12-25 17:12:30.0 </b></codeblock></p> </example>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rreftrimfunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreftrimfunc.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreftrimfunc.dita (original)
+++ db/derby/docs/trunk/src/ref/rreftrimfunc.dita Thu Oct  3 17:14:57 2013
@@ -26,31 +26,36 @@ limitations under the License.
 </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>
-<refsyn><title>Syntax</title> <codeblock>TRIM( [ <i>trimOperands</i> ] <i>trimSource</i>)</codeblock> 
-<p>
-<codeblock>
-<i>trimOperands</i>  ::= { <i>trimType</i> [ <i>trimCharacter ] </i> FROM | <i>trimCharacter</i> FROM }
-<i>trimType</i>      ::= { LEADING | TRAILING | BOTH }
-<i>trimCharacter</i> ::= <i>CharacterExpression</i>
-<i>trimSource</i>    ::= <i>CharacterExpression</i>
-</codeblock>
-</p><p>
-If <i>trimType</i> is not specified, it will default to BOTH. If <i>trimCharacter</i> is not specified, it will default to the space character (' ').  Otherwise the <i>trimCharacter</i> expression must evaulate to one of the following:
+<refsyn><title>Syntax</title>
+<codeblock><b>TRIM( [ <xref
+href="rreftrimfunc.dita#rreftrimfunc/trimOp"><i>trimOperands</i></xref> ] <i>trimSource</i> )</b></codeblock> 
+<p>The <i>trimSource</i> is a <i>characterExpression</i>.</p>
+</refsyn>
+<section id="trimOp"><title>trimOperands</title>
+<codeblock><b>{ <xref
+href="rreftrimfunc.dita#rreftrimfunc/trimTy"><i>trimType</i></xref> [ <i>trimCharacter</i> ] FROM | <i>trimCharacter</i> FROM }</b></codeblock>
+<p>The <i>trimCharacter</i> is a <i>characterExpression</i>.</p>
+</section>
+<section id="trimTy"><title>trimType</title>
+<codeblock><b>{ LEADING | TRAILING | BOTH }</b></codeblock>
+</section>
+<section>
+<p>If <i>trimType</i> is not specified, it defaults to BOTH. If <i>trimCharacter</i> is not specified, it will default to the space character (' ').  Otherwise the <i>trimCharacter</i> expression must evaulate to one of the following:
 	<ul>
-	    <li>a character string whose length is exactly one, or.</li>
+	    <li>A character string whose length is exactly one</li>
 	    <li>NULL</li>
 	</ul>
 </p><p>
 If either <i>trimCharacter</i> or <i>trimSource</i> evaluates to NULL, the result of the TRIM function is NULL.  Otherwise, the result of the TRIM function is defined as follows:
 	<ul>
-	<li>If trimType is LEADING, the result will be the trimSource value with all leading occurrences of trimChar removed.</li>
-	<li>If trimType is TRAILING, the result will be the trimSource value with all trailing occurrences of trimChar removed.</li>
-	<li>If trimType is BOTH, the result will be the trimSource value with all leading *and* trailing occurrences of trimChar removed.</li>
+	<li>If <i>trimType</i> is LEADING, the result will be the <i>trimSource</i> value with all leading occurrences of <i>trimCharacter</i> removed.</li>
+	<li>If <i>trimType</i> is TRAILING, the result will be the <i>trimSource</i> value with all trailing occurrences of <i>trimCharacter</i> removed.</li>
+	<li>If <i>trimType</i> is BOTH, the result will be the <i>trimSource</i> value with all leading <i>and</i> trailing occurrences of <i>trimCharacter</i> removed.</li>
 	</ul>
 </p><p>
 If <i>trimSource</i>'s data type is CHAR or VARCHAR, the return type of the TRIM function will be VARCHAR. Otherwise the return type of the TRIM function will be CLOB.
 </p>
-</refsyn>
+</section>
 <example><title>Examples</title>
 <p>
 <codeblock><b><ph>-- returns 'derby' (no spaces)</ph>



Mime
View raw message