You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ch...@apache.org on 2014/06/30 21:04:20 UTC

svn commit: r1606882 - /db/derby/docs/trunk/src/tools/

Author: chaase3
Date: Mon Jun 30 19:04:20 2014
New Revision: 1606882

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

Modified 18 Tools Guide topics.

Patch: DERBY-6379-tools-props.diff

Modified:
    db/derby/docs/trunk/src/tools/rtoolsijlocale.dita
    db/derby/docs/trunk/src/tools/rtoolsijpropref10135.dita
    db/derby/docs/trunk/src/tools/rtoolsijpropref12236.dita
    db/derby/docs/trunk/src/tools/rtoolsijpropref25589.dita
    db/derby/docs/trunk/src/tools/rtoolsijpropref28146.dita
    db/derby/docs/trunk/src/tools/rtoolsijpropref28788.dita
    db/derby/docs/trunk/src/tools/rtoolsijpropref29864.dita
    db/derby/docs/trunk/src/tools/rtoolsijpropref32585.dita
    db/derby/docs/trunk/src/tools/rtoolsijpropref35032.dita
    db/derby/docs/trunk/src/tools/rtoolsijpropref38481.dita
    db/derby/docs/trunk/src/tools/rtoolsijpropref41073.dita
    db/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita
    db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita
    db/derby/docs/trunk/src/tools/rtoolsijproprefexceptiontrace.dita
    db/derby/docs/trunk/src/tools/rtoolsijproprefpassword.dita
    db/derby/docs/trunk/src/tools/rtoolsijproprefshownoconn.dita
    db/derby/docs/trunk/src/tools/rtoolsijproprefshownoselectcount.dita
    db/derby/docs/trunk/src/tools/rtoolsijproprefuser.dita

Modified: db/derby/docs/trunk/src/tools/rtoolsijlocale.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijlocale.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijlocale.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijlocale.dita Mon Jun 30 19:04:20 2014
@@ -20,32 +20,37 @@ limitations under the License.
 -->
 <reference id="rtoolsijlocale" xml:lang="en-us">
 <title>derby.ui.locale property</title>
+<shortdesc>The <codeph>derby.ui.locale</codeph> property specifies an
+alternative supported locale name when you use one of the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> tools with a language
+not supported by your default system.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>derby.ui.locale (tool property)</indexterm>
+<keywords><indexterm>derby.ui.locale property</indexterm>
 <indexterm>Internationalization features<indexterm>locale</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-    <section><title>Function</title>
-        <p>Set this property to a supported locale name when using one of the
-            <ph conref="../conrefs.dita#prod/productshortname"></ph> tools,
-            if you want another locale than the system default locale.
-            The locale determines the localized display format for numbers,
-            dates, times and timestamps, as well as the language of the
-            messages from the
-            <ph conref="../conrefs.dita#prod/productshortname"></ph> tools.
-</p> </section>
-<refsyn><title>Syntax</title> <codeblock><b>derby.ui.locale=<b><i>derbyval</i></b></b></codeblock> <p>where <i>derbyval</i> is
-        a supported locale name, in the form <i>ll_CC</i>, where <i>ll</i>
-        is the two-letter language code, and <i>CC</i> is the two-letter
-        country code; for example, <codeph>ja_JP</codeph>.</p> </refsyn>
-<example><title>Example</title> <p>The following command runs
-<codeph>ij</codeph> using the Japanese locale (<i>derby.ui.locale=ja_JP</i>)
-and Japanese Latin Kanji mixed encoding (<i>derby.ui.codeset=Cp939</i>):</p>
-<codeblock><b>java -Dderby.ui.locale=ja_JP -Dderby.ui.codeset=Cp939 
-    -Dij.protocol=jdbc:derby:
-    org.apache.derby.tools.ij</b></codeblock>
-<p>Language codes consist of a pair of lowercase letters that
-    conform to ISO 639-1. The following table shows some examples.</p>  
+<section>
+<p>The locale determines the localized display format for numbers, dates, times,
+and timestamps, as well as the language of the messages from the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> tools.</p>
+<p>This property is commonly used in conjunction with the
+<codeph><xref href="rtoolsijpropref97949.dita">derby.ui.codeset</xref></codeph>
+property.</p>
+</section>
+<refsyn><title>Syntax</title>
+<codeblock><b>derby.ui.locale=<i>derbyval</i></b></codeblock>
+<p>where <i>derbyval</i> is a supported locale name, in the form <i>ll_CC</i>,
+where <i>ll</i> is the two-letter language code, and <i>CC</i> is the two-letter
+country code; for example, <codeph>ja_JP</codeph>.</p>
+</refsyn>
+<example><title>Example</title>
+<p>The following command runs <codeph>ij</codeph> using the Japanese locale
+(<codeph>derby.ui.locale=ja_JP</codeph>) and Japanese Latin Kanji mixed encoding
+(<codeph>derby.ui.codeset=Cp939</codeph>):</p>
+<codeblock><b>java -Dderby.ui.locale=ja_JP -Dderby.ui.codeset=Cp939 \
+-Dij.protocol=jdbc:derby: org.apache.derby.tools.ij</b></codeblock>
+<p>Language codes consist of a pair of lowercase letters that conform to
+ISO 639-1. The following table shows some examples.</p>  
 <table frame="all">
 <title>Sample language codes</title>
 <desc>This table lists and describes some examples of language codes.</desc>
@@ -78,8 +83,8 @@ and Japanese Latin Kanji mixed encoding 
 </tbody>
 </tgroup>
 </table> <p>To see a full list of ISO 639 codes, go to <xref format="html"
-href="http://www.loc.gov/standards/iso639-2/php/code_list.php" scope="external">
-<i>http://www.loc.gov/standards/iso639-2/php/code_list.php</i></xref>.</p>
+href="http://www.loc.gov/standards/iso639-2/php/code_list.php"
+scope="external"/>.</p>
 <p>Country codes consist of two uppercase letters that conform to ISO 3166. The
 following table shows some examples.</p>
 <table frame="all">
@@ -117,10 +122,10 @@ following table shows some examples.</p>
 </row>
 </tbody>
 </tgroup>
-</table> <p>A copy of ISO 3166 can be found at <xref format="html" 
+</table>
+<p>A copy of ISO 3166 can be found at <xref format="html" 
 href="http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html"
-scope="external"><i>http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</i>
-</xref>.</p>
+scope="external"/>.</p>
 </example>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijpropref10135.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijpropref10135.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijpropref10135.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijpropref10135.dita Mon Jun 30 19:04:20 2014
@@ -19,35 +19,46 @@ limitations under the License.
 -->
 <reference id="rtoolsijpropref10135" xml:lang="en-us">
 <title>ij.connection.<i>connectionName</i> property</title>
