db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r202296 [15/16] - in /incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Tue, 28 Jun 2005 22:46:37 GMT
Modified: incubator/derby/docs/trunk/src/tools/rtoolssysinfo41288.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/rtoolssysinfo41288.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/rtoolssysinfo41288.dita (original)
+++ incubator/derby/docs/trunk/src/tools/rtoolssysinfo41288.dita Tue Jun 28 15:46:15 2005
@@ -24,6 +24,6 @@
 </prolog>
 <refbody>
 <section><p>Use the sysinfo utility to display information about your Java environment
-and <ph conref="toolsconrefs.dita#prod/productshortname"></ph> (including version information). To use sysinfo, either <i>derby.jar</i> or <i>derbytools</i><i>.jar</i> must be in your class path.  
+and <ph conref="toolsconrefs.dita#prod/productshortname"></ph> (including version information). To use sysinfo, either <i>derby.jar</i> or <i>derbytools</i><i>.jar</i> must be in your classpath.  
 <codeblock><b>java org.apache.derby.tools.sysinfo</b></codeblock></p></section>
 </refbody></reference>

Modified: incubator/derby/docs/trunk/src/tools/ttoolsij11815.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ttoolsij11815.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ttoolsij11815.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ttoolsij11815.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
+ "../dtd/task.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,22 +16,18 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
- "../dtd/task.dtd">
-
 <task id="ttoolsij11815" xml:lang="en-us">
 <title>Starting ij</title>
 <taskbody>
 <context> <p><ph conref="toolsconrefs.dita#prod/productshortname"></ph> provides
 batch and shell scripts for users in Windows and UNIX environments. If you
 put the appropriate script in your path, you will be able to start ij with
-a simple command. These scripts use the <codeph><xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032"></xref></codeph> property,
+a simple command. These scripts use the <xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref> property,
 which automatically loads a driver and simplifies the process of connecting
 to a database. The scripts are found in the %<ph conref="toolsconrefs.dita#prod/productinstallpath"></ph>%/bin/
 directory. You can also customize the ij scripts to suit your environment.</p><p>If
 you are starting ij from a command line, be sure that the derbytools.jar file
-is in your class path. If you are using <ph conref="toolsconrefs.dita#prod/productshortname"></ph> as
+is in your classpath. If you are using <ph conref="toolsconrefs.dita#prod/productshortname"></ph> as
 a database server, start the server before connecting to the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database.
 You can start ij by running the ij scripts in the /frameworks/embedded/bin/
 directory or in the /frameworks/NetworkServer/bin/ directory.</p> </context>
@@ -57,4 +55,3 @@
  </p></postreq>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/tools/ttoolsij30600.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ttoolsij30600.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ttoolsij30600.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ttoolsij30600.dita Tue Jun 28 15:46:15 2005
@@ -30,11 +30,11 @@
 <example><p>To start ij by using the <codeph>ij.properties</codeph> file,
 use the following command:   <codeblock>java org.apache.derby.tools.ij -p ij.properties</codeblock></p><p>To
 start ij with a maximumDisplayWidth of 1000:   <codeblock>java -Dij.maximumDisplayWidth=1000 org.apache.derby.tools.ij </codeblock></p><p>To
-start ij with an <xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032"></xref> of <b>jdbc:derby:</b> and
-an <xref href="rtoolsijpropref28146.dita#rtoolsijpropref28146"></xref> of <b>sample</b>,
+start ij with an <xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref> of <b>jdbc:derby:</b> and
+an <xref href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref> of <b>sample</b>,
 use the following command:   <codeblock>java -Dij.protocol=jdbc:derby: -Dij.database=toursDB
     org.apache.derby.tools.ij</codeblock></p><p>To start ij with
-two named connections, using the <xref href="rtoolsijpropref10135.dita#rtoolsijpropref10135"></xref> property,
+two named connections, using the <xref href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> property,
 use the following command:   <codeblock>java -Dij.connection.toursDB=jdbc:derby:toursDB 
 -Dij.connection.History=jdbc:derby:History 
 -Dderby. system.home=c:/derby/demo/databases

Modified: incubator/derby/docs/trunk/src/tools/ttoolsij97656.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ttoolsij97656.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ttoolsij97656.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ttoolsij97656.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
+ "../dtd/task.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,10 +16,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
- "../dtd/task.dtd">
-
 <task id="ttoolsij97656" xml:lang="en-us">
 <title>Connecting to a Derby database</title>
 <taskbody>
@@ -33,10 +31,10 @@
 For drivers supplied by <ph conref="toolsconrefs.dita#prod/productshortname"></ph>,
 you can load the driver by specifying the full database connection URL in
 the connection. You do not need to load the driver explicitly in a second
-step.</p> <p>To connect, specify the full database connection URL in a <xref
-href="rtoolsijcomref22318.dita#rtoolsijcomref22318"></xref> command, <xref
-href="rtoolsijpropref10135.dita#rtoolsijpropref10135"></xref> property, or <xref
-href="rtoolsijpropref28146.dita#rtoolsijpropref28146"></xref> property.</p> <p>The
+step.</p><p>To connect, specify the full database connection URL in a <xref
+href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref> command, <xref
+href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> property, or <xref
+href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref> property.</p><p>The
 protocol of the database connection URL must correspond to the driver provided
 by <ph conref="toolsconrefs.dita#prod/productshortname"></ph> (see <xref href="ctoolsijtools16011.dita#ctoolsijtools16011"></xref>)
 or, if you are using another driver, to that driver.   The following example
@@ -48,16 +46,15 @@
 <li>Protocol and short database connection URL   <p>For drivers supplied by <ph
 conref="toolsconrefs.dita#prod/productshortname"></ph>, specifying a protocol
 automatically loads the appropriate driver. You do not need to load the driver
-explicitly in a separate step. You specify a protocol with a property (<codeph><xref
-href="rtoolsijpropref35032.dita#rtoolsijpropref35032"></xref></codeph> or <codeph><xref
-href="rtoolsijpropref12236.dita#rtoolsijpropref12236"></xref></codeph>) or
-command (<xref href="rtoolsijcomref27997.dita#rtoolsijcomref27997"></xref>).</p> <p>To
+explicitly in a separate step. You specify a protocol with a property (<xref
+href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref> or <xref href="rtoolsijpropref12236.dita#rtoolsijpropref12236">ij.protocol.protocolName</xref>) 
+or command (<xref href="rtoolsijcomref27997.dita#rtoolsijcomref27997">Protocol</xref>).</p><p>To
 connect, specify the "short form" of the database connection URL in a <xref
-href="rtoolsijcomref22318.dita#rtoolsijcomref22318"></xref> command, <codeph><xref
-href="rtoolsijpropref10135.dita#rtoolsijpropref10135"></xref></codeph> property,
-or <codeph><xref href="rtoolsijpropref28146.dita#rtoolsijpropref28146"></xref></codeph> property.
-A short form of the database connection URL eliminates the protocol (For more
-information, see <xref href="ctoolsijtools16011.dita#ctoolsijtools16011/ctoolsabtproto"></xref>).</p> <codeblock>D:&gt;java org.apache.derby.tools.ij
+href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref> command, <xref
+href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> property, or <xref
+href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref> property. A
+short form of the database connection URL eliminates the protocol (For more
+information, see <xref href="ctoolsijtools16011.dita#ctoolsijtools16011/ctoolsabtproto"></xref>).</p><codeblock>D:&gt;java org.apache.derby.tools.ij
 ij version 10.0
 ij&gt; protocol 'jdbc:derby:';
 ij&gt; connect 'toursDB';
@@ -74,11 +71,11 @@
 The <ph conref="toolsconrefs.dita#prod/productshortname"></ph> drivers are
 implicitly loaded when a supported protocol is used. Any other driver has
 to be explicitly loaded. You can load a driver explicitly with an ij property
