db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r202296 [3/16] - in /incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Tue, 28 Jun 2005 22:46:37 GMT
Modified: incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,22 +16,39 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
 <concept id="cadminspace21579" xml:lang="en-us">
-<title>Reclaiming unused space: Overview</title>
-<prolog></prolog>
+<title>Reclaiming unused space</title>
+<shortdesc>A <ph conref="adminconrefs.dita#prod/productshortname"></ph> table
+or index (sometimes called a <i>conglomerate</i>) can contain unused space
+after large amounts of data have been deleted or updated.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>Compressing tables and indexes</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>A <ph conref="adminconrefs.dita#prod/productshortname"></ph> table or index
-(sometimes called a conglomerate) can contain unused space after large amounts
-of data have been deleted or updated. This happens because, by default, <ph
-conref="adminconrefs.dita#prod/productshortname"></ph> does not return unused
-space to the operating system. Once a page has been allocated to a table or
-index, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does not
-automatically return the page to the operating system until the table or index
-is dropped, even if the space is no longer needed. However, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does
+<p>This happens because, by default, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does
+not return unused space to the operating system. After a page has been allocated
+to a table or index, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does
+not automatically return the page to the operating system until the table
+or index is dropped, even if the space is no longer needed. However, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does
 provide a way to reclaim unused space in tables and associated indexes.</p>
+<p>If you determine that a table and its indexes have a significant amount
+of unused space, use the SYSCS_UTIL.SYSCS_COMPRESS_TABLE procedure to reclaim
+that space. The procedure returns the reclaimed space to the operating system.
+By default, the SYSCS_UTIL.SYSCS_COMPRESS_TABLE procedure instructs <ph conref="adminconrefs.dita#prod/productshortname"></ph> to
+compress the table and its related indexes concurrently, which can use a lot
+of temporary disk space and memory.</p>
+<example><p> For example, after you have determined that the FlightAvailability
+table and its related indexes have too much unused space, you could reclaim
+that space with the following command:</p><codeblock>call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('APP', 'FLIGHTAVAILABILITY', 0);</codeblock><p> The
+third parameter in the SYSCS_UTIL.SYSCS_COMPRESS_TABLE() procedure determines
+whether the operation will run in sequential or non-sequential mode. If you
+specify <codeph>0</codeph> for the third argument in the procedure, the operation
+will run in non-sequential mode. In sequential mode,<ph conref="adminconrefs.dita#prod/productshortname"></ph> compresses
+the table and indexes sequentially, one at a time. Sequential compression
+uses less memory and disk space but is slower. To force the operation to run
+in sequential mode, substitute a non-zero smallint value for the third argument.
+The following example shows how to force the procedure to run in sequential
+mode:</p><codeblock>call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('APP', 'FLIGHTAVAILABILITY', 1);</codeblock></example>
+<section>For more information about this command, see the <cite><ph conref="adminconrefs.dita#pub/citref"></ph></cite>.</section>
 </conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap (original)
+++ incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap Tue Jun 28 15:46:15 2005
@@ -19,7 +19,7 @@
 <map title="Server and Administration Guide">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2004"/>
+<copyryear year="1997, 2005"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>
@@ -28,25 +28,25 @@
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
 <topicref href="radmincopyright.dita" navtitle="Copyright"></topicref>
-<topicref href="cadminpreface30074.dita" navtitle="About this guide">
+<topicref collection-type="family" href="cadminpreface30074.dita" navtitle="About this guide">
 <topicref href="cadminpreface11181.dita" navtitle="Purpose of this guide">
 </topicref>
 <topicref href="cadminpreface22460.dita" navtitle="Audience"></topicref>
-<topicref href="cadminpreface23947.dita" navtitle="How This Document Is Organized">
+<topicref href="cadminpreface23947.dita" navtitle="How this guide is organized">
 </topicref>
 </topicref>
-<topicref href="cadminpartone.dita" navtitle="Derby Server Guide">
-<topicref href="cadminov11108.dita" navtitle="Derby in a multi-user environment">
-<topicref href="cadminov17524.dita" navtitle="Derby in a server framework">
+<topicref collection-type="family" href="cadminpartone.dita" navtitle="Part one: Derby Server Guide">
+<topicref collection-type="family" href="cadminov11108.dita" navtitle="Derby in a multi-user environment">
+<topicref collection-type="family" href="cadminov17524.dita" navtitle="Derby in a server framework">
 <topicref href="cadminov825125.dita" navtitle="Connectivity configurations">
 </topicref>
-<topicref href="cadminov33597.dita" navtitle="Multiple-client features available in Derby">
-<topicref href="cadminov28261.dita" navtitle="Row-Level Locking"></topicref>
+<topicref collection-type="family" href="cadminov33597.dita" navtitle="Multiple-client features available in Derby">
+<topicref href="cadminov28261.dita" navtitle="Row-level locking"></topicref>
 <topicref href="cadminov16172.dita" navtitle="Multiple concurrency levels">
 </topicref>
 <topicref href="cadminov65220.dita" navtitle="Multi-connection and multi-threading">
 </topicref>
-<topicref href="cadminov83312.dita" navtitle="Administrative Tools"></topicref>
+<topicref href="cadminov83312.dita" navtitle="Administrative tools"></topicref>
 </topicref>
 <topicref href="cadminov825266.dita" navtitle="The Derby Network Server">
 </topicref>
@@ -59,101 +59,105 @@
 <topicref href="cadminov38650.dita" navtitle="About this guide and the Network Server documentation">
 </topicref>
 </topicref>
-<topicref href="cadminapps59125.dita" navtitle="Using the Network Server with preexisting Derby applications">
+<topicref collection-type="family" href="cadminapps59125.dita" navtitle="Using the Network Server with preexisting Derby applications">
 <topicref href="cadminappsthenetworkserverandjvms.dita" navtitle="The Network Server and JVMs">
 </topicref>
-<topicref href="tadminappschangingyourclasspath.dita" navtitle="Changing your classpath">
+<topicref href="tadminappschangingyourclasspath.dita" navtitle="Installing required jar files and adding them to the classpath">
 </topicref>
-<topicref href="tadmincbdjhhfd.dita" navtitle="Starting the Network Server">
+<topicref collection-type="family" href="tadmincbdjhhfd.dita" navtitle="Starting the Network Server">
 <topicref href="tadminconfigalteringthestartnetworkserverscr.dita" navtitle="Altering the startNetworkServer script">
 </topicref>
-<topicref href="tadminconfig814934.dita" navtitle="Starting the Network Server without the script">
+<topicref href="tadminconfig814934.dita" navtitle="Starting the Network Server without using the script">
 </topicref>
 <topicref href="tadminconfig814963.dita" navtitle="Starting the Network Server from a Java application">
 </topicref>
 </topicref>
-<topicref href="tadminconfigshuttingdownthenetworkserver.dita" navtitle="Shutting down the Network Server">
+<topicref collection-type="family" href="tadminconfigshuttingdownthenetworkserver.dita"
+navtitle="Shutting down the Network Server">
 <topicref href="tadminconfig815333.dita" navtitle="Shutting down by using the command line">
 </topicref>
 <topicref href="tadminconfig815357.dita" navtitle="Shutting down by using the API">
 </topicref>
 </topicref>
-<topicref href="tadminconfigsysteminformation.dita" navtitle="Obtaining system information">
-<topicref href="tadminconfig815768.dita" navtitle="Obtaining system information using the command line">
+<topicref collection-type="family" href="tadminconfigsysteminformation.dita"
+navtitle="Obtaining system information">
+<topicref href="tadminconfig815768.dita" navtitle="Obtaining system information by using the command line">
 </topicref>
-<topicref href="tadminconfig815853.dita" navtitle="Obtaining system information using the API">
-<topicref href="tadminappsruntimeinfo.dita" navtitle="Obtaining Network Server run-time information by using the runtimeinfo command">
+<topicref collection-type="family" href="tadminconfig815853.dita" navtitle="Obtaining system information by using the API">
+<topicref href="tadminappsruntimeinfo.dita" navtitle="Obtaining Network Server runtime information">
 </topicref>
-<topicref href="tadminconfig815822.dita" navtitle="Obtaining Network Server properties by using the getCurrent Properties method">
+<topicref href="tadminconfig815822.dita" navtitle="Obtaining Network Server properties by using the getCurrent Properties
+method"></topicref>
 </topicref>
 </topicref>
+<topicref collection-type="family" href="cadminappsclient.dita" navtitle="Accessing the Network Server by using the network client driver">
+<topicref href="cadminappsclientsecurity.dita" navtitle="Network client security">
 </topicref>
-<topicref href="cadminappsclient.dita" navtitle="Accessing the Network Server by using the Network Client driver">
-<topicref href="cadminappsclientsecurity.dita" navtitle="Network Client security">
+<topicref href="cadminappsclienttracing.dita" navtitle="Network client tracing">
 </topicref>
