db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r436974 [1/3] - in /db/derby/docs/branches/10.2: ./ lib/ src/adminguide/ src/devguide/ src/getstart/ src/images/ src/pt_BR/getstart/ src/pt_BR/ref/ src/ref/ src/tools/ src/tuning/ src/workingwithderby/
Date Fri, 25 Aug 2006 22:00:05 GMT
Author: rhillegas
Date: Fri Aug 25 14:59:58 2006
New Revision: 436974

URL: http://svn.apache.org/viewvc?rev=436974&view=rev
Log:
DERBY-1725: Mega-merge docs from trunk to 10.2 branch: No JIRA (436666, 433940, 432774), DERBY-1215 (436920), DERBY-1601 (436908), DERBY-1655 (436862, 434236, 434125, 433708, 433307, 433298), DERBY-1685 (434580), DERBY-1747 (434542), DERBY-1682 (434218), DERBY-1731 (434159), DERBY-753 (434003), DERBY-1565 (433873), DERBY-935 / DERBY-1565 (433814), DERBY-1622 (433290, 432775), DERBY-1717 (432771).

Added:
    db/derby/docs/branches/10.2/lib/apache-license-html.html
      - copied unchanged from r436939, db/derby/docs/trunk/lib/apache-license-html.html
    db/derby/docs/branches/10.2/src/adminguide/radmindrdasecmechanism.dita
      - copied unchanged from r436939, db/derby/docs/trunk/src/adminguide/radmindrdasecmechanism.dita
    db/derby/docs/branches/10.2/src/devguide/cdevstandardsxml.dita
      - copied unchanged from r436939, db/derby/docs/trunk/src/devguide/cdevstandardsxml.dita
    db/derby/docs/branches/10.2/src/devguide/tdevdvlpcreateencryptdbextkey.dita
      - copied unchanged from r436939, db/derby/docs/trunk/src/devguide/tdevdvlpcreateencryptdbextkey.dita
    db/derby/docs/branches/10.2/src/images/
      - copied from r436939, db/derby/docs/trunk/src/images/
    db/derby/docs/branches/10.2/src/images/logowithtext.jpg
      - copied unchanged from r436939, db/derby/docs/trunk/src/images/logowithtext.jpg
    db/derby/docs/branches/10.2/src/ref/rrefattribencryptkey.dita
      - copied unchanged from r436939, db/derby/docs/trunk/src/ref/rrefattribencryptkey.dita
    db/derby/docs/branches/10.2/src/ref/rrefbackupdbnowaitproc.dita
      - copied unchanged from r436939, db/derby/docs/trunk/src/ref/rrefbackupdbnowaitproc.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncxmlexists.dita
      - copied unchanged from r436939, db/derby/docs/trunk/src/ref/rreffuncxmlexists.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncxmlparse.dita
      - copied unchanged from r436939, db/derby/docs/trunk/src/ref/rreffuncxmlparse.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncxmlquery.dita
      - copied unchanged from r436939, db/derby/docs/trunk/src/ref/rreffuncxmlquery.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncxmlserialize.dita
      - copied unchanged from r436939, db/derby/docs/trunk/src/ref/rreffuncxmlserialize.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbcrefsqlxml.dita
      - copied unchanged from r436939, db/derby/docs/trunk/src/ref/rrefjdbcrefsqlxml.dita
    db/derby/docs/branches/10.2/src/ref/rreflimitsxml.dita
      - copied unchanged from r436939, db/derby/docs/trunk/src/ref/rreflimitsxml.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqljtypexml.dita
      - copied unchanged from r436939, db/derby/docs/trunk/src/ref/rrefsqljtypexml.dita
Removed:
    db/derby/docs/branches/10.2/src/adminguide/RVa03912
    db/derby/docs/branches/10.2/src/ref/rrefonlinebackupdbnowaitproc.dita
Modified:
    db/derby/docs/branches/10.2/build.xml
    db/derby/docs/branches/10.2/docs.properties
    db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl
    db/derby/docs/branches/10.2/lib/fo2html.xsl
    db/derby/docs/branches/10.2/src/adminguide/cadminapps49914.dita
    db/derby/docs/branches/10.2/src/adminguide/cadminappsclientsecurity.dita
    db/derby/docs/branches/10.2/src/adminguide/derbyadmin.ditamap
    db/derby/docs/branches/10.2/src/adminguide/radmincopyright.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecure60146.dita
    db/derby/docs/branches/10.2/src/devguide/cdevdvlp30653.dita
    db/derby/docs/branches/10.2/src/devguide/cdevstandards805975.dita
    db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap
    db/derby/docs/branches/10.2/src/devguide/rdevcopyright.dita
    db/derby/docs/branches/10.2/src/devguide/tdevcsecure82556.dita
    db/derby/docs/branches/10.2/src/devguide/tdevdvlp40140.dita
    db/derby/docs/branches/10.2/src/getstart/getstartderby.ditamap
    db/derby/docs/branches/10.2/src/getstart/rgscopyright.dita
    db/derby/docs/branches/10.2/src/pt_BR/getstart/rgsdocs10012.dita
    db/derby/docs/branches/10.2/src/pt_BR/getstart/rgsdocs18277.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc38274.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc80004.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc96386.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbcdatabasemetadata30.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbcjavasqlconnection30.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs12085.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs12813.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs13420.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs22441.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs23241.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs24045.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs24269.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs26665.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs28114.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs33768.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs33921.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs39391.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs40972.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs79888.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabslilanguageitemsysstatistics.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsqlj23075.dita
    db/derby/docs/branches/10.2/src/ref/crefjdbc12657.dita
    db/derby/docs/branches/10.2/src/ref/refderby.ditamap
    db/derby/docs/branches/10.2/src/ref/rrefbuiltchar.dita
    db/derby/docs/branches/10.2/src/ref/rrefcopyright.dita
    db/derby/docs/branches/10.2/src/ref/rrefcreatefunctionstatement.dita
    db/derby/docs/branches/10.2/src/ref/rrefcreateprocedurestatement.dita
    db/derby/docs/branches/10.2/src/ref/rrefdatefunc.dita
    db/derby/docs/branches/10.2/src/ref/rrefdayfunc.dita
    db/derby/docs/branches/10.2/src/ref/rrefdeclaretemptable.dita
    db/derby/docs/branches/10.2/src/ref/rrefexcept71493.dita
    db/derby/docs/branches/10.2/src/ref/rrefhourfunc.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc20377.dita
    db/derby/docs/branches/10.2/src/ref/rrefminutefunc.dita
    db/derby/docs/branches/10.2/src/ref/rrefmonthfunc.dita
    db/derby/docs/branches/10.2/src/ref/rrefsecondfunc.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj33562.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj58560.dita
    db/derby/docs/branches/10.2/src/ref/rreftimefunc.dita
    db/derby/docs/branches/10.2/src/ref/rreftimestampfunc.dita
    db/derby/docs/branches/10.2/src/tools/ctoolsimport27052.dita
    db/derby/docs/branches/10.2/src/tools/derbytools.ditamap
    db/derby/docs/branches/10.2/src/tools/rtoolscopyright.dita
    db/derby/docs/branches/10.2/src/tuning/ctundepth1002853.dita
    db/derby/docs/branches/10.2/src/tuning/ctunperf98197.dita
    db/derby/docs/branches/10.2/src/tuning/ctuntransform25857.dita
    db/derby/docs/branches/10.2/src/tuning/rtuncopyright.dita
    db/derby/docs/branches/10.2/src/tuning/tuningderby.ditamap
    db/derby/docs/branches/10.2/src/workingwithderby/WorkingWithDerby.ditamap
    db/derby/docs/branches/10.2/src/workingwithderby/cwwdactivities.dita
    db/derby/docs/branches/10.2/src/workingwithderby/cwwdsummary.dita
    db/derby/docs/branches/10.2/src/workingwithderby/rwwdactivity3.dita
    db/derby/docs/branches/10.2/src/workingwithderby/rwwdcopyright.dita
    db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity1.dita
    db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity1_Setup.dita
    db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity2.dita
    db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity3_Setup.dita
    db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity4.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=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/build.xml (original)
