db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r159548 [12/17] - in incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ tuning/
Date Thu, 31 Mar 2005 00:27:30 GMT
Modified: incubator/derby/docs/trunk/src/devguide/tdevdeploy33704.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdeploy33704.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdeploy33704.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdeploy33704.dita Wed Mar 30 16:26:36 2005
@@ -1,66 +1,66 @@
-<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
-<task xml:lang="en-us" id="tdevdeploy33704">
-<title>Transferring read-only databases to archive (jar or zip) files</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Zip files<indexterm>databases in</indexterm></indexterm>
-<indexterm>Archiving read-only databases</indexterm>
-<indexterm>Read-only databases<indexterm>archiving to jar or
-zip files</indexterm></indexterm>
-<indexterm>Jar files<indexterm>databases in</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog><taskbody><context>
-<p>Once a database has been created in <ph conref="devconrefs.dita#prod/productshortname"></ph>, it can be stored in a
-jar or zip file and continue to be accessed by <ph conref="devconrefs.dita#prod/productshortname"></ph> in read-only mode.
-This allows a read-only database to be distributed as a single file instead
-of as multiple files within a directory and to be compressed. In fact, a jar
-or zip file can contain any number of <ph conref="devconrefs.dita#prod/productshortname"></ph> databases and can also contain
-other information not related to <ph conref="devconrefs.dita#prod/productshortname"></ph>, such as application data or
-code.</p>
-<p>You cannot store the <i>derby.properties</i> file in a
-jar or zip file.</p>
-<p>To create a jar or zip file containing one or more <ph conref="devconrefs.dita#prod/productshortname"></ph> databases:
-<ol>
-<li>Follow the instructions for creating a database for use on read-only media.
-See <xref href="tdevdeploy26887.dita#tdevdeploy26887"/>.</li>
-<li>From the directory that contains the database folder, archive the database
-directory and its contents. For example, for the database<i> sales</i> that lives in the system directory<i> C:\london</i>, issue the command from <i>london</i>. Do not issue
-the command from inside the database directory itself.</li>
-</ol></p>
-<p>For example, archive the database folder and its contents using the JAR
-program from the JDK. You can use any zip or jar tool to generate the archive.</p>
-<p>This command archives the database directory <i>sales</i> and
-its contents into a compressed jar file called <i>dbs.jar</i>.</p>
-<codeblock>cd C:\london
-jar cMf C:\dbs.jar sales</codeblock>
-<p>You can add multiple databases with jar. For example, this command puts
-the <i>sales</i> databases and the <i>boiledfood</i> database (in the subdirectory products) into the archive.</p>
-<codeblock>cd C:\london
-jar cMf C:\dbs.jar sales products\boiledfood</codeblock>
-<p>The relative paths of the database in the jar need not match their original
-relative paths. You can do this by allowing your archive tool to change the
-path, or by moving the original databases before archiving them.</p>
-<p>The archive can be compressed or uncompressed, or individual databases
-can be uncompressed or compressed if your archive tool allows it. Compressed
-databases take up a smaller amount of space on disk, depending on the data
-loaded, but are slower to access.</p>
-<p>Once the database is archived into the jar or zip file, it has no relationship
-to the original database. The original database can continue to be modified
-if desired.</p></context></taskbody></task>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
+<task xml:lang="en-us" id="tdevdeploy33704">
+<title>Transferring read-only databases to archive (jar or zip) files</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Zip files<indexterm>databases in</indexterm></indexterm>
+<indexterm>Archiving read-only databases</indexterm>
+<indexterm>Read-only databases<indexterm>archiving to jar or
+zip files</indexterm></indexterm>
+<indexterm>Jar files<indexterm>databases in</indexterm></indexterm>
+</keywords>
+</metadata>
+</prolog><taskbody><context>
+<p>Once a database has been created in <ph conref="devconrefs.dita#prod/productshortname"></ph>, it can be stored in a
+jar or zip file and continue to be accessed by <ph conref="devconrefs.dita#prod/productshortname"></ph> in read-only mode.
+This allows a read-only database to be distributed as a single file instead
+of as multiple files within a directory and to be compressed. In fact, a jar
+or zip file can contain any number of <ph conref="devconrefs.dita#prod/productshortname"></ph> databases and can also contain
+other information not related to <ph conref="devconrefs.dita#prod/productshortname"></ph>, such as application data or
+code.</p>
+<p>You cannot store the <i>derby.properties</i> file in a
+jar or zip file.</p>
+<p>To create a jar or zip file containing one or more <ph conref="devconrefs.dita#prod/productshortname"></ph> databases:
+<ol>
+<li>Follow the instructions for creating a database for use on read-only media.
+See <xref href="tdevdeploy26887.dita#tdevdeploy26887"/>.</li>
+<li>From the directory that contains the database folder, archive the database
+directory and its contents. For example, for the database<i> sales</i> that lives in the system directory<i> C:\london</i>, issue the command from <i>london</i>. Do not issue
+the command from inside the database directory itself.</li>
+</ol></p>
+<p>For example, archive the database folder and its contents using the JAR
+program from the JDK. You can use any zip or jar tool to generate the archive.</p>
+<p>This command archives the database directory <i>sales</i> and
+its contents into a compressed jar file called <i>dbs.jar</i>.</p>
+<codeblock>cd C:\london
+jar cMf C:\dbs.jar sales</codeblock>
+<p>You can add multiple databases with jar. For example, this command puts
+the <i>sales</i> databases and the <i>boiledfood</i> database (in the subdirectory products) into the archive.</p>
+<codeblock>cd C:\london
+jar cMf C:\dbs.jar sales products\boiledfood</codeblock>
+<p>The relative paths of the database in the jar need not match their original
+relative paths. You can do this by allowing your archive tool to change the
+path, or by moving the original databases before archiving them.</p>
+<p>The archive can be compressed or uncompressed, or individual databases
+can be uncompressed or compressed if your archive tool allows it. Compressed
+databases take up a smaller amount of space on disk, depending on the data
+loaded, but are slower to access.</p>
+<p>Once the database is archived into the jar or zip file, it has no relationship
+to the original database. The original database can continue to be modified
+if desired.</p></context></taskbody></task>

