db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r713814 - /db/derby/docs/trunk/src/devguide/
Date Thu, 13 Nov 2008 20:43:00 GMT
Author: chaase3
Date: Thu Nov 13 12:42:59 2008
New Revision: 713814

URL: http://svn.apache.org/viewvc?rev=713814&view=rev
Log:
DERBY-2389: Move Derby system and properties info from Tuning Guide into Reference Manual

This patch fixes references to the system properties reference topics in the Developer's Guide
and updates references to topics in Tuning Derby as needed.

Patch: DERBY-2389-devguide.diff

Modified:
    db/derby/docs/trunk/src/devguide/cdevadvjdbc41138.dita
    db/derby/docs/trunk/src/devguide/cdevbabejgjd.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts23810.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts65864.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure60146.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure876908.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp13018.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp25820.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp25889.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp39943.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp846110.dita
    db/derby/docs/trunk/src/devguide/rdevconcepts8424.dita
    db/derby/docs/trunk/src/devguide/tdevcsecure81850.dita
    db/derby/docs/trunk/src/devguide/tdevdeploy26887.dita

Modified: db/derby/docs/trunk/src/devguide/cdevadvjdbc41138.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevadvjdbc41138.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevadvjdbc41138.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevadvjdbc41138.dita Thu Nov 13 12:42:59 2008
@@ -24,7 +24,7 @@
 GUI tool to determine the properties for which it should prompt a user in
 order to get enough information to connect to a database. Depending on the
 values the user has supplied so far, additional values might become necessary.
-It might be necessary to iterate though several calls to <codeph><i>getPropertyInfo</i></codeph>.</shortdesc>
+It might be necessary to iterate though several calls to <i>getPropertyInfo</i>.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>java.sql.Driver.getPropertyInfo</indexterm><indexterm>Available
 databases<indexterm>list of provided by databaseName attribute</indexterm></indexterm>
@@ -40,18 +40,18 @@
     "jdbc:derby:").getPropertyInfo(<i>URL</i>, <i>Prop</i>)</codeblock>
 <p>In a <ph conref="../conrefs.dita#prod/productshortname"></ph> system,
the
 properties returned in the <i>DriverPropertyInfo</i> object are connection
-URL attributes, including a list of booted databases in a system (the <codeph><i>databaseName</i></codeph>
attribute).</p>
+URL attributes, including a list of booted databases in a system (the <i>databaseName</i>
attribute).</p>
 <p>Databases in a system are not automatically booted until you connect with
 them. You can configure your system to retain the former behavior, in which
-case the steps described in this section will continue to work. See <i>"derby.system.bootAll"
</i> in <cite><ph
-conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p>
-<p><i>getPropertyInfo</i> requires a connection URL and a <codeph><i>Properties</i></codeph>
object
+case the steps described in this section will continue to work. See "<i>derby.system.bootAll</i>"
in
+the <ph conref="../conrefs.dita#pub/citref"></ph>.</p>
+<p><i>getPropertyInfo</i> requires a connection URL and a <i>Properties</i>
object
 as parameters. Typically, what you pass are values that you will use in a
-future call to <codeph><i>java.sql.DriverManager.getConnection</i></codeph>
when
+future call to <i>java.sql.DriverManager.getConnection</i> when
 you actually connect to the database.</p>
 <p>A call to <i>getPropertyInfo</i> with parameters that contain sufficient
 information to connect successfully returns an array of zero length. (Receiving
-this zero-length array does not <i>guarantee</i> that the <codeph><i>getConnection</i></codeph>
call
+this zero-length array does not <i>guarantee</i> that the <i>getConnection</i>
call
 will succeed, because something else could go wrong.)</p>
 <p>Repeat calls to <i>getPropertyInfo</i> until it returns a zero-length
array
 or none of the properties remaining are desired.</p>