-(<codeph><xref href="rtoolsijpropref41073.dita#rtoolsijpropref41073"></xref></codeph>),
-a system property (<codeph>jdbc.drivers</codeph>), or a command (<xref href="rtoolsijcomref39042.dita#rtoolsijcomref39042"></xref>).</p> <p>To
-connect, specify the full database connection URL in a <xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318"></xref> command, <codeph><xref
-href="rtoolsijpropref10135.dita#rtoolsijpropref10135"></xref></codeph> property,
-or <codeph><xref href="rtoolsijpropref28146.dita#rtoolsijpropref28146"></xref></codeph> property.</p> <codeblock>D:&gt;java org.apache.derby.tools.ij
+(<xref href="rtoolsijpropref41073.dita#rtoolsijpropref41073">ij.Driver</xref>), a system
+property (<codeph>jdbc.drivers</codeph>), or a command (<xref href="rtoolsijcomref39042.dita#rtoolsijcomref39042">Driver</xref>).</p> <p>To
+connect, specify the full database connection URL in a <xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref> command, <xref
+href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> property, or <xref
+href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref> property.</p><codeblock>D:&gt;java org.apache.derby.tools.ij
 ij version 10.0
 ij&gt; driver 'sun.jdbc.odbc.JdbcOdbcDriver';
 ij&gt; connect 'jdbc:odbc:myOdbcDataSource';
@@ -86,4 +83,3 @@
 </ul></example>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/tools/ttoolsij98878.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ttoolsij98878.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ttoolsij98878.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ttoolsij98878.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
+ "../dtd/task.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,9 +16,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
- "../dtd/task.dtd">
 <task id="ttoolsij98878" xml:lang="en-us">
 <title>Running ij scripts</title>
 <taskbody>
@@ -42,7 +41,7 @@
 <li>By redirecting output to a file:<codeblock>java -Djdbc.drivers=org.apache.derby.jdbc.EmbeddedDriver
     org.apache.derby.tools.ij &lt;<i>myscript.sql</i>&gt; &lt;<i>myoutput.txt</i>>
 </codeblock></li>
-<li>By setting the <codeph><xref href="rtoolsijpropref32585.dita#rtoolsijpropref32585"></xref></codeph> property
+<li>By setting the <xref href="rtoolsijpropref32585.dita#rtoolsijpropref32585">ij.outfile</xref> property
 (See <xref href="rtoolsijpropref32585.dita#rtoolsijpropref32585"></xref>):<codeblock>
 java -Dij.outfile=&lt;<i>myoutput.txt</i>> org.apache.derby.tools.ij 
     &lt;myscript.sql></codeblock></li>
@@ -56,4 +55,3 @@
 it is running in a server framework.</p></postreq>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/tuning/ctundepth10525.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctundepth10525.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctundepth10525.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctundepth10525.dita Tue Jun 28 15:46:15 2005
@@ -23,10 +23,5 @@
 <p><ph conref="tunconrefs.dita#prod/productshortname"></ph> is fast and efficient, but when tables are huge, scanning tables
 might take longer than a user would expect. It's even worse if you then
 ask <ph conref="tunconrefs.dita#prod/productshortname"></ph> to sort this data.</p>
-<p>Things that you can do to avoid table scans fall into two categories. These
-categories are, in order of importance:  
-<ol>
-<li><xref href="ctundepth23033.dita#ctundepth23033"/></li>
-<li><xref href="ctundepth36205.dita#ctundepth36205"/></li>
-</ol></p>
+<p>Things that you can do to avoid table scans fall into two categories.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctundepth13055.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctundepth13055.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctundepth13055.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctundepth13055.dita Tue Jun 28 15:46:15 2005
@@ -26,9 +26,5 @@
 <conbody>
 <p><ph conref="tunconrefs.dita#prod/productshortname"></ph> provides a language-level tool for evaluating the performance
 and the execution plans of statements, the RUNTIMESTATISTICS attribute.  
-<ul>
-<li><xref href="ctundepth26674.dita#ctundepth26674"/></li>
-<li><xref href="ttundepth34375.dita#ttundepth34375"/></li>
-<li><xref href="ctundepth37648.dita#ctundepth37648"/></li>
-</ul></p>
+</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctundepth14326.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctundepth14326.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctundepth14326.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctundepth14326.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,73 +16,65 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="ctundepth14326">
+<concept id="ctundepth14326" xml:lang="en-us">
 <title>Shielding users from Derby class-loading events</title>
 <prolog><metadata>
-<keywords>
-<indexterm>Class loading<indexterm>when it occurs in <ph conref="tunconrefs.dita#prod/productshortname"></ph></indexterm><indexterm>how to minimize impact of</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Class loading<indexterm>when it occurs in Derby</indexterm><indexterm>how
+to minimize impact of</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
 <p>JVMs tend to load classes as they are needed, which means the first time
 you need a class in a piece of software, it takes longer to use.</p>
-<p><ph conref="tunconrefs.dita#prod/productshortname"></ph> has three clear cases when a lot of class loading occurs:  
-<ul>
-<li><i>When the system boots</i>  
-<p>The system boots when
-you load the embedded driver, <i>org.apache.derby.</i><i>jdbc.EmbeddedDriver</i>. In a server framework, the system
-boots when you start the server framework. Booting <ph conref="tunconrefs.dita#prod/productshortname"></ph> loads basic <ph conref="tunconrefs.dita#prod/productshortname"></ph> classes.</p></li>
-<li><i>When the first database boots</i>  
-<p>Booting the
-first database loads some more <ph conref="tunconrefs.dita#prod/productshortname"></ph> classes. The default behavior is
-that the first database boots when the first connection is made to it. You
-can also configure the system to boot databases at startup. Depending on your
-application, one or the other might be preferable. </p></li>
-<li><i>When you compile the first query</i>  
-<p>Compiling
-the first query loads additional classes.</p></li>
+<p><ph conref="tunconrefs.dita#prod/productshortname"></ph> has three clear
+cases when a lot of class loading occurs:   <ul>
+<li><i>When the system boots</i>   <p>The system boots when you load the embedded
+driver, <i>org.apache.derby.</i><i>jdbc.EmbeddedDriver</i>. In a server framework,
+the system boots when you start the server framework. Booting <ph conref="tunconrefs.dita#prod/productshortname"></ph> loads
+basic <ph conref="tunconrefs.dita#prod/productshortname"></ph> classes.</p></li>
+<li><i>When the first database boots</i>   <p>Booting the first database loads
+some more <ph conref="tunconrefs.dita#prod/productshortname"></ph> classes.
+The default behavior is that the first database boots when the first connection
+is made to it. You can also configure the system to boot databases at startup.
+Depending on your application, one or the other might be preferable. </p></li>
+<li><i>When you compile the first query</i>   <p>Compiling the first query
+loads additional classes.</p></li>
 </ul></p>
 <p>For any of these events, you can control the impact they have on users
 by starting them in separate threads while other tasks are occurring.</p>
-<p>In addition, if you are using <i>PreparedStatements</i>,
-prepare them in a separate thread in the background while other tasks are
-occurring.</p>
+<p>In addition, if you are using <i>PreparedStatements</i>, prepare them in
+a separate thread in the background while other tasks are occurring.</p>
 <table>
-<tgroup cols="1" colsep="1" rowsep="1">
-<colspec colnum="1" colname="1" colwidth="100*"/>
+<tgroup cols="1" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="100*"/>
 <tbody>
 <row>
-<entry colname="1">
-<p><b>Tuning tips for multi-user systems</b>  
-<ul>
+<entry colname="1"> <p><b>Tuning tips for multi-user systems</b>   <ul>
 <li>For concurrency, use row-level locking and the READ_COMMITTED isolation
 level.</li>
 <li>For read-only applications, use table-level locking and the READ_COMMITTED
 isolation level.</li>
 <li>Boot databases at startup to minimize the impact of connecting.</li>
