You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by sc...@apache.org on 2007/03/07 19:49:19 UTC
svn commit: r515695 - /db/derby/docs/trunk/src/ref/
Author: scotsmatrix
Date: Wed Mar 7 10:49:17 2007
New Revision: 515695
URL: http://svn.apache.org/viewvc?view=rev&rev=515695
Log:
Derby-1920: Updated topic titles for the attributes section of Ref Manual. Patch derby-1920-ref7.diff was contributed by Kim Haase.
Modified:
db/derby/docs/trunk/src/ref/rrefattrib10035.dita
db/derby/docs/trunk/src/ref/rrefattrib15290.dita
db/derby/docs/trunk/src/ref/rrefattrib16471.dita
db/derby/docs/trunk/src/ref/rrefattrib17246.dita
db/derby/docs/trunk/src/ref/rrefattrib26867.dita
db/derby/docs/trunk/src/ref/rrefattrib34183.dita
db/derby/docs/trunk/src/ref/rrefattrib42100.dita
db/derby/docs/trunk/src/ref/rrefattrib42686.dita
db/derby/docs/trunk/src/ref/rrefattrib56769.dita
db/derby/docs/trunk/src/ref/rrefattrib60346.dita
db/derby/docs/trunk/src/ref/rrefattrib72457.dita
db/derby/docs/trunk/src/ref/rrefattrib88843.dita
db/derby/docs/trunk/src/ref/rrefattribencryptkey.dita
db/derby/docs/trunk/src/ref/rrefattribnewbootpw.dita
db/derby/docs/trunk/src/ref/rrefattribnewencryptkey.dita
db/derby/docs/trunk/src/ref/rrefcreatefrom.dita
db/derby/docs/trunk/src/ref/rrefrestorefrom.dita
db/derby/docs/trunk/src/ref/rrefrollforward.dita
Modified: db/derby/docs/trunk/src/ref/rrefattrib10035.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib10035.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib10035.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib10035.dita Wed Mar 7 10:49:17 2007
@@ -19,9 +19,9 @@
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"../dtd/reference.dtd">
<reference id="rrefattrib10035" xml:lang="en-us">
-<title>user=userName</title>
+<title>user=userName attribute</title>
<prolog><metadata>
-<keywords><indexterm>user=userName (database connection URL attribute)</indexterm>
+<keywords><indexterm>user=userName database connection URL attribute</indexterm>
</keywords>
</metadata></prolog>
<refbody>
@@ -29,7 +29,7 @@
password. A valid user name and password are required when user authentication
is turned on.</p></section>
<section><title>Combining with other attributes</title> <p>Use
-in conjunction with <i><xref href="rrefattrib42686.dita#rrefattrib42686"></xref>.</i></p> </section>
+in conjunction with the <i><xref href="rrefattrib42686.dita#rrefattrib42686">password=userPassword</xref></i> attribute.</p> </section>
<example> <p>The following database connection URL connects the user jill
to <i>toursDB</i>:</p> <codeblock><b>jdbc:derby:toursDB;user=jill;password=toFetchAPail</b></codeblock> </example>
</refbody>
Modified: db/derby/docs/trunk/src/ref/rrefattrib15290.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib15290.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib15290.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib15290.dita Wed Mar 7 10:49:17 2007
@@ -19,9 +19,9 @@
limitations under the License.
-->
<reference id="rrefattrib15290" xml:lang="en-us">
-<title>dataEncryption=true</title>
+<title>dataEncryption=true attribute</title>
<prolog><metadata>
-<keywords><indexterm>dataEncryption=true</indexterm><indexterm>encrypting
+<keywords><indexterm>dataEncryption=true attribute</indexterm><indexterm>encrypting
databases<indexterm>data encryption</indexterm></indexterm><indexterm>databases<indexterm>attributes,
data encryption</indexterm></indexterm><indexterm>attributes<indexterm>dataEncryption</indexterm></indexterm>
</keywords>
@@ -29,13 +29,13 @@
<refbody>
<section><title>Function</title><p>Specifies data encryption on disk for a
new database or to configure an existing unencrypted database for encryption.
-For information about data encryption, see "Encrypting Databases on Disk"
+For information about data encryption, see "Encrypting databases on disk"
in the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</p> </section>
<section><title>Combining with other attributes</title><p>The <i>dataEncryption</i> attribute
-must be combined with the <i><xref href="rrefattrib42100.dita#rrefattrib42100"></xref></i> attribute
-or the <xref href="rrefattribnewencryptkey.dita#rrefattribnewencryptkey"></xref> attribute.
-You have the option of also specifying the <i><xref href="rrefattrib88843.dita#rrefattrib88843"></xref></i> and <i><xref
-href="rrefattrib60346.dita#rrefattrib60346"></xref></i> attributes.</p> </section>
+must be combined with the <i><xref href="rrefattrib42100.dita#rrefattrib42100">bootPassword=key</xref></i> attribute
+or the <xref href="rrefattribnewencryptkey.dita#rrefattribnewencryptkey">newEncryptionKey=key</xref> attribute.
+You have the option of also specifying the <i><xref href="rrefattrib88843.dita#rrefattrib88843">encryptionProvider=providerName</xref></i> and <i><xref
+href="rrefattrib60346.dita#rrefattrib60346">encryptionAlgorithm=algorithm</xref></i> attributes.</p> </section>
<example><title>Examples</title><codeblock><b><ph> -- encrypt a new database</ph>
jdbc:derby:encryptedDB;create=true;dataEncryption=true;
bootPassword=cLo4u922sc23aPe
Modified: db/derby/docs/trunk/src/ref/rrefattrib16471.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib16471.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib16471.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib16471.dita Wed Mar 7 10:49:17 2007
@@ -19,9 +19,9 @@
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"../dtd/reference.dtd">
<reference id="rrefattrib16471" xml:lang="en-us">
-<title>shutdown=true</title>
+<title>shutdown=true attribute</title>
<prolog><metadata>
-<keywords><indexterm>shutdown=true (database connection URL attribute)</indexterm>
+<keywords><indexterm>shutdown=true database connection URL attribute</indexterm>
</keywords>
</metadata></prolog>
<refbody>
@@ -37,8 +37,8 @@
results in an <i>SQLException</i> indicating that <ph conref="refconrefs.dita#prod/productshortname"></ph> has
shut down and that there is no connection. Once <ph conref="refconrefs.dita#prod/productshortname"></ph> is
shut down, you can restart it by reloading the driver. For details on restarting <ph
-conref="refconrefs.dita#prod/productshortname"></ph>, see "Shutting Down the
-System" in Chapter 1 of the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</p> <p><i>Checkpointing</i> means
+conref="refconrefs.dita#prod/productshortname"></ph>, see
+"Shutting down the system" in the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</p> <p><i>Checkpointing</i> means
writing all data and transaction information to disk so that no recovery needs
to be performed at the next connection.</p> <p>Used to shut down the entire
system only when it is embedded in an application. <note>Any request to
Modified: db/derby/docs/trunk/src/ref/rrefattrib17246.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib17246.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib17246.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib17246.dita Wed Mar 7 10:49:17 2007
@@ -19,10 +19,10 @@
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"../dtd/reference.dtd">
<reference id="rrefattrib17246" xml:lang="en-us">
-<title>databaseName=nameofDatabase</title>
+<title>databaseName=nameofDatabase attribute</title>
<prolog><metadata>
-<keywords><indexterm>databaseName=nameOfDatabase (database connection URL
-attribute)</indexterm></keywords>
+<keywords><indexterm>databaseName=nameOfDatabase database connection URL
+attribute</indexterm></keywords>
</metadata></prolog>
<refbody>
<section><title>Function</title> <p>Specifies a database name for a connection;
Modified: db/derby/docs/trunk/src/ref/rrefattrib26867.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib26867.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib26867.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib26867.dita Wed Mar 7 10:49:17 2007
@@ -19,9 +19,9 @@
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"../dtd/reference.dtd">
<reference id="rrefattrib26867" xml:lang="en-us">
-<title>create=true</title>
+<title>create=true attribute</title>
<prolog><metadata>
-<keywords><indexterm>create=true (database connection URL attribute)</indexterm>
+<keywords><indexterm>create=true database connection URL attribute</indexterm>
</keywords>
</metadata></prolog>
<refbody>
Modified: db/derby/docs/trunk/src/ref/rrefattrib34183.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib34183.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib34183.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib34183.dita Wed Mar 7 10:49:17 2007
@@ -19,14 +19,17 @@
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"../dtd/reference.dtd">
<reference id="rrefattrib34183" xml:lang="en-us">
-<title>(no attributes)</title>
+<title>Creating a connection without specifying attributes</title>
+<prolog><metadata>
+<keywords><indexterm>Attributes to database connection URL</indexterm></keywords>
+</metadata></prolog>
<refbody>
<section> <p>If no attributes are specified, you must specify a <i>databaseName.</i></p> <p><ph
conref="refconrefs.dita#prod/productshortname"></ph> opens a connection to
an existing database with that name in the current system directory. If the
database does not exist, the connection attempt returns an <i>SQLException</i> indicating
that the database cannot be found. </p></section>
-<example> <codeblock>jdbc:derby:mydb<indexterm>Attributes to database connection URL</indexterm></codeblock> </example>
+<example> <codeblock>jdbc:derby:mydb</codeblock> </example>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rrefattrib42100.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib42100.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib42100.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib42100.dita Wed Mar 7 10:49:17 2007
@@ -19,9 +19,9 @@
limitations under the License.
-->
<reference id="rrefattrib42100" xml:lang="en-us">
-<title>bootPassword=key</title>
+<title>bootPassword=key attribute</title>
<prolog><metadata>
-<keywords><indexterm>bootPassword=key</indexterm><indexterm>encrypting databases<indexterm>boot
+<keywords><indexterm>bootPassword=key attribute</indexterm><indexterm>encrypting databases<indexterm>boot
password key</indexterm></indexterm><indexterm>databases<indexterm>attributes,
boot password key</indexterm></indexterm><indexterm>attributes<indexterm>bootPassword</indexterm></indexterm>
</keywords>
@@ -34,10 +34,10 @@
</ul>Specify an alphanumeric string that is at least eight characters long.</p> </section>
<section><title>Combining with other attributes</title><p>When you create
a new database, the <i>bootPassword=key</i> attribute must be combined with
-the <i><xref href="rrefattrib26867.dita#rrefattrib26867"></xref></i> and <i><xref
-href="rrefattrib15290.dita#rrefattrib15290"></xref></i> attributes. </p><p>When
+the <i><xref href="rrefattrib26867.dita#rrefattrib26867">create=true</xref></i> and <i><xref
+href="rrefattrib15290.dita#rrefattrib15290">dataEncryption=true</xref></i> attributes. </p><p>When
you configure an existing unencrypted database for encryption, the <i>bootPassword=key</i> attribute
-must be combined with the <xref href="rrefattrib15290.dita#rrefattrib15290"></xref> attribute. </p><p>When
+must be combined with the <xref href="rrefattrib15290.dita#rrefattrib15290">dataEncryption=true</xref> attribute. </p><p>When
you boot an existing encrypted database, no other attributes are necessary.</p> </section>
<example><title>Examples</title><codeblock><b><ph>-- create a new, encrypted database</ph>
jdbc:derby:newDB;create=true;dataEncryption=true;
Modified: db/derby/docs/trunk/src/ref/rrefattrib42686.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib42686.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib42686.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib42686.dita Wed Mar 7 10:49:17 2007
@@ -19,15 +19,15 @@
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"../dtd/reference.dtd">
<reference id="rrefattrib42686" xml:lang="en-us">
-<title>password=userPassword</title>
+<title>password=userPassword attribute</title>
<prolog><metadata>
-<keywords><indexterm>password=userPassword (database connection URL attribute)</indexterm>
+<keywords><indexterm>password=userPassword database connection URL attribute</indexterm>
</keywords>
</metadata></prolog>
<refbody>
<section><title>Function</title> <p>A valid password for the given user name. </p> </section>
<section><title>Combining with other attributes</title> <p>Use
-in conjunction with <i><xref href="rrefattrib10035.dita#rrefattrib10035"></xref>.</i></p> </section>
+in conjunction with the <i><xref href="rrefattrib10035.dita#rrefattrib10035">user=userName</xref></i> attribute.</p> </section>
<example> <codeblock><b>jdbc:derby:toursDB;user=jack;password=upTheHill</b></codeblock> </example>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rrefattrib56769.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib56769.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib56769.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib56769.dita Wed Mar 7 10:49:17 2007
@@ -19,9 +19,9 @@
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"../dtd/reference.dtd">
<reference id="rrefattrib56769" xml:lang="en-us">
-<title>territory=ll_CC</title>
+<title>territory=ll_CC attribute</title>
<prolog><metadata>
-<keywords><indexterm>territory=ll_CC (database connection URL attribute)</indexterm>
+<keywords><indexterm>territory=ll_CC database connection URL attribute</indexterm>
<indexterm>Databases<indexterm>territory</indexterm></indexterm><indexterm>territory<indexterm>database</indexterm></indexterm>
<indexterm>Internationalization features<indexterm>territory</indexterm></indexterm>
</keywords>
@@ -31,9 +31,9 @@
use this attribute to associate a non-default territory with the database.
Setting the <i>territory</i> attribute overrides the default system territory
for that database. The default system territory is found using <i>java.util.Locale.getDefault()</i>.</p> <p>Specify
-a territory in the form <i>ll_CC</i>, where <i>ll</i> is the two letter language
-code, and <i>CC </i>is the two letter country code. </p> <p>Language codes
-consist of a pair of lower case letters that conform to ISO-639. <table
+a territory in the form <i>ll_CC</i>, where <i>ll</i> is the two-letter language
+code, and <i>CC</i> is the two-letter country code. </p> <p>Language codes
+consist of a pair of lowercase letters that conform to ISO-639. <table
frame="all"><title>Sample Language Codes</title>
<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="50*"/>
<colspec colname="2" colnum="2" colwidth="50*"/>
@@ -63,7 +63,7 @@
</tbody>
</tgroup>
</table></p> <p>To see a full list of ISO-639 codes, go to <xref format="html"
-href="http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt" scope="local"><i>http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt</i></xref
+href="http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt" scope="external"><i>http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt</i></xref
>.</p> <p>Country codes consist of two uppercase letters that conform to ISO-3166.
<table frame="all"><title>Sample Country Codes</title>
<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="50*"/>
@@ -98,7 +98,7 @@
</tbody>
</tgroup>
</table></p> <p>A copy of ISO-3166 can be found at <xref format="html" href="http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html"
-scope="local"><i>http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</i></xref>.</p> </section>
+scope="external"><i>http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</i></xref>.</p> </section>
<section><title>Combining with other attributes</title> <p>The <i>territory</i> attribute
is used only when creating a database.</p> </section>
<example> <p>In the following example, the new database has a territory of
Modified: db/derby/docs/trunk/src/ref/rrefattrib60346.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib60346.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib60346.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib60346.dita Wed Mar 7 10:49:17 2007
@@ -19,9 +19,9 @@
limitations under the License.
-->
<reference id="rrefattrib60346" xml:lang="en-us">
-<title>encryptionAlgorithm=algorithm</title>
+<title>encryptionAlgorithm=algorithm attribute</title>
<prolog><metadata>
-<keywords><indexterm>encryptionAlgorithm=algorithm </indexterm><indexterm>encrypting
+<keywords><indexterm>encryptionAlgorithm=algorithm attribute</indexterm><indexterm>encrypting
databases<indexterm>encryption algorithms</indexterm></indexterm><indexterm>databases<indexterm>attributes,
encryption algorithm</indexterm></indexterm><indexterm>attributes<indexterm>encryptionAlgorithm</indexterm></indexterm>
</keywords>
@@ -32,12 +32,12 @@
></b></b></codeblock></p><p>The only padding type that is allowed with <ph
conref="refconrefs.dita#prod/productshortname"></ph> is <i>NoPadding</i>.</p><p>If
no encryption algorithm is specified, the default value is <i>DES/CBC/NoPadding</i>.</p><p>For
-information about data encryption, see "Encrypting Databases on Disk" in the <cite><ph
+information about data encryption, see "Encrypting databases on disk" in the <cite><ph
conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</p> </section>
<section><title>Combining with other attributes</title> <p>The <i>encryptionAlgorithm</i> attribute
-must be combined with the <i><xref href="rrefattrib42100.dita#rrefattrib42100"></xref></i> attribute
-and the <xref href="rrefattrib15290.dita#rrefattrib15290"></xref> attribute.
-You have the option of also specifying the <i><xref href="rrefattrib88843.dita#rrefattrib88843"></xref></i> attribute
+must be combined with the <i><xref href="rrefattrib42100.dita#rrefattrib42100">bootPassword=key</xref></i> attribute
+and the <xref href="rrefattrib15290.dita#rrefattrib15290">dataEncryption=true</xref> attribute.
+You have the option of also specifying the <i><xref href="rrefattrib88843.dita#rrefattrib88843">encryptionProvider=providerName</xref></i> attribute
to specify the encryption provider of the algorithm.</p></section>
<example> <title>Examples</title><codeblock><b><ph> -- encrypt a new database</ph>
jdbc:derby:encryptedDB;create=true;dataEncryption=true;
Modified: db/derby/docs/trunk/src/ref/rrefattrib72457.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib72457.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib72457.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib72457.dita Wed Mar 7 10:49:17 2007
@@ -19,9 +19,9 @@
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"../dtd/reference.dtd">
<reference id="rrefattrib72457" xml:lang="en-us">
-<title>logDevice=logDirectoryPath</title>
+<title>logDevice=logDirectoryPath attribute</title>
<prolog><metadata>
-<keywords><indexterm>logDevice=logDirectoryPath (database connection URL attribute)</indexterm>
+<keywords><indexterm>logDevice=logDirectoryPath database connection URL attribute</indexterm>
</keywords>
</metadata></prolog>
<refbody>
@@ -30,8 +30,10 @@
creation or restore. Even if specified as a relative path, the <i>logDirectoryPath</i> is
stored internally as an absolute path.</p> </section>
<section><title>Combining with other attributes</title> <p>Use
-in conjunction with <i><xref href="rrefattrib26867.dita#rrefattrib26867"></xref>,
-createFrom, restoreFrom, or rollFowardRecoveryFrom</i>.</p> </section>
+in conjunction with <i><xref href="rrefattrib26867.dita#rrefattrib26867">create</xref>,
+<xref href="rrefcreatefrom.dita#rrefcreatefrom">createFrom</xref>,
+<xref href="rrefrestorefrom.dita#rrefrestorefrom">restoreFrom</xref>,
+or <xref href="rrefrollforward.dita#rrefrollforward">rollForwardRecoveryFrom</xref></i>.</p> </section>
<example> <codeblock><b>jdbc:derby:newDB;create=true;logDevice=d:/newDBlog</b></codeblock> </example>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rrefattrib88843.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib88843.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib88843.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib88843.dita Wed Mar 7 10:49:17 2007
@@ -19,23 +19,23 @@
limitations under the License.
-->
<reference id="rrefattrib88843" xml:lang="en-us">
-<title>encryptionProvider=providerName</title>
+<title>encryptionProvider=providerName attribute</title>
<prolog><metadata>
-<keywords><indexterm>encryptionProvider=providerName</indexterm><indexterm>data
+<keywords><indexterm>encryptionProvider=providerName attribute</indexterm><indexterm>data
encryption<indexterm>providers attribute</indexterm></indexterm><indexterm>encryption<indexterm>providers
attribute</indexterm></indexterm><indexterm>attributes<indexterm>encryptionProvider</indexterm></indexterm>
</keywords>
</metadata></prolog>
<refbody>
<section><title>Function</title><p>Specifies the provider for data encryption.
-For information about data encryption, see "Encrypting Databases on Disk"
+For information about data encryption, see "Encrypting databases on disk"
in the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>. </p><p>If
this attribute is not specified, the default encryption provider is the one
included in the JVM that you are using.</p> </section>
<section><title>Combining with other attributes</title> <p>The <i>encryptionProvider</i> attribute
-must be combined with the <i><xref href="rrefattrib42100.dita#rrefattrib42100"></xref> and <xref
-href="rrefattrib15290.dita#rrefattrib15290"></xref></i> attributes. You can
-also specify the <i><xref href="rrefattrib60346.dita#rrefattrib60346"></xref></i> attribute.</p> </section>
+must be combined with the <i><xref href="rrefattrib42100.dita#rrefattrib42100">bootPassword=key</xref> and <xref
+href="rrefattrib15290.dita#rrefattrib15290">dataEncryption=true</xref></i> attributes. You can
+also specify the <i><xref href="rrefattrib60346.dita#rrefattrib60346">encryptionAlgorithm=algorithm</xref></i> attribute.</p> </section>
<example><title>Examples</title><codeblock><b><ph>-- create a new, encrypted database</ph>
jdbc:derby:encryptedDB;create=true;dataEncryption=true;
encryptionProvider=com.sun.crypto.provider.SunJCE;
Modified: db/derby/docs/trunk/src/ref/rrefattribencryptkey.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattribencryptkey.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattribencryptkey.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattribencryptkey.dita Wed Mar 7 10:49:17 2007
@@ -19,9 +19,9 @@
limitations under the License.
-->
<reference id="rrefattribencryptkey" xml:lang="en-us">
-<title>encryptionKey=<key></title>
+<title>encryptionKey=key attribute</title>
<prolog><metadata>
-<keywords><indexterm>encryptionKey= <key></indexterm><indexterm>encrypting
+<keywords><indexterm>encryptionKey=key attribute</indexterm><indexterm>encrypting
databases<indexterm>encryption key</indexterm></indexterm><indexterm>databases<indexterm>attributes,
encryption key</indexterm></indexterm><indexterm>attributes<indexterm>encryptionKey</indexterm></indexterm>
</keywords>
Modified: db/derby/docs/trunk/src/ref/rrefattribnewbootpw.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattribnewbootpw.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattribnewbootpw.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattribnewbootpw.dita Wed Mar 7 10:49:17 2007
@@ -19,9 +19,9 @@
limitations under the License.
-->
<reference id="rrefattribnewbootpw" xml:lang="en-us">
-<title>newBootPassword = <new password></title>
+<title>newBootPassword=newPassword attribute</title>
<prolog><metadata>
-<keywords><indexterm>newBootPassword= <new password></indexterm><indexterm>encrypting
+<keywords><indexterm>newBootPassword=newPassword attribute</indexterm><indexterm>encrypting
databases<indexterm>new boot password</indexterm></indexterm><indexterm>databases<indexterm>attributes,
new boot password</indexterm></indexterm><indexterm>attributes<indexterm>newBootPassword</indexterm></indexterm>
</keywords>
@@ -34,7 +34,7 @@
about this attribute, see "Encrypting databases with a new boot password"
in the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</p> </section>
<section><title>Combining with other attributes</title><p>The <i>newBootPassword</i> attribute
-must be combined with the <i><xref href="rrefattrib42100.dita#rrefattrib42100"></xref></i> attribute.</p><p>You
+must be combined with the <i><xref href="rrefattrib42100.dita#rrefattrib42100">bootPassword=key</xref></i> attribute.</p><p>You
cannot change the encryption provider or the encryption algorithm when you
use the <i>newBootPassword</i> attribute.</p> </section>
<example><title>Example</title><codeblock><b><ph>-- specify a new boot password for a database</ph>
Modified: db/derby/docs/trunk/src/ref/rrefattribnewencryptkey.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattribnewencryptkey.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattribnewencryptkey.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattribnewencryptkey.dita Wed Mar 7 10:49:17 2007
@@ -19,9 +19,9 @@
limitations under the License.
-->
<reference id="rrefattribnewencryptkey" xml:lang="en-us">
-<title>newEncryptionKey= <key></title>
+<title>newEncryptionKey=key attribute</title>
<prolog><metadata>
-<keywords><indexterm>newEncryptionKey= <new encryption key></indexterm>
+<keywords><indexterm>newEncryptionKey=key attribute</indexterm>
<indexterm>encrypting databases<indexterm>new encryption key</indexterm></indexterm>
<indexterm>databases<indexterm>attributes, new encryption key</indexterm></indexterm>
<indexterm>attributes<indexterm>newEncryptionKey</indexterm></indexterm></keywords>
@@ -31,9 +31,9 @@
for an encrypted database. All of the existing data in the database is encrypted
using the new encryption key and any new data written to the database will
use this key for encryption. For more information about this attribute, see
-"Encrypting databases with a new external key" in the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</p> </section>
+"Encrypting databases with a new external encryption key" in the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</p> </section>
<section><title>Combining with other attributes</title> <p>The <i>newEncryptionKey</i> attribute
-must be combined with the <i><xref href="rrefattribencryptkey.dita#rrefattribencryptkey"></xref></i> attribute.</p><p>You
+must be combined with the <i><xref href="rrefattribencryptkey.dita#rrefattribencryptkey">encryptionKey=key</xref></i> attribute.</p><p>You
cannot change the encryption provider or the encryption algorithm when you
use the <i>newEncryptionKey</i> attribute.</p> </section>
<example><title>Example</title><codeblock><b><ph>-- specify a new encryption key for a database</ph>
Modified: db/derby/docs/trunk/src/ref/rrefcreatefrom.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcreatefrom.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcreatefrom.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcreatefrom.dita Wed Mar 7 10:49:17 2007
@@ -19,24 +19,25 @@
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"../dtd/reference.dtd">
<reference id="rrefcreatefrom" xml:lang="en-us">
-<title>createFrom=Path</title>
+<title>createFrom=path attribute</title>
<prolog><metadata>
-<keywords><indexterm>createFrom=Path (database connection URL attribute)</indexterm>
+<keywords><indexterm>createFrom=path database connection URL attribute</indexterm>
</keywords>
</metadata></prolog>
<refbody>
-<section><title>Function</title> <p>You can specify the <i>createFrom=Path</i> attribute
+<section><title>Function</title> <p>You can specify the <i>createFrom=path</i> attribute
in the boot time connection URL to create a database using a full backup at
a specified location. If there is a database with the same name in derby.system.home,
an error will occur and the existing database will be left intact. If there
is not an existing database with the same name in the current derby.system.home
location, the whole database is copied from the backup location to the derby.system.home
location and started. </p> <p>The Log files are copied to the default location.
-The logDevice attribute can be used in conjunction with <i>createFrom=Path</i> to
-store logs in a different location. With <i>createFrom=Path</i> you do not
+The logDevice attribute can be used in conjunction with <i>createFrom=path</i> to
+store logs in a different location. With <i>createFrom=path</i> you do not
need to copy the individual log files to the log directory.</p> </section>
<section><title>Combining with other attributes</title> <p>Do
-not combine this attribute with rollforwardrecoveryFrom, restoreFrom, or create.</p> </section>
+not combine this attribute with <i>rollForwardRecoveryFrom</i>, <i>restoreFrom</i>, or
+<i>create</i>.</p> </section>
<example> <codeblock>URL: jdbc:derby:wombat;createFrom=d:/backup/wombat</codeblock> </example>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rrefrestorefrom.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefrestorefrom.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefrestorefrom.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefrestorefrom.dita Wed Mar 7 10:49:17 2007
@@ -19,22 +19,23 @@
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"../dtd/reference.dtd">
<reference id="rrefrestorefrom" xml:lang="en-us">
-<title>restoreFrom=Path</title>
+<title>restoreFrom=path attribute</title>
<prolog><metadata>
-<keywords><indexterm>restoreFrom=Path (database connection URL attribute)</indexterm>
+<keywords><indexterm>restoreFrom=path database connection URL attribute</indexterm>
</keywords>
</metadata></prolog>
<refbody>
-<section><title>Function</title> <p>You can specify the <i>restoreFrom=Path</i> attribute
+<section><title>Function</title> <p>You can specify the <i>restoreFrom=path</i> attribute
in the boot time connection URL to restore a database using a full backup
from the specified location. If a database with the same name exists in the
derby.system.home location, the whole database is deleted, copied from the
backup location, and then restarted.</p> <p>The log files are copied to the
same location they were in when the backup was taken. The logDevice attribute
-can be used in conjunction with<i>restoreFrom=Path</i> to store logs in a
+can be used in conjunction with <i>restoreFrom=path</i> to store logs in a
different location.</p> </section>
<section><title>Combining with other attributes</title> <p>Do
-not combine this attribute with createFrom, rollforwardrecoveryFrom, or create.</p> </section>
+not combine this attribute with <i>createFrom</i>,
+<i>rollForwardRecoveryFrom</i>, or <i>create</i>.</p> </section>
<example> <codeblock>URL: jdbc:derby:wombat;restoreFrom=d:/backup/wombat</codeblock> </example>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rrefrollforward.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefrollforward.dita?view=diff&rev=515695&r1=515694&r2=515695
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefrollforward.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefrollforward.dita Wed Mar 7 10:49:17 2007
@@ -19,13 +19,13 @@
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"../dtd/reference.dtd">
<reference id="rrefrollforward" xml:lang="en-us">
-<title>rollForwardRecoveryFrom=Path</title>
+<title>rollForwardRecoveryFrom=path attribute</title>
<prolog><metadata>
-<keywords><indexterm>rollforwardRecovery=Path (database connection URL attribute)</indexterm>
+<keywords><indexterm>rollforwardRecovery=path (database connection URL attribute)</indexterm>
</keywords>
</metadata></prolog>
<refbody>
-<section><title>Function</title> <p>You can specify the <i> rollForwardRecoveryFrom=Path</i> in
+<section><title>Function</title> <p>You can specify the <i> rollForwardRecoveryFrom=path</i> in
the boot time URL to restore the database using a backup copy and perform
rollforward recovery using archived and active logs.</p> <p>To restore a database
using rollforward recovery, you must already have a backup copy of the database,
@@ -34,7 +34,8 @@
from full backup, transactions from the online archived logs and the active
logs are replayed.</p> </section>
<section><title>Combining with other attributes</title> <p>Do
-not combine this attribute with createFrom, restoreFrom, or create.</p> </section>
+not combine this attribute with <i>createFrom</i>, <i>restoreFrom</i>, or
+<i>create</i>.</p> </section>
<example> <codeblock>URL: jdbc:derby:wombat;rollForwardRecoveryFrom=d:/backup/wombat</codeblock> </example>
</refbody>
</reference>