Propchange: incubator/derby/docs/trunk/src/devguide/tdevdeploy33704.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita Wed Mar 30 16:26:36 2005
@@ -1,48 +1,48 @@
-<?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 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>
-<prolog><metadata>
-<keywords><indexterm>Accessing read-only databases from class path</indexterm>
-<indexterm>Read-only databases<indexterm>putting in class path</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
-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
-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>
-<steps>
-<step><cmd>Set the class path 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
-following connection URLs:</cmd><info><codeblock><b>Standard syntax:</b>
-jdbc:derby:/<i>databasePathWithinArchive</i></codeblock><codeblock><b>Syntax with subsubprotocol:</b>
-jdbc:derby:classpath:/<i>databasePathWithinArchive</i></codeblock></info>
-</step>
-</steps>
-<result> <p>For example:</p><?Pub Caret?><codeblock>jdbc:derby:/products/boiledfood
-jdbc:derby:classpath:/products/boiledfood</codeblock></result>
-</taskbody>
-</task>
-<?Pub *0000001751?>
+<?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 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>
+<prolog><metadata>
+<keywords><indexterm>Accessing read-only databases from class path</indexterm>
+<indexterm>Read-only databases<indexterm>putting in class path</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
+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
+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>
+<steps>
+<step><cmd>Set the class path 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
+following connection URLs:</cmd><info><codeblock><b>Standard syntax:</b>
+jdbc:derby:/<i>databasePathWithinArchive</i></codeblock><codeblock><b>Syntax with subsubprotocol:</b>
+jdbc:derby:classpath:/<i>databasePathWithinArchive</i></codeblock></info>
+</step>
+</steps>
+<result> <p>For example:</p><?Pub Caret?><codeblock>jdbc:derby:/products/boiledfood
+jdbc:derby:classpath:/products/boiledfood</codeblock></result>
+</taskbody>
+</task>
+<?Pub *0000001751?>

Propchange: incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp12233.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp12233.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp12233.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp12233.dita Wed Mar 30 16:26:36 2005
@@ -1,30 +1,30 @@
-<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
-<task xml:lang="en-us" id="tdevdvlp12233">
-<title>Providing a user name and password</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Users<indexterm>providing a name and password for
-in connection</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog><taskbody><context>
-<p>When user authentication is enabled, an application must provide a user
-name and password. One way to do this is to use connection URL attributes (see <i>user=userName</i> and <i>password=userPassword</i>).</p>
-<codeblock>jdbc:derby:sample;user=jill;password=toFetchAPail</codeblock>
-<p>For more information, see <xref href="cdevcsecure42374.dita#cdevcsecure42374"/>.</p></context></taskbody></task>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
+<task xml:lang="en-us" id="tdevdvlp12233">
+<title>Providing a user name and password</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Users<indexterm>providing a name and password for
+in connection</indexterm></indexterm>
+</keywords>
+</metadata>
+</prolog><taskbody><context>
+<p>When user authentication is enabled, an application must provide a user
+name and password. One way to do this is to use connection URL attributes (see <i>user=userName</i> and <i>password=userPassword</i>).</p>
+<codeblock>jdbc:derby:sample;user=jill;password=toFetchAPail</codeblock>
+<p>For more information, see <xref href="cdevcsecure42374.dita#cdevcsecure42374"/>.</p></context></taskbody></task>

Propchange: incubator/derby/docs/trunk/src/devguide/tdevdvlp12233.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp14496.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp14496.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp14496.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp14496.dita Wed Mar 30 16:26:36 2005
@@ -1,35 +1,35 @@
-<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
-<task xml:lang="en-us" id="tdevdvlp14496">
-<title>Encrypting a database when you create it</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Databases<indexterm>encrypting upon creation</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog><taskbody><context>
-<p>If your environment is configured properly, you can create your database
-as an encrypted database (one in which the database is encrypted on disk).
-To do this, you use the <i>dataEncryption=true</i> attribute
-to turn on encryption and the <codeph><i>bootPassword=key</i></codeph> attribute
-to specify a key for the encryption. You can also specify an encryption provider
-and encryption algorithm other than the defaults with the <codeph><i>encryptionProvider=providerName</i></codeph> and <codeph><i>encryptionAlgorithm=algorithm </i></codeph>attributes For more information about data encryption, see <xref href="cdevcsecure24366.dita#cdevcsecure24366"/>.</p>
-<codeblock>
-jdbc:derby:encryptedDB;create=true;dataEncryption=true;
-bootPassword=DBpassword
-</codeblock></context></taskbody></task>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
+<task xml:lang="en-us" id="tdevdvlp14496">
+<title>Encrypting a database when you create it</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Databases<indexterm>encrypting upon creation</indexterm></indexterm>
+</keywords>
+</metadata>
+</prolog><taskbody><context>
+<p>If your environment is configured properly, you can create your database
+as an encrypted database (one in which the database is encrypted on disk).
+To do this, you use the <i>dataEncryption=true</i> attribute
+to turn on encryption and the <codeph><i>bootPassword=key</i></codeph> attribute
+to specify a key for the encryption. You can also specify an encryption provider
+and encryption algorithm other than the defaults with the <codeph><i>encryptionProvider=providerName</i></codeph> and <codeph><i>encryptionAlgorithm=algorithm </i></codeph>attributes For more information about data encryption, see <xref href="cdevcsecure24366.dita#cdevcsecure24366"/>.</p>
+<codeblock>
+jdbc:derby:encryptedDB;create=true;dataEncryption=true;
+bootPassword=DBpassword
+</codeblock></context></taskbody></task>

