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 rh...@apache.org on 2006/09/15 22:35:50 UTC

svn commit: r446722 [1/3] - in /db/derby/docs/branches/10.2/src: adminguide/ devguide/ getstart/ pt_BR/adminguide/ pt_BR/getstart/ pt_BR/ref/ ref/ tools/ tuning/

Author: rhillegas
Date: Fri Sep 15 13:35:49 2006
New Revision: 446722

URL: http://svn.apache.org/viewvc?view=rev&rev=446722
Log:
DERBY-1725: Merge documentation patches from trunk to 10.2 branch: DERBY-1804 (446543), DERBY-1820 (442769), DERBY-1659 (442496), DERBY-1223 (442401), DERBY-1566 (442381), DERBY-1803 (442374).

Added:
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomrefdescribe.dita
      - copied unchanged from r446544, db/derby/docs/trunk/src/tools/rtoolsijcomrefdescribe.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomrefshow.dita
      - copied unchanged from r446544, db/derby/docs/trunk/src/tools/rtoolsijcomrefshow.dita
Removed:
    db/derby/docs/branches/10.2/src/getstart/cgsmanuallysetting.dita
    db/derby/docs/branches/10.2/src/getstart/tgs36360.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomref17529.dita
Modified:
    db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita
    db/derby/docs/branches/10.2/src/devguide/devconrefs.dita
    db/derby/docs/branches/10.2/src/getstart/cgsinstallingderby.dita
    db/derby/docs/branches/10.2/src/getstart/cgsusingsysinfo.dita
    db/derby/docs/branches/10.2/src/getstart/cgsusingtoolsutils.dita
    db/derby/docs/branches/10.2/src/getstart/getstartderby.ditamap
    db/derby/docs/branches/10.2/src/getstart/gsconrefs.dita
    db/derby/docs/branches/10.2/src/getstart/rgslib27507.dita
    db/derby/docs/branches/10.2/src/getstart/tgs26250.dita
    db/derby/docs/branches/10.2/src/getstart/tgsrunningij.dita
    db/derby/docs/branches/10.2/src/getstart/tgssetupjavaenvir.dita
    db/derby/docs/branches/10.2/src/pt_BR/adminguide/adminconrefs.dita
    db/derby/docs/branches/10.2/src/pt_BR/getstart/gsconrefs.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/refconrefs.dita
    db/derby/docs/branches/10.2/src/ref/refconrefs.dita
    db/derby/docs/branches/10.2/src/ref/rrefbackupdbenablelognowaitproc.dita
    db/derby/docs/branches/10.2/src/ref/rrefbackupdbenablelogproc.dita
    db/derby/docs/branches/10.2/src/ref/rrefbackupdbnowaitproc.dita
    db/derby/docs/branches/10.2/src/ref/rrefbackupdbproc.dita
    db/derby/docs/branches/10.2/src/ref/rrefdatefunc.dita
    db/derby/docs/branches/10.2/src/ref/rrefdttlimits.dita
    db/derby/docs/branches/10.2/src/ref/rrefexcept71493.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj33562.dita
    db/derby/docs/branches/10.2/src/tools/derbytools.ditamap
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomref39198.dita
    db/derby/docs/branches/10.2/src/tuning/tunconrefs.dita

Modified: db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
+ "../dtd/ditabase.dtd">
 <!--  
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -14,10 +17,7 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
 See the License for the specific language governing permissions and  
 limitations under the License.
---> 
-<!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
- "../dtd/ditabase.dtd">
-
+-->
 <dita>
 <concept id="prod" xml:lang="en-us">
 <title>Product specific entities</title>
@@ -29,7 +29,7 @@
 <p><ph id="productshortname">Derby</ph></p>
 <p><ph id="productlongname">Apache Derby</ph></p>
 <p><ph id="productinstallname">Derby_10</ph></p>
-<p><ph id="productinstallpath">DERBY_INSTALL</ph></p>
+<p><ph id="productinstallpath">DERBY_HOME</ph></p>
 <p><ph id="productlowercase">derby</ph></p>
 </conbody>
 </concept>
@@ -56,4 +56,3 @@
 </conbody>
 </concept>
 </dita>
-

Modified: db/derby/docs/branches/10.2/src/devguide/devconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/devconrefs.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/devconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/devconrefs.dita Fri Sep 15 13:35:49 2006
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
  "../dtd/ditabase.dtd">
-
 <!--  
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +18,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
 <dita>
 <concept id="prod" xml:lang="en-us">
 <title>Product specific entities</title>
@@ -31,7 +29,7 @@
 <p><ph id="productshortname">Derby</ph></p>
 <p><ph id="productlongname">Apache Derby</ph></p>
 <p><ph id="productinstallname">Derby_10</ph></p>
-<p><ph id="productinstallpath">DERBY_INSTALL</ph></p>
+<p><ph id="productinstallpath">DERBY_HOME</ph></p>
 <p><ph id="productlowercase">derby</ph></p>
 </conbody>
 </concept>
@@ -59,4 +57,3 @@
 </conbody>
 </concept>
 </dita>
-

Modified: db/derby/docs/branches/10.2/src/getstart/cgsinstallingderby.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/cgsinstallingderby.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/cgsinstallingderby.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/cgsinstallingderby.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!--  
@@ -19,28 +20,45 @@
 -->
 <concept id="cgsinstallingderby" xml:lang="en-us">
 <title>Installing Derby</title>
-<shortdesc>In order to install <ph conref="gsconrefs.dita#prod/productshortname"></ph> you
+<shortdesc>To install <ph conref="gsconrefs.dita#prod/productshortname"></ph> you
 must first download the <ph conref="gsconrefs.dita#prod/productshortname"></ph> zip
 or tar archive from the <ph conref="gsconrefs.dita#prod/productshortname"></ph> Web
 site.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>Derby<indexterm>installing</indexterm></indexterm><indexterm>install<indexterm>Derby</indexterm></indexterm>
+<indexterm>distributions<indexterm>bin</indexterm></indexterm><indexterm>distributions<indexterm>lib</indexterm></indexterm>
+<indexterm>distributions<indexterm>lib-debug</indexterm><indexterm>distributions<indexterm>src</indexterm></indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <conbody>
-<p> Navigate your Web browser to <xref format="html" href="http://db.apache.org/derby/derby_downloads.html"><ph
+<p>Navigate your Web browser to <xref format="html" href="http://db.apache.org/derby/derby_downloads.html"><ph
 conref="gsconrefs.dita#paths/pathdownload"></ph></xref>. This downloads page
 provides several distributions of <ph conref="gsconrefs.dita#prod/productshortname"></ph>,
