db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r439393 - in /db/derby/docs/branches/10.2: ./ lib/ src/adminguide/ src/devguide/ src/pt_BR/ src/ref/ src/tuning/
Date Fri, 01 Sep 2006 17:34:46 GMT
Author: rhillegas
Date: Fri Sep  1 10:34:44 2006
New Revision: 439393

URL: http://svn.apache.org/viewvc?rev=439393&view=rev
Log:
DERBY-1725: Mega-merge docs from trunk to 10.2 branch. This ports the following patches: No JIRA (439040, 438715), DERBY-502 (438714), DERBY-1747 (438322), DERBY-1636 (438307), DERBY-1575 (438290), DERBY-1636 (437069).

Added:
    db/derby/docs/branches/10.2/src/devguide/tdevcsecurenewbootpw.dita
      - copied unchanged from r439136, db/derby/docs/trunk/src/devguide/tdevcsecurenewbootpw.dita
    db/derby/docs/branches/10.2/src/devguide/tdevcsecurenewextkey.dita
      - copied unchanged from r439136, db/derby/docs/trunk/src/devguide/tdevcsecurenewextkey.dita
    db/derby/docs/branches/10.2/src/devguide/tdevcsecurenewkeyoverview.dita
      - copied unchanged from r439136, db/derby/docs/trunk/src/devguide/tdevcsecurenewkeyoverview.dita
    db/derby/docs/branches/10.2/src/devguide/tdevcsecureunencrypteddb.dita
      - copied unchanged from r439136, db/derby/docs/trunk/src/devguide/tdevcsecureunencrypteddb.dita
    db/derby/docs/branches/10.2/src/ref/rrefattribnewbootpw.dita
      - copied unchanged from r439136, db/derby/docs/trunk/src/ref/rrefattribnewbootpw.dita
    db/derby/docs/branches/10.2/src/ref/rrefattribnewencryptkey.dita
      - copied unchanged from r439136, db/derby/docs/trunk/src/ref/rrefattribnewencryptkey.dita
    db/derby/docs/branches/10.2/src/tuning/pstmt_os.gif
      - copied unchanged from r439136, db/derby/docs/trunk/src/tuning/pstmt_os.gif
Removed:
    db/derby/docs/branches/10.2/src/tuning/ptsmt_os.gif
Modified:
    db/derby/docs/branches/10.2/build.xml
    db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl
    db/derby/docs/branches/10.2/lib/fo2html.xsl   (contents, props changed)
    db/derby/docs/branches/10.2/src/adminguide/cadminappsclientsecurity.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecure60146.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecure88690.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecure97760.dita
    db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap
    db/derby/docs/branches/10.2/src/devguide/tdevdvlp14496.dita
    db/derby/docs/branches/10.2/src/devguide/tdevdvlp40140.dita
    db/derby/docs/branches/10.2/src/pt_BR/build.xml
    db/derby/docs/branches/10.2/src/ref/refderby.ditamap
    db/derby/docs/branches/10.2/src/ref/rrefattrib15290.dita
    db/derby/docs/branches/10.2/src/ref/rrefattrib42100.dita
    db/derby/docs/branches/10.2/src/ref/rrefattrib60346.dita
    db/derby/docs/branches/10.2/src/ref/rrefattrib88843.dita
    db/derby/docs/branches/10.2/src/ref/rrefattribencryptkey.dita
    db/derby/docs/branches/10.2/src/ref/rrefcasenullif.dita

Modified: db/derby/docs/branches/10.2/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/build.xml?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/build.xml (original)
+++ db/derby/docs/branches/10.2/build.xml Fri Sep  1 10:34:44 2006
@@ -66,6 +66,7 @@
     <antcall target="html.dita">
       <param name="manual.name" value="workingwithderby"/>
       <param name="manual.ditamap" value="WorkingWithDerby.ditamap"/>
+      <param name="manual.title" value="Working with Derby"/>
     </antcall>
   </target>
 
@@ -73,6 +74,7 @@
     <antcall target="html.dita">
       <param name="manual.name" value="getstart"/>
       <param name="manual.ditamap" value="getstartderby.ditamap"/>
+      <param name="manual.title" value="Getting Started with Derby"/>
     </antcall>
   </target>
 
@@ -80,6 +82,7 @@
     <antcall target="html.dita">
       <param name="manual.name" value="tools"/>
       <param name="manual.ditamap" value="derbytools.ditamap"/>
+      <param name="manual.title" value="Derby Tools and Utilities Guide"/>
     </antcall>
   </target>
 
@@ -87,6 +90,7 @@
     <antcall target="html.dita">
       <param name="manual.name" value="adminguide"/>
       <param name="manual.ditamap" value="derbyadmin.ditamap"/>
