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 2011/04/29 19:10:25 UTC

svn commit: r1097890 - /db/derby/docs/branches/10.8/src/getstart/

Author: chaase3
Date: Fri Apr 29 17:10:24 2011
New Revision: 1097890

URL: http://svn.apache.org/viewvc?rev=1097890&view=rev
Log:
DERBY-5184  Tables in documentation need introductions and formatting fixes

Merged DERBY-5184-gs.diff to 10.8 code branch from trunk revision 1097888.

Modified:
    db/derby/docs/branches/10.8/src/getstart/rgsderbyrunjarsyntax.dita
    db/derby/docs/branches/10.8/src/getstart/rgsdocs10012.dita
    db/derby/docs/branches/10.8/src/getstart/rgsdocs18277.dita
    db/derby/docs/branches/10.8/src/getstart/rgslib46043.dita
    db/derby/docs/branches/10.8/src/getstart/tgsrunningdblook.dita
    db/derby/docs/branches/10.8/src/getstart/tgsrunningij.dita
    db/derby/docs/branches/10.8/src/getstart/tgsrunningsysinfo.dita
    db/derby/docs/branches/10.8/src/getstart/tgsruntoolsutils.dita
    db/derby/docs/branches/10.8/src/getstart/tgssetupjavaenvir.dita
    db/derby/docs/branches/10.8/src/getstart/tgssetupverify.dita
    db/derby/docs/branches/10.8/src/getstart/twwdactivity1.dita
    db/derby/docs/branches/10.8/src/getstart/twwdactivity1_Setup.dita
    db/derby/docs/branches/10.8/src/getstart/twwdactivity2.dita
    db/derby/docs/branches/10.8/src/getstart/twwdactivity3_Setup.dita
    db/derby/docs/branches/10.8/src/getstart/twwdactivity4.dita

Modified: db/derby/docs/branches/10.8/src/getstart/rgsderbyrunjarsyntax.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/rgsderbyrunjarsyntax.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/rgsderbyrunjarsyntax.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/rgsderbyrunjarsyntax.dita Fri Apr 29 17:10:24 2011
@@ -35,29 +35,39 @@ shortened names and you do not need to s
 variable. The <codeph>derbyrun.jar</codeph> file must be in the same folder
 as the other <ph conref="../conrefs.dita#prod/productshortname"></ph> JAR
 files.</section>
-<section><title>Syntax</title>The syntax for using <codeph>derbyrun.jar</codeph> for
-each of the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
-is as follows: <simpletable relcolwidth="1* 3*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry>UNIX (Korn Shell)</stentry>
-<stentry><codeblock>java -jar $DERBY_HOME/lib/derbyrun.jar ij [-p <i>propertiesfile</i>] [<i>sql_script</i>] 
-java -jar $DERBY_HOME/lib/derbyrun.jar sysinfo [-cp ...] [-cp help]
-
-java -jar $DERBY_HOME/lib/derbyrun.jar dblook [<i>arg</i>]* (or no arguments for usage) 
-java -jar $DERBY_HOME/lib/derbyrun.jar server [<i>arg</i>]* (or no arguments for usage) </codeblock></stentry>
-</strow>
-<strow>
-<stentry>Windows</stentry>
-<stentry><codeblock>java -jar %DERBY_HOME%\lib\derbyrun.jar ij [-p <i>propertiesfile</i>] [<i>sql_script</i>] 
-java -jar %DERBY_HOME%\lib\derbyrun.jar sysinfo [-cp ...] [-cp help] 
-java -jar %DERBY_HOME%\lib\derbyrun.jar dblook [<i>arg</i>]* (or no arguments for usage) 
-java -jar %DERBY_HOME%\lib\derbyrun.jar server [<i>arg</i>]* (or no arguments for usage) </codeblock></stentry>
-</strow>
-</simpletable><p>To see this syntax reminder, run the command  <codeph>java
+<section><title>Syntax</title><p>The following table shows the syntax for using
+<codeph>derbyrun.jar</codeph> for each of the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> tools.</p>
+<table>
+<title>Syntax for using <codeph>derbyrun.jar</codeph></title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><lines><codeph>java -jar $DERBY_HOME/lib/derbyrun.jar ij [-p <i>propertiesfile</i>] [<i>sql_script</i>]</codeph> 
+<codeph>java -jar $DERBY_HOME/lib/derbyrun.jar sysinfo [-cp ...] [-cp help]</codeph>
+<codeph>java -jar $DERBY_HOME/lib/derbyrun.jar dblook [<i>arg</i>]*</codeph> (or no arguments for usage)
+<codeph>java -jar $DERBY_HOME/lib/derbyrun.jar server [<i>arg</i>]*</codeph> (or no arguments for usage)</lines></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><lines><codeph>java -jar %DERBY_HOME%\lib\derbyrun.jar ij [-p <i>propertiesfile</i>] [<i>sql_script</i>]</codeph>
+<codeph>java -jar %DERBY_HOME%\lib\derbyrun.jar sysinfo [-cp ...] [-cp help]</codeph>
+<codeph>java -jar %DERBY_HOME%\lib\derbyrun.jar dblook [<i>arg</i>]*</codeph> (or no arguments for usage) 
+<codeph>java -jar %DERBY_HOME%\lib\derbyrun.jar server [<i>arg</i>]*</codeph> (or no arguments for usage)</lines></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<p>To see this syntax reminder, run the command  <codeph>java
 -jar derbyrun.jar</codeph> with no arguments.</p></section>
 <section><title>Additional information</title>
 

Modified: db/derby/docs/branches/10.8/src/getstart/rgsdocs10012.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/rgsdocs10012.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/rgsdocs10012.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/rgsdocs10012.dita Fri Apr 29 17:10:24 2011
@@ -22,11 +22,13 @@ limitations under the License.
 <shortdesc>SQL syntax is presented in modified BNF notation.</shortdesc>
 <refbody>
 <section><p>The meta-symbols of BNF are listed in the following table.</p>
-<table pgwide="0" frame="all">
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="30*"/>
+<table frame="all">
+<title>BNF meta-symbols</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="1" colnum="1" colwidth="30*"/>
 <colspec colname="2" colnum="2" colwidth="70*"/>
 <thead>
-<row>
+<row valign="bottom">
 <entry colname="1">Symbol</entry>
 <entry colname="2">Meaning</entry>
 </row>

Modified: db/derby/docs/branches/10.8/src/getstart/rgsdocs18277.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/rgsdocs18277.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/rgsdocs18277.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/rgsdocs18277.dita Fri Apr 29 17:10:24 2011
@@ -22,15 +22,20 @@ limitations under the License.
 <title>Typographical conventions</title>
 <shortdesc>This documentation uses some typographical conventions to highlight
 elements of the SQL language, operating system commands, and the Java programming
-language.</shortdesc>
+language. </shortdesc>
 <refbody>
-<section><p><table frame="all" pgwide="1"><title><ph conref="../conrefs.dita#prod/productshortname"></ph> typographical
+<section>
+<p>The following table lists the typographical conventions used in the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> documentation.</p>
+<table frame="all">
+<title><ph conref="../conrefs.dita#prod/productshortname"></ph> typographical
 conventions</title>
-<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="2" colnum="1" colwidth="35*"/>
-<colspec colname="COLSPEC0" colnum="2" colwidth="23*"/><colspec colname="3"
-colnum="3" colwidth="50*"/>
+<tgroup cols="3" colsep="1" rowsep="1">
+<colspec colname="2" colnum="1" colwidth="35*"/>
+<colspec colname="COLSPEC0" colnum="2" colwidth="23*"/>
+<colspec colname="3" colnum="3" colwidth="50*"/>
 <thead>
-<row>
+<row valign="bottom">
 <entry colname="2">Usage</entry>
 <entry colname="COLSPEC0">Typeface</entry>
 <entry colname="3">Examples</entry>
@@ -85,6 +90,6 @@ but replace with the appropriate name </
 </row>
 </tbody>
 </tgroup>
-</table></p></section>
+</table></section>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.8/src/getstart/rgslib46043.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/rgslib46043.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/rgslib46043.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/rgslib46043.dita Fri Apr 29 17:10:24 2011
@@ -20,8 +20,9 @@ limitations under the License.
 -->
 <reference id="rgslib46043" xml:lang="en-us">
 <title>Libraries provided by Derby</title>
-<shortdesc>This section shows the different libraries used by <ph conref="../conrefs.dita#prod/productshortname"></ph> and
-their purposes.</shortdesc>
+<shortdesc>This section shows the different libraries used by
+<ph conref="../conrefs.dita#prod/productshortname"></ph> and their
+purposes.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>derbyclient.jar</indexterm><indexterm>derby.jar</indexterm>
 <indexterm>derbytools.jar</indexterm><indexterm>Sample application libraries</indexterm>
