db-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r844160 [1/2] - in /websites/production/db/content/derby/docs/10.8: adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Fri, 28 Dec 2012 20:22:57 GMT
Author: kmarsden
Date: Fri Dec 28 20:22:56 2012
New Revision: 844160

Log:
DERBY-5924 Tasks for 10.8.3 maintenance release 

Update 10.8.3 docs. Also corrects some issues with non-ascii characters taht were showing up as ??. Only fixes that issue for 10.8. index.html and other versions still have the problem DERBY-6023



Modified:
    websites/production/db/content/derby/docs/10.8/adminguide/derbyadmin.pdf
    websites/production/db/content/derby/docs/10.8/devguide/cdevcollation.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts14433.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts19173.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts29416.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts838850.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts839085.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevconceptssavepoints.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure24366.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure31493.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure60146.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure67151.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure866716.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure88690.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure96815.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure97760.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevdvlp27715.html
    websites/production/db/content/derby/docs/10.8/devguide/cdevdvlp51654.html
    websites/production/db/content/derby/docs/10.8/devguide/derbydev.pdf
    websites/production/db/content/derby/docs/10.8/devguide/rdevdvlp847152.html
    websites/production/db/content/derby/docs/10.8/devguide/tdevconcepts839040.html
    websites/production/db/content/derby/docs/10.8/devguide/tdevcsecurenewbootpw.html
    websites/production/db/content/derby/docs/10.8/devguide/tdevcsecurenewextkey.html
    websites/production/db/content/derby/docs/10.8/devguide/tdevcsecurenewkeyoverview.html
    websites/production/db/content/derby/docs/10.8/devguide/tdevcsecureunencrypteddb.html
    websites/production/db/content/derby/docs/10.8/devguide/tdevdvlp39090.html
    websites/production/db/content/derby/docs/10.8/devguide/tdevdvlpcollation.html
    websites/production/db/content/derby/docs/10.8/devguide/toc.html
    websites/production/db/content/derby/docs/10.8/getstart/cgsusingtoolsutils.html
    websites/production/db/content/derby/docs/10.8/getstart/common.css
    websites/production/db/content/derby/docs/10.8/getstart/commonltr.css
    websites/production/db/content/derby/docs/10.8/getstart/commonrtl.css
    websites/production/db/content/derby/docs/10.8/getstart/cwwdactivities.html
    websites/production/db/content/derby/docs/10.8/getstart/getstartderby.pdf
    websites/production/db/content/derby/docs/10.8/getstart/rgsdocs10012.html
    websites/production/db/content/derby/docs/10.8/getstart/tgsrunningdblook.html
    websites/production/db/content/derby/docs/10.8/getstart/tgsrunningij.html
    websites/production/db/content/derby/docs/10.8/getstart/tgsrunningsysinfo.html
    websites/production/db/content/derby/docs/10.8/getstart/tgssetupverify.html
    websites/production/db/content/derby/docs/10.8/getstart/twwdactivity1.html
    websites/production/db/content/derby/docs/10.8/getstart/twwdactivity1_Setup.html
    websites/production/db/content/derby/docs/10.8/getstart/twwdactivity1_overview.html
    websites/production/db/content/derby/docs/10.8/ref/refderby.pdf
    websites/production/db/content/derby/docs/10.8/ref/rrefattrib15290.html
    websites/production/db/content/derby/docs/10.8/ref/rrefattrib24612.html
    websites/production/db/content/derby/docs/10.8/ref/rrefattrib42100.html
    websites/production/db/content/derby/docs/10.8/ref/rrefattrib60346.html
    websites/production/db/content/derby/docs/10.8/ref/rrefattrib88843.html
    websites/production/db/content/derby/docs/10.8/ref/rrefattribencryptkey.html
    websites/production/db/content/derby/docs/10.8/ref/rrefattribnewbootpw.html
    websites/production/db/content/derby/docs/10.8/ref/rrefattribnewencryptkey.html
    websites/production/db/content/derby/docs/10.8/ref/rrefbuiltchar.html
    websites/production/db/content/derby/docs/10.8/ref/rrefexcept71493.html
    websites/production/db/content/derby/docs/10.8/ref/rrefjdbc27734.html
    websites/production/db/content/derby/docs/10.8/ref/rrefproper40688.html
    websites/production/db/content/derby/docs/10.8/ref/rrefsqlj1083019.html
    websites/production/db/content/derby/docs/10.8/ref/toc.html
    websites/production/db/content/derby/docs/10.8/tools/derbytools.pdf
    websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref16653.html
    websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref30679.html
    websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref36618.html
    websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref37862.html
    websites/production/db/content/derby/docs/10.8/tuning/ctunoptimzoverride.html
    websites/production/db/content/derby/docs/10.8/tuning/tuningderby.pdf

Modified: websites/production/db/content/derby/docs/10.8/adminguide/derbyadmin.pdf
==============================================================================
Binary files - no diff available.

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevcollation.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevcollation.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevcollation.html Fri Dec 28 20:22:56 2012
@@ -204,10 +204,10 @@ FRUIT ORDER BY NAME</samp> returns: <ul 
 <div class="p">The collation set for the database also impacts comparison operators
 on character data types. For example, the statement <samp class="codeph">SELECT * FROM
 FRUIT WHERE NAME &gt; 'Banana' ORDER BY NAME</samp> returns: 
-<p>????????????UCS_BASIC collation???????????? Territory-based collation<br />
-????????????????????????????????Grape????????????????????????????????????????????????????????????????Grape<br />
-????????????????????????????????Pineapple???????????????????????????????????????????????????? orange<br />
-????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pineapple</p>
+<p>      UCS_BASIC collation       Territory-based collation<br />
+                Grape                                Grape<br />
+                Pineapple                           orange<br />
+                                                          Pineapple</p>
 </div>
 
 <p>For information on creating case-insensitive databases, see

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts14433.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts14433.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts14433.html Fri Dec 28 20:22:56 2012
@@ -79,7 +79,7 @@ information.</p>
 <div class="relconcepts"><strong>Related concepts</strong><br />
 <div><a href="cdevconcepts838850.html" title="When auto-commit is disabled, you use a Connection object's commit and rollback methods to commit or roll back a transaction.">Transactions when auto-commit is disabled</a></div>
 <div><a href="cdevconcepts29416.html" title="A new connection to a Derby database is in auto-commit mode by default, as specified by the JDBC standard.">Using auto-commit</a></div>
-<div><a href="cdevconcepts839085.html" title="You should explicitly close Statements, ResultSets, and Connections when you no longer need them.">Explicitly closing Statements, ResultSets, and Connections</a></div>
+<div><a href="cdevconcepts839085.html" title="You should explicitly close Statements, ResultSets, and Connections when you no longer need them, unless you declare them in a try-with-resources statement (available in JDK 7 and after).">Explicitly closing Statements, ResultSets, and Connections</a></div>
 <div><a href="cdevconceptssavepoints.html" title="The Savepoint interface contains methods to set, release, or roll back a transaction to designated savepoints. Once a savepoint has been set, the transaction can be rolled back to that savepoint without affecting preceding work. Savepoints provide finer-grained control of transactions by marking intermediate points within a transaction.">Using savepoints</a></div>
 </div>
 <div class="reltasks"><strong>Related tasks</strong><br />

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts19173.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts19173.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts19173.html Fri Dec 28 20:22:56 2012
@@ -79,7 +79,7 @@ A new connection to a Derby database is 
 <li class="ulchildlink"><strong><a href="tdevconcepts839040.html">Turning off auto-commit</a></strong><br />
 You can disable auto-commit with the Connection class's setAutoCommit method.</li>
 <li class="ulchildlink"><strong><a href="cdevconcepts839085.html">Explicitly closing Statements, ResultSets, and Connections</a></strong><br />
-You should explicitly close Statements, ResultSets, and Connections when you no longer need them.</li>
+You should explicitly close Statements, ResultSets, and Connections when you no longer need them, unless you declare them in a try-with-resources statement (available in JDK 7 and after).</li>
 <li class="ulchildlink"><strong><a href="cdevconcepts14433.html">Statement versus transaction runtime rollback</a></strong><br />
 When an SQL statement generates an exception, this exception results in a runtime rollback. A runtime rollback is a system-generated rollback of a statement or transaction by Derby, as opposed to an explicit rollback call from your application.</li>
 <li class="ulchildlink"><strong><a href="cdevconceptssavepoints.html">Using savepoints</a></strong><br />

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts29416.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts29416.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts29416.html Fri Dec 28 20:22:56 2012
@@ -199,7 +199,7 @@ isolation mode and table-level locking.<
 </div>
 <div class="relconcepts"><strong>Related concepts</strong><br />
 <div><a href="cdevconcepts838850.html" title="When auto-commit is disabled, you use a Connection object's commit and rollback methods to commit or roll back a transaction.">Transactions when auto-commit is disabled</a></div>