Modified: db/derby/docs/trunk/src/devguide/cdevbabejgjd.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevbabejgjd.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevbabejgjd.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevbabejgjd.dita Thu Nov 13 12:42:59 2008
@@ -21,7 +21,8 @@
 <concept id="cdevbabejgjd" xml:lang="en-us">
 <title>Granting permissions to Derby</title>
 <shortdesc>This section discusses which permissions should be granted to <ph
-conref="../conrefs.dita#prod/productshortname"></ph> (the code base derby.jar).</shortdesc>
+conref="../conrefs.dita#prod/productshortname"></ph> (the code base
+<codeph>derby.jar</codeph>).</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Permissions<indexterm>granting to Derby</indexterm></indexterm>
 </keywords>
@@ -40,7 +41,7 @@
 <dt>permission java.util.PropertyPermission "derby.*", "read"</dt>
 <dd>Allows <ph conref="../conrefs.dita#prod/productshortname"></ph> to
read
 individual <ph conref="../conrefs.dita#prod/productshortname"></ph> properties
-set in the JVM's system set. If the action is denied, properties in the JVM's
+set in the JVM machine's system set. If the action is denied, properties in the JVM machine's
 system set are ignored.</dd>
 </dlentry><dlentry>
 <dt>permission java.util.PropertyPermission "derby.storage.jvmInstanceId",
@@ -61,13 +62,13 @@
 <section><title>Optional permissions</title><dl><dlentry>
 <dt>permission java.io.FilePermission "${derby.system.home}", "read,write"</dt>
 <dd>Allows <ph conref="../conrefs.dita#prod/productshortname"></ph> to
determine
-the system directory when set by d<i>b2j.system.home </i>and create it if
+the system directory when set by <i>derby.system.home </i>and create it if
 needed. If the system directory already exists then only the "read" permission
 needs to be granted.</dd>
 </dlentry><dlentry>
 <dt>permission java.util.PropertyPermission "user.dir", "read"</dt>
 <dd>Permits access to the system directory value if <i>derby.system.home</i>
is
-not set or no permission has been granted to read the <codeph><i>derby.system.home</i></codeph>
property.</dd>
+not set or no permission has been granted to read the <i>derby.system.home</i>
property.</dd>
 </dlentry><dlentry>
 <dt>permission java.io.FilePermission "${derby.system.home}${/}derby.properties",
 "read"</dt>
@@ -79,17 +80,17 @@
 <dt>permission java.io.FilePermission "${user.dir}${/}derby.log", "read,write,delete";</dt>
 <dd>Only one of these permissions is needed. Permits the application to read,
 write, and delete to the <ph conref="../conrefs.dita#prod/productshortname"></ph>
