db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r911444 - in /db/derby/docs/trunk/src: ./ adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Thu, 18 Feb 2010 15:34:14 GMT
Author: chaase3
Date: Thu Feb 18 15:34:13 2010
New Revision: 911444

URL: http://svn.apache.org/viewvc?rev=911444&view=rev
Log:
DERBY-4547: Documentation: update copyright, version to 2010 and 10.6

Made changes to map and copyright files for all manuals, plus 2 in devguide,  12 in getstart, 1 in ref, 1 in tools, and 1 in tuning.

Patch: DERBY-4547.diff

Modified:
    db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
    db/derby/docs/trunk/src/adminguide/radmincopyright.dita
    db/derby/docs/trunk/src/conrefs.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita
    db/derby/docs/trunk/src/devguide/derbydev.ditamap
    db/derby/docs/trunk/src/devguide/rdevcopyright.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
    db/derby/docs/trunk/src/getstart/cgsintsr.dita
    db/derby/docs/trunk/src/getstart/cwwdsummary.dita
    db/derby/docs/trunk/src/getstart/getstartderby.ditamap
    db/derby/docs/trunk/src/getstart/rgscopyright.dita
    db/derby/docs/trunk/src/getstart/rgsdocs17307.dita
    db/derby/docs/trunk/src/getstart/rgslib46043.dita
    db/derby/docs/trunk/src/getstart/tgsrunningdblook.dita
    db/derby/docs/trunk/src/getstart/tgsrunningij.dita
    db/derby/docs/trunk/src/getstart/tgsrunningsysinfo.dita
    db/derby/docs/trunk/src/getstart/tgssetupverify.dita
    db/derby/docs/trunk/src/getstart/twwdactivity1.dita
    db/derby/docs/trunk/src/getstart/twwdactivity2.dita
    db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita
    db/derby/docs/trunk/src/getstart/twwdactivity4.dita
    db/derby/docs/trunk/src/ref/refderby.ditamap
    db/derby/docs/trunk/src/ref/rrefcopyright.dita
    db/derby/docs/trunk/src/ref/rrefsqlj81859.dita
    db/derby/docs/trunk/src/tools/derbytools.ditamap
    db/derby/docs/trunk/src/tools/rtoolscopyright.dita
    db/derby/docs/trunk/src/tools/rtoolssysinfo1002629.dita
    db/derby/docs/trunk/src/tuning/ctunoptimzoverride.dita
    db/derby/docs/trunk/src/tuning/rtuncopyright.dita
    db/derby/docs/trunk/src/tuning/tuningderby.ditamap

Modified: db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap (original)
+++ db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap Thu Feb 18 15:34:13 2010
@@ -25,12 +25,12 @@
 <map title="Server and Administration Guide">
 <topicmeta>
 <copyright>
-<copyryear year="2004, 2009"/>
+<copyryear year="2004, 2010"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>
 <prodname>Derby Server and Administration Guide</prodname>
-<vrmlist><vrm version="10.5"/></vrmlist>
+<vrmlist><vrm version="10.6"/></vrmlist>
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
 <topicref href="radmincopyright.dita" navtitle="Copyright"></topicref>

Modified: db/derby/docs/trunk/src/adminguide/radmincopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radmincopyright.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radmincopyright.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radmincopyright.dita Thu Feb 18 15:34:13 2010
@@ -22,7 +22,7 @@
 <title>Copyright</title>
 <refbody>
 <section> <p><image href="../images/logowithtext.jpg"><alt>Logo for Apache
-Derby</alt></image></p> <p>Copyright 2004-2009 The Apache Software Foundation</p> <p> Licensed
+Derby</alt></image></p> <p>Copyright 2004-2010 The Apache Software Foundation</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 <xref format="html" href="http://www.apache.org/licenses/LICENSE-2.0" scope="external">http://www.apache.org/licenses/LICENSE-2.0</xref>.</p> </section>

Modified: db/derby/docs/trunk/src/conrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/conrefs.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/conrefs.dita (original)
+++ db/derby/docs/trunk/src/conrefs.dita Thu Feb 18 15:34:13 2010
@@ -36,8 +36,8 @@
 <concept id="vers" xml:lang="en-us">
 <title>Version and release numbers</title>
 <conbody>
-<p><ph id="fullversionnumber">Version 10.5</ph></p>
-<p><ph id="shortversionnumber">10.5</ph></p>
+<p><ph id="fullversionnumber">Version 10.6</ph></p>
+<p><ph id="shortversionnumber">10.6</ph></p>
 </conbody>
 </concept>
 <concept id="pub" xml:lang="en-us">

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita Thu Feb 18 15:34:13 2010
@@ -41,10 +41,10 @@
 <p>When <ph conref="../conrefs.dita#prod/productshortname"></ph> boots a database,
 a message is added to the log file. The message includes the <ph conref="../conrefs.dita#prod/productshortname"></ph> version
 that the database was booted with, for example:</p>