-<div><a href="cdevconcepts839085.html" title="You should explicitly close Statements, ResultSets, and Connections when you no longer need them.">Explicitly closing Statements, ResultSets, and Connections</a></div>
+<div><a href="cdevconcepts839085.html" title="You should explicitly close Statements, ResultSets, and Connections when you no longer need them, unless you declare them in a try-with-resources statement (available in JDK 7 and after).">Explicitly closing Statements, ResultSets, and Connections</a></div>
 <div><a href="cdevconcepts14433.html" title="When an SQL statement generates an exception, this exception results in a runtime rollback. A runtime rollback is a system-generated rollback of a statement or transaction by Derby, as opposed to an explicit rollback call from your application.">Statement versus transaction runtime rollback</a></div>
 <div><a href="cdevconcepts41275.html" title="A result set maintains a cursor, which points to its current row of data. It can be used to step through and process the rows one by one.">Result set and cursor mechanisms</a></div>
 <div><a href="cdevconceptssavepoints.html" title="The Savepoint interface contains methods to set, release, or roll back a transaction to designated savepoints. Once a savepoint has been set, the transaction can be rolled back to that savepoint without affecting preceding work. Savepoints provide finer-grained control of transactions by marking intermediate points within a transaction.">Using savepoints</a></div>

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts838850.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts838850.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts838850.html Fri Dec 28 20:22:56 2012
@@ -79,7 +79,7 @@ whether or not these objects were create
 </div>
 <div class="relconcepts"><strong>Related concepts</strong><br />
 <div><a href="cdevconcepts29416.html" title="A new connection to a Derby database is in auto-commit mode by default, as specified by the JDBC standard.">Using auto-commit</a></div>
-<div><a href="cdevconcepts839085.html" title="You should explicitly close Statements, ResultSets, and Connections when you no longer need them.">Explicitly closing Statements, ResultSets, and Connections</a></div>
+<div><a href="cdevconcepts839085.html" title="You should explicitly close Statements, ResultSets, and Connections when you no longer need them, unless you declare them in a try-with-resources statement (available in JDK 7 and after).">Explicitly closing Statements, ResultSets, and Connections</a></div>
 <div><a href="cdevconcepts14433.html" title="When an SQL statement generates an exception, this exception results in a runtime rollback. A runtime rollback is a system-generated rollback of a statement or transaction by Derby, as opposed to an explicit rollback call from your application.">Statement versus transaction runtime rollback</a></div>
 <div><a href="cdevconceptssavepoints.html" title="The Savepoint interface contains methods to set, release, or roll back a transaction to designated savepoints. Once a savepoint has been set, the transaction can be rolled back to that savepoint without affecting preceding work. Savepoints provide finer-grained control of transactions by marking intermediate points within a transaction.">Using savepoints</a></div>
 </div>

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts839085.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts839085.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevconcepts839085.html Fri Dec 28 20:22:56 2012
@@ -26,8 +26,8 @@
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="concept" name="DC.Type" />
 <meta name="DC.Title" content="Explicitly closing Statements, ResultSets, and Connections" />
-<meta name="abstract" content="You should explicitly close Statements, ResultSets, and Connections when you no longer need them." />
-<meta name="description" content="You should explicitly close Statements, ResultSets, and Connections when you no longer need them." />
+<meta name="abstract" content="You should explicitly close Statements, ResultSets, and Connections when you no longer need them, unless you declare them in a try-with-resources statement (available in JDK 7 and after)." />
+<meta name="description" content="You should explicitly close Statements, ResultSets, and Connections when you no longer need them, unless you declare them in a try-with-resources statement (available in JDK 7 and after)." />
 <meta content="Explicit close of JDBC objects" name="DC.subject" />
 <meta content="Explicit close of JDBC objects" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="cdevconcepts838850.html" />
@@ -49,17 +49,51 @@
 
 
 
-<div><p>You should explicitly close <em>Statements</em>, <samp class="codeph"><em>ResultSets,</em></samp> and <samp class="codeph"><em>Connections</em></samp> when
-you no longer need them.</p>
+<div><p>You should explicitly close <samp class="codeph"><em>Statements</em></samp>,
+<samp class="codeph"><em>ResultSets</em></samp>, and <samp class="codeph"><em>Connections</em></samp> when
+you no longer need them, unless you declare them in a
+<samp class="codeph"><em>try</em></samp>-with-resources statement (available in JDK 7 and
+after).</p>
 
 <p>Connections to <span>Derby</span> are
 resources external to an application, and the garbage collector will not close
 them automatically. </p>
 
-<p>For example, close a <em>Statement</em> object using its <samp class="codeph"><em>close</em></samp> method;
-close a <samp class="codeph"><em>Connection</em></samp> object using its <samp class="codeph"><em>close</em></samp> method.
-If auto-commit is disabled, active transactions need to be explicitly committed
-or rolled back before closing the connection</p>
+<p>To close a <samp class="codeph"><em>Statement</em></samp>,
+<samp class="codeph"><em>ResultSet</em></samp>, or <samp class="codeph"><em>Connection</em></samp> object
+that is not declared in a <samp class="codeph"><em>try</em></samp>-with-resources statement,
+use its <samp class="codeph"><em>close</em></samp> method. If auto-commit is disabled, you
+must explicitly commit or roll back active transactions before you close the
+connection.</p>
+
+<p>Statements, result sets, and connections extend
+<samp class="codeph"><em>AutoCloseable</em></samp> in JDK 7 and after. If you declare a
+connection in a <samp class="codeph"><em>try</em></samp>-with-resources statement and there
+is an error that the code does not catch, the JRE will attempt to close the
+connection automatically.</p>
+
+<p>Note that a transaction-severity or higher exception causes
+<span>Derby</span> to abort an in-flight
+transaction. But a statement-severity exception does NOT roll back the
+transaction. Also note that
+<span>Derby</span> throws an exception if
+an attempt is made to close a connection with an in-flight transaction. Suppose
+now that a <samp class="codeph"><em>Connection</em></samp> is declared in a 
+<samp class="codeph"><em>try</em></samp>-with-resources statement, a transaction is
+in-flight, and an unhandled statement-severity error occurs inside the
+<samp class="codeph"><em>try</em></samp>-with-resources block. In this situation,
+<span>Derby</span> will raise a follow-on
+exception as the JRE exits the <em>try</em>-with-resources block. (For details on
+error severity levels, see the documentation of the
+<samp class="codeph"><em>derby.stream.error.logSeverityLevel</em></samp> property in the
+<span><em>Derby Reference Manual</em></span>.)</p>
+
+<p>It is therefore always best to catch errors inside the
+<samp class="codeph"><em>try</em></samp>-with-resources block and to either roll back or
+commit, as appropriate, to ensure that there is no pending transaction when
+leaving the <samp class="codeph"><em>try</em></samp>-with-resources block. This action also
+improves application portability, since DBMSs differ in their semantics when
+trying to close a connection with a pending transaction.</p>
 
 </div>
 

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevconceptssavepoints.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevconceptssavepoints.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevconceptssavepoints.html Fri Dec 28 20:22:56 2012
@@ -119,7 +119,7 @@ savepoint).</p>
 <div class="relconcepts"><strong>Related concepts</strong><br />
 <div><a href="cdevconcepts838850.html" title="When auto-commit is disabled, you use a Connection object's commit and rollback methods to commit or roll back a transaction.">Transactions when auto-commit is disabled</a></div>
 <div><a href="cdevconcepts29416.html" title="A new connection to a Derby database is in auto-commit mode by default, as specified by the JDBC standard.">Using auto-commit</a></div>
-<div><a href="cdevconcepts839085.html" title="You should explicitly close Statements, ResultSets, and Connections when you no longer need them.">Explicitly closing Statements, ResultSets, and Connections</a></div>
+<div><a href="cdevconcepts839085.html" title="You should explicitly close Statements, ResultSets, and Connections when you no longer need them, unless you declare them in a try-with-resources statement (available in JDK 7 and after).">Explicitly closing Statements, ResultSets, and Connections</a></div>
 <div><a href="cdevconcepts14433.html" title="When an SQL statement generates an exception, this exception results in a runtime rollback. A runtime rollback is a system-generated rollback of a statement or transaction by Derby, as opposed to an explicit rollback call from your application.">Statement versus transaction runtime rollback</a></div>
 </div>
 <div class="reltasks"><strong>Related tasks</strong><br />

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure24366.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure24366.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure24366.html Fri Dec 28 20:22:56 2012
@@ -30,8 +30,6 @@
 <meta name="description" content="Derby provides a way for you to encrypt your data on disk." />
 <meta content="Database encryption, Databases, encrypting" name="DC.subject" />
 <meta content="Database encryption, Databases, encrypting" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="tdevdvlp14496.html" />
-<meta scheme="URI" name="DC.Relation" content="tdevdvlp40140.html" />
 <meta scheme="URI" name="DC.Relation" content="cdevcsecure12392.html" />
 <meta scheme="URI" name="DC.Relation" content="cdevcsecure42374.html" />
 <meta scheme="URI" name="DC.Relation" content="cdevcsecure37241.html" />