log
-file, unless the log has been re-directed. (See the <i>derby.stream.error </i>properties
-in <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>
for more
+file, unless the log has been re-directed. (See the <i>derby.stream.error</i>
properties
+in the <ph conref="../conrefs.dita#pub/citref"></ph> for more
 information.) If one of the requested valid actions is denied, the <ph conref="../conrefs.dita#prod/productshortname"></ph>
log
-will be <codeph><i>java.lang.System.err</i></codeph>.</dd>
+will be <codeph>java.lang.System.err</codeph>.</dd>
 </dlentry><dlentry>
 <dt>permission java.security.SecurityPermission "getPolicy"</dt>
 <dd>You need this permission if you want to change the security policy on
 the fly and reload it into a running system. Given this permission, a DBA
 can reload the policy file by calling the <codeph>SYSCS_UTIL.SYSCS_RELOAD_SECURITY_POLICY</codeph>
system
 procedure. For more information, see the section which describes this procedure
-in <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>. </dd>
+in the <ph conref="../conrefs.dita#pub/citref"></ph>. </dd>
 </dlentry><dlentry>
 <dt>permission java.lang.RuntimePermission "setContextClassLoader"</dt>
 <dd>Allows <ph conref="../conrefs.dita#prod/productshortname"></ph> to
set the context class loader for long running threads to null to avoid potential for class
loader leaks in application server environments when the application server starts <ph
conref="../conrefs.dita#prod/productshortname"></ph> in a custom class loader. </dd>
@@ -107,12 +108,13 @@
 </dlentry><dlentry>
 <dt>permission javax.management.MBeanPermission "org.apache.derby.*#[org.apache.derby:*]","registerMBean,unregisterMBean";</dt>
 <dd>Allows Derby to register and unregister its (JMX) MBeans. Such MBeans are
-associated with the domain "org.apache.derby", which is also the prefix of
+associated with the domain <codeph>org.apache.derby</codeph>, which is also the
prefix of
 the fully qualified class name of all Derby MBeans. For more information about
-Derby's MBeans, refer to the public API (Javadoc) of the package
-org.apache.derby.mbeans and its subpackages. It is possible to fine tune
+Derby's MBeans, refer to the public API (Javadoc) documentation of the package
+<codeph>org.apache.derby.mbeans</codeph> and its subpackages. It is possible
to fine-tune
 this permission, for example in order to allow access only to certain MBeans.
-To fine tune this permission, see the javadoc of javax.management.MBeanPermission
+To fine-tune this permission, see the API documentation for
+<codeph>javax.management.MBeanPermission</codeph>
 or the JMX Instrumentation and Agent Specification.
 </dd>
 </dlentry><dlentry>
@@ -123,8 +125,8 @@
 </dl> </section>
 <section><title>Combining permissions</title><p>You might grant one
<i>FilePermission</i> that
 encompasses several or all of the permissions instead of separately granting
-a number of the more specific permissions. For example:<codeblock>permission java.io.FilePermission
"${derby.system.home}/-", "read,write,delete";</codeblock
->This allows the <ph conref="../conrefs.dita#prod/productshortname"></ph>
engine
+a number of the more specific permissions. For example:<codeblock>permission java.io.FilePermission
"${derby.system.home}/-", "read,write,delete";</codeblock>
+This allows the <ph conref="../conrefs.dita#prod/productshortname"></ph> engine
 complete access to the system directory and any databases contained in the
 system directory.</p></section>
 </conbody>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts23810.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevconcepts23810.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts23810.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts23810.dita Thu Nov 13 12:42:59 2008
@@ -38,11 +38,13 @@
 escalate the lock granularity for a particular transaction from row-level
 locking to table-level locking for performance reasons. You have some control
 over the threshold at which this occurs. For information on turning off row-level
-locking, see <i>"derby.storage.rowLocking" </i> in <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.
-For more information about automatic lock escalation, see "About the System's
-Selection of Lock Granularity" and "Transaction-Based Lock Escalation" in <cite><ph
-conref="../conrefs.dita#pub/cittuning"></ph></cite><cite>. </cite>For
more
+locking, see "<i>derby.storage.rowLocking</i>" in the
+<ph conref="../conrefs.dita#pub/citref"></ph>.
+For more information about automatic lock escalation, see "About the system's
+selection of lock granularity" and "Transaction-based lock escalation" in <ph
+conref="../conrefs.dita#pub/cittuning"></ph>. For more
 information on tuning your <ph conref="../conrefs.dita#prod/productshortname"></ph>
system,
-see "Tuning Databases and Applications".</p>
+see "Tuning databases and applications," also in
+<ph conref="../conrefs.dita#pub/cittuning"></ph>.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts65864.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevconcepts65864.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts65864.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts65864.dita Thu Nov 13 12:42:59 2008
@@ -34,6 +34,7 @@
 <p>In addition, some programmers might share a statement among multiple threads
 to avoid the overhead of each thread's having its own. Using the single statement
 cache, threads can share the same statement from <i>different connections</i>.
-For more information, see in <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p>
+For more information, see "Using the statement cache" in
+<ph conref="../conrefs.dita#pub/cittuning"></ph>.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevcsecure60146.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevcsecure60146.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure60146.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure60146.dita Thu Nov 13 12:42:59 2008
@@ -29,8 +29,8 @@
 </metadata></prolog>
 <conbody>
 <p>Encrypted databases cannot be booted automatically along with all other
-system databases on system startup (see <i>"derby.system.bootAll" </i> in <cite><ph
-conref="../conrefs.dita#pub/cittuning"></ph></cite>). Instead, you boot encrypted
+system databases on system startup (see "<i>derby.system.bootAll</i>" in the
+<ph conref="../conrefs.dita#pub/citref"></ph>). Instead, you boot encrypted
 databases when you first connect to the database.</p>
 <p><dl><dlentry>
 <dt>Booting a database with the <i>bootPassword</i> attribute</dt>

Modified: db/derby/docs/trunk/src/devguide/cdevcsecure876908.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevcsecure876908.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure876908.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure876908.dita Thu Nov 13 12:42:59 2008
@@ -51,8 +51,8 @@
 <li>You have set <i>derby.authentication.ldap.searchFilter</i> to <i>derby.user</i>.</li>
 <li>A user DN has been cached locally for the specific user with the <i>derby.user.UserName</i>
property.</li>
 </ul>
-<p>For more information, see <i>derby.authentication.ldap.searchFilter</i>
in <cite><ph
-conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p>
+<p>For more information, see "<i>derby.authentication.ldap.searchFilter</i>"
in
+the <ph conref="../conrefs.dita#pub/citref"></ph>.</p>
 <p>Some systems permit anonymous searches; other require a user DN and password.
 You can specify a user's DN and password for the search with the properties
 listed below. In addition, you can limit the scope of the search by specifying
@@ -80,8 +80,10 @@
 <ul>
 <li><i>derby.authentication.ldap.searchFilter (optional)</i>   <p>Set
<i>derby.authentication.ldap.searchFilter</i> to
 a logical expression that specifies what constitutes a user for your LDAP
-directory service. The default value of this property is <codeph><i>objectClass=inetOrgPerson</i></codeph>.
+directory service. The default value of this property is <codeph>objectClass=inetOrgPerson</codeph>.
 For example:</p><codeblock>objectClass=person</codeblock></li>
 </ul>
+<p>See the <ph conref="../conrefs.dita#pub/citref"></ph> for details on
all
+these properties.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita Thu Nov 13 12:42:59 2008
@@ -42,7 +42,8 @@
 <codeblock><b>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.database.classpath',
     'APP.ToursLogic:APP.ACCOUNTINGLOGIC')</b></codeblock>