-including snapshot packages as well as stable-version binary distributions.
-You will also find information on accessing the active source distributions
-for <ph conref="gsconrefs.dita#prod/productshortname"></ph>. The distributions
-come in <i>bin</i>, <i>lib</i> and <i>src</i> packages. This guide assumes
-that you have downloaded the <i>bin</i> distribution package.</p>
+including prerelease snapshots as well as stable-version binary distributions.
+You will also find information on how to use the Subversion version control
+system to access the <ph conref="gsconrefs.dita#prod/productshortname"></ph> source
+code that is currently in development.</p>
+<p>The distributions are: <ul>
+<li>The <i>bin</i> distribution contains scripts, demonstration programs,
+and documentation. The optimized jar files are available in the <i>lib</i> distribution. </li>
+<li>The <i>lib</i> distribution contains an optimized, small footprint set
+of the Derby jar files for deployment. </li>
+<li>The <i>lib-debug</i> distribution contains a larger footprint set of the
+Derby jar files that are useful for debugging or reporting issues.</li>
+<li>The <i>src</i> distribution contains the source files that are used to
+create the <i>bin</i>, <i>lib</i>, and <i>lib-debug</i> distributions.</li>
+</ul></p>
+<p>This guide assumes that you have downloaded the <i>bin</i> distribution.</p>
 <p>Extract the downloaded package. The extracted installation contains several
 subdirectories:<ul>
-<li>The <codeph>demo</codeph> subdirectory contains demonstration programs.</li>
-<li>The <codeph>frameworks</codeph> subdirectory contains scripts for executing
+<li>The <filepath>demo</filepath> subdirectory contains the demonstration
+programs.</li>
+<li>The <filepath>bin</filepath> subdirectory contains the scripts for executing
 utilities and setting up the environment.</li>
-<li>The <codeph>javadoc</codeph> subdirectory contains the <codeph>api</codeph> documentation
+<li>The <filepath>javadoc</filepath> subdirectory contains the <codeph>api</codeph> documentation
 that was generated from source code comments.</li>
-<li>The <codeph>doc</codeph> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation.</li>
-<li>The <codeph>lib</codeph> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> jar
+<li>The <filepath>doc</filepath> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation.</li>
+<li>The <filepath>lib</filepath> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> jar
 files.</li>
 </ul></p>
 </conbody>

Modified: db/derby/docs/branches/10.2/src/getstart/cgsusingsysinfo.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/cgsusingsysinfo.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/cgsusingsysinfo.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/cgsusingsysinfo.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!--  
@@ -18,14 +19,20 @@
 limitations under the License.
 -->
 <concept id="cgsusingsysinfo" xml:lang="en-us">
-<title>Using sysinfo</title>
-<shortdesc><ph conref="gsconrefs.dita#prod/productshortname"></ph>'s sysinfo
-tool displays information about your Java environment and your version of <ph
-conref="gsconrefs.dita#prod/productshortname"></ph>.</shortdesc>
+<title>Using the sysinfo tool</title>
+<shortdesc>The <ph conref="gsconrefs.dita#prod/productshortname"></ph> <cmdname>sysinfo</cmdname> tool
+displays information about your Java environment and your version of <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm><indexterm>Derby</indexterm>tools, sysinfo</indexterm>
+<indexterm><indexterm>sysinfo tool</indexterm>running</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>The sysinfo script sets the appropriate environment variables, including
-the classpath, and executes the sysinfo program. Once you have the /bin directory
-in your PATH, run sysinfo by entering the following in a command window: </p>
-<codeblock>sysinfo</codeblock>
+<p> After you add the <ph conref="gsconrefs.dita#prod/productinstallpath"></ph><filepath>/bin</filepath> directory
+to your PATH environment variable, run the <cmdname>sysinfo</cmdname> tool.
+The <cmdname>sysinfo</cmdname> script sets the appropriate environment variables,
+including the classpath, and runs the <cmdname>sysinfo</cmdname> tool. To
+run the <cmdname>sysinfo</cmdname> tool, issue the following command in a
+command window: <codeblock>sysinfo</codeblock></p>
+<p></p>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.2/src/getstart/cgsusingtoolsutils.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/cgsusingtoolsutils.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/cgsusingtoolsutils.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/cgsusingtoolsutils.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!--  
@@ -18,35 +19,42 @@
 limitations under the License.
 -->
 <concept id="cgsusingtoolsutils" xml:lang="en-us">
-<title>Using the tools and startup utilities</title>
-<shortdesc><ph conref="gsconrefs.dita#prod/productshortname"></ph> tools include
-dblook, ij, and sysinfo. <ph conref="gsconrefs.dita#prod/productshortname"></ph> utilities
-include the import, export and database class utilities.</shortdesc>
+<title>Using the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools
+and startup utilities</title>
+<shortdesc>There are several tools and utilities that you might want to use
+as you begin to work with <ph conref="gsconrefs.dita#prod/productshortname"></ph>. </shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Tools and utilities</indexterm></keywords>
+<keywords><indexterm>Derby<indexterm>scripts, using</indexterm></indexterm>
+<indexterm>Derby<indexterm>tools, using</indexterm></indexterm><indexterm>tools<indexterm>in
+Derby</indexterm></indexterm><indexterm>scripts<indexterm>in Derby</indexterm></indexterm>
+</keywords>
 </metadata></prolog>
 <conbody>
-<p>The /frameworks/embedded/bin directory contains scripts for running some
-of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools and utilities
-in embedded mode. You can find similar scripts for running tools and utilities
-for the Network Server in the /frameworks/NetworkServer/bin directory. In
-discussion of these tools and utilities in embedded mode, the /frameworks/embedded/bin
-directory is referred to as the /bin directory unless stated otherwise.</p>
-<p>The scripts have descriptive names such as <codeph>sysinfo.bat</codeph> or <codeph>ij.ksh</codeph>.
-Like the classpath scripts, these scripts end with different extensions depending
-on your environment. Windows scripts have a .bat extension, while Unix scripts
-have a .ksh extension. You might need to modify these scripts in order for
-the tools and utilities to run properly on Windows and Unix platforms.</p>
-<p>The following information applies <i>only</i> to UNIX platforms.</p>
-<p>In order to use the script files to run the tools and utilities, do the
-following: </p>
-<ol>
-<li>Turn on the execute bit for the script files. For example:<codeblock>chmod +x <i>fileName</i></codeblock><p>where <i>fileName</i> is
-any script file with a .ksh extension. This tells the system to execute the
-commands in the script every time you use it. </p></li>
-<li>Add the /bin directory to your PATH variable. This allows you to use shortened
-commands to start the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools.</li>
-</ol>
-<p>For more information on scripts, see <xref href="rgslib27507.dita#rgslib27507"></xref>.</p>
+<p>The tools that are included with <ph conref="gsconrefs.dita#prod/productshortname"></ph> are <cmdname>dblook</cmdname>, <cmdname>ij</cmdname>,
+and <cmdname>sysinfo</cmdname>. You can use the <ph conref="gsconrefs.dita#prod/productshortname"></ph> scripts
+to start the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools.</p>
+<p>There are Derby utilities that are system procedures that you can call
+by using the <cmdname>ij</cmdname> tool. . For example, there are system procedures
+that you can use to import and export external files. Instructions on how
+to use these system procedures are included in the <cite><ph conref="gsconrefs.dita#pub/citutilities"></ph></cite> and
+the <cite><ph conref="gsconrefs.dita#pub/citref"></ph></cite>.</p>
+<p>The scripts that run these tools are in the <ph conref="gsconrefs.dita#prod/productinstallpath"></ph><filepath>/bin</filepath> directory.
+These scripts also help you set up your classpath.</p>
+<p>The scripts in <ph conref="gsconrefs.dita#prod/productinstallpath"></ph><filepath>/bin</filepath> directory
+are setup to run in the embedded mode. To run these tools with the Network
+Server, use the following commands: <ul>
+<li>For the <cmdname>dblook</cmdname> tool, call the script and specify the
+-d option and the full URL to the Network Server database. For example: <codeph>dblook
+-d 'jdbc:derby://localhost/myDB;user=usr;'</codeph> </li>
+<li>For the <cmdname>ij</cmdname> tool, issue the command <codeph>set DERBY_OPTS=-Dij.protocol=jdbc:derby://localhost/</codeph> and
+then start <cmdname>ij</cmdname> by issuing the command <codeph>ij</codeph>.</li>
+<li>For the <cmdname>sysinfo</cmdname> tool, issue the command <codeph>NetworkServerControl
+sysinfo</codeph>.</li>
+</ul></p>
+<p>To show how to use the <ph conref="gsconrefs.dita#prod/productshortname"></ph> scripts
+to launch the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools,
+the examples in the <cite><ph conref="gsconrefs.dita#pub/citgetstart"></ph></cite> assume
+that you are using the embedded mode of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> database
+engine.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.2/src/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/getstartderby.ditamap?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/getstartderby.ditamap (original)
+++ db/derby/docs/branches/10.2/src/getstart/getstartderby.ditamap Fri Sep 15 13:35:49 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
  "../dtd/map.dtd">
 <!--  
