svn commit: r527289 - in /db/derby/docs/trunk/src/ref: rrefattribencryptkey.dita rrefjdbc10889.dita

[sc...@apache.org]

Author: scotsmatrix
Date: Tue Apr 10 13:40:40 2007
New Revision: 527289

URL: http://svn.apache.org/viewvc?view=rev&rev=527289
Log:
DERBY-1933: Updated the commenting scheme in the sample code and corrected bleed off of example in the pdf. The patch derby-1933.diff was submitted by me.

Modified:
    db/derby/docs/trunk/src/ref/rrefattribencryptkey.dita
    db/derby/docs/trunk/src/ref/rrefjdbc10889.dita

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=527289&r1=527288&r2=527289
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattribencryptkey.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattribencryptkey.dita Tue Apr 10 13:40:40 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
- 
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -40,11 +40,11 @@
 if the algorithm that was used when the database was created is not the default
 algorithm. </p><p>The default encryption algorithm used by <ph conref="../conrefs.dita#prod/productshortname"></ph> is
 DES/CBC/NoPadding.</p> </section>
-<example><title>Examples</title><codeblock><b><ph>-- create a new encrypted database</ph>  
-    jdbc:derby:newDB;create=true;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=6162636465666768
-<ph>-- configure an existing unencrypted database for encryption</ph>
-    jdbc:derby:salesdb;dataEncryption=true;encryptionKey=6162636465666768 
-<ph>-- boot an encrypted database</ph>
-    jdbc:derby:encryptedDB;encryptionKey=6162636465666768</b></codeblock> </example>
+<example><title>Examples</title><p><b>Example of a JDBC URL that creates a
+new encrypted database:</b></p><codeblock>jdbc:derby:newDB;create=true;dataEncryption=true;
+   encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=6162636465666768</codeblock><p><b>Example
+of a JDBC URL that configures an existing unencrypted database for encryption:</b><codeblock>jdbc:derby:salesdb;dataEncryption=true;encryptionKey=6162636465666768
+</codeblock></p><p><b>Example of a JDBC URL that boots an encrypted database:</b><codeblock>jdbc:derby:encryptedDB;encryptionKey=6162636465666768</codeblock
+></p> </example>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rrefjdbc10889.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc10889.dita?view=diff&rev=527289&r1=527288&r2=527289
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc10889.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc10889.dita Tue Apr 10 13:40:40 2007
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -21,6 +22,7 @@
 <title>Attributes of the Derby database connection URL </title>
 <prolog><metadata>
 <keywords><indexterm>Database connection URL<indexterm>attributes</indexterm></indexterm>
+<indexterm>Database connection URL<indexterm>Properties object</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
@@ -31,21 +33,21 @@
 as system properties, only in an object passed to the <i>DriverManager.getConnection</i> method.)</p></section>
 <section><p>These attributes are specific to <ph conref="../conrefs.dita#prod/productshortname"></ph> and
 are listed in <xref href="rrefattrib24612.dita#rrefattrib24612"></xref>.</p></section>
-<section><p><indexterm>Database connection URL<indexterm>settable through
-Properties in connection call</indexterm></indexterm>Attribute name/value
-pairs are converted into properties and added to the properties provided in
-the connection call. If no properties are provided in the connection call,
-a properties set is created that contains only the properties obtained from
-the database connection URL.   <codeblock><b>import java.util.Properties;
+<section><p>Attribute name/value pairs are converted into properties and added
+to the properties provided in the connection call. If no properties are provided
+in the connection call, a properties set is created that contains only the
+properties obtained from the database connection URL.   <codeblock><b>import java.util.Properties;
 
 Connection conn = DriverManager.getConnection(
     "jdbc:derby:sampleDB;create=true");
-<ph>-- setting an attribute in a Properties object</ph>
+
+<ph>/* setting an attribute in a Properties object */</ph>
 Properties myProps = new Properties();
 myProps.put("create", "true");
 Connection conn = DriverManager.getConnection(
     "jdbc:derby:sampleDB", myProps);
-<ph>-- passing user name and password</ph>
+
+<ph>/* passing user name and password */</ph>
 Connection conn = DriverManager.getConnection(
     "jdbc:derby:sampleDB", "dba", "password");</b></codeblock></p></section>
 <section> <note>Attributes are not parsed for correctness. If you pass in