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 [6/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/devguide/cdevspecial27988.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevspecial27988.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevspecial27988.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevspecial27988.dita Tue Jun 28 15:46:15 2005
@@ -1,38 +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 id="cdevspecial27988" xml:lang="en-us">
-<title>Overview</title>
-<prolog><metadata>
-<keywords><indexterm>Database-side procedures<indexterm>definition</indexterm></indexterm>
-<indexterm>Database-side JDBC procedures<indexterm>definition</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<p>Methods invoked within an application are called application-side methods.
-Methods invoked within <ph conref="devconrefs.dita#prod/productshortname"></ph> are
-called database-side procedures.</p>
-<p>An application-side method can be exactly the same as a database-side
-procedure. The only difference is where you invoke them. You write the method
-only once. Where you invoke the method-within the application or within an
-SQL statement-determines whether it is an "application-side" or a "database-side"
-method. </p>
-</conbody>
-</concept>
-

Modified: incubator/derby/docs/trunk/src/devguide/cdevspecial42117.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevspecial42117.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevspecial42117.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevspecial42117.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,18 @@
 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="cdevspecial42117">
+<concept id="cdevspecial42117" xml:lang="en-us">
 <title>Programming database-side JDBC procedures</title>
+<shortdesc>Methods invoked within an application are called application-side
+methods. Methods invoked within <ph conref="devconrefs.dita#prod/productshortname"></ph> are
+called database-side procedures.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Database-side JDBC procedures</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Database-side JDBC procedures</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<ul>
-<li><xref href="cdevspecial27988.dita#cdevspecial27988"/></li>
-<li><xref href="cdevspecial29620.dita#cdevspecial29620"/></li>
-<li><xref href="cdevspecial28907.dita#cdevspecial28907"/></li>
-<li><xref href="cdevspecial29620.dita#cdevspecial29620"/></li>
-<li><xref href="cdevspecial16181.dita#cdevspecial16181"/></li>
-<li><xref href="cdevspecial41728.dita#cdevspecial41728"/></li>
-<li><xref href="cdevspecial45786.dita#cdevspecial45786"/></li>
-</ul>
-</conbody></concept>
+<p>An application-side method can be exactly the same as a database-side procedure.
+The only difference is where you invoke them. You write the method only once.
+Where you invoke the method-within the application or within an SQL statement-determines
+whether it is an "application-side" or a "database-side" method. </p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevspecial49460.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevspecial49460.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevspecial49460.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevspecial49460.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,18 +16,29 @@
 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="cdevspecial49460">
+<concept id="cdevspecial49460" xml:lang="en-us">
 <title>Triggers and exceptions</title>
+<shortdesc>Exceptions raised by triggers have a statement severity; they roll
+back the statement that caused the trigger to fire.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Triggers<indexterm>and exceptions</indexterm></indexterm>
+<keywords><indexterm>Triggers<indexterm>and exceptions</indexterm></indexterm>
+<indexterm>Triggers<indexterm>automatic rollback of trigger actions</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<ul>
-<li><xref href="cdevspecial67198.dita#cdevspecial67198"/></li>
-<li><xref href="cdevspecial93497.dita#cdevspecial93497"/></li>
-</ul>
-</conbody></concept>
+<p>This rule applies to nested triggers (triggers that are fired by other
+triggers). If a trigger action raises an exception (and it is not caught),
+the transaction on the current connection is rolled back to the point before
+the triggering event. For example, suppose Trigger A causes Trigger B to fire.
+If Trigger B throws an exception, the current connection is rolled back to
+the point before to the statement in Trigger A that caused Trigger B to fire.
+Trigger A is then free to catch the exception thrown by Trigger B and continue
+with its work. If Trigger A does not throw an exception, the statement that
+caused Trigger A, as well as any work done in Trigger A, continues until the
+transaction in the current connection is either committed or rolled back.
+However, if Trigger A does not catch the exception from Trigger B, it is as
+if Trigger A had thrown the exception. In that case, the statement that caused
+Trigger A to fire is rolled back, along with any work done by both of the
+triggers.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevspecial67198.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevspecial67198.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevspecial67198.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevspecial67198.dita Tue Jun 28 15:46:15 2005
@@ -1,44 +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="cdevspecial67198">
-<title>Exceptions in triggers actions</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Triggers<indexterm>automatic rollback of trigger
-actions</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
-<conbody>
-<p>Exceptions raised by triggers have a statement severity; they roll back
-the statement that caused the trigger to fire.</p>
-<p>This rule applies to nested triggers (triggers that are fired by other
-triggers). If a trigger action raises an exception (and it is not caught),
-the transaction on the current connection is rolled back to the point before
-the triggering event. For example, suppose Trigger A causes Trigger B to fire.
-If Trigger B throws an exception, the current connection is rolled back to
-the point before to the statement in Trigger A that caused Trigger B to fire.
-Trigger A is then free to catch the exception thrown by Trigger B and continue
-with its work. If Trigger A does not throw an exception, the statement that
-caused Trigger A, as well as any work done in Trigger A, continues until the
-transaction in the current connection is either committed or rolled back.
-However, if Trigger A does not catch the exception from Trigger B, it is as
-if Trigger A had thrown the exception. In that case, the statement that caused
-Trigger A to fire is rolled back, along with any work done by both of the
-triggers.</p>
-</conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevstandards806055.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstandards806055.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstandards806055.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstandards806055.dita Tue Jun 28 15:46:15 2005
@@ -1,23 +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="cdevstandards806055">
-<title>SQL99</title>
-<prolog>
-</prolog>
-<conbody>
-</conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevstart19524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstart19524.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstart19524.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstart19524.dita Tue Jun 28 15:46:15 2005
@@ -21,7 +21,7 @@
 </prolog>
 <conbody>
 <p>This chapter provides reference information about the installation directory,
-JVMs, class path, upgrades, and platform-specific issues.</p>
+JVMs, classpath, upgrades, and platform-specific issues.</p>
 <p>Review the <codeph>install.html</codeph> file that is installed with <ph conref="devconrefs.dita#prod/productshortname"></ph> for
 information on installing the <ph conref="devconrefs.dita#prod/productshortname"></ph> development environment. See the Release
 Notes for information on platform support, changes that may affect your existing

Modified: incubator/derby/docs/trunk/src/devguide/cdevstart98282.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstart98282.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstart98282.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstart98282.dita Tue Jun 28 15:46:15 2005
@@ -16,13 +16,13 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevstart98282">
-<title>Derby libraries and class path</title>
+<title>Derby libraries and classpath</title>
 <prolog>
 </prolog>
 <conbody>
 <p><ph conref="devconrefs.dita#prod/productshortname"></ph> libraries are located in the /<i>lib</i> subdirectory
-of the <ph conref="devconrefs.dita#prod/productshortname"></ph> base directory. You must set the class path on your development
+of the <ph conref="devconrefs.dita#prod/productshortname"></ph> base directory. You must set the classpath on your development
 machine to include the appropriate libraries.</p>
 <p><cite><ph conref="devconrefs.dita#pub/citgetstart"></ph></cite><cite> </cite> explains how to set the
-class path in a development environment.</p>
+classpath in a development environment.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevtricks32436.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevtricks32436.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevtricks32436.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevtricks32436.dita Tue Jun 28 15:46:15 2005
@@ -20,13 +20,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This section provides some examples of interesting SQL features (it also
-includes one or two non-SQL tips):</p>
-<ul>
-<li><xref href="cdevtricks19707.dita#cdevtricks19707"/></li>
-<li><xref href="cdevtricks39584.dita#cdevtricks39584"/></li>
-<li><xref href="cdevtricks21248.dita#cdevtricks21248"/></li>
-<li><xref href="cdevtricks23426.dita#cdevtricks23426"/></li>
-<li><xref href="cdevtricks13019.dita#cdevtricks13019"/></li>
-</ul>
+<p>This section provides some examples of interesting SQL features. It also
+includes a few non-SQL tips.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ incubator/derby/docs/trunk/src/devguide/derbydev.ditamap Tue Jun 28 15:46:15 2005
@@ -28,21 +28,20 @@
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
 <topicref href="rdevcopyright.dita" navtitle="Copyright"></topicref>
-<topicref href="cdevdgpref29520.dita" navtitle="About This Document">
-<topicref href="cdevdgpref11181.dita" navtitle="Purpose of This Document">
-</topicref>
+<topicref collection-type="family" href="cdevdgpref29520.dita" navtitle="About This Document">
+<topicref href="cdevdgpref11181.dita" navtitle="Purpose of this guide"></topicref>
 <topicref href="cdevdgpref24290.dita" navtitle="Audience"></topicref>
-<topicref href="cdevdgpref23947.dita" navtitle="How This Document Is Organized">
+<topicref href="cdevdgpref23947.dita" navtitle="How this guide Is Organized">
 </topicref>
 </topicref>
-<topicref href="cdevdvlp19524.dita" navtitle="JDBC applications and Derby basics">
+<topicref collection-type="family" href="cdevdvlp19524.dita" navtitle="JDBC applications and Derby basics">
 <topicref href="cdevdvlp14839.dita" navtitle="Application development overview">
 </topicref>
-<topicref href="cdevdvlp39409.dita" navtitle="Derby embedded basics">
+<topicref collection-type="family" href="cdevdvlp39409.dita" navtitle="Derby embedded basics">
 <topicref href="cdevdvlp40653.dita" navtitle="Derby JDBC driver"></topicref>
 <topicref href="cdevdvlp17453.dita" navtitle="Derby JDBC database connection URL">
 </topicref>
-<topicref href="cdevdvlp27610.dita" navtitle="Derby system">
+<topicref collection-type="family" href="cdevdvlp27610.dita" navtitle="Derby system">
 <topicref href="cdevdvlp96597.dita" navtitle="One Derby instance for each Java Virtual Machine">
 </topicref>
 <topicref href="cdevdvlp27715.dita" navtitle="Booting databases"></topicref>
@@ -55,7 +54,7 @@
 </topicref>
 <topicref href="cdevdvlp19297.dita" navtitle="Recommended practices"></topicref>
 </topicref>
-<topicref href="cdevdvlp21955.dita" navtitle="A Derby database">
+<topicref collection-type="family" href="cdevdvlp21955.dita" navtitle="A Derby database">
 <topicref href="cdevdvlp40724.dita" navtitle="The database directory"></topicref>
 <topicref href="cdevdvlp42173.dita" navtitle="Creating, dropping, and backing up databases">
 </topicref>
@@ -68,8 +67,8 @@
 </topicref>
 <topicref href="cdevdvlp30653.dita" navtitle="Database limitations"></topicref>
 </topicref>
-<topicref href="cdevdvlp34964.dita" navtitle="Connecting to databases">
-<topicref href="cdevdvlp19619.dita" navtitle="Standard connections">
+<topicref collection-type="family" href="cdevdvlp34964.dita" navtitle="Connecting to databases">
+<topicref collection-type="family" href="cdevdvlp19619.dita" navtitle="Standard connections">
 <topicref href="cdevdvlp846369.dita" navtitle="Connecting to databases within the system">
 </topicref>
 <topicref href="cdevdvlp846402.dita" navtitle="Connecting to databases outside the system directory">
@@ -77,8 +76,8 @@
 </topicref>
 <topicref href="cdevdvlp40350.dita" navtitle="Conventions for specifying the database path">
 </topicref>
-<topicref href="cdevdvlp19700.dita" navtitle="Special database access">
-<topicref href="cdevdvlp91854.dita" navtitle="Accessing databases from the class path">
+<topicref collection-type="family" href="cdevdvlp19700.dita" navtitle="Special database access">
+<topicref href="cdevdvlp91854.dita" navtitle="Accessing databases from the classpath">
 </topicref>
 <topicref href="cdevdvlp24155.dita" navtitle="Accessing databases from a jar or zip file">
 </topicref>
@@ -86,7 +85,7 @@
 <topicref href="rdevdvlp22102.dita" navtitle="Database connection examples">
 </topicref>
 </topicref>
-<topicref href="cdevdvlp51654.dita" navtitle="Working with the database connection URL attributes">
+<topicref collection-type="family" href="cdevdvlp51654.dita" navtitle="Working with the database connection URL attributes">
 <topicref href="rdevdvlp847152.dita" navtitle="Using the databaseName attribute">
 </topicref>
 <topicref href="tdevdvlp40464.dita" navtitle="Shutting down Derby or an individual database">
@@ -104,13 +103,13 @@
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevstart19524.dita" navtitle="After installing">
-<topicref href="cdevstart16043.dita" navtitle="The installation directory">
+<topicref collection-type="family" href="cdevstart19524.dita" navtitle="After installing">
+<topicref collection-type="family" href="cdevstart16043.dita" navtitle="The installation directory">
 <topicref href="cdevstart813142.dita" navtitle="Batch files and shell scripts">
 </topicref>
 </topicref>
 <topicref href="cdevstart18978.dita" navtitle="Derby and JVMs"></topicref>
-<topicref href="cdevstart98282.dita" navtitle="Derby libraries and class path">
+<topicref href="cdevstart98282.dita" navtitle="Derby libraries and classpath">
 </topicref>
 <topicref href="cdevstart41260.dita" navtitle="UNIX-specific issues">
 <topicref href="cdevstart39409.dita" navtitle="Configuring file descriptors">
@@ -118,7 +117,7 @@
 <topicref href="cdevstart813545.dita" navtitle="Scripts"></topicref>
 </topicref>
 </topicref>
-<topicref href="cdevdvlp25174.dita" navtitle="Derby embedded basics">
+<topicref collection-type="family" href="cdevdvlp25174.dita" navtitle="Derby embedded basics">
 <topicref href="cdevdvlp40170.dita" navtitle="Embedded Derby JDBC driver">
 </topicref>
 <topicref href="rdevdvlp38881.dita" navtitle="Embedded Derby JDBC database connection URL">
@@ -128,18 +127,16 @@
 <topicref href="tdevdvlp38381.dita" navtitle="Starting Derby as an embedded database">
 </topicref>
 </topicref>
-<topicref href="cdevdeploy32171.dita" navtitle="Deploying Derby applications">
-<topicref href="cdevdeploy38918.dita" navtitle="Deployment issues">
+<topicref collection-type="family" href="cdevdeploy32171.dita" navtitle="Deploying Derby applications">
+<topicref collection-type="family" href="cdevdeploy38918.dita" navtitle="Deployment issues">
 <topicref href="cdevdeploy855368.dita" navtitle="Embedded deployment application overview">
 </topicref>
-<topicref href="cdevdeploy37603.dita" navtitle="Deployment cheat sheets">
-<topicref href="cdevdeploy855655.dita" navtitle="Deploying Derby in an embedded environment">
+<topicref collection-type="family" href="cdevdeploy855655.dita" navtitle="Deploying Derby in an embedded environment">
 <topicref href="cdevdeploy18639.dita" navtitle="Embedded systems and properties">
 </topicref>
 </topicref>
 </topicref>
-</topicref>
-<topicref href="cdevdeploy15325.dita" navtitle="Creating Derby databases for read-only use">
+<topicref collection-type="family" href="cdevdeploy15325.dita" navtitle="Creating Derby databases for read-only use">
 <topicref href="tdevdeploy26887.dita" navtitle="Creating and preparing the database for read-only use">
 </topicref>
 <topicref href="tdevdeploy19136.dita" navtitle="Deploying the database on the read-only media">
@@ -148,23 +145,23 @@
 </topicref>
 <topicref href="cdevdeploy11201.dita" navtitle="Accessing a read-only database in a zip/jar file">
 </topicref>
-<topicref href="tdevdeploy39856.dita" navtitle="Accessing databases within a jar file using the class path">
+<topicref collection-type="family" href="tdevdeploy39856.dita" navtitle="Accessing databases within a jar file using the classpath">
 <topicref href="cdevdeploy18716.dita" navtitle="Connecting to databases with ambiguous paths to databases in the file system">
 </topicref>
-<topicref href="cdevdeploy856333.dita" navtitle="Connecting to databases when the path is ambiguous because of databases in the class path">
+<topicref href="cdevdeploy856333.dita" navtitle="Connecting to databases when the path is ambiguous because of databases in the classpath">
 </topicref>
 </topicref>
 <topicref href="cdevdeploy82529.dita" navtitle="Databases on read-only media and DatabaseMetaData">
 </topicref>
 </topicref>
-<topicref href="cdevdeploy30736.dita" navtitle="Loading classes from a database">
-<topicref href="cdevdeploy856753.dita" navtitle="Class loading overview">
+<topicref collection-type="family" href="cdevdeploy30736.dita" navtitle="Loading classes from a database">
+<topicref collection-type="family" href="cdevdeploy856753.dita" navtitle="Class loading overview">
 <topicref href="cdevdeploy92419.dita" navtitle="Signed jar files"></topicref>
 </topicref>
 <topicref href="cdevdeploy15818.dita" navtitle="Create jar files for your application">
 </topicref>
-<topicref href="cdevdeploy23812.dita" navtitle="Add the jar file or files to the database">
-<topicref href="rdevdeploy856948.dita" navtitle="Jar file examples">
+<topicref collection-type="family" href="cdevdeploy23812.dita" navtitle="Add the jar file or files to the database">
+<topicref collection-type="family" href="rdevdeploy856948.dita" navtitle="Jar file examples">
 <topicref href="rdevdeploy856845.dita" navtitle="Installing jar files"></topicref>
 <topicref href="rdevdeploy856880.dita" navtitle="Removing jar files"></topicref>
 <topicref href="rdevdeploy856912.dita" navtitle="Replacing jar files"></topicref>
@@ -173,21 +170,20 @@
 <topicref href="cdevdeploy21645.dita" navtitle="Enable database class loading with a property">
 </topicref>
 <topicref href="cdevdeploy12748.dita" navtitle="Code your applications"></topicref>
-<topicref href="cdevdeploy17604.dita" navtitle="Dynamic changes to jar files or to the database jar class path">
+<topicref collection-type="family" href="cdevdeploy17604.dita" navtitle="Dynamic changes to jar files or to the database jar classpath">
 <topicref href="cdevdeploy857611.dita" navtitle="Requirements for dynamic changes">
 </topicref>
 <topicref href="cdevdeploy857648.dita" navtitle="Notes"></topicref>
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevspecial.dita" navtitle="Derby server-side programming">
-<topicref href="cdevspecial42117.dita" navtitle="Programming database-side JDBC procedures">
-<topicref href="cdevspecial27988.dita" navtitle="Overview"></topicref>
-<topicref href="cdevspecial29620.dita" navtitle="Database-side JDBC procedures and nested connections">
+<topicref collection-type="family" href="cdevspecial.dita" navtitle="Derby server-side programming">
+<topicref collection-type="family" href="cdevspecial42117.dita" navtitle="Programming database-side JDBC procedures">
+<topicref collection-type="family" href="cdevspecial29620.dita" navtitle="Database-side JDBC procedures and nested connections">
 <topicref href="cdevspecial28907.dita" navtitle="Requirements for database-side JDBC procedures using nested connections">
 </topicref>
 </topicref>
-<topicref href="cdevspecial16181.dita" navtitle="Database-side JDBC procedures using non-nested connections">
+<topicref collection-type="family" href="cdevspecial16181.dita" navtitle="Database-side JDBC procedures using non-nested connections">
 <topicref href="cdevspecial847513.dita" navtitle="Invoking a procedure using the CALL command">
 </topicref>
 </topicref>
@@ -204,23 +200,21 @@
 <topicref href="cdevspecial67260.dita" navtitle="Accessing before and after rows">
 </topicref>
 <topicref href="cdevspecial13670.dita" navtitle="Examples"></topicref>
-<topicref href="cdevspecial49460.dita" navtitle="Triggers and exceptions">
-<topicref href="cdevspecial67198.dita" navtitle="Exceptions in triggers actions">
-</topicref>
+<topicref collection-type="family" href="cdevspecial49460.dita" navtitle="Triggers and exceptions">
 <topicref href="cdevspecial93497.dita" navtitle="Aborting statements and transactions">
 </topicref>
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevconcepts19524.dita" navtitle="Controlling Derby Application Behavior">
-<topicref href="cdevconcepts38375.dita" navtitle="The JDBC Connection and Transaction Model">
-<topicref href="cdevconcepts36881.dita" navtitle="Connections">
+<topicref collection-type="family" href="cdevconcepts19524.dita" navtitle="Controlling Derby Application Behavior">
+<topicref collection-type="family" href="cdevconcepts38375.dita" navtitle="The JDBC Connection and Transaction Model">
+<topicref collection-type="family" href="cdevconcepts36881.dita" navtitle="Connections">
 <topicref href="cdevconcepts838179.dita" navtitle="Statements"></topicref>
 <topicref href="cdevconcepts838315.dita" navtitle="ResultSets and Cursors">
 </topicref>
 <topicref href="cdevconcepts26633.dita" navtitle="Nested connections"></topicref>
 </topicref>
-<topicref href="cdevconcepts19173.dita" navtitle="Transactions">
+<topicref collection-type="family" href="cdevconcepts19173.dita" navtitle="Transactions">
 <topicref href="cdevconcepts838850.dita" navtitle="Transactions when auto-commit is disabled">
 </topicref>
 <topicref href="cdevconcepts29416.dita" navtitle="Using auto-commit"></topicref>
@@ -232,10 +226,10 @@
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevconcepts41275.dita" navtitle="SQL and JDBC ResultSet/Cursor mechanisms">
+<topicref collection-type="family" href="cdevconcepts41275.dita" navtitle="SQL and JDBC ResultSet/Cursor mechanisms">
 <topicref href="rdevconcepts88082.dita" navtitle="Simple non-updatable ResultSets">
 </topicref>
-<topicref href="cdevconcepts28351.dita" navtitle="Updatable cursors">
+<topicref collection-type="family" href="cdevconcepts28351.dita" navtitle="Updatable cursors">
 <topicref href="cdevconcepts30811.dita" navtitle="Requirements for updatable cursors">
 </topicref>
 <topicref href="tdevconcepts41704.dita" navtitle="Naming or accessing the name of a cursor">
@@ -247,20 +241,21 @@
 </topicref>
 <topicref href="cdevconcepts22641.dita" navtitle="Scrolling insensitive ResultSets">
 </topicref>
-<topicref href="rdevconceptsholdablecursors.dita" navtitle="Holdable cursors">
+<topicref collection-type="family" href="rdevconceptsholdablecursors.dita"
+navtitle="Holdable cursors">
 <topicref href="cdevconcepts840995.dita" navtitle="Holdable cursors and autocommit">
 </topicref>
 <topicref href="rdevconcepts1119.dita" navtitle="Non-holdable cursor example">
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevconcepts30291.dita" navtitle="Locking, concurrency, and isolation">
+<topicref collection-type="family" href="cdevconcepts30291.dita" navtitle="Locking, concurrency, and isolation">
 <topicref href="cdevconcepts15366.dita" navtitle="Isolation levels and concurrency">
 </topicref>
 <topicref href="cdevconcepts22300.dita" navtitle="Configuring isolation levels">
 </topicref>
 <topicref href="cdevconcepts23810.dita" navtitle="Lock granularity"></topicref>
-<topicref href="cdevconcepts36402.dita" navtitle="Types and scope of locks in Derby systems">
+<topicref collection-type="family" href="cdevconcepts36402.dita" navtitle="Types and scope of locks in Derby systems">
 <topicref href="cdevconcepts842279.dita" navtitle="Exclusive locks"></topicref>
 <topicref href="cdevconcepts842304.dita" navtitle="Shared locks"></topicref>
 <topicref href="cdevconcepts842385.dita" navtitle="Update locks"></topicref>
@@ -268,7 +263,7 @@
 <topicref href="rdevconcepts8424.dita" navtitle="Scope of locks"></topicref>
 <topicref href="cdevconcepts842613.dita" navtitle="Notes on locking"></topicref>
 </topicref>
-<topicref href="cdevconcepts28436.dita" navtitle="Deadlocks">
+<topicref collection-type="family" href="cdevconcepts28436.dita" navtitle="Deadlocks">
 <topicref href="cdevconcepts53677.dita" navtitle="Avoiding Deadlocks"></topicref>
 <topicref href="cdevconcepts95005.dita" navtitle="Deadlock detection"></topicref>
 <topicref href="cdevconcepts89097.dita" navtitle="Lock wait timeouts"></topicref>
@@ -279,7 +274,7 @@
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevconcepts34828.dita" navtitle="Working with multiple connections to a single database">
+<topicref collection-type="family" href="cdevconcepts34828.dita" navtitle="Working with multiple connections to a single database">
 <topicref href="rdevconcepts713.dita" navtitle="Deployment options and threading and connection modes">
 </topicref>
 <topicref href="cdevconcepts10914.dita" navtitle="Multi-user database access">
@@ -287,7 +282,7 @@
 <topicref href="cdevconcepts24019.dita" navtitle="Multiple connections from a single application">
 </topicref>
 </topicref>
-<topicref href="cdevconcepts23499.dita" navtitle="Working with multiple threads sharing a single connection">
+<topicref collection-type="family" href="cdevconcepts23499.dita" navtitle="Working with multiple threads sharing a single connection">
 <topicref href="cdevconcepts89498.dita" navtitle="Pitfalls of sharing a connection among threads">
 </topicref>
 <topicref href="cdevconcepts65864.dita" navtitle="Multi-thread programming tips">
@@ -297,39 +292,33 @@
 </topicref>
 <topicref href="cdevdvlp22619.dita" navtitle="Working with database threads in an embedded environment">
 </topicref>
-<topicref href="cdevconcepts24927.dita" navtitle="Working with Derby SQLExceptions in an Application">
-<topicref href="cdevconcepts844813.dita" navtitle="Information provided in SQLExceptions">
+<topicref collection-type="family" href="cdevconcepts24927.dita" navtitle="Working with Derby SQLExceptions in an Application">
+<topicref collection-type="family" href="cdevconcepts844813.dita" navtitle="Information provided in SQLExceptions">
 <topicref href="rdevprocsqle.dita" navtitle="Example of processing SQLExceptions">
 </topicref>
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevresman19524.dita" navtitle="Using Derby as a J2EE resource manager">
+<topicref collection-type="family" href="cdevresman19524.dita" navtitle="Using Derby as a J2EE resource manager">
 <topicref href="rdevresman79556.dita" navtitle="Classes that pertain to resource managers">
 </topicref>
-<topicref href="cdevresman78715.dita" navtitle="How to use them">
 <topicref href="cdevresman89722.dita" navtitle="Getting a DataSource"></topicref>
 <topicref href="cdevresman92946.dita" navtitle="Shutting down or creating a database">
 </topicref>
 </topicref>
-</topicref>
-<topicref href="cdevcsecuree.dita" navtitle="Derby and Security">
-<topicref href="cdevcsecure33663.dita" navtitle="Security overview">
-<topicref href="cdevcsecure862382.dita" navtitle="Features"></topicref>
-<topicref href="cdevcsecure12392.dita" navtitle="Configuring security for your environment">
+<topicref collection-type="family" href="cdevcsecuree.dita" navtitle="Derby and Security">
+<topicref collection-type="family" href="cdevcsecure12392.dita" navtitle="Configuring security for your environment">
 <topicref href="tdevcsecure82556.dita" navtitle="Configuring security in a client/server environment">
 </topicref>
 <topicref href="tdevcsecure81850.dita" navtitle="Configuring security in an embedded environment">
 </topicref>
 </topicref>
-</topicref>
-<topicref href="cdevcsecure42374.dita" navtitle="Working with user authentication">
-<topicref href="cdevcsecure30032.dita" navtitle="Overview"></topicref>
+<topicref collection-type="family" href="cdevcsecure42374.dita" navtitle="Working with user authentication">
 <topicref href="cdevcsecure36127.dita" navtitle="Enabling user authentication">
 </topicref>
 <topicref href="cdevcsecure37817.dita" navtitle="Defining users"></topicref>
-<topicref href="cdevcsecure38522.dita" navtitle="External directory service">
-<topicref href="cdevcsecure41285.dita" navtitle="LDAP directory service">
+<topicref collection-type="family" href="cdevcsecure38522.dita" navtitle="External directory service">
+<topicref collection-type="family" href="cdevcsecure41285.dita" navtitle="LDAP directory service">
 <topicref href="rdevcsecure608.dita" navtitle="Libraries for LDAP user authentication">
 </topicref>
 <topicref href="cdevcsecure863446.dita" navtitle="Setting up Derby to use your LDAP directory service">
@@ -344,12 +333,12 @@
 </topicref>
 <topicref href="cdevcsecure864242.dita" navtitle="JNDI-specific properties for external directory services">
 </topicref>
-<topicref href="cdevcsecure21561.dita" navtitle="User-defined class">
+<topicref collection-type="family" href="cdevcsecure21561.dita" navtitle="User-defined class">
 <topicref href="rdevexudclass.dita" navtitle="Example of setting a user-defined class">
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevcsecure21547.dita" navtitle="Built-in Derby users">
+<topicref collection-type="family" href="cdevcsecure21547.dita" navtitle="Built-in Derby users">
 <topicref href="cdevcsecure864642.dita" navtitle="Database-level properties">
 </topicref>
 <topicref href="cdevcsecure864692.dita" navtitle="System-level properties">
@@ -357,14 +346,14 @@
 </topicref>
 <topicref href="rdevcsecure557.dita" navtitle="List of user-authentication properties">
 </topicref>
-<topicref href="cdevcsecure79358.dita" navtitle="Programming applications for Derby user authentication">
+<topicref collection-type="family" href="cdevcsecure79358.dita" navtitle="Programming applications for Derby user authentication">
 <topicref href="rdevcsecure766.dita" navtitle="Programming the application to provide the user and password">
 </topicref>
 <topicref href="rdevcsecure305.dita" navtitle="Login failure exceptions with user authentication">
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevcsecure37241.dita" navtitle="Users and authorization identifiers">
+<topicref collection-type="family" href="cdevcsecure37241.dita" navtitle="Users and authorization identifiers">
 <topicref href="cdevcsecure24458.dita" navtitle="Authorization identifiers, user authentication, and user authorization">
 </topicref>
 <topicref href="cdevcsecure865580.dita" navtitle="User names and schemas">
@@ -372,8 +361,8 @@
 <topicref href="rdevcsecure622.dita" navtitle="Exceptions when using authorization identifiers">
 </topicref>
 </topicref>
-<topicref href="cdevcsecure36595.dita" navtitle="User authorization">
-<topicref href="cdevcsecure866060.dita" navtitle="Setting user authorization">
+<topicref collection-type="family" href="cdevcsecure36595.dita" navtitle="User authorization">
+<topicref collection-type="family" href="cdevcsecure866060.dita" navtitle="Setting user authorization">
 <topicref href="cdevcsecure865818.dita" navtitle="Setting the default access mode">
 </topicref>
 <topicref href="cdevcsecure865880.dita" navtitle="Setting the access mode for particular users">
@@ -383,19 +372,18 @@
 <topicref href="rdevcsecure379.dita" navtitle="User authorization exceptions">
 </topicref>
 </topicref>
-<topicref href="rdevcsecure190.dita" navtitle="Read-only and full access permissions">
+<topicref collection-type="family" href="rdevcsecure190.dita" navtitle="Read-only and full access permissions">
 </topicref>
 <topicref href="rdevcsecure131.dita" navtitle="Examples of user authorization">
 </topicref>
 </topicref>
-<topicref href="cdevcsecure24366.dita" navtitle="Encrypting databases on disk">
-<topicref href="cdevcsecure99212.dita" navtitle="Overview"></topicref>
-<topicref href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
+<topicref collection-type="family" href="cdevcsecure24366.dita" navtitle="Encrypting databases on disk">
+<topicref collection-type="family" href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
 </topicref>
-<topicref href="cdevcsecure97760.dita" navtitle="Working with encryption">
-<topicref href="cdevcsecure88690.dita" navtitle="Encrypting databases on creation">
+<topicref collection-type="family" href="cdevcsecure97760.dita" navtitle="Working with encryption">
+<topicref collection-type="family" href="cdevcsecure88690.dita" navtitle="Encrypting databases on creation">
 </topicref>
-<topicref href="cdevcsecure866716.dita" navtitle="Creating the boot password">
+<topicref collection-type="family" href="cdevcsecure866716.dita" navtitle="Creating the boot password">
 <topicref href="cdevcsecure31493.dita" navtitle="Specifying an alternate encryption provider">
 </topicref>
 <topicref href="cdevcsecure67151.dita" navtitle="Specifying an alternate encryption algorithm">
@@ -410,44 +398,18 @@
 <topicref href="cdevcsecure90988.dita" navtitle="Signed jar files"></topicref>
 <topicref href="cdevcsecure10983.dita" navtitle="Notes on the Derby security features">
 </topicref>
-<topicref href="cdevcsecure51876.dita" navtitle="User authentication and authorization examples">
+<topicref collection-type="family" href="cdevcsecure51876.dita" navtitle="User authentication and authorization examples">
 <topicref href="rdevcsecure125.dita" navtitle="User authentication example in a client/server environment">
 </topicref>
-<topicref href="rdevcsecure13713.dita" navtitle="User authentication example in a single-user, embedded environment">
+<topicref collection-type="family" href="rdevcsecure13713.dita" navtitle="User authentication example in a single-user, embedded environment">
 <topicref href="rdevcsecure26537.dita" navtitle="User authentication and authorization extended examples">
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevcbabejdfj.dita" navtitle="Running Derby under a security manager">
+<topicref collection-type="family" href="cdevcbabejdfj.dita" navtitle="Running Derby under a security manager">
 <topicref href="cdevbabejgjd.dita" navtitle="Granting permissions to Derby">
-<topicref href="cdevcsecure871035.dita" navtitle="Mandatory permissions">
-<topicref href="rdevcsecure871065.dita" navtitle="permission java.lang.RuntimePermission createClassLoader">
-</topicref>
-<topicref href="rdevcsecure871126.dita" navtitle="permission java.util.PropertyPermission derby.*, read">
-</topicref>
-</topicref>
-<topicref href="cdevcsecure871172.dita" navtitle="Database access permissions">
-<topicref href="rdevcsecure871193.dita" navtitle="permission java.io.FilePermission directory${/}/-, read,write,delete">
-</topicref>
-</topicref>
-<topicref href="cdevcsecure871230.dita" navtitle="Optional permissions">
-<topicref href="rdevcsecure871260.dita" navtitle="permission java.io.FilePermission ${derby.system.home}, read,write">
 </topicref>
-<topicref href="rdevcsecure871279.dita" navtitle="permission java.util.PropertyPermission user.dir, read">
-</topicref>
-<topicref href="rdevcsecure871300.dita" navtitle="permission java.io.FilePermission ${derby.system.home}${/}derby.properties, read">
-</topicref>
-<topicref href="rdevcsecure871315.dita" navtitle="permission java.io.FilePermission ${derby.system.home}${/}derby.log, read,write,delete">
-</topicref>
-<topicref href="rdevcsecure871330.dita" navtitle="permission java.io.FilePermission ${user.dir}${/}derby.log, read,write,delete">
-</topicref>
-</topicref>
-<topicref href="cdevcsecure871353.dita" navtitle="Combining permissions">
-<topicref href="rdevcsecure871372.dita" navtitle="permission java.io.FilePermission ${derby.system.home}/-, read,write,delete">
-</topicref>
-</topicref>
-</topicref>
-<topicref href="cdevcsecure871387.dita" navtitle="Examples of Java 2 security policy files for embedded Derby">
+<topicref collection-type="family" href="cdevcsecure871387.dita" navtitle="Examples of Java 2 security policy files for embedded Derby">
 <topicref href="rdevcsecure871406.dita" navtitle="Java 2 security policy file example 1">
 </topicref>
 <topicref href="rdevcsecure871422.dita" navtitle="Java 2 security policy file example 2">
@@ -457,19 +419,19 @@
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevadvjdbc35053.dita" navtitle="Developing Tools and Using Derby with an IDE">
-<topicref href="cdevadvjdbc41138.dita" navtitle="Offering Connection Choices to the User">
-<topicref href="rdevadvjdbc034.dita" navtitle="The DriverPropertyInfo Array">
+<topicref collection-type="family" href="cdevadvjdbc35053.dita" navtitle="Developing Tools and Using Derby with an IDE">
+<topicref collection-type="family" href="cdevadvjdbc41138.dita" navtitle="Offering Connection Choices to the User">
+<topicref collection-type="family" href="rdevadvjdbc034.dita" navtitle="The DriverPropertyInfo Array">
 <topicref href="rdevadvjdbc965.dita" navtitle="DriverPropertyInfo array example">
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevadvjdbc32436.dita" navtitle="Using Derby with IDEs">
+<topicref collection-type="family" href="cdevadvjdbc32436.dita" navtitle="Using Derby with IDEs">
 <topicref href="cdevadvjdbc18939.dita" navtitle="IDEs and multiple JVMs">
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevtricks32436.dita" navtitle="SQL tips">
+<topicref collection-type="family" href="cdevtricks32436.dita" navtitle="SQL tips">
 <topicref href="cdevtricks19707.dita" navtitle="Retrieving the database connection URL">
 </topicref>
 <topicref href="cdevtricks39584.dita" navtitle="Supplying a parameter only once">
@@ -486,14 +448,13 @@
 </topicref>
 </topicref>
 </topicref>
-<topicref href="cdevin10613.dita" navtitle="Localizing Derby">
+<topicref collection-type="family" href="cdevin10613.dita" navtitle="Localizing Derby">
 <topicref href="cdevin71274.dita" navtitle="SQL parser support for Unicode">
 </topicref>
 <topicref href="cdevin55108.dita" navtitle="Other components"></topicref>
 <topicref href="cdevin38113.dita" navtitle="Messages libraries"></topicref>
 </topicref>
-<topicref href="cdevstandards806118.dita" navtitle="Derby and standards">
-<topicref href="cdevstandards806055.dita" navtitle="SQL99">
+<topicref collection-type="family" href="cdevstandards806118.dita" navtitle="Derby and standards">
 <topicref href="cdevstandards805644.dita" navtitle="Dynamic SQL"></topicref>
 <topicref href="cdevstandards805664.dita" navtitle="Cursors"></topicref>
 <topicref href="cdevstandards805690.dita" navtitle="Information schema"></topicref>
@@ -515,7 +476,5 @@
 </topicref>
 <topicref href="cdevstandards806027.dita" navtitle="ALTER TABLE"></topicref>
 </topicref>
-</topicref>
 <topicref href="rdevtrademderby.dita" navtitle="Trademarks"></topicref>
 </map>
-

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita Tue Jun 28 15:46:15 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -42,12 +41,12 @@
 </row>
 <row>
 <entry colname="1"><i>derby.authentication.server</i></entry>
-<entry colname="2">For LDAP user authentication, specifies the
-location of the server.</entry>
+<entry colname="2">For LDAP user authentication, specifies the location of
+the server.</entry>
 </row>
 <row>
 <entry colname="1"><i>derby.authentication.ldap.searchAuthDN, derby.authentication.ldap.searchAuthPW, <ph
-conref="devconrefs.dita#prod/productshortname"></ph>.authentication.ldap.searchFilter, </i>and<codeph><i> <ph
+conref="devconrefs.dita#prod/productshortname"></ph>.authentication.ldap.searchFilter, </i> and <codeph><i> <ph
 conref="devconrefs.dita#prod/productshortname"></ph>.authentication. ldap.searchBase</i></codeph></entry>
 <entry colname="2">Configures the way DN searches are performed.</entry>
 </row>
@@ -65,4 +64,3 @@
 </table>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure608.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure608.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure608.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure608.dita Tue Jun 28 15:46:15 2005
@@ -28,7 +28,7 @@
 </prolog>
 <refbody>
 <section><p>To use an LDAP directory service with <ph conref="devconrefs.dita#prod/productshortname"></ph>, you need the following
-libraries in your class path:</p></section><section>
+libraries in your classpath:</p></section><section>
 <ul>
 <li><i>jndi.jar</i>  
 <p>JNDI classes</p></li>

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure871065.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure871065.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure871065.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure871065.dita Tue Jun 28 15:46:15 2005
@@ -1,25 +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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure871065">
-<title>permission java.lang.RuntimePermission createClassLoader</title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>Mandatory. It allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to execute SQL queries and supports loading
-class files from jar files stored in the database.</p></section>
-</refbody></reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure871126.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure871126.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure871126.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure871126.dita Tue Jun 28 15:46:15 2005
@@ -1,26 +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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure871126">
-<title>permission java.util.PropertyPermission "derby.*", read</title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>Allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to read individual <ph conref="devconrefs.dita#prod/productshortname"></ph> properties set in the JVM's
-system set. If the action is denied, properties in the JVM's system set
-are ignored.</p></section>
-</refbody></reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure871193.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure871193.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure871193.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure871193.dita Tue Jun 28 15:46:15 2005
@@ -1,26 +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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure871193">
-<title>permission java.io.FilePermission "directory${/}/-", "read,write,delete"</title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>Allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to manage files within the database that maps to the
-directory specified. For read-only databases, only the "read" action
-needs to be granted.</p></section>
-</refbody></reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure871260.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure871260.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure871260.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure871260.dita Tue Jun 28 15:46:15 2005
@@ -1,25 +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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure871260">
-<title>permission java.io.FilePermission "${derby.system.home}", "read,write"</title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>Allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to determine the system directory when set by d<i>b2j.system.home </i>and create it if needed. If the system directory already
-exists then only the "read" permission needs to be granted.</p></section>
-</refbody></reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure871279.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure871279.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure871279.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure871279.dita Tue Jun 28 15:46:15 2005
@@ -1,24 +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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure871279">
-<title>permission java.util.PropertyPermission "user.dir", "read"</title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>Permits access to the system directory value if <i>derby.system.home </i>is not set or no permission has been granted to read the <codeph><i>derby.system.home </i></codeph>property.</p></section>
-</refbody></reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure871300.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure871300.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure871300.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure871300.dita Tue Jun 28 15:46:15 2005
@@ -1,24 +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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure871300">
-<title>permission java.io.FilePermission "${derby.system.home}${/}derby.properties", "read"</title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>Allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to read the system properties file from the system directory.</p></section>
-</refbody></reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure871315.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure871315.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure871315.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure871315.dita Tue Jun 28 15:46:15 2005
@@ -1,24 +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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure871315">
-<title>permission java.io.FilePermission "${derby.system.home}${/}derby.log", "read,write,delete"</title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>or</p></section>
-</refbody></reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure871330.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure871330.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure871330.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure871330.dita Tue Jun 28 15:46:15 2005
@@ -1,27 +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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure871330">
-<title>permission java.io.FilePermission "${user.dir}${/}derby.log", "read,write,delete" </title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>Only one of these permissions is needed. Permits the application to read,
-write, and delete to the <ph conref="devconrefs.dita#prod/productshortname"></ph> log file, unless the log has been re-directed.
-(See the <i>derby.stream.error </i>properties in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite> for more information.) If one of the requested valid actions is denied,
-the <ph conref="devconrefs.dita#prod/productshortname"></ph> log will be <codeph><i>java.lang.System.err</i></codeph>.</p></section>
-</refbody></reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure871372.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure871372.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure871372.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure871372.dita Tue Jun 28 15:46:15 2005
@@ -1,25 +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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure871372">
-<title>permission java.io.FilePermission "${derby.system.home}/-", "read,write,delete"</title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>Allows the <ph conref="devconrefs.dita#prod/productshortname"></ph> engine complete access to the system directory and
-any databases contained in the system directory.</p></section>
-</refbody></reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevdvlp22102.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdvlp22102.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdvlp22102.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdvlp22102.dita Tue Jun 28 15:46:15 2005
@@ -42,7 +42,7 @@
 <p>On a UNIX system, this would be the path of the directory. On a Windows
 system, the path would be <i>C:\reference\phrases\french</i> if
 the current drive were <i>C. </i>If a jar file storing databases
-were in the user's class path, this could also be a path within the jar
+were in the user's classpath, this could also be a path within the jar
 file.</p></li>
 <li><i>jdbc:derby:a:/demo/sample</i>  
 <p>Open a connection
@@ -58,16 +58,16 @@
 <li><i>jdbc:derby:sample;shutdown=true</i>  
 <p>Shut down the <i>sample</i> database.</p></li>
 <li><i>jdbc:derby:/myDB</i>  
-<p>Access <i>myDB</i> (which is directly in a directory in the class path) as a read-only
+<p>Access <i>myDB</i> (which is directly in a directory in the classpath) as a read-only
 database.</p></li>
 <li><i>jdbc:derby:classpath:/myDB</i>  
-<p>Access <i>myDB</i> (which is directly in a directory in the class path) as a read-only
+<p>Access <i>myDB</i> (which is directly in a directory in the classpath) as a read-only
 database. The reason for using the subsubprotocol is that it might  have the
 same path as a database in the directory structure.</p></li>
 <li><i>jdbc:derby:jar:(C:/dbs.jar)products/boiledfood</i>  
 <p>Access the read-only database <i>boiledfood</i> in the <i>products</i> directory from the jar file <i>C:/dbs.jar</i>.</p></li>
 <li><i>jdbc:derby:directory:myDB</i>  
 <p>Access <i>myDB</i>, which is in the system directory. The reason for using the <codeph><i>directory:</i></codeph> subsubprotocol is that it might happen
-to have the same path as a database in the class path.</p></li>
+to have the same path as a database in the classpath.</p></li>
 </ul></section>
 </refbody></reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevdvlp38881.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdvlp38881.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdvlp38881.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdvlp38881.dita Tue Jun 28 15:46:15 2005
@@ -45,7 +45,7 @@
 path.</li>
 <li><i>classpath</i> Databases are treated as read-only databases,
 and all <i>databaseNames</i> must begin with at least a slash,
-because you specify them "relative" to the class path directory.</li>
+because you specify them "relative" to the classpath directory.</li>
 <li><i>jar</i> Databases are treated as read-only databases. <i>DatabaseNames</i> might require a leading slash, because you
 specify them "relative" to the jar file.</li>
 </ul></section>

Modified: incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita Tue Jun 28 15:46:15 2005
@@ -36,7 +36,7 @@
 <codeblock>
 jdbc:derby:jar:(<i>pathToArchive</i>)<i>databasePathWithinArchive</i>
 </codeblock></example>
-<section><p>Or, if the jar or zip file has been included in the class path, like this:</p></section><example>
+<section><p>Or, if the jar or zip file has been included in the classpath, like this:</p></section><example>
 <codeblock>
 jdbc:derby:/<i>databasePathWithinArchive</i>
 </codeblock></example>

Modified: incubator/derby/docs/trunk/src/devguide/rdevresman79556.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevresman79556.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevresman79556.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevresman79556.dita Tue Jun 28 15:46:15 2005
@@ -19,9 +19,9 @@
 <title>Classes that pertain to resource managers</title>
 <prolog><metadata>
 <keywords>
-<indexterm>org.apache.derby.jdbc.EmbeddedDataSource</indexterm>
-<indexterm>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</indexterm>
-<indexterm>org.apache.derby.jdbc.EmbeddedXADataSource</indexterm>
+<indexterm>EmbeddedDataSource</indexterm>
+<indexterm>EmbeddedConnectionPoolDataSource</indexterm>
+<indexterm>EmbeddedXADataSource</indexterm>
 </keywords>
 </metadata>
 </prolog>

Modified: incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita Tue Jun 28 15:46:15 2005
@@ -18,21 +18,21 @@
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <task id="tdevdeploy39856" xml:lang="en-us">
-<title>Accessing databases within a jar file using the class path</title>
+<title>Accessing databases within a jar file using the classpath</title>
 <prolog><metadata>
-<keywords><indexterm>Accessing read-only databases from class path</indexterm>
-<indexterm>Read-only databases<indexterm>putting in class path</indexterm></indexterm>
+<keywords><indexterm>Accessing read-only databases from classpath</indexterm>
+<indexterm>Read-only databases<indexterm>putting in classpath</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
 <context> <p>Once an archive containing one or more <ph conref="devconrefs.dita#prod/productshortname"></ph> databases
-has been created it can be placed in the class path. This allows access to
+has been created it can be placed in the classpath. This allows access to
 a database from within an application without the application's knowing the
-path of the archive. When jar or zip files are part of the class path, you
+path of the archive. When jar or zip files are part of the classpath, you
 do not have to specify the jar subsubprotocol to connect to them.</p> <p>To
-access a database in a zip or jar file in the class path:</p></context>
+access a database in a zip or jar file in the classpath:</p></context>
 <steps>
-<step><cmd>Set the class path to include the jar or zip file before starting
+<step><cmd>Set the classpath to include the jar or zip file before starting
 up <ph conref="devconrefs.dita#prod/productshortname"></ph>:</cmd><info><codeblock>CLASSPATH="C:\dbs.jar;%CLASSPATH%"</codeblock></info>
 </step>
 <step><cmd>Connect to a database within the jar or zip file with one of the

Modified: incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita Tue Jun 28 15:46:15 2005
@@ -28,7 +28,7 @@
 contains two subdirectories:<ol>
 <li>The <codeph>lib</codeph> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> jar
 files. </li>
-<li>The <codeph>javadoc</codeph>subdirectory contains the <codeph>api</codeph> documentation
+<li>The <codeph>javadoc</codeph> subdirectory contains the <codeph>api</codeph> documentation
 that was generated from source code comments.</li>
 </ol></p>
 </conbody>

Modified: incubator/derby/docs/trunk/src/getstart/cgslib19524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgslib19524.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgslib19524.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgslib19524.dita Tue Jun 28 15:46:15 2005
@@ -19,7 +19,7 @@
 <concept id="cgslib19524" xml:lang="en-us">
 <title>Derby libraries and scripts: complete reference </title>
 <prolog><metadata>
-<keywords><indexterm>Libraries</indexterm><indexterm>Class path</indexterm>
+<keywords><indexterm>Libraries</indexterm><indexterm>Classpath</indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>

Modified: incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita Tue Jun 28 15:46:15 2005
@@ -20,7 +20,7 @@
 <title>Quick start guide for experienced JDBC users</title>
 <conbody>
 <p>This chapter is for experienced JDBC programmers who already know how to
-set the class path, how to run a Java program, and how to use a JDBC driver.</p>
+set the classpath, how to run a Java program, and how to use a JDBC driver.</p>
 <p>For more detailed information on the topics covered in this section,
 see the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite> and
 the <cite><ph conref="gsconrefs.dita#pub/citutilities"></ph></cite>.</p>

Modified: incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita Tue Jun 28 15:46:15 2005
@@ -22,7 +22,7 @@
 <p>Before you configure your system to run <ph conref="gsconrefs.dita#prod/productshortname"></ph>,
 it is useful to understand something about the different environments in which <ph
 conref="gsconrefs.dita#prod/productshortname"></ph> can run, because these
-environments affect the class path, driver name, and database connection URL.
+environments affect the classpath, driver name, and database connection URL.
 See the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite> for
 more information on <ph conref="gsconrefs.dita#prod/productshortname"></ph> environments.</p>
 <dl><dlentry>

Modified: incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita Tue Jun 28 15:46:15 2005
@@ -22,7 +22,7 @@
 <p><ph conref="gsconrefs.dita#prod/productshortname"></ph>'s sysinfo
 tool displays information about your Java environment and your version of <ph
 conref="gsconrefs.dita#prod/productshortname"></ph>. The sysinfo script sets
-the appropriate environment variables, including the class path, and executes
+the appropriate environment variables, including the classpath, and executes
 the sysinfo program. Once you have the /bin directory in your PATH, run sysinfo
 by entering the following in a command window: </p>
 <codeblock>sysinfo</codeblock>

Modified: incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita Tue Jun 28 15:46:15 2005
@@ -27,7 +27,7 @@
 <p>You can find similar scripts for running tools and utilities for the Network
 Server in the /frameworks/NetworkServer/bin directory. The scripts have descriptive
 names such as <codeph>sysinfo.bat</codeph> or <codeph>ij.ksh</codeph>. Like
-the class path scripts, these scripts end with different extensions depending
+the classpath scripts, these scripts end with different extensions depending
 on your environment. Windows scripts have a .bat extension, while Unix scripts
 have a .ksh extension. You might need to modify these scripts in order for
 the tools and utilities to run properly on Windows and Unix platforms.</p>

Modified: incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap (original)
+++ incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap Tue Jun 28 15:46:15 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE map PUBLIC "-//IBM//DTD DITA Map//EN"
  "../dtd/map.dtd">
-
 <!--  
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -30,8 +29,7 @@
 </topicmeta>
 <topicref href="rgscopyright.dita" navtitle="Copyright"></topicref>
 <topicref collection-type="family" href="cgsintro.dita" navtitle="Introducing Derby">
-<topicref href="cgsintdo.dita" navtitle="Deployment options">
-</topicref>
+<topicref href="cgsintdo.dita" navtitle="Deployment options"></topicref>
 <topicref href="cgsintsr.dita" navtitle="System requirements"></topicref>
 <topicref href="rgsdocs17307.dita" navtitle="The Derby library"></topicref>
 </topicref>
@@ -44,8 +42,8 @@
 <topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
 </topicref>
 <topicref collection-type="family" href="cgsmanuallysetting.dita" navtitle="Manually setting environment variables and paths">
-<topicref href="tgs36360.dita" navtitle="Set the DERBY_INSTALL environment variable">
-<topicref href="tgs26250.dita" navtitle="Set the class path"></topicref>
+<topicref collection-type="family" href="tgs36360.dita" navtitle="Set the DERBY_INSTALL environment variable">
+<topicref href="tgs26250.dita" navtitle="Set the classpath"></topicref>
 </topicref>
 </topicref>
 </topicref>
@@ -54,7 +52,7 @@
 <topicref href="cgsquck35643.dita" navtitle="Embedded environment"></topicref>
 <topicref href="cgsquck13780.dita" navtitle="Client/server environment"></topicref>
 </topicref>
-<topicref href="rgsquck67441.dita" navtitle="Libraries and class path"></topicref>
+<topicref href="rgsquck67441.dita" navtitle="Libraries and classpath"></topicref>
 <topicref href="rgsquck35368.dita" navtitle="Available drivers"></topicref>
 <topicref href="rgsquck30197.dita" navtitle="Database connection URL"></topicref>
 </topicref>
@@ -72,4 +70,3 @@
 </topicref>
 <topicref href="rgstrademderby.dita" navtitle="Trademarks"></topicref>
 </map>
-

Modified: incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita Tue Jun 28 15:46:15 2005
@@ -20,30 +20,30 @@
 <title>The Derby library</title>
 <refbody>
 <section> <dl><dlentry>
-<dt><cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite></dt>
+<dt><ph conref="gsconrefs.dita#pub/citdevelop"></ph></dt>
 <dd><p>Describes the functionality and features of <ph conref="gsconrefs.dita#prod/productshortname"></ph> common
 to all deployments, such as <ph conref="gsconrefs.dita#prod/productshortname"></ph>'s
 JDBC and SQL specifics, deploying <ph conref="gsconrefs.dita#prod/productshortname"></ph> applications,
 security, and other advanced features.</p></dd>
 </dlentry><dlentry>
-<dt><cite><ph conref="gsconrefs.dita#pub/citref"></ph></cite></dt>
+<dt><ph conref="gsconrefs.dita#pub/citref"></ph></dt>
 <dd><p>Documents <ph conref="gsconrefs.dita#prod/productshortname"></ph>'s
 implementation of the SQL language. Also provides reference information for <ph
 conref="gsconrefs.dita#prod/productshortname"></ph>'s JDBC and JTA implementations,
 keywords, system tables, properties, and <i>SQLExceptions</i>. </p></dd>
 </dlentry><dlentry>
-<dt><cite><ph conref="gsconrefs.dita#pub/cittuning"></ph></cite></dt>
+<dt><ph conref="gsconrefs.dita#pub/cittuning"></ph></dt>
 <dd><p>Explains how to configure and tune <ph conref="gsconrefs.dita#prod/productshortname"></ph> through
 properties and provides reference information on properties. It also offers
 performance tips, an in-depth discussion of performance, and information about
 the <ph conref="gsconrefs.dita#prod/productshortname"></ph> optimizer.</p></dd>
 </dlentry><dlentry>
-<dt><cite><ph conref="gsconrefs.dita#pub/citutilities"></ph></cite></dt>
+<dt><ph conref="gsconrefs.dita#pub/citutilities"></ph></dt>
 <dd><p>A guide for working with the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools
 such as <codeph>ij</codeph>, and more advanced utilities such as import/export
 and the database class loader.</p></dd>
 </dlentry><dlentry>
-<dt><cite><ph conref="gsconrefs.dita#pub/citadmin"></ph></cite></dt>
+<dt><ph conref="gsconrefs.dita#pub/citadmin"></ph></dt>
 <dd><p>Part One of this guide discusses configuration of servers, how to program
 client applications, and database administration.</p><p>In addition, some
 systems might require administrative tasks such as backing up databases. These
@@ -59,4 +59,3 @@
 </dlentry></dl></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita Tue Jun 28 15:46:15 2005
@@ -49,22 +49,22 @@
 <row>
 <entry colname="2">In syntax, items that you do not type exactly as they appear,
 but replace with the appropriate name </entry>
-<entry colname="3"> <codeblock><b>CREATE TABLE <b><i>tableName</i></b></b></codeblock></entry>
+<entry colname="3"> <codeph>CREATE TABLE <i>tableName</i></codeph></entry>
 </row>
 <row>
 <entry colname="1" morerows="1">Bold, fixed-width</entry>
 <entry colname="2">SQL examples</entry>
-<entry colname="3"><codeph><b>SELECT city.getName() FROM Cities</b></codeph></entry>
+<entry colname="3"><codeph>SELECT city.getName() FROM Cities</codeph></entry>
 </row>
 <row>
 <entry colname="2">Java application examples</entry>
-<entry colname="3"><codeph><b>Connection conn = DriverManager.getConnection
-("jdbc:derby:Sample")</b></codeph></entry>
+<entry colname="3"><codeph>Connection conn = DriverManager.getConnection
+("jdbc:derby:Sample")</codeph></entry>
 </row>
 <row>
 <entry colname="1">Bold, fixed-width</entry>
 <entry colname="2">Things you type in a command prompt</entry>
-<entry colname="3"><codeph><b>java org.apache.derby.tools.ij</b></codeph></entry>
+<entry colname="3"><codeph>java org.apache.derby.tools.ij</codeph></entry>
 </row>
 <row>
 <entry colname="1">Roman, fixed-width</entry>

Modified: incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita Tue Jun 28 15:46:15 2005
@@ -20,13 +20,10 @@
 <title>Terminology</title>
 <refbody>
 <section><p>The <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation
-uses these specialized terms:   <dl><dlentry>
-<dt>environment</dt>
-<dd>The method your application uses to interact with <ph conref="gsconrefs.dita#prod/productshortname"></ph>.
+uses the specialized term <codeph>environment</codeph> to describe the method
+your application uses to interact with <ph conref="gsconrefs.dita#prod/productshortname"></ph>.
 An environment is sometimes referred to as a <i>framework</i>. The two types
 of environments are the <i>embedded environment</i> and the <i>client/server
-environment.</i></dd>
-</dlentry></dl></p></section>
+environment.</i></p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/getstart/rgslib27507.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgslib27507.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgslib27507.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgslib27507.dita Tue Jun 28 15:46:15 2005
@@ -25,7 +25,7 @@
   <ul>
 <li><i>frameworks/embedded/bin/ij</i>   <p>Starts ij.</p></li>
 <li><i>frameworks/embedded/bin/setEmbeddedCP</i>   <p>Puts all the <ph conref="gsconrefs.dita#prod/productshortname"></ph> libraries
-for an embedded environment in the class path.</p></li>
+for an embedded environment in the classpath.</p></li>
 <li><i>frameworks/embedded/bin/sysinfo</i>   <p>Runs sysinfo.</p></li>
 <li><i>frameworks/embedded/bin/dblook</i>  <p>Runs dblook.</p></li>
 <li><i>frameworks/NetworkServer/bin/dblook</i> <p>Runs dblook in a Network
@@ -35,10 +35,10 @@
 <li><i>frameworks/NetworkServer/bin/NetworkServerControl</i> <p>Runs NetworkServerControl.</p></li>
 <li><i>frameworks/NetworkServer/bin/setNetworkClientCP</i> <p>Puts the libraries
 needed to connect to <ph conref="gsconrefs.dita#prod/productshortname"></ph> Network
-Server into the class path.</p></li>
+Server into the classpath.</p></li>
 <li><i>frameworks/NetworkServer/bin/setNetworkServerCP</i> <p>Puts the libraries
 needed for <ph conref="gsconrefs.dita#prod/productshortname"></ph> Network
-Server into the class path.</p></li>
+Server into the classpath.</p></li>
 <li><i>frameworks/NetworkServer/bin/startNetworkServer</i> <p>Starts the Network
 Server on the local machine.</p></li>
 <li><i>frameworks/NetworkServer/bin/stopNetworkServer</i> <p>Stops the Network

Modified: incubator/derby/docs/trunk/src/getstart/rgslib46043.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgslib46043.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgslib46043.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgslib46043.dita Tue Jun 28 15:46:15 2005
@@ -45,7 +45,7 @@
 </row>
 <row>
 <entry nameend="2" namest="1"><b>Tools libraries</b>   <p>For embedded environments,
-you need a library in the class path to use a tool. For a client/server environment,
+you need a library in the classpath to use a tool. For a client/server environment,
 you need a library on the client only.</p></entry>
 </row>
 <row>

Modified: incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita Tue Jun 28 15:46:15 2005
@@ -17,7 +17,7 @@
 limitations under the License.
 -->
 <reference id="rgsquck67441" xml:lang="en-us">
-<title>Libraries and class path</title>
+<title>Libraries and classpath</title>
 <refbody>
 <section><p>See <xref href="cgslib19524.dita#cgslib19524"></xref> in the appendix
 for a complete description of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> libraries.</p></section>

Modified: incubator/derby/docs/trunk/src/getstart/tgs26250.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/tgs26250.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/tgs26250.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/tgs26250.dita Tue Jun 28 15:46:15 2005
@@ -17,14 +17,14 @@
 limitations under the License.
 -->
 <task id="tgs26250" xml:lang="en-us">
-<title> Set the class path</title>
+<title> Set the classpath</title>
 <prolog><metadata>
-<keywords><indexterm>Class path<indexterm>setting</indexterm></indexterm>
+<keywords><indexterm>Classpath<indexterm>setting</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
 <context><p>The JVM needs to know the path of every class file needed by your
-application. The class path is a list of the class libraries needed by the
+application. The classpath is a list of the class libraries needed by the
 JVM and other Java applications to run your program. You can set the CLASSPATH
 environment variable in the operating system either temporarily, permanently,
 or at run time when you start your Java application and the JVM. If you set
@@ -32,7 +32,7 @@
 a new command window.</p><p>In most development environments, it is best to
 set the operating system's CLASSPATH environment variable temporarily. <ph
 conref="gsconrefs.dita#prod/productshortname"></ph> provides some scripts
-to help you set your class path this way; they are found in the /frameworks/embedded/bin
+to help you set your classpath this way; they are found in the /frameworks/embedded/bin
 directory or the /frameworks/NetworkServer/bin directory. To set the class
 path temporarily, run a script every time you open a new command window. </p></context>
 <steps-unordered>



Mime
View raw message