@@ -72,7 +70,8 @@ number of ways, including transport over
 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>
+an encrypted form. The user who boots the database must provide a boot password
+or encryption key.</p>
 
 <div class="note"><span class="notetitle">Note: </span>Jar files stored in the database are not encrypted.</div>
 
@@ -99,10 +98,6 @@ This section describes using encryption 
 <div><a href="cdevcsecure51876.html" title="This section provides examples on using user authentication and authorization in Derby in either a client/server environment or in an embedded environment.">User authentication and authorization examples</a></div>
 <div><a href="cdevcbabejdfj.html" title="When running within an application or application server with a Java 2 Security Manager enabled, Derby must be granted certain permissions to execute and access database files.">Running Derby under a security manager</a></div>
 </div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tdevdvlp14496.html" title="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 dataEncryption=true attribute to turn on encryption and the bootPassword=key attribute or the encryptionKey attribute to specify a key for the encryption.">Encrypting a database when you create it</a></div>
-<div><a href="tdevdvlp40140.html" title="You must specify several attributes in the URL when you boot an encrypted database. You must specify these attributes the first time that you connect to the database within a JVM session, or after you shut the database down within the same JVM session.">Booting an encrypted database</a></div>
-</div>
 </div>
 
 </body>

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure31493.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure31493.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure31493.html Fri Dec 28 20:22:56 2012
@@ -47,35 +47,33 @@
 
 
 <div><p>You can specify an alternate provider when you create the database
-with the <samp class="codeph"><em>encryptionProvider=providerName</em></samp> attribute.</p>
+with the <em>encryptionProvider=providerName</em> 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 classpath.</p>
 
-
-<pre><strong>-- using the the provider library jce_jdk13-10b4.zip|
+<pre><strong>-- using the the provider library bcprov-jdk15on-147.jar
 -- available from www.bouncycastle.org</strong>
 jdbc:derby:encryptedDB3;create=true;dataEncryption=true;
 bootPassword=clo760uds2caPe;
 encryptionProvider=org.bouncycastle.jce.provider.BouncyCastleProvider;
 encryptionAlgorithm=DES/CBC/NoPadding
 
-<strong>-- using a provider
--- available from
--- http://jcewww.iaik.tu-graz.ac.at/download.html</strong>
+<strong>-- using a provider available from
+-- http://jce.iaik.tugraz.at/sic/Download</strong>
 jdbc:derby:encryptedDB3;create=true;dataEncryption=true;
 bootPassword=clo760uds2caPe;
-encryptionProvider=iaik.security.provider.IAIK;encryptionAlgorithm=
-DES/CBC/NoPadding</pre>
+encryptionProvider=iaik.security.provider.IAIK;
+encryptionAlgorithm=DES/CBC/NoPadding</pre>
 
 </div>
 
 <div>
 <div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="cdevcsecure866716.html" title="When you encrypt a database you must also specify a boot password, which is an alpha-numeric string used to generate the encryption key.">Creating the boot password</a></div>
+<div class="parentlink"><strong>Parent topic:</strong> <a href="cdevcsecure866716.html" title="When you encrypt a database you usually specify a boot password, which is an alphanumeric string used to generate the encryption key. (You can also specify an encryption key directly.)">Creating a boot password</a></div>
 </div>
 <div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cdevcsecure88690.html" title="You configure a Derby database for encryption when you create the database by specifying the dataEncryption=true attribute on the connection URL.">Encrypting databases on creation</a></div>
+<div><a href="cdevcsecure88690.html" title="You configure a Derby database for encryption when you create the database by specifying attributes on the connection URL.">Encrypting databases on creation</a></div>
 <div><a href="cdevcsecure67151.html" title="Derby supports the following encryption algorithms.">Specifying an alternate encryption algorithm</a></div>
 </div>
 </div>

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure60146.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure60146.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure60146.html Fri Dec 28 20:22:56 2012
@@ -26,8 +26,8 @@
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="concept" name="DC.Type" />
 <meta name="DC.Title" content="Booting an encrypted database" />
-<meta name="abstract" content="If you create an encrypted database using the bootPassword attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey attribute, you must specify the encryptionKey to reboot the database." />
-<meta name="description" content="If you create an encrypted database using the bootPassword attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey attribute, you must specify the encryptionKey to reboot the database." />
+<meta name="abstract" content="If you create an encrypted database using the bootPassword=key attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey=key attribute, you must specify the encryption key to reboot the database." />
+<meta name="description" content="If you create an encrypted database using the bootPassword=key attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey=key attribute, you must specify the encryption key to reboot the database." />
 <meta content="encrypted databases, booting" name="DC.subject" />
 <meta content="encrypted databases, booting" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="cdevcsecure88690.html" />
@@ -49,18 +49,18 @@
 
 
 
-<div><p>If you create an encrypted database using the <em>bootPassword</em> attribute,
-you must specify the boot password to reboot the database. If you create an
-encrypted database using the <em>encryptionKey</em> attribute, you must specify
-the <em>encryptionKey</em> to reboot the database.</p>
+<div><p>If you create an encrypted database using the <em>bootPassword=key</em>
+attribute, you must specify the boot password to reboot the database. If you
+create an encrypted database using the <em>encryptionKey=key</em> attribute, you
+must specify the encryption key to reboot the database.</p>
 
 <p>Encrypted databases cannot be booted automatically along with all other
 system databases on system startup (see "<em>derby.system.bootAll</em>" in the
-<span><em>Derby Reference Manual</em></span>). Instead, you boot encrypted
-databases when you first connect to the database.</p>
+<span><em>Derby Reference Manual</em></span>). Instead, you boot an encrypted
+database when you first connect to the database.</p>
 
 <div class="p"><dl>
-<dt class="dlterm">Booting a database with the <em>bootPassword</em> attribute</dt>
+<dt class="dlterm">Booting a database with the <em>bootPassword=key</em> attribute</dt>
 
 <dd>To access an encrypted database called <samp class="codeph">wombat</samp> that was
 created with the boot password <samp class="codeph">clo760uds2caPe</samp>, use the following
@@ -68,13 +68,14 @@ connection URL:<pre>jdbc:derby:wombat;bo
 </dd>
 
 
-<dt class="dlterm">Booting a database with the <em>encryptionKey</em> attribute</dt>
+<dt class="dlterm">Booting a database with the <em>encryptionKey=key</em> attribute</dt>
 
 <dd>To access an encrypted database called <samp class="codeph">flintstone</samp> that
-was created with the <samp class="codeph">encryptionKey=c566bab9ee8b62a5ddb4d9229224c678</samp> and
-with the <samp class="codeph">encryptionAlgorithm=AES/CBC/NoPadding</samp>, use the following
-connection URL:   <pre>jdbc:derby:flintstone;encryptionAlgorithm=AES/CBC/NoPadding;
-encryptionKey=c566bab9ee8b62a5ddb4d9229224c678  </pre>
+was created with the attributes
+<samp class="codeph">encryptionKey=c566bab9ee8b62a5ddb4d9229224c678</samp> and
+<samp class="codeph">encryptionAlgorithm=AES/CBC/NoPadding</samp>, use the following
+connection URL:
+<pre>jdbc:derby:flintstone;encryptionKey=c566bab9ee8b62a5ddb4d9229224c678</pre>
 </dd>
 
 </dl>
@@ -109,13 +110,13 @@ after it has been booted, turn on user a
 <div class="parentlink"><strong>Parent topic:</strong> <a href="cdevcsecure97760.html" title="This section describes using encryption in Derby.">Working with encryption</a></div>
 </div>
 <div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cdevcsecure88690.html" title="You configure a Derby database for encryption when you create the database by specifying the dataEncryption=true attribute on the connection URL.">Encrypting databases on creation</a></div>
-<div><a href="cdevcsecure866716.html" title="When you encrypt a database you must also specify a boot password, which is an alpha-numeric string used to generate the encryption key.">Creating the boot password</a></div>
+<div><a href="cdevcsecure88690.html" title="You configure a Derby database for encryption when you create the database by specifying attributes on the connection URL.">Encrypting databases on creation</a></div>
+<div><a href="cdevcsecure866716.html" title="When you encrypt a database you usually specify a boot password, which is an alphanumeric string used to generate the encryption key. (You can also specify an encryption key directly.)">Creating a boot password</a></div>
 </div>
 <div class="reltasks"><strong>Related tasks</strong><br />
 <div><a href="tdevcsecureunencrypteddb.html" title="You can encrypt an unencrypted Derby database by specifying attributes on the connection URL when you boot the database. The attributes that you specify depend on how you want the database encrypted.">Encrypting an existing unencrypted database</a></div>