-<p>See <i>"derby.database.classpath"</i> in <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>
for
+<p>See "<i>derby.database.classpath</i>" in the
+<ph conref="../conrefs.dita#pub/citref"></ph> for
 more information about the property.</p>
 <note><ph conref="../conrefs.dita#prod/productshortname"></ph>'s class
loader
 looks first in the user's classpath for any needed classes, and then in the

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp13018.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp13018.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp13018.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp13018.dita Thu Nov 13 12:42:59 2008
@@ -21,7 +21,7 @@
 <concept id="cdevdvlp13018" xml:lang="en-us">
 <title>Defining the system directory</title>
 <shortdesc>You define the system directory when <ph conref="../conrefs.dita#prod/productshortname"></ph>
starts
-up by specifying a Java <i>system property</i> called <codeph><i>derby.system.home</i></codeph>.</shortdesc>
+up by specifying a Java <i>system property</i> called <i>derby.system.home</i>.</shortdesc>
 <prolog></prolog>
 <conbody>
 <p>If you do not specify the system directory when starting up <ph conref="../conrefs.dita#prod/productshortname"></ph>,
@@ -29,7 +29,8 @@
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> uses the <i>derby.system.home</i>
property
 to determine which directory is its system directory - and thus what databases
 are in its system, where to create new databases, and what configuration parameters