@@ -35,7 +36,7 @@
 </relcell>
 <relcell>
 <topicref href="cgsintsr.dita" navtitle="System requirements"></topicref>
-<topicref collection-type="family" href="cgsinsta.dita" navtitle="Installing and working with Derby">
+<topicref href="cgsinsta.dita" navtitle="Installing and working with Derby">
 </topicref>
 </relcell>
 </relrow>
@@ -60,29 +61,47 @@
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cgsusingsysinfo.dita" navtitle="Using sysinfo"></topicref>
+<topicref href="tgssetupjavaenvir.dita" navtitle=" Setting up your Java environment">
+</topicref>
 </relcell>
 <relcell>
-<topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
+<topicref href="cgsusingtoolsutils.dita" navtitle="Using the Derby tools and startup utilities">
+</topicref>
+<topicref href="tgs26250.dita" navtitle="Manually setting the classpath">
+</topicref>
 </relcell>
 </relrow>
 <relrow>
 <relcell>
-<topicref href="tgssetupjavaenvir.dita" navtitle=" Setting up your Java environment">
+<topicref href="cgsusingtoolsutils.dita" navtitle="Using the Derby tools and startup utilities">
 </topicref>
 </relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
 <relcell>
-<topicref href="cgsmanuallysetting.dita" navtitle="Manually setting environment variables and paths ">
-</topicref>
+<topicref href="cgsusingsysinfo.dita" navtitle="Using the sysinfo tool"></topicref>
+</relcell>
+<relcell>
+<topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
+<topicref href="tgs26250.dita" navtitle="Setting the classpath"></topicref>
 </relcell>
 </relrow>
 <relrow>
 <relcell>
-<topicref href="tgs36360.dita" navtitle=" Set the DERBY_INSTALL environment variable">
-</topicref>
+<topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
 </relcell>
 <relcell>
-<topicref href="tgs26250.dita" navtitle=" Set the classpath"></topicref>
+<topicref href="tgs26250.dita" navtitle="Setting the classpath"></topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="tgs26250.dita" navtitle="Setting the classpath"></topicref>
+</relcell>
+<relcell>
+<topicref href="cgsusingsysinfo.dita" navtitle="Using the sysinfo tool"></topicref>
+<topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
 </relcell>
 </relrow>
 <relrow>
@@ -93,7 +112,8 @@
 <relcell>
 <topicref href="rgslib56653.dita" navtitle=" Libraries not provided by Derby">
 </topicref>
-<topicref href="rgslib27507.dita" navtitle="Scripts provided by Derby"></topicref>
+<topicref href="rgslib27507.dita" navtitle="Scripts included with Derby">
+</topicref>
 </relcell>
 </relrow>
 <relrow>
@@ -102,7 +122,8 @@
 </topicref>
 </relcell>
 <relcell>
-<topicref href="rgslib27507.dita" navtitle="Scripts provided by Derby"></topicref>
+<topicref href="rgslib27507.dita" navtitle="Scripts included with Derby">
+</topicref>
 </relcell>
 </relrow>
 </reltable>
@@ -116,14 +137,10 @@
 <topicref href="cgsinstallingderby.dita" navtitle="Installing Derby"></topicref>
 <topicref href="tgssetupjavaenvir.dita" navtitle=" Setting up your Java environment">
 </topicref>
-<topicref href="cgsusingtoolsutils.dita" navtitle="Using the tools and startup utilities">
-<topicref href="cgsusingsysinfo.dita" navtitle="Using sysinfo"></topicref>
+<topicref href="cgsusingtoolsutils.dita" navtitle="Using the Derby tools and startup utilities">
+<topicref href="cgsusingsysinfo.dita" navtitle="Using the sysinfo tool"></topicref>
 <topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
-</topicref>
-<topicref href="cgsmanuallysetting.dita" navtitle="Manually setting environment variables and paths ">
-<topicref href="tgs36360.dita" navtitle=" Set the DERBY_INSTALL environment variable">
-</topicref>
-<topicref href="tgs26250.dita" navtitle=" Set the classpath"></topicref>
+<topicref href="tgs26250.dita" navtitle="Setting the classpath"></topicref>
 </topicref>
 </topicref>
 <topicref href="cgsquck19524.dita" navtitle="Quick start guide for experienced JDBC users">
@@ -144,7 +161,8 @@
 </topicref>
 <topicref href="rgslib56653.dita" navtitle=" Libraries not provided by Derby">
 </topicref>
-<topicref href="rgslib27507.dita" navtitle="Scripts provided by Derby"></topicref>
+<topicref href="rgslib27507.dita" navtitle="Scripts included with Derby">
+</topicref>
 </topicref>
 <topicref href="rgstrademderby.dita" navtitle="Trademarks"></topicref>
 </map>

Modified: db/derby/docs/branches/10.2/src/getstart/gsconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/gsconrefs.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/gsconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/gsconrefs.dita Fri Sep 15 13:35:49 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
  "../dtd/ditabase.dtd">
-
 <!--  
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -29,7 +29,7 @@
 <p><ph id="productshortname">Derby</ph></p>
 <p><ph id="productlongname">Apache Derby</ph></p>
 <p><ph id="productinstallname">Derby_10</ph></p>
-<p><ph id="productinstallpath">DERBY_INSTALL</ph></p>
+<p><ph id="productinstallpath">DERBY_HOME</ph></p>
 <p><ph id="productlowercase">derby</ph></p>
 </conbody>
 </concept>
@@ -62,4 +62,3 @@
 </conbody>
 </concept>
 </dita>
-

Modified: db/derby/docs/branches/10.2/src/getstart/rgslib27507.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/rgslib27507.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/rgslib27507.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/rgslib27507.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!--  
@@ -18,35 +19,43 @@
 limitations under the License.
 -->
 <reference id="rgslib27507" xml:lang="en-us">