-</ul></p></entry></row>
+</ul></p></entry>
+</row>
 </tbody>
 </tgroup>
 </table>
 <table>
-<tgroup cols="1" colsep="1" rowsep="1">
-<colspec colnum="1" colname="1" colwidth="100*"/>
+<tgroup cols="1" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="100*"/>
 <tbody>
 <row>
-<entry colname="1">
-<p><b>Tuning tips for single-user systems</b>  
-<ul>
-<li><ph conref="tunconrefs.dita#prod/productshortname"></ph> boots when you first load the embedded JDBC driver (<i>org.apache.derby.</i><i>jdbc.EmbeddedDriver</i>). Load this driver during the least
-time-sensitive portion of your program, such as when it is booting or when
-you are waiting for user input. For server frameworks, the driver is loaded
-automatically when the server boots.</li>
+<entry colname="1"> <p><b>Tuning tips for single-user systems</b>   <ul>
+<li><ph conref="tunconrefs.dita#prod/productshortname"></ph> boots when you
+first load the embedded JDBC driver (<i>org.apache.derby.</i><i>jdbc.EmbeddedDriver</i>).
+Load this driver during the least time-sensitive portion of your program,
+such as when it is booting or when you are waiting for user input. For server
+frameworks, the driver is loaded automatically when the server boots.</li>
 <li>Boot the database at connection (the default behavior), not at startup.
 Connect in a background thread if possible.</li>
 <li>Turn off row-level locking and use READ_COMMITTED isolation level.</li>
-</ul></p></entry></row>
+</ul></p></entry>
+</row>
 </tbody>
 </tgroup>
 </table>
-</conbody></concept>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctundepth21935.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctundepth21935.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctundepth21935.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctundepth21935.dita Tue Jun 28 15:46:15 2005
@@ -27,11 +27,6 @@
 </prolog>
 <conbody>
 <p>Things that you can do to improve the performance of <ph conref="tunconrefs.dita#prod/productshortname"></ph> applications
-fall into three categories. In order of importance, these categories are:
- 
-<ol>
-<li><xref href="ctundepth10525.dita#ctundepth10525"/></li>
-<li><xref href="ctundepth29804.dita#ctundepth29804"/></li>
-<li><xref href="ctundepth14326.dita#ctundepth14326"/></li>
-</ol></p>
+fall into three categories.
+</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctundepth853133.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctundepth853133.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctundepth853133.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctundepth853133.dita Tue Jun 28 15:46:15 2005
@@ -124,8 +124,8 @@
         optimizer estimated cost:           69.35
 
 Source result set:
-        Table Scan ResultSet for COUNTRIES at read committed isolation levelusing instantaneous share row 
-locking chosen by the optimizer
+        Table Scan ResultSet for COUNTRIES at read committed isolation level
+using instantaneous share row locking chosen by the optimizer
         Number of opens = 1
         Rows seen = 6
         Rows filtered = 0

Modified: incubator/derby/docs/trunk/src/tuning/ctunoptimz23977.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunoptimz23977.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunoptimz23977.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunoptimz23977.dita Tue Jun 28 15:46:15 2005
@@ -43,10 +43,4 @@
 matters.</p>
 <p>This section gives an overview of the <ph conref="tunconrefs.dita#prod/productshortname"></ph> optimizer and discusses
 performance issues in the execution of DML statements.</p>
-<p>This section covers the following topics:  
-<ul>
-<li><xref href="ctunoptimz30217.dita#ctunoptimz30217"/></li>
-<li><xref href="ctunoptimz12168.dita#ctunoptimz12168"/></li>
-<li><xref href="ctunoptimz42425.dita#ctunoptimz42425"/></li>
-</ul></p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctunoptimz27975.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunoptimz27975.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunoptimz27975.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunoptimz27975.dita Tue Jun 28 15:46:15 2005
@@ -29,8 +29,5 @@
 about escalating row locks to table locks for performance reasons. This section
 discusses ways in which the <ph conref="tunconrefs.dita#prod/productshortname"></ph> system and the user can make similar
 lock escalations.  
-<ul>
-<li><xref href="ctunoptimz42065.dita#ctunoptimz42065"/></li>
-<li><xref href="ctunoptimz11775.dita#ctunoptimz11775"/></li>
-</ul></p>
+</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctunoptimz30217.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunoptimz30217.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunoptimz30217.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunoptimz30217.dita Tue Jun 28 15:46:15 2005
@@ -26,12 +26,4 @@
 so those indexes are always available to the optimizer, as well as those that
 you explicitly create with the CREATE INDEX command. The way <ph conref="tunconrefs.dita#prod/productshortname"></ph> gets
 to the data-via an index or directly via the table-is called the <i>access path</i>.</p>
-<p>This section covers the following topics:  
-<ul>
-<li><xref href="ctunoptimz33368.dita#ctunoptimz33368"/></li>
-<li><xref href="ctunoptimz39106.dita#ctunoptimz39106"/></li>
-<li><xref href="ctunoptimz30768.dita#ctunoptimz30768"/></li>
-<li><xref href="ctunoptimz41314.dita#ctunoptimz41314"/></li>
-<li><xref href="ctunoptimz22900.dita#ctunoptimz22900"/></li>
-</ul></p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctunoptimz860097.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunoptimz860097.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunoptimz860097.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunoptimz860097.dita Tue Jun 28 15:46:15 2005
@@ -24,8 +24,5 @@
 it does not consider them when determining the access path and join order.
 If all the conditions are right, it makes the optimizations after the access
 path and join order are determined.  
-<ul>
-<li><xref href="ctunoptimz22460.dita#ctunoptimz22460"/></li>
-<li><xref href="ctunoptimz22111.dita#ctunoptimz22111"/></li>
-</ul></p>
+</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctunperf25864.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunperf25864.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunperf25864.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunperf25864.dita Tue Jun 28 15:46:15 2005
@@ -21,23 +21,23 @@
 </prolog>
 <conbody>
 <ul>
-<li><i><xref href="ctunperf18705.dita#ctunperf18705"/></i> to save
+<li><i><xref href="ctunperf18705.dita#ctunperf18705">Use prepared statements with substitution parameters</xref></i> to save
 on costly compilation time. Prepared statements using substitution parameters
 significantly improves performance in applications using standard statements.</li>
-<li><i><xref href="ctunperf10679.dita#ctunperf10679"/>.</i> Indexes
+<li><i><xref href="ctunperf10679.dita#ctunperf10679">Create indexes, and make sure they are being used</xref>.</i> Indexes
 speed up queries dramatically if the table is much larger than the number
 of rows retrieved.</li>
-<li><i><xref href="ctunperf54492.dita#ctunperf54492"/></i> and prime
+<li><i><xref href="ctunperf54492.dita#ctunperf54492">Increase the size of the data page cache</xref></i> and prime
 all the caches.</li>
-<li><i><xref href="ctunperf10065.dita#ctunperf10065"/>.</i> Using
+<li><i><xref href="ctunperf10065.dita#ctunperf10065">Tune the size of database pages</xref>.</i> Using
 large database pages has provided a performance improvement of <i>up to 50%</i>. There are also other storage parameters worth tweaking. If
 you use large database pages, increase the amount of memory available to <ph conref="tunconrefs.dita#prod/productshortname"></ph>.</li>
-<li><i><xref href="ctunperf23868.dita#ctunperf23868"/>.</i></li>
-<li><i><xref href="ctunperf98197.dita#ctunperf98197"/>.</i></li>
-<li><i><xref href="ctunperf16556.dita#ctunperf16556"/>.</i> System
+<li><i><xref href="ctunperf23868.dita#ctunperf23868">Avoid expensive queries</xref>.</i></li>
+<li><i><xref href="ctunperf98197.dita#ctunperf98197">Use the appropriate getXXX and setXXX methods for the type</xref>.</i></li>
+<li><i><xref href="ctunperf16556.dita#ctunperf16556">Tune database booting/class loading</xref>.</i> System
 startup time can be improved by reducing the number of databases in the system
 directory. </li>