+++ db/derby/docs/branches/10.2/build.xml Fri Aug 25 14:59:58 2006
@@ -26,7 +26,18 @@
     <echo message="For Brazilian Portuguese output, run &quot;ant pt_BR.usage&quot;"/>
   </target>
 
-  <target name="all" depends="html,pdf,monohtml,pt_BR"/>
+  <!-- PDFs are built as a part of the monohtml target -->
+  <target name="all" depends="html,monohtml,pt_BR"/>
+
+  <!-- targets that build all formats of each manual. PDFs are built  -->
+  <!-- as a dependent of the monohtml target                          -->
+  <target name="adminguide" depends="init,html.adminguide,monohtml.adminguide"/>
+  <target name="devguide" depends="init,html.devguide,monohtml.devguide"/>
+  <target name="getstart" depends="init,html.getstart,monohtml.getstart"/>
+  <target name="ref" depends="init,html.ref,monohtml.ref"/>
+  <target name="tools" depends="init,html.tools,monohtml.tools"/>
+  <target name="tuning" depends="init,html.tuning,monohtml.tuning"/>
+  <target name="workingwithderby" depends="init,html.workingwithderby,monohtml.workingwithderby"/>
 
   <target name="html" depends="init,html.workingwithderby,html.getstart,html.tools,html.devguide,html.adminguide,html.ref,html.tuning"/>
 
@@ -37,6 +48,9 @@
       <fileset dir="${dita.dtd.dir}"/>
     </copy>
     <mkdir dir="${dita.temp.dir}"/>
+    <copy todir="${dita.output.dir}/images">
+      <fileset dir="${dita.src.dir}/images"/>
+    </copy>
   </target>
 
   <target name="check.dita">
@@ -98,18 +112,33 @@
   </target>
 
   <target name="html.dita">
+    <!-- build to temp directory, then move the files over to the correct -->
+    <!-- directory name, prepending the Apache License as we go.          -->
     <mkdir dir="${dita.dir}/temp"/>
-    <mkdir dir="${basedir}/out/${manual.name}"/>
-    <copy todir="${basedir}/out/${manual.name}">
+    <mkdir dir="${basedir}/out/${manual.name}temp"/>
+    <copy todir="${basedir}/out/${manual.name}temp">
       <fileset dir="${dita.dir}/resource"
                includes="index.html"/>
     </copy>
 			
     <ant dir="${dita.dir}" antfile="conductor.xml" target="dita2xhtml" 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}"/>
+      <property name="output.dir" value="${basedir}${file.separator}out${file.separator}${manual.name}temp"/>
       <property name="args.xhtml.toc" value="toc"/>
     </ant>
+    <move todir="${basedir}/out/${manual.name}">
+      <fileset dir="${basedir}/out/${manual.name}temp">
+        <include name="**/*.html"/>
+        <exclude name="**/*.gif"/>
+      </fileset>
+      <filterchain>
+        <concatfilter prepend="${basedir}/lib/apache-license-html.html"/>
+      </filterchain>
+    </move>
+    <!-- move any remaining files over -->
+    <move todir="${basedir}/out/${manual.name}">
+      <fileset dir="${basedir}/out/${manual.name}temp"/>
+    </move>
   </target>
 
   <target name="check.regex.done">
@@ -252,7 +281,7 @@
 
   <!-- Brazilian Portuguese manuals -->
 
-  <target name="pt_BR" depends="init,pt_BR.html,pt_BR.pdf,pt_BR.monohtml"/>
+  <target name="pt_BR" depends="init,pt_BR.html,pt_BR.monohtml"/>
 
   <target name="pt_BR.html" depends="init">
     <ant dir="src/pt_BR" target="pt_BR.adminguide.html"/>

Modified: db/derby/docs/branches/10.2/docs.properties
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/docs.properties?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/docs.properties (original)
+++ db/derby/docs/branches/10.2/docs.properties Fri Aug 25 14:59:58 2006
@@ -5,6 +5,7 @@
 dita.css.dir=${dita.dir}/css
 dita.resource.dir=${dita.dir}/resource
 dita.output.dir=${basedir}/out
+dita.src.dir=${basedir}/src
 dita.temp.dir=${basedir}/temp
 dita.lib.dir=${basedir}/lib
 dita.extname=.dita

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=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl (original)
+++ db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl Fri Aug 25 14:59:58 2006
@@ -165,9 +165,6 @@
       <!-- End of custom art section -->
       <fo:block text-align="left" font-family="Helvetica">
         <!-- set the brand and title -->
-        <fo:block font-size="14pt" line-height="540%" margin-bottom="1in" text-align="right">     
-   <xsl:value-of select="//*[contains(@class,' topic/prodinfo ')]/*[contains(@class,' topic/brand ')]"/>
-</fo:block>
         <fo:block font-size="22pt" font-weight="bold" line-height="140%">
          <xsl:value-of select="//*[contains(@class,' topic/prodinfo ')]/*[contains(@class,' topic/prodname ')]"/>
         </fo:block>
@@ -242,8 +239,7 @@
 <!-- product specific art, etc. -->
 <fo:block margin-top="2pc" font-family="Helvetica" border-color="black" border-width="thin" padding="6pt">
   <fo:block font-size="12pt" line-height="100%" margin-top="12pc" margin-bottom="12pc" text-align="right">
-   Derby Logo
-    <!-- one might imbed SVG directly here for use with FOP, for instance -->
+    <fo:external-graphic src="url(../images/logowithtext.jpg)"/>
   </fo:block>
 </fo:block>
 </xsl:template>
@@ -391,7 +387,7 @@
        
   </fo:inline>
         <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-tce2-section"/>
@@ -406,7 +402,7 @@
           <xsl:value-of select="*[contains(@class,' topic/title ')]"/>
         </fo:inline>
         <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-tce3-section"/>
@@ -419,7 +415,7 @@
 <fo:basic-link internal-destination="{string(@id)}">
         <xsl:value-of select="*[contains(@class,' topic/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-tce4-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=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/lib/fo2html.xsl (original)
+++ db/derby/docs/branches/10.2/lib/fo2html.xsl Fri Aug 25 14:59:58 2006
@@ -324,7 +324,10 @@
 </xsl:template>
 
 <xsl:template match="fo:basic-link[@internal-destination]">
-  &anchor;<a href="#{@internal-destination}">&add-style;<xsl:apply-templates/></a>
+
+  <xsl:variable name="citation-id" select="fo:page-number-citation/@ref-id"/>
+
+  &anchor;<a href="#{$citation-id}">&add-style;<xsl:apply-templates/></a>
 </xsl:template>
 
 

Modified: db/derby/docs/branches/10.2/src/adminguide/cadminapps49914.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/cadminapps49914.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/cadminapps49914.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/cadminapps49914.dita Fri Aug 25 14:59:58 2006
@@ -39,11 +39,14 @@
 > <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server
 supports the following security properties:</p>
 <ul>
-<li><i>UserID  (</i><codeph><i>org.apache.derby.jdbc.ClientDataSource.USER_ONLY_SECURITY)</i></codeph> 
+<li><i>UserID  (org.apache.derby.jdbc.ClientDataSource.USER_ONLY_SECURITY)</i>
  <p>When using this mechanism, you must specify only the user property.</p></li>
-<li><i>Encrypted UserID and encrypted password  (org.apache.derby.jdbc.ClientDataSource.ENCRYPTED_USER
-AND_PASSWORD_SECURITY)</i>   <p>When using this mechanism, both password and
+<li><i>Encrypted UserID and encrypted password (org.apache.derby.jdbc.ClientDataSource.ENCRYPTED_USER_AND_PASSWORD_SECURITY)</i>   <p>When using this mechanism, both password and
 user id are encrypted.</p></li>