-<codeblock>2009-05-08 17:27:11.199 GMT:
+<codeblock>2010-02-11 22:17:36.174 GMT:
  Booting <ph conref="../conrefs.dita#prod/productshortname"></ph> version The Apache Software Foundation - <ph
 conref="../conrefs.dita#prod/productlongname"></ph> 
--  10.5.1.1 - (764942): instance a816c00e-0121-2140-ffd9-fffff0cfee85
+-  10.6.0.0 - (908506): instance a816c00e-0121-2140-ffd9-fffff0cfee85
 on database directory C:\sampledb</codeblock>
 <p>The number of databases running in a <ph conref="../conrefs.dita#prod/productshortname"></ph> system
 is limited only by the amount of memory available in the JVM.</p>

Modified: db/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Thu Feb 18 15:34:13 2010
@@ -21,12 +21,12 @@
 <map title="Developer's Guide">
 <topicmeta>
 <copyright>
-<copyryear year="2004, 2009"/>
+<copyryear year="2004, 2010"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>
 <prodname>Derby Developer's Guide</prodname>
-<vrmlist><vrm version="10.5"/></vrmlist>
+<vrmlist><vrm version="10.6"/></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)-->

Modified: db/derby/docs/trunk/src/devguide/rdevcopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevcopyright.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcopyright.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcopyright.dita Thu Feb 18 15:34:13 2010
@@ -22,7 +22,7 @@
 <title>Copyright</title>
 <refbody>
 <section> <p><image href="../images/logowithtext.jpg"><alt>Logo for Apache
-Derby</alt></image></p> <p>Copyright 2004-2009 The Apache Software Foundation</p> <p> Licensed
+Derby</alt></image></p> <p>Copyright 2004-2010 The Apache Software Foundation</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 <xref format="html" href="http://www.apache.org/licenses/LICENSE-2.0" scope="external">http://www.apache.org/licenses/LICENSE-2.0</xref>.</p> </section>

Modified: db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita Thu Feb 18 15:34:13 2010
@@ -32,8 +32,10 @@
 the application shuts down the <ph conref="../conrefs.dita#prod/productshortname"></ph> system
 by issuing the following JDBC call:</p><codeblock>DriverManager.getConnection("jdbc:derby:;shutdown=true");</codeblock><p>Shutdown
 commands always raise <i>SQLExceptions</i>.</p><p>When a <ph conref="../conrefs.dita#prod/productshortname"></ph> system
-shuts down, a message goes to the log file:</p><codeblock>2009-05-08 17:28:47.140 GMT:
-Shutting down instance a816c00e-0121-2140-ffd9-fffff0cfee85</codeblock><p>Typically,
+shuts down, a message goes to the log file:</p>
+<codeblock>2010-02-11 22:19:13.372 GMT:
+Shutting down instance a816c00e-0121-2140-ffd9-fffff0cfee85</codeblock>
+<p>Typically,
 an application using an embedded <ph conref="../conrefs.dita#prod/productshortname"></ph> engine
 shuts down <ph conref="../conrefs.dita#prod/productshortname"></ph> just before
 shutting itself down. However, an application can shut down <ph conref="../conrefs.dita#prod/productshortname"></ph> and

Modified: db/derby/docs/trunk/src/getstart/cgsintsr.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsintsr.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsintsr.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsintsr.dita Thu Feb 18 15:34:13 2010
@@ -21,13 +21,13 @@
 <concept id="cgsinstr" xml:lang="en-us">
 <title>System requirements</title>
 <shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> is a database
-engine written completely in Java. The database will run in any certified
+engine written completely in the Java programming language. The database will run in any certified
 Java Virtual Machine (JVM).</shortdesc>
 <conbody>
-<p>You must have a JAVA version 1.4 or higher installed on your computer.
-The Java Development Kit (JDK) is required to perform the activities in the <xref
+<p>You must have a Java Development Kit (JDK) version 1.4 or higher installed on your computer.
+The JDK is required to perform the activities in the <xref
 href="cgstutorialintro.dita#cgstutorialintro"></xref>. </p>
-<p>To check that the correct version of Java is installed, issue the <codeph>java
+<p>To check that the correct version of the JDK is installed, issue the <codeph>java
 -version</codeph> command.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/getstart/cwwdsummary.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cwwdsummary.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cwwdsummary.dita (original)
+++ db/derby/docs/trunk/src/getstart/cwwdsummary.dita Thu Feb 18 15:34:13 2010
@@ -28,10 +28,10 @@
 address your own  specific needs. As your next step in learning about this
 lightweight and powerful tool, visit the <ph conref="../conrefs.dita#prod/productlongname"></ph> Web
 site.</p>
