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 [5/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/cdevconcepts38375.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts38375.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts38375.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts38375.dita Tue Jun 28 15:46:15 2005
@@ -29,10 +29,5 @@
 not by SQL commands.</p>
 <p>JDBC defines a system session and transaction model for database access.
 A <i>session</i> is the duration of one connection to the
-database and is handled by a JDBC <codeph><i>Connection</i></codeph> object.
-This section includes the following topics:</p>
-<ul>
-<li><xref href="cdevconcepts36881.dita#cdevconcepts36881"/></li>
-<li><xref href="cdevconcepts19173.dita#cdevconcepts19173"/></li>
-</ul>
+database and is handled by a JDBC <codeph><i>Connection</i></codeph> object.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts41275.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts41275.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts41275.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts41275.dita Tue Jun 28 15:46:15 2005
@@ -30,11 +30,4 @@
 to use a language construct, such as SQL-92's DECLARE CURSOR, to work
 with cursors in a Java application. In <ph conref="devconrefs.dita#prod/productshortname"></ph>, any SELECT statement generates
 a cursor.</p>
-<ul>
-<li><xref href="rdevconcepts88082.dita#rdevconcepts88082"/></li>
-<li><xref href="cdevconcepts28351.dita#cdevconcepts28351"/></li>
-<li><xref href="cdevconcepts23987.dita#cdevconcepts23987"/></li>
-<li><xref href="cdevconcepts22641.dita#cdevconcepts22641"/></li>
-<li><xref href="rdevconceptsholdablecursors.dita#rdevconceptsholdablecursors"/></li>
-</ul>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure12392.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure12392.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure12392.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure12392.dita Tue Jun 28 15:46:15 2005
@@ -27,10 +27,6 @@
 <p>In most cases, you enable <ph conref="devconrefs.dita#prod/productshortname"></ph>'s security features through the
 use of properties. It is important to understand the best way of setting properties
 for your environment.</p>
-<ul>
-<li><xref href="tdevcsecure82556.dita#tdevcsecure82556"/></li>
-<li><xref href="tdevcsecure81850.dita#tdevcsecure81850"/></li>
-</ul>
 <section><title>Configuring security</title>
 <p><ph conref="devconrefs.dita#prod/productshortname"></ph> does not come with a built-in superuser. For that reason, be
 careful when configuring <ph conref="devconrefs.dita#prod/productshortname"></ph> for user authentication and user authorization. </p>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure24366.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure24366.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure24366.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure24366.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,20 +16,27 @@
 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="cdevcsecure24366">
+<concept id="cdevcsecure24366" xml:lang="en-us">
 <title>Encrypting databases on disk</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> provides
+a way for you to encrypt your data on disk.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Database encryption</indexterm>
-<indexterm>Databases<indexterm>encrypting</indexterm></indexterm>
+<keywords><indexterm>Database encryption</indexterm><indexterm>Databases<indexterm>encrypting</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<ul>
-<li><xref href="cdevcsecure99212.dita#cdevcsecure99212"/></li>
-<li><xref href="cdevcsecure96815.dita#cdevcsecure96815"/></li>
-<li><xref href="cdevcsecure97760.dita#cdevcsecure97760"/></li>
-</ul>
-</conbody></concept>
+<p>Typically, database systems encrypt and decrypt data in transport over
+the network, using industry-standard systems. This system works well for client/server
+databases; the server is assumed to be in a trusted, safe environment, managed
+by a system administrator. In addition, the recipient of the data is trusted
+and should be capable of protecting the data. The only risk comes when transporting
+data over the wire, and data encryption happens during network transport only.</p>
+<p>However, <ph conref="devconrefs.dita#prod/productshortname"></ph> databases
+are platform-independent files that are designed to be easily shared in a
+number of ways, including transport over the Internet. Recipients of the data
+might not know how, or might not have the means, to properly protect the data.</p>
+<p>This data encryption feature provides the ability to store user data in
+an encrypted form. The user who boots the database must provide a boot password.</p>
+<note>Jar files stored in the database are not encrypted.</note>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure30032.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure30032.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure30032.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure30032.dita Tue Jun 28 15:46:15 2005
@@ -1,72 +0,0 @@
-<?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.  
-
-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.
--->
-<concept id="cdevcsecure30032" xml:lang="en-us">
-<title>Overview</title>
-<prolog></prolog>
-<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides support
-for user authentication. <i>User authentication</i> means that <ph conref="devconrefs.dita#prod/productshortname"></ph> authenticates
-a user's name and password before allowing that user access to the system.</p>
-<p>When user authentication is enabled (which it is not by default), the user
-requesting a connection must provide a valid name and password, which <ph
-conref="devconrefs.dita#prod/productshortname"></ph> verifies against the
-repository of users defined for the system. Once <ph conref="devconrefs.dita#prod/productshortname"></ph> authenticates
-the user, it grants the user access to the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
-but not necessarily access to the database made in the connection request.
-In the <ph conref="devconrefs.dita#prod/productshortname"></ph> system, access
-to a database is determined by <i>user authorization</i>. For information,
-see <xref href="cdevcsecure36595.dita#cdevcsecure36595"></xref>.</p>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> allows you to
-provide a repository of users in a number of different ways. For example,
-you can hook <ph conref="devconrefs.dita#prod/productshortname"></ph> up to
-an external directory service elsewhere in your enterprise, create your own,
-use <ph conref="devconrefs.dita#prod/productshortname"></ph>'s simple mechanism
-for creating a built-in repository of users.</p>
-<p>You can define a repository of users for a particular database or for an
-entire system, depending on whether you use system-wide or database-wide properties.
-See <xref href="cdevcsecure12392.dita#cdevcsecure12392"></xref> for more information.</p>
-<p>When <ph conref="devconrefs.dita#prod/productshortname"></ph> user authentication
-is enabled and <ph conref="devconrefs.dita#prod/productshortname"></ph> uses
-an external directory service, the architecture looks something like that
-shown in the Figure below: </p>
-<fig expanse="column" id="cdevcsecure32704"><title><ph conref="devconrefs.dita#prod/productshortname"></ph> user
-authentication using an external service. The application can be a single-user
-application with an embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> engine
-or a multi-user application server.</title>
-<image href="authentic_os.gif" placement="break"><alt>Derby user
-authentication using an external service.</alt></image>
-</fig>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> always runs embedded
-in another Java application, whether that application is a single-user application
-or a multiple-user application server or connectivity framework. A database
-can be accessed by only one JVM at a time, so it is possible to deploy a system
-in which the application in which <ph conref="devconrefs.dita#prod/productshortname"></ph> is
-embedded, not <ph conref="devconrefs.dita#prod/productshortname"></ph>, handles
-the user authentication by connecting to an external directory service. </p>
-<fig expanse="column"><title>The application provides the user authentication
-using an external service. The application can be a single-user application
-with an embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> engine
-or a multi-user application server.</title>
-<image href="appauth_os.gif" placement="break"><alt>The application user authentication
-as an external service.</alt></image>
-</fig>
-</conbody>
-</concept>
-

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure31493.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure31493.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure31493.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure31493.dita Tue Jun 28 15:46:15 2005
@@ -27,7 +27,7 @@
 <p>You can specify an alternate provider when you create the database with
 the <codeph><i>encryptionProvider=providerName</i></codeph> attribute. </p>
 <p>You must specify the full package and class name of the provider, and you
-must also add the libraries to the application's class path.</p>
+must also add the libraries to the application's classpath.</p>
 <codeblock><b>-- using the the provider library jce_jdk13-10b4.zip|
 -- available from www.bouncycastle.org</b>
 jdbc:derby:encryptedDB3;create=true;dataEncryption=true;

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure33663.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure33663.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure33663.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure33663.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 concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure33663">
-<title>Security overview</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Security features</indexterm>
-</keywords>
-</metadata>
-</prolog>
-<conbody>
-</conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure38522.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure38522.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure38522.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure38522.dita Tue Jun 28 15:46:15 2005
@@ -32,9 +32,4 @@
 system. <ph conref="devconrefs.dita#prod/productshortname"></ph> uses the Java naming and directory interface (JNDI) to
 interact with external directory services that can provide authentication
 of users' names and passwords.</p>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> can use the following services:</p>
-<ul>
-<li><xref href="cdevcsecure41285.dita#cdevcsecure41285"/></li>
-<li><xref href="cdevcsecure21561.dita#cdevcsecure21561"/></li>
-</ul>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure42374.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure42374.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure42374.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure42374.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,22 +16,59 @@
 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="cdevcsecure42374">
+<concept id="cdevcsecure42374" xml:lang="en-us">
 <title>Working with user authentication</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> provides
+support for user authentication. <i>User authentication</i> means that <ph
+conref="devconrefs.dita#prod/productshortname"></ph> authenticates a user's
+name and password before allowing that user access to the system.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>User authentication</indexterm>
-<indexterm>Authentication</indexterm>
+<keywords><indexterm>User authentication</indexterm><indexterm>Authentication</indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<ul>
-<li><xref href="cdevcsecure30032.dita#cdevcsecure30032"/></li>
-<li><xref href="cdevcsecure36127.dita#cdevcsecure36127"/></li>
-<li><xref href="cdevcsecure37817.dita#cdevcsecure37817"/></li>
-<li><xref href="rdevcsecure557.dita#rdevcsecure557"/></li>
-<li><xref href="cdevcsecure79358.dita#cdevcsecure79358"/></li>
-</ul>
-</conbody></concept>
+<p>When user authentication is enabled (which it is not by default), the user
+requesting a connection must provide a valid name and password, which <ph
+conref="devconrefs.dita#prod/productshortname"></ph> verifies against the
+repository of users defined for the system. Once <ph conref="devconrefs.dita#prod/productshortname"></ph> authenticates
+the user, it grants the user access to the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
+but not necessarily access to the database made in the connection request.
+In the <ph conref="devconrefs.dita#prod/productshortname"></ph> system, access
+to a database is determined by <i>user authorization</i>. For information,
+see <xref href="cdevcsecure36595.dita#cdevcsecure36595"></xref>.</p>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> allows you to
+provide a repository of users in a number of different ways. For example,
+you can hook <ph conref="devconrefs.dita#prod/productshortname"></ph> up to
+an external directory service elsewhere in your enterprise, create your own,
+use <ph conref="devconrefs.dita#prod/productshortname"></ph>'s simple mechanism
+for creating a built-in repository of users.</p>
+<p>You can define a repository of users for a particular database or for an
+entire system, depending on whether you use system-wide or database-wide properties.
+See <xref href="cdevcsecure12392.dita#cdevcsecure12392"></xref> for more information.</p>
+<p>When <ph conref="devconrefs.dita#prod/productshortname"></ph> user authentication
+is enabled and <ph conref="devconrefs.dita#prod/productshortname"></ph> uses
+an external directory service, the architecture looks something like that
+shown in the Figure below: </p>
+<fig expanse="column" id="cdevcsecure32704"><title><ph conref="devconrefs.dita#prod/productshortname"></ph> user
+authentication using an external service. The application can be a single-user
+application with an embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> engine
+or a multi-user application server.</title>
+<image href="authentic_os.gif" placement="break"><alt>Derby user authentication
+using an external service.</alt></image>
+</fig>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> always runs embedded
+in another Java application, whether that application is a single-user application
+or a multiple-user application server or connectivity framework. A database
+can be accessed by only one JVM at a time, so it is possible to deploy a system
+in which the application in which <ph conref="devconrefs.dita#prod/productshortname"></ph> is
+embedded, not <ph conref="devconrefs.dita#prod/productshortname"></ph>, handles
+the user authentication by connecting to an external directory service. </p>
+<fig expanse="column"><title>The application provides the user authentication
+using an external service. The application can be a single-user application
+with an embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> engine
+or a multi-user application server.</title>
+<image href="appauth_os.gif" placement="break"><alt>The application user authentication
+as an external service.</alt></image>
+</fig>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure51876.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure51876.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure51876.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure51876.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,15 +16,12 @@
 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="cdevcsecure51876">
+<concept id="cdevcsecure51876" xml:lang="en-us">
 <title>User authentication and authorization examples</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <conbody>
-<ul>
-<li><xref href="rdevcsecure125.dita#rdevcsecure125"/></li>
-<li><xref href="rdevcsecure13713.dita#rdevcsecure13713"/></li>
-<li><xref href="rdevcsecure26537.dita#rdevcsecure26537"/></li>
-</ul>
-</conbody></concept>
+<p>This section provides examples on using user authentication and authorization
+in <ph conref="devconrefs.dita#prod/productshortname"></ph> in either a client/server
+environment or in an embedded environment.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure79358.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure79358.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure79358.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure79358.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,20 +16,14 @@
 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="cdevcsecure79358">
+<concept id="cdevcsecure79358" xml:lang="en-us">
 <title>Programming applications for Derby user authentication</title>
 <prolog><metadata>
-<keywords>
-<indexterm>User authentication<indexterm>programming applications
-for</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>User authentication<indexterm>programming applications
+for</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<ul>
-<li><xref href="rdevcsecure766.dita#rdevcsecure766"/></li>
-<li><xref href="rdevcsecure305.dita#rdevcsecure305"/></li>
-<li><xref href="cdevcsecure24458.dita#cdevcsecure24458"/></li>
-</ul>
-</conbody></concept>
+<p>This section discusses programming user authentication into applications
+for use with <ph conref="devconrefs.dita#prod/productshortname"></ph>.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure862382.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure862382.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure862382.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure862382.dita Tue Jun 28 15:46:15 2005
@@ -1,56 +0,0 @@
-<?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.  
-
-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.
--->
-<concept id="cdevcsecure862382" xml:lang="en-us">
-<title>Features</title>
-<prolog><metadata>
-<keywords><indexterm>User authentication<indexterm>definition</indexterm></indexterm>
-<indexterm>Authentication<indexterm>definition</indexterm></indexterm><indexterm>Disk
-encryption</indexterm><indexterm>Encrypting databases</indexterm></keywords>
-</metadata></prolog>
-<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> can be deployed
-in a number of ways and in a number of different environments. The security
-needs of the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
-are also diverse. <ph conref="devconrefs.dita#prod/productshortname"></ph> supplies
-or supports the following optional security mechanisms:</p>
-<ul>
-<li><i>User authentication</i>   <p><ph conref="devconrefs.dita#prod/productshortname"></ph> verifies
-user names and passwords before permitting them access to the <ph conref="devconrefs.dita#prod/productshortname"></ph> system.
-See <xref href="cdevcsecure42374.dita#cdevcsecure42374"></xref>.</p></li>
-<li><i>User authorization</i>   <p>A means of granting specific users permission
-to read a database or to write to a database. See <xref href="cdevcsecure36595.dita#cdevcsecure36595"></xref>.</p></li>
-<li><i>Disk encryption</i>   <p>A means of encrypting <ph conref="devconrefs.dita#prod/productshortname"></ph> data
-stored on disk. See <xref href="cdevcsecure24366.dita#cdevcsecure24366"></xref>.</p></li>
-<li><i>Validation of Certificate for Signed Jar Files</i>   <p>In a Java 2
-environment, <ph conref="devconrefs.dita#prod/productshortname"></ph> validates
-certificates for classes loaded from signed jar files. See <xref href="cdevcsecure90988.dita#cdevcsecure90988"></xref>.</p>  <fig
-expanse="column"><title>Some of the <ph conref="devconrefs.dita#prod/productshortname"></ph> security
-mechanisms at work in a client/server environment</title>
-<image href="security_os.gif" placement="break"><alt>Some of the Derby
-security mechanisms at work in a client/server environment.</alt></image>
-</fig> <fig expanse="column"><title>Another <ph conref="devconrefs.dita#prod/productshortname"></ph> security
-mechanism, disk encryption, protects data when the recipient might not know
-how to protect data. It is useful for databases deployed in an embedded environment.</title>
-<image href="security2_os.gif" placement="break"><alt>The disk encryption
-security mechanism.</alt></image>
-</fig></li>
-</ul>
-</conbody>
-</concept>
-

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure871035.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure871035.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure871035.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure871035.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 concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure871035">
-<title>Mandatory permissions</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Permissions<indexterm>mandatory</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
-<conbody>
-</conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure871172.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure871172.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure871172.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure871172.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 concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure871172">
-<title>Database access permissions</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Permissions<indexterm>database access</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
-<conbody>
-</conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure871230.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure871230.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure871230.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure871230.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 concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure871230">
-<title>Optional permissions</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Permissions<indexterm>optional</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
-<conbody>
-</conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure871353.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure871353.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure871353.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure871353.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 concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure871353">
-<title>Combining permissions</title>
-<prolog>
-</prolog>
-<conbody>
-<p>You might grant one <i>FilePermission</i> that encompasses
-several, or all, of the permissions described below, instead of separately
-granting a number of the more specific permissions.</p>
-<p>For example:</p>
-</conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure97760.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure97760.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure97760.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure97760.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,15 +16,13 @@
 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="cdevcsecure97760">
+<concept id="cdevcsecure97760" xml:lang="en-us">
 <title>Working with encryption</title>
-<prolog>
-</prolog>
+<prolog><metadata>
+<keywords><indexterm>Encryption<indexterm>working with</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <conbody>
-<ul>
-<li><xref href="cdevcsecure88690.dita#cdevcsecure88690"/></li>
-<li><xref href="cdevcsecure60146.dita#cdevcsecure60146"/></li>
-<li><xref href="cdevcsecure55054.dita#cdevcsecure55054"/></li>
-</ul>
-</conbody></concept>
+<p>This section describes using encryption in <ph conref="devconrefs.dita#prod/productshortname"></ph>.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure99212.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure99212.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure99212.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure99212.dita Tue Jun 28 15:46:15 2005
@@ -1,37 +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="cdevcsecure99212">
-<title>Overview</title>
-<prolog>
-</prolog>
-<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides a way for you to encrypt your data on disk.</p>
-<p>Typically, database systems encrypt and decrypt data in transport over
-the network, using industry-standard systems. This system works well for client/server
-databases; the server is assumed to be in a trusted, safe environment, managed
-by a system administrator. In addition, the recipient of the data is trusted
-and should be capable of protecting the data. The only risk comes when transporting
-data over the wire, and data encryption happens during network transport only.</p>
-<p>However, <ph conref="devconrefs.dita#prod/productshortname"></ph> databases are platform-independent files that are
-designed to be easily shared in a number of ways, including transport over
-the Internet. Recipients of the data might not know how, or might not have
-the means, to properly protect the data.</p>
-<p>This data encryption feature provides the ability to store user data in
-an encrypted form. The user who boots the database must provide a boot password.</p>
-<note>Jar files stored in the database are not encrypted.</note>
-</conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecuree.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecuree.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecuree.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecuree.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,21 +16,40 @@
 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="cdevcsecuree">
+<concept id="cdevcsecuree" xml:lang="en-us">
 <title>Derby and Security</title>
-<prolog>
-</prolog>
+<prolog><metadata>
+<keywords><indexterm>User authentication<indexterm>definition</indexterm></indexterm>
+<indexterm>Authentication<indexterm>definition</indexterm></indexterm><indexterm>Disk
+encryption</indexterm><indexterm>Encrypting databases</indexterm></keywords>
+</metadata></prolog>
 <conbody>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> can be deployed
+in a number of ways and in a number of different environments. The security
+needs of the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
+are also diverse. <ph conref="devconrefs.dita#prod/productshortname"></ph> supplies
+or supports the following optional security mechanisms:</p>
 <ul>
-<li><xref href="cdevcsecure33663.dita#cdevcsecure33663"/></li>
-<li><xref href="cdevcsecure42374.dita#cdevcsecure42374"/></li>
-<li><xref href="cdevcsecure37241.dita#cdevcsecure37241"/></li>
-<li><xref href="cdevcsecure36595.dita#cdevcsecure36595"/></li>
-<li><xref href="cdevcsecure24366.dita#cdevcsecure24366"/></li>
-<li><xref href="cdevcsecure90988.dita#cdevcsecure90988"/></li>
-<li><xref href="cdevcsecure10983.dita#cdevcsecure10983"/></li>
-<li><xref href="cdevcsecure51876.dita#cdevcsecure51876"/></li>
-<li><xref href="cdevcbabejdfj.dita#cdevcbabejdfj"/></li>
+<li><i>User authentication</i>   <p><ph conref="devconrefs.dita#prod/productshortname"></ph> verifies
+user names and passwords before permitting them access to the <ph conref="devconrefs.dita#prod/productshortname"></ph> system.
+See <xref href="cdevcsecure42374.dita#cdevcsecure42374"></xref>.</p></li>
+<li><i>User authorization</i>   <p>A means of granting specific users permission
+to read a database or to write to a database. See <xref href="cdevcsecure36595.dita#cdevcsecure36595"></xref>.</p></li>
+<li><i>Disk encryption</i>   <p>A means of encrypting <ph conref="devconrefs.dita#prod/productshortname"></ph> data
+stored on disk. See <xref href="cdevcsecure24366.dita#cdevcsecure24366"></xref>.</p></li>
+<li><i>Validation of Certificate for Signed Jar Files</i>   <p>In a Java 2
+environment, <ph conref="devconrefs.dita#prod/productshortname"></ph> validates
+certificates for classes loaded from signed jar files. See <xref href="cdevcsecure90988.dita#cdevcsecure90988"></xref>.</p>  <fig
+expanse="column"><title>Some of the <ph conref="devconrefs.dita#prod/productshortname"></ph> security
+mechanisms at work in a client/server environment</title>
+<image href="security_os.gif" placement="break"><alt>Some of the Derby security
+mechanisms at work in a client/server environment.</alt></image>
+</fig> <fig expanse="column"><title>Another <ph conref="devconrefs.dita#prod/productshortname"></ph> security
+mechanism, disk encryption, protects data when the recipient might not know
+how to protect data. It is useful for databases deployed in an embedded environment.</title>
+<image href="security2_os.gif" placement="break"><alt>The disk encryption
+security mechanism.</alt></image>
+</fig></li>
 </ul>
-</conbody></concept>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy12748.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy12748.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy12748.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy12748.dita Tue Jun 28 15:46:15 2005
@@ -29,7 +29,7 @@
 <p>In your applications, you load resources the way you normally would, using
 the standard <i>java.lang.Class.getResourceAsStream</i>,
 a mechanism that allows an application to access resources defined in the
-class path without knowing where or how they are stored.</p>
+classpath without knowing where or how they are stored.</p>
 <p>You do not need to make any changes to the way code interacts with <ph conref="devconrefs.dita#prod/productshortname"></ph> and
 its JDBC driver. An application can safely attempt to boot <ph conref="devconrefs.dita#prod/productshortname"></ph>, even
 though it is already running, without any errors. Applications connect to <ph conref="devconrefs.dita#prod/productshortname"></ph> in

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy15325.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy15325.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy15325.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy15325.dita Tue Jun 28 15:46:15 2005
@@ -17,6 +17,8 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevdeploy15325">
 <title>Creating Derby databases for read-only use</title>
+<shortdesc>You can create <ph conref="devconrefs.dita#prod/productshortname"></ph> databases for use on read-only media such as
+CD-ROMs.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>Read-only databases<indexterm>working with</indexterm></indexterm>
@@ -24,16 +26,7 @@
 </metadata>
 </prolog>
 <conbody>
-<p>You can create <ph conref="devconrefs.dita#prod/productshortname"></ph> databases for use on read-only media such as
-CD-ROMs. <ph conref="devconrefs.dita#prod/productshortname"></ph> databases in zip or jar files are also read-only databases.
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> databases in zip or jar files are also read-only databases.
 Typically, read-only databases are deployed with an application in an embedded
 environment.</p>
-<ul>
-<li><xref href="tdevdeploy26887.dita#tdevdeploy26887"/></li>
-<li><xref href="tdevdeploy19136.dita#tdevdeploy19136"/></li>
-<li><xref href="tdevdeploy33704.dita#tdevdeploy33704"/></li>
-<li><xref href="cdevdeploy11201.dita#cdevdeploy11201"/></li>
-<li><xref href="tdevdeploy39856.dita#tdevdeploy39856"/></li>
-<li><xref href="cdevdeploy82529.dita#cdevdeploy82529"/></li>
-</ul>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy15818.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy15818.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy15818.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy15818.dita Tue Jun 28 15:46:15 2005
@@ -32,7 +32,7 @@
 <p>A running <ph conref="devconrefs.dita#prod/productshortname"></ph> system can load classes from any number of jar files
 from any number of schemas and databases.</p>
 <p>Create jar files intended for <ph conref="devconrefs.dita#prod/productshortname"></ph> database class loading the same
-way you create a jar file for inclusion in a user's class path. For example,
+way you create a jar file for inclusion in a user's classpath. For example,
 consider an application targeted at travel agencies: </p>
 <codeblock><b>jar cf travelagent.jar travelagent/*.class.</b></codeblock>
 <p>Various IDEs have tools to generate a list of contents for a jar file based

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy17604.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy17604.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy17604.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy17604.dita Tue Jun 28 15:46:15 2005
@@ -16,15 +16,15 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevdeploy17604">
-<title>Dynamic changes to jar files or to the database jar class path</title>
+<title>Dynamic changes to jar files or to the database jar classpath</title>
 <prolog>
 </prolog>
 <conbody>
 <p>When you store jar files in a single database and make those jar files
 available to that database, it is possible to make changes to jar files or
-to change the database jar "class path" dynamically (without having
+to change the database jar "classpath" dynamically (without having
 to reboot).</p>
 <p>That is, when you install or replace a jar file within an SQL statement
-or change the database jar "class path" (the <i>derby.database.classpath</i> property<codeph><i>),</i></codeph> <ph conref="devconrefs.dita#prod/productshortname"></ph> is able to
+or change the database jar "classpath" (the <i>derby.database.classpath</i> property<codeph><i>),</i></codeph> <ph conref="devconrefs.dita#prod/productshortname"></ph> is able to
 load the new classes right away without your having to reboot.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy21645.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy21645.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy21645.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy21645.dita Tue Jun 28 15:46:15 2005
@@ -21,12 +21,12 @@
 </prolog>
 <conbody>
 <p>Once you have added one or more jar files to a database, you must set the
-database jar "class path" by including the jar file or files in the <i>derby.database.classpath</i> property to enable <ph conref="devconrefs.dita#prod/productshortname"></ph> to
+database jar "classpath" by including the jar file or files in the <i>derby.database.classpath</i> property to enable <ph conref="devconrefs.dita#prod/productshortname"></ph> to
 load classes from the jar files. This property, which behaves like a class
 path, specifies the jar files to be searched for classes and resources and
 the order in which they are searched. If <ph conref="devconrefs.dita#prod/productshortname"></ph> does not find a needed
 class stored in the database, it can retrieve the class from the user's
-class path. (<ph conref="devconrefs.dita#prod/productshortname"></ph> first looks in the user's class path before looking
+classpath. (<ph conref="devconrefs.dita#prod/productshortname"></ph> first looks in the user's classpath before looking
 in the database.)</p>
 <ul>
 <li>Separate jar files with a colon (:).</li>
@@ -39,6 +39,6 @@
     'APP.ToursLogic:APP.ACCOUNTINGLOGIC')</b></codeblock>
 <p>See <i>"derby.database.classpath"</i> in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite> for more information about the property.</p>
 <note><ph conref="devconrefs.dita#prod/productshortname"></ph>'s class loader looks first in the user's
-class path for any needed classes, and then in the database. To ensure class
-loading with the database class loader, remove classes from the class path.</note>
+classpath for any needed classes, and then in the database. To ensure class
+loading with the database class loader, remove classes from the classpath.</note>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy30736.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy30736.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy30736.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy30736.dita Tue Jun 28 15:46:15 2005
@@ -30,7 +30,7 @@
 the database. Application logic, which can be used by SQL functions and procedures,
 includes Java class files and other resources. Storing application code simplifies
 application deployment, since it reduces the potential for problems with a
-user's class path.</p>
+user's classpath.</p>
 <p>In an embedded environment, when application logic is stored in the database, <ph
 conref="devconrefs.dita#prod/productshortname"></ph> can access classes loaded
 by the <ph conref="devconrefs.dita#prod/productshortname"></ph> class loader

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy32171.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy32171.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy32171.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy32171.dita Tue Jun 28 15:46:15 2005
@@ -23,11 +23,6 @@
 <p>Typically, once you have developed a <ph conref="devconrefs.dita#prod/productshortname"></ph> application and database,
 you package up the application, the <ph conref="devconrefs.dita#prod/productshortname"></ph> libraries, and the database
 in some means for distribution to your users. This process is called <i>deployment</i>. </p>
-<p>This chapter discusses issues for deploying <ph conref="devconrefs.dita#prod/productshortname"></ph> applications and
-databases. </p>
-<ul>
-<li><xref href="cdevdeploy38918.dita#cdevdeploy38918"/></li>
-<li><xref href="cdevdeploy15325.dita#cdevdeploy15325"/></li>
-<li><xref href="cdevdeploy30736.dita#cdevdeploy30736"/></li>
-</ul>
+<p>This section discusses issues for deploying <ph conref="devconrefs.dita#prod/productshortname"></ph> applications and
+databases.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy37603.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy37603.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy37603.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy37603.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="cdevdeploy37603">
-<title>Deployment cheat sheets</title>
-<prolog>
-</prolog>
-<conbody>
-</conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy38918.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy38918.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy38918.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy38918.dita Tue Jun 28 15:46:15 2005
@@ -21,8 +21,4 @@
 </prolog>
 <conbody>
 <p>This section discusses deployment options and details.</p>
-<ul>
-<li><xref href="cdevdeploy855368.dita#cdevdeploy855368"/></li>
-<li><xref href="cdevdeploy37603.dita#cdevdeploy37603"/></li>
-</ul>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy855368.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy855368.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy855368.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy855368.dita Tue Jun 28 15:46:15 2005
@@ -16,44 +16,50 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<concept xml:lang="en-us" id="cdevdeploy855368">
+<concept id="cdevdeploy855368" xml:lang="en-us">
 <title>Embedded deployment application overview</title>
+<shortdesc>In an embedded environment, <ph conref="devconrefs.dita#prod/productshortname"></ph> runs
+in the same JVM as the application.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Embedded environments</indexterm>
-<indexterm>Embedded applications<indexterm>deploying</indexterm></indexterm>
-<indexterm>Embedded environments<indexterm><ph conref="devconrefs.dita#prod/productshortname"></ph> as single-user
-database</indexterm></indexterm>
-<indexterm>Embedded environments<indexterm>how applications
-interact with <ph conref="devconrefs.dita#prod/productshortname"></ph> in</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Embedded environments</indexterm><indexterm>Embedded
+applications<indexterm>deploying</indexterm></indexterm><indexterm>Embedded
+environments<indexterm>Derby as single-user database</indexterm></indexterm>
+<indexterm>Embedded environments<indexterm>how applications interact with
+Derby in</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>In an embedded environment, <ph conref="devconrefs.dita#prod/productshortname"></ph> runs in the same JVM as the application.
-The application can be a single-user application or a multi-user application
-server. In the latter case, <ph conref="devconrefs.dita#prod/productshortname"></ph> runs embedded in the user-provided
-server framework, and any client applications use user-provided connectivity
-or allow the application server to handle all database interaction.</p>
-<fig id="cdevdeploy31527">
-<title><ph conref="devconrefs.dita#prod/productshortname"></ph> embedded in a single-user Java
-application</title><image placement="break" href="embed_os.gif"><alt><ph conref="devconrefs.dita#prod/productshortname"></ph> in a single-user application scenario.</alt></image></fig>
-<fig id="cdevdeploy29107">
-<title>Derby embedded in a multi-user Java application
-server</title><image placement="break" href="itserv_os.gif"><alt><ph conref="devconrefs.dita#prod/productshortname"></ph> in a multi-user application scenario.</alt></image></fig>
-<p>When a <ph conref="devconrefs.dita#prod/productshortname"></ph> database is embedded in a Java application, the database
-is dedicated to that single application. If you deploy more than one copy
-of the application, <i>each application has its own copy of
-the database and <ph conref="devconrefs.dita#prod/productshortname"></ph> software</i>. A <ph conref="devconrefs.dita#prod/productshortname"></ph> server framework can work
-in multi-threaded, multi-connection mode and can even connect to more than
-one database at a time. A server framework, such as the <ph conref="devconrefs.dita#prod/productshortname"></ph> Network Server,
-can be used to manage multiple connections and handle network capabilities.
+<p>The application can be a single-user application or a multi-user application
+server. In the latter case, <ph conref="devconrefs.dita#prod/productshortname"></ph> runs
+embedded in the user-provided server framework, and any client applications
+use user-provided connectivity or allow the application server to handle all
+database interaction.</p>
+<fig id="cdevdeploy31527"><title><ph conref="devconrefs.dita#prod/productshortname"></ph> embedded
+in a single-user Java application</title>
+<image href="embed_os.gif" placement="break"><alt>Derby in a single-user application
+scenario.</alt></image>
+</fig>
+<fig id="cdevdeploy29107"><title>Derby embedded in a multi-user Java application
+server</title>
+<image href="itserv_os.gif" placement="break"><alt>Derby in a multi-user application
+scenario.</alt></image>
+</fig>
+<p>When a <ph conref="devconrefs.dita#prod/productshortname"></ph> database
+is embedded in a Java application, the database is dedicated to that single
+application. If you deploy more than one copy of the application, <i>each
+application has its own copy of the database and <ph conref="devconrefs.dita#prod/productshortname"></ph> software</i>.
+A <ph conref="devconrefs.dita#prod/productshortname"></ph> server framework
+can work in multi-threaded, multi-connection mode and can even connect to
+more than one database at a time. A server framework, such as the <ph conref="devconrefs.dita#prod/productshortname"></ph> Network
+Server, can be used to manage multiple connections and handle network capabilities.
 Some server framework solutions, such as WebSphere Application Server, provide
 additional features such as web services and connection pooling. However,
 only one server framework at a time can operate against a <ph conref="devconrefs.dita#prod/productshortname"></ph> database.</p>
-<p>The <ph conref="devconrefs.dita#prod/productshortname"></ph> application accesses an embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> database through
-the JDBC API. To connect, an application makes a call to the local <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC
-driver. Accessing the JDBC driver automatically starts the embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> software.
-The calling application is responsible for shutting down the embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> database
-software. </p>
-</conbody></concept>
+<p>The <ph conref="devconrefs.dita#prod/productshortname"></ph> application
+accesses an embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> database
+through the JDBC API. To connect, an application makes a call to the local <ph
+conref="devconrefs.dita#prod/productshortname"></ph> JDBC driver. Accessing
+the JDBC driver automatically starts the embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> software.
+The calling application is responsible for shutting down the embedded <ph
+conref="devconrefs.dita#prod/productshortname"></ph> database software. </p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy856333.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy856333.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy856333.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy856333.dita Tue Jun 28 15:46:15 2005
@@ -17,22 +17,22 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevdeploy856333">
 <title>Connecting to databases when the path is ambiguous because of databases
-in the class path</title>
+in the classpath</title>
 <prolog><metadata>
 <keywords>
 <indexterm>Connecting to databases<indexterm>when path is ambiguous
-because of databases in class path</indexterm></indexterm>
+because of databases in classpath</indexterm></indexterm>
 </keywords>
 </metadata>
 </prolog>
 <conbody>
 <p>To connect to a database in the file system when the connection URL that you would
-use would be ambiguous with a database in the class path, use the following
+use would be ambiguous with a database in the classpath, use the following
 form of the connection URL:</p>
 <codeblock>jdbc:derby:directory:<i>databasePathInFileSystem</i></codeblock>
 <p>For example,</p>
 <codeblock>jdbc:derby:directory:/products/boiledfood</codeblock>
-<p>Apart from the connection URL, databases in archives in the class path behave just
+<p>Apart from the connection URL, databases in archives in the classpath behave just
 like databases in archives accessed through the file system. However, databases
 in archives are read-only.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy856753.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy856753.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy856753.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy856753.dita Tue Jun 28 15:46:15 2005
@@ -26,12 +26,12 @@
 is the way in which you invoke the application.</p>
 <p>Here are the basic steps:</p>
 <ol>
-<li><xref href="cdevdeploy15818.dita#cdevdeploy15818"/></li>
-<li><xref href="cdevdeploy23812.dita#cdevdeploy23812"/></li>
-<li><xref href="cdevdeploy21645.dita#cdevdeploy21645"/></li>
-<li><xref href="cdevdeploy12748.dita#cdevdeploy12748"/></li>
+<li><xref href="cdevdeploy15818.dita#cdevdeploy15818">Create jar files for your application</xref></li>
+<li><xref href="cdevdeploy23812.dita#cdevdeploy23812">Add the jar file or files to the database</xref></li>
+<li><xref href="cdevdeploy21645.dita#cdevdeploy21645">Enable database class loading with a property</xref></li>
+<li><xref href="cdevdeploy12748.dita#cdevdeploy12748">Code your applications</xref></li>
 </ol>
 <note>If you are interested in making changes to jar files stored
-in the database or changing the database jar "class path" of your
+in the database or changing the database jar "classpath" of your
 application without having to re-boot, read <xref href="cdevdeploy17604.dita#cdevdeploy17604"/>.</note>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy857648.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy857648.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy857648.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy857648.dita Tue Jun 28 15:46:15 2005
@@ -23,7 +23,7 @@
 <p>When you are changing the <i>derby.database.classpath</i> property,
 all classes loaded from database jar files are reloaded, even for a jar file
 that has not changed.</p>
-<p>Remember that the user's class path is searched first.</p>
+<p>Remember that the user's classpath is searched first.</p>
 <p>Any existing prepared statements will use the previously loaded classes
 unless they require class loading, in which case they will fail with a <i>ClassNotFound</i> error.</p>
 <p>Cached objects do not match objects created with newly loaded classes.

Modified: incubator/derby/docs/trunk/src/devguide/cdevdgpref11181.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdgpref11181.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdgpref11181.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdgpref11181.dita Tue Jun 28 15:46:15 2005
@@ -16,7 +16,7 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevdgpref11181">
-<title>Purpose of This Document</title>
+<title>Purpose of this guide</title>
 <prolog>
 </prolog>
 <conbody>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdgpref23947.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdgpref23947.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdgpref23947.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdgpref23947.dita Tue Jun 28 15:46:15 2005
@@ -16,7 +16,7 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevdgpref23947">
-<title>How This Document Is Organized</title>
+<title>How this guide Is Organized</title>
 <prolog>
 </prolog>
 <conbody>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdgpref29520.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdgpref29520.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdgpref29520.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdgpref29520.dita Tue Jun 28 15:46:15 2005
@@ -18,14 +18,9 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <concept id="cdevdgpref29520" xml:lang="en-us">
-<title>About This Document</title>
+<title>About this guide</title>
 <prolog></prolog>
 <conbody>
-<ul>
-<li><xref href="cdevdgpref11181.dita#cdevdgpref11181"></xref></li>
-<li><xref href="cdevdgpref24290.dita#cdevdgpref24290"></xref></li>
-<li><xref href="cdevdgpref23947.dita#cdevdgpref23947"></xref></li>
-</ul>
 <p>For general information about the <ph conref="devconrefs.dita#prod/productshortname"></ph> documentation, such
 as a complete list of books, conventions, and further reading, see <cite><ph
 conref="devconrefs.dita#pub/citgetstart"></ph></cite>.</p>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdvlp19700.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdvlp19700.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdvlp19700.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdvlp19700.dita Tue Jun 28 15:46:15 2005
@@ -20,6 +20,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p>You can also access databases from the class path or from a jar file (in
-the class path or not) as read-only databases.</p>
+<p>You can also access databases from the classpath or from a jar file (in
+the classpath or not) as read-only databases.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdvlp24155.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdvlp24155.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdvlp24155.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdvlp24155.dita Tue Jun 28 15:46:15 2005
@@ -21,15 +21,15 @@
 </prolog>
 <conbody>
 <p>It is possible to access databases from a jar file. The jar file can be,
-but does not have to be, on the class path.</p>
+but does not have to be, on the classpath.</p>
 <note>All such databases are read-only.</note>
 <p>For example, suppose you have archived the database <i>jarDB1</i> into a file called <i>jar1.jar</i>. This archive
-is in the class path before you start up <ph conref="devconrefs.dita#prod/productshortname"></ph>. You can access <i>jarDB1</i> with the following connection URL</p>
+is in the classpath before you start up <ph conref="devconrefs.dita#prod/productshortname"></ph>. You can access <i>jarDB1</i> with the following connection URL</p>
 <codeblock>jdbc:derby:/jarDB1</codeblock>
-<p>To access a database in a jar file that is not on the class path, use the
+<p>To access a database in a jar file that is not on the classpath, use the
 jar subprotocol. </p>
 <p>For example, suppose you have archived the database <i>jarDB2</i> into a file called <i>jar2.jar</i>. This archive
-is not in the class path. You can access <i>jarDB2</i> by
+is not in the classpath. You can access <i>jarDB2</i> by
 specifying the path to the jar file along with the jar subsubprotocol, like
 this:</p>
 <codeblock>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdvlp27610.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdvlp27610.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdvlp27610.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdvlp27610.dita Tue Jun 28 15:46:15 2005
@@ -33,7 +33,7 @@
 engine and the environment in which it runs. It consists of a system directory,
 zero or more databases, and a system-wide configuration. The system directory
 contains any persistent system-wide configuration parameters, or properties,
-specific to that system in a properties file called <xref href="cdevdvlp39943.dita#cdevdvlp39943"></xref>.
+specific to that system in a properties file called <xref href="cdevdvlp39943.dita#cdevdvlp39943">derby.properties</xref>.
 This file is not automatically created; you must create it yourself.</p>
 <p>The <ph conref="devconrefs.dita#prod/productshortname"></ph> system is
 not persistent; you must specify the location of the system directory at every

Modified: incubator/derby/docs/trunk/src/devguide/cdevdvlp40350.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdvlp40350.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdvlp40350.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdvlp40350.dita Tue Jun 28 15:46:15 2005
@@ -26,7 +26,7 @@
 </metadata>
 </prolog>
 <conbody>
-<p>When accessing databases from the file system (instead of from class path
+<p>When accessing databases from the file system (instead of from classpath
 or a jar file), any path that is not absolute is interpreted as relative to
 the system directory. </p>
 <p>The path must do one of the following:</p>
@@ -49,7 +49,7 @@
 not already exist when creating a new database. If it cannot create the intermediate
 directory, the database creation fails.</p>
 <p>If the path to the database is ambiguous, i.e., potentially the same as
-that to a database that is available on the class path (see "Special Database
+that to a database that is available on the classpath (see "Special Database
 Access"), use the <i>directory:</i> subsubprotocol to
 specify the one in the file system. For example:</p>
 <codeblock>jdbc:derby:directory:myDB</codeblock>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdvlp40724.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdvlp40724.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdvlp40724.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdvlp40724.dita Tue Jun 28 15:46:15 2005
@@ -63,7 +63,7 @@
 few limitations on the number and size of databases and database objects.
 The following table shows some size limitations of <ph conref="devconrefs.dita#prod/productshortname"></ph> databases
 and database objects:</p>
-<table frame="none" id="cdevdvlp85623" rowheader="firstcol"><title>Size Limits
+<table id="cdevdvlp85623" rowheader="firstcol"><title>Size Limits
 to Derby Database Objects</title>
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="40*"/>
 <colspec colname="2" colnum="2" colwidth="60*"/>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdvlp845973.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdvlp845973.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdvlp845973.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdvlp845973.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,17 +16,13 @@
 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="cdevdvlp845973">
+<concept id="cdevdvlp845973" xml:lang="en-us">
 <title>Single database shutdown</title>
 <prolog><metadata>
-<keywords>
-<indexterm>Shutting down a single database</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Shutting down a single database</indexterm></keywords>
+</metadata></prolog>
 <conbody>
 <p>An application can shut down a single database within a <ph conref="devconrefs.dita#prod/productshortname"></ph> system
-and leave the rest of the system running. See "Shutting Down <ph conref="devconrefs.dita#prod/productshortname"></ph> or
-an Individual Database".</p>
-</conbody></concept>
+and leave the rest of the system running. See <xref href="tdevdvlp40464.dita#tdevdvlp40464"></xref>.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdvlp91854.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdvlp91854.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdvlp91854.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdvlp91854.dita Tue Jun 28 15:46:15 2005
@@ -16,24 +16,24 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevdvlp91854">
-<title>Accessing databases from the class path</title>
+<title>Accessing databases from the classpath</title>
 <prolog><metadata>
 <keywords>
-<indexterm>Class path<indexterm>accessing databases from</indexterm></indexterm>
+<indexterm>Classpath<indexterm>accessing databases from</indexterm></indexterm>
 </keywords>
 </metadata>
 </prolog>
 <conbody>
 <p>In most cases, you access databases from the file system as described above.
-However, it is also possible to access databases from the class path. The
+However, it is also possible to access databases from the classpath. The
 databases can be archived into a jar or zip file or left as is.</p>
 <p>All such databases are read-only.</p>
-<p>To access an unarchived database from the class path, specify the name
-of the database relative to the directory in the class path. You can use the
-class path subprotocol if such a database is ambiguous within the directory
+<p>To access an unarchived database from the classpath, specify the name
+of the database relative to the directory in the classpath. You can use the
+classpath subprotocol if such a database is ambiguous within the directory
 system. See <xref href="rdevdvlp38881.dita#rdevdvlp38881"/> for more information.</p>
 <p>For example, for a database called <i>sample</i> in <i>C:\<ph conref="devconrefs.dita#prod/productlowercase"></ph>\demo\databases</i>, you can put the <i>C:\<ph conref="devconrefs.dita#prod/productlowercase"></ph>\demo\databases</i> directory in the
-class path and access <i>sample</i> like this:</p>
+classpath and access <i>sample</i> like this:</p>
 <codeblock>
 jdbc:derby:/sample
 </codeblock>

Modified: incubator/derby/docs/trunk/src/devguide/cdevin10613.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevin10613.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevin10613.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevin10613.dita Tue Jun 28 15:46:15 2005
@@ -32,7 +32,7 @@
 some support for locales for databases and other components such as the tools
 and the installer.</p>
 <p>It also provides a feature to support databases in many different languages,
-a feature which is independent of a particular territory. See <xref href="cdevin71274.dita#cdevin71274"/>.</p>
+a feature which is independent of a particular territory.</p>
 <p>When you create or upgrade a database, you can use the territory attribute
 to associate a non-default territory with the database. For information about
 how to use the territory attribute, see the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>

Modified: incubator/derby/docs/trunk/src/devguide/cdevin38113.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevin38113.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevin38113.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevin38113.dita Tue Jun 28 15:46:15 2005
@@ -29,7 +29,7 @@
 <li>You must have the locale-specific <ph conref="devconrefs.dita#prod/productshortname"></ph> jar file. <ph conref="devconrefs.dita#prod/productshortname"></ph> provides
 such jars for only some locales. You will find the locale jar files in the
 /lib directory in your <ph conref="devconrefs.dita#prod/productshortname"></ph> installation.</li>
-<li>The locale-specific <ph conref="devconrefs.dita#prod/productshortname"></ph> jar file must be in the class path.</li>
+<li>The locale-specific <ph conref="devconrefs.dita#prod/productshortname"></ph> jar file must be in the classpath.</li>
 </ul>
 <p>The locale-specific <ph conref="devconrefs.dita#prod/productshortname"></ph> jar file is named <i><ph conref="devconrefs.dita#prod/productlowercase"></ph>Locale_ll_CC.jar</i>, where<i> ll</i> is the two-letter code for language,
 and <i>CC</i> is the two-letter code for country. For example,

Modified: incubator/derby/docs/trunk/src/devguide/cdevin55108.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevin55108.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevin55108.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevin55108.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,38 +16,36 @@
 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="cdevin55108">
+<concept id="cdevin55108" xml:lang="en-us">
 <title>Other components</title>
 <prolog><metadata>
-<keywords>
-<indexterm>Error messages<indexterm>localized</indexterm></indexterm>
+<keywords><indexterm>Error messages<indexterm>localized</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> also provides locale support for the following: </p>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> also provides
+locale support for the following: </p>
 <ul>
 <li>Database error messages are in the language of the locale, if support
-is explicitly provided for that locale with a special library.  
-<p>For example, <ph conref="devconrefs.dita#prod/productshortname"></ph> explicitly
-supports Spanish-language error messages. If a database's locale is set
-to one of the Spanish-language locales, <ph conref="devconrefs.dita#prod/productshortname"></ph> returns error messages
-in the Spanish language.</p>
-<p>Localized messages require special
-libraries. See <xref href="cdevin38113.dita#cdevin38113"/>.</p></li>
-<li>The <ph conref="devconrefs.dita#prod/productshortname"></ph> tools. In the case of the tools, locale support includes
-locale-specific interface and error messages and localized data display.  
-<p>Localized messages require special libraries. See <xref href="cdevin38113.dita#cdevin38113"/>.</p>
-<p>For more information about localization of the <ph conref="devconrefs.dita#prod/productshortname"></ph> tools,
+is explicitly provided for that locale with a special library.   <p>For example, <ph
+conref="devconrefs.dita#prod/productshortname"></ph> explicitly supports Spanish-language
+error messages. If a database's locale is set to one of the Spanish-language
+locales, <ph conref="devconrefs.dita#prod/productshortname"></ph> returns
+error messages in the Spanish language.</p> </li>
+<li>The <ph conref="devconrefs.dita#prod/productshortname"></ph> tools. In
+the case of the tools, locale support includes locale-specific interface and
+error messages and localized data display.   <p>For more information about
+localization of the <ph conref="devconrefs.dita#prod/productshortname"></ph> tools,
 see the <cite><ph conref="devconrefs.dita#pub/citutilities"></ph></cite>. </p></li>
 </ul>
+<p>Localized messages require special libraries. See <xref href="cdevin38113.dita#cdevin38113"></xref>.</p>
 <p>The locale of the error messages and of the tools is not determined by
-the database's localle set by the <i>locale=ll_CC</i> attribute
-when the database is created but instead by the default system locale. This
-means that it is possible to create a database with a non-default locale.
-In such a case, error messages would not be returned in the language of the
-database's locale but in the language of the default locale instead.</p>
-<note>You can override the default locale for ij or Cview with a
-property on the JVM. For more information, see the <cite><ph conref="devconrefs.dita#pub/citutilities"></ph></cite>.</note>
-</conbody></concept>
+the database's localle set by the <i>locale=ll_CC</i> attribute when the database
+is created but instead by the default system locale. This means that it is
+possible to create a database with a non-default locale. In such a case, error
+messages would not be returned in the language of the database's locale but
+in the language of the default locale instead.</p>
+<note>You can override the default locale for ij with a property on the JVM.
+For more information, see the <cite><ph conref="devconrefs.dita#pub/citutilities"></ph></cite>.</note>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevresman19524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevresman19524.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevresman19524.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevresman19524.dita Tue Jun 28 15:46:15 2005
@@ -47,10 +47,6 @@
 some implementation-specific details.</p>
 <note>All of the classes described in this chapter require a Java
 2 Platform, Standard Edition, v 1.2 (J2SE) or higher environment.</note>
-<ul>
-<li><xref href="rdevresman79556.dita#rdevresman79556"></xref></li>
-<li><xref href="cdevresman78715.dita#cdevresman78715"></xref></li>
-</ul>
 </conbody>
 </concept>
 

Modified: incubator/derby/docs/trunk/src/devguide/cdevresman78715.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevresman78715.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevresman78715.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevresman78715.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 concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevresman78715">
-<title>How to use them</title>
-<prolog>
-</prolog>
-<conbody>
-<ul>
-<li><xref href="cdevresman89722.dita#cdevresman89722"/></li>
-<li><xref href="cdevresman92946.dita#cdevresman92946"/></li>
-</ul>
-</conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevspecial.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevspecial.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevspecial.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevspecial.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,16 +16,11 @@
 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="cdevspecial">
+<concept id="cdevspecial" xml:lang="en-us">
 <title>Derby server-side programming</title>
-<prolog>
-</prolog>
+<shortdesc>This section discusses special programming for <ph conref="devconrefs.dita#prod/productshortname"></ph>.</shortdesc>
 <conbody>
-<p>This chapter discusses special programming for <ph conref="devconrefs.dita#prod/productshortname"></ph> features such
-as database-side JDBC procedures and triggers.</p>
-<ul>
-<li><xref href="cdevspecial42117.dita#cdevspecial42117"/></li>
-<li><xref href="cdevspecial27163.dita#cdevspecial27163"/></li>
-</ul>
-</conbody></concept>
+<p>These features include such programming as database-side JDBC procedures
+and triggers.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevspecial27163.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevspecial27163.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevspecial27163.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevspecial27163.dita Tue Jun 28 15:46:15 2005
@@ -35,11 +35,4 @@
 provides information on defining the trigger action itself, which is only
 one aspect of creating triggers.</p>
 <p>This section refers to the <codeph>CREATE TRIGGER</codeph> statement as the <i>trigger actions</i>.</p>
-<ul>
-<li><xref href="cdevspecial53165.dita#cdevspecial53165"/></li>
-<li><xref href="cdevspecial76763.dita#cdevspecial76763"/></li>
-<li><xref href="cdevspecial67260.dita#cdevspecial67260"/></li>
-<li><xref href="cdevspecial13670.dita#cdevspecial13670"/></li>
-<li><xref href="cdevspecial49460.dita#cdevspecial49460"/></li>
-</ul>
 </conbody></concept>



Mime
View raw message