-<li><i><xref href="ctunperf16800.dita#ctunperf16800"/></i>. Speed
+<li><i><xref href="ctunperf16800.dita#ctunperf16800">Avoid inserts in autocommit mode if possible</xref></i>. Speed
 up insert performance.</li>
 </ul>
 <p>These tips might solve your particular performance problem. Be sure to

Modified: incubator/derby/docs/trunk/src/tuning/ctunperf54492.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunperf54492.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunperf54492.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunperf54492.dita Tue Jun 28 15:46:15 2005
@@ -32,8 +32,8 @@
 quickly.</p>
 <p>The default size of the data page cache is 1000 pages. In a multi-user
 environment, or in an environment where the user accesses a lot of data, increase
-the size of the cache. You configure its size with the <i><xref href="rtunproper81359.dita#rtunproper81359"/></i> property. For more information about
-how to set this property and how to estimate memory use, see <i><xref href="rtunproper81359.dita#rtunproper81359"/>.</i>  
+the size of the cache. You configure its size with the <xref href="rtunproper81359.dita#rtunproper81359">derby.storage.pageCacheSize</xref> property. For more information about
+how to set this property and how to estimate memory use, see <i><xref href="rtunproper81359.dita#rtunproper81359">derby.storage.pageCacheSize</xref>.</i>  
 <note><ph conref="tunconrefs.dita#prod/productshortname"></ph> can
 run even with a small amount of memory and even with a small data page cache,
 although it might perform poorly. Increasing the amount of memory available

Modified: incubator/derby/docs/trunk/src/tuning/ctunperf816059.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunperf816059.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunperf816059.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunperf816059.dita Tue Jun 28 15:46:15 2005
@@ -27,7 +27,7 @@
 <conbody>
 <p>Using large database pages benefits database performance, notably decreasing
 I/O time. By default, the database page size is 4096 bytes. You can change
-the default database page size with the <i><xref href="rtunproper40688.dita#rtunproper40688"/></i> property. For example:  
+the default database page size with the <i><xref href="rtunproper40688.dita#rtunproper40688">derby.storage.pageSize</xref></i> property. For example:  
 <codeblock><b>derby.storage.pageSize=8192</b></codeblock></p>
 <note>Large database pages require more memory.</note>
 <p>If row size is large, generally page size should be correspondingly large.

Modified: incubator/derby/docs/trunk/src/tuning/ctunperf816635.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunperf816635.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunperf816635.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunperf816635.dita Tue Jun 28 15:46:15 2005
@@ -16,17 +16,17 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="ctunperf816635">
-<title>Put Derby first in your class path</title>
+<title>Put Derby first in your classpath</title>
 <prolog><metadata>
 <keywords>
-<indexterm>Class path<indexterm>performance implications of</indexterm></indexterm>
+<indexterm>Classpath<indexterm>performance implications of</indexterm></indexterm>
 </keywords>
 </metadata>
 </prolog>
 <conbody>
-<p>The structure of your class path can affect <ph conref="tunconrefs.dita#prod/productshortname"></ph> startup time and
+<p>The structure of your classpath can affect <ph conref="tunconrefs.dita#prod/productshortname"></ph> startup time and
 the time required to load a particular class. </p>
-<p>The class path is searched linearly, so locate <ph conref="tunconrefs.dita#prod/productshortname"></ph>'s libraries <i>at the beginning of the class path</i> so that they are found
-first. If the class path first points to a directory that contains multiple
+<p>The classpath is searched linearly, so locate <ph conref="tunconrefs.dita#prod/productshortname"></ph>'s libraries <i>at the beginning of the classpath</i> so that they are found
+first. If the classpath first points to a directory that contains multiple
 files, booting <ph conref="tunconrefs.dita#prod/productshortname"></ph> can be very slow. </p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctunproper22250.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunproper22250.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunproper22250.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunproper22250.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,169 +16,201 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="ctunproper22250">
+<concept id="ctunproper22250" xml:lang="en-us">
 <title>Derby properties</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <conbody>
-<p>This chapter includes all the core <ph conref="tunconrefs.dita#prod/productshortname"></ph> properties.  
-<note>When setting properties that have boolean values, be sure to trim extra spaces
-around the word <i>true</i>. Extra spaces around the word <i>true</i> cause the property to be set to false.</note></p>
-<p><xref href="ctunproper22250.dita#ctunproper22250/rtunproper24108"/> summarizes the general <ph conref="tunconrefs.dita#prod/productshortname"></ph> properties.
+<p>This chapter includes all the core <ph conref="tunconrefs.dita#prod/productshortname"></ph> properties.
+  <note>When setting properties that have boolean values, be sure to trim
+extra spaces around the word <i>true</i>. Extra spaces around the word <i>true</i> cause
+the property to be set to false.</note></p>
+<p><xref href="ctunproper22250.dita#ctunproper22250/rtunproper24108"></xref> summarizes
+the general <ph conref="tunconrefs.dita#prod/productshortname"></ph> properties.
 In that table, S stands for system-wide, D stands for database-wide, and C
 indicates the value persists with newly created conglomerates. X means yes.
- 
-<table id="rtunproper24108" expanse="column" frame="all">
-<title>Derby properties</title>
-<tgroup cols="3" colsep="1" rowsep="1">
-<colspec colnum="1" colname="1" colwidth="50*"/>
-<colspec colnum="2" colname="2" colwidth="12*"/>
-<colspec colnum="3" colname="3" colwidth="38*"/>
+  <table expanse="column" frame="all" id="rtunproper24108"><title>Derby properties</title>
+<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="50*"/>
+<colspec colname="2" colnum="2" colwidth="12*"/><colspec colname="3" colnum="3"
+colwidth="38*"/>
 <thead>
 <row>
 <entry colname="1">Property</entry>
 <entry colname="2">Scope</entry>
-<entry colname="3">Dynamic</entry></row>
+<entry colname="3">Dynamic</entry>
+</row>
 </thead>
 <tbody>
 <row>
-<entry colname="1"><i><xref href="rtunsearchauthdn.dita#rtunsearchauthdn"/></i></entry>
+<entry colname="1"><i><xref href="rtunsearchauthdn.dita#rtunsearchauthdn">derby.authentication.ldap.searchAuthDN</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunsearchauthpw.dita#rtunsearchauthpw"/></i></entry>
+<entry colname="1"><i><xref href="rtunsearchauthpw.dita#rtunsearchauthpw">derby.authentication.ldap.searchAuthPW</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper26978.dita#rtunproper26978"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper26978.dita#rtunproper26978">derby.authentication.ldap.searchBase</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper37341.dita#rtunproper37341"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper37341.dita#rtunproper37341">derby.authentication.ldap.searchFilter</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper13766.dita#rtunproper13766"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper13766.dita#rtunproper13766">derby.authentication.provider</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper25581.dita#rtunproper25581"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper25581.dita#rtunproper25581">derby.authentication.server</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper27467.dita#rtunproper27467"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper27467.dita#rtunproper27467">derby.connection.requireAuthentication</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper24846.dita#rtunproper24846"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper24846.dita#rtunproper24846">derby.database.defaultConnectionMode</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X<xref href="ctunproper22250.dita#ctunproper22250/rtunproper97948">*</xref></entry></row>
+<entry colname="3">X<xref href="ctunproper22250.dita#ctunproper22250/rtunproper97948">*</xref></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper81405.dita#rtunproper81405"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper81405.dita#rtunproper81405">derby.database.forceDatabaseLock</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper25025.dita#rtunproper25025"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper25025.dita#rtunproper25025">derby.database.fullAccessUsers</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X<xref href="ctunproper22250.dita#ctunproper22250/rtunproper97948">*</xref></entry></row>
+<entry colname="3">X<xref href="ctunproper22250.dita#ctunproper22250/rtunproper97948">*</xref></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper24390.dita#rtunproper24390"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper24390.dita#rtunproper24390">derby.database.propertiesOnly</xref></i></entry>
 <entry colname="2">D</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper39325.dita#rtunproper39325"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper39325.dita#rtunproper39325">derby.database.readOnlyAccessUsers</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X<xref href="ctunproper22250.dita#ctunproper22250/rtunproper97948">*</xref></entry></row>