@@ -29,91 +30,189 @@ their purposes.</shortdesc>
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><dl><dlentry>
-<dt>Engine library</dt>
-<dd><simpletable relcolwidth="1* 3*">
-<sthead>
-<stentry>Library Name</stentry>
-<stentry>Use</stentry>
-</sthead>
-<strow>
-<stentry>derby.jar</stentry>
-<stentry>For embedded databases. <p>You always need this library for embedded
+<section>
+<p>The following table shows the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> engine library.</p>
+<table>
+<title>Engine library</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="35*"/>
+<colspec colname="col2" colnum="2" colwidth="65*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Library Name</entry>
+<entry colname="col2">Use</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1"><codeph>derby.jar</codeph></entry>
+<entry colname="col2">For embedded databases. <p>You always need this library for embedded
 environments. For client/server environments, you only need this library on
-the server.</p></stentry>
-</strow>
-</simpletable></dd>
-</dlentry><dlentry>
-<dt>Tools libraries</dt>
-<dd>For embedded environments, you need a library in the classpath to use
+the server.</p></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<p>For embedded environments, you need a library in the classpath to use
 a tool. For a client/server environment, you need a library on the client
-only.<simpletable relcolwidth="1* 3*">
-<sthead>
-<stentry>Library Names</stentry>
-<stentry>Use</stentry>
-</sthead>
-<strow>
-<stentry>derbytools.jar</stentry>
-<stentry>Required for running all the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
-(such as <codeph>ij</codeph>, <codeph>dblook</codeph>, and import/export). </stentry>
-</strow>
-<strow>
-<stentry>derbyrun.jar</stentry>
-<stentry>Executable jar file that can be used to start the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools. </stentry>
-</strow>
-</simpletable></dd>
-</dlentry><dlentry>
-<dt>The Network Server library</dt>
-<dd><simpletable relcolwidth="1* 3*">
-<sthead>
-<stentry>Library Name</stentry>
-<stentry>Use</stentry>
-</sthead>
-<strow>
-<stentry>derbynet.jar</stentry>
-<stentry>Required to start the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Server.</stentry>
-</strow>
-</simpletable></dd>
-</dlentry><dlentry>
-<dt>The network client library</dt>
-<dd><simpletable relcolwidth="1* 3*">
-<sthead>
-<stentry>Library Name</stentry>
-<stentry>Use</stentry>
-</sthead>
-<strow>
-<stentry>derbyclient.jar</stentry>
-<stentry>Required to use the <ph conref="../conrefs.dita#prod/productshortname"></ph> network
-client driver.</stentry>
-</strow>
-</simpletable></dd>
-</dlentry><dlentry>
-<dt>The locale libraries</dt>
-<dd><simpletable relcolwidth="1* 3*">
-<sthead>
-<stentry>Library Names</stentry>
-<stentry>Use</stentry>
-</sthead>
-<strow>
-<stentry><ul>
-<li>derbyLocale_cs.jar</li>
-<li>derbyLocale_de_DE.jar</li>
-<li>derbyLocale_es.jar</li>
-<li>derbyLocale_fr.jar</li>
-<li>derbyLocale_hu.jar</li>
-<li>derbyLocale_it.jar</li>
-<li>derbyLocale_ja_JP.jar</li>
-<li>derbyLocale_ko_KR.jar</li>
-<li>derbyLocale_pl.jar</li>
-<li>derbyLocale_pt_BR.jar</li>
-<li>derbyLocale_ru.jar</li>
-<li>derbyLocale_zh_CN.jar</li>
-<li>derbyLocale_zh_TW.jar</li>
-</ul></stentry>
-<stentry>Required to provide translated messages for the indicated locales.</stentry>
-</strow>
-</simpletable></dd>
-</dlentry></dl></section>
+only. The following table shows the tools libraries.</p>
+<table>
+<title>Tools libraries</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="35*"/>
+<colspec colname="col2" colnum="2" colwidth="65*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Library Name</entry>
+<entry colname="col2">Use</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1"><codeph>derbytools.jar</codeph></entry>
+<entry colname="col2">Required for running all the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> tools (such as
+<codeph>ij</codeph>, <codeph>dblook</codeph>, and import/export).</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyrun.jar</codeph></entry>
+<entry colname="col2">Executable jar file that can be used to start the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> tools.</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<p>The following table shows the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server
+library.</p>
+<table>
+<title>Network Server library</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="35*"/>
+<colspec colname="col2" colnum="2" colwidth="65*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Library Name</entry>
+<entry colname="col2">Use</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1"><codeph>derbynet.jar</codeph></entry>
+<entry colname="col2">Required to start the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server.</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<p>The following table shows the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> network client
+library.</p>
+<table>
+<title>Network client library</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="35*"/>
+<colspec colname="col2" colnum="2" colwidth="65*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Library Name</entry>
+<entry colname="col2">Use</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1"><codeph>derbyclient.jar</codeph></entry>
+<entry colname="col2">Required to use the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> network client
+driver.</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<p>The following table shows the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> locale libraries.</p>
+<table>
+<title>Locale libraries</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="35*"/>
+<colspec colname="col2" colnum="2" colwidth="65*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Library Name</entry>
+<entry colname="col2">Use</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1"><codeph>derbyLocale_cs.jar</codeph></entry>
+<entry colname="col2">Required to provide translated messages for the Czech
+locale.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyLocale_de_DE.jar</codeph></entry>
+<entry colname="col2">Required to provide translated messages for the German
+locale.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyLocale_es.jar</codeph></entry>
+<entry colname="col2">Required to provide translated messages for the Spanish
+locale.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyLocale_fr.jar</codeph></entry>
+<entry colname="col2">Required to provide translated messages for the French
+locale.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyLocale_hu.jar</codeph></entry>
+<entry colname="col2">Required to provide translated messages for the Hungarian
+locale.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyLocale_it.jar</codeph></entry>
+<entry colname="col2">Required to provide translated messages for the Italian
+locale.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyLocale_ja_JP.jar</codeph></entry>
+<entry colname="col2">Required to provide translated messages for the Japanese
+locale.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyLocale_ko_KR.jar</codeph></entry>
+<entry colname="col2">Required to provide translated messages for the Korean
+locale.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyLocale_pl.jar</codeph></entry>
+<entry colname="col2">Required to provide translated messages for the Polish
+locale.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyLocale_pt_BR.jar</codeph>
+</entry>
+<entry colname="col2">Required to provide translated messages for the Brazilian
+Portuguese locale.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyLocale_ru.jar</codeph></entry>
+<entry colname="col2">Required to provide translated messages for the Russian
+locale.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyLocale_zh_CN.jar</codeph></entry>
+<entry colname="col2">Required to provide translated messages for the Simplified
+Chinese locale.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>derbyLocale_zh_TW.jar</codeph></entry>
+<entry colname="col2">Required to provide translated messages for the
+Traditional Chinese locale.</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</section>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.8/src/getstart/tgsrunningdblook.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/tgsrunningdblook.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/tgsrunningdblook.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/tgsrunningdblook.dita Fri Apr 29 17:10:24 2011
@@ -32,46 +32,68 @@ tool</indexterm>running</indexterm></key
 all or parts of the DDL of a user-specified database to either a console or
 a file. The generated DDL can then be used for such things as recreating all
 or parts of a database, viewing a subset of the objects in a database (for
-example, those objects that pertain to specific tables and schemas), or documenting
-the schema of a database. </p><p>Choose the method that you can use to run
-the <codeph>dblook</codeph> script:</p><simpletable relcolwidth="1* 1* 2*">
-<sthead>
-<stentry>Method</stentry>
-<stentry>When to Use</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry>Run <codeph>dblook</codeph> as a standalone command.</stentry>
-<stentry>Use this method if you are relatively new to the Java programming
-language and new to <ph conref="../conrefs.dita#prod/productshortname"></ph>.</stentry>
-<stentry>You must <xref href="tgssetupjavaenvir.dita#tgssetupjavaenvir">set
-your environment variables</xref> before you can run the <codeph>dblook</codeph> utility
-using this method. <p>To run the <codeph>dblook</codeph> script from the command
-line use:</p><codeblock>dblook -d <i>connectionURL</i> [<i>options</i>]</codeblock><p>The <codeph>dblook</codeph> script
-sets the appropriate environment variables, including the CLASSPATH, and runs
-the <codeph>dblook</codeph> utility. </p></stentry>
-</strow>
-<strow>
-<stentry>Run <codeph>dblook</codeph> using the jar file that is located in
-the directory where <codeph>dblook</codeph> resides.</stentry>
-<stentry>Use this method if you are new to <ph conref="../conrefs.dita#prod/productshortname"></ph>,
-but are familiar with the Java programming language.  </stentry>
-<stentry>You must set the <ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment
-variable before you can run the <codeph>dblook</codeph> utility using this
-method. <p>On UNIX, the command is:</p><codeblock>java [options] -jar $DERBY_HOME/lib/derbyrun.jar dblook -d <i>connectionURL</i> [<i>options</i>]</codeblock><p>On
-Windows, the command is:</p><codeblock>java [options] -jar %DERBY_HOME%\lib\derbyrun.jar dblook -d <i>connectionURL</i> [<i>options</i>]</codeblock></stentry>
-</strow>
-<strow>
-<stentry>Run <codeph>dblook</codeph> using the <codeph>java</codeph> command.</stentry>
-<stentry>Use this method if you are familiar with both the Java programming
-language and <ph conref="../conrefs.dita#prod/productshortname"></ph>, and
-you have already set your command execution PATH to the location of your 
-<codeph>java</codeph> command.</stentry>
-<stentry>You must set your CLASSPATH. Use the steps specified in <xref href="tgs26250.dita#tgs26250"></xref>.
-Then specify the class name in the <codeph>java</codeph> command.  For example:<codeblock>java org.apache.derby.tools.dblook -d <i>connectionURL</i> [<i>options</i>]</codeblock
-></stentry>
-</strow>
-</simpletable></context>
+example, those objects that pertain to specific tables and schemas), or
+documenting the schema of a database.</p>
+<p>Choose the method that you will use to run the <codeph>dblook</codeph>
+script. The methods are listed in the following table.</p>
+<table><title>Methods of running the <codeph>dblook</codeph> utility</title>
+<tgroup cols="3" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="25*"/>
+<colspec colname="col3" colnum="3" colwidth="50*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Method</entry>
+<entry colname="col2">When to Use</entry>
+<entry colname="col3">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">Run <codeph>dblook</codeph> as a standalone command.</entry>
+<entry colname="col2">Use this method if you are relatively new to the Java
+programming language and new to
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.</entry>
+<entry colname="col3">Follow the steps in
+<xref href="tgssetupjavaenvir.dita#tgssetupjavaenvir"></xref> before you run the
+<codeph>dblook</codeph> utility using this method.
+<p>To run the <codeph>dblook</codeph> script from the command line use:</p>
+<codeblock>dblook -d <i>connectionURL</i> [<i>options</i>]</codeblock>
+<p>The <codeph>dblook</codeph> script sets the appropriate environment
+variables, including the CLASSPATH, and runs the <codeph>dblook</codeph>
+utility.</p></entry>
+</row>
+<row>
+<entry colname="col1">Run <codeph>dblook</codeph> using the jar file that is
+located in the directory where <codeph>dblook</codeph> resides.</entry>
+<entry colname="col2">Use this method if you are new to
+<ph conref="../conrefs.dita#prod/productshortname"></ph>, but are familiar with
+the Java programming language.</entry>
+<entry colname="col3">You must set the
+<ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment variable
+before you can run the <codeph>dblook</codeph> utility using this method.
+<p>On UNIX, the command is:</p>
+<codeblock>java [options] -jar $DERBY_HOME/lib/derbyrun.jar dblook -d <i>connectionURL</i> [<i>options</i>]</codeblock>
+<p>On Windows, the command is:</p>
+<codeblock>java [options] -jar %DERBY_HOME%\lib\derbyrun.jar dblook -d <i>connectionURL</i> [<i>options</i>]</codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Run <codeph>dblook</codeph> using the
+<codeph>java</codeph> command.</entry>
+<entry colname="col2">Use this method if you are familiar with both the Java
+programming language and
+<ph conref="../conrefs.dita#prod/productshortname"></ph>, and you have already
+added the location of the <codeph>java</codeph> executable file to your command
+execution PATH.</entry>
+<entry colname="col3">You must set your CLASSPATH. Use the steps specified in
+<xref href="tgs26250.dita#tgs26250"></xref>. Then specify the class name in the
+<codeph>java</codeph> command. For example:
+<codeblock>java org.apache.derby.tools.dblook -d <i>connectionURL</i> [<i>options</i>]</codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table> 
+</context>
 <postreq>See <xref href="cgsusingtoolsutils.dita#cgsusingtoolsutils"></xref>
 for an example of the use of the <i>connectionURL</i>. See "dblook" and its
 subtopics in the

