Return-Path: 
 <derby-commits-return-5376-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 77400 invoked from network); 9 Oct 2006 23:56:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 9 Oct 2006 23:56:47 -0000
Received: (qmail 35639 invoked by uid 500); 9 Oct 2006 23:56:47 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 35576 invoked by uid 500); 9 Oct 2006 23:56:47 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 35565 invoked by uid 99); 9 Oct 2006 23:56:47 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Oct 2006 16:56:47 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Oct 2006 16:56:46 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8304A1A981A; Mon,  9 Oct 2006 16:56:25 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r454559 - in /db/derby/docs/branches/10.2/src/adminguide:
 tadminconfig815357.dita tadminconfig815822.dita tadminconfig815853.dita
Date: Mon, 09 Oct 2006 23:56:25 -0000
To: derby-commits@db.apache.org
From: fuzzylogic@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061009235625.8304A1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: fuzzylogic
Date: Mon Oct  9 16:56:24 2006
New Revision: 454559

URL: http://svn.apache.org/viewvc?view=rev&rev=454559
Log:
DERBY-1819: Correct errors in the admin guide documentation of
NetworkServerControl() API. Merge of revision 454557 from trunk.

Committed for Laura Stewart <scotsmatrix@gmail.com>

Modified:
    db/derby/docs/branches/10.2/src/adminguide/tadminconfig815357.dita
    db/derby/docs/branches/10.2/src/adminguide/tadminconfig815822.dita
    db/derby/docs/branches/10.2/src/adminguide/tadminconfig815853.dita

Modified: db/derby/docs/branches/10.2/src/adminguide/tadminconfig815357.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/tadminconfig815357.dita?view=diff&rev=454559&r1=454558&r2=454559
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/tadminconfig815357.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/tadminconfig815357.dita Mon Oct  9 16:56:24 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -21,15 +21,15 @@
 <task id="tadminconfig815357" xml:lang="en-us">
 <title>Shutting down by using the API</title>
 <prolog><metadata>
-<keywords><indexterm>Shutting down Network Server<indexterm>from the API</indexterm></indexterm>
+<keywords><indexterm>Network Server<indexterm>shutting down using the API</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
 <context> <p>You can use the NetworkServerControl API to shut down the Network
-Server from within a Java application. For example:</p><codeblock>shutdown();</codeblock> </context>
+Server from within a Java application. The name of the method that you use
+to shutdown the Network Server is <codeph>shutdown()</codeph>.</p> </context>
 <example><p>For example, the following command shuts down the Network Server
-running on the current machine using port 1527.</p><codeblock>NetworkServerControl server = new NetworkServerControl();
+running on the current machine using the default port number (1527):</p><codeblock>NetworkServerControl server = new NetworkServerControl();
 server.shutdown();</codeblock></example>
 </taskbody>
 </task>
-

Modified: db/derby/docs/branches/10.2/src/adminguide/tadminconfig815822.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/tadminconfig815822.dita?view=diff&rev=454559&r1=454558&r2=454559
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/tadminconfig815822.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/tadminconfig815822.dita Mon Oct  9 16:56:24 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -21,11 +21,15 @@
 <task id="tadminconfig815822" xml:lang="en-us">
 <title>Obtaining Network Server properties by using the getCurrent Properties
 method</title>
+<prolog><metadata>
+<keywords><indexterm>Network Server<indexterm>properties information, getCurrentProperties
+method</indexterm></indexterm></keywords>
+</metadata></prolog>
 <taskbody>
-<context> <p>The getCurrentProperties method is a Java method
-that you can use to obtain information about the Network Server. It returns
-a Properties object with the value of all the NetServer properties as they
-are currently set.</p><p>The signature of this method is:</p><codeblock>Properties getCurrentProperties();</codeblock></context>
+<context> <p>The getCurrentProperties method is a Java method that you can
+use to obtain information about the Network Server. It returns a Properties
+object with the value of all the Network Server properties as they are currently
+set.</p><p>The signature of this method is:<codeblock>Properties getCurrentProperties();</codeblock></p></context>
 <example>For example:<codeblock>NetworkServerControl server = new NetworkServerControl();
 Properties p = server.getCurrentProperties();
 p.list(System.out);
@@ -38,4 +42,3 @@
 information about obtaining system information using the servlet interface.</p></postreq>
 </taskbody>
 </task>
-

Modified: db/derby/docs/branches/10.2/src/adminguide/tadminconfig815853.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/tadminconfig815853.dita?view=diff&rev=454559&r1=454558&r2=454559
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/tadminconfig815853.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/tadminconfig815853.dita Mon Oct  9 16:56:24 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -20,13 +20,17 @@
 -->
 <task id="tadminconfig815853" xml:lang="en-us">
 <title>Obtaining system information by using the API</title>
+<prolog><metadata>
+<keywords><indexterm>Network Server<indexterm>sysinfo method</indexterm></indexterm>
+<indexterm>Network Server<indexterm>system information, obtaining</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <taskbody>
-<context> <p>The <b>sysinfo</b> method produces the same information as the <b>sysinfo</b> command.
-The signature for this method is</p> <codeblock>String getSysinfo();</codeblock> </context>
+<context> <p>The <codeph>sysinfo</codeph> method produces the same information
+as the <cmdname>sysinfo</cmdname> command. The signature for this method is</p><codeblock>String getSysinfo();</codeblock> </context>
 <example><p>For example:</p><codeblock>NetworkServerControl serverControl = new NetworkServerControl();
-String myinfo = serverControl.getSysinfo();</codeblock><p>These methods return
-information about the Network Server running on the current machine on the default port
-number (1527).</p></example>
+String myinfo = serverControl.getSysinfo();</codeblock><p>The <codeph>getSysinfo()</codeph> method
+returns information about the Network Server that is running on the current
+machine on the default port number (1527).</p></example>
 </taskbody>
 </task>
-