+<entry colname="3">X<xref href="ctunproper22250.dita#ctunproper22250/rtunproper97948">*</xref></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper13217.dita#rtunproper13217"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper13217.dita#rtunproper13217">derby.infolog.append</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper43414.dita#rtunproper43414"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper43414.dita#rtunproper43414">derby.language.logQueryPlan</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper43517.dita#rtunproper43517"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper43517.dita#rtunproper43517">derby.language.logStatementText</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper10607.dita#rtunproper10607"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper10607.dita#rtunproper10607">derby.locks.deadlockTimeout</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper23835.dita#rtunproper23835"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper23835.dita#rtunproper23835">derby.locks.deadlockTrace</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper40346.dita#rtunproper40346"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper40346.dita#rtunproper40346">derby.locks.escalationThreshold</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper98166.dita#rtunproper98166"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper98166.dita#rtunproper98166">derby.locks.monitor</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper46141.dita#rtunproper46141"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper46141.dita#rtunproper46141">derby.locks.waitTimeout</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper27529.dita#rtunproper27529"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper27529.dita#rtunproper27529">derby.storage.initialPages</xref></i></entry>
 <entry colname="2">C</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunstorminrecsize.dita#rtunstorminrecsize"/></i></entry>
+<entry colname="1"><i><xref href="rtunstorminrecsize.dita#rtunstorminrecsize">derby.storage.minimumRecordSize</xref></i></entry>
 <entry colname="2">S, D, C</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper81359.dita#rtunproper81359"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper81359.dita#rtunproper81359">derby.storage.pageCacheSize</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper28026.dita#rtunproper28026"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper28026.dita#rtunproper28026">derby.storage.pageReservedSpace</xref></i></entry>
 <entry colname="2">S, D, C</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper40688.dita#rtunproper40688"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper40688.dita#rtunproper40688">derby.storage.pageSize</xref></i></entry>
 <entry colname="2">S, D, C</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper34037.dita#rtunproper34037"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper34037.dita#rtunproper34037">derby.storage.tempDirectory</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper33027.dita#rtunproper33027"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper33027.dita#rtunproper33027">derby.stream.error.field</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper18151.dita#rtunproper18151"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper18151.dita#rtunproper18151">derby.stream.error.file</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper35028.dita#rtunproper35028"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper35028.dita#rtunproper35028">derby.stream.error.method</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper26985.dita#rtunproper26985"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper26985.dita#rtunproper26985">derby.stream.error.logSeverityLevel</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproperdurability.dita#rtunproperdurability"/></i></entry>
+<entry colname="1"><i><xref href="rtunproperdurability.dita#rtunproperdurability">derby.system.durability</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper32066.dita#rtunproper32066"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper32066.dita#rtunproper32066">derby.system.home</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3"/></row>
+<entry colname="3"></entry>
+</row>
 <row>
-<entry colname="1"><i><xref href="rtunproper27355.dita#rtunproper27355"/></i></entry>
+<entry colname="1"><i><xref href="rtunproper27355.dita#rtunproper27355">derby.user.UserName</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 </tbody>
 </tgroup>
 </table></p>
-<p id="rtunproper97948">* See the main page for this property
-for information about when changes to the property are dynamic.</p>
+<p id="rtunproper97948">* See the main page for this property for information
+about when changes to the property are dynamic.</p>
 <p>There are additional properties associated with the <ph conref="tunconrefs.dita#prod/productshortname"></ph> tools.
 For more information about tool-specific properties, see the <i><ph conref="tunconrefs.dita#pub/citutilities"></ph> Guide</i>.</p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctunpropref1002477.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunpropref1002477.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunpropref1002477.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunpropref1002477.dita Tue Jun 28 15:46:15 2005
@@ -18,14 +18,9 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <concept id="ctunpropref1002477" xml:lang="en-us">
-<title>About this document</title>
+<title>About this guide</title>
 <prolog></prolog>
 <conbody>
-<ul>
-<li><xref href="ctunpropref11181.dita#ctunpropref11181"></xref></li>
-<li><xref href="ctunpropref22460.dita#ctunpropref22460"></xref></li>
-<li><xref href="ctunpropref23947.dita#ctunpropref23947"></xref></li>
-</ul>
 <p>For general information about the <ph conref="tunconrefs.dita#prod/productshortname"></ph> documentation,
 such as a complete list of books, conventions, and further reading, see <cite><ph
 conref="tunconrefs.dita#pub/citgetstart"></ph></cite>.</p>

Modified: incubator/derby/docs/trunk/src/tuning/ctunpropref11181.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunpropref11181.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunpropref11181.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunpropref11181.dita Tue Jun 28 15:46:15 2005
@@ -16,7 +16,7 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="ctunpropref11181">
-<title>Purpose of this document</title>
+<title>Purpose of this guide</title>
 <prolog>
 </prolog>
 <conbody>

Modified: incubator/derby/docs/trunk/src/tuning/ctunpropref23947.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunpropref23947.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunpropref23947.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunpropref23947.dita Tue Jun 28 15:46:15 2005
@@ -16,11 +16,11 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="ctunpropref23947">
-<title>How this document is organized</title>
+<title>How this guide is organized</title>
 <prolog>
 </prolog>
 <conbody>
-<p>This document includes the following chapters:  
+<p>This guide includes the following sections:
 <ul>
 <li><i><xref href="ctunsetprop34818.dita#ctunsetprop34818"/></i>  
 <p>An overview of how you set properties.</p></li>

Modified: incubator/derby/docs/trunk/src/tuning/ctunsetprop11108.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunsetprop11108.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunsetprop11108.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunsetprop11108.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,20 +16,18 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="ctunsetprop11108">
+<concept id="ctunsetprop11108" xml:lang="en-us">
 <title>Properties overview</title>
-<prolog>
-</prolog>
+<shortdesc><ph conref="tunconrefs.dita#prod/productshortname"></ph> lets you
+configure behavior or attributes of a system, a specific database, or a specific <i>conglomerate</i> (a
+table or index) through the use of properties.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p><ph conref="tunconrefs.dita#prod/productshortname"></ph> lets you configure behavior or attributes of a system, a specific
-database, or a specific <i>conglomerate</i> (a table or index)
-through the use of properties.</p>
-<p>Examples of behavior or attributes that you can configure are:  
-<ul>
+<p>Examples of behavior or attributes that you can configure are:   <ul>
 <li>Whether to authorize users</li>
 <li>Page size of tables and indexes</li>
 <li>Where and whether to create an error log</li>
 <li>Which databases in the system to boot</li>
 </ul></p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctunsetprop12821.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunsetprop12821.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunsetprop12821.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunsetprop12821.dita Tue Jun 28 15:46:15 2005
@@ -20,10 +20,10 @@
 <prolog><metadata>
 <keywords>
 <indexterm>Database-wide properties<indexterm>setting</indexterm></indexterm>
-<indexterm>SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY</indexterm>
+<indexterm>SYSCS_SET_DATABASE_PROPERTY</indexterm>
 <indexterm>Database-wide properties<indexterm>verifying value
 of</indexterm></indexterm>
-<indexterm>SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY</indexterm>
+<indexterm>SYSCS_GET_DATABASE_PROPERTY</indexterm>
 </keywords>
 </metadata>
 </prolog>