Modified: db/derby/docs/branches/10.8/src/getstart/tgsrunningij.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/tgsrunningij.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/tgsrunningij.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/tgsrunningij.dita Fri Apr 29 17:10:24 2011
@@ -30,44 +30,71 @@ tool</indexterm>running</indexterm></key
 <taskbody>
 <context></context>
 <steps-unordered>
-<step><cmd>Choose the method that you can use to run the <codeph>ij</codeph> script:</cmd>
-<info><simpletable relcolwidth="1* 1* 2*">
-<sthead>
-<stentry>Method</stentry>
-<stentry>When to Use</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry>Run <codeph>ij</codeph> as a standalone command.</stentry>
-<stentry>Use this method if you are relatively new to the Java programming
-language and new to <ph conref="../conrefs.dita#prod/productshortname"></ph>.</stentry>
-<stentry>You must <xref href="tgssetupjavaenvir.dita#tgssetupjavaenvir">set
-your environment variables</xref> before you can run the <codeph>ij</codeph> tool
-using this method. To run the <codeph>ij</codeph> script from the command
-line use:<codeblock>ij</codeblock><p>You must add the <ph conref="../conrefs.dita#prod/productinstallpath"></ph><filepath>/bin</filepath> directory
-in your PATH environment variable before you can run the <codeph>ij</codeph> tool. </p><p>The <codeph>ij</codeph> script
-sets up the environment variables like CLASSPATH and starts the <codeph>ij</codeph> tool.</p></stentry>
-</strow>
-<strow>
-<stentry>Run <codeph>ij</codeph> using the jar file that is located in the
-directory where <codeph>ij</codeph> resides.</stentry>
-<stentry>Use this method if you are new to <ph conref="../conrefs.dita#prod/productshortname"></ph>,
-but are familiar with the Java programming language.</stentry>
-<stentry>You must set the <ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment
-variable before you can run the <codeph>ij</codeph> tool using this method. <p>On
-UNIX, the command is:<codeblock>java -jar $DERBY_HOME/lib/derbyrun.jar ij </codeblock></p><p>On
-Windows, the command is:</p><codeblock>java -jar %DERBY_HOME%\lib\derbyrun.jar ij </codeblock></stentry>
-</strow>
-<strow>
-<stentry>Run <codeph>ij</codeph> using the <codeph>java</codeph> command.</stentry>
-<stentry>Use this method if you are familiar with both the Java programming
-language and <ph conref="../conrefs.dita#prod/productshortname"></ph>, and
-you have already set the <codeph>java.exe</codeph> file in your command execution
-PATH.</stentry>
-<stentry>You must set your CLASSPATH. Use the steps specified in <xref href="tgs26250.dita#tgs26250"></xref>.
-Then specify the class name in the <codeph>java</codeph> command.  For example:<codeblock>java org.apache.derby.tools.ij </codeblock></stentry>
-</strow>
-</simpletable></info></step>
+<step><cmd>Choose the method that you will use to run the <codeph>ij</codeph>
+script. The methods are listed in the following table.</cmd>
+<info>
+<table><title>Methods of running the <codeph>ij</codeph> utility</title>
+<tgroup cols="3" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="25*"/>
+<colspec colname="col3" colnum="3" colwidth="50*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Method</entry>
+<entry colname="col2">When to Use</entry>
+<entry colname="col3">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">Run <codeph>ij</codeph> as a standalone command.</entry>
+<entry colname="col2">Use this method if you are relatively new to the Java
+programming language and new to
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.</entry>
+<entry colname="col3">Follow the steps in
+<xref href="tgssetupjavaenvir.dita#tgssetupjavaenvir"></xref> before you run the
+<codeph>ij</codeph> tool using this method. To run the <codeph>ij</codeph>
+script from the command line, use:
+<codeblock>ij</codeblock>
+<p>You must add the
+<codeph><ph conref="../conrefs.dita#prod/productinstallpath"></ph>/bin</codeph>
+directory to your PATH environment variable before you can run the
+<codeph>ij</codeph> tool.</p>
+<p>The <codeph>ij</codeph> script sets the appropriate environment
+variables, including the CLASSPATH, and starts the <codeph>ij</codeph>
+tool.</p></entry>
+</row>
+<row>
+<entry colname="col1">Run <codeph>ij</codeph> using the jar file that is located
+in the directory where <codeph>ij</codeph> resides.</entry>
+<entry colname="col2">Use this method if you are new to
+<ph conref="../conrefs.dita#prod/productshortname"></ph>, but are familiar with
+the Java programming language.</entry>
+<entry colname="col3">You must set the
+<ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment variable
+before you can run the <codeph>ij</codeph> tool using this method.
+<p>On UNIX, the command is:</p>
+<codeblock>java -jar $DERBY_HOME/lib/derbyrun.jar ij</codeblock>
+<p>On Windows, the command is:</p>
+<codeblock>java -jar %DERBY_HOME%\lib\derbyrun.jar ij </codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Run <codeph>ij</codeph> using the <codeph>java</codeph>
+command.</entry>
+<entry colname="col2">Use this method if you are familiar with both the Java
+programming language and
+<ph conref="../conrefs.dita#prod/productshortname"></ph>, and you have already
+added the location of the <codeph>java</codeph> executable file to your command
+execution PATH.</entry>
+<entry colname="col3">You must set your CLASSPATH. Use the steps specified in
+<xref href="tgs26250.dita#tgs26250"></xref>. Then specify the class name in the
+<codeph>java</codeph> command. For example:
+<codeblock>java org.apache.derby.tools.ij</codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table> 
+</info></step>
 <step><cmd>When you are ready to leave the <codeph>ij</codeph> tool, type: </cmd>
 <stepxmp><codeblock>ij&gt; exit;</codeblock></stepxmp></step>
 </steps-unordered>