-<div><a href="tdevcsecurenewbootpw.html" title="You can apply a new boot password to a Derby database by specifying the newBootPassword attribute on the connection URL when you boot the database.">Encrypting databases with a new boot password</a></div>
-<div><a href="tdevcsecurenewextkey.html" title="You can apply a new external encryption key to a Derby database by specifying the newEncryptionKey attribute on the connection URL when you boot the database.">Encrypting databases with a new external encryption key</a></div>
+<div><a href="tdevcsecurenewbootpw.html" title="You can apply a new boot password to a Derby database by specifying the newBootPassword=newPassword attribute on the connection URL when you boot the database.">Encrypting databases with a new boot password</a></div>
+<div><a href="tdevcsecurenewextkey.html" title="You can apply a new external encryption key to a Derby database by specifying the newEncryptionKey=key attribute on the connection URL when you boot the database.">Encrypting databases with a new external encryption key</a></div>
 </div>
 </div>
 

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure67151.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure67151.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure67151.html Fri Dec 28 20:22:56 2012
@@ -104,8 +104,8 @@ is not supported by the provider you hav
 an exception.</p>
 
 <p>To specify the AES encryption algorithm with a key length other than the
-default of 128, specify the <em>encryptionKeyLength</em> attribute. For example,
-you might specify the following connection attributes:</p>
+default of 128, specify the <em>encryptionKeyLength=length</em> attribute. For
+example, you might specify the following connection attributes:</p>
 
 <pre>
 jdbc:derby:encdbcbc_192;create=true;dataEncryption=true;
@@ -123,10 +123,10 @@ length using the default policy jar file
 
 <div>
 <div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="cdevcsecure866716.html" title="When you encrypt a database you must also specify a boot password, which is an alpha-numeric string used to generate the encryption key.">Creating the boot password</a></div>
+<div class="parentlink"><strong>Parent topic:</strong> <a href="cdevcsecure866716.html" title="When you encrypt a database you usually specify a boot password, which is an alphanumeric string used to generate the encryption key. (You can also specify an encryption key directly.)">Creating a boot password</a></div>
 </div>
 <div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cdevcsecure88690.html" title="You configure a Derby database for encryption when you create the database by specifying the dataEncryption=true attribute on the connection URL.">Encrypting databases on creation</a></div>
+<div><a href="cdevcsecure88690.html" title="You configure a Derby database for encryption when you create the database by specifying attributes on the connection URL.">Encrypting databases on creation</a></div>
 <div><a href="cdevcsecure31493.html" title="You can specify an alternate provider when you create the database with the encryptionProvider=providerName attribute.">Specifying an alternate encryption provider</a></div>
 </div>
 </div>

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure866716.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure866716.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure866716.html Fri Dec 28 20:22:56 2012
@@ -25,9 +25,9 @@
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Creating the boot password" />
-<meta name="abstract" content="When you encrypt a database you must also specify a boot password, which is an alpha-numeric string used to generate the encryption key." />
-<meta name="description" content="When you encrypt a database you must also specify a boot password, which is an alpha-numeric string used to generate the encryption key." />
+<meta name="DC.Title" content="Creating a boot password" />
+<meta name="abstract" content="When you encrypt a database you usually specify a boot password, which is an alphanumeric string used to generate the encryption key. (You can also specify an encryption key directly.)" />
+<meta name="description" content="When you encrypt a database you usually specify a boot password, which is an alphanumeric string used to generate the encryption key. (You can also specify an encryption key directly.)" />
 <meta scheme="URI" name="DC.Relation" content="cdevcsecure88690.html" />
 <meta scheme="URI" name="DC.Relation" content="cdevcsecure60146.html" />
 <meta scheme="URI" name="DC.Relation" content="cdevcsecure97760.html" />
@@ -37,17 +37,18 @@
 <meta content="cdevcsecure866716" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
 <link href="commonltr.css" type="text/css" rel="stylesheet" />
-<title>Creating the boot password</title>
+<title>Creating a boot password</title>
 </head>
 <body id="cdevcsecure866716"><a name="cdevcsecure866716"><!-- --></a>
 
 
-<h1 class="topictitle1">Creating the boot password</h1>
+<h1 class="topictitle1">Creating a boot password</h1>
 
 
 
-<div><p>When you encrypt a database you must also specify a boot password,
-which is an alpha-numeric string used to generate the encryption key.</p>
+<div><p>When you encrypt a database you usually specify a boot password,
+which is an alphanumeric string used to generate the encryption key. (You can
+also specify an encryption key directly.)</p>
 
 <p>The length of the encryption key depends on the algorithm used:</p>
 
@@ -67,18 +68,19 @@ of bytes in the encryption key (56 bits=
 bytes). The minimum number of characters for the boot password allowed by <span>Derby</span> is eight.</div>
 
 <p>It is a good idea not to use words that would be easily guessed, such as
-a login name or simple words or numbers. A <em>bootPassword</em>, like any password,
-should be a mix of numbers and upper- and lowercase letters.</p>
+a login name or simple words or numbers. A boot password, like any password,
+should be a mix of numbers and uppercase and lowercase letters.</p>
 
 <p>You turn on and configure encryption and specify the corresponding boot
 password on the connection URL for a database when you create it:</p>
 
 <pre>jdbc:derby:encryptionDB1;create=true;dataEncryption=true;
-    bootPassword=clo760uds2caPe</pre>
+bootPassword=clo760uds2caPe</pre>
 
-<div class="note"><span class="notetitle">Note: </span>If you lose the <em>bootPassword</em> and the database is not currently
+<div class="note"><span class="notetitle">Note: </span>If you lose the boot password and the database is not currently
 booted, you will not be able to connect to the database anymore. (If you know
-the current <em>bootPassword</em>, you can change it. See <a href="tdevcsecurenewkeyoverview.html">Encrypting databases with a new key</a>.)</div>
+the current boot password, you can change it. See
+<a href="tdevcsecurenewkeyoverview.html">Encrypting databases with a new key</a>.)</div>
 
 </div>
 
@@ -94,8 +96,8 @@ Derby supports the following encryption 
 <div class="parentlink"><strong>Parent topic:</strong> <a href="cdevcsecure97760.html" title="This section describes using encryption in Derby.">Working with encryption</a></div>
 </div>
 <div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cdevcsecure88690.html" title="You configure a Derby database for encryption when you create the database by specifying the dataEncryption=true attribute on the connection URL.">Encrypting databases on creation</a></div>
-<div><a href="cdevcsecure60146.html" title="If you create an encrypted database using the bootPassword attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey attribute, you must specify the encryptionKey to reboot the database.">Booting an encrypted database</a></div>
+<div><a href="cdevcsecure88690.html" title="You configure a Derby database for encryption when you create the database by specifying attributes on the connection URL.">Encrypting databases on creation</a></div>
+<div><a href="cdevcsecure60146.html" title="If you create an encrypted database using the bootPassword=key attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey=key attribute, you must specify the encryption key to reboot the database.">Booting an encrypted database</a></div>
 </div>
 </div>
 

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure88690.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure88690.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure88690.html Fri Dec 28 20:22:56 2012
@@ -26,8 +26,8 @@
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="concept" name="DC.Type" />
 <meta name="DC.Title" content="Encrypting databases on creation" />
-<meta name="abstract" content="You configure a Derby database for encryption when you create the database by specifying the dataEncryption=true attribute on the connection URL." />
-<meta name="description" content="You configure a Derby database for encryption when you create the database by specifying the dataEncryption=true attribute on the connection URL." />
+<meta name="abstract" content="You configure a Derby database for encryption when you create the database by specifying attributes on the connection URL." />
+<meta name="description" content="You configure a Derby database for encryption when you create the database by specifying attributes on the connection URL." />
 <meta content="encrypting databases, on creation, databases, encrypting, on creation" name="DC.subject" />
 <meta content="encrypting databases, on creation, databases, encrypting, on creation" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="cdevcsecure866716.html" />
@@ -49,23 +49,40 @@
 
 
 
-<div><p>You configure a <span>Derby</span> database
-for encryption when you create the database by specifying the <em>dataEncryption=true</em> attribute
-on the connection URL.</p>
-
-<p> The Java Runtime Environment (JRE) determines the default encryption provider,
-as follows:</p>
+<div><p>You configure a
+<span>Derby</span> database for encryption
+when you create the database by specifying attributes on the connection URL.</p>
 
 <ul>
-<li>For J2SE/J2EE 1.4 or higher, the JRE's provider is the default.</li>
+<li>To enable encryption, use the <em>dataEncryption=true</em> attribute.</li>
+
+<li>To provide a key for the encryption, specify either the
+<em>bootPassword=key</em> attribute or the <em>encryptionKey=key</em>
+attribute.</li>
 
-<li>If your environment for some reason does not include a provider, it must be specified.</li>
- 
 </ul>
 