-<topicref href="cadminappsclienttracing.dita" navtitle="Network Client tracing">
+<topicref href="radminappsclientxmp.dita" navtitle="Network client driver examples">
 </topicref>
-<topicref href="radminappsclientxmp.dita" navtitle="Network Client driver examples">
-</topicref>
-<topicref href="cadminapps810777.dita" navtitle="Accessing the Network Server by using the DB2 Universal Driver">
+<topicref collection-type="family" href="cadminapps810777.dita" navtitle="Accessing the Network Server by using the DB2 Universal Driver">
 <topicref href="radminapps810699.dita" navtitle="DB2 Universal Driver examples"
 toc="no"></topicref>
 </topicref>
 </topicref>
-<topicref href="cadminnsdatasources.dita" navtitle="Accessing the Network Server by using a DataSource">
+<topicref collection-type="family" href="cadminnsdatasources.dita" navtitle="Accessing the Network Server by using a DataSource">
 <topicref href="radminnsdatasourcexmp.dita" navtitle="DataSource access example"
 toc="no"></topicref>
 </topicref>
-<topicref href="cadminapps811478.dita" navtitle="XA and the Network Server">
-<topicref href="cadminappsxawthdriver.dita" navtitle="Using XA with the DB2 Universal JDBC Driver">
+<topicref collection-type="family" href="cadminapps811478.dita" navtitle="XA and the Network Server">
+<topicref href="cadminappsxawthdriver.dita" navtitle="Using XA with the network client driver">
 </topicref>
 </topicref>
-<topicref href="cadminappsusingthederbytoolswiththene.dita" navtitle="Using the Derby tools with the Network Server">
+<topicref collection-type="family" href="cadminappsusingthederbytoolswiththene.dita"
+navtitle="Using the Derby tools with the Network Server">
 <topicref href="tadminapps811302.dita" navtitle="Using the Derby ij tool with the Network Server">
 </topicref>
 <topicref href="tadminapps811345.dita" navtitle="Using the Derby dblook tool with the Network Server">
 </topicref>
 </topicref>
-<topicref href="cadminapps.dita" navtitle="Differences between running Derby in embedded mode and using the Network Server">
-<topicref href="cadminappsclientdiffs.dita" navtitle="Differences between the embedded client and the network client driver"></topicref>
-<topicref href="radminappsresultsetdiffs.dita" navtitle="Updatable Result Sets"></topicref>
-<topicref href="radminapps811974.dita" navtitle="Error messages"></topicref>
-<topicref href="cadminapps49914.dita" navtitle="User authentication">
-<topicref href="cadminapps811631.dita" navtitle="Network Server user authentication when user authentication is on in Derby">
+<topicref collection-type="family" href="cadminapps.dita" navtitle="Differences between running Derby in embedded mode and using the Network
+Server">
+<topicref href="cadminappsclientdiffs.dita" navtitle="Differences between the embedded client and the network client driver">
 </topicref>
-<topicref href="cadminapps811656.dita" navtitle="Network Server user authentication when user authentication is off in Derby">
+<topicref href="radminappsresultsetdiffs.dita" navtitle="Updatable Result Sets">
 </topicref>
-<topicref href="tadminapps811695.dita" navtitle="Encrypted user ID and password">
+<topicref href="radminapps811974.dita" navtitle="Error message differences">
 </topicref>
+<topicref collection-type="family" href="cadminapps49914.dita" navtitle="User authentication differences">
+<topicref href="cadminapps811631.dita" navtitle="Network Server user authentication when user authentication is on in Derby">
 </topicref>
+<topicref href="cadminapps811656.dita" navtitle="Network Server user authentication when user authentication is off
+in Derby"></topicref>
+<topicref href="tadminapps811695.dita" navtitle="Enabling the encrypted user ID and password security mechanism">
 </topicref>
-<topicref href="tadminappssettingportnumbers.dita" navtitle="Setting port numbers">
 </topicref>
 </topicref>
-<topicref href="cadminconfig86869.dita" navtitle="Managing the Derby Network Server">
-<topicref href="cadminconfigoverview.dita" navtitle="Overview">
-<topicref href="cadminconfig813340.dita" navtitle="The Network Server and JVMs">
+<topicref href="tadminappssettingportnumbers.dita" navtitle="Setting port numbers">
 </topicref>
-<topicref href="tadminconfig813498.dita" navtitle="Setting the class path">
 </topicref>
+<topicref collection-type="family" href="cadminconfig86869.dita" navtitle="Managing the Derby Network Server">
+<topicref collection-type="family" href="cadminconfigoverview.dita" navtitle="Overview">
 <topicref href="tadminconfig813694.dita" navtitle="Using the NetworkServerControl API">
 </topicref>
 </topicref>
-<topicref href="tadminconfigsettingnetwrokserverproperties.dita" navtitle="Setting Network Server Properties">
+<topicref collection-type="family" href="tadminconfigsettingnetwrokserverproperties.dita"
+navtitle="Setting Network Server properties">
 <topicref href="radmindrdahost.dita" navtitle="derby.drda.host"></topicref>
 <topicref href="radmindrdakeepalive.dita" navtitle="derby.drda.keepAlive">
 </topicref>
 <topicref href="radminconfigdb2jdrdalogconnections.dita" navtitle="derby.drda.logConnections">
 </topicref>
-<topicref href="radmindrdamaxthreads.dita" navtitle="derby.drda.maxThreads">
+<topicref href="radmindrdamaxthreads.dita" navtitle="derby.drda.maxThreads ">
 </topicref>
-<topicref href="radmindrdaminthreads.dita" navtitle="derby.drda.minThreads">
+<topicref href="radmindrdaminthreads.dita" navtitle="derby.drda.minThreads ">
 </topicref>
 <topicref href="radminconfigportnumber.dita" navtitle="derby.drda.portNumber">
 </topicref>
 <topicref href="radminconfigstartnetworkserver.dita" navtitle="derby.drda.startNetworkServer">
 </topicref>
-<topicref href="radmindrdatimeslice.dita" navtitle="derby.drda.timeslice">
+<topicref href="radmindrdatimeslice.dita" navtitle="derby.drda.timeslice ">
 </topicref>
 <topicref href="radminconfig.dita" navtitle="derby.drda.traceAll"></topicref>
 <topicref href="radminconfigdb2jdrdatracedirectory.dita" navtitle="derby.drda.traceDirectory">
@@ -162,16 +166,16 @@
 <topicref href="tadminconfigverifyingstartup.dita" navtitle="Verifying Startup">
 </topicref>
 </topicref>
-<topicref href="cadminservlet98430.dita" navtitle="Managing the Derby Network Server remotely using the servlet interface">
+<topicref collection-type="family" href="cadminservlet98430.dita" navtitle="Managing the Derby Network Server remotely by using the servlet interface">
 <topicref href="radminservlet810694.dita" navtitle="Start-up page"></topicref>
 <topicref href="radminservlet810717.dita" navtitle="Running page"></topicref>
 <topicref href="radminservlet810796.dita" navtitle="Trace session page"></topicref>
 <topicref href="radminservlet810822.dita" navtitle="Trace directory page">
 </topicref>
-<topicref href="radminservlet810910.dita" navtitle="Set Network Server parameters">
+<topicref href="radminservlet810910.dita" navtitle="Set Network Server parameters ">
 </topicref>
 </topicref>
-<topicref href="cadminadvtops.dita" navtitle="Derby Network Server advanced topics">
+<topicref collection-type="family" href="cadminadvtops.dita" navtitle="Derby Network Server advanced topics">
 <topicref href="cadminnetservsecurity.dita" navtitle="Network Server security">
 </topicref>
 <topicref href="tadminnetservrun.dita" navtitle="Running the Network Server under the security manager">
@@ -187,41 +191,40 @@
 </topicref>
 </topicref>
 </topicref>
-<topicref href="radminsampleprograms.dita" navtitle="Derby Network Server sample programs">
-<topicref href="radminovnssample.dita" navtitle="The NsSample sample program">
-<topicref href="cadminovnsdemo.dita" navtitle="Overview of the NsSample sample program">
-</topicref>
+<topicref collection-type="family" href="radminsampleprograms.dita" navtitle="Derby Network Server sample programs">
+<topicref collection-type="family" href="radminovnssample.dita" navtitle="The NsSample sample program">
 <topicref href="tadminovnsrundemo.dita" navtitle="Running the NsSample sample program">
 </topicref>
 </topicref>