+      <param name="manual.title" value="Derby Server and Administration Guide"/>
     </antcall>
   </target>
 
@@ -94,6 +98,7 @@
     <antcall target="html.dita">
       <param name="manual.name" value="devguide"/>
       <param name="manual.ditamap" value="derbydev.ditamap"/>
+      <param name="manual.title" value="Derby Developer's Guide"/>
     </antcall>
   </target>
 
@@ -101,6 +106,7 @@
     <antcall target="html.dita">
       <param name="manual.name" value="ref"/>
       <param name="manual.ditamap" value="refderby.ditamap"/>
+      <param name="manual.title" value="Derby Reference Manual"/>
     </antcall>
   </target>
 
@@ -108,6 +114,7 @@
     <antcall target="html.dita">
       <param name="manual.name" value="tuning"/>
       <param name="manual.ditamap" value="tuningderby.ditamap"/>
+      <param name="manual.title" value="Tuning Derby"/>
     </antcall>
   </target>
 
@@ -119,6 +126,11 @@
     <copy todir="${basedir}/out/${manual.name}temp">
       <fileset dir="${dita.dir}/resource"
                includes="index.html"/>
+      <filterchain>
+        <tokenfilter>
+          <replaceregex pattern="Web Sample" replace="${manual.title}"/>
+        </tokenfilter>
+      </filterchain>
     </copy>
 			
     <ant dir="${dita.dir}" antfile="conductor.xml" target="dita2xhtml" inheritAll="true">
@@ -205,7 +217,10 @@
     
   <target name="pdf.dita">
     <mkdir dir="${dita.dir}/temp"/>
-    <mkdir dir="${basedir}/out/${manual.name}"/>
+    <mkdir dir="${dita.output.dir}/${manual.name}"/>
+    <copy todir="${dita.output.dir}/${manual.name}">
+      <fileset dir="${dita.src.dir}/${manual.name}" includes="*.jpg"/>
+    </copy>
     <ant dir="${dita.dir}" antfile="conductor.xml" target="dita2pdf" inheritAll="true">
       <property name="args.input" value="${basedir}${file.separator}src${file.separator}${manual.name}${file.separator}${manual.ditamap}"/>
       <property name="output.dir" value="${basedir}${file.separator}out${file.separator}${manual.name}"/>
@@ -303,19 +318,16 @@
 
   <target name="pt_BR.adminguide" depends="init">
     <ant dir="src/pt_BR" target="pt_BR.adminguide.html"/>
-    <ant dir="src/pt_BR" target="pt_BR.adminguide.pdf"/>
     <ant dir="src/pt_BR" target="pt_BR.adminguide.monohtml"/>
   </target>
 
   <target name="pt_BR.getstart" depends="init">
     <ant dir="src/pt_BR" target="pt_BR.getstart.html"/>
-    <ant dir="src/pt_BR" target="pt_BR.getstart.pdf"/>
     <ant dir="src/pt_BR" target="pt_BR.getstart.monohtml"/>
   </target>
 
   <target name="pt_BR.ref" depends="init">
     <ant dir="src/pt_BR" target="pt_BR.ref.html"/>
-    <ant dir="src/pt_BR" target="pt_BR.ref.pdf"/>
     <ant dir="src/pt_BR" target="pt_BR.ref.monohtml"/>
   </target>
 

Modified: db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl (original)
+++ db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl Fri Sep  1 10:34:44 2006
@@ -146,6 +146,9 @@
   <xsl:template name="front-covers">
     <!-- generate an "outside front cover" page (right side) (sheet 1) -->
     <fo:page-sequence master-reference="cover">
+      <fo:title>
+        <xsl:value-of select="//*[contains(@class,' topic/prodinfo ')]/*[contains(@class,' topic/prodname ')]"/>
+      </fo:title>
      
 <!--Jeff added this here -->
 <fo:static-content flow-name="xsl-region-after">    
@@ -428,7 +431,7 @@
 <fo:basic-link internal-destination="{string(@id)}">
         <xsl:value-of select="*/title"/>
         <fo:leader leader-pattern="dots"/>
-        <fo:page-number-citation ref-id="{generate-id()}"/>
+        <fo:page-number-citation ref-id="{generate-id(@id)}"/>
 	</fo:basic-link>
       </fo:block>
       <xsl:call-template name="get-tce5-section"/>
@@ -441,7 +444,7 @@
 	<fo:basic-link internal-destination="{string(@id)}">
         <xsl:value-of select="*/title"/>
         <fo:leader leader-pattern="dots"/>
-        <fo:page-number-citation ref-id="{generate-id()}"/>
+        <fo:page-number-citation ref-id="{generate-id(@id)}"/>
 	</fo:basic-link>
       </fo:block>
       <!--xsl:call-template name="get-tce6-section"/-->