-<p>You have the option of specifying an alternate encryption provider. The
-default encryption algorithm is DES, but you have the option of specifying
-an alternate algorithm as well. See <a href="cdevcsecure31493.html#cdevcsecure31493">Specifying an alternate encryption provider</a></p>
+<p>The following connection URL specifies a boot password:</p>
+
+<pre>jdbc:derby:encryptedDB;create=true;dataEncryption=true;
+bootPassword=DBpassword</pre>
+
+<div class="p">The following URL specifies an encryption key:
+<pre>jdbc:derby:encryptedDB;create=true;dataEncryption=true;
+encryptionKey=6162636465666768</pre>
+</div>
+
+<p>The default encryption algorithm is DES.</p>
+
+<p>You can specify an encryption provider and/or encryption algorithm
+other than the defaults by using the <em>encryptionProvider=providerName</em> and
+<em>encryptionAlgorithm=algorithm</em> attributes. See
+<a href="cdevcsecure31493.html#cdevcsecure31493">Specifying an alternate encryption provider</a> and
+<a href="cdevcsecure67151.html#cdevcsecure67151">Specifying an alternate encryption algorithm</a> for more
+information.</p>
+
+<p>See the <span><em>Derby Reference Manual</em></span> for details on the
+connection URL attributes.</p>
 
 </div>
 
@@ -74,8 +91,8 @@ an alternate algorithm as well. See <a h
 <div class="parentlink"><strong>Parent topic:</strong> <a href="cdevcsecure97760.html" title="This section describes using encryption in Derby.">Working with encryption</a></div>
 </div>
 <div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cdevcsecure866716.html" title="When you encrypt a database you must also specify a boot password, which is an alpha-numeric string used to generate the encryption key.">Creating the boot password</a></div>
-<div><a href="cdevcsecure60146.html" title="If you create an encrypted database using the bootPassword attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey attribute, you must specify the encryptionKey to reboot the database.">Booting an encrypted database</a></div>
+<div><a href="cdevcsecure866716.html" title="When you encrypt a database you usually specify a boot password, which is an alphanumeric string used to generate the encryption key. (You can also specify an encryption key directly.)">Creating a boot password</a></div>
+<div><a href="cdevcsecure60146.html" title="If you create an encrypted database using the bootPassword=key attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey=key attribute, you must specify the encryption key to reboot the database.">Booting an encrypted database</a></div>
 <div><a href="cdevcsecure31493.html" title="You can specify an alternate provider when you create the database with the encryptionProvider=providerName attribute.">Specifying an alternate encryption provider</a></div>
 <div><a href="cdevcsecure67151.html" title="Derby supports the following encryption algorithms.">Specifying an alternate encryption algorithm</a></div>
 </div>

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure96815.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure96815.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure96815.html Fri Dec 28 20:22:56 2012
@@ -50,12 +50,22 @@
 <p>
 <span>Derby</span> supports disk
 encryption and requires an encryption provider. An encryption provider