-<lines importance="high">  <b>Use this link:</b>       <xref format="html"
+<lines importance="high"><b>Use this link:</b> <xref format="html"
 href="http://wiki.apache.org/db-derby/WorkingWithDerby" importance="high"
 scope="external"><b>WorkingWithDerby Resources page</b></xref>
-  <b>Browser URL</b>:       <codeph><b>http://wiki.apache.org/db-derby/WorkingWithDerby</b></codeph></lines>
+<b>Browser URL</b>: <codeph><b>http://wiki.apache.org/db-derby/WorkingWithDerby</b></codeph></lines>
 <section><title>Activities summary</title><p>We hope these activities have
 helped you understand the steps needed to create and access <ph conref="../conrefs.dita#prod/productshortname"></ph> databases.
 Although <ph conref="../conrefs.dita#prod/productshortname"></ph> is easy

Modified: db/derby/docs/trunk/src/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/getstartderby.ditamap?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/getstartderby.ditamap (original)
+++ db/derby/docs/trunk/src/getstart/getstartderby.ditamap Thu Feb 18 15:34:13 2010
@@ -21,12 +21,12 @@
 <map title="Getting Started with Derby">
 <topicmeta>
 <copyright>
-<copyryear year="2004, 2009"/>
+<copyryear year="2004, 2010"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>
 <prodname>Getting Started with Derby</prodname>
-<vrmlist><vrm version="10.5"/></vrmlist>
+<vrmlist><vrm version="10.6"/></vrmlist>
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
 <reltable>

Modified: db/derby/docs/trunk/src/getstart/rgscopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rgscopyright.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgscopyright.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgscopyright.dita Thu Feb 18 15:34:13 2010
@@ -22,7 +22,7 @@
 <title>Copyright</title>
 <refbody>
 <section> <p><image href="../images/logowithtext.jpg"><alt>Logo for Apache
-Derby</alt></image></p> <p>Copyright 2004-2009 The Apache Software Foundation</p> <p> Licensed
+Derby</alt></image></p> <p>Copyright 2004-2010 The Apache Software Foundation</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  <xref format="html" href="http://www.apache.org/licenses/LICENSE-2.0"

Modified: db/derby/docs/trunk/src/getstart/rgsdocs17307.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rgsdocs17307.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsdocs17307.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsdocs17307.dita Thu Feb 18 15:34:13 2010
@@ -56,7 +56,7 @@
 </dlentry><dlentry>
 <dt><ph conref="../conrefs.dita#pub/citutilities"></ph></dt>
 <dd>Describes how to use the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
-such as <codeph>dblook</codeph>, <codeph>ij</codeph>, and<codeph>sysinfo</codeph>,
+such as <codeph>dblook</codeph>, <codeph>ij</codeph>, and <codeph>sysinfo</codeph>,
 and how to use the system procedures to import and export data, and how to
 store Java code in the database.</dd>
 </dlentry><dlentry>
@@ -70,7 +70,7 @@
 </dlentry><dlentry>
 <dt><ph conref="../conrefs.dita#prod/productshortname"></ph> API Reference</dt>
 <dd>An API Reference that is automatically generated for all public <ph conref="../conrefs.dita#prod/productshortname"></ph> classes.
-No reference is provided for the JDBC API, which is part of the Java 2 Platform,
+No reference is provided for the JDBC API, which is part of the Java Platform,
 Standard Edition. For more information about the classes in the API, see the <cite><ph
 conref="../conrefs.dita#pub/citref"></ph></cite>.</dd>
 </dlentry></dl><p>You can access the <ph conref="../conrefs.dita#vers/fullversionnumber"></ph> manuals

Modified: db/derby/docs/trunk/src/getstart/rgslib46043.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rgslib46043.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgslib46043.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgslib46043.dita Thu Feb 18 15:34:13 2010
@@ -101,8 +101,8 @@
 <li>derbyLocale_de_DE.jar</li>
 <li>derbyLocale_es.jar</li>
 <li>derbyLocale_fr.jar</li>
-<li>derbyLocale_it.jar</li>
 <li>derbyLocale_hu.jar</li>
+<li>derbyLocale_it.jar</li>
 <li>derbyLocale_ja_JP.jar</li>
 <li>derbyLocale_ko_KR.jar</li>
 <li>derbyLocale_pl.jar</li>

Modified: db/derby/docs/trunk/src/getstart/tgsrunningdblook.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/tgsrunningdblook.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/tgsrunningdblook.dita (original)
+++ db/derby/docs/trunk/src/getstart/tgsrunningdblook.dita Thu Feb 18 15:34:13 2010
@@ -20,7 +20,7 @@
 -->
 <task id="tgsrunningdblook" xml:lang="en-us">
 <title>Running dblook</title>
-<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> <codeph>dblook</codeph> utility
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph>&nbsp;<codeph>dblook</codeph> utility
 is a Data Definition Language (DDL) generation utility.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm><indexterm>Derby</indexterm>tools, dblook</indexterm>