+<li><i>Strong password substitution (org.apache.derby.jdbc.ClientDataSource.STRONG_PASSWORD_SUBSTITUTE_SECURITY)</i>
+<p>When using this mechanism, a strong password substitute is generated and 
+used to authenticate the user with the network server. The original password is 
+never sent in any form across the network.</p></li>
 </ul>
 <p>The user's name that is specified upon connection is the default schema
 for the connection, if a schema with that name exists. See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for

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=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/cadminappsclientsecurity.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/cadminappsclientsecurity.dita Fri Aug 25 14:59:58 2006
@@ -54,17 +54,23 @@
 <tbody>
 <row>
 <entry colname="col1">User id and password</entry>
-<entry colname="col2">ClientDataSource. CLEAR_TEXT_PASSWORD_SECURITY (0x03)</entry>
+<entry colname="col2">ClientDataSource.CLEAR_TEXT_PASSWORD_SECURITY (0x03)</entry>
 <entry colname="col3">Default if password is set</entry>
 </row>
 <row>
 <entry colname="col1">User id only</entry>
-<entry colname="col2">ClientDataSource. USER_ONLY_SECURITY (0x04)</entry>
+<entry colname="col2">ClientDataSource.USER_ONLY_SECURITY (0x04)</entry>
 <entry colname="col3">Default if password is not set</entry>
 </row>
 <row>
+<entry colname="col1">Strong password substitution</entry>
+<entry colname="col2">ClientDataSource.STRONG_PASSWORD_SUBSTITUTE_SECURITY (0x08)</entry>
+<entry colname="col3">Strong password substitution cannot be used with external 
+Derby authentication schemes (for example, LDAP)</entry>
+</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/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/derbyadmin.ditamap?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/derbyadmin.ditamap (original)
+++ db/derby/docs/branches/10.2/src/adminguide/derbyadmin.ditamap Fri Aug 25 14:59:58 2006
@@ -21,10 +21,11 @@
             under the License.
 -->
 <!--LS 8/1/06 - Updated for Derby-1628-->
+<!--LS 8/23/06 - Updated for Derby-1682-->
 <map title="Server and Administration Guide">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2005"/>
+<copyryear year="2004, 2006"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>
@@ -164,11 +165,13 @@
 </topicref>
 <topicref href="radminconfigportnumber.dita" navtitle="derby.drda.portNumber">
 </topicref>
-<topicref href="radminconfigstartnetworkserver.dita" navtitle="derby.drda.startNetworkServer">
+<topicref href="radmindrdasecmechanism.dita" navtitle="derby.drda.securityMechanism">
 </topicref>
-<topicref href="radmindrdatimeslice.dita" navtitle="derby.drda.timeslice ">
+<topicref href="radminconfigstartnetworkserver.dita" navtitle="derby.drda.startNetworkServer">
 </topicref>
 <topicref href="radmindrdaStreamOutBufferSize.dita" navtitle="derby.drda.streamOutBufferSize">
+</topicref>
+<topicref href="radmindrdatimeslice.dita" navtitle="derby.drda.timeslice ">
 </topicref>
 <topicref href="radminconfig.dita" navtitle="derby.drda.traceAll"></topicref>
 <topicref href="radminconfigdb2jdrdatracedirectory.dita" navtitle="derby.drda.traceDirectory">

Modified: db/derby/docs/branches/10.2/src/adminguide/radmincopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/radmincopyright.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/radmincopyright.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/radmincopyright.dita Fri Aug 25 14:59:58 2006
@@ -20,10 +20,19 @@
 <reference id="radmincopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 1997, 2006 The Apache Software Foundation or its licensors,
-as applicable.</p><p>Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.   You may
-obtain a copy of the License at<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.jpg"/></p>
+<p>Copyright 2004, 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
 required by applicable law or agreed to in writing, software   distributed
 under the License is distributed on an "AS IS" BASIS,   WITHOUT WARRANTIES
 OR CONDITIONS OF ANY KIND, either express or implied.   See the License for

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=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecure60146.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecure60146.dita Fri Aug 25 14:59:58 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -20,35 +20,46 @@
 -->
 <concept id="cdevcsecure60146" xml:lang="en-us">
 <title>Booting an encrypted database</title>
-<shortdesc>Once you have created an encrypted database, you must supply the
-boot password to reboot it.</shortdesc>
+<shortdesc>If you create an encrypted database using the <i>bootPassword</i> attribute,
+you must specify the boot password to reboot the database. If you create an
+encrypted database using the <i>encryptionKey</i> attribute, you must specify
+the <i>encryptionKey</i> to reboot the database.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Encrypted databases<indexterm>booting</indexterm></indexterm>
+<keywords><indexterm>encrypted databases<indexterm>booting</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
 <p>Encrypted databases cannot be booted automatically along with all other
 system databases on system startup (see <i>"derby.system.bootAll" </i> in <cite><ph
 conref="devconrefs.dita#pub/cittuning"></ph></cite>). Instead, you boot encrypted
-databases when you first connect to them.</p>
-<p>For example, to access an encrypted database called <i>wombat,</i> created
-with the boot password clo760uds2caPe<i>,</i> you would use the following
-connection URL:</p>
-<codeblock>jdbc:derby:wombat;bootPassword=clo760uds2caPe</codeblock>
-<p>Once the database is booted, all connections can access the database without
+databases when you first connect to the database.</p>
+<p><dl><dlentry>
+<dt>Booting a database with the <i>bootPassword</i> attribute</dt>
+<dd>To access an encrypted database called <codeph>wombat</codeph> that was
+created with the boot password <codeph>clo760uds2caPe</codeph>, use the following
+connection URL:<codeblock>jdbc:derby:wombat;bootPassword=clo760uds2caPe</codeblock></dd>
+</dlentry><dlentry>
+<dt>Booting a database with the <i>encryptionKey</i> attribute</dt>
+<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>
+</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 thus
-require the boot password:</p>
-<ul>
+<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>
 <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>
 <li>The first connection to the database after the system has been shut down
 and then rebooted</li>
-</ul>
-<note>The boot password is not meant to prevent unauthorized connections to
-the database once it has been booted. To protect a database once it has been
-booted, turn on user authentication (see <xref href="cdevcsecure42374.dita#cdevcsecure42374"></xref>).</note>
+</ul></p>
+<note>The boot password and the encryption key are not meant to prevent unauthorized
+connections to the database after the database is booted. To protect a database
+after it has been booted, turn on user authentication (see <xref href="cdevcsecure42374.dita#cdevcsecure42374"></xref>).</note>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.2/src/devguide/cdevdvlp30653.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevdvlp30653.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevdvlp30653.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevdvlp30653.dita Fri Aug 25 14:59:58 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -19,31 +19,28 @@
 limitations under the License.
 -->
 <concept id="cdevdvlp30653" xml:lang="en-us">
-<title>Database limitations</title>
+<title><ph conref="devconrefs.dita#prod/productshortname"></ph> database limitations</title>
 <shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> databases
 have a few limitations.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Limitations<indexterm>in current version</indexterm></indexterm>