Modified: db/derby/docs/branches/10.2/lib/fo2html.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/lib/fo2html.xsl?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/lib/fo2html.xsl (original)
+++ db/derby/docs/branches/10.2/lib/fo2html.xsl Fri Sep  1 10:34:44 2006
@@ -39,7 +39,7 @@
       <title>
         <xsl:choose>
           <xsl:when test="descendant::fo:title[1]">
-            <xsl:value-of select="fo:title"/>
+            <xsl:value-of select="descendant::fo:title[1]"/>
           </xsl:when>
           <xsl:otherwise>XSL FO Document</xsl:otherwise>
         </xsl:choose>

Propchange: db/derby/docs/branches/10.2/lib/fo2html.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/docs/branches/10.2/src/adminguide/cadminappsclientsecurity.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/cadminappsclientsecurity.dita?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/cadminappsclientsecurity.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/cadminappsclientsecurity.dita Fri Sep  1 10:34:44 2006
@@ -42,11 +42,11 @@
 is both the user id and password. The default user is APP if no other user
 is specified.<table id="radminappsclientsecuritytable"><title>Security mechanisms
 supported by the Derby Network Client</title>
-<tgroup cols="3"><colspec colname="col1" colwidth="68*"/><colspec colname="col2"
-colwidth="134*"/><colspec colname="col3" colwidth="89*"/>
+<tgroup cols="3"><colspec colname="col1" colwidth="45*"/><colspec colname="col2"
+colwidth="210*"/><colspec colname="col3" colwidth="45*"/>
 <thead>
 <row valign="bottom">
-<entry colname="col1">Security and mechanism</entry>
+<entry colname="col1">Security mechanism</entry>
 <entry colname="col2"><codeph>securityMechanism</codeph> property value</entry>
 <entry colname="col3">Comments</entry>
 </row>
@@ -70,7 +70,7 @@
 </row>
 <row>
 <entry colname="col1">Encrypted user id and encrypted password</entry>
-<entry colname="col2">ClientDataSource.ENCRYPTED_USER_AND_ PASSWORD_SECURITY
+<entry colname="col2">ClientDataSource.ENCRYPTED_USER_AND_PASSWORD_SECURITY
 (0x09)</entry>
 <entry colname="col3">Encryption requires a JCE implementation that supports
 the Diffie-Helman algorithm with a prime of 32 bytes.</entry>

Modified: db/derby/docs/branches/10.2/src/devguide/cdevcsecure60146.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevcsecure60146.dita?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecure60146.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecure60146.dita Fri Sep  1 10:34:44 2006
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
- 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -43,15 +42,15 @@
 <dd>To access an encrypted database called <codeph>flintstone</codeph> that
 was created with the <codeph>encryptionKey=c566bab9ee8b62a5ddb4d9229224c678</codeph> and
 with the <codeph>encryptionAlgorithm=AES/CBC/NoPadding</codeph>, use the following
-connection URL:   <codeblock>jdbc:derby:flintstone;encryptionAlgorithm=AES/CBC/NoPadding;encryptionKey=c566bab9ee8b62a5ddb4d9229224c678  </codeblock
-></dd>
+connection URL:   <codeblock>jdbc:derby:flintstone;encryptionAlgorithm=AES/CBC/NoPadding;
+encryptionKey=c566bab9ee8b62a5ddb4d9229224c678  </codeblock></dd>
 </dlentry></dl></p>
 <p>After the database is booted, all connections can access the database without
 the boot password. Only a connection that boots the database requires the
 key.</p>
 <p>For example, the following connections would boot the database and require
-the boot password or encryption key,depending on what mechanism was used to
-encrypt the database originally:<ul>
+the boot password or encryption key, depending on what mechanism was used
+to encrypt the database originally:<ul>
 <li>The first connection to the database in the JVM session</li>
 <li>The first connection to the database after the database has been explicitly
 shut down</li>

Modified: db/derby/docs/branches/10.2/src/devguide/cdevcsecure88690.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevcsecure88690.dita?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecure88690.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecure88690.dita Fri Sep  1 10:34:44 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -20,12 +20,12 @@
 -->
 <concept id="cdevcsecure88690" xml:lang="en-us">
 <title>Encrypting databases on creation</title>
-<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> allows
-you to configure a database for encryption when you create it. To do so, you
-specify <i>dataEncryption=true</i> on the connection URL.</shortdesc>
+<shortdesc>You configure a <ph conref="devconrefs.dita#prod/productshortname"></ph> database
+for encryption when you create the database by specifying the <i>dataEncryption=true</i> attribute
+on the connection URL.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Encrypted databases<indexterm>creating</indexterm></indexterm>
-<indexterm>Data encryption<indexterm>configuring</indexterm></indexterm><indexterm>Encryption<indexterm>configuring</indexterm></indexterm>
+<keywords><indexterm>encrypting databases<indexterm>on creation</indexterm></indexterm>
+<indexterm>databases<indexterm>encrypting, on creation</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>