Propchange: incubator/derby/docs/trunk/src/devguide/tdevdvlp14496.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp20349.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp20349.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp20349.dita Wed Mar 30 16:26:36 2005
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
- "../dtd/task.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.
--->
-<task id="tdevdvlp20349" xml:lang="en-us">
-<title>Shutting down the system</title>
-<prolog><metadata>
-<keywords><indexterm>Restarting Derby within same JVM</indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context> <p>In an embedded environment, when an application shuts down, it
-should first shut down <ph conref="devconrefs.dita#prod/productshortname"></ph>.</p><p>If
-the application that started the embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> quits
-but leaves the JVM running, <ph conref="devconrefs.dita#prod/productshortname"></ph> continues
-to run and is available for database connections.</p><p>In an embedded system,
-the application shuts down the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
-by issuing the following JDBC call:</p><codeblock>DriverManager.getConnection("jdbc:derby:cs;shutdown=true");</codeblock><p>Shutdown
-commands always raise <i>SQLExceptions</i>.</p><p>When a <ph conref="devconrefs.dita#prod/productshortname"></ph> system
-shuts down, a message goes to the error log:</p><codeblock>Sat Jan 10 14:31:54 PDT 2004:
-Shutting down instance 80000001-00d0-8bdf-d115-000a0a0b2d00</codeblock><p>Typically,
-an application using an embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> engine
-shuts down <ph conref="devconrefs.dita#prod/productshortname"></ph> just before
-shutting itself down. However, an application can shut down <ph conref="devconrefs.dita#prod/productshortname"></ph> and
-later restart it in the same JVM session. To restart <ph conref="devconrefs.dita#prod/productshortname"></ph> successfully,
-the JVM needs to unload <i>org.apache.derby.jdbc.EmbeddedDriver</i>, so that
-it can reload it when it restarts <ph conref="devconrefs.dita#prod/productshortname"></ph>.
-(Loading the local driver starts <ph conref="devconrefs.dita#prod/productshortname"></ph>.) </p><p>You
-cannot explicitly request that the JVM unload a class, but you can ensure
-that the <i>EmbeddedDriver</i> class is unloaded by using a <codeph><i>System.gc()</i></codeph> to
-force it to garbage collect classes that are no longer needed. Running with <codeph><i>-nogc</i></codeph> or <codeph><i>-noclassgc</i></codeph> definitely <i
->prevents</i> the class from being unloaded and makes you unable to restart <ph
-conref="devconrefs.dita#prod/productshortname"></ph> in the same JVM. </p><p>It
-is also possible to shut down a single database instead of the entire <ph
-conref="devconrefs.dita#prod/productshortname"></ph> system. See <xref href="tdevdvlp40464.dita#tdevdvlp40464"></xref>.
-You can reboot a database in the same <ph conref="devconrefs.dita#prod/productshortname"></ph> session
-after shutting it down.</p></context>
-</taskbody>
-</task>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
+ "../dtd/task.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.
+-->
+<task id="tdevdvlp20349" xml:lang="en-us">
+<title>Shutting down the system</title>
+<prolog><metadata>
+<keywords><indexterm>Restarting Derby within same JVM</indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody>
+<context> <p>In an embedded environment, when an application shuts down, it
+should first shut down <ph conref="devconrefs.dita#prod/productshortname"></ph>.</p><p>If
+the application that started the embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> quits
+but leaves the JVM running, <ph conref="devconrefs.dita#prod/productshortname"></ph> continues
+to run and is available for database connections.</p><p>In an embedded system,
+the application shuts down the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
+by issuing the following JDBC call:</p><codeblock>DriverManager.getConnection("jdbc:derby:cs;shutdown=true");</codeblock><p>Shutdown
+commands always raise <i>SQLExceptions</i>.</p><p>When a <ph conref="devconrefs.dita#prod/productshortname"></ph> system
+shuts down, a message goes to the error log:</p><codeblock>Sat Jan 10 14:31:54 PDT 2004:
+Shutting down instance 80000001-00d0-8bdf-d115-000a0a0b2d00</codeblock><p>Typically,
+an application using an embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> engine
+shuts down <ph conref="devconrefs.dita#prod/productshortname"></ph> just before
+shutting itself down. However, an application can shut down <ph conref="devconrefs.dita#prod/productshortname"></ph> and
+later restart it in the same JVM session. To restart <ph conref="devconrefs.dita#prod/productshortname"></ph> successfully,
+the JVM needs to unload <i>org.apache.derby.jdbc.EmbeddedDriver</i>, so that
+it can reload it when it restarts <ph conref="devconrefs.dita#prod/productshortname"></ph>.
+(Loading the local driver starts <ph conref="devconrefs.dita#prod/productshortname"></ph>.) </p><p>You
+cannot explicitly request that the JVM unload a class, but you can ensure
+that the <i>EmbeddedDriver</i> class is unloaded by using a <codeph><i>System.gc()</i></codeph> to
+force it to garbage collect classes that are no longer needed. Running with <codeph><i>-nogc</i></codeph> or <codeph><i>-noclassgc</i></codeph> definitely <i
+>prevents</i> the class from being unloaded and makes you unable to restart <ph
+conref="devconrefs.dita#prod/productshortname"></ph> in the same JVM. </p><p>It
+is also possible to shut down a single database instead of the entire <ph
+conref="devconrefs.dita#prod/productshortname"></ph> system. See <xref href="tdevdvlp40464.dita#tdevdvlp40464"></xref>.
+You can reboot a database in the same <ph conref="devconrefs.dita#prod/productshortname"></ph> session
+after shutting it down.</p></context>
+</taskbody>
+</task>