Modified: db/derby/docs/trunk/src/getstart/tgsrunningij.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/tgsrunningij.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/tgsrunningij.dita (original)
+++ db/derby/docs/trunk/src/getstart/tgsrunningij.dita Thu Feb 18 15:34:13 2010
@@ -20,7 +20,7 @@
 -->
 <task id="tgsrunningij" xml:lang="en-us">
 <title>Running ij</title>
-<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> <codeph>ij</codeph> tool
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph>&nbsp;<codeph>ij</codeph> tool
 is a JDBC tool that you can use to run scripts or interactive queries against
 a <ph conref="../conrefs.dita#prod/productshortname"></ph> database.</shortdesc>
 <prolog><metadata>

Modified: db/derby/docs/trunk/src/getstart/tgsrunningsysinfo.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/tgsrunningsysinfo.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/tgsrunningsysinfo.dita (original)
+++ db/derby/docs/trunk/src/getstart/tgsrunningsysinfo.dita Thu Feb 18 15:34:13 2010
@@ -20,7 +20,7 @@
 -->
 <task id="tgsrunningsysinfo" xml:lang="en-us">
 <title>Running sysinfo</title>
-<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> <codeph>sysinfo</codeph> tool
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph>&nbsp;<codeph>sysinfo</codeph> tool
 displays information about your Java environment and your version of <ph conref="../conrefs.dita#prod/productshortname"></ph>.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm><indexterm>Derby</indexterm>tools, sysinfo</indexterm>

Modified: db/derby/docs/trunk/src/getstart/tgssetupverify.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/tgssetupverify.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/tgssetupverify.dita (original)
+++ db/derby/docs/trunk/src/getstart/tgssetupverify.dita Thu Feb 18 15:34:13 2010
@@ -39,9 +39,11 @@
 <step><cmd>Verify that the <codeph>java.exe</codeph> file, version 1.4.2 or,
 higher is in your command execution PATH by opening a command window and running
 the <codeph>java -version</codeph> command.</cmd><stepresult>The output from
-the command looks something like this:<codeblock><systemoutput>java version &quot;1.4.2_04&quot;  
-Java(TM) 2 Runtime Environment, Standard Edition (build 1.4.2_04-b05)  
-Java HotSpot(TM) Client VM (build 1.4.2_04-b05, mixed mode)</systemoutput></codeblock> The
+the command looks something like this:
+<codeblock><systemoutput>java version &quot;1.6.0_17&quot;  
+Java(TM) SE Runtime Environment (build 1.6.0_17-b04)  
+Java HotSpot(TM) Client VM (build 14.3-b01, mixed mode, sharing)</systemoutput></codeblock>
+The
 output you see might be different from what is shown here because the <codeph>java
 -version</codeph> command outputs vendor-specific information. If the command
 produces an error or the version listed is not 1.4 or higher, install a JDK

Modified: db/derby/docs/trunk/src/getstart/twwdactivity1.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/twwdactivity1.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/twwdactivity1.dita (original)
+++ db/derby/docs/trunk/src/getstart/twwdactivity1.dita Thu Feb 18 15:34:13 2010
@@ -47,12 +47,12 @@
 <stentry><lines>UNIX
 (Korn Shell)</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar ij</userinput></b>
-<systemoutput>ij version 10.5</systemoutput></codeblock></stentry>
+<systemoutput>ij version 10.6</systemoutput></codeblock></stentry>
 </strow>
 <strow>
 <stentry><lines>Windows</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar ij</userinput></b>
-<systemoutput>ij version 10.5</systemoutput></codeblock></stentry>
+<systemoutput>ij version 10.6</systemoutput></codeblock></stentry>
 </strow>
 </simpletable></stepxmp></step>
 <step><cmd>Create the database and open a connection to the database using
@@ -143,15 +143,15 @@
 <li>The <codeph>derby.log</codeph> file. This file is a message and error
 log that, under normal circumstances, contains a set of startup messages and
 a shutdown message. <codeblock><systemoutput>----------------------------------------------------------------
-2009-05-08 16:55:29.736 GMT:
+2010-02-11 21:56:41.744 GMT:
  Booting Derby version The Apache Software Foundation - Apache 
-  Derby - 10.5.1.1 - (764942): 
+  Derby - 10.6.0.0 - (908506): 
   instance a816c00e-0121-2126-a56a-000000418588
   on database directory C:\DERBYTUTOR\firstdb  
 
 Database Class Loader started - derby.database.classpath=''
 
-2009-05-08 16:56:37.367 GMT:
+2010-02-11 21:57:38.008 GMT:
 Shutting down instance a816c00e-0121-2126-a56a-000000418588
 ----------------------------------------------------------------</systemoutput></codeblock></li>
 <li>The <codeph>firstdb</codeph> database directory. Within the directory

