Return-Path: 
 <derby-commits-return-3091-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 30172 invoked from network); 25 Apr 2006 23:12:44 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 25 Apr 2006 23:12:44 -0000
Received: (qmail 86914 invoked by uid 500); 25 Apr 2006 23:12:42 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 86892 invoked by uid 500); 25 Apr 2006 23:12:42 -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 86881 invoked by uid 99); 25 Apr 2006 23:12:42 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2006 16:12:42 -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: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 25 Apr 2006 16:12:41 -0700
Received: (qmail 29929 invoked by uid 65534); 25 Apr 2006 23:12:20 -0000
Message-ID: <20060425231220.29926.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r397015 - in /db/derby/docs/branches/10.1/src:
 adminguide/tadminnetservrun.dita devguide/rdevcsecure871406.dita
 devguide/rdevcsecure871422.dita devguide/rdevcsecure871439.dita
Date: Tue, 25 Apr 2006 23:12:11 -0000
To: derby-commits@db.apache.org
From: jta@apache.org
X-Mailer: svnmailer-1.0.8
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jta
Date: Tue Apr 25 16:12:04 2006
New Revision: 397015

URL: http://svn.apache.org/viewcvs?rev=397015&view=rev
Log:
DERBY-701 : port doc fix to 10.1.3

Modified:
    db/derby/docs/branches/10.1/src/adminguide/tadminnetservrun.dita
    db/derby/docs/branches/10.1/src/devguide/rdevcsecure871406.dita
    db/derby/docs/branches/10.1/src/devguide/rdevcsecure871422.dita
    db/derby/docs/branches/10.1/src/devguide/rdevcsecure871439.dita

Modified: db/derby/docs/branches/10.1/src/adminguide/tadminnetservrun.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/branches/10.1/src/adminguide/tadminnetservrun.dita?rev=397015&r1=397014&r2=397015&view=diff
==============================================================================
--- db/derby/docs/branches/10.1/src/adminguide/tadminnetservrun.dita (original)
+++ db/derby/docs/branches/10.1/src/adminguide/tadminnetservrun.dita Tue Apr 25 16:12:04 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -33,6 +34,7 @@
 grant codeBase "file:d:/<ph conref="adminconrefs.dita#prod/productlowercase"></ph>/lib/-" {
 permission java.io.FilePermission "${derby.system.home}${/}-", 
 	"read, write, delete";
+permission java.io.FilePermission "${derby.system.home}","read";
 permission java.io.FilePermission "${user.dir}${/}-", "read, write, delete";
 permission java.util.PropertyPermission "derby.*", "read";
 permission java.util.PropertyPermission "user.dir", "read";
@@ -62,10 +64,9 @@
 when starting the server as shown in the following example:<codeblock>java -Djava.security.manager -Djava.security.policy=d:/nwsvr.policy
 org.apache.derby.drda.NetworkServerControl start -h localhost</codeblock></li>
 <li>The following example shows how to start the Network Server (assuming
-that you start the server on the host machine <i>myserver</i>)
-in the default security manager  (listening to client requests originating
-from other machines only). This example assumes that the policy file exists
-in <filepath>d:/nwsvr.policy</filepath>.<codeblock>java -Djava.security.manager -Djava.security.policy=d:/nwsvr.policy
+that you start the server on the host machine <i>myserver</i>) in the default
+security manager  (listening to client requests originating from other machines
+only). This example assumes that the policy file exists in <filepath>d:/nwsvr.policy</filepath>.<codeblock>java -Djava.security.manager -Djava.security.policy=d:/nwsvr.policy
 org.apache.derby.drda.NetworkServerControl start -h <i>myserver</i></codeblock></li>
 </ul></example>
 </taskbody>

Modified: db/derby/docs/branches/10.1/src/devguide/rdevcsecure871406.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/branches/10.1/src/devguide/rdevcsecure871406.dita?rev=397015&r1=397014&r2=397015&view=diff
==============================================================================
--- db/derby/docs/branches/10.1/src/devguide/rdevcsecure871406.dita (original)
+++ db/derby/docs/branches/10.1/src/devguide/rdevcsecure871406.dita Tue Apr 25 16:12:04 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,13 +17,11 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure871406">
+<reference id="rdevcsecure871406" xml:lang="en-us">
 <title>Java 2 security policy file example 1</title>