-<indexterm>Indexes<indexterm>limitations of</indexterm><indexterm>not supported
-for CLOB, BLOB, and LONG VARCHAR data types</indexterm></indexterm></keywords>
+<keywords><indexterm>limitations<indexterm>Derby databases</indexterm></indexterm>
+<indexterm>indexes<indexterm>limitations</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<ul>
-<li><i>Indexes are not supported for columns defined on CLOB, BLOB, and LONG
-VARCHAR data types.</i>   <p>If the length of the key columns in an index
-is larger than half the page size of the index, creating an index on those
-key columns for the table fails. For existing indexes, an insert of new rows
-for which the key columns are larger than half of the index page size causes
-the insert to fail.</p> <p>It is generally not recommended to create indexes
-on long columns. It is best to create indexes on small columns that provide
-a quick look-up to larger, unwieldy data in the row. You might not see performance
-improvements if you index long columns. For information about indexes, see <cite><ph
-conref="devconrefs.dita#pub/cittuning"></ph></cite>. </p></li>
-<li><i>The system shuts down if the database log cannot allocate more disk
-space.</i>   <p>A "LogFull" error or some sort of <codeph><i>IOException</i></codeph> will
-occur in the <i>derby.log </i> if the system runs out of space. If the system
-has no more disk space to append to the <i>derby.log</i>, you might not see
-the error messages.</p></li>
-</ul>
+<section><title>Indexes</title><p>Indexes are not supported for columns defined
+on CLOB, BLOB, LONG VARCHAR, and XML data types.</p><p>If the length of the
+key columns in an index is larger than half the page size of the index, creating
+an index on those key columns for the table fails. For existing indexes, an
+insert of new rows for which the key columns are larger than half of the index
+page size causes the insert to fail.</p><p>Avoid creating indexes on long
+columns. Create indexes on small columns that provide a quick look-up to larger,
+unwieldy data in the row. You might not see performance improvements if you
+index long columns. For information about indexes, see <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>. </p></section>
+<section><title>System shutdowns</title><p>The system shuts down if the database
+log cannot allocate more disk space.</p><p>A "LogFull" error or some sort
+of <codeph>IOException</codeph> occurs in the <filepath>derby.log</filepath> file
+when the system runs out of space. If the system has no more disk space to
+append to the <filepath>derby.log</filepath> file, you might not see the error
+messages.</p></section>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.2/src/devguide/cdevstandards805975.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevstandards805975.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevstandards805975.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevstandards805975.dita Fri Aug 25 14:59:58 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -19,10 +19,13 @@
 limitations under the License.
 -->
 <concept id="cdevstandards805975" xml:lang="en-us">
-<title>CLOB, and BLOB</title>
+<title>CLOB and BLOB</title>
 <shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> supports
 the standard CLOB and BLOB data types. BLOB and CLOB values are limited to
 a maximum of 2,147,483,647 characters.</shortdesc>
-<prolog></prolog>
+<prolog><metadata>
+<keywords><indexterm>data types<indexterm>CLOB</indexterm></indexterm><indexterm>data
+types<indexterm>BLOB</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody></conbody>
 </concept>

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=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap Fri Aug 25 14:59:58 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
  "map.dtd">
 <!-- 
@@ -20,7 +21,7 @@
 <map title="Developer's Guide">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2006"/>
+<copyryear year="2004, 2006"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>
@@ -329,6 +330,18 @@
 </relrow>
 <relrow>
 <relcell>
+<topicref href="tdevdvlpcreateencryptdbextkey.dita" navtitle="Creating an encrypted database with an external key">
+</topicref>
+</relcell>
+<relcell>
+<topicref href="tdevdvlp40140.dita" navtitle="Booting an encrypted database">
+</topicref>
+<topicref href="tdevdvlp14496.dita" navtitle="Encrypting a database when you create it">
+</topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
 <topicref href="tdevdvlp40140.dita" navtitle="Booting an encrypted database">
 </topicref>
 </relcell>
@@ -1804,7 +1817,7 @@
 </topicref>
 <topicref href="cdevstandards805949.dita" navtitle="DECIMAL max precision">
 </topicref>
-<topicref href="cdevstandards805975.dita" navtitle="CLOB, and BLOB"></topicref>
+<topicref href="cdevstandards805975.dita" navtitle="CLOB and BLOB"></topicref>
 <topicref href="cdevstandards806001.dita" navtitle="Expressions on LONGs">
 </topicref>
 <topicref href="cdevstandards806027.dita" navtitle="ALTER TABLE"></topicref>
@@ -1827,7 +1840,7 @@
 </topicref>
 <topicref href="cdevstandards805949.dita" navtitle="DECIMAL max precision">
 </topicref>
-<topicref href="cdevstandards805975.dita" navtitle="CLOB, and BLOB"></topicref>
+<topicref href="cdevstandards805975.dita" navtitle="CLOB and BLOB"></topicref>
 <topicref href="cdevstandards806001.dita" navtitle="Expressions on LONGs">
 </topicref>
 <topicref href="cdevstandards806027.dita" navtitle="ALTER TABLE"></topicref>
@@ -1849,7 +1862,7 @@
 </topicref>
 <topicref href="cdevstandards805949.dita" navtitle="DECIMAL max precision">
 </topicref>
-<topicref href="cdevstandards805975.dita" navtitle="CLOB, and BLOB"></topicref>
+<topicref href="cdevstandards805975.dita" navtitle="CLOB and BLOB"></topicref>
 <topicref href="cdevstandards806001.dita" navtitle="Expressions on LONGs">
 </topicref>
 <topicref href="cdevstandards806027.dita" navtitle="ALTER TABLE"></topicref>
@@ -1870,7 +1883,7 @@
 </topicref>
 <topicref href="cdevstandards805949.dita" navtitle="DECIMAL max precision">
 </topicref>
-<topicref href="cdevstandards805975.dita" navtitle="CLOB, and BLOB"></topicref>
+<topicref href="cdevstandards805975.dita" navtitle="CLOB and BLOB"></topicref>
 <topicref href="cdevstandards806001.dita" navtitle="Expressions on LONGs">
 </topicref>
 <topicref href="cdevstandards806027.dita" navtitle="ALTER TABLE"></topicref>
@@ -1890,7 +1903,7 @@
 </topicref>
 <topicref href="cdevstandards805949.dita" navtitle="DECIMAL max precision">
 </topicref>
-<topicref href="cdevstandards805975.dita" navtitle="CLOB, and BLOB"></topicref>
+<topicref href="cdevstandards805975.dita" navtitle="CLOB and BLOB"></topicref>
 <topicref href="cdevstandards806001.dita" navtitle="Expressions on LONGs">
 </topicref>
 <topicref href="cdevstandards806027.dita" navtitle="ALTER TABLE"></topicref>
@@ -1908,7 +1921,7 @@
 </topicref>
 <topicref href="cdevstandards805949.dita" navtitle="DECIMAL max precision">
 </topicref>
-<topicref href="cdevstandards805975.dita" navtitle="CLOB, and BLOB"></topicref>
+<topicref href="cdevstandards805975.dita" navtitle="CLOB and BLOB"></topicref>
 <topicref href="cdevstandards806001.dita" navtitle="Expressions on LONGs">
 </topicref>
 <topicref href="cdevstandards806027.dita" navtitle="ALTER TABLE"></topicref>
@@ -1924,7 +1937,7 @@
 </topicref>
 <topicref href="cdevstandards805949.dita" navtitle="DECIMAL max precision">
 </topicref>
-<topicref href="cdevstandards805975.dita" navtitle="CLOB, and BLOB"></topicref>
+<topicref href="cdevstandards805975.dita" navtitle="CLOB and BLOB"></topicref>
 <topicref href="cdevstandards806001.dita" navtitle="Expressions on LONGs">
 </topicref>
 <topicref href="cdevstandards806027.dita" navtitle="ALTER TABLE"></topicref>
@@ -1950,7 +1963,7 @@
 </topicref>
 </relcell>
 <relcell>
-<topicref href="cdevstandards805975.dita" navtitle="CLOB, and BLOB"></topicref>
+<topicref href="cdevstandards805975.dita" navtitle="CLOB and BLOB"></topicref>
 <topicref href="cdevstandards806001.dita" navtitle="Expressions on LONGs">
 </topicref>
 <topicref href="cdevstandards806027.dita" navtitle="ALTER TABLE"></topicref>
@@ -1958,7 +1971,7 @@
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cdevstandards805975.dita" navtitle="CLOB, and BLOB"></topicref>
+<topicref href="cdevstandards805975.dita" navtitle="CLOB and BLOB"></topicref>
 </relcell>
 <relcell>
 <topicref href="cdevstandards806001.dita" navtitle="Expressions on LONGs">
@@ -1984,6 +1997,13 @@
 <topicref href="cdevdvlp40724.dita" navtitle="The database directory"></topicref>
 </relcell>
 </relrow>
+<relrow>
+<relcell>
+<topicref href="cdevstandardsxml.dita" navtitle="XML data types and operators">
+</topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
 </reltable>
 <topicref href="rdevcopyright.dita" navtitle="Copyright"></topicref>
 <topicref href="cdevdgpref29520.dita" navtitle="About this guide">