Modified: db/derby/docs/trunk/src/getstart/twwdactivity2.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/twwdactivity2.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/twwdactivity2.dita (original)
+++ db/derby/docs/trunk/src/getstart/twwdactivity2.dita Thu Feb 18 15:34:13 2010
@@ -49,19 +49,19 @@
 <stentry><lines>UNIX
 (Korn Shell)</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server start</userinput></b>
-<systemoutput>2009-05-08 17:00:50.077 GMT : Security manager
+<systemoutput>2010-02-11 22:00:38.982 GMT GMT : Security manager
  installed using the Basic server security policy.
-2009-05-08 17:00:50.798 GMT : Apache Derby Network
- Server - 10.5.1.1 - (764942) started and ready to
+2010-02-11 22:00:39.661 GMT : Apache Derby Network
+ Server - 10.6.0.0 - (908506) started and ready to
  accept connections on port 1527</systemoutput></codeblock></stentry>
 </strow>
 <strow>
 <stentry><lines>Windows</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server start</userinput></b>
-<systemoutput>2009-05-08 17:00:50.077 GMT : Security manager
+<systemoutput>2010-02-11 22:00:38.982 GMT : Security manager
  installed using the Basic server security policy.
-2009-05-08 17:00:50.798 GMT : Apache Derby Network
- Server - 10.5.1.1 - (764942) started and ready to
+2010-02-11 22:00:39.661 : Apache Derby Network
+ Server - 10.6.0.0 - (908506) started and ready to
  accept connections on port 1527</systemoutput></codeblock></stentry>
 </strow>
 </simpletable></stepxmp><stepresult>A Network Server startup message appears
@@ -80,12 +80,12 @@
 <stentry><lines>UNIX
 (Korn Shell)</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar ij</userinput></b>
-<systemoutput>ij version 10.5</systemoutput></codeblock></stentry>
+<systemoutput>ij version 10.6</systemoutput></codeblock></stentry>
 </strow>
 <strow>
 <stentry><lines>Windows</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar ij</userinput></b>
-<systemoutput>ij version 10.5</systemoutput></codeblock></stentry>
+<systemoutput>ij version 10.6</systemoutput></codeblock></stentry>
 </strow>
 </simpletable></stepxmp><stepresult>You will enter all subsequent commands
 from the network client, so you will type the commands in the Shell-2 command
@@ -132,14 +132,14 @@
 <stentry><lines>UNIX
 (Korn Shell)</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server shutdown</userinput></b>
-<systemoutput>2009-05-08 17:07:25.887 GMT : Apache Derby Network
- Server - 10.5.1.1 - (764942) shutdown</systemoutput></codeblock></stentry>
+<systemoutput>2010-02-11 22:04:30.301 GMT : Apache Derby Network
+ Server - 10.6.0.0 - (908506) shutdown</systemoutput></codeblock></stentry>
 </strow>
 <strow>
 <stentry><lines>Windows</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server shutdown</userinput></b>
-<systemoutput>2009-05-08 17:07:25.887 GMT : Apache Derby Network
- Server - 10.5.1.1 - (764942) shutdown</systemoutput></codeblock></stentry>
+<systemoutput>2010-02-11 22:04:30.301 GMT : Apache Derby Network
+ Server - 10.6.0.0 - (908506) shutdown</systemoutput></codeblock></stentry>
 </strow>
 </simpletable></stepxmp><stepresult>The server shutdown confirmation appears
 in both command windows.</stepresult></step>

Modified: db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita (original)
+++ db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita Thu Feb 18 15:34:13 2010
@@ -90,13 +90,13 @@
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>a peppermint stick</userinput></b>
 <systemoutput>  __________________________________________________________
-On 2009-05-08 13:12:09.058 I wished for a peppermint stick
+On 2010-02-11 17:11:13.838 I wished for a peppermint stick
   __________________________________________________________
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>a long vacation</userinput></b>
 <systemoutput>  __________________________________________________________
-On 2009-05-08 13:12:09.058 I wished for a peppermint stick
-On 2009-05-08 13:12:21.28 I wished for a long vacation
+On 2010-02-11 17:11:13.838 I wished for a peppermint stick
+On 2010-02-11 17:11:19.381 I wished for a long vacation
   __________________________________________________________
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>exit</userinput></b>

Modified: db/derby/docs/trunk/src/getstart/twwdactivity4.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/twwdactivity4.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/twwdactivity4.dita (original)
+++ db/derby/docs/trunk/src/getstart/twwdactivity4.dita Thu Feb 18 15:34:13 2010
@@ -121,19 +121,19 @@
 <stentry><lines>UNIX
 (Korn Shell)</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server start</userinput></b>
-2009-05-08 17:24:16.031 GMT : Security manager
+2010-02-11 22:14:03.613 GMT : Security manager
  installed using the Basic server security policy.
