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 [2/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/cadminhubbkup67525.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup67525.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup67525.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup67525.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,32 +16,30 @@
 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 xml:lang="en-us" id="cadminhubbkup67525">
+<concept id="cadminhubbkup67525" xml:lang="en-us">
 <title>When the log is in a non-default location</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <conbody>
-<note>Read <xref href="cadminlog98.dita#cadminlog98"/> to find out
-about the default location of the database log.</note>
+<note>Read <xref href="cadminlog98.dita#cadminlog98"></xref> to find out about
+the default location of the database log.</note>
 <p>If you put the database log in a non-default location prior to backing
-up the database, note the following:</p>
+up the database, be aware of the following requirements:</p>
 <ul>
-<li>If backing up the database using an operating system command, you must
-explicitly copy the log file as well.  
-<codeblock>xcopy d:\mydatabases\sample c:\mybackups\2004-06-01\sample /s /i
+<li>If you are using an operating system command to back up the database,
+you must explicitly copy the log file as well, as shown in the following example:
+  <codeblock>xcopy d:\mydatabases\sample c:\mybackups\2004-06-01\sample /s /i
 xcopy h:\janet\tourslog\log c:\mybackups\2004-06-01\sample\log /s /i</codeblock></li>
 </ul>
-<note>If you are not using Windows NT, substitute the appropriate
-operating system command for copying a directory and all contents to a new
-location.</note>
+<p>If you are not using Windows, substitute the appropriate operating system
+command for copying a directory and all of its contents to a new location.</p>
 <ul>
-<li>Edit the <i>logDevice </i>entry in <i>service.properties</i> of the database backup so that it points to the correct
-location for the log. In the above example, the log was moved to the default
-location for a log, so you could remove the logDevice entry entirely, or leave
-the logDevice entry as is and wait until the database is restored to edit
-the entry.</li>
+<li>Edit the <i>logDevice</i> entry in <i>service.properties</i> of the database
+backup so that it points to the correct location for the log. In the previous
+example, the log was moved to the default location for a log, so you can remove
+the logDevice entry entirely, or leave the logDevice entry as is and wait
+until the database is restored to edit the entry.</li>
 </ul>
-<p>See <xref href="cadminlog98.dita#cadminlog98"/> for information about putting
-the log in a non-default location.</p>
-</conbody></concept>
+<p>See <xref href="cadminlog98.dita#cadminlog98"></xref> for information about
+putting the log in a non-default location.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita Tue Jun 28 15:46:15 2005
@@ -18,35 +18,33 @@
 -->
 <concept id="cadminhubbkup75469" xml:lang="en-us">
 <title>Using operating system commands with the freeze and unfreeze system
-procedures</title>
+procedures to perform an online backup</title>
 <prolog><metadata>
-<keywords><indexterm>SYSCS_UTIL.SYSCS_FREEZE_DATABASE system procedure</indexterm>
-<indexterm>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE system procedure</indexterm>
+<keywords><indexterm>SYSCS_FREEZE_DATABASE system procedure</indexterm>
+<indexterm>SYSCS_UNFREEZE_DATABASE system procedure</indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>Typically, this procedure is used to speed up the copy operation involved
-in the online backup. In this scenario, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does
-not perform the copy operation for you. You use the <i>SYSCS_UTIL.SYSCS_FREEZE_DATABASE()</i> procedure
-to lock the database, and then explicitly copy the database directory using
+<p>Typically, these procedures are used to speed up the copy operation involved
+in an online backup. In this scenario, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does not perform the copy operation for you. You use the SYSCS_UTIL.SYSCS_FREEZE_DATABASE procedure
+to lock the database, and then you explicitly copy the database directory by using
 operating system commands. </p>
-<p>For example, because the UNIX <i>tar</i> command uses operating system
-file-copying routines and <ph conref="adminconrefs.dita#prod/productshortname"></ph> uses
-the IBM Application Developer Kit file-copying routines, tar might provide
-faster backups than the <i>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</i> procedure.</p>
-<p>To use operating system commands for online database backups, call the <i>SYSCS_UTIL.SYSCS_FREEZE_DATABASE()</i> system
-procedure. The <i>SYSCS_UTIL.SYSCS_FREEZE_DATABASE()</i> system procedure
+<p>For example, because the UNIX tar command uses operating system
+file-copying routines, and <ph conref="adminconrefs.dita#prod/productshortname"></ph> uses
+the IBM Application Developer Kit file-copying routines, the tar command might provide
+faster backups than the SYSCS_UTIL.SYSCS_BACKUP_DATABASE procedure.</p>
+<p>To use operating system commands for online database backups, call the SYSCS_UTIL.SYSCS_FREEZE_DATABASE system
+procedure. The SYSCS_UTIL.SYSCS_FREEZE_DATABASE system procedure
 puts the database into a state in which it can be safely copied. After the
-copy is complete, use the <i>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()</i> system
-procedure to continue working with the database. Only after <i>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()</i> has
+database has been copied, use the SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE system
+procedure to continue working with the database. Only after SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE has
 been specified can transactions once again write to the database. Read operations
-can proceed while the database is "frozen".</p>
+can proceed while the database is "frozen."</p>
 <note>To ensure a consistent backup of the database, <ph conref="adminconrefs.dita#prod/productshortname"></ph> might
-block applications that attempt to write to a "frozen" database until the
-back up is completed and the <i>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()</i> system
+block applications that attempt to write to a frozen database until the
+backup is completed and the SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE system
 procedure is called.</note>
-<p>The following example demonstrates using <i>freeze</i> and <i>unfreeze</i> surrounding
-an operating system copy command:</p>
+<p>The following example demonstrates how the freeze and unfreeze procedures are used to surround an operating system copy command:</p>
 <codeblock>public static void backUpDatabaseWithFreeze(Connection conn)
 	throws SQLException
 {

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup98797.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,17 +16,16 @@
 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 xml:lang="en-us" id="cadminhubbkup98797">
+<concept id="cadminhubbkup98797" xml:lang="en-us">
 <title>Backing up and restoring databases</title>
+<shortdesc><ph conref="adminconrefs.dita#prod/productshortname"></ph> provides
+a way to back up a database while it is online. You can also restore a full
+backup from a specified location.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Backing up databases</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Backing up databases</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> provides a way to back up a database while it is online. While
-the backup is in progress, update operations are temporarily blocked, but
-read operations can still proceed.</p>
-</conbody></concept>
+<p>While the backup is in progress, update operations are temporarily blocked,
+but read operations can still proceed.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita Tue Jun 28 15:46:15 2005
@@ -18,7 +18,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <concept id="cadminlockvti42553" xml:lang="en-us">
-<title>Getting locking information</title>
+<title>Obtaining locking information</title>
 <prolog><metadata>
 <keywords><indexterm>Locks<indexterm>monitoring</indexterm></indexterm><indexterm>Deadlock<indexterm>tools
 to help minimize</indexterm></indexterm></keywords>
@@ -29,7 +29,7 @@
 applications that minimize deadlock. It can also help you locate the cause
 of deadlock when it does occur.</p>
 <p>To diagnose locking problems, constantly monitor locking traffic by logging
-all deadlocks (using the <i>derby.locks.monitor</i> property).</p>
+all deadlocks by using the derby.locks.monitor property.</p>
 </conbody>
 </concept>
 

Modified: incubator/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita Tue Jun 28 15:46:15 2005
@@ -18,34 +18,33 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <concept id="cadminlockvti83889" xml:lang="en-us">
-<title>Lock monitoring</title>
+<title>Monitoring deadlocks</title>
+<shortdesc>The derby.stream.error.logSeverityLevel property determines the
+level of error that you are informed about.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>derby.locks.deadlockTrace</indexterm><indexterm>derby.locks.monitor</indexterm>
 <indexterm>derby.stream.error.logSeverityLevel</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>The <i>derby.stream.error.logSeverityLevel</i> property determines the
-level of error you are informed about. By default, <codeph><i>derby.stream.error.logSeverityLevel </i></codeph>is
-set at 40000. If <codeph><i>derby.stream.error.logSeverityLevel</i></codeph> is
+<p>By default, derby.stream.error.logSeverityLevel is
+set to 40000. If derby.stream.error.logSeverityLevel is
 set to display transaction-level errors (that is, if it is set to a value
-less than 40000), deadlock errors are logged to the <i>derby.log</i> file.
+less than 40000), deadlock errors are logged to the derby.log file.
 If it is set to a value of 40000 or higher, deadlock errors are not logged
-to the <i>derby.log</i> file.</p>
-<p>The <i>derby.locks.monitor</i> property ensures that deadlock errors are
-logged regardless of the value of <codeph><i>derby.stream.error.logSeverityLevel</i></codeph>.
-When <codeph><i>derby.locks.monitor</i></codeph> is set to <i>true</i>, all
-locks involved in deadlocks are written to <i>derby.log</i> along with a unique
-number identifying the lock.</p>
-<p>To see a thread's stack trace when a lock is requested, set <i>derby.locks.deadlockTrace</i> to
-true. This property is ignored if <codeph><i>derby.locks.monitor</i></codeph> is
-set to <i>false</i>.</p>
-<note>Use <i>derby.locks.deadlockTrace</i> with care. Setting this property
+to the derby.log file.</p>
+<p>The derby.locks.monitor property ensures that deadlock errors are
+logged regardless of the value of derby.stream.error.logSeverityLevel.
+When derby.locks.monitor is set to true, all
+locks that are involved in deadlocks are written to derby.log along with a unique
+number that identifies the lock.</p>
+<p>To see a thread's stack trace when a lock is requested, set derby.locks.deadlockTrace to
+true. This property is ignored if derby.locks.monitor is
+set to false.</p>
+<note>Use derby.locks.deadlockTrace with care. Setting this property
 can alter the timing of the application, severely affect performance, and
-produce a very large <i>derby.log</i> file.</note>
-<p>For information on how to set properties, see <cite><ph conref="adminconrefs.dita#pub/cittuning"></ph></cite>.
-For specific information about the properties mentioned in this section, see
-the properties chapter in that book.</p>
-<p>Here is an example of a victim's error message when <ph conref="adminconrefs.dita#prod/productshortname"></ph> aborts
+produce a very large derby.log file.</note>
+<p>For information about how to set properties, and information about the specific properties that are mentioned in this topic, see <cite><ph conref="adminconrefs.dita#pub/cittuning"></ph></cite>.</p>
+<p>Here is an example of an error message when <ph conref="adminconrefs.dita#prod/productshortname"></ph> aborts
 a transaction because of a deadlock:</p>
 <codeblock>--SQLException Caught--
 
@@ -58,11 +57,11 @@
 Granted XID : {758, X} Lock : ROW, EMPLOYEE, (2,8)
 Waiting XID : {758, U} , APP, update employee set bonus=150 where salary=23840
 Granted XID : {752, X} The selected victim is XID : 752</codeblock>
-<note>You can use the <i>derby.locks.waitTimeout</i> and <i>derby.locks.deadlockTimeout</i> properties
+<note>You can use the derby.locks.waitTimeout and derby.locks.deadlockTimeout properties
 to configure how long <ph conref="adminconrefs.dita#prod/productshortname"></ph> waits
 for a lock to be released, or when to begin deadlock checking. For more information
-on these properties, see the chapter that discusses controlling <ph conref="adminconrefs.dita#prod/productshortname"></ph> application
-behavior, in the <i><ph conref="adminconrefs.dita#pub/citdevelop"></ph></i>.</note>
+about these properties, see the section that discusses controlling <ph conref="adminconrefs.dita#prod/productshortname"></ph> application
+behavior in the <i><ph conref="adminconrefs.dita#pub/citdevelop"></ph></i>.</note>
 </conbody>
 </concept>
 

Modified: incubator/derby/docs/trunk/src/adminguide/cadminlog98.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminlog98.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminlog98.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminlog98.dita Tue Jun 28 15:46:15 2005
@@ -17,6 +17,9 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminlog98">
 <title>Logging on a separate device</title>
+<shortdesc>You can improve the performance of update-intensive,
+large databases by putting a database's log on a separate device, which
+reduces I/O contention.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>Logging transactions</indexterm>
@@ -26,13 +29,10 @@
 </metadata>
 </prolog>
 <conbody>
-<p>System administrators can improve the performance for update-intensive,
-large databases by putting a database's log on a separate device, which
-reduces I/O contention.</p>
 <p>By default, the transaction log is in the <i>log</i> subdirectory
-of the database directory. If you want to store this <i>log</i> subdirectory in another location, do either of the following:</p>
+of the database directory. Use either of the following methods to store this <i>log</i> subdirectory in another location:</p>
 <ul>
-<li>Specify the non-default location using the <i>logDevice</i> attribute on the database connection URL when you create the database.</li>
+<li>Specify the non-default location by using the <i>logDevice</i> attribute on the database connection URL when you create the database.</li>
 <li>If the database is already created, move the log manually and update the <i>service.properties</i> file.</li>
 </ul>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminnetservsecurity.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,36 +16,37 @@
 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 xml:lang="en-us" id="cadminnetservsecurity">
+<concept id="cadminnetservsecurity" xml:lang="en-us">
 <title>Network Server security</title>
 <prolog><metadata>
-<keywords>
-<indexterm>Network Server Security</indexterm>
-<indexterm>Network Server<indexterm>and security changes</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Network Server security</indexterm><indexterm>Network
+Server<indexterm>and security changes</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>By default, the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server will only listen on the <codeph><i>localhost</i></codeph>. Clients must use the <codeph><i>localhost</i></codeph> host name to connect. By default, clients cannot access
-the Network Server from another host. To enable connections from other hosts,
-you can set the <codeph><i>derby.drda.host</i></codeph> property,
-or you can start the Network Server with the <codeph><i>-h</i></codeph> option
-in the <codeph><i>java org.apache.derby.drda.NetworkServerControl
-start</i></codeph> command.</p>
-<p>In the following example the server will only listen on <codeph><i>localhost</i></codeph> and clients cannot access the server from another host.</p>
+<p>By default, the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server will only listen on the localhost. Clients must use the localhost host
+name to connect. By default, clients cannot access the Network Server from
+another host. To enable connections from other hosts, set the derby.drda.host
+property, or start the Network Server with the <codeph><i>-h</i></codeph> option
+in the <codeph><i>java org.apache.derby.drda.NetworkServerControl start</i></codeph> command.</p>
+<p>In the following example the server will listen only on localhost and clients
+cannot access the server from another host.</p>
 <codeblock><b>java org.apache.derby.drda.NetworkServerControl start</b></codeblock>
-<p>In the following example, the server runs on host machine <codeph><i>myserver.mydomain.com</i></codeph> and also listens for clients from other hosts.
-Clients should specify the server in the URL or DataSource as <codeph><i>myserver.mydomain.com</i></codeph>:</p>
-<codeblock><b>java org.apache.derby.drda.NetworkServerControl start -h myserver.mydomain.com</b></codeblock>
+<p>In the following example, the server runs on host machine <codeph><i>sampleserver.sampledomain.com</i></codeph> and
+also listens for clients from other hosts. Clients must specify the server
+in the URL or DataSource as sampleserver.sampledomain.com:</p>
+<codeblock><b>java org.apache.derby.drda.NetworkServerControl start 
+   -h sampleserver.sampledomain.com</b></codeblock>
 <p>To start the Network Server so that it will listen on all interfaces, start
-with an IP address of <codeph><i>0.0.0.0</i></codeph>, as follows: 
-<codeblock><b>java org.apache.derby.drda.NetworkServerControl start -h 0.0.0.0</b></codeblock></p>
-<p>A server started with the <codeph><i>0.0.0.0</i></codeph> option
-will listen to client requests that originate from both <codeph><i>localhost</i></codeph> and other machines on the network.</p>
-<p>In addition, administrative commands (for example: <codeph><i>org.apache.derby.drda.NetworkServerControl shutdown</i></codeph>) can only execute
-on the host where the server was started even if the server was started with
-the <codeph><i>-h</i></codeph> option.</p>
-<p/>
-<p/>
-</conbody></concept>
+with an IP address of <codeph><i>0.0.0.0</i></codeph>, shown in the following
+example:  <codeblock><b>java org.apache.derby.drda.NetworkServerControl start -h 0.0.0.0</b></codeblock></p>
+<p>A server that is started with the <codeph><i>0.0.0.0</i></codeph> option
+will listen to client requests that originate from both <codeph><i>localhost</i></codeph> and
+from other machines on the network.</p>
+<p>In addition, administrative commands (for example, <codeph><i>org.apache.derby.drda.NetworkServerControl
+shutdown</i></codeph>) can run only on the host where the server was started,
+even if the server was started with the <codeph><i>-h</i></codeph> option.</p>
+<p></p>
+<p></p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita Tue Jun 28 15:46:15 2005
@@ -22,7 +22,6 @@
 <conbody>
 <p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
 Client driver DataSources <codeph>org.apache.derby.jdbc.ClientDataSource</codeph> and <codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph
-> are supported with Network Server.</p>
+> are supported by the Network Server.</p>
 </conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita Tue Jun 28 15:46:15 2005
@@ -20,5 +20,5 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This section discusses the use of <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a server environment.</p>
+<p>This section describes how to use <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a multi-user (or "server") environment.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov16172.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov16172.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov16172.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov16172.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,20 +16,32 @@
 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 xml:lang="en-us" id="cadminov16172">
+<concept id="cadminov16172" xml:lang="en-us">
 <title>Multiple concurrency levels</title>
 <prolog><metadata>
-<keywords>
-<indexterm>Isolation levels</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Isolation levels</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> supports <codeph>SERIALIZABLE</codeph> (RR), <codeph>REPEATABLE READ</codeph> (RS), <codeph>READ COMMITTED</codeph> (CS), and <codeph>READ UNCOMMITTED</codeph> (UR)
-isolation levels. <codeph>CS</codeph> (the default isolation level) provides the
-best balance between concurrency and consistency in multiple-client environments. <codeph>RS</codeph> provides less consistency than <codeph>RR</codeph> but allows more concurrency. <codeph>RR</codeph> provides greatest consistency. <codeph>UR</codeph> provides maximum concurrency,
-if uncommitted values are allowed in the query. It is typically used if approximate
-results are acceptable. See "Types and Scope of Locks in <ph conref="adminconrefs.dita#prod/productshortname"></ph> Systems"
-in the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for more information.</p>
-</conbody></concept>
+<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> supports SERIALIZABLE
+(RR), REPEATABLE (RS), READ COMMITTED (CS), and READ UNCOMMITTED (UR) isolation
+levels.</p>
+<dl><dlentry>
+<dt>CS</dt>
+<dd>CS (the default isolation level) provides the best balance between concurrency
+and consistency in multiple-client environments.</dd>
+</dlentry><dlentry>
+<dt>RS</dt>
+<dd>RS provides less consistency than RR but allows more concurrency.</dd>
+</dlentry><dlentry>
+<dt>RR</dt>
+<dd>RR provides greatest consistency.</dd>
+</dlentry><dlentry>
+<dt>UR</dt>
+<dd>UR provides maximum concurrency, if uncommitted values are allowed in
+the query. It is typically used if approximate results are acceptable.</dd>
+</dlentry></dl>
+<p>See "Types and Scope of Locks in <ph conref="adminconrefs.dita#prod/productshortname"></ph> Systems"
+in the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
+more information.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov17524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov17524.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov17524.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov17524.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,21 +16,24 @@
 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 xml:lang="en-us" id="cadminov17524">
+<concept id="cadminov17524" xml:lang="en-us">
 <title>Derby in a server framework</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <conbody>
-<p>In a sense, <ph conref="adminconrefs.dita#prod/productshortname"></ph> is always an embedded product. You can embed it
-in an application where users access the database from a single JVM or in
-a server framework-an application that allows users from different JVMs to
-connect to <ph conref="adminconrefs.dita#prod/productshortname"></ph> simultaneously. When <ph conref="adminconrefs.dita#prod/productshortname"></ph> is embedded in an
-application, the local JDBC driver calls the local <ph conref="adminconrefs.dita#prod/productshortname"></ph> database. When <ph conref="adminconrefs.dita#prod/productshortname"></ph> is
-embedded in a server framework, the server framework's connectivity software
-provides data to multiple client JDBC applications over a network or the Internet.</p>
-<p>For local or remote multi-user (multiple users accessing from different
-JVMs) connectivity, use the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server. If you require features
-other than those included in Network Server, you can embed the basic <ph conref="adminconrefs.dita#prod/productshortname"></ph> product
+<p>In a sense, <ph conref="adminconrefs.dita#prod/productshortname"></ph> is
+always an embedded product. You can embed it in an application in which users
+access the database from a single JVM or you can embed it in a server framework
+(an application that allows users from different JVMs to connect to <ph conref="adminconrefs.dita#prod/productshortname"></ph> simultaneously).
+When <ph conref="adminconrefs.dita#prod/productshortname"></ph> is embedded
+in an application, the local JDBC driver calls the local <ph conref="adminconrefs.dita#prod/productshortname"></ph> database.
+When <ph conref="adminconrefs.dita#prod/productshortname"></ph> is embedded
+in a server framework, the server framework's connectivity software provides
+data to multiple client JDBC applications over a network or the Internet.</p>
+<p>For local or remote multi-user connectivity (multiple users who access <ph
+conref="adminconrefs.dita#prod/productshortname"></ph> from different JVMs),
+use the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server. If you require features that are not included in the Network Server,
+you can embed the basic <ph conref="adminconrefs.dita#prod/productshortname"></ph> product
 in another server framework.</p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov28261.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov28261.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov28261.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov28261.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,23 +16,21 @@
 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 xml:lang="en-us" id="cadminov28261">
-<title>Row-Level Locking</title>
+<concept id="cadminov28261" xml:lang="en-us">
+<title>Row-level locking</title>
 <prolog><metadata>
-<keywords>
-<indexterm>Table-level locking</indexterm>
-<indexterm>Row-level locking</indexterm>
-<indexterm>Locking<indexterm>row-level</indexterm></indexterm>
-<indexterm>Locking<indexterm>table-level</indexterm></indexterm>
+<keywords><indexterm>Table-level locking</indexterm><indexterm>Row-level locking</indexterm>
+<indexterm>Locking<indexterm>row-level</indexterm></indexterm><indexterm>Locking<indexterm>table-level</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>To support multi-user access, <ph conref="adminconrefs.dita#prod/productshortname"></ph> utilizes row-level locking. You
-can configure <ph conref="adminconrefs.dita#prod/productshortname"></ph> to use table-level locking in environments with
-few concurrent transactions (for example, a read-only database) . Table-level
-locking is preferable if there are few or no writes to the server, while row-level
-locking is essential for good performance if many clients write to the server
-concurrently. The <ph conref="adminconrefs.dita#prod/productshortname"></ph> optimizer tunes lock choice for queries automatically.</p>
-</conbody></concept>
+<p>To support multi-user access, <ph conref="adminconrefs.dita#prod/productshortname"></ph> utilizes
+row-level locking. However, you can configure <ph conref="adminconrefs.dita#prod/productshortname"></ph> to
+use table-level locking in environments that have few concurrent transactions
+(for example, a read-only database) . Table-level locking is preferable if
+there are few or no writes to the server, while row-level locking is essential
+for good performance if many clients write to the server concurrently. The <ph
+conref="adminconrefs.dita#prod/productshortname"></ph> optimizer tunes lock
+choice for queries automatically.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov33597.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov33597.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov33597.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov33597.dita Tue Jun 28 15:46:15 2005
@@ -20,12 +20,5 @@
 <prolog>
 </prolog>
 <conbody>
-<p>The basic <ph conref="adminconrefs.dita#prod/productshortname"></ph> product contains some features that are useful for
-developing multi-user applications. These features include:</p>
-<ul>
-<li><xref href="cadminov28261.dita#cadminov28261"/></li>
-<li><xref href="cadminov16172.dita#cadminov16172"/></li>
-<li><xref href="cadminov65220.dita#cadminov65220"/></li>
-<li><xref href="cadminov83312.dita#cadminov83312"/></li>
-</ul>
+<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> contains some features that are useful for developing multi-user applications.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita Tue Jun 28 15:46:15 2005
@@ -20,8 +20,7 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This guide assumes you are familiar with <ph conref="adminconrefs.dita#prod/productshortname"></ph> features, administration,
-and tuning. Before reading this guide, you should first learn the basic <ph conref="adminconrefs.dita#prod/productshortname"></ph> product
+<p>This guide assumes that you are familiar with <ph conref="adminconrefs.dita#prod/productshortname"></ph> features and and tuning. Before reading this guide, you should first learn about basic <ph conref="adminconrefs.dita#prod/productshortname"></ph> functionality
 by reading the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite>. Also, because multi-user environments typically
-have performance and tuning issues, you should read <cite><ph conref="adminconrefs.dita#pub/cittuning"></ph></cite>. </p>
+have performance and tuning issues, you should read <cite><ph conref="adminconrefs.dita#pub/cittuning"></ph></cite>.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov825125.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov825125.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov825125.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov825125.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,27 +16,30 @@
 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 xml:lang="en-us" id="cadminov825125">
+<concept id="cadminov825125" xml:lang="en-us">
 <title>Connectivity configurations</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <conbody>
-<p>There are many ways you can embed <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a server framework:</p>
-<ul>
-<li><i>Use the Network Server.</i>  
-<p>The easiest way to
-provide connectivity to multiple users accessing <ph conref="adminconrefs.dita#prod/productshortname"></ph> databases from
-different JVMs. The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server provides this kind of connectivity
-to <ph conref="adminconrefs.dita#prod/productshortname"></ph> databases within a single system or over a network.</p></li>
-<li><i>Purchase another server framework.</i>  
-<p>You can
-use <ph conref="adminconrefs.dita#prod/productshortname"></ph> within many server frameworks, such as the IBM WebSphere
-Application Server.</p></li>
-<li><i>Write your own framework.</i></li>
-</ul>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph>'s flexibility allows other configurations as well. For
-example, rather than embedding <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a server that communicates with
-a client using JDBC, you can embed <ph conref="adminconrefs.dita#prod/productshortname"></ph> within a servlet in a Web server
-that communicates with a browser using HTTP.</p>
-</conbody></concept>
+<p>There are several ways to embed <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
+a server framework:</p>
+<dl><dlentry>
+<dt>Use the Network Server</dt>
+<dd>This is the easiest way to provide connectivity to multiple users who
+are accessing <ph conref="adminconrefs.dita#prod/productshortname"></ph> databases
+from different JVMs. The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server provides this kind of connectivity to <ph conref="adminconrefs.dita#prod/productshortname"></ph> databases
+within a single system or over a network.</dd>
+</dlentry><dlentry>
+<dt>Purchase another server framework</dt>
+<dd>You can use <ph conref="adminconrefs.dita#prod/productshortname"></ph> within
+many server frameworks, such as IBM WebSphere Application Server.</dd>
+</dlentry><dlentry>
+<dt>Write your own framework</dt>
+<dd><ph conref="adminconrefs.dita#prod/productshortname"></ph>'s flexibility
+allows other configurations as well. For example, rather than embedding <ph
+conref="adminconrefs.dita#prod/productshortname"></ph> in a server that communicates
+with a client that uses JDBC, you can embed <ph conref="adminconrefs.dita#prod/productshortname"></ph> within
+a servlet in a web server that communicates with a browser using HTTP.</dd>
+</dlentry></dl>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov825149.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov825149.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov825149.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov825149.dita Tue Jun 28 15:46:15 2005
@@ -20,7 +20,5 @@
 <prolog>
 </prolog>
 <conbody>
-<p>Because <ph conref="adminconrefs.dita#prod/productshortname"></ph> is written in Java, you have great flexibility in configuring
-your deployment. For example, you can run <ph conref="adminconrefs.dita#prod/productshortname"></ph>, the JDBC server framework,
-and another application in the same JVM as a single process.</p>
+<p>Because <ph conref="adminconrefs.dita#prod/productshortname"></ph> is written in Java, you have great flexibility in how you choose to configure your deployment. For example, you can run <ph conref="adminconrefs.dita#prod/productshortname"></ph>, the JDBC server framework, and another application in the same JVM as a single process.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov825266.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,53 +16,55 @@
 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 xml:lang="en-us" id="cadminov825266">
+<concept id="cadminov825266" xml:lang="en-us">
 <title>The Derby Network Server</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <conbody>
-<p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server provides multi-user connectivity to <ph conref="adminconrefs.dita#prod/productshortname"></ph> databases
-within a single system or over a network. The Network Server receives and
-replies to queries from clients using standard Distributed Relational Database
-Architecture (DRDA) protocol. Databases are accessed through the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Client driver.</p>
-<p>The Network Server is a solution for multiple JVMs connecting to the database,
-unlike the embedded scenario where one JVM is all that runs as part of the
-system. When <ph conref="adminconrefs.dita#prod/productshortname"></ph> is embedded in a single-JVM application, the embedded
-JDBC driver calls the local <ph conref="adminconrefs.dita#prod/productshortname"></ph>. When <ph conref="adminconrefs.dita#prod/productshortname"></ph> is embedded in a
-server framework, the server framework's connectivity software provides data
-to multiple client JDBC applications over a network or the Internet.</p>
-<p>To run the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server, you will need to install the following
-files:</p>
-<p>On the server side: 
-<ul>
-<li><filepath>derby.jar</filepath></li>
-<li><filepath>derbynet.jar</filepath></li>
-</ul></p>
-<p>On the client side:
-<ul>
-<li><filepath>derbyclient.jar</filepath></li>
+<p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server provides multi-user connectivity to <ph conref="adminconrefs.dita#prod/productshortname"></ph> databases
+within a single system or over a network. The Network Server uses the standard
+Distributed Relational Database Architecture (DRDA) protocol to receive and
+reply to queries from clients. Databases are accessed through the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server by using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Client driver.</p>
+<p>The Network Server is a solution for multiple JVMs that connect to the
+database, unlike the embedded scenario where only one JVM runs as part of
+the system. When <ph conref="adminconrefs.dita#prod/productshortname"></ph> is
+embedded in a single-JVM application, the embedded JDBC driver calls the local <ph
+conref="adminconrefs.dita#prod/productshortname"></ph> database. When <ph
+conref="adminconrefs.dita#prod/productshortname"></ph> is embedded in a server
+framework, the server framework's connectivity software provides data to multiple
+client JDBC applications over a network or the Internet.</p>
+<p>To run the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server, you need to install the following files:<ul>
+<li>On the server side, install <filepath>derby.jar</filepath> and <filepath>derbynet.jar</filepath>.</li>
+<li>On the client side, install <filepath>derbyclient.jar</filepath>.</li>
 </ul></p>
-<p>There are several ways to manage the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server:</p>
+<p>There are several ways to manage the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server, including:</p>
 <ul>
 <li>Through the command line</li>
-<li>By using <i>.bat</i> and <i>.ksh</i> scripts</li>
+<li>By using .bat and .ksh scripts</li>
 <li>Through the servlet interface</li>
 <li>With your own Java program (written using the Network Server API)</li>
 <li>By setting Network Server properties</li>
 </ul>
-<p><xref href="cadminapps59125.dita#cadminapps59125"/> explains how to change existing
-Java applications that currently run against <ph conref="adminconrefs.dita#prod/productshortname"></ph> in embedded mode
-to run against the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server.</p>
-<p><xref href="cadminconfig86869.dita#cadminconfig86869"/> explains how to manage the
-Network Server via the command line, including starting and stopping it.</p>
-<p><xref href="cadminservlet98430.dita#cadminservlet98430"/> explains how to use the servlet
-interface to manage the Network Server.</p>
-<p><xref href="cadminadvtops.dita#cadminadvtops"/> contains advanced topics for <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+<p><xref href="cadminapps59125.dita#cadminapps59125"></xref> explains how
+to change existing Java applications that currently run against <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
+embedded mode to run against the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server.</p>
+<p><xref href="cadminconfig86869.dita#cadminconfig86869"></xref> explains
+how to manage the Network Server by using the command line, including starting
+and stopping it.</p>
+<p><xref href="cadminservlet98430.dita#cadminservlet98430"></xref> explains
+how to use the servlet interface to manage the Network Server.</p>
+<p><xref href="cadminadvtops.dita#cadminadvtops"></xref> contains advanced
+topics for <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
 Server users.</p>
 <p>Because of the differences in JDBC drivers that are used, you might encounter
-differences in functionality when running <ph conref="adminconrefs.dita#prod/productshortname"></ph> in the Network Server
-framework rather than running it embedded in a user application. Refer to <xref href="cadminapps59125.dita#cadminapps59125"/> here for a complete list of the differences
-between embedded and Network Server configurations.</p>
-</conbody></concept>
+differences in functionality when running <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
+the Network Server framework as opposed to running it embedded in a user application.
+Refer to <xref href="cadminapps59125.dita#cadminapps59125"></xref> for a complete
+list of the differences between embedded and Network Server configurations.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov83312.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov83312.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov83312.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov83312.dita Tue Jun 28 15:46:15 2005
@@ -16,17 +16,15 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminov83312">
-<title>Administrative Tools</title>
+<title>Administrative tools</title>
 <prolog>
 </prolog>
 <conbody>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> provides some tools and features to assist database administrators.
-These tools are:</p>
+<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> provides some tools and features to assist database administrators, including:</p>
 <ul>
 <li>Consistency checker</li>
-<li>On-line backup</li>
+<li>Online backup</li>
 <li>The ability to put a database's log on a separate device</li>
 </ul>
-<p>These tools and features are discussed in part two of this book. See the
-chapters in that section for more information.</p>
+<p>These tools and features are discussed in part two of this guide. See the sections in that part for more information.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita Tue Jun 28 15:46:15 2005
@@ -25,17 +25,17 @@
 </metadata>
 </prolog>
 <conbody>
-<p>The <i>SimpleNetworkClientSample</i> program is a client
+<p>The SimpleNetworkClientSample program is a client
 program that interacts with the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server from another JVM.
-The program performs the following tasks.
+The program performs the following tasks:
 <ul>
 <li>Loads the Network Client driver</li>
-<li>Obtains a client connection using the DriverManager</li>
-<li>Obtains a client connection using a DataSource</li>
-<li>Tests the database connections by executing a sample query</li>
-<li>Closes the connections and then exits the program.</li>
+<li>Obtains a client connection by using the DriverManager</li>
+<li>Obtains a client connection by using a DataSource</li>
+<li>Tests the database connections by running a sample query</li>
+<li>Closes the connections and then exits the program</li>
 </ul></p>
-<p>The following files should be installed in the <codeph>%<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\programs\nserverdemo\</codeph> directory in order to run the sample program:
+<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>The source file: <filepath>SimpleNetworkClientSample.java</filepath></li>
 <li>The compiled class file: <filepath>SimpleNetworkClientSample.class</filepath></li>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminovnsdemo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminovnsdemo.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminovnsdemo.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminovnsdemo.dita Tue Jun 28 15:46:15 2005
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.
--->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cadminovnsdemo">
-<title>Overview of the NsSample sample program</title>
-<prolog>
-</prolog>
-<conbody>
-<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>The following files should be installed in the <codeph>%<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\programs\nserverdemo\</codeph> directory in order to 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, while 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>
-<ul>
-<li>NUM_ROWS - The number of rows that must be initially loaded into the schema.
-  </li>
-<li> ITERATIONS - The number of iterations for which each client thread does
-database related work.</li>
-<li>NUM_CLIENT_THREADS - The number of clients that you want to run the program
-against.</li>
-<li>NETWORKSERVER_PORT - The port on which the Network Server is running.</li>
-</ul></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 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>
-</conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminovntsrvsample.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,33 +16,24 @@
 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 xml:lang="en-us" id="cadminovntsrvsample">
+<concept id="cadminovntsrvsample" xml:lang="en-us">
 <title>Network Server sample programs for embedded and client connections</title>
+<shortdesc>This <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server sample program demonstrates how to obtain an embedded connection and
+client connections to the same database by using the Network Server. This
+program shows how to use either the DriverManager or a DataSource to obtain
+client connections.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Network Server<indexterm>sample programs for embedded
-and client connections</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Network Server<indexterm>sample programs for embedded
+and client connections</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>This <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server sample program demonstrates how to obtain
-an embedded connection and client connections to the same database using the
-Network Server. This program shows how to use either the DriverManager or
-a DataSource to obtain client connections.</p>
 <p>For a database to be consistent, only one JVM can access it at a time.
 The embedded driver is loaded when the Network Server is started. The JVM
-that starts the Network Server can get an embedded connection to the same
+that starts the Network Server can obtain an embedded connection to the same
 database that the Network Server is accessing to serve clients from other
-JVMs. This solution allows you to take advantage of the performance benefits
-of the embedded driver while also allowing client connections from other JVMs
-to connect to the same database.</p>
-<p>This topic contains the following sections:
-<ul>
-<li><xref href="cadminovsrvsmpprgm.dita#cadminovsrvsmpprgm"/></li>
-<li><xref href="tadminovrunsrvprgm.dita#tadminovrunsrvprgm"/></li>
-<li><xref href="cadminovcliconnect.dita#cadminovcliconnect"/></li>
-<li><xref href="tadminovclirun.dita#tadminovclirun"/></li>
-</ul></p>
-</conbody></concept>
+JVMs. This solution provides the performance benefits of the embedded driver
+and also allows client connections from other JVMs to connect to the same
+database.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita Tue Jun 28 15:46:15 2005
@@ -24,23 +24,22 @@
 </metadata>
 </prolog>
 <conbody>
-<p>The <i>SimpleNetworkServerSample</i> program starts the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server, as well as the embedded driver and waits for clients to connect. The
+<p>The SimpleNetworkServerSample program starts the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server, as well as the embedded driver, and waits for clients to connect. The
 program performs the following tasks.
 <ul>
-<li>Starts the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server using a property and also loads
-the embedded driver</li>
-<li>Checks if the Network Server is up and running</li>
-<li>Creates the database <i>NSSimpleDB</i> if it is not already
+<li>Starts the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server by using a property and also loads the embedded driver</li>
+<li>Determines if the Network Server is running</li>
+<li>Creates the NSSimpleDB database if it is not already
 created</li>
 <li>Obtains an embedded database connection </li>
-<li>Tests the database connection by executing a sample query.</li>
+<li>Tests the database connection by executing a sample query</li>
 <li>Allows client connections to connect to the server until you decide to
 stop the server and exit the program</li>
 <li>Closes the connection</li>
-<li>Shuts down the Network Server before exiting the program. </li>
+<li>Shuts down the Network Server before exiting the program</li>
 </ul></p>
-<p> To run the sample program, the following files should be installed in
+<p> To run the sample program, install the following files in
 the <codeph>%<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\programs\nserverdemo\</codeph> directory:
 <ul>
 <li>The source file: <filepath>SimpleNetworkServerSample.java</filepath></li>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita Tue Jun 28 15:46:15 2005
@@ -16,10 +16,10 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminpartone">
-<title>Derby Server Guide</title>
+<title>Part one: Derby Server Guide</title>
 <prolog>
 </prolog>
 <conbody>
-<p>This part of the guide is divided into sections discussing the Network Server.
+<p>This part of the guide explains the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server.
 </p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita Tue Jun 28 15:46:15 2005
@@ -16,10 +16,10 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminparttwo">
-<title>Derby Administration Guide</title>
+<title>Part two: Derby Administration Guide</title>
 <prolog>
 </prolog>
 <conbody>
-<p>This part of the guide is divided into several administrative tasks.
+<p>This section of the guide is divided into several administrative tasks.
 </p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminpreface11181.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminpreface11181.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminpreface11181.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminpreface11181.dita Tue Jun 28 15:46:15 2005
@@ -23,12 +23,12 @@
 <conbody>
 <p>This guide explains how to use <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a multiple-client environment.
 It also provides information that a server administrator might need to keep
-<ph conref="adminconrefs.dita#prod/productshortname"></ph> running with high performance and reliability in a server framework
-or a multiple-client application server. (When running in embedded mode, <ph conref="adminconrefs.dita#prod/productshortname"></ph>
-databases typically do not need any administration.)</p>
+<ph conref="adminconrefs.dita#prod/productshortname"></ph> running with a high level of performance and reliability in a server framework
+or in a multiple-client application server environment (When running in embedded mode, <ph conref="adminconrefs.dita#prod/productshortname"></ph>
+databases typically do not need any administration).</p>
 <p>To connect multiple clients with <ph conref="adminconrefs.dita#prod/productshortname"></ph>, you can embed <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a server
-framework of your own choosing, or you can use the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server. This
-manual describes these options.</p>
+framework that you choose, or you can use the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server. This
+guide describes these options.</p>
 </conbody>
 </concept>
 

Modified: incubator/derby/docs/trunk/src/adminguide/cadminpreface22460.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminpreface22460.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminpreface22460.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminpreface22460.dita Tue Jun 28 15:46:15 2005
@@ -20,6 +20,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This book contains two parts. The first part is for developers of client/server
-and multiple-client applications. The second part is for administrators.</p>
+<p>The first part of this guide is intended for developers of client/server
+and multiple-client applications. The second part of this guide is intended for administrators.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminpreface23947.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminpreface23947.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminpreface23947.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminpreface23947.dita Tue Jun 28 15:46:15 2005
@@ -16,40 +16,39 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminpreface23947">
-<title>How This Document Is Organized</title>
+<title>How this guide is organized</title>
 <prolog>
 </prolog>
 <conbody>
-<p>This document includes the following chapters:</p>
-<p>Part One: (<ph conref="adminconrefs.dita#prod/productshortname"></ph> Server Guide):</p>
+<p>This guide includes the following two parts:</p>
+<p>Part one: <ph conref="adminconrefs.dita#prod/productshortname"></ph> Server Guide</p>
 <ul>
 <li><i><xref href="cadminov11108.dita#cadminov11108"/></i>  
-<p>Describes the different options for embedding <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a server framework;
+<p>Describes the different options for embedding <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a server framework and
 explains the Network Server option.</p></li>
 <li><i><xref href="cadminapps59125.dita#cadminapps59125"/></i>  
 <p>Describes how to change existing <ph conref="adminconrefs.dita#prod/productshortname"></ph> applications to work with the
 Network Server.</p></li>
 <li><i><xref href="cadminconfig86869.dita#cadminconfig86869"/></i>  
-<p>Describes how to manage the Network Server using shell scripts, the command
-line, or the Network Server API.</p></li>
+<p>Describes how to use shell scripts, the command
+line, and the Network Server API to manage the Network Server.</p></li>
 <li><i><xref href="cadminservlet98430.dita#cadminservlet98430"/></i>  
-<p>Describes how to manage the Network Server using the servlet interface.</p></li>
+<p>Describes how to use the servlet interface to manage the Network Server.</p></li>
 <li><i><xref href="cadminadvtops.dita#cadminadvtops"/></i> 
 <p>Describes
 advanced topics for <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server users.</p></li>
 </ul>
-<p>Part Two (<ph conref="adminconrefs.dita#prod/productshortname"></ph> Administration Guide):</p>
+<p>Part two: <ph conref="adminconrefs.dita#prod/productshortname"></ph> Administration Guide</p>
 <ul>
 <li><i><xref href="cadminconsist01.dita#cadminconsist01"/></i>  
-<p>Shows how to check the consistency of <ph conref="adminconrefs.dita#prod/productshortname"></ph> databases.</p></li>
+<p>Describes how to check the consistency of <ph conref="adminconrefs.dita#prod/productshortname"></ph> databases.</p></li>
 <li><i><xref href="cadminhubbkup98797.dita#cadminhubbkup98797"/></i>  
-<p>Shows how to back up a database while it is online.</p></li>
+<p>Describes how to back up a database when it is online.</p></li>
 <li><i><xref href="cadminlog98.dita#cadminlog98"/></i>  
-<p>Shows how to put a database's log on a separate device, which is helpful
-for the performance of large databases.</p></li>
+<p>Describes how to put a database's log on a separate device, which can improve the performance of large databases.</p></li>
 <li><i><xref href="cadminlockvti42553.dita#cadminlockvti42553"/></i>  
-<p>Shows how to get detailed information about locking status.</p></li>
+<p>Describes how to get detailed information about locking status.</p></li>
 <li><i><xref href="cadminspace21579.dita#cadminspace21579"/></i>  
-<p>Shows how to identify and reclaim unused space in tables and related indexes.</p></li>
+<p>Describes how to identify and reclaim unused space in tables and related indexes.</p></li>
 </ul>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminpreface30074.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminpreface30074.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminpreface30074.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminpreface30074.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,15 +16,10 @@
 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 xml:lang="en-us" id="cadminpreface30074">
+<concept id="cadminpreface30074" xml:lang="en-us">
 <title>About this guide</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <conbody>
-<ul>
-<li><xref href="cadminpreface11181.dita#cadminpreface11181"/></li>
-<li><xref href="cadminpreface22460.dita#cadminpreface22460"/></li>
-<li><xref href="cadminpreface23947.dita#cadminpreface23947"/></li>
-</ul>
-</conbody></concept>
+<p>This section describes who this guide is for as well as how to use it.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminrollforward.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminrollforward.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminrollforward.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminrollforward.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,85 +16,86 @@
 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 xml:lang="en-us" id="cadminrollforward">
+<concept id="cadminrollforward" xml:lang="en-us">
 <title>Roll-forward recovery</title>
+<shortdesc><ph conref="adminconrefs.dita#prod/productshortname"></ph> supports
+roll-forward recovery to restore a damaged database to the most recent state
+before a failure occurred.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Online Archived Logs</indexterm>
-<indexterm>Online Archived Logs<indexterm>Enabling</indexterm></indexterm>
-<indexterm>Online Archived Logs<indexterm>Disabling</indexterm></indexterm>
-<indexterm>Backing Up<indexterm>Roll-forward Recovery</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Online archived logs</indexterm><indexterm>Online archived
+logs<indexterm>enabling</indexterm></indexterm><indexterm>Online archived
+logs<indexterm>disabling</indexterm></indexterm><indexterm>Backing up<indexterm>Roll-forward
+recovery</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> supports roll-forward recovery to restore a damaged
-database to the most recent state before a failure occurred. <ph conref="adminconrefs.dita#prod/productshortname"></ph> restores
-a database from full backup and replays all the transactions after the backup.
-All the log files after a backup are required to replay the transactions after
-the backup. By default, the database keeps only logs that are required for
-crash-recovery. For roll-forward recovery to be successful, all log files
-should be archived after a backup. Log files can be archived using the backup
-function calls that enable log archiving.</p>
+<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> restores a database
+from full backup and replays all the transactions after the backup. All the
+log files after a backup are required to replay the transactions after the
+backup. By default, the database keeps only logs that are required for crash-recovery.
+For roll-forward recovery to be successful, all log files must be archived
+after a backup. Log files can be archived using the backup function calls
+that enable log archiving.</p>
 <p>In roll-forward recovery the log archival mode ensures that all old log
 files are available. The log files are available only from the time that the
 log archival mode is enabled. </p>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> uses the following information to restore the database:
-<ul>
+<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> uses the following
+information to restore the database: <ul>
 <li>The backup copy of the database</li>
 <li>The set of archived logs</li>
 <li>The current online active log</li>
 </ul></p>
 <p>You cannot use roll-forward recovery to restore individual tables. Roll-forward
 recovery recovers the entire database.</p>
-<p>To restore a database using roll-forward recovery, you must already have
-a backup copy of the database, all the archived logs since then, and the active
-log files. All the log files should be in the database log directory.</p>
-<p>There are two types of log files in <ph conref="adminconrefs.dita#prod/productshortname"></ph>: active logs and online
-archived logs.</p>
-<p><b>Active logs:</b></p>
-<p>Active logs are used during crash recovery to prevent a failure from leaving
-a database in an inconsistent state. Roll-forward recovery can also use the
-active logs to recover to the end of the log files. Active logs are located
-in the database log path directory.</p>
-<p><b>Online archived logs</b></p>
-<p>Log files that are stored for roll-forward recovery use when they are no
-longer needed for crash recovery. Online archived logs are also kept in the
-database log path directory.</p>
+<p>To restore a database by using roll-forward recovery, you must already
+have a backup copy of the database, all the archived logs since the backup
+was created, and the active log files. All the log files should be in the
+database log directory.</p>
+<p>There are two types of log files in <ph conref="adminconrefs.dita#prod/productshortname"></ph>:
+active logs and online archived logs.</p>
+<dl><dlentry>
+<dt>Active logs</dt>
+<dd>Active logs are used during crash recovery to prevent a failure that might
+leave a database in an inconsistent state. Roll-forward recovery can also
+use the active logs to recover to the end of the log files. Active logs are
+located in the database log path directory.</dd>
+</dlentry><dlentry>
+<dt>Online archived logs</dt>
+<dd>Log files that are stored for roll-forward recovery use when they are
+no longer needed for crash recovery. Online archived logs are also kept in
+the database log path directory.</dd>
+</dlentry></dl>
 <p><b>Enabling log archival mode</b></p>
 <p>Online archive logs are available only if the database is enabled for log
-archival mode. You can use the following system procedure:</p>
+archival mode. You can use the following system procedure to enable the database
+for log archival mode:</p>
 <codeblock>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE
 (IN BACKUPDIR VARCHAR(32672), IN SMALLINT DELETE_ARCHIVED_LOG_FILES)</codeblock>
-<p>The input parameters for the above calls are the location where the backup
-should be stored and to indicate to the database whether or not to keep online
-archived logs for the backup. Existing online archived log files before this
-backup will be deleted if the input parameter value for <i>deleteOnlineArchivedLogFiles</i> is non-zero. The log files are deleted only
-after a successful backup.
-<note>Make sure to store the backup database
-in a safe place when you choose the log file removal option.</note></p>
+<p>The input parameters for the calls in the previous example specify the
+location where the backup should be stored and specify whether or not the
+database should keep online archived logs for the backup. Existing online
+archived log files that were created before this backup will be deleted if
+the input parameter value for the <i>deleteOnlineArchivedLogFiles</i> parameter
+is non-zero. The log files are deleted only after a successful backup. <note>Make
+sure to store the backup database in a safe place when you choose the log
+file removal option.</note></p>
 <p><b>Disabling log archival mode:</b></p>
 <p>After you enable log archival mode, the database will always have the log
 archival mode enabled even if it is subsequently booted or backed up. The
-only way to disable the log archive mode is to call:</p>
-<p><i>SYSCS_UTIL.SYSCS_DISABLE_LOG_ARCHIVE_MODE(IN SMALLINT
-DELETE_ARCHIVED_LOG_FILES )</i></p>
+only way to disable the log archive mode is to run the following procedure:</p>
+<codeblock>SYSCS_UTIL.SYSCS_DISABLE_LOG_ARCHIVE_MODE(IN SMALLINT DELETE_ARCHIVED_LOG_FILES)</codeblock>
 <p>This system procedure disables the log archive mode and deletes any existing
-online archived log files if the input parameter <i>DELETE_ARCHIVED_LOG_FILES </i>is non-zero.</p>
+online archived log files if the input parameter <i>DELETE_ARCHIVED_LOG_FILES</i> is
+non-zero.</p>
 <p><b>Performing roll-forward recovery:</b></p>
-<p>By using the full backup copy , archived logs  and active logs, the database
-can be restored to its most recent state by performing roll-forward recovery.
- Roll-forward recovery can be performed  by specifying a connection URL attribute <i>rollForwardRecoveryFrom=&lt;BackupPath&gt;</i> at boot time.
- This brings the database to most recent state using full backup copy , archived
-logs  and active logs. All the log files should be in the database log path
-directory.</p>
-<p>In the following example a database named 'wombat' is backed up to d:/database
-directory with log archive mode enabled and restored using roll-forward recovery
-after a media failure:</p>
+<p>By using the full backup copy, archived logs, and active logs, you can
+restore a database to its most recent state by performing roll-forward recovery.
+You perform a roll-forward recovery by specifying a connection URL attribute <i>rollForwardRecoveryFrom=&lt;BackupPath&gt;</i> at
+boot time. This brings the database to its most recent state by using full
+backup copy, archived logs, and active logs. All the log files should be in
+the database log path directory.</p>
 <p><b>Backing up a database:</b></p>
-<p>
-<codeblock>connect 'jdbc:derby:wombat;create=true';
+<p>In the following example, a database named wombat is backed up to the d:/backup
+directory with log archive mode enabled:<codeblock>connect 'jdbc:derby:wombat;create=true';
 
 create table t1(a int not null primary key);
 ------------------DML/DDL Operations
@@ -103,15 +106,16 @@
 -----------------DML/DDL Operations
 -----------------Database Crashed (Media Corruption on data disks)</codeblock></p>
 <p><b>Restoring a database using roll-forward recovery:</b></p>
-<p>
-<codeblock>connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=d:/backup/wombat';
+<p>In the following example, the database is restored using roll-forward recovery
+after a media failure:<codeblock>connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=d:/backup/wombat';
 select * from t1;
 ---------------DML/DDL Operations</codeblock></p>
 <p>The following attribute can be specified in the JDBC boot time connection
 URL:</p>
 <p><i>rollForwardRecoveryFrom=&lt;Path&gt;</i></p>
-<p>For more information see the rollForwardRecoveryFrom=&lt;Path&gt; section
+<p>For more information, see the rollForwardRecoveryFrom=&lt;Path&gt; section
 in the <ph conref="adminconrefs.dita#pub/citref"></ph>.</p>
 <p>After a database is restored from full backup, transactions from the online
 archived logs and active logs are replayed.</p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminservlet98430.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminservlet98430.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminservlet98430.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminservlet98430.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,36 +16,35 @@
 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="cadminservlet98430" xml:lang="en-us">
-<title>Managing the Derby Network Server remotely using the servlet interface</title>
-<prolog></prolog>
+<title>Managing the Derby Network Server remotely by using the servlet interface</title>
+<shortdesc>You can use the servlet interface to manage the Network Server
+remotely. To use the servlet interface, the servlet must be registered with
+a Web server, and derby.system.home must be known to the Web server.</shortdesc>
 <conbody>
-<p>You can use the servlet interface to start the Network Server remotely.
-To use the servlet interface, the servlet must be registered with a web server,
-and <i>derby.system.home</i> must be known to the web server.</p>
 <p>A Web application archive (WAR) file, <i>derby.war</i>, for the <ph conref="adminconrefs.dita#prod/productshortname"></ph> 
 Network Server is available in <i>$<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>/frameworks/NetworkServer/war.</i> This
-WAR registers the Network Server's servlet at the relative path <i>/derbynet</i>.
+file registers the Network Server's servlet at the relative path <i>/derbynet</i>.
 See the documentation for your Application Server for instructions on how
 to install it.</p>
 <p>For example, if <i>derby.war</i> is installed in WebSphere Application
-Server with a context root of <filepath>cns</filepath>, then the URL of the
-server is:</p>
+Server with a context root of <filepath>cns</filepath>, the URL of the server
+is:</p>
 <codeblock>http://server[:port]/cns/derbynet</codeblock>
 <note>A servlet engine is not part of the Network Server. </note>
 <p>The servlet takes the following optional configuration parameters:</p>
-<ul>
-<li><i>portNumber</i>   <p>Specifies the port number to be used by the network
-server.</p></li>
-<li><i>startNetworkServerOnInit</i> <p>Specifies that the Network Server is
-to be started when the servlet is initialized.</p></li>
-<li><i>tracingDirectory</i>   <p>Specifies the location for trace files. If
-the tracing directory is not specified, the traces are placed in <i>derby.system.home</i>.</p></li>
-</ul>
+<dl><dlentry>
+<dt>portNumber</dt>
+<dd>Specifies the port number to be used by the network server.</dd>
+</dlentry><dlentry>
+<dt>startNetworkServerOnInit</dt>
+<dd>Specifies that the Network Server is to be started when the servlet is
+initialized.</dd>
+</dlentry><dlentry>
+<dt>tracingDirectory</dt>
+<dd>Specifies the location for trace files. If the tracing directory is not
+specified, the traces are placed in <i>derby.system.home</i>.</dd>
+</dlentry></dl>
 <p>This section describes the servlet pages.</p>
 </conbody>
 </concept>
-



Mime
View raw message