@@ -2057,6 +2077,8 @@
 </topicref>
 <topicref href="tdevdvlp14496.dita" navtitle="Encrypting a database when you create it">
 </topicref>
+<topicref href="tdevdvlpcreateencryptdbextkey.dita" navtitle="Creating an encrypted database with an external key">
+</topicref>
 <topicref href="tdevdvlp40140.dita" navtitle="Booting an encrypted database">
 </topicref>
 <topicref href="tdevdvlp36289.dita" navtitle="Specifying attributes in a properties object">
@@ -2420,24 +2442,26 @@
 <topicref href="cdevin38113.dita" navtitle="Messages libraries"></topicref>
 </topicref>
 <topicref href="cdevstandards806118.dita" navtitle="Derby and standards">
-<topicref href="cdevstandards805644.dita" navtitle="Dynamic SQL"></topicref>
+<topicref href="cdevstandards806027.dita" navtitle="ALTER TABLE"></topicref>
+<topicref href="cdevstandards805768.dita" navtitle="Calling functions and procedures">
+</topicref>
+<topicref href="cdevstandards805975.dita" navtitle="CLOB, and BLOB"></topicref>
 <topicref href="cdevstandards805664.dita" navtitle="Cursors"></topicref>
+<topicref href="cdevstandards805949.dita" navtitle="DECIMAL max precision">
+</topicref>
+<topicref href="cdevstandards805644.dita" navtitle="Dynamic SQL"></topicref>
+<topicref href="cdevstandards806001.dita" navtitle="Expressions on LONGs">
+</topicref>
 <topicref href="cdevstandards805690.dita" navtitle="Information schema"></topicref>
+<topicref href="cdevstandards805893.dita" navtitle="NOT NULL characteristic">
+</topicref>
 <topicref href="cdevstandards805716.dita" navtitle="Transactions"></topicref>
 <topicref href="cdevstandards805742.dita" navtitle="Stored routines and PSM">
 </topicref>
-<topicref href="cdevstandards805768.dita" navtitle="Calling functions and procedures">
-</topicref>
 <topicref href="cdevstandards805841.dita" navtitle="Unique constraints and nulls">
 </topicref>
-<topicref href="cdevstandards805893.dita" navtitle="NOT NULL characteristic">
+<topicref href="cdevstandardsxml.dita" navtitle="XML data types and operators">
 </topicref>
-<topicref href="cdevstandards805949.dita" navtitle="DECIMAL max precision">
-</topicref>
-<topicref href="cdevstandards805975.dita" navtitle="CLOB, and BLOB"></topicref>
-<topicref href="cdevstandards806001.dita" navtitle="Expressions on LONGs">
-</topicref>
-<topicref href="cdevstandards806027.dita" navtitle="ALTER TABLE"></topicref>
 </topicref>
 <topicref href="rdevtrademderby.dita" navtitle="Trademarks"></topicref>
 </map>

Modified: db/derby/docs/branches/10.2/src/devguide/rdevcopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/rdevcopyright.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/rdevcopyright.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/rdevcopyright.dita Fri Aug 25 14:59:58 2006
@@ -20,10 +20,19 @@
 <reference id="rdevcopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 1997, 2006 The Apache Software Foundation or its licensors,
-as applicable.</p><p>Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.   You may
-obtain a copy of the License at<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.jpg"/></p>
+<p>Copyright 2004, 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
 required by applicable law or agreed to in writing, software   distributed
 under the License is distributed on an "AS IS" BASIS,   WITHOUT WARRANTIES
 OR CONDITIONS OF ANY KIND, either express or implied.   See the License for

Modified: db/derby/docs/branches/10.2/src/devguide/tdevcsecure82556.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/tdevcsecure82556.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/tdevcsecure82556.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/tdevcsecure82556.dita Fri Aug 25 14:59:58 2006
@@ -42,6 +42,9 @@
 to configure user authorization with system-level properties. This is useful
 when you are developing systems or when all databases have the same level
 of sensitivity.</cmd></step>
+<step><cmd>Check and if necessary configure your Derby network security 
+according to your environment. See the section "Network client security" in the
+<cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite>.</cmd></step>
 </steps>
 <result></result>
 </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=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/tdevdvlp40140.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/tdevdvlp40140.dita Fri Aug 25 14:59:58 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -20,14 +20,30 @@
 -->
 <task id="tdevdvlp40140" xml:lang="en-us">
 <title>Booting an encrypted database</title>
-<shortdesc>You must specify the encryption key with the <i>bootPassword=key</i> attribute
-for an encrypted database when you boot it (which is the first time you connect
-to it within a JVM session or after shutting it down within the same JVM session).</shortdesc>
+<shortdesc>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.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Encrypted databases<indexterm>booting</indexterm></indexterm>
+<keywords><indexterm>encrypted databases<indexterm>booting</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
-<context> <codeblock>jdbc:derby:encryptedDB;bootPassword=DBpassword</codeblock></context>
+<context><p>To boot an existing encrypted database: </p></context>
+<steps>
+<step><cmd>The attribute that you specify depends on how the database was
+originally encrypted: </cmd>
+<choices>
+<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
+DES/CBC/NoPadding.</p></choice>
+</choices>
+</step>
+</steps>
 </taskbody>
 </task>

Modified: db/derby/docs/branches/10.2/src/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/getstartderby.ditamap?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/getstartderby.ditamap (original)
+++ db/derby/docs/branches/10.2/src/getstart/getstartderby.ditamap Fri Aug 25 14:59:58 2006
@@ -20,7 +20,7 @@
 <map title="Getting Started with Derby">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2006"/>
+<copyryear year="2004, 2006"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>

Modified: db/derby/docs/branches/10.2/src/getstart/rgscopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/rgscopyright.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/rgscopyright.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/rgscopyright.dita Fri Aug 25 14:59:58 2006
@@ -22,10 +22,19 @@
 <reference id="rgscopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 1997, 2006 The Apache Software Foundation or its licensors,
-as applicable.</p><p>Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.   You may
-obtain a copy of the License at<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.jpg"/></p>
+<p>Copyright 2004, 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
 required by applicable law or agreed to in writing, software   distributed
 under the License is distributed on an "AS IS" BASIS,   WITHOUT WARRANTIES
 OR CONDITIONS OF ANY KIND, either express or implied.   See the License for

Modified: db/derby/docs/branches/10.2/src/pt_BR/getstart/rgsdocs10012.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/getstart/rgsdocs10012.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/getstart/rgsdocs10012.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/getstart/rgsdocs10012.dita Fri Aug 25 14:59:58 2006
@@ -22,7 +22,7 @@
 <shortdesc>A sintaxe SQL é apresentada em notação BNF modificada.</shortdesc>
 <refbody>
 <section><p>Os metassímbolos do BNF são:
-<table expanse="column" frame="all" rowheader="firstcol">
+<table pgwide="0" frame="all" rowheader="firstcol">
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="30*"/>
 <colspec colname="2" colnum="2" colwidth="70*"/>
 <thead>

Modified: db/derby/docs/branches/10.2/src/pt_BR/getstart/rgsdocs18277.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/getstart/rgsdocs18277.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/getstart/rgsdocs18277.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/getstart/rgsdocs18277.dita Fri Aug 25 14:59:58 2006
@@ -25,7 +25,7 @@
 <refbody>
 <section>
 <p>
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <title>
 Convenções tipográficas do
 <ph conref="gsconrefs.dita#prod/productshortname"></ph>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc38274.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc38274.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc38274.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc38274.dita Fri Aug 25 14:59:58 2006
@@ -32,7 +32,7 @@
 não verifica a fonte ou possibilidade de atualização das colunas dos
 <i>ResultSets</i>, e portanto sempre retorna as seguintes constantes para os
 seguintes métodos:
-<table expanse="column" frame="all">
+<table pgwide="0" frame="all">
 <tgroup cols="2" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="40*"/>
 <colspec colname="2" colnum="2" colwidth="60*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc80004.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc80004.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc80004.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc80004.dita Fri Aug 25 14:59:58 2006