-<topicref href="cadminovntsrvsample.dita" navtitle="Network Server sample programs for embedded and client connections">
+<topicref collection-type="family" href="cadminovntsrvsample.dita" navtitle="Network Server sample programs for embedded and client connections">
 <topicref href="cadminovsrvsmpprgm.dita" navtitle="Overview of the SimpleNetworkServerSample program">
 </topicref>
 <topicref href="tadminovrunsrvprgm.dita" navtitle="Running the SimpleNetworkServerSample program">
 </topicref>
-<topicref href="cadminovcliconnect.dita" navtitle="Connecting a client to the Network Server with the SimpleNetworkClientSample program">
-</topicref>
+<topicref href="cadminovcliconnect.dita" navtitle="Connecting a client to the Network Server with the SimpleNetworkClientSample
+program"></topicref>
 <topicref href="tadminovclirun.dita" navtitle="Running the SimpleNetworkClientSample program">
 </topicref>
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cadminparttwo.dita" navtitle="Derby Administration Guide">
-<topicref href="cadminconsist01.dita" navtitle="Checking database consistency">
+<topicref collection-type="family" href="cadminparttwo.dita" navtitle="Part two: Derby Administration Guide">
+<topicref collection-type="family" href="cadminconsist01.dita" navtitle="Checking database consistency">
 <topicref href="radminconsist30301.dita" navtitle="The SYSCS_CHECK_TABLE function">
 </topicref>
-<topicref href="radminconsist38781.dita" navtitle="Sample error messages">
+<topicref href="radminconsist38781.dita" navtitle="Sample SYSCS_CHECK_TABLE error messages">
 </topicref>
-<topicref href="radminconsist24642.dita" navtitle="Sample queries"></topicref>
+<topicref href="radminconsist24642.dita" navtitle="Sample SYSCS_CHECK_TABLE queries">
 </topicref>
-<topicref href="cadminhubbkup98797.dita" navtitle="Backing up and restoring databases">
-<topicref href="cadminbckupdb.dita" navtitle="Backing up a database">
-<topicref href="cadminhubbkup12677.dita" navtitle="Offline backups"></topicref>
-<topicref href="cadminhubbkup63476.dita" navtitle="Online backups">
-<topicref href="cadminhubbkup01.dita" navtitle="Using the backup procedure">
 </topicref>
-<topicref href="cadminhubbkup75469.dita" navtitle="Using operating system commands with the freeze and unfreeze system procedures">
+<topicref collection-type="family" href="cadminhubbkup98797.dita" navtitle="Backing up and restoring databases">
+<topicref collection-type="family" href="cadminbckupdb.dita" navtitle="Backing up a database">
+<topicref href="cadminhubbkup12677.dita" navtitle="Offline backups"></topicref>
+<topicref collection-type="family" href="cadminhubbkup63476.dita" navtitle="Online backups">
+<topicref href="cadminhubbkup01.dita" navtitle="Using the backup procedure to perform an online backup">
 </topicref>
+<topicref href="cadminhubbkup75469.dita" navtitle="Using operating system commands with the freeze and unfreeze system
+procedures to perform an online backup"></topicref>
 </topicref>
 <topicref href="cadminhubbkup67525.dita" navtitle="When the log is in a non-default location">
 </topicref>
@@ -235,8 +238,8 @@
 <topicref href="cadminrollforward.dita" navtitle="Roll-forward recovery">
 </topicref>
 </topicref>
-<topicref href="cadminlog98.dita" navtitle="Logging on a separate device">
-<topicref href="tadminlog800206.dita" navtitle="Using the logDevice property">
+<topicref collection-type="family" href="cadminlog98.dita" navtitle="Logging on a separate device">
+<topicref href="tadminlog800206.dita" navtitle="Using the logDevice attribute">
 </topicref>
 <topicref href="radminlog800241.dita" navtitle="Example of creating a log in a non-default location">
 </topicref>
@@ -245,11 +248,10 @@
 <topicref href="cadminlog800315.dita" navtitle="Issues for logging in a non-default location">
 </topicref>
 </topicref>
-<topicref href="cadminlockvti42553.dita" navtitle="Getting locking information">
+<topicref collection-type="family" href="cadminlockvti42553.dita" navtitle="Getting locking information">
 <topicref href="cadminlockvti83889.dita" navtitle="Lock monitoring"></topicref>
 </topicref>
-<topicref href="cadminspace21579.dita" navtitle="Reclaiming unused space: Overview">
-<topicref href="tadminspace43.dita" navtitle="Reclaiming unused space"></topicref>
+<topicref href="cadminspace21579.dita" navtitle="Reclaiming unused space">
 </topicref>
 </topicref>
 <topicref href="radmintrademderby.dita" navtitle="Trademarks"></topicref>

Modified: incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita Tue Jun 28 15:46:15 2005
@@ -17,27 +17,26 @@
 limitations under the License.
 -->
 <reference id="radminapps811974" xml:lang="en-us">
-<title>Network Server error messages</title>
+<title>Error message differences</title>
 <prolog><metadata>
 <keywords><indexterm>Network Server<indexterm>error messages and</indexterm></indexterm>
 <indexterm>Error messages<indexterm>and the Network Server</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p>The Network Server reports only the first error/warning if multiple