Modified: db/derby/docs/branches/10.8/src/getstart/tgsrunningsysinfo.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/tgsrunningsysinfo.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/tgsrunningsysinfo.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/tgsrunningsysinfo.dita Fri Apr 29 17:10:24 2011
@@ -29,44 +29,67 @@ tool</indexterm>running</indexterm></key
 </metadata></prolog>
 <taskbody>
 <context>The <codeph>sysinfo</codeph> utility prints system information to
-a console.<p>Choose the method that you can use to run the <codeph>sysinfo</codeph> script:</p><simpletable
-relcolwidth="1* 1* 2*">
-<sthead>
-<stentry>Method</stentry>
-<stentry>When to Use</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry>Run <codeph>sysinfo</codeph> as a standalone command.</stentry>
-<stentry>Use this method if you are relatively new to the Java programming
-language and new to <ph conref="../conrefs.dita#prod/productshortname"></ph>.</stentry>
-<stentry>You must <xref href="tgssetupjavaenvir.dita#tgssetupjavaenvir">set
-your environment variables</xref> before you can run the <codeph>sysinfo</codeph> utility
-using this method. <p>To run the <codeph>sysinfo</codeph> script from the
-command line us:</p><codeblock>sysinfo</codeblock><p>The <codeph>sysinfo</codeph> script
-sets the appropriate environment variables, including the CLASSPATH, and runs
-the <codeph>sysinfo</codeph> utility. </p></stentry>
-</strow>
-<strow>
-<stentry>Run <codeph>sysinfo</codeph> using the jar file that is located in
-the directory where <codeph>sysinfo</codeph> resides.</stentry>
-<stentry>Use this method if you are new to <ph conref="../conrefs.dita#prod/productshortname"></ph>,
-but are familiar with the Java programming language.  </stentry>
-<stentry>You must set the <ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment
-variable before you can run the <codeph>sysinfo</codeph> utility using this
-method. <p>On UNIX, the command is:</p><codeblock>java [options] -jar $DERBY_HOME/lib/derbyrun.jar sysinfo</codeblock><p>On
-Windows, the command is:</p><codeblock>java [options] -jar %DERBY_HOME%\lib\derbyrun.jar sysinfo</codeblock></stentry>
-</strow>
-<strow>
-<stentry>Run <codeph>sysinfo</codeph> using the <codeph>java</codeph> command.</stentry>
-<stentry>Use this method if you are familiar with both the Java programming
-language and <ph conref="../conrefs.dita#prod/productshortname"></ph>, and
-you have already set the <codeph>java.exe</codeph> file in your command execution
-PATH.</stentry>
-<stentry>You must set your CLASSPATH. Use the steps specified in <xref href="tgs26250.dita#tgs26250"></xref>.
-Then specify the class name in the <codeph>java</codeph> command.  For example:<codeblock>java org.apache.derby.tools.sysinfo</codeblock></stentry>
-</strow>
-</simpletable></context>
+a console.<p>Choose the method that you will use to run the
+<codeph>sysinfo</codeph> script. The methods are listed in
+the following table.</p>
+<table><title>Methods of running the <codeph>sysinfo</codeph> utility</title>
+<tgroup cols="3" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="25*"/>
+<colspec colname="col3" colnum="3" colwidth="50*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Method</entry>
+<entry colname="col2">When to Use</entry>
+<entry colname="col3">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">Run <codeph>sysinfo</codeph> as a standalone command.</entry>
+<entry colname="col2">Use this method if you are relatively new to the Java
+programming language and new to
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.</entry>
+<entry colname="col3">Follow the steps in
+<xref href="tgssetupjavaenvir.dita#tgssetupjavaenvir"></xref> before you run the
+<codeph>sysinfo</codeph> utility using this method.
+<p>To run the <codeph>sysinfo</codeph> script from the command line, use:</p>
+<codeblock>sysinfo</codeblock>
+<p>The <codeph>sysinfo</codeph> script sets the appropriate environment
+variables, including the CLASSPATH, and runs the <codeph>sysinfo</codeph>
+utility.</p></entry>
+</row>
+<row>
+<entry colname="col1">Run <codeph>sysinfo</codeph> using the jar file that is
+located in the directory where <codeph>sysinfo</codeph> resides.</entry>
+<entry colname="col2">Use this method if you are new to
+<ph conref="../conrefs.dita#prod/productshortname"></ph>, but are familiar with
+the Java programming language.</entry>
+<entry colname="col3">You must set the
+<ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment variable
+before you can run the <codeph>sysinfo</codeph> utility using this method.
+<p>On UNIX, the command is:</p>
+<codeblock>java [options] -jar $DERBY_HOME/lib/derbyrun.jar sysinfo</codeblock>
+<p>On Windows, the command is:</p>
+<codeblock>java [options] -jar %DERBY_HOME%\lib\derbyrun.jar sysinfo</codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Run <codeph>sysinfo</codeph> using the
+<codeph>java</codeph> command.</entry>
+<entry colname="col2">Use this method if you are familiar with both the Java
+programming language and
+<ph conref="../conrefs.dita#prod/productshortname"></ph>, and you have already
+added the location of the <codeph>java</codeph> executable file to your command
+execution PATH.</entry>
+<entry colname="col3">You must set your CLASSPATH. Use the steps specified in
+<xref href="tgs26250.dita#tgs26250"></xref>. Then specify the class name in the
+<codeph>java</codeph> command. For example:
+<codeblock>java org.apache.derby.tools.sysinfo</codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</context>
 <postreq>See "sysinfo" in the <cite><ph conref="../conrefs.dita#pub/citutilities"></ph></cite> for
 more information about using the <codeph>sysinfo</codeph> utility.</postreq>
 </taskbody>

Modified: db/derby/docs/branches/10.8/src/getstart/tgsruntoolsutils.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/tgsruntoolsutils.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/tgsruntoolsutils.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/tgsruntoolsutils.dita Fri Apr 29 17:10:24 2011
@@ -31,62 +31,84 @@ and startup utilities. </shortdesc>
 <context> <p>The method that you choose to run the tools and utilities determines
 the environment variables that you set for <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p></context>
 <steps>