@@ -29,7 +29,7 @@
 </metadata>
 </prolog>
 <refbody>
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <title>Métodos de conexão do JDBC 2.0 suportados</title>
 <tgroup cols="2" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="20*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc96386.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc96386.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc96386.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbc96386.dita Fri Aug 25 14:59:58 2006
@@ -127,7 +127,7 @@
 </section>
 <section>
 <p>
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <title>Métodos java.sql.Blob do JDBC 2.0 suportados</title>
 <tgroup cols="3" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="13*"/>
@@ -175,7 +175,7 @@
 </tbody>
 </tgroup>
 </table>
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <title>Métodos java.sql.Clob do JDBC 2.0 suportados</title>
 <tgroup cols="3" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="14*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbcdatabasemetadata30.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbcdatabasemetadata30.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbcdatabasemetadata30.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbcdatabasemetadata30.dita Fri Aug 25 14:59:58 2006
@@ -21,7 +21,7 @@
 <reference id="rrefjdbcdatabasemetadata30" xml:lang="pt-br">
 <title>java.sql.DatabaseMetaData </title>
 <refbody>
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <title>Métodos DatabaseMetaData do JDBC 3.0 suportados</title>
 <tgroup cols="3" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="10*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbcjavasqlconnection30.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbcjavasqlconnection30.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbcjavasqlconnection30.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefjdbcjavasqlconnection30.dita Fri Aug 25 14:59:58 2006
@@ -30,7 +30,7 @@
 <refbody>
 <section>
 <p>
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <title>Métodos de conexão do JDBC 3.0 suportados</title>
 <tgroup cols="3" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="11*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs12085.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs12085.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs12085.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs12085.dita Fri Aug 25 14:59:58 2006
@@ -23,7 +23,7 @@
 <refbody>
 <section>
 <p>Descreve os esquemas no banco de dados corrente.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="26*"/>
 <colspec colname="2" colnum="2" colwidth="15*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs12813.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs12813.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs12813.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs12813.dita Fri Aug 25 14:59:58 2006
@@ -29,7 +29,7 @@
 <section>
 <p>Os fornecedores são tabelas, conglomerados e restrições.
 Os dependentes são visões.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="28*"/>
 <colspec colname="2" colnum="2" colwidth="24*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs13420.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs13420.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs13420.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs13420.dita Fri Aug 25 14:59:58 2006
@@ -29,7 +29,7 @@
 <p>O <ph conref="refconrefs.dita#prod/productshortname"></ph> gera um índice
 de apoio para cada restrição de chave estrangeira; o nome deste índice é o
 mesmo de SYSFOREIGNKEYS.CONGLOMERATEID.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="27*"/>
 <colspec colname="2" colnum="2" colwidth="10*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs22441.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs22441.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs22441.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs22441.dita Fri Aug 25 14:59:58 2006
@@ -22,7 +22,7 @@
 <refbody>
 <section>
 <p>Descreve as colunas de todas as tabelas do banco de dados corrente:
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="29*"/>
 <colspec colname="2" colnum="2" colwidth="23*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs23241.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs23241.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs23241.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs23241.dita Fri Aug 25 14:59:58 2006
@@ -26,7 +26,7 @@
 Descreve as informações comuns a todos os tipos de restrição no banco de dados
 corrente (no momento inclui restrições de chave primária, unicidade,
 chave estrangeira e verificação).
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="27*"/>
 <colspec colname="2" colnum="2" colwidth="15*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs24045.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs24045.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs24045.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs24045.dita Fri Aug 25 14:59:58 2006
@@ -23,7 +23,7 @@
 <refbody>
 <section>
 <p>Descreve as definições das visões no banco de dados corrente.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="24*"/>
 <colspec colname="2" colnum="2" colwidth="23*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs24269.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs24269.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs24269.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs24269.dita Fri Aug 25 14:59:58 2006
@@ -23,7 +23,7 @@
 <refbody>
 <section>
 <p>Descreve as tabelas e visões no banco de dados corrente.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="19*"/>
 <colspec colname="2" colnum="2" colwidth="16*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs26665.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs26665.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs26665.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs26665.dita Fri Aug 25 14:59:58 2006
@@ -23,7 +23,7 @@
 <refbody>
 <section>
 <p>Descreve as restrições de verificação no banco de dados corrente.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="27*"/>
 <colspec colname="2" colnum="2" colwidth="24*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs28114.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs28114.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs28114.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs28114.dita Fri Aug 25 14:59:58 2006
@@ -22,7 +22,7 @@
 <refbody>
 <section>
 <p>Descreve os procedimentos e funções no banco de dados.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="18*"/>
 <colspec colname="2" colnum="2" colwidth="29*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs33768.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs33768.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs33768.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs33768.dita Fri Aug 25 14:59:58 2006
@@ -23,7 +23,7 @@
 <refbody>
 <section>
 <p>Contém uma linha por instrução preparada.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="30*"/>
 <colspec colname="2" colnum="2" colwidth="21*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs33921.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs33921.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs33921.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs33921.dita Fri Aug 25 14:59:58 2006
@@ -27,7 +27,7 @@
 O <ph conref="refconrefs.dita#prod/productshortname"></ph> gera um índice
 na tabela para apoiar cada restrição destes tipos.
 O nome do índice é o mesmo de <i>SYSKEYS.CONGLOMERATEID</i>.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="29*"/>
 <colspec colname="2" colnum="2" colwidth="18*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs39391.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs39391.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs39391.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs39391.dita Fri Aug 25 14:59:58 2006
@@ -23,7 +23,7 @@
 <section>
 <p>Descreve os conglomerados do banco de dados corrente.
 O conglomerado é uma unidade de armazenamento, sendo uma tabela ou um índice.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="31*"/>
 <colspec colname="2" colnum="2" colwidth="22*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs40972.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs40972.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs40972.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs40972.dita Fri Aug 25 14:59:58 2006
@@ -23,7 +23,7 @@
 <refbody>
 <section>
 <p>Descreve os arquivos <i>jar</i> armazenados no banco de dados.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="28*"/>
 <colspec colname="2" colnum="2" colwidth="18*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs79888.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs79888.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs79888.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabs79888.dita Fri Aug 25 14:59:58 2006
@@ -22,7 +22,7 @@
 <refbody>
 <section>
 <p>Descreve os gatilhos do banco de dados.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="2784*"/>
 <colspec colname="2" colnum="2" colwidth="2185*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabslilanguageitemsysstatistics.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabslilanguageitemsysstatistics.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabslilanguageitemsysstatistics.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsistabslilanguageitemsysstatistics.dita Fri Aug 25 14:59:58 2006
@@ -22,7 +22,7 @@
 <refbody>
 <section>
 <p>Descreve as estatísticas no banco de dados corrente.
-<table expanse="page" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="26*"/>
 <colspec colname="2" colnum="2" colwidth="15*"/>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsqlj23075.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsqlj23075.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsqlj23075.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsqlj23075.dita Fri Aug 25 14:59:58 2006
@@ -41,7 +41,7 @@
 <section>
 <p>As expressões booleanas podem incluir um ou mais operadores booleanos,
 listados em <xref href="rrefsqlj23075.dita#rrefsqlj23075/sqlj34517"></xref>.
-<table expanse="page" frame="all" id="sqlj34517">
+<table pgwide="1" frame="all" id="sqlj34517">
 <title>
 <ph><indexterm>Operadores booleanos<indexterm>parte da cláusula WHERE</indexterm></indexterm></ph>
 Operadores booleanos SQL

Modified: db/derby/docs/branches/10.2/src/ref/crefjdbc12657.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/crefjdbc12657.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/crefjdbc12657.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/crefjdbc12657.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,25 +18,38 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
 <concept id="crefjdbc12657" xml:lang="en-us">
 <title>JDBC Reference</title>
+<shortdesc><ph conref="refconrefs.dita#prod/productshortname"></ph> comes
+with a built-in JDBC driver. </shortdesc>
 <prolog><metadata>
 <keywords><indexterm>JDBC API<indexterm>Derby implementation of</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p><ph conref="refconrefs.dita#prod/productshortname"></ph> comes with a built-in