-<title>Scripts provided by Derby</title>
-<shortdesc><ph conref="gsconrefs.dita#prod/productshortname"></ph> provides
-scripts in the <i>/bin</i> directory. Each script comes in two flavors, one
-ending in .<i>bat</i> and one ending in .<i>ksh</i>.</shortdesc>
+<title>Scripts included with Derby</title>
+<shortdesc>The <ph conref="gsconrefs.dita#prod/productshortname"></ph> scripts
+are located in the <filepath>/bin</filepath> directory.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>Derby<indexterm>scripts</indexterm></indexterm><indexterm>scripts<indexterm>in
+Derby</indexterm></indexterm><indexterm>dblook script<indexterm>in Derby</indexterm></indexterm>
+<indexterm>ij script<indexterm>in Derby</indexterm></indexterm><indexterm>setEmbeddedCP
+script<indexterm>in Derby</indexterm></indexterm><indexterm>sysinfo script<indexterm>in
+Derby</indexterm></indexterm><indexterm>NetworkServerControl script<indexterm>in
+Derby</indexterm></indexterm><indexterm>setNetworkClientCP script<indexterm>in
+Derby</indexterm></indexterm><indexterm>startNetworkServer script<indexterm>in
+Derby</indexterm></indexterm><indexterm>stopNetworkServer script<indexterm>in
+Derby</indexterm></indexterm><indexterm>scripts<indexterm>dblook</indexterm></indexterm>
+<indexterm>scripts<indexterm>ij</indexterm></indexterm><indexterm>scripts<indexterm>setEmbeddedCP</indexterm></indexterm>
+<indexterm>scripts<indexterm>sysinfo</indexterm></indexterm><indexterm>scripts<indexterm>NetworkServerControl</indexterm></indexterm>
+<indexterm>scripts<indexterm>setNetworkClientCP</indexterm></indexterm><indexterm>scripts<indexterm>startNetworkServer</indexterm></indexterm>
+<indexterm>scripts<indexterm>stopNetworkServer</indexterm></indexterm></keywords>
+</metadata></prolog>
 <refbody>
-<section><p>Here is a complete listing:   <ul>
-<li><i>frameworks/embedded/bin/dblook</i>  <p>Runs dblook.</p></li>
-<li><i>frameworks/embedded/bin/ij</i>   <p>Starts ij.</p></li>
-<li><i>frameworks/embedded/bin/setEmbeddedCP</i>   <p>Puts all the <ph conref="gsconrefs.dita#prod/productshortname"></ph> libraries
+<section><p>The complete list of scripts that are included with Derby are:
+  <ul>
+<li><i>bin/dblook</i>  <p>Runs the <cmdname>dblook</cmdname> tool.</p></li>
+<li><i>bin/ij</i>   <p>Starts the <cmdname>ij</cmdname> tool.</p></li>
+<li><i>bin/NetworkServerControl</i> <p>Runs NetworkServerControl.</p></li>
+<li><i>bin/setEmbeddedCP</i>   <p>Puts all of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> libraries
 for an embedded environment in the classpath.</p></li>
-<li><i>frameworks/embedded/bin/sysinfo</i>   <p>Runs sysinfo.</p></li>
-<li><i>frameworks/NetworkServer/bin/dblook</i> <p>Runs dblook in a Network
-Server client context.</p></li>
-<li><i>frameworks/NetworkServer/bin/ij</i> <p>Runs ij in a Network Server
-client context.</p></li>
-<li><i>frameworks/NetworkServer/bin/NetworkServerControl</i> <p>Runs NetworkServerControl.</p></li>
-<li><i>frameworks/NetworkServer/bin/setNetworkClientCP</i> <p>Puts the libraries
-needed to connect to <ph conref="gsconrefs.dita#prod/productshortname"></ph> Network
-Server into the classpath.</p></li>
-<li><i>frameworks/NetworkServer/bin/setNetworkServerCP</i> <p>Puts the libraries
-needed for <ph conref="gsconrefs.dita#prod/productshortname"></ph> Network
-Server into the classpath.</p></li>
-<li><i>frameworks/NetworkServer/bin/startNetworkServer</i> <p>Starts the Network
-Server on the local machine.</p></li>
-<li><i>frameworks/NetworkServer/bin/stopNetworkServer</i> <p>Stops the Network
-Server on the local machine.</p></li>
-<li><i>frameworks/NetworkServer/bin/sysinfo</i> <p>Gets the system information
-from a running <ph conref="gsconrefs.dita#prod/productshortname"></ph> Network
-Server.</p></li>
+<li><i>bin/setNetworkClientCP</i> <p>Puts the libraries needed to connect
+to the <ph conref="gsconrefs.dita#prod/productshortname"></ph> Network Server
+into the classpath.</p></li>
+<li><i>bin/setNetworkServerCP</i> <p>Puts the libraries needed to start the <ph
+conref="gsconrefs.dita#prod/productshortname"></ph> Network Server into the
+classpath.</p></li>
+<li><i>bin/startNetworkServer</i> <p>Starts the Network Server on the local
+machine.</p></li>
+<li><i>bin/stopNetworkServer</i> <p>Stops the Network Server on the local
+machine.</p></li>
+<li><i>bin/sysinfo</i>   <p>Runs the <cmdname>sysinfo</cmdname> tool.</p></li>
 </ul></p></section>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/getstart/tgs26250.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/tgs26250.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/tgs26250.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/tgs26250.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!--  
@@ -18,43 +19,46 @@
 limitations under the License.
 -->
 <task id="tgs26250" xml:lang="en-us">
-<title> Set the classpath</title>
-<shortdesc>The JVM needs to know the path of every class file needed by your
-application. The classpath is a list of the class libraries needed by the
-JVM and other Java applications to run your program.</shortdesc>
+<title>Setting the classpath</title>
+<shortdesc>The classpath is a list of the class libraries that are needed
+by the JVM and other Java applications to run your program. The scripts that
+are included with Derby set up their own classpath for running the tools.
+However, to call the tools directly using Java and not using the scripts,
+you need to manually set the CLASSPATH environment variable.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Classpath<indexterm>setting</indexterm></indexterm></keywords>
+<keywords><indexterm>classpath<indexterm>setting</indexterm></indexterm><indexterm>environment
+variables<indexterm>CLASSPATH</indexterm></indexterm><indexterm>scripts<indexterm>setEmbeddedCP</indexterm></indexterm>
+<indexterm>scripts<indexterm>setNetworkServerCP</indexterm></indexterm><indexterm>scripts<indexterm>setNetworkClientCP</indexterm></indexterm>
+</keywords>
 </metadata></prolog>
 <taskbody>
 <context><p>You can set the CLASSPATH environment variable in the operating
 system either temporarily, permanently, or at run time when you start your