Propchange: incubator/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp36289.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp36289.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp36289.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp36289.dita Wed Mar 30 16:26:36 2005
@@ -1,41 +1,41 @@
-<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
-<task xml:lang="en-us" id="tdevdvlp36289">
-<title>Specifying attributes in a properties object</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Attributes (URL), setting as properties</indexterm>
-<indexterm>Attributes to database connection URL<indexterm>specifying with Properties object</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog><taskbody><context>
-<p>Instead of specifying attributes on the connection URL, you can specify attributes
-as properties in a <i>Properties</i> object that you pass
-as a second argument to the <codeph><i>DriverManager.getConnection</i></codeph> method. For example, to set the user name and password:</p>
-<codeblock>Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
-
-Properties p = new Properties();
-
-p.put("user", "sa");
-
-p.put("password", "manager");
-
-
-Connection conn = DriverManager.getConnection(
-
-    "jdbc:derby:mynewDB", p);</codeblock></context></taskbody></task>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
+<task xml:lang="en-us" id="tdevdvlp36289">
+<title>Specifying attributes in a properties object</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Attributes (URL), setting as properties</indexterm>
+<indexterm>Attributes to database connection URL<indexterm>specifying with Properties object</indexterm></indexterm>
+</keywords>
+</metadata>
+</prolog><taskbody><context>
+<p>Instead of specifying attributes on the connection URL, you can specify attributes
+as properties in a <i>Properties</i> object that you pass
+as a second argument to the <codeph><i>DriverManager.getConnection</i></codeph> method. For example, to set the user name and password:</p>
+<codeblock>Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+
+Properties p = new Properties();
+
+p.put("user", "sa");
+
+p.put("password", "manager");
+
+
+Connection conn = DriverManager.getConnection(
+
+    "jdbc:derby:mynewDB", p);</codeblock></context></taskbody></task>

Propchange: incubator/derby/docs/trunk/src/devguide/tdevdvlp36289.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp38381.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp38381.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp38381.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp38381.dita Wed Mar 30 16:26:36 2005
@@ -1,54 +1,54 @@
-<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
-<task xml:lang="en-us" id="tdevdvlp38381">
-<title>Starting Derby as an embedded database</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Starting Derby<indexterm>embedded mode</indexterm></indexterm>
-<indexterm>JDBC driver (embedded)<indexterm>starting</indexterm></indexterm>
-<indexterm>Starting Derby</indexterm>
-<indexterm>Connecting to databases<indexterm>in embedded mode</indexterm></indexterm>
-<indexterm>Connecting to a database</indexterm>
-</keywords>
-</metadata>
-</prolog><taskbody><context>
-<p>To start <ph conref="devconrefs.dita#prod/productshortname"></ph>, you start the <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC driver. Starting the <ph conref="devconrefs.dita#prod/productshortname"></ph> driver
-starts up the complete <ph conref="devconrefs.dita#prod/productshortname"></ph> system within the current JVM.</p>
-<p>For example, when using the JBDC driver manager directly within Java code,
-you typically start a JDBC driver in one of two ways:</p>
-<ul>
-<li>Specify the <i>jdbc.drivers</i> system property, which
-allows users to customize the JDBC drivers used by their applications. For
-example:  
-<codeblock>
-java -Djdbc.drivers=org.apache.derby.jdbc.EmbeddedDriver <i>applicationClass
-</i></codeblock></li>
-</ul>
-<ul>
-<li>Load the class directly from Java code using the static method <i>Class.forName</i>. For example:  
-<codeblock>
-Class.forName("org.apache.derby.jdbc.EmbeddedDriver"); 
-</codeblock></li>
-</ul>
-<p>For more details, see <i>"java.sql.Driver"</i> in
-the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite><cite>.</cite></p>
-<p>Once the <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC driver class has been loaded, you can connect
-to any <ph conref="devconrefs.dita#prod/productshortname"></ph> database by passing the embedded connection URL with the appropriate
-attributes to the <i>DriverManager.getConnection</i> method.</p>
-<p>For example:</p>
-<codeblock>Connection conn = DriverManager.getConnection("jdbc:derby:sample");</codeblock></context></taskbody></task>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
+<task xml:lang="en-us" id="tdevdvlp38381">
+<title>Starting Derby as an embedded database</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Starting Derby<indexterm>embedded mode</indexterm></indexterm>
+<indexterm>JDBC driver (embedded)<indexterm>starting</indexterm></indexterm>
+<indexterm>Starting Derby</indexterm>
+<indexterm>Connecting to databases<indexterm>in embedded mode</indexterm></indexterm>
+<indexterm>Connecting to a database</indexterm>
+</keywords>
+</metadata>
+</prolog><taskbody><context>
+<p>To start <ph conref="devconrefs.dita#prod/productshortname"></ph>, you start the <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC driver. Starting the <ph conref="devconrefs.dita#prod/productshortname"></ph> driver
+starts up the complete <ph conref="devconrefs.dita#prod/productshortname"></ph> system within the current JVM.</p>
+<p>For example, when using the JBDC driver manager directly within Java code,
+you typically start a JDBC driver in one of two ways:</p>
+<ul>
+<li>Specify the <i>jdbc.drivers</i> system property, which
+allows users to customize the JDBC drivers used by their applications. For
+example:  
+<codeblock>
+java -Djdbc.drivers=org.apache.derby.jdbc.EmbeddedDriver <i>applicationClass
+</i></codeblock></li>
+</ul>
+<ul>
+<li>Load the class directly from Java code using the static method <i>Class.forName</i>. For example:  
+<codeblock>
+Class.forName("org.apache.derby.jdbc.EmbeddedDriver"); 
+</codeblock></li>
+</ul>
+<p>For more details, see <i>"java.sql.Driver"</i> in
+the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite><cite>.</cite></p>
+<p>Once the <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC driver class has been loaded, you can connect
+to any <ph conref="devconrefs.dita#prod/productshortname"></ph> database by passing the embedded connection URL with the appropriate
+attributes to the <i>DriverManager.getConnection</i> method.</p>
+<p>For example:</p>
+<codeblock>Connection conn = DriverManager.getConnection("jdbc:derby:sample");</codeblock></context></taskbody></task>