Modified: incubator/derby/docs/trunk/src/tuning/ctunsetprop13074.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunsetprop13074.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunsetprop13074.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunsetprop13074.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,41 +16,37 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="ctunsetprop13074">
-<title>In the derby.properties file</title>
+<concept id="ctunsetprop13074" xml:lang="en-us">
+<title>Changing the system-wide properties by using the derby.properties file</title>
 <prolog><metadata>
-<keywords>
-<indexterm>derby.properties file</indexterm>
-<indexterm>System-wide properties<indexterm>setting</indexterm></indexterm>
-<indexterm>derby.system.home<indexterm>determining location
-of derby.properties</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>derby.properties file</indexterm><indexterm>System-wide
+properties<indexterm>setting</indexterm></indexterm><indexterm>derby.system.home<indexterm>determining
+location of derby.properties</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>You can set persistent system-wide properties in a text file called <i>derby.properties</i>, which must be placed in the directory
-specified by the <i>derby.system.home</i> property.
-There should be one <i>derby.properties</i> file per system,
-not per database. The file must be created in the system directory. In a client/server
-environment, that directory is on the server. (For more information about
-a <ph conref="tunconrefs.dita#prod/productshortname"></ph> system and the system directory, see "<ph conref="tunconrefs.dita#prod/productshortname"></ph> System"
+<p>You can set persistent system-wide properties in a text file called <i>derby.properties</i>,
+which must be placed in the directory specified by the <i>derby.system.home</i> property.
+There should be one <i>derby.properties</i> file per system, not per database.
+The file must be created in the system directory. In a client/server environment,
+that directory is on the server. (For more information about a <ph conref="tunconrefs.dita#prod/productshortname"></ph> system
+and the system directory, see "<ph conref="tunconrefs.dita#prod/productshortname"></ph> System"
 in the <cite><ph conref="tunconrefs.dita#pub/citdevelop"></ph></cite>.)</p>
-<p><ph conref="tunconrefs.dita#prod/productshortname"></ph> does <i>not</i>:  
-<ul>
+<p><ph conref="tunconrefs.dita#prod/productshortname"></ph> does <i>not</i>:
+  <ul>
 <li>Provide this file</li>
 <li>Automatically create this file for you</li>
 <li>Automatically write any properties or values to this file</li>
 </ul></p>
 <p>Instead, you must create, write, and edit this file yourself.</p>
 <p>The file should be in the format created by the <i>java.util.Properties.save</i> method.</p>
-<p>The following is the text of a sample properties file:  
-<codeblock><b>derby.infolog.append=true 
+<p>The following is the text of a sample properties file:   <codeblock><b>derby.infolog.append=true 
 derby.storage.pageSize=8192
 derby.storage.pageReservedSpace=60</b></codeblock></p>
 <p>Properties set this way are persistent for the system until changed, until
 the file is removed from the system, or until the system is booted in some
-other directory (in which case <ph conref="tunconrefs.dita#prod/productshortname"></ph> would be looking for <i>derby.properties</i> in that new directory). If a database is removed from
-a system, system-wide properties do not "travel" with the database
-unless explicitly set again.</p>
-</conbody></concept>
+other directory (in which case <ph conref="tunconrefs.dita#prod/productshortname"></ph> would
+be looking for <i>derby.properties</i> in that new directory). If a database
+is removed from a system, system-wide properties do not "travel" with the
+database unless explicitly set again.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctunsetprop24222.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunsetprop24222.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunsetprop24222.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunsetprop24222.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,22 +16,13 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="ctunsetprop24222">
+<concept id="ctunsetprop24222" xml:lang="en-us">
 <title>Ways of setting Derby properties</title>
 <prolog><metadata>
-<keywords>
-<indexterm>Configuring Derby</indexterm>
-<indexterm><ph conref="tunconrefs.dita#prod/productshortname"></ph> properties<indexterm>setting</indexterm></indexterm>
+<keywords><indexterm>Configuring Derby</indexterm><indexterm>Derby properties<indexterm>setting</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>This section covers the different ways of setting properties.  
-<ul>
-<li><xref href="ctunsetprop16827.dita#ctunsetprop16827"/></li>
-<li><xref href="ctunsetprop12821.dita#ctunsetprop12821"/></li>
-<li><xref href="ctunsetprop24843.dita#ctunsetprop24843"/></li>
-<li><xref href="ctunsetprop44147.dita#ctunsetprop44147"/></li>
-</ul></p>
-</conbody></concept>
+<p>This section covers the different ways of setting properties.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctunsetprop824533.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunsetprop824533.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunsetprop824533.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunsetprop824533.dita Tue Jun 28 15:46:15 2005
@@ -27,7 +27,7 @@
 </prolog>
 <conbody>
 <p>There is one important exception to the search order for properties described
-above: When you set the <i><xref href="rtunproper24390.dita#rtunproper24390"/></i> property
+above: When you set the <i><xref href="rtunproper24390.dita#rtunproper24390">derby.database.propertiesOnly</xref></i> property
 to <i>true</i>, database-wide properties cannot be overridden
 by system-wide properties.</p>
 <p>This property ensures that a database's environment cannot be modified

Modified: incubator/derby/docs/trunk/src/tuning/ctunstats849203.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunstats849203.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunstats849203.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunstats849203.dita Tue Jun 28 15:46:15 2005
@@ -25,9 +25,5 @@
 </prolog>
 <conbody>
 <p><ph conref="tunconrefs.dita#prod/productshortname"></ph> determines the selectivity for a WHERE clause in one of two
-ways:  
-<ul>
-<li><xref href="ctunstats72938.dita#ctunstats72938"/></li>
-<li><xref href="ctunstats52657.dita#ctunstats52657"/></li>
-</ul></p>
+ways.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctuntransform11313.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctuntransform11313.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctuntransform11313.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctuntransform11313.dita Tue Jun 28 15:46:15 2005
@@ -28,9 +28,5 @@
 <p>When <ph conref="tunconrefs.dita#prod/productshortname"></ph> evaluates a statement that references a view, it transforms
 the reference to a view into a derived table. It might make additional transformations
 to improve performance.  
-<ul>
-<li><xref href="ctuntransform22576.dita#ctuntransform22576"/></li>
-<li><xref href="ctuntransform36623.dita#ctuntransform36623"/></li>
-<li><xref href="ctuntransform25857.dita#ctuntransform25857"/></li>
-</ul></p>
+</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctuntransform13699.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctuntransform13699.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctuntransform13699.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctuntransform13699.dita Tue Jun 28 15:46:15 2005
@@ -28,10 +28,5 @@
 <p>Subqueries are notoriously expensive to evaluate. This section describes
 some of the transformations that <ph conref="tunconrefs.dita#prod/productshortname"></ph> makes internally to reduce the
 cost of evaluating them.  
-<ul>
-<li><xref href="ctuntransform25857.dita#ctuntransform25857"/></li>
-<li><xref href="ctuntransform36368.dita#ctuntransform36368"/></li>
-<li><xref href="ctuntransform25868.dita#ctuntransform25868"/></li>
-<li><xref href="ctuntransform47182.dita#ctuntransform47182"/></li>
-</ul></p>
+</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctuntransform16033.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctuntransform16033.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctuntransform16033.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctuntransform16033.dita Tue Jun 28 15:46:15 2005
@@ -27,9 +27,5 @@
 <conbody>
 <p>Sorting is an expensive process. <ph conref="tunconrefs.dita#prod/productshortname"></ph> tries to eliminate unnecessary
 sorting steps where possible.  
-<ul>
-<li><xref href="ctuntransform16279.dita#ctuntransform16279"/></li>
-<li><xref href="ctuntransform21780.dita#ctuntransform21780"/></li>
-<li><xref href="ctuntransform14044.dita#ctuntransform14044"/></li>
-</ul></p>
+</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/ctuntransform35783.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctuntransform35783.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctuntransform35783.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctuntransform35783.dita Tue Jun 28 15:46:15 2005
@@ -41,12 +41,6 @@
 section describes the predicate transformations that <ph conref="tunconrefs.dita#prod/productshortname"></ph> performs
 to make predicates optimizable.</p>
 <p>A predicate that uses the following comparison operators can sometimes
-be transformed internally into optimizable predicates:  
-<ul>
-<li><xref href="rtuntransform139.dita#rtuntransform139"/></li>
-<li><xref href="rtuntransform208.dita#rtuntransform208"/></li>
-<li><xref href="rtuntransform582.dita#rtuntransform582"/></li>
-<li><xref href="rtuntransform590.dita#rtuntransform590"/></li>
-<li><xref href="ctuntransform37032.dita#ctuntransform37032"/></li>
-</ul></p>
+be transformed internally into optimizable predicates. 
+</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper10607.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper10607.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper10607.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper10607.dita Tue Jun 28 15:46:15 2005
@@ -27,9 +27,9 @@
 a transaction waiting to obtain a lock is involved in a deadlock. If a deadlock
 has occurred, and <ph conref="tunconrefs.dita#prod/productshortname"></ph> chooses the transaction as a deadlock victim, <ph conref="tunconrefs.dita#prod/productshortname"></ph> aborts
 the transaction. The transaction receives an <i>SQLException</i> of <i>SQLState</i> 40001. If the transaction is not
-chosen as the victim, it continues to wait for a lock if <i><xref href="rtunproper46141.dita#rtunproper46141"/></i> is set to a higher value than the
+chosen as the victim, it continues to wait for a lock if <i><xref href="rtunproper46141.dita#rtunproper46141">derby.locks.waitTimeout</xref></i> is set to a higher value than the
 value of <i>derby.locks.deadlockTimeout</i>.</p>
-<p>If this property is set to a higher value than <i><xref href="rtunproper46141.dita#rtunproper46141"/>,</i> no deadlock checking occurs. See <i><xref href="rtunproper46141.dita#rtunproper46141"/>.</i></p>
+<p>If this property is set to a higher value than <i><xref href="rtunproper46141.dita#rtunproper46141">derby.locks.waitTimeout</xref>,</i> no deadlock checking occurs. See <i><xref href="rtunproper46141.dita#rtunproper46141">derby.locks.waitTimeout</xref>.</i></p>
 <p>For more information about deadlock checking, see "Deadlocks" in
 Chapter 5 of the <cite><ph conref="tunconrefs.dita#pub/citdevelop"></ph></cite>.</p>
 </section>

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper13766.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper13766.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper13766.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper13766.dita Tue Jun 28 15:46:15 2005
@@ -34,7 +34,7 @@
 authentication.</p></li>
 </ul></p> <p>When using an external authentication service provider (LDAP),
 you must also set:   <ul>
-<li><i><xref href="rtunproper25581.dita#rtunproper25581"></xref></i></li>
+<li><i><xref href="rtunproper25581.dita#rtunproper25581">derby.authentication.server</xref></i></li>
 </ul></p> <p>When using LDAP, you can set other LDAP-specific properties.
 See also:   <ul>
 <li><i><xref href="rtunsearchauthdn.dita#rtunsearchauthdn"></xref></i></li>
@@ -49,13 +49,10 @@
 conref="tunconrefs.dita#prod/productshortname"></ph> to hook up to an existing
 user authentication service that uses any of the standard directory and naming
 service providers to JNDI. </p> <p>To enable any <ph conref="tunconrefs.dita#prod/productshortname"></ph> user
-authentication, you must set the <i><xref href="rtunproper27467.dita#rtunproper27467"></xref></i> property
+authentication, you must set the <i><xref href="rtunproper27467.dita#rtunproper27467">derby.connection.requireAuthentication</xref></i> property
 to true.</p> <p>For more information about user authentication, see the <cite><ph
 conref="tunconrefs.dita#pub/citdevelop"></ph>.</cite></p> </section>
-<refsyn><title>Syntax</title> <codeblock><b>derby.authentication.provider={
-    LDAP |
-    BUILTIN |
-    <b><i>classProviderName</i></b> }</b></codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><b>derby.authentication.provider={ LDAP | BUILTIN | <b><i>classProviderName</i></b> }</b></codeblock> </refsyn>
 <section><title>Default</title> <p>BUILTIN</p> </section>
 <example><title>Example</title> <codeblock><b><ph>-- system-wide property</ph>
 derby.authentication.provider=LDAP

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper18151.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper18151.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper18151.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper18151.dita Tue Jun 28 15:46:15 2005
@@ -25,7 +25,7 @@
 <section><title>Function</title>
 <p>Specifies name of the file to which the error log is written. If the file
 name is relative, it is taken as relative to the system directory.</p>
-<p>If this property is set, the <xref href="rtunproper35028.dita#rtunproper35028"/> and <xref href="rtunproper33027.dita#rtunproper33027"/> properties
+<p>If this property is set, the <xref href="rtunproper35028.dita#rtunproper35028">derby.stream.error.method</xref> and <xref href="rtunproper33027.dita#rtunproper33027">derby.stream.error.field</xref> properties
 are ignored.</p>
 </section>
 <section><title>Default</title>

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper23835.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper23835.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper23835.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper23835.dita Tue Jun 28 15:46:15 2005
@@ -26,7 +26,7 @@
 <p>Causes a detailed list of locks at the time of a deadlock or a timeout
 to be written to the error log (typically the <i>derby.log</i>). For a deadlock, <ph conref="tunconrefs.dita#prod/productshortname"></ph> will describe the cycle of locks which caused
 the deadlock. For a timeout, <ph conref="tunconrefs.dita#prod/productshortname"></ph> will print the entire lock list at the
-time of the timeout. This property is meaningful only if the <i><xref href="rtunproper98166.dita#rtunproper98166"/></i> property is set to <i>true</i>.  
+time of the timeout. This property is meaningful only if the <i><xref href="rtunproper98166.dita#rtunproper98166">derby.locks.monitor</xref></i> property is set to <i>true</i>.  
 <note>This level of debugging is intrusive: it can alter
 the timing of the application, reduce performance severely, and produce a
 large error log file. It should be used with care.</note></p>

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper24846.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper24846.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper24846.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper24846.dita Tue Jun 28 15:46:15 2005
@@ -18,7 +18,7 @@
 <reference xml:lang="en-us" id="rtunproper24846">
 <title>derby.database.defaultConnectionMode</title>
 <prolog><metadata>
-<keywords><indexterm>derby.database.defaultConnectionMode</indexterm><indexterm>User authorization<indexterm>configuring</indexterm></indexterm>
+<keywords><indexterm>derby.database. defaultConnectionMode</indexterm><indexterm>User authorization<indexterm>configuring</indexterm></indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper25025.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper25025.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper25025.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper25025.dita Tue Jun 28 15:46:15 2005
@@ -30,7 +30,7 @@
 access to all the databases in the system is granted.</p>
 <p>See also <i><xref href="rtunproper39325.dita#rtunproper39325"/>.</i></p>
 <p>A malformed list of user names raises an exception. Do not specify a user
-both with this property and in <i><xref href="rtunproper39325.dita#rtunproper39325"/>.</i>  
+both with this property and in <i><xref href="rtunproper39325.dita#rtunproper39325">derby.database.readOnlyAccessUsers</xref>.</i>  
 <note>User names, called authorization identifiers,
 follow the rules of <i>SQL92Identifiers</i> and can be delimited.
 Specifying a user name that does not follow these rules raises an exception.</note></p>

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper25581.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper25581.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper25581.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper25581.dita Tue Jun 28 15:46:15 2005
@@ -26,7 +26,7 @@
 <refbody>
 <section><title>Function</title> <p>Specifies the location of the external
 directory service that provides user authentication for the <ph conref="tunconrefs.dita#prod/productshortname"></ph> system
-as defined with <i><xref href="rtunproper13766.dita#rtunproper13766"></xref>.</i> For
+as defined with <i><xref href="rtunproper13766.dita#rtunproper13766">derby.authentication.provider</xref>.</i> For
 LDAP, specify the host name and port number.</p> <p>The server must be known
 on the network.</p> <p>For more information about external user authentication,
 see "External Directory Service" in the <cite><ph conref="tunconrefs.dita#pub/citdevelop"></ph>.</cite></p> </section>

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper27355.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper27355.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper27355.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper27355.dita Tue Jun 28 15:46:15 2005
@@ -25,15 +25,15 @@
 </metadata></prolog>
 <refbody>
 <section><title>Function</title> <p>Has two uses:   <ul>
-<li>Creates users and passwords when <i><xref href="rtunproper13766.dita#rtunproper13766"></xref></i> is
+<li>Creates users and passwords when <i><xref href="rtunproper13766.dita#rtunproper13766">derby.authentication.provider</xref></i> is
 set to <i>BUILTIN.</i></li>
-<li>Caches user DNs locally when <i><xref href="rtunproper13766.dita#rtunproper13766"></xref></i> is
-set to <i>LDAP</i> and <i><xref href="rtunproper37341.dita#rtunproper37341"></xref></i> is
+<li>Caches user DNs locally when <i><xref href="rtunproper13766.dita#rtunproper13766">derby.authentication.provider</xref></i> is
+set to <i>LDAP</i> and <i><xref href="rtunproper37341.dita#rtunproper37341">derby.authentication.ldap.searchFilter</xref></i> is
 set to <i>derby.user</i>.</li>
 </ul></p> </section>
 <section><title>Users and Passwords</title> <p>This property creates valid
 clear-text users and passwords within <ph conref="tunconrefs.dita#prod/productshortname"></ph> when
-the <i><xref href="rtunproper13766.dita#rtunproper13766"></xref></i> property
+the <i><xref href="rtunproper13766.dita#rtunproper13766">derby.authentication.provider</xref></i> property
 is set to <i>BUILTIN</i>. For information about users, see "Working with User
 Authentication" in the <cite><ph conref="tunconrefs.dita#pub/citdevelop"></ph></cite>.
    <ul>

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper27467.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper27467.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper27467.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper27467.dita Tue Jun 28 15:46:15 2005
@@ -18,7 +18,7 @@
 <reference xml:lang="en-us" id="rtunproper27467">
 <title>derby.connection.requireAuthentication</title>
 <prolog><metadata>
-<keywords><indexterm>derby.connection.requireAuthentication</indexterm><indexterm>Authentication<indexterm>turning on</indexterm></indexterm><indexterm>User authentication<indexterm>turning on</indexterm></indexterm>
+<keywords><indexterm>derby.connection. requireAuthentication</indexterm><indexterm>Authentication<indexterm>turning on</indexterm></indexterm><indexterm>User authentication<indexterm>turning on</indexterm></indexterm>
 </keywords>
 </metadata>
 </prolog><refbody>
@@ -26,7 +26,7 @@
 <p>Turns on user authentication for <ph conref="tunconrefs.dita#prod/productshortname"></ph>.</p>
 <p>When user authentication is turned on, a connection request must provide
 a valid user name and password.</p>
-<p><ph conref="tunconrefs.dita#prod/productshortname"></ph> uses the type of user authentication specified with the <i><xref href="rtunproper13766.dita#rtunproper13766"/></i> property.</p>
+<p><ph conref="tunconrefs.dita#prod/productshortname"></ph> uses the type of user authentication specified with the <i><xref href="rtunproper13766.dita#rtunproper13766">derby.authentication.provider</xref></i> property.</p>
 <p>For more information about user authentication, see "Working with User
 Authentication" in Chapter 7 of the <cite><ph conref="tunconrefs.dita#pub/citdevelop"></ph></cite>.</p>
 </section>

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper33027.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper33027.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper33027.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper33027.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,32 +16,29 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtunproper33027">
-<title>derby.stream.error.field<ph><indexterm>derby.stream.error.field</indexterm></ph><ph><indexterm>Error log<indexterm>redirecting to a stream</indexterm></indexterm></ph></title>
-<prolog>
-</prolog><refbody>
-<section><title>Function</title>
-<p>Specifies a static field that references a stream to which the error log
-is written. The field is specified using the fully qualified name of the class,
-then a dot (.) and then the field name. The field must be public and static.
-Its type can be either <i>java.io.OutputStream</i> or <i>java.io.Writer</i>. </p>
-<p>The field is accessed once at <ph conref="tunconrefs.dita#prod/productshortname"></ph> boot time, and the value is used
-until <ph conref="tunconrefs.dita#prod/productshortname"></ph> is rebooted. If the field is null, the error stream defaults
-to the system error stream (<i>java.lang.System.err</i>).</p>
-<p>If the field does not exist or is inaccessible, the error stream defaults
-to the system error stream. <ph conref="tunconrefs.dita#prod/productshortname"></ph> will not call the <i>close()</i> method of the object obtained from the field.</p>
-</section>
-<section><title>Default</title>
-<p>None.</p>
-</section>
-<example><title>Example</title>
-<codeblock><b>derby.stream.error.field=java.lang.System.err</b></codeblock>
-</example>
-<section><title>Scope</title>
-<p><xref href="ctunproper51399.dita#ctunproper51399/rtunproper41229">system-wide</xref></p>
-</section>
-<section><title>Dynamic or static</title>
-<p>This property is static; if you change it while <ph conref="tunconrefs.dita#prod/productshortname"></ph> is running,
-the change does not take effect until you reboot.</p>
-</section></refbody></reference>
+<reference id="rtunproper33027" xml:lang="en-us">
+<title>derby.stream.error.field</title>
+<prolog><metadata>
+<keywords><indexterm>derby.stream.error.field</indexterm><indexterm>Error
+log</indexterm><indexterm>redirecting to a stream</indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<section><title>Function</title> <p>Specifies a static field that references
+a stream to which the error log is written. The field is specified using the
+fully qualified name of the class, then a dot (.) and then the field name.
+The field must be public and static. Its type can be either <i>java.io.OutputStream</i> or <i>java.io.Writer</i>. </p> <p>The
+field is accessed once at <ph conref="tunconrefs.dita#prod/productshortname"></ph> boot
+time, and the value is used until <ph conref="tunconrefs.dita#prod/productshortname"></ph> is
+rebooted. If the field is null, the error stream defaults to the system error
+stream (<i>java.lang.System.err</i>).</p> <p>If the field does not exist or
+is inaccessible, the error stream defaults to the system error stream. <ph
+conref="tunconrefs.dita#prod/productshortname"></ph> will not call the <i>close()</i> method
+of the object obtained from the field.</p> </section>
+<section><title>Default</title> <p>None.</p> </section>
+<example><title>Example</title> <codeblock><b>derby.stream.error.field=java.lang.System.err</b></codeblock> </example>
+<section><title>Scope</title> <p><xref href="ctunproper51399.dita#ctunproper51399/rtunproper41229">system-wide</xref></p> </section>
+<section><title>Dynamic or static</title> <p>This property is static; if you
+change it while <ph conref="tunconrefs.dita#prod/productshortname"></ph> is
+running, the change does not take effect until you reboot.</p> </section>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper34037.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper34037.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper34037.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper34037.dita Tue Jun 28 15:46:15 2005
@@ -33,7 +33,8 @@
 <p>This property allows databases located on read-only media to write temporary
 files to a writable location. If this property is not set, databases located
 on read-only media might get an error like the following:  
-<codeblock>ERROR XSDF1: Exception during creation of file  c:\databases\db\tmp\T887256591756.tmp
+<codeblock>ERROR XSDF1: Exception during creation 
+	of file  c:\databases\db\tmp\T887256591756.tmp
 for container
 ERROR XJ001: Java exception:
 'a:\databases\db\tmp\T887256591756.tmp: java.io.IOException'.</codeblock></p>



Mime
View raw message