-JDBC driver. That makes the JDBC API the only API for working with <ph conref="refconrefs.dita#prod/productshortname"></ph> databases.
+<p>That makes the JDBC API the only API for working with <ph conref="refconrefs.dita#prod/productshortname"></ph> databases.
 The driver is a native protocol all-Java driver (type number four of types
 defined by Sun).</p>
-<p>This chapter provides reference information about <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
+<p>This section provides reference information about <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
 implementation of the JDBC API and documents the way it conforms to the JDBC
 2.0, 3.0, and 4.0 APIs.</p>
 <p>See the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite> for
 task-oriented instructions on working with the driver.</p>
+<p>
+Note that an application run on Java SE 6 uses the JDBC4 versions
+of <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
+JDBC drivers. In that environment,
+<ph conref="refconrefs.dita#prod/productshortname"></ph>'s
+two JDBC
+drivers, the embedded driver and the network client driver,
+implement an early access (late beta) version of the JDBC4
+specification. It is possible that the final version of the JDBC4
+specification may differ from the early access version
+available when
+this manual was written. We expect such discrepancies
+to be minor. These discrepancies, if any, are
+documented in the 10.2 Release Notes.
+</p>
 <p>This JDBC driver implements the standard JDBC interface defined by Sun.
 When invoked from an application running in the same JVM as <ph conref="refconrefs.dita#prod/productshortname"></ph>,
 the JDBC driver supports connections to a <ph conref="refconrefs.dita#prod/productshortname"></ph> database
@@ -49,8 +65,6 @@
 and supplies all the required JDBC interfaces. Unimplemented aspects of the
 JDBC driver return an <i>SQLException</i> with a message stating "Feature
 not implemented" and an <i>SQLState</i> of XJZZZ. These unimplemented parts
-are for features not supported by <ph conref="refconrefs.dita#prod/productshortname"></ph>.
-</p>
+are for features not supported by <ph conref="refconrefs.dita#prod/productshortname"></ph>. </p>
 </conbody>
 </concept>
-

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=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/refderby.ditamap (original)
+++ db/derby/docs/branches/10.2/src/ref/refderby.ditamap Fri Aug 25 14:59:58 2006
@@ -21,7 +21,7 @@
 <map title="Reference Manual">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2005"/>
+<copyryear year="2004, 2006"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>
@@ -49,6 +49,10 @@
 <topicref href="rrefsqljgrant.dita" navtitle="GRANT statement "></topicref>
 </relcell>
 </relrow>
+<relrow>
+<relcell></relcell>
+<relcell></relcell>
+</relrow>
 </reltable>
 <topicref href="rrefcopyright.dita" navtitle="Copyright"></topicref>
 <topicref collection-type="family" href="crefmpref1002477.dita" navtitle="About this guide">
@@ -239,6 +243,11 @@
 <topicref href="rrefsqlj29930.dita" navtitle="UCASE or UPPER"></topicref>
 <topicref href="rrefsqlj42476.dita" navtitle="USER"></topicref>
 <topicref href="rrefbuiltvarchar.dita" navtitle="VARCHAR"></topicref>
+<topicref href="rreffuncxmlexists.dita" navtitle="XMLEXISTS operator"></topicref>
+<topicref href="rreffuncxmlparse.dita" navtitle="XMLPARSE operator"></topicref>
+<topicref href="rreffuncxmlquery.dita" navtitle="XMLQUERY operator"></topicref>
+<topicref href="rreffuncxmlserialize.dita" navtitle="XMLSERIALIZE operator">
+</topicref>
 <topicref href="rrefyearfunc.dita" navtitle="YEAR"></topicref>
 </topicref>
 <topicref collection-type="family" href="crefsqlbuiltinsystemfunctions.dita"
@@ -270,7 +279,7 @@
 </topicref>
 <topicref href="rrefbackupdbproc.dita" navtitle="SYSCS_UTIL.SYSCS_BACKUP_DATABASE">
 </topicref>
-<topicref href="rrefonlinebackupdbnowaitproc.dita" navtitle="SYSC_UTIL.SYSCS_ONLINE_BACKUP_DATABASE_NOWAIT">
+<topicref href="rrefbackupdbnowaitproc.dita" navtitle="SYSC_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT">
 </topicref>
 <topicref href="rrefbackupdbenablelogproc.dita" navtitle="SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE">
 </topicref>
@@ -322,6 +331,7 @@
 <topicref href="rrefsqlj27620.dita" navtitle="TIMESTAMP"></topicref>
 <topicref href="rrefsqlj41207.dita" navtitle="VARCHAR"></topicref>
 <topicref href="rrefsqlj32714.dita" navtitle="VARCHAR FOR BIT DATA"></topicref>
+<topicref href="rrefsqljtypexml.dita" navtitle="XML data type"></topicref>
 </topicref>
 <topicref collection-type="family" href="rrefsqlj19433.dita" navtitle="SQL expressions">
 <topicref collection-type="family" href="rrefsqlj1080779.dita" navtitle="Expression precedence">
@@ -404,24 +414,25 @@
 <topicref collection-type="family" href="rrefjdbc40794.dita" navtitle="java.sql.Statement ">
 <topicref href="rrefso2.dita" navtitle="ResultSet objects "></topicref>
 </topicref>
-<topicref collection-type="family" href="rrefjdbc29874.dita" navtitle="java.sql.PreparedStatement ">
-<topicref href="rrefjavsqlprst.dita" navtitle="Prepared statements and streaming columns ">
-</topicref>
-</topicref>
 <topicref collection-type="family" href="rrefjdbc20485.dita" navtitle="java.sql.CallableStatement ">
 <topicref href="rrefjavcallstatout.dita" navtitle="CallableStatements and OUT Parameters ">
 </topicref>
 <topicref href="rrefjdbc75719.dita" navtitle="CallableStatements and INOUT Parameters ">
 </topicref>
 </topicref>
+<topicref href="rrefjdbc16643.dita" navtitle="java.sql.SQLException "></topicref>
+<topicref collection-type="family" href="rrefjdbc29874.dita" navtitle="java.sql.PreparedStatement ">
+<topicref href="rrefjavsqlprst.dita" navtitle="Prepared statements and streaming columns ">
+</topicref>
+</topicref>
 <topicref collection-type="family" href="rrefjdbc23502.dita" navtitle="java.sql.ResultSet ">
 <topicref href="rrefjavsqlrssc.dita" navtitle="ResultSets and streaming columns ">
 </topicref>
 </topicref>
 <topicref href="rrefjdbc38274.dita" navtitle="java.sql.ResultSetMetaData ">
 </topicref>
-<topicref href="rrefjdbc16643.dita" navtitle="java.sql.SQLException "></topicref>
 <topicref href="rrefjdbc30469.dita" navtitle="java.sql.SQLWarning "></topicref>
+<topicref href="rrefjdbcrefsqlxml.dita" navtitle="java.sql.SQLXML"></topicref>
 <topicref href="rrefjdbc20377.dita" navtitle="Mapping of java.sql.Types to SQL types">
 </topicref>
 <topicref collection-type="family" href="rrefjdbc96386.dita" navtitle="java.sql.Blob and java.sql.Clob">
@@ -500,6 +511,7 @@
 <topicref href="rrefattrib17246.dita" navtitle="databaseName=nameofDatabase">
 </topicref>
 <topicref href="rrefattrib15290.dita" navtitle="dataEncryption=true"></topicref>
+<topicref href="rrefattribencryptkey.dita" navtitle="encryptionKey=key"></topicref>
 <topicref href="rrefattrib88843.dita" navtitle="encryptionProvider=providerName">
 </topicref>
 <topicref href="rrefattrib60346.dita" navtitle="encryptionAlgorithm=algorithm">
@@ -542,14 +554,15 @@
 </topicref>
 <topicref href="rrefsqlj75638.dita" navtitle="Supported territories "></topicref>
 <topicref collection-type="family" href="rreflimits.dita" navtitle="Derby limitations">