-errors or warnings occur for a given statement. For example: <codeblock>ij&gt; create table ai (x int, y int generated always as identity
+<section><p>The Network Server reports only the first error or warning message
+if multiple errors or warnings occur for a given statement. For example: <codeblock>ij&gt; create table ai (x int, y int generated always as identity
 	(increment by 200000000));
 ij&gt; insert into ai (x) values (1),(2),(3),(4),(5),(6),(7),
 (8),(9),(10),(11),(12),(13),(14),(15),(16),(17),(18),(19);</codeblock></p></section>
-<section><p>The Network Server generates the following error with the exception
-message appended to error: <codeblock>ERROR 42Z24: Overflow occurred in identity for column 'Y' in table 'AI':
+<section><p>The Network Server generates the following error message and appends
+the exception message to the error: <codeblock>ERROR 42Z24: Overflow occurred in identity for column 'Y' in table 'AI':
 SQLSTATE: 22003: The resulting value is outside the range 
 for the data type INTEGER.</codeblock></p></section>
-<section><p>Using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> embedded
-driver, you would see the following two SQL exceptions: : <codeblock>ERROR 42Z24: Overflow occurred in identity for column 'Y' in table 'AI'. 
+<section><p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> embedded
+driver, however, would generate two SQL exceptions:<codeblock>ERROR 42Z24: Overflow occurred in identity for column 'Y' in table 'AI'. 
 </codeblock> <codeblock>ERROR 22003: The resulting value is outside the range for the data type INTEGER.</codeblock></p></section>
-<section><p>This is because the Network Client driver reports only one SQLException
-or one <i>SQLWarning </i>per statement.</p></section>
+<section><p>This is because the network client driver reports only one SQLException
+or one SQLWarning per statement.</p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita Tue Jun 28 15:46:15 2005
@@ -20,20 +20,19 @@
 <title>Network client driver examples</title>
 <refbody>
 <section><title>Example 1</title><p>The following example connects to the
-default server name <i>localhost</i> on the default port, <i>1527</i>, and
-to the database <i>sample</i>. It specifies the <i>user</i> and <i>password</i> URL
-attributes. You must set these attributes before attempting to connect to
-the server.</p><codeblock>jdbc:derby://localhost:1527/sample;user=judy;password=no12see;</codeblock></section>
+default server name localhost on the default port, 1527, and to the database
+sample. It specifies the user and password URL attributes. You must set these
+attributes before attempting to connect to the server.</p><codeblock>jdbc:derby://localhost:1527/sample;user=judy;password=no12see;</codeblock></section>
 <section><title>Example 2</title><p>The following example specifies both <ph
 conref="adminconrefs.dita#prod/productshortname"></ph> and Network Client
 driver attributes:  <codeblock>jdbc:derby://localhost:1527/sample;create=true;user=judy;
 password=no12see;</codeblock></p></section>
 <section><title>Example 3</title><p>This example connects to the default server
-name <i>localhost</i> on the default port, <i>1527</i>, and includes the path
-in the database name portion of the URL.</p><codeblock>jdbc:derby://localhost:1527/c:/my-db-dir/my-db-name;user=judy;
+name localhost on the default port, 1527, and includes the path in the database
+name portion of the URL.</p><codeblock>jdbc:derby://localhost:1527/c:/my-db-dir/my-db-name;user=judy;
 password=no12see;</codeblock></section>
-<section><title>Example 4</title><p>The following is a sample program fragment
-that connects to the Network Server using the Network Client driver:</p><codeblock>String databaseURL = "jdbc:derby://localhost:1527/sample";
+<section><title>Example 4</title><p>The following example shows how to use
+the network client driver to connect the network client to the Network Server:</p><codeblock>String databaseURL = "jdbc:derby://localhost:1527/sample";
 <b>// Load Derby Network Client driver class</b>
 Class.forName("org.apache.derby.jdbc.ClientDriver");
 <b>// Set user and password properties</b>

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfig.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfig.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfig.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfig.dita Tue Jun 28 15:46:15 2005
@@ -27,8 +27,8 @@
 <refsyn><title>Syntax</title> <codeblock>derby.drda.traceAll=[true|false]</codeblock> </refsyn>
 <section><title>Default</title> <p>False.</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.traceAll=true</b></codeblock> </example>
-<section><title>Static or Dynamic</title> <p>Dynamic. System values can be
-changed using commands or the servlet interface after the Network Server has
+<section><title>Static or dynamic</title> <p>Dynamic. System values can be
+changed by using commands or the servlet interface after the Network Server has
 been started.</p> </section>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita Tue Jun 28 15:46:15 2005
@@ -26,8 +26,8 @@
 <refsyn><title>Syntax</title> <codeblock>derby.drda.logConnections=[true|false]</codeblock> </refsyn>
 <section><title>Default</title> <p>False.</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.logConnections=true </b></codeblock></example>
-<section><title>Static or Dynamic</title><p>Dynamic. System values can be
-changed using commands or the servlet interface after the Network Server has
+<section><title>Static or dynamic</title><p>Dynamic. System values can be
+changed by using commands or the servlet interface after the Network Server has
 been started.</p> </section>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita Tue Jun 28 15:46:15 2005
@@ -23,14 +23,14 @@
 <keywords><indexterm>derby.drda.traceDirectory</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>Indicates the location for tracing files. </section>
+<section>Indicates the location of tracing files. </section>
 <refsyn><title>Syntax</title> <codeblock>derby.drda.traceDirectory=<i>tracefiledirectory</i></codeblock> </refsyn>
-<section><title>Default</title> <p>If the <i>derby.system.home</i> property
+<section><title>Default</title> <p>If the derby.system.home property
 has been set, it is the default. Otherwise, the default is the current directory.</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.traceDirectory=c:/<ph
 conref="adminconrefs.dita#prod/productshortname"></ph>/trace</b></codeblock> </example>
-<section><title>Static or Dynamic</title> <p>Dynamic. System values can be
-changed using commands or the servlet interface after the Network Server has
+<section><title>Static or dynamic</title> <p>Dynamic. System values can be
+changed by using commands or the servlet interface after the Network Server has
 been started.</p> </section>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita Tue Jun 28 15:46:15 2005
@@ -27,7 +27,7 @@
 <section><title>Default</title><p>If no port number is specified, 1527 is
 the default.</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.portNumber=1110</b></codeblock> </example>
-<section><title>Static or Dynamic</title><p>Static. You must restart the Network
+<section><title>Static or dynamic</title><p>Static. You must restart the Network
 Server for changes to take effect.</p> </section>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita Tue Jun 28 15:46:15 2005
@@ -22,14 +22,14 @@
 <keywords><indexterm>derby.drda.startNetworkServer</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>Use the <i>derby.drda.startNetworkServer</i> property to simplify
-embedding the Network Server in your application. When you set <i>derby.drda.startNetworkServer</i>,
+<section>Use the derby.drda.startNetworkServer property to simplify
+embedding the Network Server in your application. When you set derby.drda.startNetworkServer,
 the Network Server will automatically start when you start <ph conref="adminconrefs.dita#prod/productshortname"></ph>.
 Only one Network Server can be started in a JVM.</section>
 <refsyn><title>Syntax</title><codeblock>derby.drda.startNetworkServer=[true | false]</codeblock> </refsyn>
-<section><title>Default</title><p>false</p> </section>
+<section><title>Default</title><p>False.</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.startNetworkServer=true</b></codeblock> </example>
-<section><title>Static or Dynamic</title><p>Static. You must shut down the
+<section><title>Static or dynamic</title><p>Static. You must shut down the
 Network Server and restart <ph conref="adminconrefs.dita#prod/productshortname"></ph> for
 this change to take effect.</p> </section>
 </refbody>

Modified: incubator/derby/docs/trunk/src/adminguide/radminconsist24642.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconsist24642.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconsist24642.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconsist24642.dita Tue Jun 28 15:46:15 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -18,28 +17,29 @@
 limitations under the License.
 -->
 <reference id="radminconsist24642" xml:lang="en-us">
-<title>Sample queries</title>
+<title>Sample SYSCS_CHECK_TABLE queries</title>
 <prolog><metadata>
-<keywords><indexterm>Queries<indexterm>Sample</indexterm></indexterm>
-</keywords>
+<keywords><indexterm>Queries<indexterm>Sample</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p>This section provides examples that illustrate how to use <i>SYSCS_UTIL.SYSCS_CHECK_TABLE() </i> in
-queries.</p></section>
-<section><p>Check the consistency of a single table:</p></section>
-<example><codeblock><b>VALUES SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'FLIGHTS')</b></codeblock></example>
-<section><p>Check the consistency of all of the tables in a schema, stopping
-at the first failure: </p></section>
-<example><codeblock><b>SELECT tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE(
+<section><p>This section provides examples that illustrate how to use the
+SYSCS_UTIL.SYSCS_CHECK_TABLE function in queries.</p></section>
+<section><p>To check the consistency of a single table, run a query that is
+similar to the one shown in the following example:</p></section>
+<example><codeblock>VALUES SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'FLIGHTS')</codeblock></example>
+<section><p>To check the consistency of all of the tables in a schema, stopping
+at the first failure, run a query that is similar to the one shown in the
+following example:</p></section>
+<example><codeblock>SELECT tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE(
     'SAMP', tablename)
 FROM sys.sysschemas s, sys.systables t
-WHERE s.schemaname = 'SAMP' AND s.schemaid = t.schemaid</b></codeblock></example>
-<section><p>Check the consistency of an entire database, stopping at the first
-failure:</p></section>
-<example><codeblock><b>SELECT schemaname, tablename,
+WHERE s.schemaname = 'SAMP' AND s.schemaid = t.schemaid</codeblock></example>
+<section><p>To check the consistency of an entire database, stopping at the
+first failure, run a query that is similar to the one shown in the following
+example::</p></section>
+<example><codeblock>SELECT schemaname, tablename,
 SYSCS_UTIL.SYSCS_CHECK_TABLE(schemaname, tablename)
 FROM sys.sysschemas s, sys.systables t
-WHERE s.schemaid = t.schemaid</b></codeblock></example>
+WHERE s.schemaid = t.schemaid</codeblock></example>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/adminguide/radminconsist30301.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconsist30301.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconsist30301.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconsist30301.dita Tue Jun 28 15:46:15 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -17,7 +16,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
 <reference id="radminconsist30301" xml:lang="en-us">
 <title>The SYSCS_CHECK_TABLE function</title>
 <prolog><metadata>
@@ -25,27 +23,24 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p>The <i>SYSCS_UTIL.SYSCS_CHECK_TABLE()</i> checks the consistency
-of a <ph conref="adminconrefs.dita#prod/productshortname"></ph> table. You
-run this function in an SQL statement, as follows:</p></section>
+<section><p>The SYSCS_UTIL.SYSCS_CHECK_TABLE() function checks the consistency
+of a <ph conref="adminconrefs.dita#prod/productshortname"></ph> table. In
+particular, the <i>SYSCS_UTIL.SYSCS_CHECK_TABLE</i> function verifies the
+following conditions:<ul>
+<li>Base tables are internally consistent</li>
+<li>Base tables and all associated indexes contain the same number of rows</li>
+<li>The values and row locations in each index match those of the base table</li>
+<li>All BTREE indexes are internally consistent</li>
+</ul>You run this function in an SQL statement, as follows:</p></section>
 <example> <codeblock>VALUES SYSCS_UTIL.SYSCS_CHECK_TABLE(
-    SchemaName, TableName)</codeblock></example>
-<section><p><i>SYSCS_CHECK_TABLE</i> returns a smallint. If the table is consistent
-(or if <codeph><i>SYSCS_CHECK_TABLE</i></codeph> is run on a view), <codeph><i>SYSCS_CHECK_TABLE </i></codeph> returns
-a non-zero value. Otherwise, <codeph><i>SYSCS_CHECK_TABLE</i></codeph> throws
-an exception on the first inconsistency it finds.</p></section>
-<section><p><i>SYSCS_UTIL.SYSCS_CHECK_TABLE</i> verifies the following:</p></section>
-<section> <ul>
-<li>Base tables are internally consistent.</li>
-<li>Base tables and all associated indexes contain the same number of rows.</li>
-<li>The values and row locations in each index match those of the base table.</li>
-<li>All BTREE indexes are internally consistent.</li>
-</ul></section>
-<section> <note>Both <i>SchemaName</i> and <i>TableName</i> must be any expression
-that evaluates to a string data type. If you created a schema or table name
-as a non-delimited identifier, you must present their names in all upper case.
-For example:</note></section>
-<example> <codeblock><b>VALUES SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'CITIES')</b></codeblock></example>
+    <i>SchemaName</i>, <i>TableName</i>)</codeblock>where <i>SchemaName</i> and <i>TableName</i> are
+expressions that evaluate to a string data type. If you created a schema or
+table name as a non-delimited identifier, you must present their names in
+all upper case. For example:<codeblock>VALUES SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'CITIES')</codeblock></example>
+<section><p>The SYSCS_UTIL.SYSCS_CHECK_TABLE function returns a smallint.
+If the table is consistent (or if you run SYSCS_UTIL.SYSCS_CHECK_TABLE on
+a view), SYSCS_UTIL.SYSCS_CHECK_TABLE returns a non-zero value. Otherwise,
+the function throws an exception on the first inconsistency that it finds.</p></section>
 <section><p>For a consistent table, the following result is displayed:</p></section>
 <example> <codeblock>1
 -----
