db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r227515 - in /db/derby/docs/trunk/src: getstart/ tools/
Date Thu, 04 Aug 2005 23:26:53 GMT
Author: fuzzylogic
Date: Thu Aug  4 16:26:22 2005
New Revision: 227515

URL: http://svn.apache.org/viewcvs?rev=227515&view=rev
Log:
DERBY-489: Improve related links for the Getting Started Guide. Also fixes
duplicate doctype in rtoolsimport91458.dita.

Committed for Jeff Levitt <derby@mylevita.com>

Modified:
    db/derby/docs/trunk/src/getstart/cgsinsta.dita
    db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
    db/derby/docs/trunk/src/getstart/cgsintdo.dita
    db/derby/docs/trunk/src/getstart/cgsintro.dita
    db/derby/docs/trunk/src/getstart/cgsintsr.dita
    db/derby/docs/trunk/src/getstart/cgslib19524.dita
    db/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita
    db/derby/docs/trunk/src/getstart/cgsquck13780.dita
    db/derby/docs/trunk/src/getstart/cgsquck19524.dita
    db/derby/docs/trunk/src/getstart/cgsquck35643.dita
    db/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita
    db/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita
    db/derby/docs/trunk/src/getstart/getstartderby.ditamap
    db/derby/docs/trunk/src/getstart/rgsdocs10012.dita
    db/derby/docs/trunk/src/getstart/rgsdocs17307.dita
    db/derby/docs/trunk/src/getstart/rgsdocs18277.dita
    db/derby/docs/trunk/src/getstart/rgsdocs37966.dita
    db/derby/docs/trunk/src/getstart/rgsdocs99397.dita
    db/derby/docs/trunk/src/getstart/rgslib27507.dita
    db/derby/docs/trunk/src/getstart/rgslib46043.dita
    db/derby/docs/trunk/src/getstart/rgslib56653.dita
    db/derby/docs/trunk/src/getstart/rgsquck30197.dita
    db/derby/docs/trunk/src/getstart/rgsquck35368.dita
    db/derby/docs/trunk/src/getstart/rgsquck67441.dita
    db/derby/docs/trunk/src/getstart/tgs26250.dita
    db/derby/docs/trunk/src/getstart/tgs36360.dita
    db/derby/docs/trunk/src/getstart/tgsrunningij.dita
    db/derby/docs/trunk/src/getstart/tgssetupjavaenvir.dita
    db/derby/docs/trunk/src/tools/rtoolsimport91458.dita

Modified: db/derby/docs/trunk/src/getstart/cgsinsta.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/cgsinsta.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsinsta.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsinsta.dita Thu Aug  4 16:26:22 2005
@@ -18,10 +18,9 @@
 -->
 <concept id="cgsinsta" xml:lang="en-us">
 <title>Installing and working with Derby</title>
+<shortdesc>If you are new to <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
+JDBC programming, this section will help you begin using the product.</shortdesc>
 <conbody>
-<p>If you are new to <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
-JDBC programming, the following topics will help you begin using the product.
-If you are an experienced JDBC programmer, see <xref href="cgsquck19524.dita#cgsquck19524"></xref>.</p>
+<p>If you are an experienced JDBC programmer, see <xref href="cgsquck19524.dita#cgsquck19524"></xref>.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita Thu Aug  4 16:26:22 2005
@@ -18,11 +18,12 @@
 -->
 <concept id="cgsinstallingderby" xml:lang="en-us">
 <title>Installing Derby</title>
-<conbody>
-<p>In order to install <ph conref="gsconrefs.dita#prod/productshortname"></ph> you
+<shortdesc>In order 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 at <xref format="html" href="http://incubator.apache.org/derby/derby_downloads.html"><ph
+or tar archive from the <ph conref="gsconrefs.dita#prod/productshortname"></ph> Web
+site.</shortdesc>
+<conbody>
+<p> Navigate your Web browser to <xref format="html" href="http://incubator.apache.org/derby/derby_downloads.html"><ph
 conref="gsconrefs.dita#paths/pathdownload"></ph></xref>. This downloads page
 includes provides several distributions of <ph conref="gsconrefs.dita#prod/productshortname"></ph>,
 including snapshot packages as well as stable-version binary distributions.

