svn commit: r412636 - /db/derby/docs/branches/10.1/src/adminguide/radminconfigstartnetworkserver.dita

[jt...@apache.org]

Author: jta
Date: Wed Jun  7 19:41:18 2006
New Revision: 412636

URL: http://svn.apache.org/viewvc?rev=412636&view=rev
Log:
DERBY-1239 Merge fix from trunk, revision 412634, to 10.1 branch.
Improves the wording for the derby.drda.startNetworthServer property. 
Incorporates contributions by John H. Embretsen (John.Embretsen@Sun.com) 
and Halley Pacheco de Oliveira (halleypo@yahoo.com.br).

Modified:
    db/derby/docs/branches/10.1/src/adminguide/radminconfigstartnetworkserver.dita

Modified: db/derby/docs/branches/10.1/src/adminguide/radminconfigstartnetworkserver.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.1/src/adminguide/radminconfigstartnetworkserver.dita?rev=412636&r1=412635&r2=412636&view=diff
==============================================================================
--- db/derby/docs/branches/10.1/src/adminguide/radminconfigstartnetworkserver.dita (original)
+++ db/derby/docs/branches/10.1/src/adminguide/radminconfigstartnetworkserver.dita Wed Jun  7 19:41:18 2006
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005, 2006 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.  
@@ -22,10 +22,20 @@
 <keywords><indexterm>derby.drda.startNetworkServer</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>Use the derby.drda.startNetworkServer property to simplify
-embedding the Network Server in your application. When you set derby.drda.startNetworkServer,
-the Network Server will automatically start when you start <ph conref="adminconrefs.dita#prod/productshortname"></ph>.
-Only one Network Server can be started in a JVM.</section>
+<section>
+<p>Use the derby.drda.startNetworkServer property to simplify
+embedding the Network Server in your Java application. When you set 
+derby.drda.startNetworkServer to true, the Network Server will automatically 
+start when you start <ph conref="adminconrefs.dita#prod/productshortname"></ph> 
+(in this context, <ph conref="adminconrefs.dita#prod/productshortname"></ph>
+will start when the embedded driver is loaded). Only one Network Server
+can be started in a JVM.</p>
+<p>NOTE:
+If you start the Network Server with this property set to true, the Network 
+Server will stop when your application ends or when you stop it by other means 
+(e.g. by using the Java API, the command line interface, or by shutting down 
+the Derby system), whichever comes first.</p>
+</section>
 <refsyn><title>Syntax</title><codeblock>derby.drda.startNetworkServer=[true | false]</codeblock> </refsyn>
 <section><title>Default</title><p>False.</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.startNetworkServer=true</b></codeblock> </example>