-Java application and the JVM. If you set the environment variable temporarily,
-you must set it each time that you open a new command window.</p><p>In most
-development environments, it is best to set the operating system's CLASSPATH
-environment variable temporarily. <ph conref="gsconrefs.dita#prod/productshortname"></ph> provides
-some scripts to help you set your classpath this way; they are found in the
-/frameworks/embedded/bin directory or the /frameworks/NetworkServer/bin directory.
-To set the class path temporarily, run a script every time you open a new
-command window. </p></context>
-<steps-unordered>
-<step><cmd>Set your CLASSPATH so that it includes the derby.jar and derbytools.jar
-files.</cmd><stepxmp>For example:<codeblock>set CLASSPATH=%<ph conref="gsconrefs.dita#prod/productinstallpath"></ph>%\lib\derby.jar;
-%<ph conref="gsconrefs.dita#prod/productinstallpath"></ph>%\lib\derbytools.jar;%CLASSPATH%</codeblock></stepxmp>
-</step>
-<step><cmd>To manually run the sysinfo utility, enter the following in a command
-window or shell: </cmd><stepxmp><codeblock>java org.apache.derby.tools.sysinfo</codeblock></stepxmp>
-</step>
-<step><cmd>To manually run the ij utility and connect to the database:</cmd>
-<substeps>
-<substep><cmd>Enter the following in a command window or shell: </cmd><stepxmp><codeblock>java org.apache.derby.tools.ij
-ij&gt; connect 'jdbc:derby:&lt;<i>dbname</i>>;create=true';</codeblock>where &lt;<i>dbname</i>>
-is the name of the database you are connecting to.</stepxmp></substep>
-<substep><cmd>To exit the ij utility, enter:</cmd><stepxmp><codeblock>ij&gt; exit;</codeblock> </stepxmp>
-</substep>
-</substeps>
-</step>
-</steps-unordered>
-<postreq>For more information on running the ij and sysinfo utilities, see
-the <cite><ph conref="gsconrefs.dita#pub/citutilities"></ph></cite></postreq>
+Java application and the JVM. </p><p>In most development environments, it
+is best to temporarily set the CLASSPATH environment variable in the command
+line shell where you are entering commands. <ph conref="gsconrefs.dita#prod/productshortname"></ph> provides
+several scripts in the <ph conref="gsconrefs.dita#prod/productinstallpath"></ph><filepath>/bin</filepath> directory
+to help you set your classpath quickly. These scripts are: <dl><dlentry>
+<dt>setEmbeddedCP</dt>
+<dd>The <cmdname>setEmbeddedCP</cmdname> script adds the derby.jar and derbytools.jar
+files to the classpath, when the database engine is used in embedded mode. </dd>
+</dlentry><dlentry>
+<dt>setNetworkServerCP</dt>
+<dd>The <cmdname>setNetworkServerCP</cmdname> script adds the derby.jar and
+derbynet.jar files to the classpath, so that you can start the network server. </dd>
+</dlentry><dlentry>
+<dt>setNetworkClientCP</dt>
+<dd>The <cmdname>setNetworkClientCP</cmdname> script adds the derbyclient.jar
+and derbytools.jar files to the classpath, so that you can access databases
+using the network client. </dd>
+</dlentry></dl></p><p>To set the classpath temporarily, run the script that
+is appropriate for your environment every time that you open a new command
+window.</p><p>To see the classpath that the script sets, issue the following
+command after you run the script: <ul>
+<li>On UNIX, use <codeph>echo $CLASSPATH</codeph></li>
+<li>On Windows, use <codeph>echo %CLASSPATH%</codeph></li>
+</ul></p></context>
+<postreq>For more information on running the <filepath>ij</filepath> and <filepath>sysinfo</filepath> utilities,
+see the <cite><ph conref="gsconrefs.dita#pub/citutilities"></ph></cite></postreq>
 </taskbody>
 </task>

Modified: db/derby/docs/branches/10.2/src/getstart/tgsrunningij.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/tgsrunningij.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/tgsrunningij.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/tgsrunningij.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!--  
@@ -19,23 +20,30 @@
 -->
 <task id="tgsrunningij" xml:lang="en-us">
 <title>Running ij</title>
-<shortdesc>You can use the <b>ij</b> tool to connect to a <ph conref="gsconrefs.dita#prod/productshortname"></ph> database.</shortdesc>
+<shortdesc>You can use the <cmdname>ij</cmdname> tool to connect to a <ph
+conref="gsconrefs.dita#prod/productshortname"></ph> database.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm><indexterm>Derby</indexterm>tools, ij</indexterm><indexterm><indexterm>ij
+tool</indexterm>running</indexterm></keywords>
+</metadata></prolog>
 <taskbody>
-<context> <p>You must include the /bin directory in your PATH environment
-variable to run ij.</p> </context>
+<context> <p>You must add the <ph conref="gsconrefs.dita#prod/productinstallpath"></ph><filepath>/bin</filepath> directory
+in your PATH environment variable before you can run the <cmdname>ij</cmdname> tool.</p> </context>
 <steps-unordered>
-<step><cmd>You can run ij by typing the following command: </cmd><stepxmp><codeblock>ij</codeblock></stepxmp>
-<stepresult>The ij script executes the ij program and sets up environment
-variables like CLASSPATH.</stepresult></step>
-<step><cmd>To create a database with ij, type the following command:</cmd>
-<stepxmp><codeblock>ij&gt; connect 'jdbc:derby:testdb;create=true';</codeblock></stepxmp>
-<stepresult>This command creates a database called testdb in the current directory,
-populates the system tables, and connects to the database. You can then execute
-any SQL statements from the ij command line.</stepresult></step>
-<step><cmd>When you are ready to leave ij, type: </cmd><stepxmp><codeblock>ij&gt; exit;</codeblock></stepxmp>
-</step>
+<step><cmd>To start the <cmdname>ij</cmdname> tool, run the <cmdname>ij</cmdname> script
+from the command line. </cmd><stepxmp>For example:<codeblock>ij</codeblock></stepxmp>
+<stepresult>The <cmdname>ij</cmdname> script starts the <cmdname>ij</cmdname> tool
+and sets up the environment variables like CLASSPATH.</stepresult></step>
+<step><cmd>To create a database with the <cmdname>ij</cmdname> tool, type
+the following command:</cmd><stepxmp><codeblock>ij&gt; connect 'jdbc:derby:testdb;create=true';</codeblock></stepxmp>
+<stepresult>This command creates a database called <codeph>testdb</codeph> in
+the current directory, populates the system tables, and connects to the database.
+You can then run any SQL statements from the <cmdname>ij</cmdname> command
+line.</stepresult></step>
+<step><cmd>When you are ready to leave the <cmdname>ij</cmdname> tool, type: </cmd>
+<stepxmp><codeblock>ij&gt; exit;</codeblock></stepxmp></step>
 </steps-unordered>
 <postreq>See the <cite><ph conref="gsconrefs.dita#pub/citutilities"></ph></cite> for
-more information on running ij.</postreq>
+more information about <cmdname>ij</cmdname>.</postreq>
 </taskbody>
 </task>

Modified: db/derby/docs/branches/10.2/src/getstart/tgssetupjavaenvir.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/tgssetupjavaenvir.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/tgssetupjavaenvir.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/tgssetupjavaenvir.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!--  
@@ -18,29 +19,65 @@
 limitations under the License.
 -->
 <task id="tgssetupjavaenvir" xml:lang="en-us">