Modified: db/derby/docs/trunk/src/getstart/cgsintdo.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/cgsintdo.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsintdo.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsintdo.dita Thu Aug  4 16:26:22 2005
@@ -18,16 +18,17 @@
 -->
 <concept id="cgsintdo" xml:lang="en-us">
 <title>Deployment options</title>
+<shortdesc>You can deploy <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
+a number of different ways.</shortdesc>
 <conbody>
-<p>You can deploy <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
-a number of different ways:   <ul>
+<p>Your deployment options include:<ul>
 <li>Embedded in a single-user Java application. <ph conref="gsconrefs.dita#prod/productshortname"></ph> can
 be almost invisible to the end user because it requires no administration
 and runs in the same Java virtual machine (JVM) as the application.</li>
 <li>Embedded in a multiuser application such as a web server, an application
 server, or a shared development environment.</li>
 <li>Embedded in a server framework. You can use the Network Server
-with the Network Client driver or a server of your own choice.</li>
+with the network client driver or a server of your own choice.</li>
 </ul></p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/getstart/cgsintro.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/cgsintro.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsintro.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsintro.dita Thu Aug  4 16:26:22 2005
@@ -19,11 +19,12 @@
 -->
 <concept id="cgsintro" xml:lang="en-us">
 <title>Introducing Derby</title>
-<conbody>
-<p>Welcome to <ph conref="gsconrefs.dita#prod/productshortname"></ph>! <ph
+<shortdesc>Welcome to <ph conref="gsconrefs.dita#prod/productshortname"></ph>! <ph
 conref="gsconrefs.dita#prod/productshortname"></ph> is a relational database
 management system (RDBMS) that is based on <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> and SQL. This section
+tmtype="tm" trademark="Java">Java</tm> and SQL.</shortdesc>
+<conbody>
+<p>This section
 describes <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/getstart/cgsintsr.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/cgsintsr.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsintsr.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsintsr.dita Thu Aug  4 16:26:22 2005
@@ -19,10 +19,11 @@
 
 <concept id="cgsinstr" xml:lang="en-us">
 <title>System requirements</title>
-<conbody>
-<p><ph conref="gsconrefs.dita#prod/productshortname"></ph> is a database engine
+<shortdesc><ph conref="gsconrefs.dita#prod/productshortname"></ph> is a database engine
 written completely in Java; it will run in any certified Java Virtual Machine
-(JVM).</p>
+(JVM).</shortdesc>
+<conbody>
+<p></p>
 </conbody>
 </concept>
 

Modified: db/derby/docs/trunk/src/getstart/cgslib19524.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/cgslib19524.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgslib19524.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgslib19524.dita Thu Aug  4 16:26:22 2005
@@ -18,13 +18,13 @@
 -->
 <concept id="cgslib19524" xml:lang="en-us">
 <title>Derby libraries and scripts: complete reference </title>
+<shortdesc>This appendix describes <ph conref="gsconrefs.dita#prod/productshortname"></ph> libraries
+and scripts.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Libraries</indexterm><indexterm>Classpath</indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>This appendix describes <ph conref="gsconrefs.dita#prod/productshortname"></ph> libraries
-and scripts.</p>
+<p></p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita Thu Aug  4 16:26:22 2005
@@ -18,10 +18,10 @@
 -->
 <concept id="cgsmanuallysetting" xml:lang="en-us">
 <title>Manually setting environment variables and paths </title>
+<shortdesc>If you cannot run the scripts for the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools
+and utilities, you must complete certain steps manually.</shortdesc>
 <conbody>