@@ -54,4 +49,3 @@
 1 row selected</codeblock></example>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/adminguide/radminconsist38781.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconsist38781.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconsist38781.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconsist38781.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,27 +16,32 @@
 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="radminconsist38781">
-<title>Sample error messages</title>
-<prolog>
-</prolog>
+<reference id="radminconsist38781" xml:lang="en-us">
+<title>Sample SYSCS_CHECK_TABLE error messages</title>
+<shortdesc>This section provides examples of error messages that the SYSCS_UTIL.SYSCS_CHECK_TABLE()
+function can return.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>SYSCS_CHECK_TABLE error messages</indexterm></keywords>
+</metadata></prolog>
 <refbody>
-<section><p>This section provides examples of error messages that <i>SYSCS_UTIL.SYSCS_CHECK_TABLE() </i> can return.</p></section>
-<section><p>The row counts of the base table and an index differ:</p></section><example>
-<codeblock>ERROR X0Y55: The number of rows in the base table does not match 
+<section><p>If the row counts of the base table and an index differ, error
+message X0Y55 is issued:</p></section>
+<example> <codeblock>ERROR X0Y55: The number of rows in the base table does not match 
 the number of rows in at least 1 of the indexes on the table. Index 
 'T1_I' on table 'APP.T1' has 4 rows, but the base table has 5 rows. 
 The suggested corrective action is to recreate the index.</codeblock></example>
-<section><p>The index refers to a row that does not exist in the base table:</p></section><example>
-<codeblock>ERROR X0X62: Inconsistency found between table 'APP.T1' and index
+<section><p>If the index refers to a row that does not exist in the base table,
+error message X0X62 is issued:</p></section>
+<example> <codeblock>ERROR X0X62: Inconsistency found between table 'APP.T1' and index
 'T1_I'. Error when trying to retrieve row location '(1,6)' from the 
 table. The full index key,including the row location, is '{ 1, (1,6) }'.
 The suggested corrective action is to recreate the index.</codeblock></example>
-<section><p>A key column value differs between the base table and the index:</p></section><example>
-<codeblock>ERROR X0X61: The values for column 'C10' in index 'T1_C10' and 
+<section><p>If a key column value differs between the base table and the index,
+error message X0X61 is issued:</p></section>
+<example> <codeblock>ERROR X0X61: The values for column 'C10' in index 'T1_C10' and 
 table 'APP.T1' do not match for row location (1,7). The value in the 
 index is '2 2   ', while the value in the base table is 'NULL'. The full
 index key, including the row location, is '{ 2 2       , (1,7) }'. The 
 suggested corrective action is to recreate the index.</codeblock></example>
-</refbody></reference>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita Tue Jun 28 15:46:15 2005
@@ -23,19 +23,19 @@
 <keywords><indexterm>derby.drda.host</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>Indicates that Network Server listen on a specific network interface.
-This allows multiple instances of Network Server to run on a single machine
+<section>Causes the Network Server to listen on a specific network interface.
+This property allows multiple instances of Network Server to run on a single machine,
 each using its own unique host:port combination. The host needs to be set
-to enable remote connections. By default, the Network Server will only listen
+to enable remote connections. By default, the Network Server will listen only
 on the loopback address. If the property is set to 0.0.0.0, Network Server
 will listen on all interfaces. Ensure that you are running under the security
-manager and that you have user authorization enabled before enabling remote
+manager and that user authorization is enabled before you enable remote
 connections with this property. </section>
 <refsyn><title>Syntax</title> <codeblock>derby.drda.host = <i>hostname</i></codeblock> </refsyn>
-<section><title>Default</title> <p>If no host is specified, the Network Server
+<section><title>Default</title> <p>If no host name is specified, the Network Server
 listens on the loopback address of the current machine (localhost).</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.host=myhost</b></codeblock> </example>
-<section><title>Static or Dynamic</title> <p>Static. You must restart the
+<section><title>Static or dynamic</title> <p>Static. You must restart the
 Network Server for changes to take effect.</p> </section>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita Tue Jun 28 15:46:15 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -23,23 +22,22 @@
 <keywords><indexterm>derby.drda.keepAlive</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>Indicates whether SO_KEEPALIVE is enabled on Sockets. The keepAlive
+<section>Indicates whether SO_KEEPALIVE is enabled on sockets. The keepAlive
 mechanism is used to detect when clients disconnect unexpectedly.  A <i>keepalive
 probe</i> is sent to the client if a long time (by default, more than two
-hours) passes with no other data being sent or received.    <ph conref="adminconrefs.dita#prod/productlowercase"></ph>.drda.keepAlive
-is used to detect and clean up connections for clients on powered-off machines
-or clients that have disconnected unexpectedly. </section>
-<section> If the property is set to <codeph>false</codeph>, <ph conref="adminconrefs.dita#prod/productshortname"></ph> will
-not attempt to clean up disconnected clients. keepAlive might
+hours) passes with no other data being sent or received. <ph conref="adminconrefs.dita#prod/productlowercase"></ph>.
+The drda.keepAlive property is used to detect and clean up connections for
+clients on powered-off machines or clients that have disconnected unexpectedly. </section>
+<section> If the property is set to false, <ph conref="adminconrefs.dita#prod/productshortname"></ph> will
+not attempt to clean up disconnected clients. The keepAlive mechanism might
 be disabled if clients need to resume work without reconnecting even after
 being disconnected from the network for some time. To disable keepAlive probes
-on Network Server connections, set this property to <codeph>false</codeph>.</section>
+on Network Server connections, set this property to false.</section>
 <section><title></title></section>
 <refsyn><title>Syntax</title><codeblock>derby.drda.keepAlive=[true|false] </codeblock></refsyn>
-<section><title>Default</title><p>True </p></section>
+<section><title>Default</title><p>True.</p></section>
 <example><title>Example</title><codeblock>derby.drdra.keepAlive=false </codeblock></example>
-<section><title>Static or Dynamic</title><p>Static. You must restart the Network
+<section><title>Static or dynamic</title><p>Static. You must restart the Network
 Server for changes to take effect.</p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita Tue Jun 28 15:46:15 2005
@@ -23,15 +23,14 @@
 <keywords><indexterm>derby.drda.maxThreads </indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>Use the <i>derby.drda.maxThreads</i> property to set a maximum number
+<section>Use the derby.drda.maxThreads property to set a maximum number
 of connection threads that Network Server will allocate. If all of the connection
 threads are currently being used and the Network Server has already allocated
-the maximum amount of threads, then threads will be shared using the <i>derby.drda.timeslice</i> property
-to determine when sessions will be swapped.</section>
+the maximum number of threads, the threads will be shared by using the derby.drda.timeslice property to determine when sessions will be swapped.</section>
 <refsyn><title>Syntax</title> <codeblock><ph>derby.drda.maxThreads=<i>numthreads</i></ph></codeblock> </refsyn>
 <section><title>Default</title> <p>1</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.maxThreads=50</b></codeblock> </example>
-<section><title>Static or Dynamic</title> <p>Static. You must restart the Network Server for changes to take effect.</p> </section>
+<section><title>Static or dynamic</title> <p>Static. You must restart the Network Server for changes to take effect.</p> </section>
 </refbody>
 </reference>
 

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita Tue Jun 28 15:46:15 2005
@@ -22,12 +22,12 @@
 <keywords><indexterm>derby.drda.minThreads </indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>Use the <i>derby.drda.minThreads</i> property to set a minimum number
+<section>Use the derby.drda.minThreads property to set the minimum number
 of connection threads that Network Server will allocate. By default, connection
 threads are allocated as needed.</section>
 <refsyn><title>Syntax</title><codeblock><ph>derby.drda.minThreads=<i>numthreads</i></ph></codeblock> </refsyn>
 <section><title>Default</title><p>1</p> </section>
 <example><title>Example</title><codeblock><b>derby.drda.minThreads=10</b></codeblock> </example>