-<step><cmd>Choose the method that you want to use: </cmd><info><simpletable
-relcolwidth="1.5* 1.5* 2*">
-<sthead>
-<stentry>Method</stentry>
-<stentry>When to Use</stentry>
-<stentry>Requirements</stentry>
-</sthead>
-<strow>
-<stentry>Run the tools using the command shell scripts that are provided with <ph
-conref="../conrefs.dita#prod/productshortname"></ph>.</stentry>
-<stentry>Use this method when you want to run the tools with the least amount
-of typing and have installed the full <codeph>bin</codeph> distribution of <ph
-conref="../conrefs.dita#prod/productshortname"></ph>.</stentry>
-<stentry><ul>
-<li>Set the DERBY_HOME environment variable</li>
-<li>Include the <codeph>java.exe</codeph> file in the PATH environment variable</li>
-<li>Include the <codeph>DERBY_HOME\bin</codeph> directory in the PATH environment
+<step><cmd>Choose the method that you want to use. The methods are listed in
+the following table.</cmd>
+<info>
+<table><title>Methods of running the <ph
+conref="../conrefs.dita#prod/productshortname"></ph> tools and utilities</title>
+<tgroup cols="3" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="30*"/>
+<colspec colname="col2" colnum="2" colwidth="30*"/>
+<colspec colname="col3" colnum="3" colwidth="40*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Method</entry>
+<entry colname="col2">When to Use</entry>
+<entry colname="col3">Requirements</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">Run the tools using the command shell scripts that are
+provided with <ph conref="../conrefs.dita#prod/productshortname"></ph>.</entry>
+<entry colname="col2">Use this method when you want to run the tools with the
+least amount of typing and have installed the full <codeph>bin</codeph>
+distribution of <ph conref="../conrefs.dita#prod/productshortname"></ph>.</entry>
+<entry colname="col3"><ul>
+<li>Set the <ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment variable</li>
+<li>Include the location of the <codeph>java</codeph> executable file (usually
+<codeph>JAVA_HOME\bin</codeph>) in the PATH environment variable</li>
+<li>Include the <codeph><ph conref="../conrefs.dita#prod/productinstallpath"></ph>\bin</codeph> directory in the PATH environment
 variable</li>
-</ul></stentry>
-</strow>
-<strow>
-<stentry>Run the tools using the <codeph>derbyrun.jar</codeph> archive file. </stentry>
-<stentry>Use this method when:<ul>
-<li>You have only the <ph conref="../conrefs.dita#prod/productshortname"></ph> jar
-files available (see <xref href="rgslib46043.dita#rgslib46043"></xref>), and
-do not have the full <codeph>bin</codeph> distribution of <ph conref="../conrefs.dita#prod/productshortname"></ph></li>
-<li>You do not want to use the scripts that are provided with <ph conref="../conrefs.dita#prod/productshortname"></ph></li>
-</ul></stentry>
-<stentry><ul>
-<li>Set the DERBY_HOME environment variable</li>
-<li>Include the <codeph>java.exe</codeph> file in the PATH environment variable</li>
+</ul></entry>
+</row>
+<row>
+<entry colname="col1">Run the tools using the <codeph>derbyrun.jar</codeph>
+archive file.</entry>
+<entry colname="col2">Use this method when:<ul>
+<li>You have only the <ph conref="../conrefs.dita#prod/productshortname"></ph>
+jar files available (see <xref href="rgslib46043.dita#rgslib46043"></xref>), and
+do not have the full <codeph>bin</codeph> distribution of
+<ph conref="../conrefs.dita#prod/productshortname"></ph></li>
+<li>You do not want to use the scripts that are provided with
+<ph conref="../conrefs.dita#prod/productshortname"></ph></li>
+</ul></entry>
+<entry colname="col3"><ul>
+<li>Set the <ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment variable</li>
+<li>Include the location of the <codeph>java</codeph> executable file (usually
+<codeph>JAVA_HOME\bin</codeph>) in the PATH environment variable</li>
 </ul> <p>The <codeph>derbyrun.jar</codeph> file must be in the same folder
 as the other <ph conref="../conrefs.dita#prod/productshortname"></ph> .jar
-files.</p><p>For more information see the <xref href="rgsderbyrunjarsyntax.dita#rgsderbyrunjarsyntax">syntax
-for the <codeph>derbyrun.jar</codeph> file</xref>.</p></stentry>
-</strow>
-<strow>
-<stentry>Run the tools using the complete <codeph>java</codeph> syntax or
-use <ph conref="../conrefs.dita#prod/productshortname"></ph> in a Java program.</stentry>
-<stentry>Use this method when: <ul>
-<li>You do not have the <codeph>derbyrun.jar</codeph> file or the <ph conref="../conrefs.dita#prod/productshortname"></ph> scripts
-installed. </li>
+files.</p><p>For more information, see
+<xref href="rgsderbyrunjarsyntax.dita#rgsderbyrunjarsyntax"></xref>.</p></entry>
+</row>
+<row>
+<entry colname="col1">Run the tools using the complete <codeph>java</codeph>
+syntax, or use <ph conref="../conrefs.dita#prod/productshortname"></ph> in a Java
+program.</entry>
+<entry colname="col2">Use this method when:<ul>
+<li>You do not have the <codeph>derbyrun.jar</codeph> file or the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> scripts installed</li>
 <li>You want to learn the full syntax of each command and understand the details
-of setting up the execution environment.  </li>
-<li>You are developing application programs with <ph conref="../conrefs.dita#prod/productshortname"></ph></li>
-</ul></stentry>
-<stentry><ul>
-<li>Set the DERBY_HOME environment variable</li>
-<li>Include the <codeph>java.exe</codeph>file in the PATH environment variable</li>
+of setting up the execution environment</li>
+<li>You are developing application programs with
+<ph conref="../conrefs.dita#prod/productshortname"></ph></li>
+</ul></entry>
+<entry colname="col3"><ul>
+<li>Set the <ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment variable</li>
+<li>Include the location of the <codeph>java</codeph> executable file (usually
+<codeph>JAVA_HOME\bin</codeph>) in the PATH environment variable</li>
 <li>You must know the full package name for the Java class that supports the
 tool</li>
 <li>The CLASSPATH environment variable must be set to include the required
-JAR files.</li>
-</ul><p>For details on setting the CLASSPATH, see  <xref href="tgs26250.dita#tgs26250"></xref>.</p></stentry>
-</strow>
-</simpletable></info></step>
+JAR files</li>
+</ul><p>For details on setting the CLASSPATH, see 
+<xref href="tgs26250.dita#tgs26250"></xref>.</p></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</info></step>
 <step><cmd>Based on the requirements of the method that you chose to run the
 tools, follow the instructions to <xref href="tgssetupjavaenvir.dita#tgssetupjavaenvir">set
 the environment variables</xref>.</cmd></step>

Modified: db/derby/docs/branches/10.8/src/getstart/tgssetupjavaenvir.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/tgssetupjavaenvir.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/tgssetupjavaenvir.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/tgssetupjavaenvir.dita Fri Apr 29 17:10:24 2011
@@ -36,7 +36,8 @@ variable, setting</indexterm></indexterm
 <taskbody>
 <context>As mentioned in <xref href="tgsruntoolsutils.dita#tgsruntoolsutils">choosing
 a method to run the Derby tools and startup utilities</xref>, you must set
-the DERBY_HOME environment variable so that you can use the command examples
+the <ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment
+variable so that you can use the command examples
 that are presented in this manual.  Adding the <ph conref="../conrefs.dita#prod/productshortname"></ph> scripts
 directory to your command execution PATH makes the scripts easier to use and
 enables you to use the script examples in this manual.  The CLASSPATH environment
@@ -54,41 +55,84 @@ variable to the location where you extra
 <stepxmp>For example, if you installed <ph conref="../conrefs.dita#prod/productshortname"></ph> in
 the <codeph>/opt/<ph conref="../conrefs.dita#prod/productinstallname"></ph></codeph> directory
 on UNIX or in the <codeph>c:\<ph conref="../conrefs.dita#prod/productinstallname"></ph></codeph> directory
-on Windows, use the following command to set the <ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment
-variable:</stepxmp>
-<choicetable relcolwidth="1* 3*">
-<chhead><choptionhd>Operating System</choptionhd><chdeschd>Command</chdeschd>
-</chhead>
-<chrow><choption>UNIX</choption><chdesc><codeph>export <ph conref="../conrefs.dita#prod/productinstallpath"></ph>=/opt/<ph
-conref="../conrefs.dita#prod/productinstallname"></ph></codeph></chdesc></chrow>
-<chrow><choption>Windows</choption><chdesc><codeph>set <ph conref="../conrefs.dita#prod/productinstallpath"></ph>=c:\<ph
-conref="../conrefs.dita#prod/productinstallname"></ph></codeph>. </chdesc>
-</chrow>
-</choicetable>
+on Windows, use one of the commands in the following table to set the
+<ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment
+variable.</stepxmp>
+<info>
+<table>
+<title>Commands to set the
+<ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment
+variable</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeph>export
+<ph conref="../conrefs.dita#prod/productinstallpath"></ph>=/opt/<ph
+conref="../conrefs.dita#prod/productinstallname"></ph></codeph></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeph>set
+<ph conref="../conrefs.dita#prod/productinstallpath"></ph>=c:\<ph
+conref="../conrefs.dita#prod/productinstallname"></ph></codeph></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</info>
 </step>