Modified: db/derby/docs/branches/10.2/src/devguide/cdevcsecure97760.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevcsecure97760.dita?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecure97760.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecure97760.dita Fri Sep  1 10:34:44 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -22,7 +22,7 @@
 <title>Working with encryption</title>
 <shortdesc>This section describes using encryption in <ph conref="devconrefs.dita#prod/productshortname"></ph>.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Encryption<indexterm>working with</indexterm></indexterm>
+<keywords><indexterm>encryption<indexterm>working with</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody></conbody>

Modified: db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap Fri Sep  1 10:34:44 2006
@@ -29,6 +29,7 @@
 <vrmlist><vrm version="10.2"/></vrmlist>
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
+<!--YOU MUST ADD THE NEW TOPIC TO THE RELTABLE (FOR RELATED LINKS) AND TO THE TOPICREF LIST BELOW THE RELTABLE (TO APPEAR IN THE BOOK TOC AND PDF)-->
 <reltable>
 <relrow>
 <relcell>
@@ -1602,6 +1603,18 @@
 </relrow>
 <relrow>
 <relcell>
+<topicref href="tdevcsecureunencrypteddb.dita" navtitle="Encrypting an existing unencrypted database">
+</topicref>
+</relcell>
+<relcell>
+<topicref href="cdevcsecure60146.dita" navtitle="Booting an encrypted database">
+</topicref>
+<topicref href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
+</topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
 <topicref href="cdevcsecure866716.dita" navtitle="Creating the boot password">
 </topicref>
 </relcell>
@@ -1634,6 +1647,48 @@
 </relrow>
 <relrow>
 <relcell>
+<topicref href="tdevcsecurenewkeyoverview.dita" navtitle="Encrypting databases with a new key">
+</topicref>
+</relcell>
+<relcell>
+<topicref href="tdevcsecureunencrypteddb.dita" navtitle="Encrypting an existing unencrypted database">
+</topicref>
+<topicref href="cdevcsecure88690.dita" navtitle="Encrypting databases on creation">
+</topicref>
+<topicref href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
+</topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="tdevcsecurenewbootpw.dita" navtitle="Encrypting databases with a new boot password">
+</topicref>
+</relcell>
+<relcell>
+<topicref href="cdevcsecure60146.dita" navtitle="Booting an encrypted database">
+</topicref>
+<topicref href="tdevcsecurenewextkey.dita" navtitle="Encrypting databases with a new external key">
+</topicref>
+<topicref href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
+</topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="tdevcsecurenewextkey.dita" navtitle="Encrypting databases with a new external key">
+</topicref>
+</relcell>
+<relcell>
+<topicref href="tdevcsecurenewbootpw.dita" navtitle="Encrypting databases with a new boot password">
+</topicref>
+<topicref href="cdevcsecure60146.dita" navtitle="Booting an encrypted database">
+</topicref>
+<topicref href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
+</topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
 <topicref href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
 </topicref>
 </relcell>
@@ -2370,10 +2425,18 @@
 <topicref href="cdevcsecure97760.dita" navtitle="Working with encryption">
 <topicref href="cdevcsecure88690.dita" navtitle="Encrypting databases on creation">
 </topicref>
+<topicref href="tdevcsecureunencrypteddb.dita" navtitle="Encrypting an existing unencrypted database">
+</topicref>
 <topicref href="cdevcsecure866716.dita" navtitle="Creating the boot password">
 <topicref href="cdevcsecure31493.dita" navtitle="Specifying an alternate encryption provider">
 </topicref>
 <topicref href="cdevcsecure67151.dita" navtitle="Specifying an alternate encryption algorithm">
+</topicref>
+</topicref>
+<topicref href="tdevcsecurenewkeyoverview.dita" navtitle="Encrypting databases with a new key">
+<topicref href="tdevcsecurenewbootpw.dita" linking="sourceonly" navtitle="Encrypting databases with a new boot password">
+</topicref>
+<topicref href="tdevcsecurenewextkey.dita" linking="sourceonly" navtitle="Encrypting databases with a new external key">
 </topicref>
 </topicref>
 <topicref href="cdevcsecure60146.dita" navtitle="Booting an encrypted database">

Modified: db/derby/docs/branches/10.2/src/devguide/tdevdvlp14496.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/tdevdvlp14496.dita?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/tdevdvlp14496.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/tdevdvlp14496.dita Fri Sep  1 10:34:44 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -24,9 +24,10 @@
 database as an encrypted database (one in which the database is encrypted
 on disk). To do this, you use the <i>dataEncryption=true</i> attribute to
 turn on encryption and the <codeph><i>bootPassword=key</i></codeph> attribute