-implements the Java cryptography concepts. The JRE for Java SE 1.4 and
-higher includes Java Cryptographic Extensions (JCE, part of the
+implements the Java cryptography concepts. The Java Runtime Environment (JRE)
+for Java SE includes Java Cryptographic Extensions (JCE, part of the
 Java Cryptography Architecture) and one or more default encryption providers.
 For more information, see the <em><a href="http://download.oracle.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html" target="_blank">Java Cryptography Architecture (JCA) Reference Guide</a></em>.
 </p>
 
+<p> The JRE determines the default encryption provider as follows:</p>
+
+<ul>
+<li>The JRE's provider is the default.</li>
+
+<li>If your environment for some reason does not include a provider, it must be
+specified.</li>
+
+</ul>
+
 </div>
 
 <div>
@@ -68,8 +78,8 @@ For more information, see the <em><a hre
 <div class="reltasks"><strong>Related tasks</strong><br />
 <div><a href="tdevcsecureunencrypteddb.html" title="You can encrypt an unencrypted Derby database by specifying attributes on the connection URL when you boot the database. The attributes that you specify depend on how you want the database encrypted.">Encrypting an existing unencrypted database</a></div>
 <div><a href="tdevcsecurenewkeyoverview.html" title="You can apply a new encryption key to a Derby database by specifying a new boot password or a new external key.">Encrypting databases with a new key</a></div>
-<div><a href="tdevcsecurenewbootpw.html" title="You can apply a new boot password to a Derby database by specifying the newBootPassword attribute on the connection URL when you boot the database.">Encrypting databases with a new boot password</a></div>
-<div><a href="tdevcsecurenewextkey.html" title="You can apply a new external encryption key to a Derby database by specifying the newEncryptionKey attribute on the connection URL when you boot the database.">Encrypting databases with a new external encryption key</a></div>
+<div><a href="tdevcsecurenewbootpw.html" title="You can apply a new boot password to a Derby database by specifying the newBootPassword=newPassword attribute on the connection URL when you boot the database.">Encrypting databases with a new boot password</a></div>
+<div><a href="tdevcsecurenewextkey.html" title="You can apply a new external encryption key to a Derby database by specifying the newEncryptionKey=key attribute on the connection URL when you boot the database.">Encrypting databases with a new external encryption key</a></div>
 </div>
 </div>
 

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure97760.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure97760.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevcsecure97760.html Fri Dec 28 20:22:56 2012
@@ -56,15 +56,15 @@
 <div>
 <ul class="ullinks">
 <li class="ulchildlink"><strong><a href="cdevcsecure88690.html">Encrypting databases on creation</a></strong><br />
-You configure a Derby database for encryption when you create the database by specifying the dataEncryption=true attribute on the connection URL.</li>
+You configure a Derby database for encryption when you create the database by specifying attributes on the connection URL.</li>
 <li class="ulchildlink"><strong><a href="tdevcsecureunencrypteddb.html">Encrypting an existing unencrypted database</a></strong><br />
 You can encrypt an unencrypted Derby database by specifying attributes on the connection URL when you boot the database. The attributes that you specify depend on how you want the database encrypted.</li>
-<li class="ulchildlink"><strong><a href="cdevcsecure866716.html">Creating the boot password</a></strong><br />
-When you encrypt a database you must also specify a boot password, which is an alpha-numeric string used to generate the encryption key.</li>
+<li class="ulchildlink"><strong><a href="cdevcsecure866716.html">Creating a boot password</a></strong><br />
+When you encrypt a database you usually specify a boot password, which is an alphanumeric string used to generate the encryption key. (You can also specify an encryption key directly.)</li>
 <li class="ulchildlink"><strong><a href="tdevcsecurenewkeyoverview.html">Encrypting databases with a new key</a></strong><br />
 You can apply a new encryption key to a Derby database by specifying a new boot password or a new external key.</li>
 <li class="ulchildlink"><strong><a href="cdevcsecure60146.html">Booting an encrypted database</a></strong><br />
-If you create an encrypted database using the bootPassword attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey attribute, you must specify the encryptionKey to reboot the database.</li>
+If you create an encrypted database using the bootPassword=key attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey=key attribute, you must specify the encryption key to reboot the database.</li>
 </ul>
 
 <div class="familylinks">

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevdvlp27715.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevdvlp27715.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevdvlp27715.html Fri Dec 28 20:22:56 2012
@@ -84,6 +84,9 @@ Loaded from file:C:\db-derby-10.7.1.0-bi
 java.vendor=Sun Microsystems Inc.
 java.runtime.version=1.6.0_24-b07
 user.dir=C:\
+os.name=Windows XP
+os.arch=x86
+os.version=5.1
 derby.system.home=null
 Database Class Loader started - derby.database.classpath=''</pre>
 

Modified: websites/production/db/content/derby/docs/10.8/devguide/cdevdvlp51654.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/cdevdvlp51654.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/cdevdvlp51654.html Fri Dec 28 20:22:56 2012
@@ -41,9 +41,6 @@
 <meta scheme="URI" name="DC.Relation" content="tdevdvlp39090.html" />
 <meta scheme="URI" name="DC.Relation" content="tdevdvlp12233.html" />
 <meta scheme="URI" name="DC.Relation" content="tdevdvlpcollation.html" />
-<meta scheme="URI" name="DC.Relation" content="tdevdvlp14496.html" />
-<meta scheme="URI" name="DC.Relation" content="tdevdvlpcreateencryptdbextkey.html" />
-<meta scheme="URI" name="DC.Relation" content="tdevdvlp40140.html" />
 <meta scheme="URI" name="DC.Relation" content="tdevdvlp36289.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cdevdvlp51654" name="DC.Identifier" />
@@ -72,6 +69,20 @@ obtaining a connection; see <a href="tde
 
 <p>All attributes are optional. </p>
 
+<div class="p">For more information on working with connection URL attributes, see the
+following:
+<ul>
+<li><a href="cdevcsecure24366.html#cdevcsecure24366">Encrypting databases on disk</a> for information
+on database encryption</li>
+
+<li><span><em>Derby Server and Administration Guide</em></span> for information on tracing
+network clients, replicating databases, restoring databases from backup, and
+logging on separate devices</li>
+
+</ul>
+
+</div>
+
 <p>For complete information about the attributes, see "Setting attributes for
 the database connection URL" in the
 <span><em>Derby Reference Manual</em></span>.</p>
@@ -93,12 +104,6 @@ You create a database by supplying a new
 When user authentication is enabled, an application must provide a user name and password. One way to do this is to use the user=userName and password=userPassword connection URL attributes.</li>
 <li class="ulchildlink"><strong><a href="tdevdvlpcollation.html">Creating a database with territory-based collation</a></strong><br />
 By default, Derby uses Unicode codepoint collation. However, you can specify territory-based collation when you create the database.</li>
-<li class="ulchildlink"><strong><a href="tdevdvlp14496.html">Encrypting a database when you create it</a></strong><br />
-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 dataEncryption=true attribute to turn on encryption and the bootPassword=key attribute or the encryptionKey attribute to specify a key for the encryption.</li>
-<li class="ulchildlink"><strong><a href="tdevdvlpcreateencryptdbextkey.html">Creating an encrypted database with an external key</a></strong><br />
-You can create a database and encrypt the database with an external key.</li>
-<li class="ulchildlink"><strong><a href="tdevdvlp40140.html">Booting an encrypted database</a></strong><br />
-You must specify several attributes in the URL when you boot an encrypted database. You must specify these attributes the first time that you connect to the database within a JVM session, or after you shut the database down within the same JVM session.</li>
 <li class="ulchildlink"><strong><a href="tdevdvlp36289.html">Specifying attributes in a properties object</a></strong><br />
 Instead of specifying attributes on the connection URL, you can specify attributes as properties in a Properties object that you pass as a second argument to the DriverManager.getConnection method.</li>
 </ul>

Modified: websites/production/db/content/derby/docs/10.8/devguide/derbydev.pdf
==============================================================================
Binary files - no diff available.

Modified: websites/production/db/content/derby/docs/10.8/devguide/rdevdvlp847152.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/rdevdvlp847152.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/rdevdvlp847152.html Fri Dec 28 20:22:56 2012
@@ -33,8 +33,6 @@
 <meta scheme="URI" name="DC.Relation" content="tdevdvlp40464.html" />
 <meta scheme="URI" name="DC.Relation" content="tdevdvlp39090.html" />
 <meta scheme="URI" name="DC.Relation" content="tdevdvlp12233.html" />
-<meta scheme="URI" name="DC.Relation" content="tdevdvlp14496.html" />
-<meta scheme="URI" name="DC.Relation" content="tdevdvlp40140.html" />
 <meta scheme="URI" name="DC.Relation" content="tdevdvlp36289.html" />
 <meta scheme="URI" name="DC.Relation" content="cdevdvlp51654.html" />
 <meta content="XHTML" name="DC.Format" />
@@ -80,8 +78,6 @@ like this:</p>
 <div><a href="tdevdvlp40464.html" title="Applications in an embedded environment shut down the Derby system by specifying the shutdown=true attribute in the connection URL. To shut down the system, you do not specify a database name, and you do not ordinarily specify any other attribute.">Shutting down Derby or an individual database</a></div>
 <div><a href="tdevdvlp39090.html" title="You create a database by supplying a new database name in the connection URL and specifying create=true.">Creating and accessing a database</a></div>
 <div><a href="tdevdvlp12233.html" title="When user authentication is enabled, an application must provide a user name and password. One way to do this is to use the user=userName and password=userPassword connection URL attributes.">Providing a user name and password</a></div>
-<div><a href="tdevdvlp14496.html" title="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 dataEncryption=true attribute to turn on encryption and the bootPassword=key attribute or the encryptionKey attribute to specify a key for the encryption.">Encrypting a database when you create it</a></div>
-<div><a href="tdevdvlp40140.html" title="You must specify several attributes in the URL when you boot an encrypted database. You must specify these attributes the first time that you connect to the database within a JVM session, or after you shut the database down within the same JVM session.">Booting an encrypted database</a></div>
 <div><a href="tdevdvlp36289.html" title="Instead of specifying attributes on the connection URL, you can specify attributes as properties in a Properties object that you pass as a second argument to the DriverManager.getConnection method.">Specifying attributes in a properties object</a></div>
 </div>
 </div>

Modified: websites/production/db/content/derby/docs/10.8/devguide/tdevconcepts839040.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/tdevconcepts839040.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/tdevconcepts839040.html Fri Dec 28 20:22:56 2012
@@ -63,7 +63,7 @@
 <div class="relconcepts"><strong>Related concepts</strong><br />
 <div><a href="cdevconcepts838850.html" title="When auto-commit is disabled, you use a Connection object's commit and rollback methods to commit or roll back a transaction.">Transactions when auto-commit is disabled</a></div>
 <div><a href="cdevconcepts29416.html" title="A new connection to a Derby database is in auto-commit mode by default, as specified by the JDBC standard.">Using auto-commit</a></div>
-<div><a href="cdevconcepts839085.html" title="You should explicitly close Statements, ResultSets, and Connections when you no longer need them.">Explicitly closing Statements, ResultSets, and Connections</a></div>
+<div><a href="cdevconcepts839085.html" title="You should explicitly close Statements, ResultSets, and Connections when you no longer need them, unless you declare them in a try-with-resources statement (available in JDK 7 and after).">Explicitly closing Statements, ResultSets, and Connections</a></div>
 <div><a href="cdevconcepts14433.html" title="When an SQL statement generates an exception, this exception results in a runtime rollback. A runtime rollback is a system-generated rollback of a statement or transaction by Derby, as opposed to an explicit rollback call from your application.">Statement versus transaction runtime rollback</a></div>
 <div><a href="cdevconceptssavepoints.html" title="The Savepoint interface contains methods to set, release, or roll back a transaction to designated savepoints. Once a savepoint has been set, the transaction can be rolled back to that savepoint without affecting preceding work. Savepoints provide finer-grained control of transactions by marking intermediate points within a transaction.">Using savepoints</a></div>
 </div>

Modified: websites/production/db/content/derby/docs/10.8/devguide/tdevcsecurenewbootpw.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/tdevcsecurenewbootpw.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/tdevcsecurenewbootpw.html Fri Dec 28 20:22:56 2012
@@ -26,8 +26,8 @@
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="task" name="DC.Type" />
 <meta name="DC.Title" content="Encrypting databases with a new boot password" />
-<meta name="abstract" content="You can apply a new boot password to a Derby database by specifying the newBootPassword attribute on the connection URL when you boot the database." />
-<meta name="description" content="You can apply a new boot password to a Derby database by specifying the newBootPassword attribute on the connection URL when you boot the database." />
+<meta name="abstract" content="You can apply a new boot password to a Derby database by specifying the newBootPassword=newPassword attribute on the connection URL when you boot the database." />
+<meta name="description" content="You can apply a new boot password to a Derby database by specifying the newBootPassword=newPassword attribute on the connection URL when you boot the database." />
 <meta content="encrypting databases, new boot password, databases, encrypting, new boot password" name="DC.subject" />
 <meta content="encrypting databases, new boot password, databases, encrypting, new boot password" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="cdevcsecure60146.html" />
@@ -49,27 +49,27 @@
 
 
 <div><p>You can apply a new boot password to a <span>Derby</span> database
-by specifying the <em>newBootPassword</em> attribute on the connection URL when
-you boot the database.</p>
+by specifying the <em>newBootPassword=newPassword</em> attribute on the connection
+URL when you boot the database.</p>
 
 <div class="p"><ul>
 <li>If the database is configured with log archival for roll-forward recovery,
 you must disable log archival and perform a shutdown before you can encrypt
 the database with a new boot password. </li>
 
-<li>If there are any global transaction that are in the prepared state after
+<li>If any global transactions are in the prepared state after
 recovery, the database cannot be encrypted with a new boot password.</li>
 
 <li>If the database is currently encrypted with an external encryption key,
-you should use the <a href="tdevcsecurenewextkey.html#tdevcsecurenewextkey"><em>newEncryptionKey</em></a> attribute
-to encrypt the database.</li>
+<a href="tdevcsecurenewextkey.html#tdevcsecurenewextkey">use the
+<em>newEncryptionKey=key</em> attribute</a> to encrypt the database.</li>
 
 </ul>
 </div>
 
-<div class="section"><p>When you use the <em>newBootPassword</em> attribute, a new encryption
-key is generated internally by the engine and the key is protected using the
-new boot password. The newly generated encryption key encrypts the database,
+<div class="section"><p>When you use the <em>newBootPassword=newPassword</em> attribute, a new
+encryption key is generated internally by the engine, and the key is protected
+using the new boot password. The newly generated encryption key encrypts the database,
 including the existing data. You cannot change the encryption provider or
 encryption algorithm when you apply a new boot password.</p>
 <p>To encrypt
@@ -77,10 +77,13 @@ a database  with a new boot password:</p
 </div>
 
 
-<div class="p"><span>Specify the <em>newBootPassword</em> attribute in a URL and reboot
-the database.</span> For example, when the following URL is used when
-the <samp class="codeph">salesdb</samp> database is rebooted, the database is encrypted
-with the new encryption key, and is protected by the password new1234xyz:<pre> jdbc:derby:salesdb;bootPassword=abc1234xyz;newBootPassword=new1234xyz</pre>
+<div class="p"><span>Specify the <em>newBootPassword=newPassword</em> attribute in a URL and
+reboot the database.</span>
+ For example, if you use the following URL to reboot
+the <samp class="codeph">salesdb</samp> database, the database is encrypted
+with the new encryption key and is protected by the password
+<samp class="codeph">new1234xyz</samp>:
+<pre>jdbc:derby:salesdb;bootPassword=abc1234xyz;newBootPassword=new1234xyz</pre>
 
    
     <p>
@@ -108,11 +111,11 @@ particularly "Roll-forward recovery".</p
 <div class="parentlink"><strong>Parent topic:</strong> <a href="tdevcsecurenewkeyoverview.html" title="You can apply a new encryption key to a Derby database by specifying a new boot password or a new external key.">Encrypting databases with a new key</a></div>
 </div>
 <div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cdevcsecure60146.html" title="If you create an encrypted database using the bootPassword attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey attribute, you must specify the encryptionKey to reboot the database.">Booting an encrypted database</a></div>
+<div><a href="cdevcsecure60146.html" title="If you create an encrypted database using the bootPassword=key attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey=key attribute, you must specify the encryption key to reboot the database.">Booting an encrypted database</a></div>
 <div><a href="cdevcsecure96815.html" title="">Requirements for Derby encryption</a></div>
 </div>
 <div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tdevcsecurenewextkey.html" title="You can apply a new external encryption key to a Derby database by specifying the newEncryptionKey attribute on the connection URL when you boot the database.">Encrypting databases with a new external encryption key</a></div>
+<div><a href="tdevcsecurenewextkey.html" title="You can apply a new external encryption key to a Derby database by specifying the newEncryptionKey=key attribute on the connection URL when you boot the database.">Encrypting databases with a new external encryption key</a></div>
 </div>
 </div>
 

Modified: websites/production/db/content/derby/docs/10.8/devguide/tdevcsecurenewextkey.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/tdevcsecurenewextkey.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/tdevcsecurenewextkey.html Fri Dec 28 20:22:56 2012
@@ -26,8 +26,8 @@
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="task" name="DC.Type" />
 <meta name="DC.Title" content="Encrypting databases with a new external encryption key" />
-<meta name="abstract" content="You can apply a new external encryption key to a Derby database by specifying the newEncryptionKey attribute on the connection URL when you boot the database." />
-<meta name="description" content="You can apply a new external encryption key to a Derby database by specifying the newEncryptionKey attribute on the connection URL when you boot the database." />
+<meta name="abstract" content="You can apply a new external encryption key to a Derby database by specifying the newEncryptionKey=key attribute on the connection URL when you boot the database." />
+<meta name="description" content="You can apply a new external encryption key to a Derby database by specifying the newEncryptionKey=key attribute on the connection URL when you boot the database." />
 <meta content="encrypting databases, new external key, databases, encrypting, new external key" name="DC.subject" />
 <meta content="encrypting databases, new external key, databases, encrypting, new external key" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="tdevcsecurenewbootpw.html" />
@@ -49,7 +49,7 @@
 
 
 <div><p>You can apply a new external encryption key to a <span>Derby</span> database
-by specifying the <em>newEncryptionKey</em> attribute on the connection URL
+by specifying the <em>newEncryptionKey=key</em> attribute on the connection URL
 when you boot the database.</p>
 
 <div class="p"><ul>
@@ -57,12 +57,13 @@ when you boot the database.</p>
 you must disable log archival and perform a shutdown before you can encrypt
 the database with a new external encryption key. </li>
 
-<li>If there are any global transaction that are in the prepared state after
+<li>If any global transaction are in the prepared state after
 recovery, the database cannot be encrypted with a new encryption key.</li>
 
-<li>If the database is currently encrypted with a boot password , you should
-use the <a href="tdevcsecurenewbootpw.html#tdevcsecurenewbootpw"><em>newBootPassword</em></a> attribute
-to encrypt the database.</li>
+<li>If the database is currently encrypted with a boot password,
+<a href="tdevcsecurenewbootpw.html#tdevcsecurenewbootpw">use the
+<em>newBootPassword=newPassword</em> attribute</a> to encrypt the
+database.</li>
 
 </ul>
 </div>
@@ -71,10 +72,13 @@ to encrypt the database.</li>
 </div>
 
 
-<div class="p"><span>Specify the <em>newEncryptionKey</em> attribute in a URL and reboot
-the database.</span> For example, when the following URL is used when
-the <samp class="codeph">salesdb</samp> database is rebooted, the database is encrypted
-with the new encryption key 6862636465666768:<pre>jdbc:derby:salesdb;encryptionKey=6162636465666768;newEncryptionKey=6862636465666768'</pre>
+<div class="p"><span>Specify the <em>newEncryptionKey=key</em> attribute in a URL and reboot
+the database.</span> For example, if you use the following URL to reboot
+the <samp class="codeph">salesdb</samp> database, the database is encrypted
+with the new encryption key <samp class="codeph">6862636465666768</samp>:
+<pre>jdbc:derby:salesdb;encryptionKey=6162636465666768;
+newEncryptionKey=6862636465666768'</pre>
+
 
  
   <p>
@@ -102,11 +106,11 @@ particularly "Roll-forward recovery".</p
 <div class="parentlink"><strong>Parent topic:</strong> <a href="tdevcsecurenewkeyoverview.html" title="You can apply a new encryption key to a Derby database by specifying a new boot password or a new external key.">Encrypting databases with a new key</a></div>
 </div>
 <div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cdevcsecure60146.html" title="If you create an encrypted database using the bootPassword attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey attribute, you must specify the encryptionKey to reboot the database.">Booting an encrypted database</a></div>
+<div><a href="cdevcsecure60146.html" title="If you create an encrypted database using the bootPassword=key attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey=key attribute, you must specify the encryption key to reboot the database.">Booting an encrypted database</a></div>
 <div><a href="cdevcsecure96815.html" title="">Requirements for Derby encryption</a></div>
 </div>
 <div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tdevcsecurenewbootpw.html" title="You can apply a new boot password to a Derby database by specifying the newBootPassword attribute on the connection URL when you boot the database.">Encrypting databases with a new boot password</a></div>
+<div><a href="tdevcsecurenewbootpw.html" title="You can apply a new boot password to a Derby database by specifying the newBootPassword=newPassword attribute on the connection URL when you boot the database.">Encrypting databases with a new boot password</a></div>
 </div>
 </div>
 

Modified: websites/production/db/content/derby/docs/10.8/devguide/tdevcsecurenewkeyoverview.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/tdevcsecurenewkeyoverview.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/tdevcsecurenewkeyoverview.html Fri Dec 28 20:22:56 2012
@@ -50,10 +50,10 @@
 <div><p>You can apply a new encryption key to a <span>Derby</span> database
 by specifying a new boot password or a new external key.</p>
 
-<div class="section"><p>Encrypting a database with a new encryption key is a time consuming
+<div class="section"><p>Encrypting a database with a new encryption key is a time-consuming
 process because it involves encrypting all of the existing data in the database
 with the new encryption key. If the process is interrupted before completion,
-all the changes are rolled back the next time that the database is booted.
+all the changes are rolled back the next time the database is booted.
 If the interruption occurs immediately after the database is encrypted with
 the new encryption key but before the connection is returned to the application,
 you might not be able to boot the database with the old encryption key. In
@@ -63,7 +63,7 @@ encryption key. </p>
 you have enough free disk space before you encrypt a database with a new key.
 In addition to the disk space required for the current size of the database,
 temporary disk space is required to store the old version of the data to restore
-the database back to it's original state if the new encryption is interrupted
+the database back to its original state if the new encryption is interrupted
 or returns errors. All of the temporary disk space is released back to the
 operating system after the database is reconfigured to work with the new encryption
 key.</div>
@@ -75,10 +75,12 @@ key.</div>
 database:</span>
 <ul>
 <li>To <a href="tdevcsecurenewbootpw.html#tdevcsecurenewbootpw">encrypt
-the database with a new boot password key</a>, use the <em>newBootPassword</em> attribute.</li>
+the database with a new boot password key</a>, use the
+<em>newBootPassword=newPassword</em> attribute.</li>
 
 <li>To <a href="tdevcsecurenewextkey.html#tdevcsecurenewextkey">encrypt
-the database with a new external encryption key</a>, use the <em>newEncryptionKey</em> attribute.</li>
+the database with a new external encryption key</a>, use the
+<em>newEncryptionKey=key</em> attribute.</li>
 
 </ul>
 
@@ -101,7 +103,7 @@ the database with a new external encrypt
 <div class="parentlink"><strong>Parent topic:</strong> <a href="cdevcsecure97760.html" title="This section describes using encryption in Derby.">Working with encryption</a></div>
 </div>
 <div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cdevcsecure88690.html" title="You configure a Derby database for encryption when you create the database by specifying the dataEncryption=true attribute on the connection URL.">Encrypting databases on creation</a></div>
+<div><a href="cdevcsecure88690.html" title="You configure a Derby database for encryption when you create the database by specifying attributes on the connection URL.">Encrypting databases on creation</a></div>
 <div><a href="cdevcsecure96815.html" title="">Requirements for Derby encryption</a></div>
 </div>
 <div class="reltasks"><strong>Related tasks</strong><br />

Modified: websites/production/db/content/derby/docs/10.8/devguide/tdevcsecureunencrypteddb.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/tdevcsecureunencrypteddb.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/tdevcsecureunencrypteddb.html Fri Dec 28 20:22:56 2012
@@ -55,22 +55,29 @@ The attributes that you specify depend o
 <li>If the database is configured with log archival, you must disable log
 archival and perform a shutdown before you can encrypt the database. </li>
 
-<li>If there are any global transaction that are in the prepared state after
+<li>If any global transactions are in the prepared state after
 recovery, the database cannot be encrypted.</li>
 
 </ul>
 </div>
 
 <div class="section"><p>When you encrypt an existing, unencrypted database, you can specify
-whether the database should be encrypted using a boot password or an external
-encryption key.  You can also specify the <em>encryptionProvider</em> attribute
-and the <em>encryptionAlgorithm</em> attribute on the connection URL. The database
-is configure with the specified encryption attributes and all of the existing
-data in the database is encrypted. </p>
-<p>Encrypting a database is a time
-consuming process because it involves encrypting all of the existing data
+whether the database should be encrypted using a boot password
+(<em>bootPassword=key</em>) or an external encryption key
+(<em>encryptionKey=key</em>). You can also specify the
+<em>encryptionProvider=providerName</em> attribute and the
+<em>encryptionAlgorithm=algorithm</em> attribute on the connection URL. The
+database
+is configured with the specified encryption attributes, and all of the existing
+data in the database is encrypted.</p>
+
+<p>See the <span><em>Derby Reference Manual</em></span> for details on the
+connection URL attributes.</p>
+
+<p>Encrypting a database is a
+time-consuming process because it involves encrypting all of the existing data
 in the database. If the process is interrupted before completion, all the
-changes are rolled back the next time that the database is booted. If the
+changes are rolled back the next time the database is booted. If the
 interruption occurs immediately after the database is encrypted but before
 the connection is returned to the application, you might not be able to boot
 the database without the boot password or external encryption key. In these
@@ -80,7 +87,7 @@ or the external encryption key. </p>
 that you have enough free disk space before you encrypt a database. In addition
 to the disk space required for the current size of the database, temporary
 disk space is required to store the old version of the data to restore the
-database back to it's original state if the encryption is interrupted or returns
+database back to its original state if the encryption is interrupted or returns
 errors. All of the temporary disk space is released back to the operating
 system after the database is encrypted.</div>
 <p>To encrypt an existing unencrypted
@@ -88,8 +95,9 @@ database:</p>
 </div>
 
 
-<div class="p"><span>Specify the <em>dataEncryption=true</em> attribute and either the <em>encryptionKey</em> attribute
-or the <em>bootPassword</em> attribute in a URL and boot the database.</span>
+<div class="p"><span>Specify the <em>dataEncryption=true</em> attribute and either the
+<em>encryptionKey=key</em> attribute or the <em>bootPassword=key</em> attribute in
+a connection URL and boot the database.</span>
  For example, to encrypt the <samp class="codeph">salesdb</samp> database with
 the boot password <samp class="codeph">abc1234xyz</samp>, specify the following attributes
 in the URL:<pre>jdbc:derby:salesdb;dataEncryption=true;bootPassword=abc1234xyz </pre>
@@ -121,7 +129,7 @@ recovery".</p>
 <div class="parentlink"><strong>Parent topic:</strong> <a href="cdevcsecure97760.html" title="This section describes using encryption in Derby.">Working with encryption</a></div>
 </div>
 <div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cdevcsecure60146.html" title="If you create an encrypted database using the bootPassword attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey attribute, you must specify the encryptionKey to reboot the database.">Booting an encrypted database</a></div>
+<div><a href="cdevcsecure60146.html" title="If you create an encrypted database using the bootPassword=key attribute, you must specify the boot password to reboot the database. If you create an encrypted database using the encryptionKey=key attribute, you must specify the encryption key to reboot the database.">Booting an encrypted database</a></div>
 <div><a href="cdevcsecure96815.html" title="">Requirements for Derby encryption</a></div>
 </div>
 <div class="reltasks"><strong>Related tasks</strong><br />

Modified: websites/production/db/content/derby/docs/10.8/devguide/tdevdvlp39090.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/tdevdvlp39090.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/tdevdvlp39090.html Fri Dec 28 20:22:56 2012
@@ -32,8 +32,6 @@
 <meta content="Creating a database, using database connection URL attribute, Databases, creating" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="rdevdvlp847152.html" />
 <meta scheme="URI" name="DC.Relation" content="tdevdvlp12233.html" />
-<meta scheme="URI" name="DC.Relation" content="tdevdvlp14496.html" />
-<meta scheme="URI" name="DC.Relation" content="tdevdvlp40140.html" />
 <meta scheme="URI" name="DC.Relation" content="tdevdvlp36289.html" />
 <meta scheme="URI" name="DC.Relation" content="cdevdvlp51654.html" />
 <meta content="XHTML" name="DC.Format" />
@@ -70,8 +68,6 @@ more details about <em>create=true</em>,
 </div>
 <div class="reltasks"><strong>Related tasks</strong><br />
 <div><a href="tdevdvlp12233.html" title="When user authentication is enabled, an application must provide a user name and password. One way to do this is to use the user=userName and password=userPassword connection URL attributes.">Providing a user name and password</a></div>
-<div><a href="tdevdvlp14496.html" title="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 dataEncryption=true attribute to turn on encryption and the bootPassword=key attribute or the encryptionKey attribute to specify a key for the encryption.">Encrypting a database when you create it</a></div>
-<div><a href="tdevdvlp40140.html" title="You must specify several attributes in the URL when you boot an encrypted database. You must specify these attributes the first time that you connect to the database within a JVM session, or after you shut the database down within the same JVM session.">Booting an encrypted database</a></div>
 <div><a href="tdevdvlp36289.html" title="Instead of specifying attributes on the connection URL, you can specify attributes as properties in a Properties object that you pass as a second argument to the DriverManager.getConnection method.">Specifying attributes in a properties object</a></div>
 </div>
 <div class="relref"><strong>Related reference</strong><br />

Modified: websites/production/db/content/derby/docs/10.8/devguide/tdevdvlpcollation.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/tdevdvlpcollation.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/tdevdvlpcollation.html Fri Dec 28 20:22:56 2012
@@ -79,7 +79,7 @@ TERRITORY_BASED with a colon to separate
 <pre>jdbc:derby:SwedishDB;create=true;territory=sv_SE;collation=TERRITORY_BASED:PRIMARY</pre>
 
 <p>With strength PRIMARY, the characters 'A' and 'a' will be considered equal,
-as well as '??' ('a' with a grave accent). (This behavior is
+as well as 'à' ('a' with a grave accent). (This behavior is
 commonly the default with many other databases.) To make searches
 respect differences in accent, use strength SECONDARY.</p>
 

Modified: websites/production/db/content/derby/docs/10.8/devguide/toc.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/devguide/toc.html (original)
+++ websites/production/db/content/derby/docs/10.8/devguide/toc.html Fri Dec 28 20:22:56 2012
@@ -108,9 +108,6 @@
 <li><a href="tdevdvlp39090.html">Creating and accessing a database</a></li>
 <li><a href="tdevdvlp12233.html">Providing a user name and password</a></li>
 <li><a href="tdevdvlpcollation.html">Creating a database with territory-based collation</a></li>
-<li><a href="tdevdvlp14496.html">Encrypting a database when you create it</a></li>
-<li><a href="tdevdvlpcreateencryptdbextkey.html">Creating an encrypted database with an external key</a></li>
-<li><a href="tdevdvlp40140.html">Booting an encrypted database</a></li>
 <li><a href="tdevdvlp36289.html">Specifying attributes in a properties object</a></li>
 </ul>
 </li>
@@ -444,7 +441,7 @@
 <ul>
 <li><a href="cdevcsecure88690.html">Encrypting databases on creation</a></li>
 <li><a href="tdevcsecureunencrypteddb.html">Encrypting an existing unencrypted database</a></li>
-<li><a href="cdevcsecure866716.html">Creating the boot password</a>
+<li><a href="cdevcsecure866716.html">Creating a boot password</a>
 <ul>
 <li><a href="cdevcsecure31493.html">Specifying an alternate encryption provider</a></li>
 <li><a href="cdevcsecure67151.html">Specifying an alternate encryption algorithm</a></li>



Mime
View raw message