Propchange: incubator/derby/docs/trunk/src/devguide/tdevdvlp38381.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp39090.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp39090.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp39090.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp39090.dita Wed Mar 30 16:26:36 2005
@@ -1,36 +1,36 @@
-<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
-<task xml:lang="en-us" id="tdevdvlp39090">
-<title>Creating and accessing a database</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Creating a database<indexterm>using database connection
-URL attribute</indexterm></indexterm>
-<indexterm>Databases<indexterm>creating</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog><taskbody><context>
-<p>You create a database by supplying a new database name in the connection URL and
-specifying <i>create=true</i>. <ph conref="devconrefs.dita#prod/productshortname"></ph> creates a new
-database inside a new subdirectory in the system directory. This system directory
-has the same name as the new database. If you specify a partial path, it is
-relative to the system directory. You can also specify an absolute path.</p>
-<codeblock>
-jdbc:derby:<i>databaseName</i>;<ph>create=true</ph>
-</codeblock>
-<p>For more details about <i>create=true</i>, see <i>"create=true"</i> in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p></context></taskbody></task>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
+<task xml:lang="en-us" id="tdevdvlp39090">
+<title>Creating and accessing a database</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Creating a database<indexterm>using database connection
+URL attribute</indexterm></indexterm>
+<indexterm>Databases<indexterm>creating</indexterm></indexterm>
+</keywords>
+</metadata>
+</prolog><taskbody><context>
+<p>You create a database by supplying a new database name in the connection URL and
+specifying <i>create=true</i>. <ph conref="devconrefs.dita#prod/productshortname"></ph> creates a new
+database inside a new subdirectory in the system directory. This system directory
+has the same name as the new database. If you specify a partial path, it is
+relative to the system directory. You can also specify an absolute path.</p>
+<codeblock>
+jdbc:derby:<i>databaseName</i>;<ph>create=true</ph>
+</codeblock>
+<p>For more details about <i>create=true</i>, see <i>"create=true"</i> in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p></context></taskbody></task>

Propchange: incubator/derby/docs/trunk/src/devguide/tdevdvlp39090.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp40140.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp40140.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp40140.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp40140.dita Wed Mar 30 16:26:36 2005
@@ -1,31 +1,31 @@
-<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
-<task xml:lang="en-us" id="tdevdvlp40140">
-<title>Booting an encrypted database</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Encrypted databases<indexterm>booting</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog><taskbody><context>
-<p>You must specify the encryption key with the <i>bootPassword=key</i> attribute for an encrypted database when you boot it (which is the first
-time you connect to it within a JVM session or after shutting it down within
-the same JVM session). For more information about data encryption, see <xref href="cdevcsecure24366.dita#cdevcsecure24366"/>.</p>
-<codeblock>
-jdbc:derby:encryptedDB;bootPassword=DBpassword
-</codeblock></context></taskbody></task>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
+<task xml:lang="en-us" id="tdevdvlp40140">
+<title>Booting an encrypted database</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Encrypted databases<indexterm>booting</indexterm></indexterm>
+</keywords>
+</metadata>
+</prolog><taskbody><context>
+<p>You must specify the encryption key with the <i>bootPassword=key</i> attribute for an encrypted database when you boot it (which is the first
+time you connect to it within a JVM session or after shutting it down within
+the same JVM session). For more information about data encryption, see <xref href="cdevcsecure24366.dita#cdevcsecure24366"/>.</p>
+<codeblock>
+jdbc:derby:encryptedDB;bootPassword=DBpassword
+</codeblock></context></taskbody></task>

Propchange: incubator/derby/docs/trunk/src/devguide/tdevdvlp40140.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp40464.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp40464.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp40464.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp40464.dita Wed Mar 30 16:26:36 2005
@@ -1,44 +1,44 @@
-<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
-<task xml:lang="en-us" id="tdevdvlp40464">
-<title>Shutting down Derby or an individual database</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Shutting down a single database</indexterm>
-<indexterm>Shutting down Derby<indexterm>using database connection
-URL attribute</indexterm></indexterm>
-<indexterm>Databases<indexterm>shutting down individually</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog><taskbody><context>
-<p>Applications in an embedded environment shut down the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
-by specifying the <i>shutdown=true</i> attribute in the connection URL.
-To shut down the system, you do not specify a database name, and you must
-not specify any other attribute.</p>
-<codeblock>
-jdbc:derby:;<ph>shutdown=true</ph>
-</codeblock>
-<p>A successful shutdown always results in an <i>SQLException</i> to indicate that <ph conref="devconrefs.dita#prod/productshortname"></ph> has shut down and that there is no other
-exception.</p>
-<p>You can also shut down an individual database if you specify the <i>databaseName</i>. You can shut down the database of the current connection
-if you specify the default connection instead of a database name<i> </i>(within an SQL statement).</p>
-<codeblock>
-<b><b>// shutting down a database from your application</b>
-DriverManager.getConnection(
-    "jdbc:derby:sample;shutdown=true");</b>
-</codeblock></context></taskbody></task>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
+<task xml:lang="en-us" id="tdevdvlp40464">
+<title>Shutting down Derby or an individual database</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Shutting down a single database</indexterm>
+<indexterm>Shutting down Derby<indexterm>using database connection
+URL attribute</indexterm></indexterm>
+<indexterm>Databases<indexterm>shutting down individually</indexterm></indexterm>
+</keywords>
+</metadata>
+</prolog><taskbody><context>
+<p>Applications in an embedded environment shut down the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
+by specifying the <i>shutdown=true</i> attribute in the connection URL.
+To shut down the system, you do not specify a database name, and you must
+not specify any other attribute.</p>
+<codeblock>
+jdbc:derby:;<ph>shutdown=true</ph>
+</codeblock>
+<p>A successful shutdown always results in an <i>SQLException</i> to indicate that <ph conref="devconrefs.dita#prod/productshortname"></ph> has shut down and that there is no other
+exception.</p>
+<p>You can also shut down an individual database if you specify the <i>databaseName</i>. You can shut down the database of the current connection
+if you specify the default connection instead of a database name<i> </i>(within an SQL statement).</p>
+<codeblock>
+<b><b>// shutting down a database from your application</b>
+DriverManager.getConnection(
+    "jdbc:derby:sample;shutdown=true");</b>
+</codeblock></context></taskbody></task>