-2009-05-08 17:24:16.665 GMT : Apache Derby Network
- Server - 10.5.1.1 - (764942) started and ready to
+2010-02-11 22:14:04.278 GMT : Apache Derby Network
+ Server - 10.6.0.0 - (908506) started and ready to
  accept connections on port 1527</codeblock></stentry>
 </strow>
 <strow>
 <stentry><lines>Windows</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server start</userinput></b>
-2009-05-08 17:24:16.031 GMT : Security manager
+2010-02-11 22:14:03.613 GMT : Security manager
  installed using the Basic server security policy.
-2009-05-08 17:24:16.665 GMT : Apache Derby Network
- Server - 10.5.1.1 - (764942) started and ready to
+2010-02-11 22:14:04.278 GMT : Apache Derby Network
+ Server - 10.6.0.0 - (908506) started and ready to
  accept connections on port 1527</codeblock></stentry>
 </strow>
 </simpletable> </stepxmp></substep>
@@ -167,17 +167,17 @@
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>a sunny day</userinput></b>
 <systemoutput>  __________________________________________________________
-On 2009-05-08 13:12:09.058 I wished for a peppermint stick
-On 2009-05-08 13:12:21.28 I wished for a long vacation
-On 2009-05-08 13:27:22.581 I wished for a sunny day
+On 2010-02-11 17:11:13.838 I wished for a peppermint stick
+On 2010-02-11 17:11:19.381 I wished for a long vacation
+On 2010-02-11 17:17:43.521 I wished for a sunny day
   __________________________________________________________
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>a new car</userinput></b>
 <systemoutput>  __________________________________________________________
-On 2009-05-08 13:12:09.058 I wished for a peppermint stick
-On 2009-05-08 13:12:21.28 I wished for a long vacation
-On 2009-05-08 13:27:22.581 I wished for a sunny day
-On 2009-05-08 13:27:42.105 I wished for a new car
+On 2010-02-11 17:11:13.838 I wished for a peppermint stick
+On 2010-02-11 17:11:19.381 I wished for a long vacation
+On 2010-02-11 17:17:43.521 I wished for a sunny day
+On 2010-02-11 17:17:48.547 I wished for a new car
   __________________________________________________________
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>exit</userinput></b>
@@ -195,15 +195,15 @@
 <stentry><lines>UNIX
 (Korn Shell)</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server shutdown</userinput></b>
-<systemoutput>2009-05-08 17:28:47.171 GMT : Apache Derby Network
- Server - 10.5.1.1 - (764942) shutdown</systemoutput>
+<systemoutput>2010-02-11 22:19:13.475 GMT : Apache Derby Network
+ Server - 10.6.0.0 - (908506) shutdown</systemoutput>
 </codeblock></stentry>
 </strow>
 <strow>
 <stentry><lines>Windows</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server shutdown</userinput></b>
-<systemoutput>2009-05-08 17:28:47.171 GMT : Apache Derby Network
- Server - 10.5.1.1 - (764942) shutdown</systemoutput>
+<systemoutput>2010-02-11 22:19:13.475 GMT : Apache Derby Network
+ Server - 10.6.0.0 - (908506) shutdown</systemoutput>
 </codeblock></stentry>
 </strow>
 </simpletable> </stepxmp><stepresult>The server shutdown confirmation appears

Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Thu Feb 18 15:34:13 2010
@@ -21,12 +21,12 @@
 <map title="Reference Manual">
 <topicmeta>
 <copyright>
-<copyryear year="2004, 2009"/>
+<copyryear year="2004, 2010"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>
 <prodname>Derby Reference Manual</prodname>
-<vrmlist><vrm version="10.5"/></vrmlist>
+<vrmlist><vrm version="10.6"/></vrmlist>
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
 <!--BELOW - This relationship table is not complete. There wasn't a reltable for the ref manual, so it was added for 10.2 to document the new SQL statements and to enable a link to the Dev Guide.  Each topic (preferably in the order that they appear in the book) should be listed in the reltable and links added. The left side represents the source topic and the right side represents the topics that the source should link to.-->

Modified: db/derby/docs/trunk/src/ref/rrefcopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcopyright.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcopyright.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcopyright.dita Thu Feb 18 15:34:13 2010
@@ -22,7 +22,7 @@
 <title>Copyright</title>
 <refbody>
 <section> <p><image href="../images/logowithtext.jpg"><alt>Logo for Apache
-Derby</alt></image></p> <p>Copyright 2004-2009 The Apache Software Foundation</p> <p> Licensed
+Derby</alt></image></p> <p>Copyright 2004-2010 The Apache Software Foundation</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 <xref format="html" href="http://www.apache.org/licenses/LICENSE-2.0" scope="external">http://www.apache.org/licenses/LICENSE-2.0</xref>.</p> </section>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj81859.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj81859.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj81859.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj81859.dita Thu Feb 18 15:34:13 2010
@@ -93,13 +93,13 @@
 manually inserted data:<codeblock><b>CREATE TABLE tauto(i INT GENERATED BY DEFAULT AS IDENTITY, k INT)
 CREATE UNIQUE INDEX tautoInd ON tauto(i)
 INSERT INTO tauto(k) values 1,2</b></codeblock></p><p>The system will automatically