-<step><cmd>Be certain that the <codeph>java.exe</codeph> file, version 1.4.2
-or, higher is in your command execution PATH. Open a command window and run
+<step><cmd>Be certain that the <codeph>java</codeph> executable file, version
+1.4.2 or higher, is in your command execution PATH. Open a command window and run
 the <codeph>java -version</codeph> command.</cmd></step>
 <step><cmd>Add the <codeph><ph conref="../conrefs.dita#prod/productinstallpath"></ph>/bin</codeph> directory
 to the PATH environment variable so that you can run the <ph conref="../conrefs.dita#prod/productshortname"></ph> scripts
-from any directory.</cmd>
-<choicetable relcolwidth="1* 3*">
-<chhead><choptionhd>Operating System</choptionhd><chdeschd>Command</chdeschd>
-</chhead>
-<chrow><choption>UNIX</choption><chdesc><codeph>export PATH="$<ph conref="../conrefs.dita#prod/productinstallpath"></ph>/bin:$PATH"</codeph></chdesc>
-</chrow>
-<chrow><choption>Windows</choption><chdesc><codeph>set PATH=%<ph conref="../conrefs.dita#prod/productinstallpath"></ph>%\bin;%PATH%</codeph>.
-If you use the Control Panel to update your system PATH, add <codeph>%<ph
+from any directory, as shown in the following table.</cmd>
+<info>
+<table>
+<title>Commands to set the PATH environment variable</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeph>export
+PATH="$<ph conref="../conrefs.dita#prod/productinstallpath"></ph>/bin:$PATH"</codeph></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeph>set
+PATH=%<ph conref="../conrefs.dita#prod/productinstallpath"></ph>%\bin;%PATH%</codeph>
+<p>If you use the Control Panel to update your system PATH, add <codeph>%<ph
 conref="../conrefs.dita#prod/productinstallpath"></ph>%\bin</codeph> to the
-end of the PATH environment variable</chdesc></chrow>
-</choicetable>
-<info><note type="tip">When the <ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment
+end of the PATH environment variable.</p></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<note type="tip">When the <ph conref="../conrefs.dita#prod/productinstallpath"></ph> environment
 variable is set and the underlying <codeph>/bin</codeph> directory is included
 in the PATH environment variable, you can use shortened commands to start
 the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools. Otherwise,
 either you must be in the directory where the script that starts the <ph conref="../conrefs.dita#prod/productshortname"></ph> tool
 is located, or you must specify the full path to the location of the script
-when you want to start the tool.</note></info></step>
+when you want to start the tool.</note>
+</info></step>
 </steps>
 <postreq>For more information on the scripts included in the <i>bin</i> distribution,
 see <xref href="rgslib27507.dita#rgslib27507"></xref>.</postreq>

Modified: db/derby/docs/branches/10.8/src/getstart/tgssetupverify.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/tgssetupverify.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/tgssetupverify.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/tgssetupverify.dita Fri Apr 29 17:10:24 2011
@@ -56,9 +56,14 @@ you installed <ph conref="../conrefs.dit
 the /opt/<ph conref="../conrefs.dita#prod/productinstallname"></ph> directory
 on UNIX or the c:\<ph conref="../conrefs.dita#prod/productinstallname"></ph> directory
 on Windows, the command that you use and the expected output are shown in
-the following table:</info><stepxmp><table>
-<tgroup cols="3"><colspec colname="col1"/><colspec colname="col2"/><colspec
-colname="col3"/>
+the following table.</info><stepxmp>
+<table>
+<title>Verifying the
+<ph conref="../conrefs.dita#prod/productinstallpath"></ph> setting</title>
+<tgroup cols="3" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="34*"/>
+<colspec colname="col2" colnum="2" colwidth="33*"/>
+<colspec colname="col3" colnum="3" colwidth="33*"/>
 <thead>
 <row valign="bottom">
 <entry colname="col1">Operating System</entry>

Modified: db/derby/docs/branches/10.8/src/getstart/twwdactivity1.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/twwdactivity1.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/twwdactivity1.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/twwdactivity1.dita Fri Apr 29 17:10:24 2011
@@ -35,26 +35,36 @@ error</indexterm></indexterm><indexterm>
 <taskbody>
 <steps>
 <step><cmd>Run the  <ph conref="../conrefs.dita#prod/productshortname"></ph>&nbsp;<codeph>ij</codeph> 
-tool. </cmd><stepxmp>If you included the <codeph>DERBY_HOME/bin</codeph> directory
+tool. </cmd><stepxmp><p>If you included the <codeph>DERBY_HOME/bin</codeph> directory
 in your PATH environment variable, type: <codeblock>ij</codeblock> Otherwise,
-you can use the java command to start the <codeph>ij</codeph> tool.<simpletable
-relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar ij</userinput></b>
-<systemoutput>ij version @RELEASE_ID_SHORT@</systemoutput></codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar ij</userinput></b>
-<systemoutput>ij version @RELEASE_ID_SHORT@</systemoutput></codeblock></stentry>
-</strow>
-</simpletable></stepxmp></step>
+you can use the <codeph>java</codeph> command to start the <codeph>ij</codeph>
+tool, as shown in the following table.</p>
+<table>
+<title>Command to start the <codeph>ij</codeph> tool</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar ij</userinput></b>
+<systemoutput>ij version @RELEASE_ID_SHORT@</systemoutput></codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar ij</userinput></b>
+<systemoutput>ij version @RELEASE_ID_SHORT@</systemoutput></codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</stepxmp></step>
 <step><cmd>Create the database and open a connection to the database using
 the embedded driver.</cmd><stepxmp><codeblock><b><userinput>CONNECT 'jdbc:derby:firstdb;create=true';</userinput></b></codeblock></stepxmp>
 <info> <dl><dlentry>