-<title> Setting up your Java environment</title>
-<shortdesc>You need to set your PATH environment variable so the JVM and Java
-applications run correctly. This is extremely important for the success of
-your installation because the PATH variable enables your operating system
-to find the appropriate programs from any directory.</shortdesc>
+<title>Setting up your environment</title>
+<shortdesc>You need to set several environment variables so that the scripts
+that are included with the <ph conref="gsconrefs.dita#prod/productshortname"></ph> <codeph>bin</codeph> distribution
+run correctly.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>PATH<indexterm>setting</indexterm></indexterm></keywords>
+<keywords><indexterm>Derby<indexterm>environment setup</indexterm></indexterm>
+<indexterm>environment variables<indexterm>DERBY_HOME</indexterm></indexterm>
+<indexterm>environment variables<indexterm>JAVA_HOME</indexterm></indexterm>
+<indexterm>environment variables<indexterm>DERBY_HOME</indexterm></indexterm>
+<indexterm>environment variables<indexterm>PATH</indexterm></indexterm><indexterm>DERBY_HOME<indexterm>environment
+variable, setting</indexterm></indexterm><indexterm>JAVA_HOME<indexterm>environment
+variable, setting</indexterm></indexterm><indexterm>PATH<indexterm>environment
+variable, setting</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>If you have more than one JVM installed, the JVM you want to
-use must appear before any of the others in the PATH variable.</p><p>To check
-the PATH environment variable:</p></context>
+<context> <p>To set the environment variables:</p></context>
 <steps>
-<step><cmd>In a command window, type the following: </cmd><stepxmp><codeblock>java -version</codeblock></stepxmp>
-<stepresult>If the path is set correctly, you will see a printout telling
-you the version of your JVM.</stepresult></step>
-<step><cmd>If the command does not return the correct version of your JVM,
-set the PATH variable by adding the <codeph>bin</codeph> subdirectory of the
-JVM directory to the beginning of the path.</cmd><stepxmp>For example, if
-the directory is <codeph>C:\JDK1.4</codeph>, add <codeph>C:\JDK1.4\bin</codeph> to
-the beginning of the path.</stepxmp></step>
-<step><cmd>Repeat step 1 to make sure the PATH environment variable is set
-correctly.</cmd></step>
+<step><cmd>Set the <ph conref="gsconrefs.dita#prod/productinstallpath"></ph> environment
+variable to the location where you extracted the <ph conref="gsconrefs.dita#prod/productshortname"></ph> bin
+distribution.</cmd><stepxmp>For example, if you installed <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
+the c:\<ph conref="gsconrefs.dita#prod/productinstallname"></ph> directory,
+use the following command to set the <ph conref="gsconrefs.dita#prod/productinstallpath"></ph> environment
+variable:  <codeblock>set <ph conref="gsconrefs.dita#prod/productinstallpath"></ph>=c:\<ph
+conref="gsconrefs.dita#prod/productinstallname"></ph></codeblock></stepxmp>
+</step>
+<step><cmd>Set the JAVA_HOME environment variable. The JAVA_HOME environment
+variable is used by the scripts to locate the JVM and Java applications. </cmd>
+<choicetable>
+<chhead><choptionhd>Operating System</choptionhd><chdeschd>Command</chdeschd>
+</chhead>
+<chrow><choption>UNIX</choption><chdesc><codeph>export JAVA_HOME=/usr/j2se</codeph></chdesc>
+</chrow>
+<chrow><choption>Windows</choption><chdesc><codeph>set JAVA_HOME=C:\Program
+Files\Java\j2se1.4.2_05</codeph></chdesc></chrow>
+</choicetable>
+</step>
+<step><cmd>Add the <ph conref="gsconrefs.dita#prod/productinstallpath"></ph><filepath>/bin</filepath> directory
+to the PATH environment variable so that you can run the <ph conref="gsconrefs.dita#prod/productshortname"></ph> scripts
+from any directory.</cmd>
+<choicetable>
+<chhead><choptionhd>Operating System</choptionhd><chdeschd>Command</chdeschd>
+</chhead>
+<chrow><choption>UNIX</choption><chdesc><codeph>export PATH="$<ph conref="gsconrefs.dita#prod/productinstallpath"></ph>/bin:$PATH"</codeph></chdesc>
+</chrow>
+<chrow><choption>Windows</choption><chdesc><codeph>set PATH=%<ph conref="gsconrefs.dita#prod/productinstallpath"></ph>\bin;%PATH%</codeph></chdesc>
+</chrow>
+</choicetable>
+<info>When the <ph conref="gsconrefs.dita#prod/productinstallpath"></ph> environment
+variable is set in the PATH environment variable, you can use shortened commands
+to start the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools. </info>
+</step>
+<step><cmd>Verify that the DERBY_HOME and the JAVA_HOME environment variables
+are set correctly, and that the $DERBY_HOME/bin directory is added to the
+PATH environment variable. </cmd><stepxmp>Use the following command to check
+the settings: <codeblock>sysinfo </codeblock></stepxmp><stepresult>If the
+environment variables are set correctly, the sysinfo command displays information
+about your JVM and the version of Derby you have installed. </stepresult>
+</step>
 </steps>
+<postreq>For more information on the scripts included in the bin distribution, see <xref href="rgslib27507.dita#rgslib27507"></xref>.</postreq>
 </taskbody>
 </task>

Modified: db/derby/docs/branches/10.2/src/pt_BR/adminguide/adminconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/adminguide/adminconrefs.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/adminguide/adminconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/adminguide/adminconrefs.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
+ "ditabase.dtd">
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,22 +18,18 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<!DOCTYPE dita PUBLIC "-//IBM//DTD DITA Composite//EN"
- "../../dtd/ditabase.dtd">
-
 <dita>
 <concept id="prod" xml:lang="pt-br">
 <title>Entidades específicas do produto</title>
 <conbody>
-<p>Convenção para nomes:
-<userinput><varname>abb</varname></userinput> (abreviatura do produto)
-seguida por <userinput>l</userinput> (versão longa) ou
-<userinput>s</userinput> (versão curta), seguida por <userinput>t</userinput>
-se a referência for pré-marcada por marca registrada.</p>
+<p>Convenção para nomes: <userinput><varname>abb</varname></userinput> (abreviatura
+do produto) seguida por <userinput>l</userinput> (versão longa) ou <userinput>s</userinput> (versão
+curta), seguida por <userinput>t</userinput> se a referência for pré-marcada
+por marca registrada.</p>
 <p><ph id="productshortname">Derby</ph></p>
 <p><ph id="productlongname">Apache Derby</ph></p>
 <p><ph id="productinstallname">Derby_10</ph></p>
-<p><ph id="productinstallpath">DERBY_INSTALL</ph></p>
+<p><ph id="productinstallpath">DERBY_HOME</ph></p>
 <p><ph id="productlowercase">derby</ph></p>
 </conbody>
 </concept>
@@ -43,10 +42,9 @@
 <concept id="pub" xml:lang="pt-br">
 <title>Publicações</title>
 <conbody>
-<p>Convenção para nomes:
-<userinput>cit<varname>ABB</varname></userinput>, onde
-<userinput>cit</userinput> é o indicador que o <i>conref</i> é para o título da
-publicação e <varname>ABB</varname> é a abreviatura da publicação
+<p>Convenção para nomes: <userinput>cit<varname>ABB</varname></userinput>,
+onde <userinput>cit</userinput> é o indicador que o <i>conref</i> é para o
+título da publicação e <varname>ABB</varname> é a abreviatura da publicação
 (digamos, 2-6 caracteres).</p>
 <p>Não é possível utilizar a marca <i>cite</i> "correta" do DITA porque o
 empacotador de IDD não pode tratá-la.</p>

