Author: chaase3
Date: Thu Nov 13 12:49:39 2008
New Revision: 713816
URL: http://svn.apache.org/viewvc?rev=713816&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 Administration
Guide.
Patch: DERBY-2389-adminguide.diff
Modified:
db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita
db/derby/docs/trunk/src/adminguide/cadminreplication.dita
db/derby/docs/trunk/src/adminguide/cadminreplicfailures.dita
Modified: db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita?rev=713816&r1=713815&r2=713816&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita Thu Nov 13 12:49:39 2008
@@ -20,31 +20,34 @@
"../dtd/concept.dtd">
<concept id="cadminlockvti83889" xml:lang="en-us">
<title>Monitoring deadlocks</title>
-<shortdesc>The derby.stream.error.logSeverityLevel property determines the
+<shortdesc>The <codeph>derby.stream.error.logSeverityLevel</codeph> property
determines the
level of error that you are informed about.</shortdesc>
<prolog><metadata>
<keywords><indexterm>derby.locks.deadlockTrace</indexterm><indexterm>derby.locks.monitor</indexterm>
<indexterm>derby.stream.error.logSeverityLevel</indexterm></keywords>
</metadata></prolog>
<conbody>
-<p>By default, derby.stream.error.logSeverityLevel is
-set to 40000. If derby.stream.error.logSeverityLevel is
+<p>By default, <codeph>derby.stream.error.logSeverityLevel</codeph> is
+set to 40000. If <codeph>derby.stream.error.logSeverityLevel</codeph> is
set to display transaction-level errors (that is, if it is set to a value
-less than 40000), deadlock errors are logged to the derby.log file.
+less than 40000), deadlock errors are logged to the <codeph>derby.log</codeph>
file.
If it is set to a value of 40000 or higher, deadlock errors are not logged
-to the derby.log file.</p>
-<p>The derby.locks.monitor property ensures that deadlock errors are
-logged regardless of the value of derby.stream.error.logSeverityLevel.
-When derby.locks.monitor is set to true, all
-locks that are involved in deadlocks are written to derby.log along with a unique
+to the <codeph>derby.log</codeph> file.</p>
+<p>The <codeph>derby.locks.monitor</codeph> property ensures that deadlock
errors are
+logged regardless of the value of <codeph>derby.stream.error.logSeverityLevel</codeph>.
+When <codeph>derby.locks.monitor</codeph> is set to true, all
+locks that are involved in deadlocks are written to <codeph>derby.log</codeph>
along with a unique
number that identifies the lock.</p>
-<p>To see a thread's stack trace when a lock is requested, set derby.locks.deadlockTrace
to
-true. This property is ignored if derby.locks.monitor is
+<p>To see a thread's stack trace when a lock is requested, set <codeph>derby.locks.deadlockTrace</codeph>
to
+true. This property is ignored if <codeph>derby.locks.monitor</codeph> is
set to false.</p>
-<note>Use derby.locks.deadlockTrace with care. Setting this property
+<note>Use <codeph>derby.locks.deadlockTrace</codeph> with care. Setting
this property
can alter the timing of the application, severely affect performance, and
-produce a very large derby.log file.</note>
-<p>For information about how to set properties, and information about the specific
properties that are mentioned in this topic, see <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p>
+produce a very large <codeph>derby.log</codeph> file.</note>
+<p>For information about how to set properties, see
+<ph conref="../conrefs.dita#pub/cittuning"></ph>. For information about the
+specific properties that are mentioned in this topic, see the
+<ph conref="../conrefs.dita#pub/citref"></ph>.</p>
<p>Here is an example of an error message when <ph conref="../conrefs.dita#prod/productshortname"></ph>
aborts
a transaction because of a deadlock:</p>
<codeblock>--SQLException Caught--
@@ -58,7 +61,8 @@
Granted XID : {758, X} Lock : ROW, EMPLOYEE, (2,8)
Waiting XID : {758, U} , APP, update employee set bonus=150 where salary=23840
Granted XID : {752, X} The selected victim is XID : 752</codeblock>
-<note>You can use the derby.locks.waitTimeout and derby.locks.deadlockTimeout properties
+<note>You can use the <codeph>derby.locks.waitTimeout</codeph> and
+<codeph>derby.locks.deadlockTimeout</codeph> properties
to configure how long <ph conref="../conrefs.dita#prod/productshortname"></ph>
waits
for a lock to be released, or when to begin deadlock checking. For more information
about these properties, see the section that discusses controlling <ph conref="../conrefs.dita#prod/productshortname"></ph>
application
Modified: db/derby/docs/trunk/src/adminguide/cadminreplication.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminreplication.dita?rev=713816&r1=713815&r2=713816&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminreplication.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminreplication.dita Thu Nov 13 12:49:39 2008
@@ -90,8 +90,8 @@
</p>
<p>Several Derby properties allow you to specify the size of the replication
log buffers and the intervals between log shipments, as well as whether
-replication messages are logged. See
-<ph conref="../conrefs.dita#pub/cittuning"></ph> for details.</p>
+replication messages are logged. See the
+<ph conref="../conrefs.dita#pub/citref"></ph> for details.</p>
<p>You can perform replication on a database that runs in either embedded mode
or Network Server mode.
</p>
Modified: db/derby/docs/trunk/src/adminguide/cadminreplicfailures.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminreplicfailures.dita?rev=713816&r1=713815&r2=713816&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminreplicfailures.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminreplicfailures.dita Thu Nov 13 12:49:39 2008
@@ -47,7 +47,7 @@
size limit before the connection can be reestablished, the master replication
functionality is stopped. You can use the property
<i>derby.replication.logBufferSize</i> to configure the size limit of the
-buffer; see <ph conref="../conrefs.dita#pub/cittuning"></ph> for
+buffer; see the <ph conref="../conrefs.dita#pub/citref"></ph> for
details.</entry>
</row>
<row>
@@ -96,7 +96,7 @@
increase for as long as log shipment has trouble keeping up with the amount of
generated log records. You can use properties to tune both the log buffer size
and the minimum and maximum interval between consecutive log shipments. See
-<ph conref="../conrefs.dita#pub/cittuning"></ph> for details.</entry>
+the <ph conref="../conrefs.dita#pub/citref"></ph> for details.</entry>
</row>
<row>
<entry colname="col1">The slave
|