-to use. See <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>
for
+to use. See <ph conref="../conrefs.dita#pub/cittuning"></ph> and the
+<ph conref="../conrefs.dita#pub/citref"></ph> for
 more information on setting this property.</p>
 <p>If you specify a system directory at startup that does not exist, <ph conref="../conrefs.dita#prod/productshortname"></ph>
creates
 this new directory - and thus a new system with no databases-automatically.</p>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp25820.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp25820.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp25820.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp25820.dita Thu Nov 13 12:42:59 2008
@@ -31,8 +31,9 @@
 database-wide, or conglomerate-specific basis. By default, a conglomerate
 grows one page at a time until eight pages of user data (or nine pages of
 total disk use, which includes one page of internal information) have been
-allocated. (You can configure this behavior; see <i>"derby.storage.initialPages" </i>
in <cite><ph
-conref="../conrefs.dita#pub/cittuning"></ph></cite>.) After that, it grows
+allocated. (You can configure this behavior; see
+"<i>derby.storage.initialPages</i>" in the
+<ph conref="../conrefs.dita#pub/citref"></ph>.) After that, it grows
 eight pages at a time.</p>
 <p>The size of a row or column is not limited by the page size. Rows or columns
 that are longer than the table's page size are automatically wrapped to overflow

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp25889.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp25889.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp25889.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp25889.dita Thu Nov 13 12:42:59 2008
@@ -30,10 +30,11 @@
 <p>Typically, <ph conref="../conrefs.dita#prod/productshortname"></ph>
writes
 this information to a log called <i>derby.log</i> in the system directory,
 although you can also have <ph conref="../conrefs.dita#prod/productshortname"></ph>
send
-messages to a stream, using the <codeph>derby.stream.error.method</codeph> property.
+messages to a stream, using the <i>derby.stream.error.method</i> property.
 By default, <ph conref="../conrefs.dita#prod/productshortname"></ph> overwrites
<i>derby.log</i> when
 you start the system. You can configure <ph conref="../conrefs.dita#prod/productshortname"></ph>
to
-append to the log with the  <codeph>derby.infolog.append</codeph> property.
-For information on setting this and other properties, see <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p>
+append to the log with the <i>derby.infolog.append</i> property.
+For information on setting this and other properties, see the
+<ph conref="../conrefs.dita#pub/citref"></ph>.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp27715.dita Thu Nov 13 12:42:59 2008
@@ -31,8 +31,8 @@
 </metadata></prolog>
 <conbody>
 <p>You can also configure your system to automatically boot all databases
-in the system when it starts up; see <i>derby.system.bootAll</i> in the <ph
-conref="../conrefs.dita#pub/cittuning"></ph> manual. Because of the time needed
+in the system when it starts up; see "<i>derby.system.bootAll</i>" in the <ph
+conref="../conrefs.dita#pub/citref"></ph>. Because of the time needed
 to boot a database, the number of databases in the system directory affects
 startup performance if you use that configuration. </p>
 <p>Once a database has been booted within a <ph conref="../conrefs.dita#prod/productshortname"></ph>
system,

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp39943.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp39943.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp39943.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp39943.dita Thu Nov 13 12:42:59 2008
@@ -29,8 +29,9 @@
 <p>The <i>derby.properties</i> file is not automatically created. If you
want
 to set <ph conref="../conrefs.dita#prod/productshortname"></ph> properties
 with this file, you need to create the file yourself. The <i>derby.properties</i>
file
-should be in the format created by the <codeph><i>java.util.Properties.save</i></codeph>
method.
+should be in the format created by the <i>java.util.Properties.save</i> method.
 For more information about properties and the <i>derby.properties</i> file,