-to specify a key for the encryption.</shortdesc>
+or the encryptionKey attribute to specify a key for the encryption.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Databases<indexterm>encrypting upon creation</indexterm></indexterm>
+<keywords><indexterm>encrypting databases<indexterm>on creation</indexterm></indexterm>
+<indexterm>databases<indexterm>encrypting, on creation</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>

Modified: db/derby/docs/branches/10.2/src/devguide/tdevdvlp40140.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/tdevdvlp40140.dita?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/tdevdvlp40140.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/tdevdvlp40140.dita Fri Sep  1 10:34:44 2006
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
- 
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -37,10 +36,11 @@
 <choice>If the database was encrypted using the bootPassword mechanism, specify
 the <i>bootPassword</i> attribute. For example:<codeblock>jdbc:derby:wombat;bootPassword=clo760uds2caPe </codeblock></choice>
 <choice>If the database was encrypted using an external key, specify the <i>encryptionKey</i> attribute.
-For example: <codeblock>jdbc:derby:flintstone;encryptionAlgorithm=AES/CBC/NoPadding;encryptionKey=c566bab9ee8b62a5ddb4d9229224c678 </codeblock><p
->If the algorithm that was used when the database was created is not the default
-algorithm, you must also specify the <i>encryptionAlgorithm</i> attribute.
-The default encryption algorithm used by <ph conref="devconrefs.dita#prod/productshortname"></ph> is
+For example: <codeblock>jdbc:derby:flintstone;encryptionAlgorithm=AES/CBC/NoPadding;
+encryptionKey=c566bab9ee8b62a5ddb4d9229224c678 </codeblock><p>If the algorithm
+that was used when the database was created is not the default algorithm,
+you must also specify the <i>encryptionAlgorithm</i> attribute. The default
+encryption algorithm used by <ph conref="devconrefs.dita#prod/productshortname"></ph> is
 DES/CBC/NoPadding.</p></choice>
 </choices>
 </step>