Propchange: incubator/derby/docs/trunk/src/devguide/tdevdvlp40464.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/getstart/cgs22227.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgs22227.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgs22227.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgs22227.dita Wed Mar 30 16:26:36 2005
@@ -1,32 +1,32 @@
-<?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.
--->
-<?Pub Caret?>
-<concept id="cgs22227" xml:lang="en-us">
-<title> Read the release notes</title>
-<prolog><metadata>
-<keywords><indexterm>Release notes</indexterm></keywords>
-</metadata></prolog>
-<conbody>
-<p>Review the <ph conref="gsconrefs.dita#prod/productshortname"></ph> release
-notes for important, late-breaking information. The release notes are in the <ph
-conref="gsconrefs.dita#prod/productshortname"></ph> base directory, which
-is the directory where you installed <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</p>
-</conbody>
-</concept>
-<?Pub *0000001377?>
+<?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.
+-->
+<?Pub Caret?>
+<concept id="cgs22227" xml:lang="en-us">
+<title> Read the release notes</title>
+<prolog><metadata>
+<keywords><indexterm>Release notes</indexterm></keywords>
+</metadata></prolog>
+<conbody>
+<p>Review the <ph conref="gsconrefs.dita#prod/productshortname"></ph> release
+notes for important, late-breaking information. The release notes are in the <ph
+conref="gsconrefs.dita#prod/productshortname"></ph> base directory, which
+is the directory where you installed <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</p>
+</conbody>
+</concept>
+<?Pub *0000001377?>

Propchange: incubator/derby/docs/trunk/src/getstart/cgs22227.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/getstart/cgs28881.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgs28881.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgs28881.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgs28881.dita Wed Mar 30 16:26:36 2005
@@ -1,28 +1,28 @@
-<?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.
--->
-<?Pub Caret?>
-<concept id="cgs28881" xml:lang="en-us">
-<title>Browse the Derby documents</title>
-<conbody>
-<p>The <ph conref="gsconrefs.dita#prod/productshortname"></ph> install package
-includes a complete documentation set. Read about the documentation in <xref
-href="cgsdocs14707.dita#cgsdocs14707"></xref>.</p>
-</conbody>
-</concept>
-<?Pub *0000001158?>
+<?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.
+-->
+<?Pub Caret?>
+<concept id="cgs28881" xml:lang="en-us">
+<title>Browse the Derby documents</title>
+<conbody>
+<p>The <ph conref="gsconrefs.dita#prod/productshortname"></ph> install package
+includes a complete documentation set. Read about the documentation in <xref
+href="cgsdocs14707.dita#cgsdocs14707"></xref>.</p>
+</conbody>
+</concept>
+<?Pub *0000001158?>

Propchange: incubator/derby/docs/trunk/src/getstart/cgs28881.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/getstart/cgs80725.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgs80725.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgs80725.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgs80725.dita Wed Mar 30 16:26:36 2005
@@ -1,46 +1,46 @@
-<?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="cgs80725" xml:lang="en-us">
-<title> Simple application</title>
-<prolog><metadata>
-<keywords><indexterm>Examples<indexterm>simple</indexterm></indexterm></keywords>
-</metadata></prolog>
-<conbody>
-<p>The simple application illustrates basic tasks such as:   <ul>
-<li>Starting <ph conref="gsconrefs.dita#prod/productshortname"></ph> </li>
-<li>Loading the <ph conref="gsconrefs.dita#prod/productshortname"></ph> JDBC
-driver</li>
-<li>Running in an embedded or a client/server environment (Network Server)</li>
-<li>Establishing a connection</li>
-<li>Turning off auto-commit</li>
-<li>Creating a table</li>
-<li>Inserting and selecting data</li>
-<li>Dropping a table</li><?Pub Caret?>
-<li>Disconnecting</li>
-<li>Shutting down a <ph conref="gsconrefs.dita#prod/productshortname"></ph> system</li>
-</ul></p>
-<p>You can find the simple application in the example.html file within the
-/demo/programs/simple directory. The example.html file explains how to run
-the simple application. You can run it in both the embedded server and the
-Network Server environments to familiarize yourself with the different configurations
-of <ph conref="gsconrefs.dita#prod/productshortname"></ph>. </p>
-<p></p>
-</conbody>
-</concept>
-<?Pub *0000002038?>
+<?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="cgs80725" xml:lang="en-us">
+<title> Simple application</title>
+<prolog><metadata>
+<keywords><indexterm>Examples<indexterm>simple</indexterm></indexterm></keywords>
+</metadata></prolog>
+<conbody>
+<p>The simple application illustrates basic tasks such as:   <ul>
+<li>Starting <ph conref="gsconrefs.dita#prod/productshortname"></ph> </li>
+<li>Loading the <ph conref="gsconrefs.dita#prod/productshortname"></ph> JDBC
+driver</li>
+<li>Running in an embedded or a client/server environment (Network Server)</li>
+<li>Establishing a connection</li>
+<li>Turning off auto-commit</li>
+<li>Creating a table</li>
+<li>Inserting and selecting data</li>
+<li>Dropping a table</li><?Pub Caret?>
+<li>Disconnecting</li>
+<li>Shutting down a <ph conref="gsconrefs.dita#prod/productshortname"></ph> system</li>
+</ul></p>
+<p>You can find the simple application in the example.html file within the
+/demo/programs/simple directory. The example.html file explains how to run
+the simple application. You can run it in both the embedded server and the
+Network Server environments to familiarize yourself with the different configurations
+of <ph conref="gsconrefs.dita#prod/productshortname"></ph>. </p>
+<p></p>
+</conbody>
+</concept>
+<?Pub *0000002038?>

