svn commit: r1528981 - in /db/derby/docs/trunk/src/ref: rrefbuiltchar.dita rrefjdbc37244.dita rreftableexpression.dita

[ch...@apache.org]

Author: chaase3
Date: Thu Oct  3 19:24:22 2013
New Revision: 1528981

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

Modified 3 topics in Reference Manual.

Patch: DERBY-6121-3.diff

Modified:
    db/derby/docs/trunk/src/ref/rrefbuiltchar.dita
    db/derby/docs/trunk/src/ref/rrefjdbc37244.dita
    db/derby/docs/trunk/src/ref/rreftableexpression.dita

Modified: db/derby/docs/trunk/src/ref/rrefbuiltchar.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefbuiltchar.dita?rev=1528981&r1=1528980&r2=1528981&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefbuiltchar.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefbuiltchar.dita Thu Oct  3 19:24:22 2013
@@ -92,9 +92,7 @@ the timestamp. The length of the result 
 <codeblock><b>CHAR ( <i>decimalExpression</i> ) </b></codeblock> <dl>
 <dlentry>
 <dt><i>decimalExpression</i></dt>
-<dd>An expression that returns a value that is a decimal data type. If a different
-precision and scale is desired, the DECIMAL scalar function can be used first
-to make the change.</dd>
+<dd>An expression that returns a value that is a decimal data type.</dd>
 </dlentry></dl> </section>
 <section><title>Floating point to character syntax</title>
 <codeblock><b>CHAR ( <i>floatingPointExpression</i> ) </b></codeblock> <dl>

Modified: db/derby/docs/trunk/src/ref/rrefjdbc37244.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc37244.dita?rev=1528981&r1=1528980&r2=1528981&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc37244.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc37244.dita Thu Oct  3 19:24:22 2013
@@ -31,11 +31,11 @@ the JDBC escape syntax for outer joins (
 to the correct SQL syntax for outer joins or the appropriate join operation.</p>  <p>For
 information about join operations, see <xref href="rrefsqlj29840.dita#rrefsqlj29840"></xref>.</p></section>
 <refsyn><title>Syntax</title>
-<codeblock><b>{ oj <i><xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref></i> [ <i><xref
-href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref></i> ]* }</b></codeblock> </refsyn>
+<codeblock><b>{ oj <i><xref href="rrefsqlj29840.dita#rrefsqlj29840">joinOperation</xref></i> [ <i><xref
+href="rrefsqlj29840.dita#rrefsqlj29840">joinOperation</xref></i> ]* }</b></codeblock> </refsyn>
 <section><title>Equivalent to</title>
-<codeblock><b><i><xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref></i> [ <i><xref
-href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref></i> ]*</b></codeblock> </section>
+<codeblock><b><i><xref href="rrefsqlj29840.dita#rrefsqlj29840">joinOperation</xref></i> [ <i><xref
+href="rrefsqlj29840.dita#rrefsqlj29840">joinOperation</xref></i> ]*</b></codeblock> </section>
 <example><title>Examples</title>
 <codeblock><b><ph>-- outer join</ph>
 SELECT *

Modified: db/derby/docs/trunk/src/ref/rreftableexpression.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreftableexpression.dita?rev=1528981&r1=1528980&r2=1528981&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreftableexpression.dita (original)
+++ db/derby/docs/trunk/src/ref/rreftableexpression.dita Thu Oct  3 19:24:22 2013
@@ -54,9 +54,8 @@ can specify, see <cite><ph conref="../co
 <refsyn><title>Syntax</title>
 <codeblock><b>{
     <i><xref href="rrefsqlj33215.dita#rrefsqlj33215">tableViewOrFunctionExpression</xref></i> |
-    <xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operation</xref>
-}
-</b></codeblock>
+    <i><xref href="rrefsqlj29840.dita#rrefsqlj29840">joinOperation</xref></i>
+}</b></codeblock>
 </refsyn>
 <example><title>Example</title><codeblock><b><ph>-- SELECT from a JOIN expression </ph>
 SELECT E.EMPNO, E.LASTNAME, M.EMPNO, M.LASTNAME