You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ch...@apache.org on 2013/11/11 16:40:43 UTC
svn commit: r1540754 [2/2] - /db/derby/docs/trunk/src/adminguide/
Modified: db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita Mon Nov 11 15:40:42 2013
@@ -19,6 +19,8 @@ limitations under the License.
-->
<reference id="radminjmxenablepwd" xml:lang="en-us">
<title>Enabling remote JMX with password authentication only</title>
+<shortdesc>Some JVMs include built-in support for JMX password
+authentication.</shortdesc>
<prolog><metadata>
<keywords><indexterm>Java Management Extensions (JMX) technology</indexterm>
<indexterm>JMX<indexterm>enabling with password authentication</indexterm></indexterm>
@@ -26,11 +28,10 @@ limitations under the License.
</metadata></prolog>
<refbody>
<section>
-<p>Some JVMs include built-in support for JMX password authentication. For
-example, with Oracle Java Development Kit (JDK) 6 or later, authentication is
-enabled by default, and it is possible to specify a properties file that
-contains usernames and passwords. The properties file syntax is the same as for
-other Java properties files.</p>
+<p>For example, with Oracle Java Development Kit (JDK) 6 or later,
+authentication is enabled by default, and it is possible to specify a properties
+file that contains usernames and passwords. The properties file syntax is the
+same as for other Java properties files.</p>
<p><note>When authentication is enabled and a Java Security Manager is
installed, additional permissions may need to be granted to users in the
security policy used. See
Modified: db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita Mon Nov 11 15:40:42 2013
@@ -19,6 +19,8 @@ limitations under the License.
-->
<reference id="radminjmxenablepwdssl" xml:lang="en-us">
<title>Enabling remote JMX with password authentication and SSL</title>
+<shortdesc>This example shows how to start the Network Server as
+follows.</shortdesc>
<prolog><metadata>
<keywords><indexterm>Java Management Extensions (JMX) technology</indexterm>
<indexterm>JMX<indexterm>enabling with password authentication and SSL</indexterm></indexterm>
@@ -26,7 +28,6 @@ limitations under the License.
</metadata></prolog>
<refbody>
<section>
-<p>This example shows how to start the Network Server as follows:</p>
<ul>
<li>Using Oracle JDK 6 or later</li>
<li>Using a Java security manager and a custom policy file,
Modified: db/derby/docs/trunk/src/adminguide/radminjmxenablesimpleauth.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxenablesimpleauth.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxenablesimpleauth.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxenablesimpleauth.dita Mon Nov 11 15:40:42 2013
@@ -19,6 +19,8 @@ limitations under the License.
-->
<reference id="radminjmxenablesimpleauth" xml:lang="en-us">
<title>Simple authorization using an access file</title>
+<shortdesc>Some JVMs support a simple access file system for controlling JMX
+access.</shortdesc>
<prolog><metadata>
<keywords><indexterm>Java Management Extensions (JMX) technology</indexterm>
<indexterm>JMX<indexterm>simple authorization using an access file</indexterm></indexterm>
@@ -26,8 +28,7 @@ limitations under the License.
</metadata></prolog>
<refbody>
<section>
-<p>Some JVMs support a simple access file system for controlling JMX access. An
-access file is formatted the same way as password files (described in
+<p>An access file is formatted the same way as password files (described in
<xref href="radminjmxenablepwd.dita#radminjmxenablepwd"></xref>), and associates
roles with an access level. Valid access levels are <codeph>readonly</codeph>
and <codeph>readwrite</codeph>:</p>
Modified: db/derby/docs/trunk/src/adminguide/radminjmxintro.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxintro.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxintro.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxintro.dita Mon Nov 11 15:40:42 2013
@@ -20,6 +20,8 @@ limitations under the License.
<reference id="radminjmxintro" xml:lang="en-us">
<title>Introduction to the
<ph conref="../conrefs.dita#prod/productshortname"></ph> MBeans</title>
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> provides the
+MBeans described in this section.</shortdesc>
<prolog><metadata>
<keywords><indexterm>Java Management Extensions (JMX) technology</indexterm>
<indexterm>JMX<indexterm>using</indexterm></indexterm>
@@ -28,8 +30,6 @@ limitations under the License.
</metadata></prolog>
<refbody>
<section>
-<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides the
-MBeans described in this section.</p>
<p>The public API documentation for each
<ph conref="../conrefs.dita#prod/productshortname"></ph> MBean describes its
features in detail.</p>
Modified: db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita Mon Nov 11 15:40:42 2013
@@ -20,6 +20,9 @@ limitations under the License.
<reference id="radminjmxjconsole" xml:lang="en-us">
<title>Using JConsole to access the
<ph conref="../conrefs.dita#prod/productshortname"></ph> MBeans</title>
+<shortdesc>JConsole is a graphical JMX-compliant tool that is available in
+recent versions of the Oracle JDKs. JConsole enables you to monitor and manage
+Java applications and virtual machines on a local or remote machine.</shortdesc>
<prolog><metadata>
<keywords><indexterm>Java Management Extensions (JMX) technology</indexterm>
<indexterm>JMX<indexterm>using JConsole</indexterm></indexterm>
@@ -27,9 +30,6 @@ limitations under the License.
</metadata></prolog>
<refbody>
<section>
-<p>JConsole is a graphical JMX-compliant tool that is available in recent
-versions of the Oracle JDKs. JConsole enables you to monitor and manage Java
-applications and virtual machines on a local or remote machine.</p>
<p>You may use JConsole from JDK 6 or later even if you are running
<ph conref="../conrefs.dita#prod/productshortname"></ph> using an earlier
version of the JDK (or just the JRE). (You could also use JConsole from JDK 5 if
@@ -40,7 +40,8 @@ More information about JConsole is avail
href="http://openjdk.java.net/tools/svc/jconsole/index.html"
scope="external">http://openjdk.java.net/tools/svc/jconsole/index.html</xref>.</p>
</section>
-<section><title>Starting JConsole and connecting to Derby</title>
+<section><title>Starting JConsole and connecting to
+<ph conref="../conrefs.dita#prod/productshortname"></ph></title>
<p>In the Oracle JDK, the JConsole binary is available in
<codeph>JDK_HOME/bin</codeph>, where JDK_HOME is the directory in which the JDK
is installed. To start JConsole, use the <codeph>jconsole</codeph> command, as
@@ -64,11 +65,13 @@ running <ph conref="../conrefs.dita#prod
it.</p>
<p>To connect to a JVM on a remote host, you will need to supply the host name
and port number, or a JMX service URL, instead.</p>
-<p>If you cannot find the Derby JVM running on the local host, make sure you are
-running JConsole as the same user as the Derby JVM, or as a different user with
-sufficient file system permissions. If you are using Java SE 5, make sure you
-have enabled JMX. When you use Java SE 6 or later, local JMX access is enabled
-by default.</p>
+<p>If you cannot find the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> JVM running on the
+local host, make sure you are running JConsole as the same user as the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> JVM, or as a different
+user with sufficient file system permissions. If you are using Java SE 5, make
+sure you have enabled JMX. When you use Java SE 6 or later, local JMX access is
+enabled by default.</p>
</section>
<section><title>Accessing MBeans</title>
<p>Once you have connected to a JVM via JConsole, the JVM's MBeans should be
Modified: db/derby/docs/trunk/src/adminguide/radminjmxtroubleshoot.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxtroubleshoot.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxtroubleshoot.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxtroubleshoot.dita Mon Nov 11 15:40:42 2013
@@ -19,6 +19,8 @@ limitations under the License.
-->
<reference id="radminjmxtroubleshoot" xml:lang="en-us">
<title>Troubleshooting JMX connection issues</title>
+<shortdesc>If you experience problems connecting remotely to an MBean server
+using JMX, it may be helpful to obtain some tracing information.</shortdesc>
<prolog><metadata>
<keywords><indexterm>Java Management Extensions (JMX) technology</indexterm>
<indexterm>JMX<indexterm>using a security policy</indexterm></indexterm>
@@ -26,12 +28,12 @@ limitations under the License.
</metadata></prolog>
<refbody>
<section>
-<p>If you experience problems connecting remotely to an MBean server using JMX
-(as described in <xref href="radminjmxjconsole.dita#radminjmxjconsole"></xref>
-and <xref href="radminjmxcode.dita#radminjmxcode"></xref>), it may be helpful to
-obtain some tracing information. The JMX implementation in the Oracle JDK uses
-the <codeph>java.util.logging</codeph> API to log JMX traces. For example, in
-order to trace SSL connection issues, set the system property
+<p>For details on connecting remotely to an MBean server, see
+<xref href="radminjmxjconsole.dita#radminjmxjconsole"></xref> and
+<xref href="radminjmxcode.dita#radminjmxcode"></xref>.</p>
+<p>The JMX implementation in the Oracle JDK uses the
+<codeph>java.util.logging</codeph> API to log JMX traces. For example, in order
+to trace SSL connection issues, set the system property
<codeph>java.util.logging.config.file</codeph> as shown in the following:</p>
<codeblock><b>java -Djava.util.logging.config.file=logging.properties MyJmxClient</b></codeblock>
<p>With JConsole, a separate logging window will appear if you specify the
Modified: db/derby/docs/trunk/src/adminguide/radminlicense.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminlicense.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminlicense.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminlicense.dita Mon Nov 11 15:40:42 2013
@@ -20,7 +20,6 @@ limitations under the License.
<!--##### DO NOT CHANGE ANYTHING ABOVE THIS LINE #####-->
<reference id="radminlicense" xml:lang="en-us">
<title>License</title>
-<shortdesc></shortdesc>
<prolog><metadata>
<keywords><indexterm>Apache<indexterm>license</indexterm></indexterm></keywords>
</metadata></prolog>
Modified: db/derby/docs/trunk/src/adminguide/radminlog800241.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminlog800241.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminlog800241.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminlog800241.dita Mon Nov 11 15:40:42 2013
@@ -20,13 +20,15 @@ limitations under the License.
-->
<reference id="radminlog800241" xml:lang="en-us">
<title>Example of creating a log in a non-default location</title>
+<shortdesc>The following database connection URL creates a database in the
+directory <codeph>d:/mydatabases</codeph>, but puts the database log directory
+in <codeph>h:/janets/tourslog</codeph>.</shortdesc>
<prolog></prolog>
<refbody>
-<section><p>The following database connection URL creates a database in the
-directory <filepath>d:/mydatabases</filepath>, but puts the database log directory
-in <filepath>h:/janets/tourslog</filepath>:</p></section>
-<example> <codeblock>jdbc:derby:d:/mydatabases/toursDB;
- create=true;logDevice=h:/janets/tourslog</codeblock></example>
+<example>
+<codeblock>jdbc:derby:d:/mydatabases/toursDB;
+ create=true;logDevice=h:/janets/tourslog</codeblock>
+</example>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/adminguide/radminlog800279.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminlog800279.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminlog800279.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminlog800279.dita Mon Nov 11 15:40:42 2013
@@ -18,21 +18,29 @@ limitations under the License.
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
<reference xml:lang="en-us" id="radminlog800279">
<title>Example of moving a log manually</title>
-<prolog>
-</prolog>
+<shortdesc>If you want to move the log to <codeph>g:/bigdisk/tourslog</codeph>,
+move the log with operating system commands.</shortdesc>
+<prolog></prolog>
<refbody>
-<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>
+<section><p>For example, you could use the following command:</p></section>
+<example>
<codeblock><b>move h:\janets\tourslog\log\*.* g:\bigdisk\tourslog\log</b></codeblock></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>
+<section><p>Then, alter the <codeph>logDevice</codeph> entry in
+<codeph>service.properties</codeph> 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>
-<section><p>If you later want to move the log back to its default location (in this
-case, <filepath>d:\mydatabases\toursDB\log</filepath>), move
-the log manually as follows:</p></section><example>
+<section><p>If you later want to move the log back to its default location (in
+this case, <codeph>d:\mydatabases\toursDB\log</codeph>), 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>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
+<section><p>Then, delete the <codeph>logDevice</codeph> entry from
+<codeph>service.properties</codeph>.</p></section>
+<section>
+<note>This example uses commands that are specific to the Windows operating
system. Use commands appropriate to your operating system to copy a directory
and all of its contents to a new location.</note></section>
</refbody></reference>
Modified: db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita Mon Nov 11 15:40:42 2013
@@ -20,10 +20,17 @@ limitations under the License.
-->
<reference id="radminnsdatasourcexmp" xml:lang="en-us">
<title>DataSource access examples</title>
+<shortdesc>These examples use
+<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> and
+<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph> to access
+the Network Server.</shortdesc>
<prolog></prolog>
<refbody>
-<section><p>The following example uses <codeph>org.apache.derby.jdbc.ClientDataSource</codeph> to
-access the Network Server:</p></section>
+<section>
+<p>The following example uses
+<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> to access the Network
+Server:</p>
+</section>
<example> <codeblock>org.apache.derby.jdbc.ClientDataSource ds =
new org.apache.derby.jdbc.ClientDataSource();
ds.setDatabaseName("mydb");
Modified: db/derby/docs/trunk/src/adminguide/radminovnssample.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminovnssample.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminovnssample.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminovnssample.dita Mon Nov 11 15:40:42 2013
@@ -19,39 +19,46 @@ limitations under the License.
-->
<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>
+<shortdesc>The <codeph>NsSample</codeph> 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>
</metadata></prolog>
<refbody>
-<section><p>The <i>NsSample</i> program performs the following tasks: <ul>
-<li>Starts the Network Server. </li>
+<section><p>The <codeph>NsSample</codeph> 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. (Note that this step is not
necessary if you are running the client on JDK 1.6 or higher. In that
environment, the network client driver loads automatically.)</li>
-<li>Creates the <i>NsSampledb</i> database if not already created. </li>
+<li>Creates the <codeph>NsSampledb</codeph> database if it has not already been
+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>
+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>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>
+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="../conrefs.dita#prod/productinstallpath"></ph>%\demo\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>
+</ul></p>
+<p>You must install the following files in the
+<codeph>%<ph conref="../conrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph>
+directory before you can run the sample program:
+<ul>
+<li><codeph>NsSample.java</codeph>
+<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>
@@ -65,21 +72,26 @@ work.</dd>
<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>
+<li><codeph>NsSampleClientThread.java</codeph>
+<p>This file contains two Java classes:
+<ul>
+<li>The <codeph>NsSampleClientThread</codeph> class extends
+<codeph>Thread</codeph> and instantiates a <codeph>NsSampleWork</codeph>
+instance.</li>
+<li>The <codeph>NsSampleWork</codeph> class contains everything that is required
+to perform DML operations using JDBC calls. The <codeph>doWork</codeph> method
+in the <codeph>NsSampleWork</codeph> 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>
-</ul>The compiled class files for the NsSample program are:<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>
+<li><codeph>NetworkServerUtil.java</codeph>
+<p>This file contains helper methods to start the Network Server and to shut
+down the server.</p></li>
+</ul>The compiled class files for the <codeph>NsSample</codeph> program are:
+<ul>
+<li><codeph>NsSample.class</codeph></li>
+<li><codeph>NsSampleClientThread.class</codeph></li>
+<li><codeph>NsSampleWork.class</codeph></li>
+<li><codeph>NetworkServerUtil.class</codeph></li>
</ul></p></section>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita Mon Nov 11 15:40:42 2013
@@ -17,7 +17,10 @@ limitations under the License.
-->
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
<reference xml:lang="en-us" id="radminsampleprograms">
-<title>Derby Network Server sample programs</title>
+<title><ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server
+sample programs</title>
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> provides
+several sample programs for Network Server users.</shortdesc>
<prolog><metadata>
<keywords>
<indexterm>Sample programs for Network Server</indexterm>
@@ -25,6 +28,4 @@ limitations under the License.
</metadata>
</prolog>
<refbody>
-<section><p>This section describes several <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server sample
-programs for Network Server users.</p></section>
</refbody></reference>
Modified: db/derby/docs/trunk/src/adminguide/radminservlet810694.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminservlet810694.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminservlet810694.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminservlet810694.dita Mon Nov 11 15:40:42 2013
@@ -26,9 +26,11 @@ limitations under the License.
</metadata></prolog>
<refbody>
<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>
-</ul> </section>
+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>
+</ul>
+</section>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/adminguide/radminservlet810717.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminservlet810717.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminservlet810717.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminservlet810717.dita Mon Nov 11 15:40:42 2013
@@ -18,6 +18,9 @@ limitations under the License.
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
<reference xml:lang="en-us" id="radminservlet810717">
<title>Running page</title>
+<shortdesc>If the Network Server is running (whether it was started by
+initializing the servlet or in some other manner), the running page is
+displayed.</shortdesc>
<prolog><metadata>
<keywords>
<indexterm>Shutting down Network Server<indexterm>using servlet
@@ -26,22 +29,19 @@ interface</indexterm></indexterm>
</metadata>
</prolog>
<refbody>
-<section><p>If the Network Server is running (whether it was started by initializing
-the servlet or in some other manner), the running page is displayed. The running
-page indicates whether logging is on or off, whether tracing is on or off,
-and if tracing is on, indicates for which session.</p></section>
-<section><p>You can use the running page to stop the server and turn logging and tracing
-on or off. The following options are available
-from the running page:</p></section><section>
+<section><p>The running page indicates whether logging is on or off, whether
+tracing is on or off, and if tracing is on, indicates for which session.</p>
+<p>You can use the running page to stop the server and turn logging and tracing
+on or off. The following options are available from the running page:</p>
<ul>
-<li>Start or stop logging. </li>
-<li>Start or stop tracing all sessions. </li>
+<li>Start or stop logging.</li>
+<li>Start or stop tracing all sessions.</li>
<li>Specify session to trace. (If you choose this option, the Trace session
page is displayed.)</li>
-<li>Change tracing directory (If you choose this option, the Trace directory
+<li>Change tracing directory. (If you choose this option, the Trace directory
page is displayed.)</li>
-<li>Specify threading parameters for Network Server. (If you choose this option,
-the Thread parameters page is displayed.)</li>
+<li>Specify threading parameters for the Network Server. (If you choose this
+option, the Thread parameters page is displayed.)</li>
<li>Stop the Network Server.</li>
</ul></section>
</refbody></reference>
Modified: db/derby/docs/trunk/src/adminguide/radminservlet810796.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminservlet810796.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminservlet810796.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminservlet810796.dita Mon Nov 11 15:40:42 2013
@@ -18,12 +18,11 @@ limitations under the License.
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
<reference xml:lang="en-us" id="radminservlet810796">
<title>Trace session page</title>
-<prolog>
-</prolog>
+<shortdesc>If on the running page you choose to specify a session to trace, this
+page is displayed. You must enter the Session ID.</shortdesc>
+<prolog></prolog>
<refbody>
-<section><p>If on the running page you choose to specify a session to trace, this page
-is displayed. You must enter the Session ID. </p></section>
<section><p>You are given the option to turn tracing on or off or return to the previous
-menu. When you push the Trace On/Off button, information indicating the current
+menu. When you click the Trace On/Off button, information indicating the current
tracing state is displayed.</p></section>
</refbody></reference>
Modified: db/derby/docs/trunk/src/adminguide/radminservlet810822.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminservlet810822.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminservlet810822.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminservlet810822.dita Mon Nov 11 15:40:42 2013
@@ -18,12 +18,11 @@ limitations under the License.
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
<reference xml:lang="en-us" id="radminservlet810822">
<title>Trace directory page</title>
-<prolog>
-</prolog>
+<shortdesc>This page is displayed if the you choose to change the tracing
+directory on the Running page. You must enter the Trace Directory.</shortdesc>
+<prolog></prolog>
<refbody>
-<section><p>This page is displayed if the you choose to change the tracing directory
-on the Running page. You must enter the Trace Directory. </p></section>
-<section><p>You can either set a tracing directory, or you can return to the previous
-menu. Additional information is displayed that indicates the current tracing
-directory when you push the Set Directory button. </p></section>
+<section><p>You can either set a tracing directory, or you can return to the
+previous menu. Additional information is displayed that indicates the current
+tracing directory when you click the Set Directory button.</p></section>
</refbody></reference>
Modified: db/derby/docs/trunk/src/adminguide/radminservlet810910.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminservlet810910.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminservlet810910.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminservlet810910.dita Mon Nov 11 15:40:42 2013
@@ -18,17 +18,19 @@ See the License for the specific languag
limitations under the License.
-->
<reference id="radminservlet810910" xml:lang="en-us">
-<title>Set Network Server parameters </title>
+<title>Set Network Server parameters</title>
+<shortdesc>The first page is displayed if the thread parameter button is
+clicked. Use this page to set the new parameters.</shortdesc>
<prolog></prolog>
<refbody>
-<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>
+<section><p>Enter the following information:</p>
+<ul>
<li>New maximum number of threads</li>
<li>New thread time slice</li>
-</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>
+</ul>
+<p>If either the maximum threads or time slice parameter is left blank, that
+value is left unchanged from the current setting.</p>
+<p>Click Set Network Server parameters to display the updated values for the
+maximum threads and the time slice parameters.</p></section>
</refbody>
</reference>