Propchange: incubator/derby/docs/trunk/src/getstart/cgs80725.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/getstart/cgschoos.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgschoos.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgschoos.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgschoos.dita Wed Mar 30 16:26:36 2005
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
-<concept id="cgschoos" xml:lang="en-us">
-<title>Choosing an installer</title>
-<conbody>
-<p>You can choose between three <ph conref="gsconrefs.dita#prod/productshortname"></ph> installation
-packages. </p>
-<p><b>Windows:</b> The Windows installer provides an IBM JRE for Windows that
-you can use to run <ph conref="gsconrefs.dita#prod/productshortname"></ph>.
-This is a quick, native installer for a user that does not have any previous
-knowledge or experience with Java. The Windows installer has a footprint of
-approximately 60M.</p>
-<p><b>Linux:</b> The Linux installer provides an IBM JRE for Linux that you
-can use to run <ph conref="gsconrefs.dita#prod/productshortname"></ph>. This
-is a quick, native installer for a user that does not have any previous knowledge
-or experience with Java. The Linux installer has a footprint of approximately
-70M.</p>
-<p><b>Java:</b> The Java installer does not include a JRE and has a smaller
-footprint of approximately 15M. It provides a consistent method of installation
-across multiple platforms. You can run the Java installer on any operating
-system, including Windows and Linux. The Java installer requires that you
-already have JVM version 1.3 or later installed on your system. </p>
-<p>If you are using the Java installer and do not already have a JVM installed,
-you should contact a JVM vendor for your operating system.</p>
-<p> <note>A JRE (Java runtime environment) is a subset of the components included
-in a Java Developer Kit. A JRE contains a JVM and provides the ability to
-run Java applications. However, JREs do not include the tools and utilities
-necessary to develop applications. If you are planning to develop applications,
-you should install a Java Developer Kit.</note></p><?Pub Caret1?>
-</conbody>
-</concept>
-<?Pub *0000001953?>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
+<concept id="cgschoos" xml:lang="en-us">
+<title>Choosing an installer</title>
+<conbody>
+<p>You can choose between three <ph conref="gsconrefs.dita#prod/productshortname"></ph> installation
+packages. </p>
+<p><b>Windows:</b> The Windows installer provides an IBM JRE for Windows that
+you can use to run <ph conref="gsconrefs.dita#prod/productshortname"></ph>.
+This is a quick, native installer for a user that does not have any previous
+knowledge or experience with Java. The Windows installer has a footprint of
+approximately 60M.</p>
+<p><b>Linux:</b> The Linux installer provides an IBM JRE for Linux that you
+can use to run <ph conref="gsconrefs.dita#prod/productshortname"></ph>. This
+is a quick, native installer for a user that does not have any previous knowledge
+or experience with Java. The Linux installer has a footprint of approximately
+70M.</p>
+<p><b>Java:</b> The Java installer does not include a JRE and has a smaller
+footprint of approximately 15M. It provides a consistent method of installation
+across multiple platforms. You can run the Java installer on any operating
+system, including Windows and Linux. The Java installer requires that you
+already have JVM version 1.3 or later installed on your system. </p>
+<p>If you are using the Java installer and do not already have a JVM installed,
+you should contact a JVM vendor for your operating system.</p>
+<p> <note>A JRE (Java runtime environment) is a subset of the components included
+in a Java Developer Kit. A JRE contains a JVM and provides the ability to
+run Java applications. However, JREs do not include the tools and utilities
+necessary to develop applications. If you are planning to develop applications,
+you should install a Java Developer Kit.</note></p><?Pub Caret1?>
+</conbody>
+</concept>
+<?Pub *0000001953?>

Propchange: incubator/derby/docs/trunk/src/getstart/cgschoos.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita Wed Mar 30 16:26:36 2005
@@ -1,27 +1,27 @@
-<?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="cgsdocs14707" xml:lang="en-us">
-<title>The Derby documents</title>
-<conbody>
-<p><ph conref="gsconrefs.dita#prod/productshortname"></ph> comes with a complete
-set of documentation that describes <?Pub Caret?><ph conref="gsconrefs.dita#prod/productshortname"></ph> concepts
-and tasks, and includes reference information.</p>
-</conbody>
-</concept>
-<?Pub *0000001180?>
+<?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="cgsdocs14707" xml:lang="en-us">
+<title>The Derby documents</title>
+<conbody>
+<p><ph conref="gsconrefs.dita#prod/productshortname"></ph> comes with a complete
+set of documentation that describes <?Pub Caret?><ph conref="gsconrefs.dita#prod/productshortname"></ph> concepts
+and tasks, and includes reference information.</p>
+</conbody>
+</concept>
+<?Pub *0000001180?>

Propchange: incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/getstart/cgsinsta.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsinsta.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsinsta.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsinsta.dita Wed Mar 30 16:26:36 2005
@@ -1,27 +1,27 @@
-<?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="cgsinsta" xml:lang="en-us">
-<title>Installing and working with Derby<?Pub Caret?></title>
-<conbody>
-<p>If you are new to <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
-JDBC programming, the following topics will help you begin using the product.
-If you are an experienced JDBC programmer, see <xref href="cgsquck19524.dita#cgsquck19524"></xref>.</p>
-</conbody>
-</concept>
-<?Pub *0000001220?>
+<?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="cgsinsta" xml:lang="en-us">
+<title>Installing and working with Derby<?Pub Caret?></title>
+<conbody>
+<p>If you are new to <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
+JDBC programming, the following topics will help you begin using the product.
+If you are an experienced JDBC programmer, see <xref href="cgsquck19524.dita#cgsquck19524"></xref>.</p>
+</conbody>
+</concept>
+<?Pub *0000001220?>