-<topicref href="rrefidlengthlimits.dita" navtitle="Limitations on identifier length ">
+<topicref href="rrefdbmlimits.dita" navtitle="Limitations for database manager values">
 </topicref>
-<topicref href="rrefnumericlimits.dita" navtitle="Numeric limitations"></topicref>
-<topicref href="rrefstringlimits.dita" navtitle="String limitations"></topicref>
 <topicref href="rrefdttlimits.dita" navtitle="DATE, TIME, and TIMESTAMP limitations">
 </topicref>
-<topicref href="rrefdbmlimits.dita" navtitle="Limitations for database manager values">
+<topicref href="rrefidlengthlimits.dita" navtitle="Limitations on identifier length ">
 </topicref>
+<topicref href="rrefnumericlimits.dita" navtitle="Numeric limitations"></topicref>
+<topicref href="rrefstringlimits.dita" navtitle="String limitations"></topicref>
+<topicref href="rreflimitsxml.dita" navtitle="XML limitations"></topicref>
 </topicref>
 <topicref href="rreftrademderby.dita" navtitle="Trademarks"></topicref>
 </map>

Modified: db/derby/docs/branches/10.2/src/ref/rrefbuiltchar.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefbuiltchar.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefbuiltchar.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefbuiltchar.dita Fri Aug 25 14:59:58 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,26 @@
 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="rrefbuiltchar" xml:lang="en-us">
 <title>CHAR</title>
+<shortdesc>The CHAR function returns a fixed-length character string representation.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CHAR function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>The CHAR function returns a fixed-length character string representation
-of: <ul>
-<li>a character string, if the first argument is any type of character string.</li>
-<li>a datetime value, if the first argument is a date, time, or timestamp.</li>
-<li>a decimal number, if the first argument is a decimal number.</li>
-<li>a double-precision floating-point number, if the first argument is a DOUBLE
+<section>The representations are: <ul>
+<li>A character string, if the first argument is any type of character string.</li>
+<li>A datetime value, if the first argument is a date, time, or timestamp.</li>
+<li>A decimal number, if the first argument is a decimal number.</li>
+<li>A double-precision floating-point number, if the first argument is a DOUBLE
 or REAL. </li>
-<li>an integer number, if the first argument is a SMALLINT, INTEGER, or BIGINT.</li>
+<li>An integer number, if the first argument is a SMALLINT, INTEGER, or BIGINT.</li>
 </ul>The first argument must be of a built-in data type. The result of the
-function is a fixed-length character string. If the first argument can be
-null, the result can be null. If the first argument is null, the result is
-the null value.</section>
+CHAR function is a fixed-length character string. If the first argument can
+be null, the result can be null. If the first argument is null, the result
+is the null value.  The first argument cannot be an XML value. To convert
+an XML value to a CHAR of a specified length, you must use the SQL/XML serialization
+operator XMLSERIALIZE.</section>
 <section><title>Character to character syntax</title> <codeblock><b>CHAR (<i>CharacterExpression</i> [, <i>integer</i>] ) </b></codeblock> <dl>
 <dlentry>
 <dt>CharacterExpression</dt>
@@ -102,4 +104,3 @@
 four blanks).</p> </example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefcopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefcopyright.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefcopyright.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefcopyright.dita Fri Aug 25 14:59:58 2006
@@ -21,10 +21,19 @@
 <reference id="rrefcopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 1997, 2006 The Apache Software Foundation or its licensors,
-as applicable.</p><p>Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.   You may
-obtain a copy of the License at<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.jpg"/></p>
+<p>Copyright 2004, 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
 required by applicable law or agreed to in writing, software   distributed
 under the License is distributed on an "AS IS" BASIS,   WITHOUT WARRANTIES
 OR CONDITIONS OF ANY KIND, either express or implied.   See the License for

Modified: db/derby/docs/branches/10.2/src/ref/rrefcreatefunctionstatement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefcreatefunctionstatement.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefcreatefunctionstatement.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefcreatefunctionstatement.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -38,9 +39,9 @@
 SYS.</p></example>
 <example id="rrefcrprofunctionparameter"><title>FunctionParameter</title><codeblock><b>[ parameter-Name ] <i>DataType</i></b></codeblock></example>
 <section><p>PararameterName must be unique within a function.</p><p>The syntax
-of <i>DataType</i> is described in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p><note>Long
-data-types such as LONG VARCHAR, LONG VARCHAR FOR BIT DATA, CLOB, and BLOB
-are not allowed as parameters in a CREATE FUNCTION statement.</note></section>
+of <i>DataType</i> is described in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p><note>Data-types
+such as BLOB, CLOB, LONG VARCHAR, LONG VARCHAR FOR BIT DATA, and XML are not
+allowed as parameters in a CREATE FUNCTION statement.</note></section>
 <example id="rrefcrprofunctionelement"> <title>FunctionElement</title><codeblock><b> {
 | LANGUAGE { JAVA }
 | EXTERNAL NAME <i>string</i>

Modified: db/derby/docs/branches/10.2/src/ref/rrefcreateprocedurestatement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefcreateprocedurestatement.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefcreateprocedurestatement.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefcreateprocedurestatement.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -38,9 +39,9 @@
 ></b></codeblock></example>
 <section><p>The default value for a parameter is IN. ParameterName must be
 unique within a procedure.</p><p>The syntax of <i>DataType</i> is described
-in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p><note>Long data-types
-such as LONG VARCHAR, LONG VARCHAR FOR BIT DATA, CLOB, and BLOB are not allowed
-as parameters in a CREATE PROCEDURE statement.</note></section>
+in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p><note>Data-types
+such as BLOB, CLOB, LONG VARCHAR, LONG VARCHAR FOR BIT DATA, and XML are not
+allowed as parameters in a CREATE PROCEDURE statement.</note></section>
 <example id="rrefcrproprocedureelement"> <title>ProcedureElement</title><codeblock><b> { 
 | [ DYNAMIC ] RESULT SETS <i><xref href="rrefsqlj10696.dita#rrefsqlj10696">INTEGER</xref></i>
 | LANGUAGE { JAVA }

Modified: db/derby/docs/branches/10.2/src/ref/rrefdatefunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefdatefunc.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefdatefunc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefdatefunc.dita Fri Aug 25 14:59:58 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,24 +18,22 @@
 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="rrefdatefunc" xml:lang="en-us">
 <title>DATE</title>
+<shortdesc>The DATE function returns a date from a value.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>DATE function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The DATE function returns a date from a value.  The argument
-must be a date, timestamp, a positive number less than or equal to 3,652,059,
-a valid string representation of a date or timestamp, or a string of length
-7 that is not a CLOB or LONG VARCHAR. If the argument is a string of length
-7, it must represent a valid date in the form yyyynnn, where yyyy are digits
-denoting a year, and nnn are digits between 001 and 366, denoting a day of
-that year.  The result of the function is a date. If the argument can be null,
-the result can be null; if the argument is null, the result is the null value. </p> <p>The
-other rules depend on the data type of the argument specified:  <ul>
+<section> <p>The argument must be a date, timestamp, a positive number less
+than or equal to 3,652,059, a valid string representation of a date or timestamp,
+or a string of length 7 that is not a CLOB, LONG VARCHAR, or XML value. If
+the argument is a string of length 7, it must represent a valid date in the
+form yyyynnn, where yyyy are digits denoting a year, and nnn are digits between
+001 and 366, denoting a day of that year.  The result of the function is a
+date. If the argument can be null, the result can be null; if the argument
+is null, the result is the null value. </p> <p>The other rules depend on the
+data type of the argument specified:  <ul>
 <li>If the argument is a date, timestamp, or valid string representation of
 a date or timestamp: The result is the date part of the value.</li>
 <li>If the argument is a number: The result is the date that is n-1 days after
@@ -44,4 +45,3 @@
 <example> <p>This example results in an internal representation of '1988-12-25'.</p> <codeblock><b>VALUES DATE('1988-12-25')</b></codeblock> </example>
 </refbody>
 </reference>
-



Mime
View raw message