-<section><title>Static or Dynamic</title> <p>Static. You must restart the Network Server for changes to take effect.</p> </section>
+<section><title>Static or dynamic</title> <p>Static. You must restart the Network Server for changes to take effect.</p> </section>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita Tue Jun 28 15:46:15 2005
@@ -23,13 +23,12 @@
 <keywords><indexterm>derby.drda.timeslice</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>Use the <i>derby.drda.timeslice</i> to set the number of milliseconds
-each connection will use before yielding to another connection. This property
-is only relevant if the <i>derby.drda.maxThreads</i> property is set.</section>
+<section>Use the derby.drda.timeslice property to set the number of milliseconds that each connection will use before yielding to another connection. This property
+is relevant only if the derby.drda.maxThreads property is set.</section>
 <refsyn><title>Syntax</title> <codeblock><ph>derby.drda.timeslice=<i>milliseconds</i></ph></codeblock> </refsyn>
 <section><title>Default</title> <p>1</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.timeslice=2000</b></codeblock> </example>
-<section><title>Static or Dynamic</title> <p>Static. You must restart the Network Server for changes to take effect.</p> </section>
+<section><title>Static or dynamic</title> <p>Static. You must restart the Network Server for changes to take effect.</p> </section>
 </refbody>
 </reference>
 

Modified: incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita Tue Jun 28 15:46:15 2005
@@ -22,23 +22,21 @@
 <keywords><indexterm>Embedded server example</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p>Network Server can be started in another thread automatically
-when <ph conref="adminconrefs.dita#prod/productshortname"></ph> boots by setting
-the <i>derby.drda.startNetworkServer</i> property (see <xref href="tadminconfigsettingnetwrokserverproperties.dita#tadminconfigsettingnetwrokserverproperties"
-></xref>), or it can be started by using a program. For example:</p></section>
+<section><p>You can start the Network Server in another thread automatically
+when <ph conref="adminconrefs.dita#prod/productshortname"></ph> starts by setting
+the <i>derby.drda.startNetworkServer</i> property (see <xref href="tadminconfigsettingnetwrokserverproperties.dita#tadminconfigsettingnetwrokserverproperties"></xref>), or you can start it by using a program. The following example shows how to start the Network Server by using a program:</p></section>
 <example> <codeblock>import org.apache.derby.drda.NetworkServerControl;
 import java.net.InetAddress;
 NetworkServerControl server = new NetworkServerControl
 	(InetAddress.getByName("localhost"),1527);
 server.start(null);</codeblock></example>
-<section><p>The program that starts Network Server can access the database
-with either the embedded driver or the Network Client driver.
+<section><p>The program that starts the Network Server can access the database
+by using either the embedded driver or the Network Client driver.
 The server framework's attempt to boot the local JDBC driver is ignored because
 it has already been booted within the application's JVM. The server framework
-simply accesses the instance of <ph conref="adminconrefs.dita#prod/productshortname"></ph> already
-booted. There is no conflict between the application and the server framework.</p></section>
-<section><p>The remote client can then connect via the <ph conref="adminconrefs.dita#prod/productshortname"></ph> client
-driver: </p></section>
+simply accesses the instance of <ph conref="adminconrefs.dita#prod/productshortname"></ph> that is already booted. There is no conflict between the application and the server framework.</p></section>
+<section><p>The remote client can then connect through the <ph conref="adminconrefs.dita#prod/productshortname"></ph> client
+driver:</p></section>
 <section><p> <codeblock>String nsURL="jdbc:derby://localhost:1527/sample";  
 java.util.Properties props = new java.util.Properties();
 props.put("user","usr");

Modified: incubator/derby/docs/trunk/src/adminguide/radminlog800279.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminlog800279.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminlog800279.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminlog800279.dita Tue Jun 28 15:46:15 2005
@@ -20,9 +20,9 @@
 <prolog>
 </prolog>
 <refbody>
-<section><p>If you later want to move the log to <filepath>g:/bigdisk/tourslog</filepath>, move the log with operating system commands:</p></section><example>
+<section><p>If you want to move the log to <filepath>g:/bigdisk/tourslog</filepath>, move the log with operating system commands:</p></section><example>
 <codeblock><b>move h:\janets\tourslog\log\*.* g:\bigdisk\tourslog\log</b></codeblock></example>
-<section><p>and alter the <i>logDevice </i>entry in <i>service.properties</i> to read as follows:</p></section><example>
+<section><p>Then, alter the <i>logDevice </i>entry in <i>service.properties</i> to read as follows:</p></section><example>
 <codeblock>logDevice=g:/bigdisk/toursLog</codeblock></example><section>
 <note>You can use either a single forward slash or double back slashes
 for a path separator.</note></section>
@@ -30,8 +30,8 @@
 case, <filepath>d:\mydatabases\toursDB\log</filepath>), move
 the log manually as follows:</p></section><example>
 <codeblock><b>move g:\bigdisk\tourslog\log\*.* d:\mydatabases\toursDB\log</b></codeblock></example>
-<section><p>and delete the <i>logDevice </i>entry from <i>service.properties.</i></p></section><section>
-<note>This example uses commands specific to the Windows NT operating
+<section><p>Then, delete the <i>logDevice </i>entry from <i>service.properties.</i></p></section><section>
+<note>This example uses commands that are specific to the Windows NT operating
 system. Use commands appropriate to your operating system to copy a directory
-and all contents to a new location.</note></section>
+and all of its contents to a new location.</note></section>
 </refbody></reference>

Modified: incubator/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,26 +16,25 @@
 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="radminnsdatasourcexmp">
+<reference id="radminnsdatasourcexmp" xml:lang="en-us">
 <title>DataSource access example</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <refbody>
 <section><p>The following example uses <codeph>org.apache.derby.jdbc.ClientDataSource</codeph> to