Modified: db/derby/docs/branches/10.2/src/pt_BR/getstart/gsconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/getstart/gsconrefs.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/getstart/gsconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/getstart/gsconrefs.dita Fri Sep 15 13:35:49 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
  "../../dtd/ditabase.dtd">
-
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -22,15 +22,14 @@
 <concept id="prod" xml:lang="pt-br">
 <title>Entidades específicas do produto</title>
 <conbody>
-<p>Convenção para nomes:
-<userinput><varname>abb</varname></userinput> (abreviatura do produto)
-seguida por <userinput>l</userinput> (versão longa) ou
-<userinput>s</userinput> (versão curta), seguida por <userinput>t</userinput>
-se a referência for pré-marcada por marca registrada.</p>
+<p>Convenção para nomes: <userinput><varname>abb</varname></userinput> (abreviatura
+do produto) seguida por <userinput>l</userinput> (versão longa) ou <userinput>s</userinput> (versão
+curta), seguida por <userinput>t</userinput> se a referência for pré-marcada
+por marca registrada.</p>
 <p><ph id="productshortname">Derby</ph></p>
 <p><ph id="productlongname">Apache Derby</ph></p>
 <p><ph id="productinstallname">Derby_10</ph></p>
-<p><ph id="productinstallpath">DERBY_INSTALL</ph></p>
+<p><ph id="productinstallpath">DERBY_HOME</ph></p>
 <p><ph id="productlowercase">derby</ph></p>
 </conbody>
 </concept>
@@ -43,10 +42,9 @@
 <concept id="pub" xml:lang="pt-br">
 <title>Publicações</title>
 <conbody>
-<p>Convenção para nomes:
-<userinput>cit<varname>ABB</varname></userinput>, onde
-<userinput>cit</userinput> é o indicador que o <i>conref</i> é para o título da
-publicação e <varname>ABB</varname> é a abreviatura da publicação
+<p>Convenção para nomes: <userinput>cit<varname>ABB</varname></userinput>,
+onde <userinput>cit</userinput> é o indicador que o <i>conref</i> é para o
+título da publicação e <varname>ABB</varname> é a abreviatura da publicação
 (digamos, 2-6 caracteres).</p>
 <p>Não é possível utilizar a marca <i>cite</i> "correta" do DITA porque o
 empacotador de IDD não pode tratá-la.</p>
@@ -65,4 +63,3 @@
 </conbody>
 </concept>
 </dita>
-

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/refconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/refconrefs.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/refconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/refconrefs.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
+ "../../dtd/ditabase.dtd">
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,22 +18,18 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
- "../../dtd/ditabase.dtd">
-
 <dita>
 <concept id="prod" xml:lang="pt-br">
 <title>Entidades específicas do produto</title>
 <conbody>
-<p>Convenção para nomes:
-<userinput><varname>abb</varname></userinput> (abreviatura do produto)
-seguida por <userinput>l</userinput> (versão longa) ou
-<userinput>s</userinput> (versão curta), seguida por <userinput>t</userinput>
-se a referência for pré-marcada por marca registrada.</p>
+<p>Convenção para nomes: <userinput><varname>abb</varname></userinput> (abreviatura
+do produto) seguida por <userinput>l</userinput> (versão longa) ou <userinput>s</userinput> (versão
+curta), seguida por <userinput>t</userinput> se a referência for pré-marcada
+por marca registrada.</p>
 <p><ph id="productshortname">Derby</ph></p>
 <p><ph id="productlongname">Apache Derby</ph></p>
 <p><ph id="productinstallname">Derby_10</ph></p>
-<p><ph id="productinstallpath">DERBY_INSTALL</ph></p>
+<p><ph id="productinstallpath">DERBY_HOME</ph></p>
 <p><ph id="productlowercase">derby</ph></p>
 </conbody>
 </concept>
@@ -43,10 +42,9 @@
 <concept id="pub" xml:lang="pt-br">
 <title>Publicações</title>
 <conbody>
-<p>Convenção para nomes:
-<userinput>cit<varname>ABB</varname></userinput>, onde
-<userinput>cit</userinput> é o indicador que o <i>conref</i> é para o título da
-publicação e <varname>ABB</varname> é a abreviatura da publicação
+<p>Convenção para nomes: <userinput>cit<varname>ABB</varname></userinput>,
+onde <userinput>cit</userinput> é o indicador que o <i>conref</i> é para o
+título da publicação e <varname>ABB</varname> é a abreviatura da publicação
 (digamos, 2-6 caracteres).</p>
 <p>Não é possível utilizar a marca <i>cite</i> "correta" do DITA porque o
 empacotador de IDD não pode tratá-la.</p>
@@ -59,4 +57,3 @@
 </conbody>
 </concept>
 </dita>
-

Modified: db/derby/docs/branches/10.2/src/ref/refconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/refconrefs.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/refconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/refconrefs.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
+ "../dtd/ditabase.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +18,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
- "../dtd/ditabase.dtd">
-
 <dita>
 <concept id="prod" xml:lang="en-us">
 <title>Product specific entities</title>
@@ -29,7 +29,7 @@
 <p><ph id="productshortname">Derby</ph></p>
 <p><ph id="productlongname">Apache Derby</ph></p>
 <p><ph id="productinstallname">Derby_10</ph></p>
-<p><ph id="productinstallpath">DERBY_INSTALL</ph></p>
+<p><ph id="productinstallpath">DERBY_HOME</ph></p>
 <p><ph id="productlowercase">derby</ph></p>
 </conbody>
 </concept>
@@ -56,4 +56,3 @@
 </conbody>
 </concept>
 </dita>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefbackupdbenablelognowaitproc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefbackupdbenablelognowaitproc.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefbackupdbenablelognowaitproc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefbackupdbenablelognowaitproc.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "reference.dtd">
 <!-- 
@@ -19,6 +20,11 @@
 -->
 <reference id="rrefbackupdbenablelognowaitproc" xml:lang="en-us">
 <title>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT</title>
+<prolog><metadata>
+<keywords><indexterm>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT<indexterm>syntax</indexterm></indexterm>
+<indexterm>system procedures<indexterm>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <refbody>
 <section><p>The <codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT</codeph> system
 procedure backs up the database to a specified backup directory and enables
@@ -30,8 +36,11 @@
 IN SMALLINT DELETE_ARCHIVED_LOG_FILES)
 </codeblock><p>No result is returned from the procedure.</p><dl><dlentry>
 <dt>BACKUPDIR</dt>
-<dd>An input argument of type VARCHAR(32672) that specifies the full system
-path to the database directory to be backed up.</dd>
+<dd>An input argument of type VARCHAR(32672) that specifies the path to a
+directory, where the backup should be stored. Relative paths are resolved
+based on the current user directory, <filepath>user.dir</filepath>, of the
+JVM where the database backup is occurring. Relative paths are not resolved
+based on the derby home directory. To avoid confusion, use the absolute path.</dd>
 </dlentry><dlentry>
 <dt>DELETE_ARCHIVED_LOG_FILES</dt>
 <dd>If the input parameter value for the DELETE_ARCHIVED_LOG_FILES parameter