-see <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p>
+see <ph conref="../conrefs.dita#pub/cittuning"></ph> and the
+<ph conref="../conrefs.dita#pub/citref"></ph>.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp846110.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp846110.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp846110.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp846110.dita Thu Nov 13 12:42:59 2008
@@ -28,7 +28,7 @@
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>For more information, see "Database-Wide Properties" in <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p>
+<p>For more information, see "Database-wide properties" in <ph conref="../conrefs.dita#pub/cittuning"></ph>.</p>
 <note>You should work with database-level properties wherever possible.</note>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/rdevconcepts8424.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevconcepts8424.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevconcepts8424.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevconcepts8424.dita Thu Nov 13 12:42:59 2008
@@ -40,9 +40,9 @@
 locking systems can lock entire tables if a high number of single-row locks
 would be less efficient than a single table-level lock. Choosing table-level
 locking instead of row-level locking for performance reasons is called <i>lock
-escalation</i>. For more information about this topic, see "About the System's
-Selection of Lock Granularity" and "Transaction-Based Lock Escalation" in <cite><ph
-conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p></section>
+escalation</i>. For more information about this topic, see "About the system's
+selection of lock granularity" and "Transaction-based lock escalation" in
+<ph conref="../conrefs.dita#pub/cittuning"></ph>.</p></section>
 <section><title>Single-row locks</title><p>A statement can lock only
<i>a
 single row</i> at a time.</p><p>For row-level locking systems:<ul>
 <li>For TRANSACTION_REPEATABLE_READ isolation, the locks are released at the

Modified: db/derby/docs/trunk/src/devguide/tdevcsecure81850.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevcsecure81850.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevcsecure81850.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevcsecure81850.dita Thu Nov 13 12:42:59 2008
@@ -28,11 +28,13 @@
 <steps>
 <step><cmd>Encrypt the database when you create it.</cmd></step>
 <step><cmd>Configure all security features as database-level properties. 
-These properties are stored in the database (which is encrypted). See <cite><ph
-conref="../conrefs.dita#pub/cittuning"></ph></cite>.</cmd></step>
+These properties are stored in the database (which is encrypted). See "Scope
+of properties" and "Database-wide properties" in <ph
+conref="../conrefs.dita#pub/cittuning"></ph> for more information.</cmd></step>
 <step><cmd>Turn on protection for database-level properties so that they cannot
 be overridden by system properties by setting the <i>derby.database.propertiesOnly</i>
property
-to TRUE.</cmd></step>
+to TRUE. See the <ph conref="../conrefs.dita#pub/citref"></ph> for details
+on this property.</cmd></step>
 <step><cmd>To prevent unauthorized users from accessing databases once they
 are booted, turn on user authentication for the database and configure user
 authorization for the database.</cmd></step>

Modified: db/derby/docs/trunk/src/devguide/tdevdeploy26887.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevdeploy26887.dita?rev=713814&r1=713813&r2=713814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdeploy26887.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdeploy26887.dita Thu Nov 13 12:42:59 2008
@@ -41,10 +41,11 @@
 a writable location.</cmd><info><ph conref="../conrefs.dita#prod/productshortname"></ph>
needs
 to write to temporary files for large sorts required by such SQL statements
 as ORDER BY, UNION, DISTINCT, and GROUP BY. For more information about this
-property, see <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.<codeblock>derby.storage.tempDirectory=c:/temp/mytemp</codeblock></info>
+property, see the <ph conref="../conrefs.dita#pub/citref"></ph>.<codeblock>derby.storage.tempDirectory=c:/temp/mytemp</codeblock></info>
 </step>
 <step><cmd>Configure the database to send error messages to a writable file
-or to an output stream.</cmd><info>For information, see <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.<codeblock>derby.stream.error.file=c:/temp/mylog.LOG</codeblock
+or to an output stream.</cmd><info>For information on the
+<i>derby.stream.error.file</i> property, see the <ph conref="../conrefs.dita#pub/citref"></ph>.<codeblock>derby.stream.error.file=c:/temp/mylog.LOG</codeblock
 ></info></step>
 </steps>
 <result>Be sure to set these properties so that they are deployed with the



Mime
View raw message