-access the Network Server:</p></section><example>
-<codeblock>public static javax.sql.DataSource getDS(String database, String user, String
+access the Network Server:</p></section>
+<example> <codeblock>public static javax.sql.DataSource getDS(String database, String user, String
 password) throws SQLException
 {
-org.apache.derby.jdbc.ClientDataSource ds = new org.apache.derby.jdbc.ClientDataSource();
+org.apache.derby.jdbc.ClientDataSource ds =
+   new org.apache.derby.jdbc.ClientDataSource();
 
 // DatabaseName can include <ph conref="adminconrefs.dita#prod/productshortname"></ph> URL Attributes
-ds.setDatabaseName(database);
+ds.setDatabaseName(<i>database</i>);
 
 if (user != null)
-   ds.setUser(user);
+   ds.setUser(<i>user</i>);
 if (password != null)
-   ds.setPassword(password);
+   ds.setPassword(<i>password</i>);
 
 // The host on which Network Server is running
 ds.setServerName("localhost");
@@ -44,8 +45,8 @@
 return ds;
 }
 </codeblock></example>
-<section><p>The program then can connect:
-<codeblock>javax.sql.DataSource ds = getDS("mydb;create=true", null, null);
+<section><p>The program then can connect: <codeblock>javax.sql.DataSource ds = getDS("mydb;create=true", null, null);
 // Note:  user and password are required on connection
 Connection conn = ds.getConnection("usr2", "pass2");</codeblock></p></section>
-</refbody></reference>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/adminguide/radminovnssample.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminovnssample.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminovnssample.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminovnssample.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,21 +16,68 @@
 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="radminovnssample">
+<reference id="radminovnssample" xml:lang="en-us">
 <title>The NsSample sample program</title>
+<shortdesc>The <i>NsSample</i> demonstration program is a simple JDBC application
+that interacts with the Network Server.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Network Server<indexterm>NsSample sample program</indexterm></indexterm>
+<keywords><indexterm>Network Server<indexterm>NsSample sample program</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <refbody>
-<section><p>The <i>NsSample</i> program is a simple JDBC application
-that interacts with the Network Server.</p></section>
-<section><p>This topic includes the following sections:</p></section><section>
-<ul>
-<li><xref href="cadminovnsdemo.dita#cadminovnsdemo"/></li>
-<li><xref href="tadminovnsrundemo.dita#tadminovnsrundemo"/></li>
-</ul></section>
-</refbody></reference>
+<section><p>The <i>NsSample</i> program performs the following tasks: <ul>
+<li>Starts the Network Server. </li>
+<li>Checks that the Network Server is running.</li>
+<li>Loads the Network Client driver. </li>
+<li>Creates the <i>NsSampledb</i> database if not already created. </li>
+<li>Checks to see if the schema is already created, and if not, creates the
+schema which includes the SAMPLETBL table and corresponding indexes. </li>
+<li>Connects to the database.</li>
+<li>Loads the schema by inserting data. </li>
+<li>Starts client threads to perform database related operations. </li>
+<li>Has each of the clients perform DML operations (select, insert, delete,
+update) using JDBC calls. For example, one client thread establishes an embedded
+connection to perform database operations, while another client thread establishes
+a client connection to the Network Server to perform database operations. </li>
+<li>Waits for the client threads to finish the tasks. </li>
+<li>Shuts down the Network Server at the end of the demonstration.</li>
+</ul></p><p>You must install the following files in the <codeph>%<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\programs\nserverdemo\</codeph
+> directory before you can run the sample program: <ul>
+<li><filepath>NsSample.java</filepath> <p>This is the entry point into the
+sample program. The program starts up two client threads. The first client
+establishes an embedded connection to perform database operations, and the
+second client establishes a client connection to the Network Server to perform
+database operations.</p><p>You can change the following constants to modify
+the sample program:</p><dl><dlentry>
+<dt>NUM_ROWS</dt>
+<dd>The number of rows that must be initially loaded into the schema.</dd>
+</dlentry><dlentry>
+<dt>ITERATIONS</dt>
+<dd>The number of iterations for which each client thread does database related
+work.</dd>
+</dlentry><dlentry>
+<dt>NUM_CLIENT_THREADS</dt>
+<dd>The number of clients that you want to run the program against.</dd>
+</dlentry><dlentry>
+<dt>NETWORKSERVER_PORT</dt>
+<dd>The port on which the Network Server is running.</dd>
+</dlentry></dl></li>
+<li><filepath>NsSampleClientThread.java</filepath> <p>This file contains two
+Java classes:  <ul>
+<li>The NsSampleClientThread class extends Thread and instantiates a NsSampleWork
+instance. </li>
+<li>The NsSampleWork class contains everything that is required to perform
+DML operations using JDBC calls. The <i>doWork</i> method in the NsSampleWork
+class represents all the work done as part of this sample program. </li>
+</ul></p></li>
+<li><filepath>NetworkServerUtil.java</filepath>  <p>This file contains helper
+methods to start the Network Server and to shutdown the server.</p></li>
+<li>Compiled class files: <ul>
+<li><filepath>NsSample.class</filepath> </li>
+<li><filepath>NsSampleClientThread.class</filepath> </li>
+<li><filepath>NsSampleWork.class</filepath> </li>
+<li><filepath>NetworkServerUtil.class</filepath> </li>
+</ul></li>
+</ul></p></section>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/adminguide/radminservlet810694.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminservlet810694.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminservlet810694.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminservlet810694.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,22 +16,18 @@
 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="radminservlet810694">
+<reference id="radminservlet810694" xml:lang="en-us">
 <title>Start-up page</title>
+<shortdesc>Use the start-up page to start the server.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Starting Network Server<indexterm>from the servlet
-interface</indexterm></indexterm>
+<keywords><indexterm>Starting Network Server<indexterm>from the servlet interface</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <refbody>
-<section><p>Use the Start-up page to start the server.</p></section>
-<section><p>You can choose the following options from the startup page:</p></section><section>
-<ul>
+<section><p>In addition to starting the Network Server, you can use the startup
+page to perform the following actions:</p><ul>
 <li>Turn logging on when the server is started. </li>
 <li>Turn tracing on for all sessions when the server is started. </li>
-<li>Start the server. </li>
-</ul></section>
-</refbody></reference>
+</ul> </section>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/adminguide/radminservlet810717.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminservlet810717.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminservlet810717.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminservlet810717.dita Tue Jun 28 15:46:15 2005
@@ -39,8 +39,9 @@
 page is displayed.)</li>
 <li>Change tracing directory (If you choose this option, the Trace directory
 page is displayed.)</li>
+<li>Test the connection. (If you choose this option, the Test connection page is displayed.)</li>
 <li>Specify threading parameters for Network Server. (If you choose this option,
 the Thread parameters page is displayed.)</li>
-<li>Stop the application server. </li>
+<li>Stop the application server.</li>
 </ul></section>
 </refbody></reference>

Modified: incubator/derby/docs/trunk/src/adminguide/radminservlet810910.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminservlet810910.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminservlet810910.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminservlet810910.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,22 +16,18 @@
 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="radminservlet810910">
+<reference id="radminservlet810910" xml:lang="en-us">
 <title>Set Network Server parameters </title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <refbody>
-<section><p>The first page is displayed if the thread parameter button is pressed.
-This page sets the new parameters. Enter the following applicable information:</p></section><section>
-<ul>
+<section><p>The first page is displayed if the thread parameter button is
+pressed. Use this page to set the new parameters. Enter the following information:</p></section>
+<section> <ul>
 <li>New maximum number of threads</li>
 <li>New thread time slice</li>
-</ul></section><section>
-<note> If the either the maximum or time slice parameters are left
-blank, that value is left unchanged from the current setting. </note></section>
-<section><p>You are given the option of setting the parameters or returning to the
-previous menu.</p></section>
-<section><p>The updated values for the maximum and the time slice are displayed when
-Set Network Server Parameters is pressed. </p></section>
-</refbody></reference>
+</ul>If either the maximum threads or time slice parameters are left blank,
+that value is left unchanged from the current setting. </section>
+<section><p>Click Set Network Server parameters to display the updated values
+for the maximum threads and the time slice parameters.</p></section>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita Tue Jun 28 15:46:15 2005
@@ -23,16 +23,16 @@
 <step><cmd>Turn on tracing for all sessions by specifying the following property:</cmd>
 <stepxmp><codeblock>derby.drda.traceAll=true </codeblock>Alternatively, while
 the Network Server is running, you can use the following command to turn on
-the trace facility:<codeblock>java org.apache.derby.drda.NetworkServerControl trace on [-s &lt;<i>connection number</i>&gt;] 
-[-h &lt;<i>hostname</i>&gt;][-p &lt;<i>portnumber</i>&gt;] </codeblock></stepxmp>
-<info>If you specify a &lt;<i>connection number</i>&gt; then tracing will
-be turned on only for that connection.</info></step>
-<step><cmd>Set the location of the tracing files by specifying the property:</cmd>
-<stepxmp><codeblock>derby.drda.traceDirectory = &lt;<i>directory for tracing files</i>&gt;</codeblock></stepxmp>
-<info>You only need to specify the directory where the tracing files will
-reside. The name of the tracing files itself is determined by the system.
-If you do not set a trace directory, then the tracing files will be placed
-in derby.system.home.</info></step>
+the trace facility:<codeblock>java org.apache.derby.drda.NetworkServerControl
+   trace on [-s &lt;<i>connection number</i>&gt;] [-h &lt;<i>hostname</i>&gt;][-p &lt;<i>portnumber</i>&gt;] </codeblock></stepxmp>
+<info>If you specify a &lt;<i>connection number</i>&gt;, tracing will be turned
+on only for that connection.</info></step>
+<step><cmd>Set the location of the tracing files by specifying the following
+property:</cmd><stepxmp><codeblock>derby.drda.traceDirectory = &lt;<i>directory for tracing files</i>&gt;</codeblock></stepxmp>
+<info>You need to specify only the directory where the tracing files will
+reside. The names of the tracing files are determined by the system. If you
+do not set a trace directory, the tracing files will be placed in derby.system.home.</info>
+</step>
 <step><cmd>While the Network Server is running, enter the following command
 to set the trace directory:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl traceDirectory 
 &lt;<i>directory for tracing files</i>&gt;[-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;]  </codeblock> </stepxmp>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminadv804451.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminadv804451.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminadv804451.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminadv804451.dita Tue Jun 28 15:46:15 2005
@@ -19,9 +19,9 @@
 <task id="tadminadv804451" xml:lang="en-us">
 <title>Turning off the trace facility</title>
 <taskbody>