@@ -141,8 +151,8 @@ ij> insert into COUNTRIES values ( 'Alba
 <stepxmp><ul>
 <li>The <codeph>derby.log</codeph> file. This file is a message and error
 log that, under normal circumstances, contains a set of startup messages and
-a shutdown message. <codeblock><systemoutput>
-----------------------------------------------------------------
+a shutdown message.
+<codeblock><systemoutput>----------------------------------------------------------------
 Wed Mar 02 17:06:58 EST 2011:
 Booting Derby version The Apache Software Foundation - Apache 
   Derby - 10.8.0.0 - (1076370): 

Modified: db/derby/docs/branches/10.8/src/getstart/twwdactivity1_Setup.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/twwdactivity1_Setup.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/twwdactivity1_Setup.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/twwdactivity1_Setup.dita Fri Apr 29 17:10:24 2011
@@ -33,74 +33,121 @@ If an error occurs, verify the syntax an
 <step><cmd>Open a command window and change to a directory where you want
 to store the files that you create during the self-study tutorial activities.</cmd>
 </step>
-<step><cmd>Create the <codeph>DERBYTUTOR</codeph> directory. <codeph>DERBYTUTOR</codeph> will
-be your working directory for this activity.</cmd><stepxmp><simpletable relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>mkdir DERBYTUTOR</userinput></b></codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>md DERBYTUTOR</userinput></b></codeblock></stentry>
-</strow>
-</simpletable></stepxmp></step>
-<step><cmd>Change to the <codeph>DERBYTUTOR</codeph> directory.</cmd><stepxmp><simpletable
-relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>cd DERBYTUTOR</userinput></b></codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>cd DERBYTUTOR</userinput></b></codeblock></stentry>
-</strow>
-</simpletable></stepxmp></step>
-<step><cmd>Copy the SQL scripts from the <ph conref="../conrefs.dita#prod/productshortname"></ph>&nbsp; <codeph>demo\programs\toursdb</codeph> subdirectory
-into the  <codeph>DERBYTUTOR</codeph> directory. You will use these scripts
-to create tables and add data to a new database, <codeph>toursdb</codeph>.</cmd>
-<stepxmp><simpletable relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>cp $DERBY_HOME/demo/programs/toursdb/*.sql .</userinput></b></codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>copy %DERBY_HOME%\demo\programs\toursdb\*.sql .</userinput></b></codeblock></stentry>
-</strow>
-</simpletable></stepxmp></step>
-<step><cmd>Verify that the files were copied to the <codeph>DERBYTUTOR</codeph> directory.</cmd>
-<stepxmp><simpletable relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>ls DERBYTUTOR</userinput></b></codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>dir DERBYTUTOR</userinput></b></codeblock></stentry>
-</strow>
-</simpletable><note type="important">Include the dot (<codeph>.</codeph>)
-at the end of each command so that your current working directory is included
-in the classpath and the files are copied to the correct location. </note></stepxmp>
+<step><cmd>Create the <codeph>DERBYTUTOR</codeph> directory, as shown in the
+following table. <codeph>DERBYTUTOR</codeph> will be your working directory for
+this activity.</cmd>
+<stepxmp>
+<table>
+<title>Command to create the <codeph>DERBYTUTOR</codeph> directory</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>mkdir DERBYTUTOR</userinput></b></codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>md DERBYTUTOR</userinput></b></codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</stepxmp></step>
+<step><cmd>Change to the <codeph>DERBYTUTOR</codeph> directory, as shown in the
+following table.</cmd><stepxmp>
+<table>
+<title>Command to change to the <codeph>DERBYTUTOR</codeph> directory</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>cd DERBYTUTOR</userinput></b></codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>cd DERBYTUTOR</userinput></b></codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</stepxmp></step>
+<step><cmd>Copy the SQL scripts from the
+<ph conref="../conrefs.dita#prod/productshortname"></ph>&nbsp;
+<codeph>demo\programs\toursdb</codeph> subdirectory into the
+<codeph>DERBYTUTOR</codeph> directory, as shown in the following table. You will
+use these scripts to create tables and add data to a new database,
+<codeph>toursdb</codeph>.</cmd>
+<stepxmp>
+<table>
+<title>Command to copy the SQL scripts</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>cp $DERBY_HOME/demo/programs/toursdb/*.sql .</userinput></b></codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>copy %DERBY_HOME%\demo\programs\toursdb\*.sql .</userinput></b></codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<note type="important">Include the dot (<codeph>.</codeph>) at the end of the
+command so that the files are copied to the correct location.</note>
+</stepxmp>
+</step>
+<step><cmd>Verify that the files were copied to the <codeph>DERBYTUTOR</codeph>
+directory, as shown in the following table.</cmd>
+<stepxmp>
+<table>
+<title>Command to verify that the files were copied</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>ls DERBYTUTOR</userinput></b></codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>dir DERBYTUTOR</userinput></b></codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</stepxmp>
 </step>
 </steps>
 </taskbody>

Modified: db/derby/docs/branches/10.8/src/getstart/twwdactivity2.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/twwdactivity2.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/twwdactivity2.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/twwdactivity2.dita Fri Apr 29 17:10:24 2011
@@ -40,54 +40,75 @@ perform some basic SQL operations.</p></
 <steps>
 <step><cmd>Open a command window (Shell-1) and change to the <codeph>DERBYTUTOR</codeph> directory.</cmd>
 </step>
-<step><cmd>Start the Network Server.</cmd><stepxmp><simpletable relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server start</userinput></b>
+<step><cmd>Start the Network Server, as shown in the following table.</cmd><stepxmp>
+<table>
+<title>Command to start the Network Server</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server start</userinput></b>
 <systemoutput>Wed Mar 02 17:25:26 EST 2011 : Security manager
  installed using the Basic server security policy.
-Wed Mar 02 17:25:27 EST 2011 : Apache Derby Network
- Server - 10.8.0.0 - (1076370) started and ready to
- accept connections on port 1527</systemoutput></codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server start</userinput></b>
+Wed Mar 02 17:25:27 EST 2011 : Apache Derby
+ Network Server - 10.8.0.0 - (1076370) started and
+ ready to accept connections on port 1527</systemoutput></codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server start</userinput></b>
 <systemoutput>Wed Mar 02 17:25:26 EST 2011 : Security manager
  installed using the Basic server security policy.
-Wed Mar 02 17:25:27 EST 2011 : Apache Derby Network
- Server - 10.8.0.0 - (1076370) started and ready to
- accept connections on port 1527</systemoutput></codeblock></stentry>
-</strow>
-</simpletable></stepxmp><stepresult>A Network Server startup message appears
+Wed Mar 02 17:25:27 EST 2011 : Apache Derby
+ Network Server - 10.8.0.0 - (1076370) started and
+ ready to accept connections on port 1527</systemoutput></codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</stepxmp><stepresult>A Network Server startup message appears
 in the Shell-1 command  window.</stepresult></step>
 <step><cmd>Open another command window (Shell-2). Change to the <codeph>DERBYTUTOR</codeph> directory.</cmd>
 </step>
-<step><cmd>Start <codeph>ij</codeph>.</cmd><stepxmp>If you included the <codeph>DERBY_HOME/bin</codeph> directory
-in your PATH environment variable, type: <codeblock>ij</codeblock> Otherwise,
-you can use the <codeph>java</codeph> command to start the <codeph>ij</codeph> tool. <simpletable
-relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar ij</userinput></b>
-<systemoutput>ij version @RELEASE_ID_SHORT@</systemoutput></codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar ij</userinput></b>
-<systemoutput>ij version @RELEASE_ID_SHORT@</systemoutput></codeblock></stentry>
-</strow>
-</simpletable></stepxmp><stepresult>You will enter all subsequent commands
+<step><cmd>Start <codeph>ij</codeph>.</cmd><stepxmp><p>If you included the
+<codeph>DERBY_HOME/bin</codeph> directory in your PATH environment variable,
+type: <codeblock>ij</codeblock> Otherwise, you can use the
+<codeph>java</codeph> command to start the <codeph>ij</codeph> tool, as shown in
+the following table.</p>
+<table>
+<title>Command to start the <codeph>ij</codeph> tool</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar ij</userinput></b>
+<systemoutput>ij version @RELEASE_ID_SHORT@</systemoutput></codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar ij</userinput></b>
+<systemoutput>ij version @RELEASE_ID_SHORT@</systemoutput></codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</stepxmp><stepresult>You will enter all subsequent commands
 from the network client, so you will type the commands in the Shell-2 command
 window.</stepresult></step>
 <step><cmd>Create and open a connection to the database using the client driver.</cmd>
@@ -123,25 +144,35 @@ SQL statement:</cmd><stepxmp><codeblock>
 <step><cmd>Exit <codeph>ij</codeph>.</cmd><stepxmp><codeblock><b><userinput>exit;</userinput></b></codeblock></stepxmp>
 </step>
 <step><cmd>Shut down the  <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Server.</cmd><stepxmp><simpletable relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server shutdown</userinput></b>
-<systemoutput>Wed Mar 02 17:29:44 EST 2011 : Apache Derby Network
- Server - 10.8.0.0 - (1076370) shutdown</systemoutput></codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server shutdown</userinput></b>
-<systemoutput>Wed Mar 02 17:29:44 EST 2011 : Apache Derby Network
- Server - 10.8.0.0 - (1076370) shutdown</systemoutput></codeblock></stentry>
-</strow>
-</simpletable></stepxmp><stepresult>The server shutdown confirmation appears
+Server, as shown in the following table.</cmd><stepxmp>
+<table>
+<title>Command to shut down the Network Server</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server shutdown</userinput></b>
+<systemoutput>Wed Mar 02 17:29:44 EST 2011 : Apache Derby
+ Network Server - 10.8.0.0 - (1076370) shutdown</systemoutput></codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server shutdown</userinput></b>
+<systemoutput>Wed Mar 02 17:29:44 EST 2011 : Apache Derby
+ Network Server - 10.8.0.0 - (1076370) shutdown</systemoutput></codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</stepxmp><stepresult>The server shutdown confirmation appears
 in both command windows.</stepresult></step>
 </steps>
 <postreq><b>Activity notes</b> <p>The client connection URL contains network

Modified: db/derby/docs/branches/10.8/src/getstart/twwdactivity3_Setup.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/twwdactivity3_Setup.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/twwdactivity3_Setup.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/twwdactivity3_Setup.dita Fri Apr 29 17:10:24 2011
@@ -42,37 +42,47 @@ other Java  applications. Before perform
 the classpath and compile the <codeph>WwdEmbedded.java</codeph> program.</p></context>
 <steps>
 <step><cmd>Copy the program files into the <codeph>DERBYTUTOR</codeph> directory
-and set the CLASSPATH environment variable.</cmd><stepxmp><simpletable relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Commands</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>cp $DERBY_HOME/demo/programs/workingwithderby/* .
+and set the <codeph>CLASSPATH</codeph> environment variable, as shown in the
+following table.</cmd><stepxmp>
+<table>
+<title>Commands to copy the program files and set the <codeph>CLASSPATH</codeph>
+environment variable</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>cp $DERBY_HOME/demo/programs/workingwithderby/* .
 
-export CLASSPATH=$DERBY_HOME/lib/derby.jar:.</userinput></b>
-</codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>copy %DERBY_HOME%\demo\programs\workingwithderby\* .
+export CLASSPATH=$DERBY_HOME/lib/derby.jar:.</userinput></b></codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>copy %DERBY_HOME%\demo\programs\workingwithderby\* .
 
-set CLASSPATH=%DERBY_HOME%\lib\derby.jar;.</userinput></b>
-</codeblock></stentry>
-</strow>
-</simpletable> <note type="important">Include the dot (<codeph>.</codeph>)
+set CLASSPATH=%DERBY_HOME%\lib\derby.jar;.</userinput></b></codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<note type="important">Include the dot (<codeph>.</codeph>)
 at the end of each command so that your current working directory is included
 in the classpath and the files are copied to the correct location. </note></stepxmp>
 </step>
 <step><cmd>Compile the program source files.</cmd>
-    <info> The sample program is contained in two source files:
-        <codeph>WwdEmbedded.java</codeph> and <codeph>WwdUtils.java</codeph>.
-        Issue the following command to compile both at the same time:</info>
-    <stepxmp><codeblock>
-            <b><userinput>javac WwdEmbedded.java WwdUtils.java</userinput></b>
-</codeblock> <note type="important">A command prompt appears if the compilation
+<info> The sample program is contained in two source files:
+<codeph>WwdEmbedded.java</codeph> and <codeph>WwdUtils.java</codeph>.
+Issue the following command to compile both at the same time:</info>
+<stepxmp>
+<codeblock><b><userinput>javac WwdEmbedded.java WwdUtils.java</userinput></b></codeblock>
+<note type="important">A command prompt appears if the compilation
 is successful. The binary files <codeph>WwdEmbedded.class</codeph> and
 <codeph>WwdUtils.class</codeph> are created.
 If an error message appears, verify that the JDK is properly installed.</note> </stepxmp>

Modified: db/derby/docs/branches/10.8/src/getstart/twwdactivity4.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/getstart/twwdactivity4.dita?rev=1097890&r1=1097889&r2=1097890&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/getstart/twwdactivity4.dita (original)
+++ db/derby/docs/branches/10.8/src/getstart/twwdactivity4.dita Fri Apr 29 17:10:24 2011
@@ -38,7 +38,7 @@ and experience starting and connecting t
 You will need to use a text editor to create the <codeph>WwdClient.java</codeph> 
 program.</prereq>
 <context><note>As a convenience, the <codeph>workingwithderby</codeph>
-    directory contains a program <codeph>WwdClientExample.java</codeph>
+    directory contains a program, <codeph>WwdClientExample.java</codeph>,
     which has already been edited in the appropriate manner. You can use
     this program directly as it is, or you can compare the contents of this
     program to the <codeph>WwdClient.java</codeph> program that you will
@@ -60,21 +60,31 @@ variable in the Client-Shell to support 
 <substep><cmd>Change to the  <codeph>DERBYTUTOR</codeph> directory.</cmd>
 </substep>
 <substep><cmd>Make a copy of the <codeph>WwdEmbedded.java</codeph> program
-called <codeph>WwdClient.java</codeph>.</cmd><stepxmp> <simpletable relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>cp WwdEmbedded.java WwdClient.java</userinput></b></codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>copy WwdEmbedded.java WwdClient.java</userinput></b></codeblock></stentry>
-</strow>
-</simpletable> </stepxmp></substep>
+called <codeph>WwdClient.java</codeph>, as shown in the following table.</cmd><stepxmp>
+<table>
+<title>Command to copy the program</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>cp WwdEmbedded.java WwdClient.java</userinput></b></codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>copy WwdEmbedded.java WwdClient.java</userinput></b></codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</stepxmp></substep>
 <substep><cmd>Open the <codeph>WwdClient.java</codeph> file in a text editor
 and update the class name to reflect the new file name:</cmd><stepxmp><codeblock><b>Original declaration</b>
      public class WwdEmbedded
@@ -112,31 +122,43 @@ performed successfully.) </stepresult></
 <substep><cmd>Open a command window (Server-Shell).</cmd></substep>
 <substep><cmd>Change to the <codeph>DERBYTUTOR</codeph>  directory.</cmd>
 </substep>
-<substep><cmd>Start the Network Server:</cmd><stepxmp> <simpletable relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server start</userinput></b>
-Wed Mar 02 17:45:31 EST 2011 : Security manager
- installed using the Basic server security policy.
+<substep><cmd>Start the Network Server, as shown in the following table.</cmd><stepxmp>
+<table>
+<title>Command to start the Network Server</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server start</userinput></b>
+Wed Mar 02 17:45:31 EST 2011 : Security
+ manager installed using the Basic server
+ security policy.
 Wed Mar 02 17:45:32 EST 2011 : Apache Derby
- Network Server - 10.8.0.0 - (1076370) started and
- ready to accept connections on port 1527</codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server start</userinput></b>
-Wed Mar 02 17:45:31 EST 2011 : Security manager
- installed using the Basic server security policy.
+ Network Server - 10.8.0.0 - (1076370) started
+ and ready to accept connections on port 1527</codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server start</userinput></b>
+Wed Mar 02 17:45:31 EST 2011 : Security
+ manager installed using the Basic server
+ security policy.
 Wed Mar 02 17:45:32 EST 2011 : Apache Derby 
- Network Server - 10.8.0.0 - (1076370) started and
- ready to accept connections on port 1527</codeblock></stentry>
-</strow>
-</simpletable> </stepxmp></substep>
+ Network Server - 10.8.0.0 - (1076370) started
+ and ready to accept connections on port 1527</codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</stepxmp></substep>
 </substeps>
 </step>
 <step><cmd>Run the client program using the following steps:</cmd>
@@ -144,22 +166,36 @@ Wed Mar 02 17:45:32 EST 2011 : Apache De
 <substep><cmd>Return to the Client-Shell window.</cmd></substep>
 <substep><cmd>Set the <codeph>CLASSPATH</codeph> environment
 variable to include the  location of the file <codeph>derbyclient.jar</codeph>
-(not <codeph>derby.jar</codeph> as in the embedded example):</cmd>
-<stepxmp> <simpletable relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>export CLASSPATH=$DERBY_HOME/lib/derbyclient.jar:.</userinput></b></codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>set CLASSPATH=%DERBY_HOME%\lib\derbyclient.jar;.</userinput></b></codeblock></stentry>
-</strow>
-</simpletable> <note type="important">Include the dot (<codeph>.</codeph>)
+(not <codeph>derby.jar</codeph> as in the embedded example), as shown in the
+following table.</cmd>
+<stepxmp>
+<table>
+<title>Command to set the <codeph>CLASSPATH</codeph> environment
+variable</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>export CLASSPATH=$DERBY_HOME/lib/derbyclient.jar:.</userinput></b></codeblock>
+</entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>set CLASSPATH=%DERBY_HOME%\lib\derbyclient.jar;.</userinput></b></codeblock>
+</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<note type="important">Include the dot (<codeph>.</codeph>)
 at the end of the  command so that your current working directory is included
 in the classpath. </note> </stepxmp></substep>
 <substep><cmd>Run the program:</cmd><stepxmp> <codeblock><b><userinput>java WwdClient</userinput></b>
@@ -187,27 +223,36 @@ Getting Started With Derby JDBC program 
 </substep>
 </substeps>
 </step>
-<step><cmd>Shut down the Network Server:</cmd><stepxmp> <simpletable relcolwidth="1* 4*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry><lines>UNIX
-(Korn Shell)</lines></stentry>
-<stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server shutdown</userinput></b>
-<systemoutput>Wed Mar 02 17:48:54 EST 2011 : Apache Derby Network
- Server - 10.8.0.0 - (1076370)  shutdown</systemoutput>
-</codeblock></stentry>
-</strow>
-<strow>
-<stentry><lines>Windows</lines></stentry>
-<stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server shutdown</userinput></b>
-<systemoutput>Wed Mar 02 17:48:54 EST 2011 : Apache Derby Network
- Server - 10.8.0.0 - (1076370)  shutdown</systemoutput>
-</codeblock></stentry>
-</strow>
-</simpletable> </stepxmp><stepresult>The server shutdown confirmation appears
+<step><cmd>Shut down the Network Server, as shown in the following table.</cmd>
+<stepxmp>
+<table>
+<title>Command to shut down the Network Server</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server shutdown</userinput></b>
+<systemoutput>Wed Mar 02 17:48:54 EST 2011 : Apache Derby
+ Network Server - 10.8.0.0 - (1076370) shutdown</systemoutput></codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server shutdown</userinput></b>
+<systemoutput>Wed Mar 02 17:48:54 EST 2011 : Apache Derby
+ Network Server - 10.8.0.0 - (1076370) shutdown</systemoutput></codeblock></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</stepxmp><stepresult>The server shutdown confirmation appears
 in both command windows.</stepresult></step>
 </steps>
 <postreq><b>Activity notes</b> <p>In a client/server environment, the client