Modified: db/derby/docs/branches/10.2/src/ref/rrefbackupdbenablelogproc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefbackupdbenablelogproc.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefbackupdbenablelogproc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefbackupdbenablelogproc.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "reference.dtd">
 <!-- 
@@ -17,9 +18,13 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<?Pub Caret?>
 <reference id="rrefbackupdbenablelogproc" xml:lang="en-us">
 <title>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE</title>
+<prolog><metadata>
+<keywords><indexterm>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE<indexterm>syntax</indexterm></indexterm>
+<indexterm>system procedures<indexterm>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <refbody>
 <section><p>The <codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE</codeph> system
 procedure backs up the database to a specified backup directory and enables
@@ -28,8 +33,11 @@
 (IN BACKUPDIR VARCHAR(32672), IN SMALLINT DELETE_ARCHIVED_LOG_FILES) 
 </codeblock><p>No result is returned from the procedure.</p><dl><dlentry>
 <dt>BACKUPDIR</dt>
-<dd>An input argument of type VARCHAR(32672) that specifies the full system
-path to the database directory to be backed up.</dd>
+<dd>An input argument of type VARCHAR(32672) that specifies the path to a
+directory, where the backup should be stored. Relative paths are resolved
+based on the current user directory, <filepath>user.dir</filepath>, of the
+JVM where the database backup is occurring. Relative paths are not resolved
+based on the derby home directory. To avoid confusion, use the absolute path</dd>
 </dlentry><dlentry>
 <dt>DELETE_ARCHIVED_LOG_FILES</dt>
 <dd>If the input parameter value for the DELETE_ARCHIVED_LOG_FILES parameter
@@ -51,4 +59,3 @@
 ></section>
 </refbody>
 </reference>
-<?Pub *0000002908?>

Modified: db/derby/docs/branches/10.2/src/ref/rrefbackupdbnowaitproc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefbackupdbnowaitproc.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefbackupdbnowaitproc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefbackupdbnowaitproc.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "reference.dtd">
 <!-- 
@@ -22,7 +23,8 @@
 <shortdesc>The <codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT</codeph> system
 procedure backs up the database to a specified backup directory. </shortdesc>
 <prolog><metadata>
-<keywords><indexterm>system procedures<indexterm>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT</indexterm></indexterm>
+<keywords><indexterm>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT<indexterm>syntax</indexterm></indexterm>
+<indexterm>system procedures<indexterm>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
@@ -33,8 +35,11 @@
 <section><title>Syntax</title><codeblock>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT(IN BACKUPDIR VARCHAR()) 
 </codeblock><p>No result is returned from the procedure.</p><dl><dlentry>
 <dt>BACKUPDIR</dt>
-<dd>A VARCHAR(32672) input argument that specifies the full system path to
-the database directory that is to be backed up.</dd>
+<dd>An input argument of type VARCHAR(32672) that specifies the path to a
+directory, where the backup should be stored. Relative paths are resolved
+based on the current user directory, <filepath>user.dir</filepath>, of the
+JVM where the database backup is occurring. Relative paths are not resolved
+based on the derby home directory. To avoid confusion, use the absolute path.</dd>
 </dlentry></dl></section>
 <section><title>JDBC example</title><p>The following example backs up the
 database to the <codeph>c:/backupdir</codeph> directory:</p><codeblock>CallableStatement cs = conn.prepareCall

Modified: db/derby/docs/branches/10.2/src/ref/rrefbackupdbproc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefbackupdbproc.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefbackupdbproc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefbackupdbproc.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,19 +18,24 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefbackupdbproc" xml:lang="en-us">
 <title>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</title>
+<prolog><metadata>
+<keywords><indexterm>SYSCS_UTIL.SYSCS_BACKUP_DATABASE<indexterm>syntax</indexterm></indexterm>
+<indexterm>system procedures<indexterm>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <refbody>
 <section><p>The <codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</codeph> system procedure
 backs up the database to a specified backup directory.</p></section>
 <section><title>Syntax</title> <codeblock>SYSCS_UTIL.SYSCS_BACKUP_DATABASE(IN BACKUPDIR VARCHAR()) </codeblock> <p>No
 result is returned from the procedure.</p> <dl><dlentry>
-<dt>backupDir</dt>
-<dd>An input argument of type VARCHAR(32672) that specifies the full system
-path to the database directory to be backed up.</dd>
+<dt>BACKUPDIR</dt>
+<dd>An input argument of type VARCHAR(32672) that specifies the path to a
+directory, where the backup should be stored. Relative paths are resolved
+based on the current user directory, <filepath>user.dir</filepath>, of the
+JVM where the database backup is occurring. Relative paths are not resolved
+based on the derby home directory. To avoid confusion, use the absolute path.</dd>
 </dlentry></dl></section>
 <section><title>JDBC example</title> <p>The following example backs up the
 database to the <codeph>c:/backupdir</codeph> directory:</p> <codeblock>CallableStatement cs = conn.prepareCall
@@ -39,4 +47,3 @@
 database to the <codeph>c:/backupdir</codeph> directory:</p> <codeblock>CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE('c:/backupdir');</codeblock></section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefdatefunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefdatefunc.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefdatefunc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefdatefunc.dita Fri Sep 15 13:35:49 2006
@@ -26,7 +26,7 @@
 </metadata></prolog>
 <refbody>
 <section> <p>The argument must be a date, timestamp, a positive number less
-than or equal to 3,652,059, a valid string representation of a date or timestamp,
+than or equal to 2,932,897, a valid string representation of a date or timestamp,
 or a string of length 7 that is not a CLOB, LONG VARCHAR, or XML value. If
 the argument is a string of length 7, it must represent a valid date in the
 form yyyynnn, where yyyy are digits denoting a year, and nnn are digits between

Modified: db/derby/docs/branches/10.2/src/ref/rrefdttlimits.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefdttlimits.dita?view=diff&rev=446722&r1=446721&r2=446722
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefdttlimits.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefdttlimits.dita Fri Sep 15 13:35:49 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,15 +18,12 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefdttlimits" xml:lang="en-us">
 <title>DATE, TIME, and TIMESTAMP limitations</title>
 <refbody>
-<table frame="all"><title>DATE, TIME, and TIMESTAMP limitations</title><desc>The
-following table lists limitations on date, time, and timestamp values in <ph
-conref="refconrefs.dita#prod/productshortname"></ph>.</desc>
+<section>The following table lists limitations on date, time, and timestamp
+values in <ph conref="refconrefs.dita#prod/productshortname"></ph>.<table
+frame="all"><title>DATE, TIME, and TIMESTAMP limitations</title>
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="colspec0" colwidth="228*"/>
 <colspec colname="colspec1" colwidth="228*"/>
 <thead>
@@ -55,11 +55,10 @@
 </row>
 <row>
 <entry colname="colspec0">Largest TIMESTAMP value</entry>
-<entry colname="colspec1">9999-12-31-24.00.00.000000</entry>
+<entry colname="colspec1">9999-12-31-23.59.59.999999 </entry>
 </row>
 </tbody>
 </tgroup>
-</table>
+</table></section>
 </refbody>
 </reference>
-