-<context> <p>You can turn off tracing with the following command:<codeblock>java org.apache.derby.drda.NetworkServerControl trace off [-s &lt;<i>connection number</i
+<context> <p>Enter the following command to turn off tracing:<codeblock>java org.apache.derby.drda.NetworkServerControl trace off [-s &lt;<i>connection number</i
 >&gt;] 
 [-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;] </codeblock></p><p>The
-tracing files are named Server.trace</p></context>
+tracing files are named Server.trace.</p></context>
 </taskbody>
 </task>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminapps811302.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminapps811302.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminapps811302.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminapps811302.dita Tue Jun 28 15:46:15 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
-
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -24,28 +23,25 @@
 <indexterm>Network Server<indexterm>ij and</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> To use ij with the Network Client driver:</context>
+<context> To use the ij tool with the network client driver:</context>
 <steps>
-<step><cmd>Specify the driver</cmd><stepxmp><codeph>org.apache.derby.jdbc.ClientDriver</codeph>.
-You can do this in any of the following ways:</stepxmp>
+<step><cmd>Specify the <codeph>org.apache.derby.jdbc.ClientDriver</codeph> driver in
+any of the following ways:</cmd>
 <substeps>
-<substep><cmd>Use a Script</cmd><stepxmp><ul>
-<li>Directory: $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>\frameworks\NetworkServer\bin\
-(Windows)</li>
-<li>Script: ij.bat (Windows)</li>
-<li>Script: ij.ksh (Unix)</li>
-</ul></stepxmp></substep>
-<substep><cmd>Run ij from the command line</cmd><stepxmp><codeblock>java -Dij.driver='org.apache.derby.jdbc.ClientDriver' org.apache.derby.tools.ij </codeblock
+<substep><cmd>Use a script.</cmd><stepxmp>Run the ij.bat script on Windows
+systems and the ij.ksh script on UNIX systems. These scripts are located in
+the $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph> directory.</stepxmp>
+</substep>
+<substep><cmd>Run the ij tool from the command line.</cmd><stepxmp><codeblock>java -Dij.driver='org.apache.derby.jdbc.ClientDriver'
+   org.apache.derby.tools.ij </codeblock
 ></stepxmp></substep>
-<substep><cmd>Use the DRIVER command</cmd><stepxmp><codeblock>ij&gt; DRIVER 'org.apache.derby.jdbc.ClientDriver'; </codeblock></stepxmp>
+<substep><cmd>Use the DRIVER command.</cmd><stepxmp><codeblock>ij&gt; DRIVER 'org.apache.derby.jdbc.ClientDriver'; </codeblock></stepxmp>
 </substep>
 </substeps>
 </step>
 <step><cmd>Connect by specifying the URL:</cmd><stepxmp><codeblock>ij&gt; CONNECT 'jdbc:derby://localhost:1527/sample'
-	USER 'judy' PASSWORD 'no12see';</codeblock></stepxmp></step>
+	USER 'judy' PASSWORD 'no12see';</codeblock>See <xref href="radminappsclientxmp.dita#radminappsclientxmp"></xref> for
+additional URL examples.</stepxmp></step>
 </steps>
-<postreq>See <xref href="radminappsclientxmp.dita#radminappsclientxmp"></xref> for
-additional URL examples.</postreq>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita Tue Jun 28 15:46:15 2005
@@ -23,11 +23,12 @@
 <indexterm>Network Server<indexterm>dblook and</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>To use <b>dblook</b> with the Network Client driver, make sure
+<context> <p>To use the dblook tool with the Network Client driver, make sure
 the Network Server is running (see <xref href="tadmincbdjhhfd.dita#tadmincbdjhhfd"></xref>),
 and then include the necessary <ph conref="adminconrefs.dita#prod/productshortname"></ph> and
 Network Client driver connection attributes as part of the database URL.</p></context>
 <example><codeblock>java org.apache.derby.tools.dblook -d 'jdbc:derby://localhost:1527/sample;
-user=user1;password=secret4me;'</codeblock></example>
+user=user1;password=secret4me;'</codeblock><?Pub Caret?></example>
 </taskbody>
 </task>
+<?Pub *0000001680?>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita Tue Jun 28 15:46:15 2005
@@ -17,7 +17,7 @@
 limitations under the License.
 -->
 <task id="tadminapps811695" xml:lang="en-us">
-<title>Encrypted user ID and password</title>
+<title>Enabling the encrypted user ID and password security mechanism</title>
 <prolog><metadata>
 <keywords><indexterm>Encrypted User ID and password<indexterm>using with Network
 Server</indexterm></indexterm><indexterm>IBM Java Cryptography Extension (JCE)</indexterm>
@@ -26,13 +26,14 @@
 </keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>To use encrypted user ID and password, you need to have IBM JCE
-(Java Cryptography Extension) 1.2.1 or later. You can use it with any version
-of IBM or Sun's <ph><tm tmclass="special" tmowner="Sun Microsystems, Inc."
+<context> <p>To use the encrypted user ID and password security mechanism,
+you need IBM JCE (Java Cryptography Extension) 1.2.1 or later. You can use
+it with any version of IBM or Sun's <ph><tm tmclass="special" tmowner="Sun Microsystems, Inc."
 tmtype="tm" trademark="Java">Java</tm> 2 Platform, Standard Edition, Version
-1.2 (J2SE)</ph>.</p><p>IBM JDK 1.4 or later comes with IBM JCE, so you do
-not need to install IBM JCE separately. If you have an earlier version of
-IBM JDK or other JDK's, do the following:</p></context>
+1.2 (J2SE)</ph>.</p><p>IBM Developer Kit for the Java Platform 1.4 or later
+comes with IBM JCE, so you do not need to install IBM JCE separately. If you
+have an earlier version of IBM Developer Kit for the Java Platform or other
+Software Development Kits, complete the following steps::</p></context>
 <steps>
 <step><cmd>Copy the following IBM JCE jar files to the jre/lib/ext directory
 of the IBM SDK's installation home:</cmd><info><ul>
@@ -44,11 +45,11 @@
 <step><cmd>Modify the java.security file in the jre/lib/security directory.
 In the section that lists providers (and preference order), replace the text
 with:</cmd><info><codeblock>security.provider.1=sun.security.provider.Sun
-security.provider.2=com.ibm.crypto.provider.IBMJCE</codeblock><p><note> You
-need both lines (if you are installing the IBM JCE on a Sun JDK) and that
-order is important.</note></p></info></step>
-<step><cmd>In order to use the encrypted user id and password during JDBC
-connection using the Network Client, specify<codeph>9</codeph> as the <codeph>securityMechanism</codeph> in
+security.provider.2=com.ibm.crypto.provider.IBMJCE</codeblock><p><note>If
+you are installing the IBM JCE on a Sun Java Development Kit, you must specify
+both of these lines in the order shown.</note></p></info></step>
+<step><cmd>To use the encrypted user id and password security mechanism during
+JDBC connection using the network client, specify<codeph>9</codeph> as the <codeph>securityMechanism</codeph> in
 the connection property. </cmd><info>If an encrypted database is booted in
 the Network Server, users can connect to the database without giving the <codeph>bootPassword</codeph>.
 The first connection to the database must provide the <codeph>bootPassword</codeph>,

Modified: incubator/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita Tue Jun 28 15:46:15 2005
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
-
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -19,30 +17,31 @@
 limitations under the License.
 -->
 <task id="tadminappschangingyourclasspath" xml:lang="en-us">
-<title>Changing your class path</title>
+<title>Installing required jar files and adding them to the classpath</title>
 <prolog><metadata>
-<keywords><indexterm>derbyclient.jar</indexterm>
-<indexterm>derby.jar</indexterm><indexterm>derbynet.jar</indexterm></keywords>
+<keywords><indexterm>derbyclient.jar</indexterm><indexterm>derby.jar</indexterm>
+<indexterm>derbynet.jar</indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>To use the Network Server and Network Client driver, add the following
-jar files to your server class path:</p> </context>
+<context> <p>To use the Network Server and network client driver, add the
+following jar files to your server classpath:</p> </context>
 <steps-unordered>
 <step><cmd>derbynet.jar</cmd><info><p>This jar file contains the Network Server
 code. It is only necessary for the process that starts the Network Server
 in addition to the standard <ph conref="adminconrefs.dita#prod/productshortname"></ph> .jar
 files.</p></info></step>
-<step><cmd>derby.jar</cmd><info><p>This file must be in your class path to
+<step><cmd>derby.jar</cmd><info><p>This file must be in your classpath to
 use any of the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
 Server functions.</p></info></step>
-<step><cmd>derbyclient.jar</cmd><info><p>This jar file must be in your class path
-to use the Network Client driver. The jar file is necessary for client-side
-communication with the Network Server using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Client driver.
-It needs to be in the client-side class path to use the Network Client driver to access <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</p></info>
+<step><cmd>derbyclient.jar</cmd><info><p>This jar file must be in your class
+path to use the Network Client driver. The jar file is necessary for client-side
+communication with the Network Server using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Client driver. It needs to be in the client-side classpath to use the Network
+Client driver to access <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</p></info>
 </step>
 </steps-unordered>
 <example><p><ph conref="adminconrefs.dita#prod/productshortname"></ph> provides
-script files for setting the class path to work with the Network Server. The
+script files for setting the classpath to work with the Network Server. The
 scripts are located in the $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>\frameworks\NetworkServer\bin
 directory.</p><ul>
 <li>setNetworkClientCP.bat (Windows)</li>
@@ -52,7 +51,6 @@
 </ul></example>
 <postreq>See <xref href="cadminconfig86869.dita#cadminconfig86869"></xref> and <cite><ph
 conref="adminconrefs.dita#pub/citgetstart"></ph></cite> for more information
-on setting the class path.</postreq>
+on setting the classpath.</postreq>
 </taskbody>
 </task>
-



Mime
View raw message