-<p>If you cannot run the scripts for the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools
-and utilities, you must complete certain steps manually. The following topics
-show how to set your environment and run the tools manually. </p>
+<p>The following topics show how to set your environment and run the tools
+manually. </p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/getstart/cgsquck13780.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/cgsquck13780.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsquck13780.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsquck13780.dita Thu Aug  4 16:26:22 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
-
 <!--  
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -19,15 +18,17 @@
 -->
 <concept id="cgsquck13780" xml:lang="en-us">
 <title>Client/server environment</title>
+<shortdesc>A client/server environment is an environment in which multiple
+applications connect to <ph conref="gsconrefs.dita#prod/productshortname"></ph> over
+the network.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>client/server environment</indexterm><indexterm>environment<indexterm>client/server</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>An environment in which multiple applications connect to <ph conref="gsconrefs.dita#prod/productshortname"></ph> over
-the network. These applications run in a client/server environment. <ph conref="gsconrefs.dita#prod/productshortname"></ph> runs
-embedded in a server framework that allows multiple network connections. (The
-framework itself starts an instance of <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
+<p><ph conref="gsconrefs.dita#prod/productshortname"></ph> runs embedded in
+a server framework that allows multiple network connections. (The framework
+itself starts an instance of <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
 runs in an embedded environment. However, the client applications do not run
 in the embedded environment. )</p>
 <p>You can also embed <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
@@ -37,4 +38,3 @@
 a server.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/getstart/cgsquck19524.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/cgsquck19524.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsquck19524.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsquck19524.dita Thu Aug  4 16:26:22 2005
@@ -18,12 +18,12 @@
 -->
 <concept id="cgsquck19524" xml:lang="en-us">
 <title>Quick start guide for experienced JDBC users</title>
+<shortdesc>This section is for experienced JDBC programmers who already know
+how to set the classpath, how to run a Java program, and how to use a JDBC
+driver.</shortdesc>
 <conbody>
-<p>This chapter is for experienced JDBC programmers who already know how to
-set the classpath, how to run a Java program, and how to use a JDBC driver.</p>
-<p>For more detailed information on the topics covered in this section,
-see the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite> and
-the <cite><ph conref="gsconrefs.dita#pub/citutilities"></ph></cite>.</p>
+<p>For more detailed information on the topics covered in this section, see
+the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite> and the <cite><ph
+conref="gsconrefs.dita#pub/citutilities"></ph></cite>.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/getstart/cgsquck35643.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/cgsquck35643.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsquck35643.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsquck35643.dita Thu Aug  4 16:26:22 2005
@@ -18,16 +18,15 @@
 -->
 <concept id="cgsquck35643" xml:lang="en-us">
 <title>Embedded environment</title>
+<shortdesc>An embedded environment is an environment in which only a single
+application can access a database at one time, and no network access occurs.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>embedded environment</indexterm><indexterm>environment<indexterm>embedded</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>An environment in which only a single application can access a database
-at one time, and no network access occurs. When an application starts an instance
-of <ph conref="gsconrefs.dita#prod/productshortname"></ph> within its JVM,
-the application runs in an embedded environment. Loading the
-embedded driver starts <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</p>
+<p>When an application starts an instance of <ph conref="gsconrefs.dita#prod/productshortname"></ph> within
+its JVM, the application runs in an embedded environment. Loading the embedded
+driver starts <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita Thu Aug  4 16:26:22 2005
@@ -18,14 +18,13 @@
 -->
 <concept id="cgsusingsysinfo" xml:lang="en-us">
 <title>Using sysinfo</title>
-<conbody>
-<p><ph conref="gsconrefs.dita#prod/productshortname"></ph>'s sysinfo
+<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>. 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>
+conref="gsconrefs.dita#prod/productshortname"></ph>.</shortdesc>
+<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>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita Thu Aug  4 16:26:22 2005
@@ -18,14 +18,18 @@
 -->
 <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>
+<prolog><metadata>
+<keywords><indexterm>Tools and utilities</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p><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. 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
+<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

Modified: db/derby/docs/trunk/src/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/getstartderby.ditamap?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/getstartderby.ditamap (original)
+++ db/derby/docs/trunk/src/getstart/getstartderby.ditamap Thu Aug  4 16:26:22 2005
@@ -27,41 +27,118 @@
 <vrmlist><vrm version="10.1"/></vrmlist>
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
+<reltable>
+<relrow>
+<relcell>
+<topicref href="cgsintdo.dita" navtitle="Deployment options"></topicref>
+</relcell>
+<relcell>
+<topicref href="cgsintsr.dita" navtitle="System requirements"></topicref>
+<topicref collection-type="family" href="cgsinsta.dita" navtitle="Installing and working with Derby">
+</topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="cgsinsta.dita" linking="targetonly" navtitle="Installing and working with Derby">
+</topicref>
+</relcell>
+<relcell>
+<topicref href="cgsquck19524.dita" navtitle="Quick start guide for experienced JDBC users">
+</topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="cgsinstallingderby.dita" navtitle="Installing Derby"></topicref>
+</relcell>
+<relcell>
+<topicref href="tgssetupjavaenvir.dita" navtitle=" Setting up your Java environment">
+</topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="cgsusingsysinfo.dita" navtitle="Using sysinfo"></topicref>
+</relcell>
+<relcell>
+<topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="tgssetupjavaenvir.dita" navtitle=" Setting up your Java environment">
+</topicref>
+</relcell>
+<relcell>
+<topicref href="cgsmanuallysetting.dita" navtitle="Manually setting environment variables and paths ">
+</topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="tgs36360.dita" navtitle=" Set the DERBY_INSTALL environment variable">
+</topicref>
+</relcell>
+<relcell>
+<topicref href="tgs26250.dita" navtitle=" Set the classpath"></topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rgslib46043.dita" navtitle="Libraries provided by Derby">
+</topicref>
+</relcell>
+<relcell>
+<topicref href="rgslib56653.dita" navtitle=" Libraries not provided by Derby">
+</topicref>
+<topicref href="rgslib27507.dita" navtitle="Scripts provided by Derby"></topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rgslib56653.dita" navtitle=" Libraries not provided by Derby">
+</topicref>
+</relcell>
+<relcell>
+<topicref href="rgslib27507.dita" navtitle="Scripts provided by Derby"></topicref>
+</relcell>
+</relrow>
+</reltable>
 <topicref href="rgscopyright.dita" navtitle="Copyright"></topicref>
-<topicref collection-type="family" href="cgsintro.dita" navtitle="Introducing Derby">
+<topicref href="cgsintro.dita" navtitle="Introducing Derby">
 <topicref href="cgsintdo.dita" navtitle="Deployment options"></topicref>
 <topicref href="cgsintsr.dita" navtitle="System requirements"></topicref>
 <topicref href="rgsdocs17307.dita" navtitle="The Derby library"></topicref>
 </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 href="cgsinstallingderby.dita" navtitle="Installing Derby"></topicref>
 <topicref href="tgssetupjavaenvir.dita" navtitle=" Setting up your Java environment">
 </topicref>
-<topicref collection-type="family" href="cgsusingtoolsutils.dita" navtitle="Using the tools and startup utilities">
+<topicref href="cgsusingtoolsutils.dita" navtitle="Using the tools and startup utilities">
 <topicref href="cgsusingsysinfo.dita" navtitle="Using sysinfo"></topicref>
 <topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
 </topicref>
-<topicref collection-type="family" href="cgsmanuallysetting.dita" navtitle="Manually setting environment variables and paths ">
+<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>
 </topicref>
-<topicref collection-type="family" href="cgsquck19524.dita" navtitle="Quick start guide for experienced JDBC users">
-<topicref collection-type="family" href="cgsquck70629.dita" navtitle="Environments in which Derby can run">
+<topicref href="cgsquck19524.dita" navtitle="Quick start guide for experienced JDBC users">
+<topicref href="cgsquck70629.dita" navtitle="Environments in which Derby can run">
 <topicref href="cgsquck35643.dita" navtitle="Embedded environment"></topicref>
 <topicref href="cgsquck13780.dita" navtitle="Client/server environment"></topicref>
 </topicref>
-<topicref href="rgsquck67441.dita" navtitle="Libraries and classpath"></topicref>
 <topicref href="rgsquck35368.dita" navtitle="Available drivers"></topicref>
 <topicref href="rgsquck30197.dita" navtitle="Database connection URL"></topicref>
 </topicref>
-<topicref collection-type="family" href="rgsdocs37966.dita" navtitle="Documentation conventions">
+<topicref href="rgsdocs37966.dita" navtitle="Documentation conventions">
 <topicref href="rgsdocs99397.dita" navtitle="Terminology"></topicref>
 <topicref href="rgsdocs10012.dita" navtitle="SQL syntax"></topicref>
 <topicref href="rgsdocs18277.dita" navtitle="Typographical conventions"></topicref>
 </topicref>
-<topicref collection-type="family" href="cgslib19524.dita" navtitle="Derby libraries and scripts: complete reference ">
+<topicref href="cgslib19524.dita" navtitle="Derby libraries and scripts: complete reference ">
 <topicref href="rgslib46043.dita" navtitle="Libraries provided by Derby">
 </topicref>
 <topicref href="rgslib56653.dita" navtitle=" Libraries not provided by Derby">

Modified: db/derby/docs/trunk/src/getstart/rgsdocs10012.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/rgsdocs10012.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsdocs10012.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsdocs10012.dita Thu Aug  4 16:26:22 2005
@@ -18,9 +18,10 @@
 -->
 <reference id="rgsdocs10012" xml:lang="en-us">
 <title>SQL syntax</title>
+<shortdesc>SQL syntax is presented in modified BNF notation.</shortdesc>
 <refbody>
-<section><p> SQL syntax is presented in modified BNF notation. The meta-symbols
-of BNF are:   <table expanse="column" frame="all" rowheader="firstcol">
+<section><p>The meta-symbols of BNF are:   <table expanse="column" frame="all"
+rowheader="firstcol">
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="30*"/>
 <colspec colname="2" colnum="2" colwidth="70*"/>
 <thead>
@@ -64,4 +65,3 @@
 Virtual Machine, the way you set JVM arguments and properties might be different.</p></section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/trunk/src/getstart/rgsdocs17307.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/rgsdocs17307.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsdocs17307.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsdocs17307.dita Thu Aug  4 16:26:22 2005
@@ -18,6 +18,7 @@
 -->
 <reference id="rgsdocs17307" xml:lang="en-us">
 <title>The Derby library</title>
+<shortdesc>The <ph conref="gsconrefs.dita#prod/productshortname"></ph> library includes the <ph conref="gsconrefs.dita#prod/productshortname"></ph> manuals and API reference.</shortdesc>
 <refbody>
 <section> <dl><dlentry>
 <dt><ph conref="gsconrefs.dita#pub/citdevelop"></ph></dt>
@@ -53,7 +54,7 @@
 </dlentry><dlentry>
 <dt><ph conref="gsconrefs.dita#prod/productshortname"></ph> API javadoc </dt>
 <dd><p>Automatically generated for all public <ph conref="gsconrefs.dita#prod/productshortname"></ph> classes.
-(No javadoc is provided for the JDBC API, which is part of the Java™ 2 Platform,
+(No javadoc is provided for the JDBC API, which is part of the Java 2 Platform,
 Standard Edition) For more information about the classes in the API, see the <cite><ph
 conref="gsconrefs.dita#pub/citref"></ph></cite>.</p></dd>
 </dlentry></dl></section>

Modified: db/derby/docs/trunk/src/getstart/rgsdocs18277.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/rgsdocs18277.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsdocs18277.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsdocs18277.dita Thu Aug  4 16:26:22 2005
@@ -18,10 +18,12 @@
 -->
 <reference id="rgsdocs18277" xml:lang="en-us">
 <title>Typographical conventions</title>
-<refbody>
-<section><p>This documentation uses some typographical conventions to highlight
+<shortdesc>This documentation uses some typographical conventions to highlight
 elements of the SQL language, operating system commands, and the Java programming
-language. <table expanse="page" frame="all">
+language.</shortdesc>
+<refbody>
+<section><p><table expanse="page" frame="all"><title><ph conref="gsconrefs.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*"/>

Modified: db/derby/docs/trunk/src/getstart/rgsdocs37966.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/rgsdocs37966.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsdocs37966.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsdocs37966.dita Thu Aug  4 16:26:22 2005
@@ -18,8 +18,9 @@
 -->
 <reference id="rgsdocs37966" xml:lang="en-us">
 <title>Documentation conventions</title>
+<shortdesc> This section describes the terminology, syntax, and typographical
+conventions of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation.</shortdesc>
 <refbody>
-<section> Terminology, syntax, and typographical conventions of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation.</section>
+<section><p></p></section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/trunk/src/getstart/rgsdocs99397.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/rgsdocs99397.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsdocs99397.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsdocs99397.dita Thu Aug  4 16:26:22 2005
@@ -18,12 +18,12 @@
 -->
 <reference id="rgsdocs99397" xml:lang="en-us">
 <title>Terminology</title>
-<refbody>
-<section><p>The <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation
+<shortdesc>The <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation
 uses the specialized term <codeph>environment</codeph> to describe the method
-your application uses to interact with <ph conref="gsconrefs.dita#prod/productshortname"></ph>.
-An environment is sometimes referred to as a <i>framework</i>. The two types
-of environments are the <i>embedded environment</i> and the <i>client/server
+your application uses to interact with <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</shortdesc>
+<refbody>
+<section><p>An environment is sometimes referred to as a <i>framework</i>.
+The two types of environments are the <i>embedded environment</i> and the <i>client/server
 environment.</i></p></section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/getstart/rgslib27507.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/rgslib27507.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgslib27507.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgslib27507.dita Thu Aug  4 16:26:22 2005
@@ -18,11 +18,11 @@
 -->
 <reference id="rgslib27507" xml:lang="en-us">
 <title>Scripts provided by Derby</title>
-<refbody>
-<section><p><ph conref="gsconrefs.dita#prod/productshortname"></ph> provides
+<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>. Here is a complete listing:
-  <ul>
+ending in .<i>bat</i> and one ending in .<i>ksh</i>.</shortdesc>
+<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

Modified: db/derby/docs/trunk/src/getstart/rgslib46043.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/rgslib46043.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgslib46043.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgslib46043.dita Thu Aug  4 16:26:22 2005
@@ -18,13 +18,15 @@
 -->
 <reference id="rgslib46043" xml:lang="en-us">
 <title>Libraries provided by Derby</title>
+<shortdesc>This section shows the different libraries used by <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
+their function.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>derbyclient.jar</indexterm><indexterm>derby.jar</indexterm>
 <indexterm>derbytools.jar</indexterm><indexterm>Sample application libraries</indexterm>
 <indexterm>Sample database libraries</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<table frame="all">
+<table frame="all"><title>Derby libraries and their use</title>
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="50*"/>
 <colspec colname="2" colnum="2" colwidth="50*"/>
 <thead>

Modified: db/derby/docs/trunk/src/getstart/rgslib56653.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/rgslib56653.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgslib56653.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgslib56653.dita Thu Aug  4 16:26:22 2005
@@ -18,16 +18,15 @@
 -->
 <reference id="rgslib56653" xml:lang="en-us">
 <title> Libraries not provided by Derby</title>
+<shortdesc>In a Java Development Kit Version 1.3 environment, some special <ph
+conref="gsconrefs.dita#prod/productshortname"></ph> features require that
+you install additional libraries and place them in your class path (Java Development
+Kit, Version 1.4 already includes all of these libraries).</shortdesc>
 <refbody>
-<section><p>In a Java Development Kit Version 1.3 environment,
-some special <ph conref="gsconrefs.dita#prod/productshortname"></ph> features
-require that you install additional libraries and place them in your class
-path (Environments using Java Development Kit, Version 1.4 includes all of
-these libraries): <ul>
+<section><p><ul>
 <li>LDAP (see the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite>)</li>
 <li>JTA (see the <cite><ph conref="gsconrefs.dita#pub/citref"></ph></cite>)</li>
 <li>JDBC 2.0 Extensions (see the <cite><ph conref="gsconrefs.dita#pub/citref"></ph></cite>)</li>
 </ul></p></section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/trunk/src/getstart/rgsquck30197.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/rgsquck30197.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsquck30197.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsquck30197.dita Thu Aug  4 16:26:22 2005
@@ -18,14 +18,15 @@
 -->
 <reference id="rgsquck30197" xml:lang="en-us">
 <title>Database connection URL</title>
+<shortdesc>You must use a database connection URL when using the <ph conref="gsconrefs.dita#prod/productshortname"></ph>-provided
+embedded driver to connect to a database.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Protocol</indexterm><indexterm>Database connection URL<indexterm>supported
 protocols within</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p>For the <ph conref="gsconrefs.dita#prod/productshortname"></ph>-provided
-embedded driver, the format for the database connection URL for connecting
-to a database is this:   <codeblock>jdbc:derby:<i>databaseName</i>;<i>URLAttributes</i></codeblock>where:<ul>
+<section><p>The format for the database connection URL for connecting to a
+database is:   <codeblock>jdbc:derby:<i>databaseName</i>;<i>URLAttributes</i></codeblock>where:<ul>
 <li><i>databaseName</i>   <p>The name of the database that you want to connect
 to</p></li>
 <li><i>URLAttributes</i>   <p>One or more of the supported attributes of the

Modified: db/derby/docs/trunk/src/getstart/rgsquck35368.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/rgsquck35368.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsquck35368.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsquck35368.dita Thu Aug  4 16:26:22 2005
@@ -18,9 +18,10 @@
 -->
 <reference id="rgsquck35368" xml:lang="en-us">
 <title>Available drivers</title>
+<shortdesc>Different JDBC drivers are available depending on the environment
+you choose for <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</shortdesc>
 <refbody>
-<section>The following JDBC drivers are available depending on the environment
-you choose for <ph conref="gsconrefs.dita#prod/productshortname"></ph>:<ul>
+<section><ul>
 <li>org.apache.derby.jdbc.EmbeddedDriver   <p> A driver for embedded environments,
 when <ph conref="gsconrefs.dita#prod/productshortname"></ph> runs in the same
 JVM as the application.</p></li>
@@ -29,4 +30,3 @@
 </ul></section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/trunk/src/getstart/rgsquck67441.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/rgsquck67441.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsquck67441.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsquck67441.dita Thu Aug  4 16:26:22 2005
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<!--  
-Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
-
-Licensed under the Apache License, Version 2.0 (the "License");  
-you may not use this file except in compliance with the License.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-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.
--->
-<reference id="rgsquck67441" xml:lang="en-us">
-<title>Libraries and classpath</title>
-<refbody>
-<section><p>See <xref href="cgslib19524.dita#cgslib19524"></xref> in the appendix
-for a complete description of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> libraries.</p></section>
-</refbody>
-</reference>
-

Modified: db/derby/docs/trunk/src/getstart/tgs26250.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/tgs26250.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/tgs26250.dita (original)
+++ db/derby/docs/trunk/src/getstart/tgs26250.dita Thu Aug  4 16:26:22 2005
@@ -18,23 +18,23 @@
 -->
 <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>
 <prolog><metadata>
-<keywords><indexterm>Classpath<indexterm>setting</indexterm></indexterm>
-</keywords>
+<keywords><indexterm>Classpath<indexterm>setting</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context><p>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. 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>
+<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;
@@ -57,4 +57,3 @@
 the <cite><ph conref="gsconrefs.dita#pub/citutilities"></ph></cite></postreq>
 </taskbody>
 </task>
-

Modified: db/derby/docs/trunk/src/getstart/tgs36360.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/tgs36360.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/tgs36360.dita (original)
+++ db/derby/docs/trunk/src/getstart/tgs36360.dita Thu Aug  4 16:26:22 2005
@@ -18,10 +18,12 @@
 -->
 <task id="tgs36360" xml:lang="en-us">
 <title> Set the DERBY_INSTALL environment variable</title>
-<taskbody>
-<context> <p>During installation, a base directory was created where the software was installed. This document assumes that directory is named <ph conref="gsconrefs.dita#prod/productinstallname"></ph>.
+<shortdesc>During installation, a base directory was created where the software
+was installed. This document assumes that directory is named <ph conref="gsconrefs.dita#prod/productinstallname"></ph>.
 This document refers to that directory as the <ph conref="gsconrefs.dita#prod/productshortname"></ph> base
-directory.</p><p>If you plan to use the scripts in the <codeph>/frameworks/embedded/bin</codeph> directory
+directory.</shortdesc>
+<taskbody>
+<context> <p>If you plan to use the scripts in the <codeph>/frameworks/embedded/bin</codeph> directory
 and if your operating system supports it, create an environment variable called <ph
 conref="gsconrefs.dita#prod/productinstallpath"></ph> and set its value to
 the path of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> base

Modified: db/derby/docs/trunk/src/getstart/tgsrunningij.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/tgsrunningij.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/tgsrunningij.dita (original)
+++ db/derby/docs/trunk/src/getstart/tgsrunningij.dita Thu Aug  4 16:26:22 2005
@@ -18,18 +18,19 @@
 -->
 <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>
 <taskbody>
-<context> <p>You can use the <b>ij</b> tool to connect to a <ph conref="gsconrefs.dita#prod/productshortname"></ph> database.
-You must include the /bin directory in your PATH environment variable to run
-ij.</p> </context>
+<context> <p>You must include the /bin directory in your PATH environment
+variable to run ij.</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>
+<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>
 </steps-unordered>
@@ -37,4 +38,3 @@
 more information on running ij.</postreq>
 </taskbody>
 </task>
-

Modified: db/derby/docs/trunk/src/getstart/tgssetupjavaenvir.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/getstart/tgssetupjavaenvir.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/tgssetupjavaenvir.dita (original)
+++ db/derby/docs/trunk/src/getstart/tgssetupjavaenvir.dita Thu Aug  4 16:26:22 2005
@@ -18,28 +18,28 @@
 -->
 <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>
 <prolog><metadata>
 <keywords><indexterm>PATH<indexterm>setting</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>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. 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>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>
 <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
+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>
 </steps>
 </taskbody>
 </task>
-

Modified: db/derby/docs/trunk/src/tools/rtoolsimport91458.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/tools/rtoolsimport91458.dita?rev=227515&r1=227514&r2=227515&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsimport91458.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsimport91458.dita Thu Aug  4 16:26:22 2005
@@ -16,7 +16,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rtoolsimport91458">
 <title>Examples of bulk import and export</title>
 <prolog><metadata>



Mime
View raw message