Modified: db/derby/docs/branches/10.2/src/pt_BR/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/build.xml?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/build.xml (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/build.xml Fri Sep  1 10:34:44 2006
@@ -27,10 +27,17 @@
     <echo message="For output in all formats, run &quot;ant pt_BR&quot;"/>
   </target>
 
+  <target name="pt_BR.adminguide">
+    <antcall target="pt_BR.adminguide.html"/>
+    <antcall target="pt_BR.adminguide.monohtml"/>
+  </target>
+
+
   <target name="pt_BR.adminguide.html">
     <ant dir="../.." target="html.dita">
       <property name="manual.name" value="pt_BR/adminguide"/>
       <property name="manual.ditamap" value="derbyadmin.ditamap"/>
+      <property name="manual.title" value="Derby"/>
     </ant>
   </target>
 
@@ -50,7 +57,6 @@
 
   <target name="pt_BR.getstart">
     <antcall target="pt_BR.getstart.html"/>
-    <antcall target="pt_BR.getstart.pdf"/>
     <antcall target="pt_BR.getstart.monohtml"/>
   </target>
 
@@ -58,6 +64,7 @@
     <ant dir="../.." target="html.dita">
       <property name="manual.name" value="pt_BR/getstart"/>
       <property name="manual.ditamap" value="getstartderby.ditamap"/>
+      <property name="manual.title" value="Derby"/>
     </ant>
   </target>
 
@@ -77,7 +84,6 @@
 
   <target name="pt_BR.ref">
     <antcall target="pt_BR.ref.html"/>
-    <antcall target="pt_BR.ref.pdf"/>
     <antcall target="pt_BR.ref.monohtml"/>
   </target>
 
@@ -85,6 +91,7 @@
     <ant dir="../.." target="html.dita">
       <property name="manual.name" value="pt_BR/ref"/>
       <property name="manual.ditamap" value="refderby.ditamap"/>
+      <property name="manual.title" value="Derby"/>
     </ant>
   </target>
 

Modified: db/derby/docs/branches/10.2/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/refderby.ditamap?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/refderby.ditamap (original)
+++ db/derby/docs/branches/10.2/src/ref/refderby.ditamap Fri Sep  1 10:34:44 2006
@@ -508,6 +508,7 @@
 <topicref collection-type="family" href="rrefattrib24612.dita" navtitle="Setting attributes for the database connection URL ">
 <topicref href="rrefattrib42100.dita" navtitle="bootPassword=key"></topicref>
 <topicref href="rrefattrib26867.dita" navtitle="create=true"></topicref>
+<topicref href="rrefcreatefrom.dita" navtitle="createFrom=Path"></topicref>
 <topicref href="rrefattrib17246.dita" navtitle="databaseName=nameofDatabase">
 </topicref>
 <topicref href="rrefattrib15290.dita" navtitle="dataEncryption=true"></topicref>
@@ -516,15 +517,18 @@
 </topicref>
 <topicref href="rrefattrib60346.dita" navtitle="encryptionAlgorithm=algorithm">
 </topicref>
-<topicref href="rrefattrib56769.dita" navtitle="territory=ll_CC"></topicref>
 <topicref href="rrefattrib72457.dita" navtitle="logDevice=logDirectoryPath">
 </topicref>
+<topicref href="rrefattribnewencryptkey.dita" navtitle="newEncryptionKey=new encryption key">
+</topicref>
+<topicref href="rrefattribnewbootpw.dita" navtitle="newBootPassword=new password">
+</topicref>
 <topicref href="rrefattrib42686.dita" navtitle="password=userPassword"></topicref>
+<topicref href="rrefrestorefrom.dita" navtitle="restoreFrom=Path"></topicref>
 <topicref href="rrefrollforward.dita" navtitle="rollForwardRecoveryFrom=Path">
 </topicref>
-<topicref href="rrefcreatefrom.dita" navtitle="createFrom=Path"></topicref>
-<topicref href="rrefrestorefrom.dita" navtitle="restoreFrom=Path"></topicref>
 <topicref href="rrefattrib16471.dita" navtitle="shutdown=true"></topicref>
+<topicref href="rrefattrib56769.dita" navtitle="territory=ll_CC"></topicref>
 <topicref href="rrefattrib10035.dita" navtitle="user=userName"></topicref>
 <topicref href="rrefattrib34183.dita" navtitle="(no attributes)"></topicref>
 </topicref>

Modified: db/derby/docs/branches/10.2/src/ref/rrefattrib15290.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefattrib15290.dita?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefattrib15290.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefattrib15290.dita Fri Sep  1 10:34:44 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,27 +18,29 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefattrib15290" xml:lang="en-us">
 <title>dataEncryption=true</title>
 <prolog><metadata>
-<keywords><indexterm>dataEncryption=true (database connection URL attribute)</indexterm>
-<indexterm>Encrypting databases</indexterm><indexterm>Databases<indexterm>encrypting</indexterm></indexterm>
+<keywords><indexterm>dataEncryption=true</indexterm><indexterm>encrypting
+databases<indexterm>data encryption</indexterm></indexterm><indexterm>databases<indexterm>attributes,
+data encryption</indexterm></indexterm><indexterm>attributes<indexterm>dataEncryption</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title> <p>Specifies data encryption on disk for
-a new database. (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>Must
-be combined with <i><xref href="rrefattrib26867.dita#rrefattrib26867"></xref></i> and <i><xref
-href="rrefattrib42100.dita#rrefattrib42100"></xref>.</i> You have the option of also
-specifying <i><xref href="rrefattrib88843.dita#rrefattrib88843"></xref></i> and <i><xref
-href="rrefattrib60346.dita#rrefattrib60346"></xref>.</i></p> </section>
-<example> <codeblock><b>jdbc:derby:encryptedDB;create=true;dataEncryption=true;
-    bootPassword=cLo4u922sc23aPe</b></codeblock> </example>
+<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"
+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>
+<example><title>Examples</title><codeblock><b><ph> -- encrypt a new database</ph>
+jdbc:derby:encryptedDB;create=true;dataEncryption=true;
+    bootPassword=cLo4u922sc23aPe
+ <ph>-- configure an existing unencrypted database for encryption </ph>
+   jdbc:derby:salesdb;dataEncryption=true;bootPassword=cLo4u922sc23aPe 
+</b></codeblock> </example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefattrib42100.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefattrib42100.dita?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefattrib42100.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefattrib42100.dita Fri Sep  1 10:34:44 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,28 +18,34 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefattrib42100" xml:lang="en-us">
 <title>bootPassword=key</title>
 <prolog><metadata>
-<keywords><indexterm>bootPassword=key (database connection URL attribute)</indexterm>
-<indexterm>Encrypting databases</indexterm><indexterm>Databases<indexterm>encrypting</indexterm></indexterm>
+<keywords><indexterm>bootPassword=key</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>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title> <p>Specifies the key to use for encrypting
-a new database or booting an existing encrypted database. Specify an alphanumeric
-string at least eight characters long.</p> </section>
-<section><title>Combining with other attributes</title> <p>When creating a
-new database, must be combined with <i><xref href="rrefattrib26867.dita#rrefattrib26867"></xref></i> and <i><xref
-href="rrefattrib15290.dita#rrefattrib15290"></xref>.</i> When booting an existing
-encrypted database, no other attributes are necessary.</p> <codeblock><b><ph>-- boot an encrypted database</ph>
-jdbc:derby:encryptedDB;bootPassword=cseveryPlace
-<ph>-- create a new, encrypted database</ph>
+<section><title>Function</title><p>Specifies the key to use to : <ul>
+<li>Encrypt a new database</li>
+<li>Configure an existing unencrypted database for encryption</li>
+<li>Boot an existing encrypted database</li>
+</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
+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
+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;
-    bootPassword=cseveryPlace</b></codeblock> </section>
+    bootPassword=cseveryPlace
+<ph>-- configure an existing unencrypted database for encryption</ph>
+jdbc:derby:salesdb;dataEncryption=true;bootPassword=cseveryPlace
+<ph>-- boot an existing encrypted database</ph>
+jdbc:derby:encryptedDB;bootPassword=cseveryPlace
+</b></codeblock></example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefattrib60346.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefattrib60346.dita?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefattrib60346.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefattrib60346.dita Fri Sep  1 10:34:44 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,33 +18,39 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefattrib60346" xml:lang="en-us">
 <title>encryptionAlgorithm=algorithm</title>
 <prolog><metadata>
-<keywords><indexterm>encryptionAlgorithm=algorithm (database connection URL
-attribute)</indexterm><indexterm>Data encryption<indexterm>algorithms</indexterm></indexterm>
-<indexterm>Encryption<indexterm>algorithms</indexterm></indexterm></keywords>
+<keywords><indexterm>encryptionAlgorithm=algorithm </indexterm><indexterm>encrypting
+databases<indexterm>encryption algorithms</indexterm></indexterm><indexterm>databases<indexterm>attributes,
+encryption algorithm</indexterm></indexterm><indexterm>attributes<indexterm>encryptionAlgorithm</indexterm></indexterm>
+</keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title> <p>Specifies the algorithm for data encryption. </p> <p>Specify
-the algorithm per the Java conventions:   <codeblock><b><b><i>algorithmName</i></b>/<b><i>feedbackMode</i></b>/<b><i>padding</i></b></b></codeblock
-></p> <p>The only padding type 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 Chapter
-7 of the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>).</p> </section>
-<section><title>Combining with other attributes</title> <p>Must
-be combined with <i><xref href="rrefattrib26867.dita#rrefattrib26867"></xref>,</i> <i><xref
-href="rrefattrib42100.dita#rrefattrib42100"></xref>, <xref href="rrefattrib15290.dita#rrefattrib15290"></xref>,</i> and <i><xref
-href="rrefattrib88843.dita#rrefattrib88843"></xref>.</i></p> </section>
-<example> <codeblock><b>jdbc:derby:encryptedDB;create=true;dataEncryption=true;
+<section><title>Function</title><p>Specifies the algorithm for data encryption. </p><p>Use
+the Java conventions when you specify the algorithm, for example:   <codeblock><b><b><i>algorithmName</i></b>/<b><i>feedbackMode</i></b>/<b><i>padding</i
+></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
+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
+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;
     encryptionProvider=com.sun.crypto.provider.SunJCE;
     encryptionAlgorithm=DESede/CBC/NoPadding;
-    bootPassword=cLo4u922sc23aPe</b></codeblock> <note>If the specified provider
-does not support the specified algorithm, <ph conref="refconrefs.dita#prod/productshortname"></ph> throws
+    bootPassword=cLo4u922sc23aPe
+<ph>-- configure an existing database for encryption </ph>
+    jdbc:derby:salesdb;dataEncryption=true; 
+    encryptionProvider=com.sun.crypto.provider.SunJCE; 
+    encryptionAlgorithm=DESede/CBC/NoPadding; 
+    bootPassword=cLo4u922sc23aPe 
+</b></codeblock><note>If the specified provider does not support the specified
+algorithm, <ph conref="refconrefs.dita#prod/productshortname"></ph> returns
 an exception.</note> </example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefattrib88843.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefattrib88843.dita?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefattrib88843.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefattrib88843.dita Fri Sep  1 10:34:44 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,29 +18,34 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefattrib88843" xml:lang="en-us">
 <title>encryptionProvider=providerName</title>
 <prolog><metadata>
-<keywords><indexterm>encryptionProvider=providerName (database connection
-URL attribute)</indexterm><indexterm>Data encryption<indexterm>providers</indexterm></indexterm>
-<indexterm>Encryption<indexterm>providers</indexterm></indexterm></keywords>
+<keywords><indexterm>encryptionProvider=providerName</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"
-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>Must be combined
-with <i><xref href="rrefattrib26867.dita#rrefattrib26867"></xref>,</i> <i><xref
-href="rrefattrib42100.dita#rrefattrib42100"></xref>, and <xref href="rrefattrib15290.dita#rrefattrib15290"></xref>.</i> You
-have the option of also specifying <i><xref href="rrefattrib60346.dita#rrefattrib60346"></xref>.</i></p> </section>
-<example> <codeblock><b>jdbc:derby:encryptedDB;create=true;dataEncryption=true;
+<section><title>Function</title><p>Specifies the provider for data encryption.
+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>
+<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;
     encryptionAlgorithm=DESede/CBC/NoPadding;
-    bootPassword=cLo4u922sc23aPe</b></codeblock> </example>
+    bootPassword=cLo4u922sc23aPe
+<ph>-- configure an existing database for encryption </ph>
+    jdbc:derby:salesdb;dataEncryption=true; 
+    encryptionProvider=com.sun.crypto.provider.SunJCE; 
+    encryptionAlgorithm=DESede/CBC/NoPadding; 
+    bootPassword=cLo4u922sc23aPe 
+</b></codeblock> </example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefattribencryptkey.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefattribencryptkey.dita?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefattribencryptkey.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefattribencryptkey.dita Fri Sep  1 10:34:44 2006
@@ -29,22 +29,20 @@
 <refbody>
 <section><title>Function</title><p>Specifies the external key to use to: <ul>
 <li>Encrypt a new database</li>
-<li>Configure an existing database for encryption</li>
+<li>Configure an existing unencrypted database for encryption</li>
 <li>Boot an existing encrypted database</li>
 </ul>Your application must provide the encryption key.</p></section>
 <section><title>Combining with other attributes</title><p>When creating a
 new database, you must combine the <i>encryptionKey</i> attribute with the <i>create=true</i> and <i>dataEncryption=true</i> attributes. </p><p>When
-you configure an existing database for encryption, the <i>encryptionKey</i> attribute
-must be combined with the <i>dataEncryption=true</i> attribute.  If the algorithm
-that was used when the database was created is not the default algorithm,
-you must also specify the <i>encryptionAlgorithm</i> attribute.</p><p>When
+you configure an existing unencrypted database for encryption, the <i>encryptionKey</i> attribute
+must be combined with the <i>dataEncryption=true</i> attribute.</p><p>When
 booting an existing encrypted database, you must also specify the <i>encryptionAlgorithm</i> attribute
 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="refconrefs.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 database for encryption</ph>
+<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>

Modified: db/derby/docs/branches/10.2/src/ref/rrefcasenullif.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefcasenullif.dita?rev=439393&r1=439392&r2=439393&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefcasenullif.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefcasenullif.dita Fri Sep  1 10:34:44 2006
@@ -26,15 +26,30 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<example><title>NULLIF expression syntax</title><codeblock>NULLIF(L, R)</codeblock>The
-NULLIF expression is very similar to the CASE expression. For example: <codeblock>NULLIF(V1,V2)</codeblock> is
-equivalent to the following CASE expression:<codeblock>CASE WHEN V1=V2 THEN NULL ELSE V1 END</codeblock></example>
+<example><title>NULLIF expression syntax</title><codeblock><b>NULLIF ( L, R )</b></codeblock>The
+NULLIF expression is very similar to the CASE expression. For example: <codeblock><b>NULLIF(V1,V2)</b></codeblock> is
+equivalent to the following CASE expression:<codeblock><b>CASE WHEN V1=V2 THEN NULL ELSE V1 END</b></codeblock></example>
 <example><title>CASE expression syntax</title><p>You can place a CASE expression
 anywhere an expression is allowed. It chooses an expression to evaluate based
-on a boolean test.</p><codeblock>CASE WHEN BooleanExpression THEN thenExpression ELSE elseExpression END</codeblock><p><i>ThenExpression</i> and <i
->ElseExpression</i> are both expressions that must be type-compatible. For
+on a boolean test.</p>
+<codeblock><b>CASE 
+  WHEN <i>booleanExpression</i> THEN <i>thenExpression</i> 
+  [ WHEN <i>booleanExpression</i> THEN <i>thenExpression</i> ]...
+  ELSE <i>elseExpression</i> 
+END</b></codeblock>
+<p><i>ThenExpression</i> and <i>elseExpression</i> are both expressions that must be type-compatible. For
 built-in types, this means that the types must be the same or a built-in broadening
-conversion must exist between the types.</p><codeblock><b>-- returns 3</b>
-VALUES CASE WHEN 1=1 THEN 3 ELSE 4 END;</codeblock></example>
+conversion must exist between the types.</p><codeblock><b>-- returns 3
+VALUES CASE WHEN 1=1 THEN 3 ELSE 4 END</b></codeblock>
+<codeblock><b>
+-- returns 7
+VALUES
+   CASE
+      WHEN 1 = 2 THEN 3
+      WHEN 4 = 5 THEN 6
+      ELSE 7
+   END
+</b></codeblock>
+</example>
 </refbody>
 </reference>



Mime
View raw message