-generate values for the identity column.  But now you need to manually insert
+generate values for the identity column. But now you need to manually insert
 some data into the identity column:<codeblock><b>INSERT INTO tauto VALUES (3,3)
 INSERT INTO tauto VALUES (4,4)
 INSERT INTO tauto VALUES (5,5)</b></codeblock></p><p>The identity column has
-used values 1 through 5 at this point.  If you now want the system to generate
+used values 1 through 5 at this point. If you now want the system to generate
 a value, the system will generate a 3, which will result in a unique key exception
-because the value 3 has already been manually inserted.  To compensate for
+because the value 3 has already been manually inserted. To compensate for
 the manual inserts, issue an ALTER TABLE statement for the identity column
 with RESTART WITH 6:<codeblock><b>ALTER TABLE tauto ALTER COLUMN i RESTART WITH 6</b></codeblock></p><p>ALTER
 TABLE does not affect any view that references the table being altered. This

Modified: db/derby/docs/trunk/src/tools/derbytools.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/derbytools.ditamap?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/derbytools.ditamap (original)
+++ db/derby/docs/trunk/src/tools/derbytools.ditamap Thu Feb 18 15:34:13 2010
@@ -21,12 +21,12 @@
 <map title="Tools and Utilities Guide">
 <topicmeta>
 <copyright>
-<copyryear year="2004, 2009"/>
+<copyryear year="2004, 2010"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>
 <prodname>Derby Tools and Utilities Guide</prodname>
-<vrmlist><vrm version="10.5"/></vrmlist>
+<vrmlist><vrm version="10.6"/></vrmlist>
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
 <!--The following relationship table is only for the Import and Export topics.  The remaining topics need to be added to this table.-->

Modified: db/derby/docs/trunk/src/tools/rtoolscopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolscopyright.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolscopyright.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolscopyright.dita Thu Feb 18 15:34:13 2010
@@ -22,7 +22,7 @@
 <title>Copyright</title>
 <refbody>
 <section> <p><image href="../images/logowithtext.jpg"><alt>Logo for Apache
-Derby</alt></image></p> <p>Copyright 2004-2009 The Apache Software Foundation</p> <p> Licensed
+Derby</alt></image></p> <p>Copyright 2004-2010 The Apache Software Foundation</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 <xref format="html" href="http://www.apache.org/licenses/LICENSE-2.0" scope="external">http://www.apache.org/licenses/LICENSE-2.0</xref>.</p> </section>

Modified: db/derby/docs/trunk/src/tools/rtoolssysinfo1002629.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolssysinfo1002629.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolssysinfo1002629.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolssysinfo1002629.dita Thu Feb 18 15:34:13 2010
@@ -27,12 +27,12 @@
 <refbody>
 <example>When you run the <codeph>sysinfo</codeph> command using the
 <codeph>derbyrun.jar</codeph> file, the output looks something like this: 
-<codeblock><b>java -jar C:\db-derby-10.5.1.1-bin\lib\derbyrun.jar sysinfo</b>
+<codeblock><b>java -jar C:\db-derby-10.6.0.0-bin\lib\derbyrun.jar sysinfo</b>
 ------------------ Java Information ------------------
-Java Version:    1.6.0_13
+Java Version:    1.6.0_17
 Java Vendor:     Sun Microsystems Inc.
-Java home:       C:\jdk1.6.0_13\jre
-Java classpath:  C:\db-derby-10.5.1.1-bin\lib\derbyrun.jar
+Java home:       C:\jdk1.6.0_17\jre
+Java classpath:  C:\db-derby-10.6.0.0-bin\lib\derbyrun.jar
 OS name:         Windows XP
 OS architecture: x86
 OS version:      5.1
@@ -43,39 +43,39 @@
 java.specification.version: 1.6
 --------- Derby Information --------
 JRE - JDBC: Java SE 6 - JDBC 4.0