+<shortdesc>The <codeph>ij.connection.<i>connectionName</i></codeph> property
+creates a named connection to the given database connection URL when
+<codeph>ij</codeph> starts up.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.connection property</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title> <p>Creates a named connection to the given
-database connection URL when <codeph>ij</codeph> starts up; it is equivalent
-to the Connect AS <i>Identifier</i> command. The database connection URL can
-be of the short form if an <i><xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref></i> is
+<section>
+<p>The property is equivalent to the <codeph>Connect AS
+<i>Identifier</i></codeph> command. The database connection URL can be of the
+short form if an
+<codeph><xref href="rtoolsijpropref35032.dita">ij.protocol</xref></codeph> is
 specified. This property can be specified more than once per session, creating
 multiple connections. When <codeph>ij</codeph> starts, it displays the names
 of all the connections created in this way. It also displays the name of the
-current connection, if there is more than one, in the <codeph>ij</codeph> prompt.</p> </section>
-<refsyn><title>Syntax</title> <codeblock><b>ij.connection.<b><i>connectionName</i></b>=<b><i>databaseConnectionURL</i></b></b></codeblock> <p>When
-specified on the command line the <i>databaseConnectionURL</i> should not
-be enclosed in single quotations, however, if the database path contains special
-characters (e.g. a space) it must be enclosed in double quotes.</p> </refsyn>
+current connection, if there is more than one, in the <codeph>ij</codeph>
+prompt.</p>
+</section>
+<refsyn><title>Syntax</title>
+<codeblock><b>ij.connection.<i>connectionName</i>=<i>databaseConnectionURL</i></b></codeblock>
+<p>When specified on the command line, the <i>databaseConnectionURL</i> should
+not be enclosed in single quotes. However, if the database path contains special
+characters (such as a space), it must be enclosed in double quotes.</p>
+</refsyn>
 <example><title>Example</title>
-<p>This example connects to the existing database <i>sample</i> and
-creates, then connects to, the database <i>anotherDB</i>.</p>
-<codeblock>D:&gt; <b>java -Dij.connection.sample1=jdbc:derby:sample
--Dij.connection.anotherConn=jdbc:derby:anotherDB;create=true
-    org.apache.derby.tools.ij</b>
+<p>This example connects to the existing database <codeph>sample</codeph> and
+creates, then connects to, the database <codeph>anotherDB</codeph>.</p>
+<codeblock><b>java -Dij.connection.sample1=jdbc:derby:sample \
+-Dij.connection.anotherConn=jdbc:derby:anotherDB;create=true \
+org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph>
 ANOTHERCONN* -  jdbc:derby:anotherDB;create=true
 SAMPLE1 -        jdbc:derby:sample
 * = current connection
-ij(ANOTHERCONN)&gt;</codeblock> </example>
-<section><title>See also</title> <ul>
-<li><xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318"></xref></li>
-</ul> </section>
+ij(ANOTHERCONN)&gt;</codeblock>
+</example>
+<section><title>See also</title>
+<ul>
+<li><xref href="rtoolsijcomref22318.dita"/></li>
+</ul>
+</section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijpropref12236.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijpropref12236.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijpropref12236.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijpropref12236.dita Mon Jun 30 19:04:20 2014
@@ -18,28 +18,29 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rtoolsijpropref12236">
 <title>ij.protocol.<i>protocolName</i> property</title>