-<prolog>
-</prolog>
-<refbody><example>
-<codeblock><b>/* Grants permission to run <ph conref="devconrefs.dita#prod/productshortname"></ph> and access all      */
+<prolog></prolog>
+<refbody>
+<example> <codeblock><b>/* Grants permission to run <ph conref="devconrefs.dita#prod/productshortname"></ph> and access all      */
 /* databases under the <ph conref="devconrefs.dita#prod/productshortname"></ph> system home              */
 /* when it is specified by the system property             */
 /* <ph conref="devconrefs.dita#prod/productshortname"></ph>.system.home                                        */
@@ -31,8 +32,9 @@
 
   permission java.lang.RuntimePermission "createClassLoader";
   permission java.util.PropertyPermission "derby.*", "read";
-
+  permission.java.io.FilePermission "${derby.system.home}","read";
   permission java.io.FilePermission "${derby.system.home}${/}
 -", "read,write,delete";
 };</codeblock></example>
-</refbody></reference>
+</refbody>
+</reference>

Modified: db/derby/docs/branches/10.1/src/devguide/rdevcsecure871422.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/branches/10.1/src/devguide/rdevcsecure871422.dita?rev=397015&r1=397014&r2=397015&view=diff
==============================================================================
--- db/derby/docs/branches/10.1/src/devguide/rdevcsecure871422.dita (original)
+++ db/derby/docs/branches/10.1/src/devguide/rdevcsecure871422.dita Tue Apr 25 16:12:04 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,13 +17,11 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure871422">
+<reference id="rdevcsecure871422" xml:lang="en-us">
 <title>Java 2 security policy file example 2</title>
-<prolog>
-</prolog>
-<refbody><example>
-<codeblock><b>/* Grants permission to run <ph conref="devconrefs.dita#prod/productshortname"></ph> and access all      */
+<prolog></prolog>
+<refbody>
+<example> <codeblock><b>/* Grants permission to run <ph conref="devconrefs.dita#prod/productshortname"></ph> and access all      */
 /* databases under the <ph conref="devconrefs.dita#prod/productshortname"></ph> system home              */
 /* when it defaults to the current directory               */</b>
 
@@ -28,10 +29,11 @@
 grant codeBase "file://f:/<ph conref="devconrefs.dita#prod/productlowercase"></ph>/lib/derby.jar" {
   permission java.lang.RuntimePermission "createClassLoader";
   permission java.util.PropertyPermission "derby.*", "read";
- 
   permission java.util.PropertyPermission "user.dir", "read";
+  permission java.io.FilePermission "${derby.system.home}","read";
   permission java.io.FilePermission "${user.dir}${/}-",
  "read,write,delete";
 
 };</codeblock></example>
-</refbody></reference>
+</refbody>
+</reference>

Modified: db/derby/docs/branches/10.1/src/devguide/rdevcsecure871439.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/branches/10.1/src/devguide/rdevcsecure871439.dita?rev=397015&r1=397014&r2=397015&view=diff
==============================================================================
--- db/derby/docs/branches/10.1/src/devguide/rdevcsecure871439.dita (original)
+++ db/derby/docs/branches/10.1/src/devguide/rdevcsecure871439.dita Tue Apr 25 16:12:04 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,13 +17,11 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure871439">
+<reference id="rdevcsecure871439" xml:lang="en-us">
 <title>Java 2 security policy file example 3</title>
-<prolog>
-</prolog>
-<refbody><example>
-<codeblock><b>/* Grants permission to run <ph conref="devconrefs.dita#prod/productshortname"></ph> and access a single */
+<prolog></prolog>
+<refbody>
+<example> <codeblock><b>/* Grants permission to run <ph conref="devconrefs.dita#prod/productshortname"></ph> and access a single */
 /* database (salesdb) under the <ph conref="devconrefs.dita#prod/productshortname"></ph> system home     */
 
 /* Note <ph conref="devconrefs.dita#prod/productshortname"></ph>.system.home must be an absolute pathname */</b>
@@ -29,7 +30,7 @@
 
   permission java.lang.RuntimePermission "createClassLoader";
   permission java.util.PropertyPermission "derby.*", "read";
-
+  permission java.io.FilePermission "${derby.system.home}","read";
   permission java.io.FilePermission "${derby.system.home}${/}*", 
 "read,write,delete";
   permission java.io.FilePermission "${derby.system.home}${/}
@@ -38,4 +39,5 @@
 
 
 }; </codeblock></example>
-</refbody></reference>
+</refbody>
+</reference>