-[C:\db-derby-10.5.1.1-bin\lib\derby.jar] 10.5.1.1 - (764942)
-[C:\db-derby-10.5.1.1-bin\lib\derbytools.jar] 10.5.1.1 - (764942)
-[C:\db-derby-10.5.1.1-bin\lib\derbynet.jar] 10.5.1.1 - (764942)
-[C:\db-derby-10.5.1.1-bin\lib\derbyclient.jar] 10.5.1.1 - (764942)
+[C:\db-derby-10.6.0.0-bin\lib\derby.jar] 10.6.0.0 - (908506)
+[C:\db-derby-10.6.0.0-bin\lib\derbytools.jar] 10.6.0.0 - (908506)
+[C:\db-derby-10.6.0.0-bin\lib\derbynet.jar] 10.6.0.0 - (908506)
+[C:\db-derby-10.6.0.0-bin\lib\derbyclient.jar] 10.6.0.0 - (908506)
 ------------------------------------------------------
 ----------------- Locale Information -----------------
 Current Locale : [English/United States [en_US]]
 Found support for locale: [cs]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 Found support for locale: [de_DE]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 Found support for locale: [es]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 Found support for locale: [fr]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 Found support for locale: [hu]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 Found support for locale: [it]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 Found support for locale: [ja_JP]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 Found support for locale: [ko_KR]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 Found support for locale: [pl]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 Found support for locale: [pt_BR]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 Found support for locale: [ru]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 Found support for locale: [zh_CN]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 Found support for locale: [zh_TW]
-         version: 10.5.1.1 - (764942)
+         version: 10.6.0.0 - (908506)
 ------------------------------------------------------</codeblock></example>
 <section><p>When you request help for a problem by posting to the derby-user 
 mailing list, include a copy of the information provided

Modified: db/derby/docs/trunk/src/tuning/ctunoptimzoverride.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/ctunoptimzoverride.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/ctunoptimzoverride.dita (original)
+++ db/derby/docs/trunk/src/tuning/ctunoptimzoverride.dita Thu Feb 18 15:34:13 2010
@@ -29,12 +29,12 @@
 entire FROM clause, for tables in the FROM clause, or for both. </p>
 <p>The syntax for a FROM clause property is:<codeblock><b>FROM [ -- DERBY-PROPERTIES <xref
 href="ctunoptimzoverride.dita#ctunoptimzoverride/joinorder">joinOrder</xref> = { FIXED | UNFIXED } ]
-         <i>TableExpression</i> [,<i>TableExpression</i>]*</b></codeblock></p>
+     <i>TableExpression</i> [,<i>TableExpression</i>]*</b></codeblock></p>
 <p>The syntax for table optimizer override properties, which must be included
 at the end of a TableExpression, is:<codeblock><b>{<i>table-Name</i> | <i>view-Name</i> }
-         [ [ AS ] <i>correlation-Name</i>
-         [ (<i>Simple-column-Name</i> [ , <i>Simple-column-Name</i> ]* ) ] ]
-         [ -- DERBY-PROPERTIES { <xref href="ctunoptimzoverride.dita#ctunoptimzoverride/constraint">constraint</xref> = <i>constraint-Name</i> | <xref
+     [ [ AS ] <i>correlation-Name</i>
+     [ (<i>Simple-column-Name</i> [ , <i>Simple-column-Name</i> ]* ) ] ]
+     [ -- DERBY-PROPERTIES { <xref href="ctunoptimzoverride.dita#ctunoptimzoverride/constraint">constraint</xref> = <i>constraint-Name</i> | <xref
 href="ctunoptimzoverride.dita#ctunoptimzoverride/index">index</xref> = <i>index-Name</i> | <xref
 href="ctunoptimzoverride.dita#ctunoptimzoverride/joinstrat">joinStrategy</xref> = { NESTEDLOOP | HASH } } ]</b></codeblock></p>
 <p>The space between -- and DERBY-PROPERTIES is optional.</p>

Modified: db/derby/docs/trunk/src/tuning/rtuncopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/rtuncopyright.dita?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/rtuncopyright.dita (original)
+++ db/derby/docs/trunk/src/tuning/rtuncopyright.dita Thu Feb 18 15:34:13 2010
@@ -22,7 +22,7 @@
 <title>Copyright</title>
 <refbody>
 <section> <p><image href="../images/logowithtext.jpg"><alt>Logo for Apache
-Derby</alt></image></p> <p>Copyright 2004-2009 The Apache Software Foundation</p> <p> Licensed
+Derby</alt></image></p> <p>Copyright 2004-2010 The Apache Software Foundation</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 <xref format="html" href="http://www.apache.org/licenses/LICENSE-2.0" scope="external">http://www.apache.org/licenses/LICENSE-2.0</xref>.</p> </section>

Modified: db/derby/docs/trunk/src/tuning/tuningderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/tuningderby.ditamap?rev=911444&r1=911443&r2=911444&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/tuningderby.ditamap (original)
+++ db/derby/docs/trunk/src/tuning/tuningderby.ditamap Thu Feb 18 15:34:13 2010
@@ -21,12 +21,12 @@
 <map title="Tuning Derby">
 <topicmeta>
 <copyright>
-<copyryear year="2004, 2009"/>
+<copyryear year="2004, 2010"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>
 <prodname>Tuning Derby</prodname>
-<vrmlist><vrm version="10.5"/></vrmlist>
+<vrmlist><vrm version="10.6"/></vrmlist>
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
 <topicref href="rtuncopyright.dita" navtitle="Copyright"></topicref>



Mime
View raw message