+<shortdesc>The <codeph>ij.protocol.<i>protocolName</i></codeph> property is
+similar to the <codeph>ij.protocol</codeph> property. The only difference is
+that it associates a name with the value, thus allowing you to define and use
+more than one protocol.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.protocol.protocolName property</indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>
-<section><title>Function</title>
-<p>This property is similar to the <i><xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref></i> property. The only difference is that it associates a name
-with the value, thus allowing you to define and use more than one protocol.
-(See <xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318"/>.)</p>
-</section>
 <refsyn><title>Syntax</title>
-<codeblock><b>ij.protocol.<b><i>protocolName</i></b>=<b><i>protocolForEnvironment</i></b></b></codeblock>
+<codeblock><b>ij.protocol.<i>protocolName</i>=<i>protocolForEnvironment</i></b></codeblock>
 </refsyn>
 <example><title>Example</title>
-<codeblock>D:&gt;<b>java -Dij.protocol.derby=jdbc:derby:
+<codeblock><b>java -Dij.protocol.derby=jdbc:derby: \
 -Dij.protocol.emp=jdbc:derby: org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph>
-ij&gt; Connect 'newDB' protocol derby as new;
+ij&gt; <b>Connect 'newDB' protocol derby as new;</b>
 ij&gt;</codeblock>
 </example>
 <section><title>See also</title>
 <ul>
-<li><xref href="rtoolsijcomref27997.dita#rtoolsijcomref27997"/></li>
+<li><xref href="rtoolsijpropref35032.dita"/></li>
+<li><xref href="rtoolsijcomref27997.dita"/></li>
+<li><xref href="rtoolsijcomref22318.dita"/></li>
 </ul>
 </section></refbody></reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijpropref25589.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijpropref25589.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijpropref25589.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijpropref25589.dita Mon Jun 30 19:04:20 2014
@@ -18,27 +18,35 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rtoolsijpropref25589">
 <title>ij.showErrorCode property</title>
+<shortdesc>The <codeph>ij.showErrorCode</codeph> property specifies whether
+<codeph>ij</codeph> should display the <i>SQLException ErrorCode</i> value with
+error messages.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.showErrorCode property</indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>
-<section><title>Function</title>
-<p>Set this property to <i>true</i> to have ij display the <i>SQLException ErrorCode</i> value with error messages. The
-default is <i>false</i>.</p>
-<p>Error codes denote the severity of the error. For more information, see
-the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>.</p>
+<section>
+<p>The default value is <codeph>false</codeph>.</p>
+<p>Error codes denote the severity of the error.</p>
 </section>
 <refsyn><title>Syntax</title>
 <codeblock><b>ij.showErrorCode={ false | true }</b></codeblock>
 </refsyn>
 <example><title>Example</title>
-<codeblock><b>java -Dij.showErrorCode=true -Dij.protocol=jdbc:derby:
-    org.apache.derby.tools.ij</b>
+<codeblock><b>java -Dij.showErrorCode=true -Dij.protocol=jdbc:derby: \
+org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph>
 ij&gt; <b>Connect 'sample';</b>
 ij&gt; <b>VLUES 1;</b>
-ERROR 42X01: Syntax error: Encountered "VLUES" 
-at line 1, column 1. (errorCode = 30000)
+ERROR 42X01: Syntax error: Encountered "VLUES" at line 1, column 1.
+(errorCode = 30000)
+...
 ij&gt;</codeblock>
-</example></refbody></reference>
+</example>
+<section><title>See also</title>
+<p>See "<ph conref="../conrefs.dita#prod/productshortname"></ph> exception
+messages and SQL states" in the
+<ph conref="../conrefs.dita#pub/citref"></ph>.</p>
+</section>
+</refbody></reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijpropref28146.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijpropref28146.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijpropref28146.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijpropref28146.dita Mon Jun 30 19:04:20 2014
@@ -19,17 +19,20 @@ limitations under the License.
 -->
 <reference id="rtoolsijpropref28146" xml:lang="en-us">
 <title>ij.database property</title>
+<shortdesc>The <codeph>ij.database</codeph> property creates a connection to the
+database specified by the property when <codeph>ij</codeph> starts
+up.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.database property</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title> <p>Creates a connection to the database
-specified by the property when <codeph>ij</codeph> starts up. You can
-specify the complete connection URL (including protocol) with this property, or
-you can specify just the database path name and URL attributes if you also
-specify <i>ij.protocol</i> on the command line. After it boots,
-<codeph>ij</codeph> displays the generated name of the connection made with this
-property.</p>
+<section>
+<p>You can specify the complete connection URL (including protocol) with this
+property, or you can specify just the database path name and URL attributes if
+you also specify
+<codeph><xref href="rtoolsijpropref35032.dita">ij.protocol</xref></codeph> on
+the command line. After it boots, <codeph>ij</codeph> displays the generated
+name of the connection made with this property.</p>
 </section>
 <refsyn><title>Syntax</title>
 <codeblock><b>ij.database=<i>databaseConnectionURL</i></b></codeblock>
@@ -47,7 +50,8 @@ not be enclosed in single quotes. Howeve
 special characters (such as a space, or a semicolon on a UNIX system), it must
 be enclosed in double quotes.</p>
 </refsyn>
-<example><title>Example</title> <codeblock><b>java -Dij.protocol=jdbc:derby: \ 
+<example><title>Example</title>
+<codeblock><b>java -Dij.protocol=jdbc:derby: \ 
 -Dij.database="wombat;create=true" org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph>
 CONNECTION0* -  jdbc:derby:wombat

Modified: db/derby/docs/trunk/src/tools/rtoolsijpropref28788.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijpropref28788.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijpropref28788.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijpropref28788.dita Mon Jun 30 19:04:20 2014
@@ -18,24 +18,26 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rtoolsijpropref28788">
 <title>ij.maximumDisplayWidth property</title>
+<shortdesc>The <codeph>ij.maximumDisplayWidth</codeph> property specifies the
+maximum number of characters used to display any column.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.maximumDisplayWidth property</indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>
-<section><title>Function</title>
-<p>Specifies the maximum number of characters used to display any column.
-The default value is 128. Values with display widths longer than the maximum
-are truncated and terminated with an<i> &amp;</i> character.</p>
+<section>
+<p>The default value is 128. Values with display widths longer than the maximum
+are truncated and terminated with an ampersand (<codeph>&amp;</codeph>)
+character.</p>
 </section>
 <refsyn><title>Syntax</title>
-<codeblock><b>ij.maximumDisplayWidth=<b><i>numberOfCharacters</i></b></b></codeblock>
+<codeblock><b>ij.maximumDisplayWidth=<i>numberOfCharacters</i></b></codeblock>
 </refsyn>
 <example><title>Example</title>
 <codeblock><b>java -Dij.maximumDisplayWidth=1000 org.apache.derby.tools.ij</b></codeblock>
 </example>
 <section><title>See also</title>
 <ul>
-<li><xref href="rtoolsijcomref12281.dita#rtoolsijcomref12281"/></li>
+<li><xref href="rtoolsijcomref12281.dita"/></li>
 </ul>
 </section></refbody></reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijpropref29864.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijpropref29864.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijpropref29864.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijpropref29864.dita Mon Jun 30 19:04:20 2014
@@ -19,12 +19,13 @@ limitations under the License.
 -->
 <reference id="rtoolsijpropref29864" xml:lang="en-us">
 <title>ij properties reference</title>
+<shortdesc>When starting up <codeph>ij</codeph>, you can specify properties
+on the command line or in a properties file.</shortdesc>
 <prolog><metadata>
 <keywords></keywords>
 </metadata></prolog>
 <refbody>
-<section><p>When starting up <codeph>ij</codeph>, you can specify properties
-on the command line or in a properties file, as described in <xref href="ttoolsij30600.dita#ttoolsij30600"></xref>.
-  </p></section>
+<section><p>See <xref href="ttoolsij30600.dita">Starting ij using
+properties</xref> for details.</p></section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijpropref32585.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijpropref32585.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijpropref32585.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijpropref32585.dita Mon Jun 30 19:04:20 2014
@@ -18,18 +18,19 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rtoolsijpropref32585">
 <title>ij.outfile property</title>
+<shortdesc>The <codeph>ij.outfile</codeph> property specifies a file to which
+the system should direct output for a session.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.outfile property</indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>
-<section><title>Function</title>
-<p>Specifies a file to which the system should direct output for a session.
-Specify the file name relative to the current directory, or specify the absolute
-path.</p>
+<section>
+<p>Specify the file name relative to the current directory, or specify the
+absolute path.</p>
 </section>
 <refsyn><title>Syntax</title>
-<codeblock><b>ij.outfile=<b><i>fileName</i></b></b></codeblock>
+<codeblock><b>ij.outfile=<i>fileName</i></b></codeblock>
 </refsyn>
 <example><title>Example</title>
 <codeblock><b>java -Dij.outfile=out.txt org.apache.derby.tools.ij myscript.sql</b></codeblock>

Modified: db/derby/docs/trunk/src/tools/rtoolsijpropref35032.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijpropref35032.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijpropref35032.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijpropref35032.dita Mon Jun 30 19:04:20 2014
@@ -19,24 +19,32 @@ limitations under the License.
 -->
 <reference id="rtoolsijpropref35032" xml:lang="en-us">
 <title>ij.protocol property</title>
+<shortdesc>The <codeph>ij.protocol</codeph> property specifies the default
+protocol and subprotocol portions of the database connection URL for
+connections.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.protocol property</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title> <p>Specifies the default protocol and subprotocol
-portions of the database connection URL for connections. The Derby protocol
-is:   <ul>
-<li>jdbc:derby:</li>
-</ul></p> <p>Allows you to use a short form of a database name in a connection
-URL.</p> </section>
-<refsyn><title>Syntax</title> <codeblock><b>ij.protocol=<b><i>protocolForEnvironment</i></b></b></codeblock> </refsyn>
-<example><title>Example</title> <codeblock>D:&gt;<b>java -Dij.protocol=jdbc:derby:
-    org.apache.derby.tools.ij</b>
+<section>
+<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> protocol is:</p>
+<codeblock>jdbc:derby:</codeblock>
+<p>The property allows you to use a short form of a database name in a
+connection URL.</p>
+</section>
+<refsyn><title>Syntax</title>
+<codeblock><b>ij.protocol=<i>protocolForEnvironment</i></b></codeblock>
+</refsyn>
+<example><title>Example</title>
+<codeblock><b>java -Dij.protocol=jdbc:derby: org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph>
 ij&gt; <b>Connect 'newDB;create=true';</b>
-ij&gt;</codeblock> </example>
-<section><title>See also</title> <ul>
-<li><xref href="rtoolsijcomref27997.dita#rtoolsijcomref27997"></xref></li>
-</ul> </section>
+ij&gt;</codeblock>
+</example>
+<section><title>See also</title>
+<ul>
+<li><xref href="rtoolsijcomref27997.dita"/></li>
+</ul>
+</section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijpropref38481.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijpropref38481.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijpropref38481.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijpropref38481.dita Mon Jun 30 19:04:20 2014
@@ -18,22 +18,30 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rtoolsijpropref38481">
 <title>ij.URLCheck property</title>
+<shortdesc>The <codeph>ij.URLCheck</codeph> property specifies whether
+<codeph>ij</codeph> should check for invalid or
+non-<ph conref="../conrefs.dita#prod/productshortname"></ph> URL attributes when
+you are using the embedded driver.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Attributes to database connection URL<indexterm>validating in ij</indexterm></indexterm><indexterm>URL attributes<indexterm>verifying in ij</indexterm></indexterm><indexterm>ij.URLCheck property</indexterm>
+<keywords><indexterm>Attributes to database connection URL<indexterm>validating in ij</indexterm></indexterm>
+<indexterm>URL attributes<indexterm>verifying in ij</indexterm></indexterm>
+<indexterm>ij.URLCheck property</indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>
-<section><title>Function</title>
-<p>This property determines whether <codeph>ij</codeph> checks for invalid or non-<ph conref="../conrefs.dita#prod/productshortname"></ph> URL
-attributes when you are using the embedded driver. Set this property to <i>false</i> to prevent <codeph>ij</codeph> from validating URL attributes. The default value is <i>true</i>.</p>
-<p>When the <i>ij.URLCheck</i> property is set to <i>true</i>, you are notified whenever a connection URL contains an incorrectly
-specified attribute. For example if the attribute name is misspelled or cased
-incorrectly <codeph>ij</codeph> prints a message.  
-<note><codeph>ij</codeph> checks
-attribute <i>values</i> if the attribute has pre-defined
-values. For example, the attribute <i>shutdown</i> has the
-pre-defined values of <i>true</i> or <i>false</i>. If you try to set the attribute <i>shutdown</i> to a value other than
-<i>true</i> or <i>false</i>, <codeph>ij</codeph> displays an error. For example:  
+<section>
+<p>Set this property to <codeph>false</codeph> to prevent <codeph>ij</codeph>
+from validating URL attributes. The default value is <codeph>true</codeph>.</p>
+<p>When the <codeph>ij.URLCheck</codeph> property is set to
+<codeph>true</codeph>, you are notified whenever a connection URL contains an
+incorrectly specified attribute. For example, if the attribute name is
+misspelled or has an incorrect case, <codeph>ij</codeph> prints a message.</p>
+<p><note><codeph>ij</codeph> checks attribute <i>values</i> if the attribute has
+pre-defined values. For example, the attribute <i>shutdown</i> has the
+pre-defined values of <codeph>true</codeph> or <codeph>false</codeph>. If you
+try to set the attribute <i>shutdown</i> to a value other than
+<codeph>true</codeph> or <codeph>false</codeph>, <codeph>ij</codeph> displays an
+error. For example:
 <codeblock>ij&gt; <b>Connect 'jdbc:derby:anyDB;shutdown=rue';</b>
 ERROR XJ05B: JDBC attribute 'shutdown' has an invalid value 'rue',
 valid values are '{true|false}'.
@@ -48,21 +56,26 @@ ij&gt;</codeblock></note></p>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph> 
 ij&gt; <b>connect 'mydb;uSer=naomi';</b>
 URL Attribute [uSer=naomi]
-   Case of the <ph conref="../conrefs.dita#prod/productshortname"></ph> attribute is incorrect.</codeblock></p>
-<p>The following command line specifies to turn off URL attribute checking
-in <codeph>ij</codeph>.   
+   Case of the <ph conref="../conrefs.dita#prod/productshortname"></ph> attribute is incorrect.</codeblock>
+</p>
+<p>The following command line turns off URL attribute checking in
+<codeph>ij</codeph>.   
 <codeblock><b>java -Dij.URLCheck=false org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph> 
 ij&gt; <b>connect 'mydb;uSer=naomi';</b>
-ij&gt;</codeblock></p>
+ij&gt;</codeblock>
+</p>
 <p>Typically, you would only explicitly turn off the URL checker if you were
-using <codeph>ij</codeph> with a non-<ph conref="../conrefs.dita#prod/productshortname"></ph> JDBC driver or database.</p>
+using <codeph>ij</codeph> with a
+non-<ph conref="../conrefs.dita#prod/productshortname"></ph> JDBC driver or
+database.</p>
 </example>
 <section><title>Notes</title>
-<p>The URL checker does not check the validity of properties, only database connection URL <i>attributes</i>.</p>
+<p>The URL checker does not check the validity of properties, only database
+connection URL <i>attributes</i>.</p>
 <p>For a list of attributes, see "Setting attributes for the database
 connection URL" in the <ph conref="../conrefs.dita#pub/citref"></ph>. Because
-the <i>ij.URLCheck</i> property is valid only with the embedded driver, it does
-not apply to attributes such as <i>securityMechanism=value</i>,
+the <codeph>ij.URLCheck</codeph> property is valid only with the embedded
+driver, it does not apply to attributes such as <i>securityMechanism=value</i>,
 <i>ssl=sslMode</i>, and the attributes related to tracing.</p>
 </section></refbody></reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijpropref41073.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijpropref41073.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijpropref41073.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijpropref41073.dita Mon Jun 30 19:04:20 2014
@@ -19,19 +19,24 @@ limitations under the License.
 -->
 <reference id="rtoolsijpropref41073" xml:lang="en-us">
 <title>ij.driver property</title>
+<shortdesc>The <codeph>ij.driver</codeph> property loads the JDBC driver that
+the class specifies.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.driver property</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title> <p>Loads the JDBC driver that the class specifies.</p> </section>
-<refsyn><title>Syntax</title> <codeblock><b>ij.driver=<b><i>JDBCDriverClassName</i></b></b></codeblock> </refsyn>
-<section><title>Notes</title> </section>
-<example><title>Example</title> <codeblock>D:&gt;<b>java -Dij.driver=sun.jdbc.odbc.JdbcOdbcDriver org.apache.derby.tools.ij</b>
+<refsyn><title>Syntax</title>
+<codeblock><b>ij.driver=<b><i>JDBCDriverClassName</i></b></b></codeblock>
+</refsyn>
+<example><title>Example</title>
+<codeblock><b>java -Dij.driver=sun.jdbc.odbc.JdbcOdbcDriver org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph>
 ij&gt; <b>Connect 'jdbc:odbc:MyODBCDataSource';</b>
-ij&gt;</codeblock> </example>
-<section><title>See also</title> <ul>
-<li><xref href="rtoolsijcomref39042.dita#rtoolsijcomref39042"></xref></li>
+ij&gt;</codeblock>
+</example>
+<section><title>See also</title>
+<ul>
+<li><xref href="rtoolsijcomref39042.dita"/></li>
 </ul> </section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita Mon Jun 30 19:04:20 2014
@@ -20,29 +20,37 @@ limitations under the License.
 -->
 <reference id="rtoolsijpropref97949" xml:lang="en-us">
 <title>derby.ui.codeset property</title>
+<shortdesc>The <codeph>derby.ui.codeset</codeph> property specifies an
+alternative supported character encoding value when you use one of the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> tools with a language
+not supported by your default system.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>derby.ui.codeset (tool property)</indexterm><indexterm>Internationalization
-features<indexterm>codeset</indexterm></indexterm></keywords>
+<keywords><indexterm>derby.ui.codeset property</indexterm>
+<indexterm>Internationalization features<indexterm>codeset</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title> <p>Set this property to a supported character
-encoding value when using one of the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
-with a language not supported by your default system.</p> </section>
-<refsyn><title>Syntax</title> <codeblock><b>derby.ui.codeset=<b><i>derbyval</i></b></b></codeblock> <p>where <i>derbyval</i> is
-a supported character encoding value, for example, UTF8 (see the table later
-in this topic).</p>
+<section>
+<p>This property is commonly used in conjunction with the
+<codeph><xref href="rtoolsijlocale.dita">derby.ui.locale</xref></codeph>
+property.</p>
+</section>
+<refsyn><title>Syntax</title>
+<codeblock><b>derby.ui.codeset=<i>derbyval</i></b></codeblock>
+<p>where <i>derbyval</i> is a supported character encoding value, such as UTF8
+(see the table later in this topic).</p>
 </refsyn>
-<example><title>Example</title> <p>The following command runs
-<codeph>ij</codeph> using the Japanese locale (<i>derby.ui.locale=ja_JP</i>)
-and Japanese Latin Kanji mixed encoding (<i>derby.ui.codeset=Cp939</i>):</p>
-<codeblock><b>java -Dderby.ui.locale=ja_JP -Dderby.ui.codeset=Cp939 
-    -Dij.protocol=jdbc:derby:
-    org.apache.derby.tools.ij</b></codeblock> <p>The following table contains
-a sampling of character encodings. Supported encodings vary from product to
-product.  For example, to see the full list of the character encodings that
-are supported by the Java Platform, Standard Edition 7 Software Development Kit,
-go to <xref format="html" href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html"
-scope="external">http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html</xref>.</p>
+<example><title>Example</title>
+<p>The following command runs <codeph>ij</codeph> using the Japanese locale
+(<codeph>derby.ui.locale=ja_JP</codeph>) and Japanese Latin Kanji mixed encoding
+(<codeph>derby.ui.codeset=Cp939</codeph>):</p>
+<codeblock><b>java -Dderby.ui.locale=ja_JP -Dderby.ui.codeset=Cp939  \
+-Dij.protocol=jdbc:derby: org.apache.derby.tools.ij</b></codeblock>
+<p>The following table contains a sampling of character encodings. Supported
+encodings vary from product to product. For example, to see the full list of
+character encodings that are supported by the Java Platform, Standard Edition 7
+Software Development Kit, go to <xref format="html"
+href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html"
+scope="external"/>.</p>
 <table frame="all">
 <title>Sample character encodings</title>
 <desc>This table lists and describes some of the available character encodings.</desc>
@@ -114,6 +122,7 @@ scope="external">http://docs.oracle.com/
 </row>
 </tbody>
 </tgroup>
-</table></example>
+</table>
+</example>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita Mon Jun 30 19:04:20 2014
@@ -19,45 +19,58 @@ limitations under the License.
 -->
 <reference id="rtoolsijproprefdatasource" xml:lang="en-us">
 <title>ij.dataSource property</title>
+<shortdesc>The <codeph>ij.dataSource</codeph> property specifies the datasource
+to be used to access the database.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.dataSource property</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title><p>The <codeph>ij.dataSource</codeph> property
-specifies the datasource to be used to access the database. When specifying
-a datasource, <codeph>ij</codeph> does
-not use the DriverManager mechanism to establish connections. </p> </section>
+<section>
+<p>When specifying a datasource, <codeph>ij</codeph> does not use the
+DriverManager mechanism to establish connections.</p>
+</section>
 <refsyn><title>Syntax</title>
 <p>
-When you set the <codeph>ij.dataSource</codeph> property <codeph>ij</codeph> will automatically try to connect to a database. To establish a connection to a specific database using <codeph>ij.dataSource</codeph>, set the <codeph>ij.dataSource.databaseName</codeph> property. If you do not set this property, <codeph>ij</codeph> will start with an error. 
-If you want to create the database, specify the <codeph>ij.dataSource.createDatabase</codeph> property as well as <codeph>ij.dataSource.databaseName</codeph>. 
-Do not specify <codeph>ij.protocol</codeph> when setting <codeph>ij.dataSource</codeph> as that would activate the DriverManager mechanism. 
-</p>
-<codeblock>ij.dataSource=<varname>datasource class name</varname>
-ij.dataSource.databaseName=<varname>databasename</varname>
+When you set the <codeph>ij.dataSource</codeph> property, <codeph>ij</codeph>
+will automatically try to connect to a database. To establish a connection to a
+specific database using <codeph>ij.dataSource</codeph>, set the
+<codeph>ij.dataSource.databaseName</codeph> property. If you do not set
+this property, <codeph>ij</codeph> will start with an error. If you want to
+create the database, specify the <codeph>ij.dataSource.createDatabase</codeph>
+property as well as <codeph>ij.dataSource.databaseName</codeph>. Do not
+specify <codeph>ij.protocol</codeph> when setting
+<codeph>ij.dataSource</codeph>, as that would activate the DriverManager
+mechanism.</p>
+<codeblock>ij.dataSource=<varname>datasourceClassName</varname>
+ij.dataSource.databaseName=<varname>databaseName</varname>
 [ij.dataSource.createDatabase=create]</codeblock>
-<p>
-If you do not specify <codeph>ij.dataSource.databaseName</codeph> and get an error indicating no database was found, you can still connect to a database by using <codeph>ij</codeph>'s 
-<xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318"><codeph>connect</codeph> command</xref>. 
-You should not specify the protocol (for example jdbc:derby:) in the <codeph>connect</codeph> command when using <codeph>ij.dataSource</codeph>.
-</p>
+<p>If you do not specify <codeph>ij.dataSource.databaseName</codeph> and get an
+error indicating no database was found, you can still connect to a database by
+using <codeph>ij</codeph>'s
+<codeph><xref href="rtoolsijcomref22318.dita">Connect</xref></codeph> command. 
+You should not specify the protocol (for example, <codeph>jdbc:derby:</codeph>)
+in the <codeph>connect</codeph> command when using
+<codeph>ij.dataSource</codeph>.</p>
 </refsyn>
 <example><title>Example</title> 
 <p>In the following example, <codeph>ij</codeph> connects to a database named 
 <codeph>sample</codeph> using an <codeph>EmbeddedDataSource</codeph>. The 
 <codeph>sample</codeph> database is created if it does not already exist.
 </p>
-<codeblock><b>java -Dij.dataSource=org.apache.derby.jdbc.EmbeddedDataSource
--Dij.dataSource.databaseName=sample -Dij.dataSource.createDatabase=create
-  org.apache.derby.tools.ij</b>
+<codeblock><b>java -Dij.dataSource=org.apache.derby.jdbc.EmbeddedDataSource \
+-Dij.dataSource.databaseName=sample \
+-Dij.dataSource.createDatabase=create org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph> 
 CONNECTION0*
 * = current connection
 ij> </codeblock> </example>
-<section>For more information about DataSources, refer to the JDBC documentation
-in the <ph conref="../conrefs.dita#prod/productshortname"></ph> API
-documentation and in the <ph conref="../conrefs.dita#pub/citref"></ph>, and to
-"Using <ph conref="../conrefs.dita#prod/productshortname"></ph> as a Java EE
-Resource Manager" in the <ph conref="../conrefs.dita#pub/citdevelop"></ph>.</section>
+<section><title>See also</title>
+<p>For more information about DataSources, refer to the JDBC documentation in
+the <ph conref="../conrefs.dita#prod/productshortname"></ph> API documentation
+and to "JDBC reference" in the <ph conref="../conrefs.dita#pub/citref"></ph>,
+and to "Using <ph conref="../conrefs.dita#prod/productshortname"></ph> as a
+Java EE Resource Manager" in the
+<ph conref="../conrefs.dita#pub/citdevelop"></ph>.</p>
+</section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijproprefexceptiontrace.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijproprefexceptiontrace.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijproprefexceptiontrace.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijproprefexceptiontrace.dita Mon Jun 30 19:04:20 2014
@@ -20,41 +20,57 @@ limitations under the License.
 -->
 <reference id="rtoolsijproprefexceptiontrace" xml:lang="en-us">
 <title>ij.exceptionTrace property</title>
+<shortdesc>The <codeph>ij.exceptionTrace</codeph> property specifies whether
+<codeph>ij</codeph> should display a full exception stack trace when exceptions
+occur.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>ij.exceptionTrace property</indexterm><indexterm>ij properties<indexterm>ij.exceptionTrace</indexterm></indexterm>
+<keywords><indexterm>ij.exceptionTrace property</indexterm>
+<indexterm>ij properties<indexterm>ij.exceptionTrace</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title><p>When the <codeph>ij.exceptionTrace</codeph> property
-is set to <codeph>true</codeph>, a full exception stack trace is printed when
-exceptions occur in <codeph>ij</codeph>. The default setting is <codeph>false</codeph>.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>ij.exceptionTrace={ false | true }</b> </codeblock></refsyn>
-<example><title>Example</title> <p>In the following example, <codeph>ij</codeph> is
-started with the <codeph>ij.exceptionTrace</codeph> property set to true.</p> <codeblock>
-<b>java -Dij.exceptionTrace=true org.apache.derby.tools.ij</b>
+<section>
+<p>The default setting is <codeph>false</codeph>.</p></section>
+<refsyn><title>Syntax</title>
+<codeblock><b>ij.exceptionTrace={ false | true }</b></codeblock>
+</refsyn>
+<example><title>Example</title>
+<p>In the following example, <codeph>ij</codeph> is started with the 
+<codeph>ij.exceptionTrace</codeph> property set to <codeph>true</codeph>.</p>
+<codeblock><b>java -Dij.exceptionTrace=true org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph> 
-ij> connect 'jdbc:derby:wombat';  
+ij> <b>connect 'jdbc:derby:wombat';</b> 
 ERROR XJ004: Database 'wombat' not found.  
 SQL Exception: Database 'wombat' not found.
-    at org.apache.derby.impl.jdbc.SQLExceptionFactory.getSQLException(SQLExceptionFactory.java:44)
-    at org.apache.derby.impl.jdbc.Util.newEmbedSQLException(Util.java:87)
-    at org.apache.derby.impl.jdbc.Util.newEmbedSQLException(Util.java:93)
-    at org.apache.derby.impl.jdbc.Util.generateCsSQLException(Util.java:172)
-    at org.apache.derby.impl.jdbc.EmbedConnection.newSQLException(EmbedConnection.java:1955)
-    at org.apache.derby.impl.jdbc.EmbedConnection.(EmbedConnection.java:254)
-    at org.apache.derby.impl.jdbc.EmbedConnection30.(EmbedConnection30.java:72)
-    at org.apache.derby.jdbc.Driver30.getNewEmbedConnection(Driver30.java:73)
-    at org.apache.derby.jdbc.InternalDriver.connect(InternalDriver.java:200)
-    at java.sql.DriverManager.getConnection(DriverManager.java:512)
-    at java.sql.DriverManager.getConnection(DriverManager.java:140)
-    at org.apache.derby.impl.tools.ij.ij.dynamicConnection(ij.java:873)
-    at org.apache.derby.impl.tools.ij.ij.ConnectStatement(ij.java:723)
-    at org.apache.derby.impl.tools.ij.ij.ijStatement(ij.java:553)
-    at org.apache.derby.impl.tools.ij.utilMain.go(utilMain.java:289)
-    at org.apache.derby.impl.tools.ij.Main.go(Main.java:207)
-    at org.apache.derby.impl.tools.ij.Main.mainCore(Main.java:173)
-    at org.apache.derby.impl.tools.ij.Main14.main(Main14.java:55)
-    at org.apache.derby.tools.ij.main(ij.java:60)  ij 
-ij></codeblock>  </example>
+    at org.apache.derby.impl.jdbc.SQLExceptionFactory.getSQLException(SQLExceptionFactory.java:107)
+    at org.apache.derby.impl.jdbc.SQLExceptionFactory.getSQLException(SQLExceptionFactory.java:133)
+    at org.apache.derby.impl.jdbc.Util.generateCsSQLException(Util.java:228)
+    at org.apache.derby.impl.jdbc.Util.generateCsSQLException(Util.java:223)
+    at org.apache.derby.impl.jdbc.EmbedConnection.newSQLException(EmbedConnection.java:3198)
+    at org.apache.derby.impl.jdbc.EmbedConnection.handleDBNotFound(EmbedConnection.java:766)
+    at org.apache.derby.impl.jdbc.EmbedConnection.&lt;init>(EmbedConnection.java:436)
+    at org.apache.derby.jdbc.InternalDriver.getNewEmbedConnection(InternalDriver.java:647)
+    at org.apache.derby.jdbc.InternalDriver.connect(InternalDriver.java:301)
+    at org.apache.derby.jdbc.InternalDriver.connect(InternalDriver.java:932)
+    at org.apache.derby.jdbc.AutoloadedDriver.connect(AutoloadedDriver.java:147)
+    at java.sql.DriverManager.getConnection(DriverManager.java:571)
+    at java.sql.DriverManager.getConnection(DriverManager.java:187)
+    at org.apache.derby.impl.tools.ij.ij.dynamicConnection(ij.java:1486)
+    at org.apache.derby.impl.tools.ij.ij.ConnectStatement(ij.java:1316)
+    at org.apache.derby.impl.tools.ij.ij.ijStatement(ij.java:1101)
+    at org.apache.derby.impl.tools.ij.utilMain.runScriptGuts(utilMain.java:347)
+    at org.apache.derby.impl.tools.ij.utilMain.go(utilMain.java:245)
+    at org.apache.derby.impl.tools.ij.Main.go(Main.java:229)
+    at org.apache.derby.impl.tools.ij.Main.mainCore(Main.java:184)
+    at org.apache.derby.impl.tools.ij.Main.main(Main.java:75)
+    at org.apache.derby.tools.ij.main(ij.java:59)
+    at org.apache.derby.iapi.tools.run.main(run.java:53)
+Caused by: ERROR XJ004: Database 'wombat' not found.
+    at org.apache.derby.iapi.error.StandardException.newException(StandardException.java:290)
+    at org.apache.derby.impl.jdbc.SQLExceptionFactory.wrapArgsForTransportAcrossDRDA(SQLExceptionFactory.java:162)
+    at org.apache.derby.impl.jdbc.SQLExceptionFactory.getSQLException(SQLExceptionFactory.java:73)
+    ... 22 more
+ij></codeblock>
+</example>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijproprefpassword.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijproprefpassword.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijproprefpassword.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijproprefpassword.dita Mon Jun 30 19:04:20 2014
@@ -19,17 +19,28 @@ limitations under the License.
 -->
 <reference id="rtoolsijproprefpassword" xml:lang="en-us">
 <title>ij.password property</title>
+<shortdesc>The <codeph>ij.password</codeph> property specifies the password used
+to make connections.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.password property</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title><p>Specifies the password used to make connections.
-This property is used in conjunction with the <i>ij.user</i> property to authenticate
-a connection. If authentication is not active then these properties are ignored.</p> </section>
-<refsyn><title>Syntax</title><codeblock><b>ij.password=<b><i>password</i></b></b></codeblock></refsyn>
-<example><title>Example</title><codeblock><b>java -Dij.user=me -Dij.password=mine org.apache.derby.tools.ij</b></codeblock> </example>
-<section>See the <ph conref="../conrefs.dita#pub/citsec"></ph> for
-more information on <ph conref="../conrefs.dita#prod/productshortname"></ph> authentication
-and security.</section>
+<section>
+<p>This property is used in conjunction with the 
+<codeph><xref href="rtoolsijproprefuser.dita">ij.user</xref></codeph> property
+to authenticate a connection. If authentication is not active, these properties
+are ignored.</p>
+</section>
+<refsyn><title>Syntax</title>
+<codeblock><b>ij.password=<i>password</i></b></codeblock>
+</refsyn>
+<example><title>Example</title>
+<codeblock><b>java -Dij.user=me -Dij.password=mine org.apache.derby.tools.ij</b></codeblock>
+</example>
+<section><title>See also</title>
+<p>See the <ph conref="../conrefs.dita#pub/citsec"></ph> for more information on
+<ph conref="../conrefs.dita#prod/productshortname"></ph> authentication and
+security.</p>
+</section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijproprefshownoconn.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijproprefshownoconn.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijproprefshownoconn.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijproprefshownoconn.dita Mon Jun 30 19:04:20 2014
@@ -19,36 +19,42 @@ limitations under the License.
 -->
 <reference id="rtoolsijproprefshownoconn" xml:lang="en-us">
 <title>ij.showNoConnectionsAtStart property</title>
+<shortdesc>The <codeph>ij.showNoConnectionsAtStart</codeph> property specifies
+whether the connections message should be displayed when <codeph>ij</codeph> is
+started.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.showNoConnectionsAtStart property</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title><p>The <codeph>ij.showNoConnectionsAtStart</codeph> property
-specifies whether the connections message should be displayed when <codeph>ij</codeph> is started.
-Default is false, that is, a message indicating the current connections, if any, is displayed.</p></section>
+<section>
+<p>The default is <codeph>false</codeph>; that is, a message is displayed that
+indicates the current connections, if any.</p>
+</section>
 <refsyn><title>Syntax</title>
-<codeblock><b>ij.showNoConnectionsAtStart={ false | true }</b></codeblock></refsyn>
+<codeblock><b>ij.showNoConnectionsAtStart={ false | true }</b></codeblock>
+</refsyn>
 <example><title>Example</title> 
-<p>In the following example, <codeph>ij</codeph> connects to a previously created database named 
-<codeph>sample</codeph> using an <codeph>EmbeddedDataSource</codeph>. 
-The property <codeph>ij.showNoConnectionsAtStart</codeph> is set to true in the first session of the example,
-and set to false in the second session.
-</p>
-<codeblock>
-<b>java -Dij.dataSource=org.apache.derby.jdbc.EmbeddedDataSource 
--Dij.dataSource.databaseName=sample -Dij.showNoConnectionsAtStart=true org.apache.derby.tools.ij</b>
+<p>In the following example, <codeph>ij</codeph> connects to a previously
+created database named <codeph>sample</codeph> using an
+<codeph>EmbeddedDataSource</codeph>. The property
+<codeph>ij.showNoConnectionsAtStart</codeph> is set to <codeph>true</codeph> in
+the first session of the example and to <codeph>false</codeph> in the
+second session.</p>
+<codeblock><b>java -Dij.dataSource=org.apache.derby.jdbc.EmbeddedDataSource \
+-Dij.dataSource.databaseName=sample -Dij.showNoConnectionsAtStart=true \
+org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph> 
-ij> disconnect;
-ij> exit;
+ij> <b>disconnect;</b>
+ij> <b>exit;</b>
 
-<b>java -Dij.dataSource=org.apache.derby.jdbc.EmbeddedDataSource
--Dij.dataSource.databaseName=sample -Dij.showNoConnectionsAtStart=false org.apache.derby.tools.ij</b>
+<b>java -Dij.dataSource=org.apache.derby.jdbc.EmbeddedDataSource \
+-Dij.dataSource.databaseName=sample -Dij.showNoConnectionsAtStart=false \
+org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph>  
 CONNECTION0*
 * = current connection
-ij> disconnect;
-ij> exit;
-</codeblock>
+ij> <b>disconnect;</b>
+ij> <b>exit;</b></codeblock>
 </example>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijproprefshownoselectcount.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijproprefshownoselectcount.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijproprefshownoselectcount.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijproprefshownoselectcount.dita Mon Jun 30 19:04:20 2014
@@ -19,41 +19,43 @@ limitations under the License.
 -->
 <reference id="rtoolsijproprefshownoselectcount" xml:lang="en-us">
 <title>ij.showNoCountForSelect property</title>
+<shortdesc>The <codeph>ij.showNoCountForSelect</codeph> property specifies
+whether to display messages indicating the number of rows selected.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.showNoCountForSelect property</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title><p>The <codeph>ij.showNoCountForSelect</codeph> property specifies whether to display messages indicating the number of rows selected.
-Default is false, that is, if the property is not set, select count messages are displayed.
-</p></section>
+<section>
+<p>The default is <codeph>false</codeph>; that is, if the property is not set,
+select count messages are displayed.</p>
+</section>
 <refsyn><title>Syntax</title>
-<codeblock><b>ij.showNoCountForSelect={ false | true }</b></codeblock></refsyn>
+<codeblock><b>ij.showNoCountForSelect={ false | true }</b></codeblock>
+</refsyn>
 <example><title>Example</title>
-<p>In the following example, <codeph>ij</codeph> is first started with the <codeph>ij.showNoCountForSelect</codeph> property to true, then with the property set to false. 
-</p>
-<codeblock>
-<b>java -Dij.showNoCountForSelect=true org.apache.derby.tools.ij</b>
+<p>In the following example, <codeph>ij</codeph> is first started with the
+<codeph>ij.showNoCountForSelect</codeph> property set to <codeph>true</codeph>,
+then with the property set to <codeph>false</codeph>.</p>
+<codeblock><b>java -Dij.showNoCountForSelect=true org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph> 
-CONNECTION0*
-* = current connection
-ij> create table t1 (c1 int);
+ij> <b>connect 'jdbc:derby:sample';</b>
+ij> <b>create table t1 (c1 int);</b>
 0 rows inserted/updated/deleted
-ij> insert into t1 values 1, 2, 3;
+ij> <b>insert into t1 values 1, 2, 3;</b>
 3 rows inserted/updated/deleted
-ij> select * from t1;
+ij> <b>select * from t1;</b>
 C1
 -----------
 1
 2
 3
-ij> disconnect;
-ij> exit;
+ij> <b>disconnect;</b>
+ij> <b>exit;</b>
 
 <b>java -Dij.showNoCountForSelect=false org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph> 
-CONNECTION0*
-* = current connection
-ij> select * from t1;
+<b>connect 'jdbc:derby:sample';</b>
+ij> <b>select * from t1;</b>
 C1
 -----------
 1
@@ -61,10 +63,7 @@ C1
 3
 
 3 rows selected
-
-ij>
-
-</codeblock> 
+ij></codeblock> 
 </example>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijproprefuser.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijproprefuser.dita?rev=1606882&r1=1606881&r2=1606882&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijproprefuser.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijproprefuser.dita Mon Jun 30 19:04:20 2014
@@ -19,30 +19,40 @@ limitations under the License.
 -->
 <reference id="rtoolsijproprefuser" xml:lang="en-us">
 <title>ij.user property</title>
+<shortdesc>The <codeph>ij.user</codeph> property specifies the login name used
+to establish the connection.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>ij.user property</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title><p>Specifies the logon name used to establish
-the connection. This property is used in conjunction with the <i>ij.password</i> property
-to authenticate a connection. If authentication is not active then these properties
-are ignored.</p><p>When a username is supplied you need to be aware of the
-database schema. When you connect using <codeph>ij.user</codeph>, the default
-database schema applied to all SQL statements is the same as the user id provided
-even if the schema does not exist. Use the SET SCHEMA statement to change
-the default when the schema does not match the username. Alternately you can
-fully qualify the database objects referred to in the SQL statements . If
-no user is specified, no SET SCHEMA statement has been issued, or SQL statements
-do not include the schema name, all database objects are assumed to be under
-the APP schema.</p> </section>
-<refsyn><title>Syntax</title><codeblock><b>ij.user=<b><i>username</i></b></b></codeblock></refsyn>
-<example><title>Example</title><codeblock><b>java -Dij.user=me -Dij.password=mine org.apache.derby.tools.ij</b>
+<section>
+<p>This property is used in conjunction with the
+<codeph><xref href="rtoolsijproprefpassword.dita">ij.password</xref></codeph>
+property to authenticate a connection. If authentication is not active, these
+properties are ignored.</p>
+<p>When you supply a username, you need to be aware of the database schema. When
+you connect using <codeph>ij.user</codeph>, the default database schema applied
+to all SQL statements is the same as the user ID provided, even if the schema
+does not exist. Use the SET SCHEMA statement to change the default when the
+schema does not match the username. Alternately, you can fully qualify the
+database objects referred to in the SQL statements. If no user is specified, no
+SET SCHEMA statement has been issued, or SQL statements do not include the
+schema name, all database objects are assumed to be under the APP schema.</p>
+</section>
+<refsyn><title>Syntax</title>
+<codeblock><b>ij.user=<i>username</i></b></codeblock>
+</refsyn>
+<example><title>Example</title>
+<codeblock><b>java -Dij.user=me -Dij.password=mine org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph>
 ij> <b>connect 'jdbc:derby:sampleDB';</b>
 ij> <b>set schema finance;</b>
-ij> <b>select * from accounts;</b></codeblock> </example>
-<section>See the <ph conref="../conrefs.dita#pub/citsec"></ph> for
-more information on <ph conref="../conrefs.dita#prod/productshortname"></ph>
-authentication and security.</section>
+ij> <b>select * from accounts;</b></codeblock>
+</example>
+<section><title>See also</title>
+<p>See the <ph conref="../conrefs.dita#pub/citsec"></ph> for more information on
+<ph conref="../conrefs.dita#prod/productshortname"></ph> authentication and
+security.</p>
+</section>
 </refbody>
 </reference>