Propchange: incubator/derby/docs/trunk/src/getstart/cgsinsta.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita Wed Mar 30 16:26:36 2005
@@ -1,36 +1,36 @@
-<?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="cgsinstallingderby" xml:lang="en-us">
-<title>Installing Derby</title>
-<conbody>
-<p>In order to install <ph conref="gsconrefs.dita#prod/productshortname"></ph> you
-must first download the <ph conref="gsconrefs.dita#prod/productshortname"></ph> zip
-or tar archive from the <ph conref="gsconrefs.dita#prod/productshortname"></ph> web
-site at <xref format="html" href="http://incubator.apache.org/derby/derby_downloads.html"><?Pub Caret?><ph
-conref="gsconrefs.dita#paths/pathdownload"></ph></xref>.</p>
-<p>Extract the file. The contents will be extracted into a directory named <codeph>apache-derby-10.0</codeph> that
-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
-that was generated from source code comments.</li>
-</ol></p>
-</conbody>
-</concept>
-<?Pub *0000001786?>
+<?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="cgsinstallingderby" xml:lang="en-us">
+<title>Installing Derby</title>
+<conbody>
+<p>In order to install <ph conref="gsconrefs.dita#prod/productshortname"></ph> you
+must first download the <ph conref="gsconrefs.dita#prod/productshortname"></ph> zip
+or tar archive from the <ph conref="gsconrefs.dita#prod/productshortname"></ph> web
+site at <xref format="html" href="http://incubator.apache.org/derby/derby_downloads.html"><?Pub Caret?><ph
+conref="gsconrefs.dita#paths/pathdownload"></ph></xref>.</p>
+<p>Extract the file. The contents will be extracted into a directory named <codeph>apache-derby-10.0</codeph> that
+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
+that was generated from source code comments.</li>
+</ol></p>
+</conbody>
+</concept>
+<?Pub *0000001786?>

Propchange: incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/getstart/cgsintdo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsintdo.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsintdo.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsintdo.dita Wed Mar 30 16:26:36 2005
@@ -1,35 +1,35 @@
-<?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="cgsintdo" xml:lang="en-us">
-<title>Deployment options</title>
-<conbody>
-<p>You can deploy <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
-a number of different ways:   <ul>
-<li>Embedded in a single-user Java application. <ph conref="gsconrefs.dita#prod/productshortname"></ph> can
-be almost invisible to the end user because it requires no administration
-and runs in the same Java virtual machine (JVM) as the application.</li>
-<li>Embedded in a multiuser application such as a web server, an application
-server, or a shared development environment.</li>
-<li>Embedded in a server framework. <?Pub Caret?>You can use the Network Server
-with the IBM DB2 Universal JDBC driver (see <xref href="rgslib56653.dita#rgslib56653"></xref>)
-or a server of your own choice.</li>
-</ul></p>
-</conbody>
-</concept>
-<?Pub *0000001645?>
+<?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="cgsintdo" xml:lang="en-us">
+<title>Deployment options</title>
+<conbody>
+<p>You can deploy <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
+a number of different ways:   <ul>
+<li>Embedded in a single-user Java application. <ph conref="gsconrefs.dita#prod/productshortname"></ph> can
+be almost invisible to the end user because it requires no administration
+and runs in the same Java virtual machine (JVM) as the application.</li>
+<li>Embedded in a multiuser application such as a web server, an application
+server, or a shared development environment.</li>
+<li>Embedded in a server framework. <?Pub Caret?>You can use the Network Server
+with the IBM DB2 Universal JDBC driver (see <xref href="rgslib56653.dita#rgslib56653"></xref>)
+or a server of your own choice.</li>
+</ul></p>
+</conbody>
+</concept>
+<?Pub *0000001645?>

Propchange: incubator/derby/docs/trunk/src/getstart/cgsintdo.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/getstart/cgsintro.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsintro.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsintro.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsintro.dita Wed Mar 30 16:26:36 2005
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
-<?Pub Inc?>
-<!--  
-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="cgsintro" xml:lang="en-us">
-<title>Introducing Derby</title>
-<conbody>
-<p>Welcome to <ph conref="gsconrefs.dita#prod/productshortname"></ph>! <ph
-conref="gsconrefs.dita#prod/productshortname"></ph> is a relational database
-management system (RDBMS) that is based on <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> and SQL. This section<?Pub Caret?>
-describes <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</p>
-</conbody>
-</concept>
-<?Pub *0000001335?>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
+<?Pub Inc?>
+<!--  
+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="cgsintro" xml:lang="en-us">
+<title>Introducing Derby</title>
+<conbody>
+<p>Welcome to <ph conref="gsconrefs.dita#prod/productshortname"></ph>! <ph
+conref="gsconrefs.dita#prod/productshortname"></ph> is a relational database
+management system (RDBMS) that is based on <tm tmclass="special" tmowner="Sun Microsystems, Inc."
+tmtype="tm" trademark="Java">Java</tm> and SQL. This section<?Pub Caret?>
+describes <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</p>
+</conbody>
+</concept>
+<?Pub *0000001335?>

Propchange: incubator/derby/docs/trunk/src/getstart/cgsintro.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/getstart/cgsintsr.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsintsr.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsintsr.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsintsr.dita Wed Mar 30 16:26:36 2005
@@ -1,28 +1,28 @@
-<?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">
-<?Pub Inc?>
-<concept id="cgsinstr" xml:lang="en-us">
-<title>System r<?Pub Caret?>equirements</title>
-<conbody>
-<p><ph conref="gsconrefs.dita#prod/productshortname"></ph> is a database engine
-written completely in Java; it will run in any certified Java Virtual Machine
-(JVM).</p>
-</conbody>
-</concept>
-<?Pub *0000000482?>
+<?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">
+<?Pub Inc?>
+<concept id="cgsinstr" xml:lang="en-us">
+<title>System r<?Pub Caret?>equirements</title>
+<conbody>
+<p><ph conref="gsconrefs.dita#prod/productshortname"></ph> is a database engine
+written completely in Java; it will run in any certified Java Virtual Machine
+(JVM).</p>
+</conbody>
+</concept>
+<?Pub *0000000482?>

Propchange: incubator/derby/docs/trunk/src/getstart/cgsintsr.dita
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message