db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1540771 [2/3] - /db/derby/docs/trunk/src/adminguide/
Date Mon, 11 Nov 2013 16:51:51 GMT
Modified: db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita Mon Nov 11 16:51:49 2013
@@ -21,44 +21,49 @@ limitations under the License.
 <concept id="cadminhubbkup75469" xml:lang="en-us">
 <title>Using operating system commands with the freeze and unfreeze system
 procedures to perform an online backup</title>
+<shortdesc>Typically, these procedures are used to speed up the copy operation
+involved in an online backup.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>SYSCS_FREEZE_DATABASE system procedure</indexterm><indexterm>SYSCS_UNFREEZE_DATABASE
 system procedure</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>Typically, these procedures are used to speed up the copy operation involved
-in an online backup. In this scenario, <ph conref="../conrefs.dita#prod/productshortname"></ph> does
-not perform the copy operation for you. You use the SYSCS_UTIL.SYSCS_FREEZE_DATABASE
-procedure to lock the database, and then you explicitly copy the database
-directory by using operating system commands. </p>
-<p>For example, because the UNIX tar command uses operating system file-copying
-routines, and the SYSCS_UTIL.SYSCS_BACKUP_DATABASE procedure uses java I/O
+<p>In this scenario, <ph conref="../conrefs.dita#prod/productshortname"></ph>
+does not perform the copy operation for you. You use the
+<codeph>SYSCS_UTIL.SYSCS_FREEZE_DATABASE</codeph> procedure to lock the
+database, and then you explicitly copy the database directory by using operating
+system commands.</p>
+<p>For example, because the UNIX <codeph>tar</codeph> command uses operating
+system file-copying routines, and the
+<codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</codeph> procedure uses Java I/O
 calls with additional internal synchronization that allow updates during the
-backup, the tar command might provide faster backups than the SYSCS_UTIL.SYSCS_BACKUP_DATABASE
-procedure.</p>
+backup, the <codeph>tar</codeph> command might provide faster backups than the
+<codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</codeph> procedure.</p>
 <p>To use operating system commands for online database backups, call the
-SYSCS_UTIL.SYSCS_FREEZE_DATABASE system procedure. The SYSCS_UTIL.SYSCS_FREEZE_DATABASE
-system procedure puts the database into a state in which it can be safely
-copied. After the database has been copied, use the SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE
-system procedure to continue working with the database. Only after SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE
-has been specified can transactions once again write to the database. Read
-operations can proceed while the database is "frozen."</p>
-<note>To ensure a consistent backup of the database, <ph conref="../conrefs.dita#prod/productshortname"></ph> might
-block applications that attempt to write to a frozen database until the backup
-is completed and the SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE system procedure is
-called.</note>
+<codeph>SYSCS_UTIL.SYSCS_FREEZE_DATABASE</codeph> system procedure. The
+<codeph>SYSCS_UTIL.SYSCS_FREEZE_DATABASE</codeph> system procedure puts the
+database into a state in which it can be safely copied. After the database has
+been copied, use the <codeph>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE</codeph> system
+procedure to continue working with the database. Only after
+<codeph>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE</codeph> has been specified can
+transactions once again write to the database. Read operations can proceed while
+the database is frozen.</p>
+<note>To ensure a consistent backup of the database,
+<ph conref="../conrefs.dita#prod/productshortname"></ph> might block
+applications that attempt to write to a frozen database until the backup is
+completed and the <codeph>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE</codeph> system
+procedure is called.</note>
 <p>The following example demonstrates how the freeze and unfreeze procedures
 are used to surround an operating system copy command:</p>
 <codeblock>public static void backUpDatabaseWithFreeze(Connection conn)
-	throws SQLException
-{
-Statement s = conn.createStatement();
-s.executeUpdate(
-    "CALL SYSCS_UTIL.SYSCS_FREEZE_DATABASE()");
-<b>//copy the database directory during this interval</b>
-s.executeUpdate(
-    "CALL SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()");
-s.close();
+	throws SQLException {
+    Statement s = conn.createStatement();
+    s.executeUpdate(
+        "CALL SYSCS_UTIL.SYSCS_FREEZE_DATABASE()");
+    <b>//copy the database directory during this interval</b>
+    s.executeUpdate(
+        "CALL SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()");
+    s.close();
 }</codeblock>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminimportidentitycol.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminimportidentitycol.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminimportidentitycol.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminimportidentitycol.dita Mon Nov 11 16:51:49 2013
@@ -20,17 +20,18 @@ limitations under the License.
 -->
 <concept id="cadminimportidentitycol" xml:lang="en-us">
 <title>Import into tables that contain identity columns</title>
-<shortdesc>You can use the either the SYSCS_UTIL.SYSCS_IMPORT_DATA procedure
-or the SYSCS_UTIL.SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE procedure to import
-data into a table that contains an identity column. The approach that you take
-depends on whether the identity column is GENERATED ALWAYS or GENERATED BY
+<shortdesc>You can use the either the
+<codeph>SYSCS_UTIL.SYSCS_IMPORT_DATA</codeph> procedure or the
+<codeph>SYSCS_UTIL.SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE</codeph> procedure to
+import data into a table that contains an identity column. The approach that you
+take depends on whether the identity column is GENERATED ALWAYS or GENERATED BY
 DEFAULT.</shortdesc>
 <prolog><metadata><keywords>
 <indexterm>importing data<indexterm>tables with identity columns</indexterm></indexterm>
 </keywords></metadata></prolog>
 <conbody>
 <section><title>Identity columns and the REPLACE parameter</title>
-<p>If the <parmname>REPLACE</parmname> parameter is used during import, <ph
+<p>If the <codeph>REPLACE</codeph> parameter is used during import, <ph
 conref="../conrefs.dita#prod/productshortname"></ph> resets its internal counter
 of the last identity value for a column to the initial value defined for the
 identity column.</p>
@@ -41,14 +42,14 @@ always generated for a table row. When a
 already contains a value for the identity column, the row cannot be inserted
 into the table and the import operation will fail.</p>
 <p>To prevent such failure, the following examples show how to specify
-parameters in the SYSCS_UTIL.SYSCS_IMPORT_DATA and
-SYSCS_UTIL.SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE procedures to ignore data for the
-identity column from the file, and omit the column name from the insert column
-list.</p>
+parameters in the <codeph>SYSCS_UTIL.SYSCS_IMPORT_DATA</codeph> and
+<codeph>SYSCS_UTIL.SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE</codeph> procedures to
+ignore data for the identity column from the file, and omit the column name from
+the insert column list.</p>
 <p>The following table definition contains an identity column,
 <codeph>c2</codeph>, and is used in the examples below:</p>
-<codeblock>CREATE TABLE tab1 (c1 CHAR(30), c2 INT GENERATED ALWAYS AS IDENTITY, 
-   c3 REAL, c4 CHAR(1))</codeblock>
+<codeblock><b>CREATE TABLE tab1 (c1 CHAR(30), c2 INT GENERATED ALWAYS AS IDENTITY, 
+   c3 REAL, c4 CHAR(1))</b></codeblock>
 <ul>
 <li>Suppose that you want to import data into <codeph>tab1</codeph> from a file,
 <codeph>myfile.del</codeph>, that does not have identity column information.
@@ -60,8 +61,8 @@ Leo,23.4,I</codeblock>
 To import the data, you must explicitly list the column names in the
 <codeph>tab1</codeph> table, except for the identity column <codeph>c2</codeph>,
 when you call the procedure. For example:
-<codeblock>CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (NULL, 'TAB1', 'C1,C3,C4', 
-    null, 'myfile.del',null, null, null, 0)</codeblock></li>
+<codeblock><b>CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (NULL, 'TAB1', 'C1,C3,C4', 
+    null, 'myfile.del',null, null, null, 0)</b></codeblock></li>
 <li>Suppose that you want to import data into <codeph>tab1</codeph> from a file,
 <codeph>empfile.del</codeph>, that also has identity column information. The
 file contains three fields with the following data:
@@ -71,8 +72,8 @@ Leo,3,23.4,I</codeblock>
 To import the data, you must explicitly specify an insert column list without
 the identity column <codeph>c2</codeph> and specify the column indexes without
 identity column data when you call the procedure. For example:
-<codeblock>CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (NULL, 'TAB1', 'C1,C3,C4', 
-    '1,3,4', 'empfile.del',null, null, null, 0)</codeblock></li>
+<codeblock><b>CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (NULL, 'TAB1', 'C1,C3,C4', 
+    '1,3,4', 'empfile.del',null, null, null, 0)</b></codeblock></li>
 </ul>
 </section>
 <section><title>Identity column is GENERATED BY DEFAULT</title>
@@ -95,9 +96,9 @@ input file actually contains values for 
 </ul>
 <p>The following table definition contains an identity column,
 <codeph>c2</codeph>, and is used in the examples below:</p>
-<codeblock>CREATE TABLE tab1 (c1 CHAR(30),
+<codeblock><b>CREATE TABLE tab1 (c1 CHAR(30),
    c2 INT GENERATED BY DEFAULT AS IDENTITY, 
-   c3 REAL, c4 CHAR(1))</codeblock>
+   c3 REAL, c4 CHAR(1))</b></codeblock>
 <ul>
 <li>Suppose that you want to import data into <codeph>tab1</codeph> from a
 file, <codeph>myfile.del</codeph>, that does not have identity column
@@ -109,8 +110,8 @@ Leo,23.4,I</codeblock>
 To import the data, you must explicitly list the column names in the
 <codeph>tab1</codeph> table, except for the identity column <codeph>c2</codeph>,
 when you call the procedure. For example:
-<codeblock>CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (NULL, 'TAB1', 'C1,C3,C4', 
-    null, 'myfile.del',null, null, null, 0)</codeblock></li>
+<codeblock><b>CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (NULL, 'TAB1', 'C1,C3,C4', 
+    null, 'myfile.del',null, null, null, 0)</b></codeblock></li>
 <li>Suppose that you want to import data into <codeph>tab1</codeph> from a file,
 <codeph>empfile.del</codeph>, that also has identity column information. The
 file contains three fields with the following data:
@@ -121,8 +122,8 @@ In this case, suppose that you wish to u
 from the input file. To import the data, you may simply pass
 <codeph>null</codeph> for the insert column list and column indexes parameters
 when you call the procedure. For example:
-<codeblock>CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (NULL, 'TAB1', NULL, 
-    NULL, 'empfile.del',null, null, null, 0)</codeblock></li>
+<codeblock><b>CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (NULL, 'TAB1', NULL, 
+    NULL, 'empfile.del',null, null, null, 0)</b></codeblock></li>
 <li>Suppose (again) that you want to import data into <codeph>tab1</codeph>
 from a file, <codeph>empfile.del</codeph>, that also has identity column
 information, but in this case, suppose that you do <b>not</b> wish to use the
@@ -132,8 +133,8 @@ identity column values instead. In this 
 specify an insert column list without the identity column <codeph>c2</codeph>
 and specify the column indexes without identity column data when you call the
 procedure. For example:
-<codeblock>CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (NULL, 'TAB1', 'C1,C3,C4', 
-    '1,3,4', 'empfile.del',null, null, null, 0)</codeblock></li>
+<codeblock><b>CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (NULL, 'TAB1', 'C1,C3,C4', 
+    '1,3,4', 'empfile.del',null, null, null, 0)</b></codeblock></li>
 </ul>
 </section>
 </conbody>

Modified: db/derby/docs/trunk/src/adminguide/cadminimportjdbc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminimportjdbc.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminimportjdbc.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminimportjdbc.dita Mon Nov 11 16:51:49 2013
@@ -29,19 +29,18 @@ program.</shortdesc>
 </metadata></prolog>
 <conbody>
 <p>The following code fragment shows how you might call the
-SYSCS_UTIL.SYSCS_EXPORT_TABLE procedure from a Java program. In this example,
-the procedure exports the data in the <codeph>staff</codeph> table in the
-default schema to the <codeph>staff.dat</codeph> file. A percentage
+<codeph>SYSCS_UTIL.SYSCS_EXPORT_TABLE</codeph> procedure from a Java program.
+In this example, the procedure exports the data in the <codeph>staff</codeph>
+table in the default schema to the <codeph>staff.dat</codeph> file. A percentage
 (<codeph>%</codeph>) character is used to specify the column delimiter.</p>
-<codeblock>PreparedStatement ps=conn.prepareStatement(
+<codeblock>PreparedStatement ps = conn.prepareStatement(
     "CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE (?,?,?,?,?,?)");
-    ps.setString(1,null);
-    ps.setString(2,"STAFF");
-    ps.setString(3,"staff.dat");
-    ps.setString(4,"%");
-    ps.setString(5,null);
-    ps.setString(6,null);
-    ps.execute();
-</codeblock>
+ps.setString(1,null);
+ps.setString(2,"STAFF");
+ps.setString(3,"staff.dat");
+ps.setString(4,"%");
+ps.setString(5,null);
+ps.setString(6,null);
+ps.execute();</codeblock>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminimportlobs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminimportlobs.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminimportlobs.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminimportlobs.dita Mon Nov 11 16:51:49 2013
@@ -60,30 +60,32 @@ import file for those columns must be in
 </section>
 <section><title>Importing LOB data from a file that contains all of the
 data</title>
-<p>You can use the SYSCS_UTIL.SYSCS_IMPORT_TABLE and
-SYSCS_UTIL.SYSCS_IMPORT_DATA procedures to import data into a table that
-contains a LOB column. The LOB data must be stored in the same file as the other
-column data that you are importing. If you are importing data from a file that
-was exported from a non-<ph conref="../conrefs.dita#prod/productshortname"></ph>
-source, the binary data must be in hexadecimal format.</p>
+<p>You can use the <codeph>SYSCS_UTIL.SYSCS_IMPORT_TABLE</codeph> and
+<codeph>SYSCS_UTIL.SYSCS_IMPORT_DATA</codeph> procedures to import data into a
+table that contains a LOB column. The LOB data must be stored in the same file
+as the other column data that you are importing. If you are importing data from
+a file that was exported from a
+non-<ph conref="../conrefs.dita#prod/productshortname"></ph> source, the binary
+data must be in hexadecimal format.</p>
 </section>
 <section><title>Importing LOB data from a separate external file</title>
-<p>You can use the SYSCS_UTIL.SYSCS_IMPORT_TABLE_LOBS_FROM_EXTFILE and
-SYSCS_UTIL.SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE procedures to import LOB data
-that is stored in a file that is separate from the main import file. These
-procedures read the LOB data using the reference that is stored in the main
-import file.  If you are importing data from a
+<p>You can use the
+<codeph>SYSCS_UTIL.SYSCS_IMPORT_TABLE_LOBS_FROM_EXTFILE</codeph> and
+<codeph>SYSCS_UTIL.SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE</codeph> procedures to
+import LOB data that is stored in a file that is separate from the main import
+file. These procedures read the LOB data using the reference that is stored in
+the main import file.  If you are importing data from a
 non-<ph conref="../conrefs.dita#prod/productshortname"></ph> source, the
 references to the LOB data must be in the main import file in the format
-<parmname>lobsFileName.Offset.length/</parmname>. This is the same method that
-the <ph conref="../conrefs.dita#prod/productshortname"></ph> export procedures
-use to export the LOB data to a separate external file.</p>
+<codeph><i>lobsFileName</i>.<i>Offset</i>.<i>length</i>/</codeph>. This is the
+same method that the <ph conref="../conrefs.dita#prod/productshortname"></ph>
+export procedures use to export the LOB data to a separate external file.</p>
 </section>
 <section><title>Exporting LOB data to the same file as the other column
 data</title>
-<p>You can use the SYSCS_UTIL.SYSCS_EXPORT_TABLE and
-SYSCS_UTIL.SYSCS_EXPORT_QUERY procedures to write LOB data, along with rest of
-the column data, to a single export file.</p>
+<p>You can use the <codeph>SYSCS_UTIL.SYSCS_EXPORT_TABLE</codeph> and
+<codeph>SYSCS_UTIL.SYSCS_EXPORT_QUERY</codeph> procedures to write LOB data,
+along with the rest of the column data, to a single export file.</p>
 <p>CLOB column data is treated same as other character data. Character
 delimiters are allowed inside the CLOB data. The export procedures write the
 delimiter inside the data as a double-delimiter.</p>
@@ -94,23 +96,23 @@ represents the low nibble.</p>
 </section>
 <section><title>Exporting LOB data to a separate external file from the other
 column data</title>
-<p>You can use the SYSCS_UTIL.SYSCS_EXPORT_TABLE_LOBS_TO_EXTFILE and
-SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE procedures to write LOB data to a
-separate external file. These procedures include the
-<parmname>lobFileName</parmname> parameter, which specifies the name of the
+<p>You can use the
+<codeph>SYSCS_UTIL.SYSCS_EXPORT_TABLE_LOBS_TO_EXTFILE</codeph> and
+<codeph>SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE</codeph> procedures to
+write LOB data to a separate external file. These procedures include the
+<codeph>LOBSFILENAME</codeph> parameter, which specifies the name of the
 external file for the LOB data.</p>
 <p>When you use these procedures, the location of the LOB data is written to the
-main export file. The format of the  reference to the LOB stored in the main
-export file is <parmname>lobsFileName.Offset.length/</parmname>.</p>
+main export file. The format of the reference to the LOB stored in the main
+export file is
+<codeph><i>lobsFileName</i>.<i>Offset</i>.<i>length</i>/</codeph>.</p>
 <ul>
-<li><parmname>Offset</parmname> is the position in the external file in
-bytes</li>
-<li><parmname>length</parmname> is the size of the LOB column data in
-bytes</li>
+<li><i>Offset</i> is the position in the external file in bytes</li>
+<li><i>length</i> is the size of the LOB column data in bytes</li>
 </ul>
-<p>If a LOB column value is NULL, length is written as -1. No data conversion
-is performed when you export LOB data to an external file. BLOB data is written
-in binary format, and CLOB data is written using the codeset that you
+<p>If a LOB column value is NULL, <i>length</i> is written as -1. No data
+conversion is performed when you export LOB data to an external file. BLOB data
+is written in binary format, and CLOB data is written using the codeset that you
 specify.</p>
 <p>See <xref href="radminimport91458.dita#radminimport91458"></xref> for
 examples using each of the import and export procedures.</p></section>

Modified: db/derby/docs/trunk/src/adminguide/cadminjmxoverview.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminjmxoverview.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminjmxoverview.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminjmxoverview.dita Mon Nov 11 16:51:49 2013
@@ -19,6 +19,9 @@ limitations under the License.
 -->
 <concept id="cadminjmxoverview" xml:lang="en-us">
 <title>Using Java Management Extensions (JMX) technology</title>
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> includes a
+set of MBeans (Managed Beans) and their attributes and operations, providing
+monitoring and management capabilities.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Java Management Extensions (JMX) technology</indexterm>
 <indexterm>JMX<indexterm>using</indexterm></indexterm>
@@ -26,12 +29,10 @@ limitations under the License.
 </keywords>
 </metadata></prolog>
 <conbody>
-<p><ph conref="../conrefs.dita#prod/productshortname"></ph> includes a set of
-MBeans (Managed Beans) and their attributes and operations, providing monitoring
-and management capabilities. Before using the
-<ph conref="../conrefs.dita#prod/productshortname"></ph> MBeans, you should have
-a basic understanding of JMX technology. A good source of information is the
-"Monitoring and Management for the Java Platform" web page at <xref format="html"
+<p>Before using the <ph conref="../conrefs.dita#prod/productshortname"></ph>
+MBeans, you should have a basic understanding of JMX technology. A good source
+of information is the "Monitoring and Management for the Java Platform" web page
+at <xref format="html"
 href="http://docs.oracle.com/javase/7/docs/technotes/guides/management/"
 scope="external">http://docs.oracle.com/javase/7/docs/technotes/guides/management/
 </xref>.</p>

Modified: db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita Mon Nov 11 16:51:49 2013
@@ -20,17 +20,18 @@ limitations under the License.
  "../dtd/concept.dtd">
 <concept id="cadminlockvti42553" xml:lang="en-us">
 <title>Obtaining locking information</title>
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> provides a
+tool to monitor and display locking information.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Locks<indexterm>monitoring</indexterm></indexterm><indexterm>Deadlock<indexterm>tools
 to help minimize</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides a tool
-to monitor and display locking information. This tool can help you create
-applications that minimize deadlock. It can also help you locate the cause
-of deadlock when it does occur.</p>
+<p>This tool can help you create applications that minimize deadlock. It can
+also help you locate the cause of deadlock when it does occur.</p>
 <p>To diagnose locking problems, constantly monitor locking traffic by logging
-all deadlocks by using the derby.locks.monitor property.</p>
+all deadlocks by using the <codeph>derby.locks.monitor</codeph> property, which
+is described in the <ph conref="../conrefs.dita#pub/citref"></ph>.</p>
 </conbody>
 </concept>
 

Modified: db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita Mon Nov 11 16:51:49 2013
@@ -20,36 +20,39 @@ limitations under the License.
  "../dtd/concept.dtd">
 <concept id="cadminlockvti83889" xml:lang="en-us">
 <title>Monitoring deadlocks</title>
-<shortdesc>The <codeph>derby.stream.error.logSeverityLevel</codeph> property determines the
-level of error that you are informed about.</shortdesc>
+<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>
+<keywords><indexterm>derby.locks.deadlockTrace</indexterm>
+<indexterm>derby.locks.monitor</indexterm>
 <indexterm>derby.stream.error.logSeverityLevel</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<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 <codeph>derby.log</codeph> file.
-If it is set to a value of 40000 or higher, deadlock errors are not logged
-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
+<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 <codeph>derby.log</codeph> file. If it is set
+to a value of 40000 or higher, deadlock errors are not logged 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 <codeph>derby.locks.deadlockTrace</codeph> to
-true. This property is ignored if <codeph>derby.locks.monitor</codeph> is
-set to false.</p>
-<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 <codeph>derby.log</codeph> file.</note>
+<p>To see a thread's stack trace when a lock is requested, set
+<codeph>derby.locks.deadlockTrace</codeph> to <codeph>true</codeph>. This
+property is ignored if <codeph>derby.locks.monitor</codeph> is set to false.</p>
+<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 <codeph>derby.log</codeph> file.</note>
 <p>For information about working with properties, see the
 <ph conref="../conrefs.dita#pub/citdevelop"></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>
+<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--
 
 SQLState: 40001 =
@@ -62,11 +65,12 @@ Granted XID : {758, X} Lock : ROW, EMPLO
 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 <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
-behavior in the <i><ph conref="../conrefs.dita#pub/citdevelop"></ph></i>.</note>
+<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 "Controlling
+<ph conref="../conrefs.dita#prod/productshortname"></ph> application behavior"
+in the <i><ph conref="../conrefs.dita#pub/citdevelop"></ph></i>.</note>
 </conbody>
 </concept>
 

Modified: db/derby/docs/trunk/src/adminguide/cadminlog800315.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminlog800315.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminlog800315.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminlog800315.dita Mon Nov 11 16:51:49 2013
@@ -18,10 +18,10 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminlog800315">
 <title>Issues for logging in a non-default location</title>
-<prolog>
-</prolog>
+<shortdesc>When the log is not in the default location, backing up and restoring
+a database can require extra steps.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>When the log is not in the default location, backing up and restoring a
-database can require extra steps. See <xref href="cadminhubbkup98797.dita#cadminhubbkup98797"/> for
+<p>See <xref href="cadminhubbkup98797.dita#cadminhubbkup98797"/> for
 details.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminlog98.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminlog98.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminlog98.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminlog98.dita Mon Nov 11 16:51:49 2013
@@ -30,10 +30,14 @@ reduces I/O contention.</shortdesc>
 </metadata>
 </prolog>
 <conbody>
-<p>By default, the transaction log is in the <i>log</i> subdirectory
-of the database directory. Use either of the following methods to store this <i>log</i> subdirectory in another location:</p>
+<p>By default, the transaction log is in the <codeph>log</codeph> subdirectory
+of the database directory. Use either of the following methods to store this
+<codeph>log</codeph> subdirectory in another location:</p>
 <ul>
-<li>Specify the non-default location by using the <i>logDevice=logDirectoryPath</i> attribute on the database connection URL when you create the database.</li>
-<li>If the database is already created, move the log manually and update the <i>service.properties</i> file.</li>
+<li>Specify the non-default location by using the
+<codeph>logDevice=<i>logDirectoryPath</i></codeph> attribute on the database
+connection URL when you create the database.</li>
+<li>If the database is already created, move the log manually and update the
+<codeph>service.properties</codeph> file.</li>
 </ul>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminnetservfileperms.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminnetservfileperms.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminnetservfileperms.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminnetservfileperms.dita Mon Nov 11 16:51:49 2013
@@ -19,6 +19,11 @@ limitations under the License.
 -->
 <concept id="cadminnetservfileperms" xml:lang="en-us">
 <title>Controlling database file access</title>
+<shortdesc>When <ph conref="../conrefs.dita#prod/productshortname"></ph> creates
+new files, the visibility of the new file (that is, which users can access it)
+is normally determined by the JVM environment and the file location only (that
+is, by the umask setting on UNIX and Linux systems and by the default file
+permissions on Windows NTFS).</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>derby.storage.useDefaultFilePermissions property</indexterm>
 <indexterm>database files<indexterm>specifying permissions with Java SE 7 and up</indexterm></indexterm>
@@ -27,11 +32,6 @@ limitations under the License.
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>When <ph conref="../conrefs.dita#prod/productshortname"></ph> creates new
-files, the visibility of the new file (that is, which users can access it) is
-normally determined by the JVM environment and the file location only (that is,
-by the umask setting on UNIX and Linux systems and by the default file
-permissions on Windows NTFS).</p>
 <p>On Java SE 7 or later,
 <ph conref="../conrefs.dita#prod/productshortname"></ph> may further restrict
 the file permissions to the operating system account that started the Java

Modified: db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita Mon Nov 11 16:51:49 2013
@@ -19,33 +19,39 @@ limitations under the License.
 -->
 <concept id="cadminnetservsecurity" xml:lang="en-us">
 <title>Network Server security</title>
+<shortdesc>By default, the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server listens
+only on the localhost. Clients must use the localhost host name to
+connect.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Network Server security</indexterm><indexterm>Network
 Server<indexterm>and security changes</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>By default, the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Server will only listen on the localhost. Clients must use the localhost host
-name to connect. By default, clients cannot access the Network Server from
-another host. To enable connections from other hosts, set the derby.drda.host
-property, or start the Network Server with the <codeph><i>-h</i></codeph> option
-in the <codeph><i>java org.apache.derby.drda.NetworkServerControl start</i></codeph> command.</p>
-<p>In the following example the server will listen only on localhost and clients
-cannot access the server from another host.</p>
+<p>By default, clients cannot access the Network Server from another host. To
+enable connections from other hosts, set the <codeph>derby.drda.host</codeph>
+property, or start the Network Server with the <codeph>-h</codeph> option
+in the <codeph>java org.apache.derby.drda.NetworkServerControl start</codeph>
+command.</p>
+<p>In the following example, the server will listen only on the localhost, and
+clients cannot access the server from another host:</p>
 <codeblock><b>java org.apache.derby.drda.NetworkServerControl start</b></codeblock>
-<p>In the following example, the server runs on host machine <codeph><i>sampleserver.example.com</i></codeph> and
-also listens for clients from other hosts. Clients must specify the server
-in the URL or DataSource as sampleserver.example.com:</p>
+<p>In the following example, the server runs on the host machine
+<codeph>sampleserver.example.com</codeph> and also listens for clients
+from other hosts. Clients must specify the server in the URL or DataSource as
+<codeph>sampleserver.example.com</codeph>:</p>
 <codeblock><b>java org.apache.derby.drda.NetworkServerControl start 
    -h sampleserver.example.com</b></codeblock>
 <p>To start the Network Server so that it will listen on all interfaces, start
-with an IP address of <codeph><i>0.0.0.0</i></codeph>, shown in the following
-example:  <codeblock><b>java org.apache.derby.drda.NetworkServerControl start -h 0.0.0.0</b></codeblock></p>
-<p>A server that is started with the <codeph><i>-h 0.0.0.0</i></codeph> option
-will listen to client requests that originate from both <codeph><i>localhost</i></codeph> and
-from other machines on the network.</p>
-<p>However, administrative commands (for example, <codeph><i>org.apache.derby.drda.NetworkServerControl
-shutdown</i></codeph>) can run only on the host where the server was started,
-even if the server was started with the <codeph><i>-h</i></codeph> option.</p>
+with an IP address of <codeph>0.0.0.0</codeph>, as shown in the following
+example:</p>
+<codeblock><b>java org.apache.derby.drda.NetworkServerControl start -h 0.0.0.0</b></codeblock>
+<p>A server that is started with the <codeph>-h 0.0.0.0</codeph> option will
+listen to client requests that originate from both <codeph>localhost</codeph>
+and from other machines on the network.</p>
+<p>However, administrative commands (for example,
+<codeph>org.apache.derby.drda.NetworkServerControl shutdown</codeph>) can run
+only on the host where the server was started, even if the server was started
+with the <codeph>-h</codeph> option.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov11108.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov11108.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov11108.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov11108.dita Mon Nov 11 16:51:49 2013
@@ -17,9 +17,12 @@ limitations under the License.
 -->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminov11108">
-<title>Derby in a multi-user environment</title>
+<title><ph conref="../conrefs.dita#prod/productshortname"></ph> in a multi-user
+environment</title>
+<shortdesc>This section describes how to use
+<ph conref="../conrefs.dita#prod/productshortname"></ph> in a multi-user (or
+"server") environment.</shortdesc>
 <prolog>
 </prolog>
 <conbody>
-<p>This section describes how to use <ph conref="../conrefs.dita#prod/productshortname"></ph> in a multi-user (or "server") environment.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov16172.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov16172.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov16172.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov16172.dita Mon Nov 11 16:51:49 2013
@@ -19,17 +19,17 @@ limitations under the License.
 -->
 <concept id="cadminov16172" xml:lang="en-us">
 <title>Multiple concurrency levels</title>
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> supports the
+SERIALIZABLE (RR), REPEATABLE (RS), READ COMMITTED (CS), and READ UNCOMMITTED
+(UR) isolation levels.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Isolation levels</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p><ph conref="../conrefs.dita#prod/productshortname"></ph> supports SERIALIZABLE
-(RR), REPEATABLE (RS), READ COMMITTED (CS), and READ UNCOMMITTED (UR) isolation
-levels.</p>
 <dl><dlentry>
 <dt>CS</dt>
-<dd>CS (the default isolation level) provides the best balance between concurrency
-and consistency in multiple-client environments.</dd>
+<dd>CS (the default isolation level) provides the best balance between
+concurrency and consistency in multiple-client environments.</dd>
 </dlentry><dlentry>
 <dt>RS</dt>
 <dd>RS provides less consistency than RR but allows more concurrency.</dd>
@@ -38,11 +38,11 @@ and consistency in multiple-client envir
 <dd>RR provides greatest consistency.</dd>
 </dlentry><dlentry>
 <dt>UR</dt>
-<dd>UR provides maximum concurrency, if uncommitted values are allowed in
-the query. It is typically used if approximate results are acceptable.</dd>
+<dd>UR provides maximum concurrency, if uncommitted values are allowed in the
+query. It is typically used if approximate results are acceptable.</dd>
 </dlentry></dl>
-<p>See "Types and Scope of Locks in <ph conref="../conrefs.dita#prod/productshortname"></ph> Systems"
-in the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite> for
-more information.</p>
+<p>See "Types and Scope of Locks in
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Systems" in the
+<ph conref="../conrefs.dita#pub/citdevelop"></ph> for more information.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov17524.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov17524.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov17524.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov17524.dita Mon Nov 11 16:51:49 2013
@@ -18,23 +18,27 @@ See the License for the specific languag
 limitations under the License.
 -->
 <concept id="cadminov17524" xml:lang="en-us">
-<title>Derby in a server framework</title>
+<title><ph conref="../conrefs.dita#prod/productshortname"></ph> in a server
+framework</title>
+<shortdesc>In a sense, <ph conref="../conrefs.dita#prod/productshortname"></ph>
+is always an embedded product. You can embed it in an application in which users
+access the database from a single Java Virtual Machine (JVM), or you can embed
+it in a server framework (an application that allows users from different JVMs
+to connect to <ph conref="../conrefs.dita#prod/productshortname"></ph>
+simultaneously).</shortdesc>
 <prolog></prolog>
 <conbody>
-<p>In a sense, <ph conref="../conrefs.dita#prod/productshortname"></ph> is
-always an embedded product. You can embed it in an application in which users
-access the database from a single JVM or you can embed it in a server framework
-(an application that allows users from different JVMs to connect to <ph conref="../conrefs.dita#prod/productshortname"></ph> simultaneously).
-When <ph conref="../conrefs.dita#prod/productshortname"></ph> is embedded
-in an application, the local JDBC driver calls the local <ph conref="../conrefs.dita#prod/productshortname"></ph> database.
-When <ph conref="../conrefs.dita#prod/productshortname"></ph> is embedded
+<p>When <ph conref="../conrefs.dita#prod/productshortname"></ph> is embedded
+in an application, the local JDBC driver calls the local
+<ph conref="../conrefs.dita#prod/productshortname"></ph> database.</p>
+<p>When <ph conref="../conrefs.dita#prod/productshortname"></ph> is embedded
 in a server framework, the server framework's connectivity software provides
 data to multiple client JDBC applications over a network or the Internet.</p>
 <p>For local or remote multi-user connectivity (multiple users who access <ph
 conref="../conrefs.dita#prod/productshortname"></ph> from different JVMs),
 use the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server. If you require features that are not included in the Network Server,
-you can embed the basic <ph conref="../conrefs.dita#prod/productshortname"></ph> product
-in another server framework.</p>
+you can embed the basic <ph conref="../conrefs.dita#prod/productshortname"></ph>
+product in another server framework.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov28261.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov28261.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov28261.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov28261.dita Mon Nov 11 16:51:49 2013
@@ -19,18 +19,21 @@ limitations under the License.
 -->
 <concept id="cadminov28261" xml:lang="en-us">
 <title>Row-level locking</title>
+<shortdesc>To support multi-user access,
+<ph conref="../conrefs.dita#prod/productshortname"></ph> uses row-level locking.
+</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Table-level locking</indexterm><indexterm>Row-level locking</indexterm>
 <indexterm>Locking<indexterm>row-level</indexterm></indexterm><indexterm>Locking<indexterm>table-level</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>To support multi-user access, <ph conref="../conrefs.dita#prod/productshortname"></ph> utilizes
-row-level locking. However, you can configure <ph conref="../conrefs.dita#prod/productshortname"></ph> to
-use table-level locking in environments that have few concurrent transactions
-(for example, a read-only database) . Table-level locking is preferable if
-there are few or no writes to the server, while row-level locking is essential
-for good performance if many clients write to the server concurrently. The <ph
+<p>However, you can configure
+<ph conref="../conrefs.dita#prod/productshortname"></ph> to use table-level
+locking in environments that have few concurrent transactions (for example, a
+read-only database). Table-level locking is preferable if there are few or no
+writes to the server, while row-level locking is essential for good performance
+if many clients write to the server concurrently. The <ph
 conref="../conrefs.dita#prod/productshortname"></ph> optimizer tunes lock
 choice for queries automatically.</p>
 </conbody>

Modified: db/derby/docs/trunk/src/adminguide/cadminov33597.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov33597.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov33597.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov33597.dita Mon Nov 11 16:51:49 2013
@@ -17,9 +17,11 @@ limitations under the License.
 -->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminov33597">
-<title>Multiple-client features available in Derby</title>
+<title>Multiple-client features available in
+<ph conref="../conrefs.dita#prod/productshortname"></ph></title>
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> contains
+some features that are useful for developing multi-user applications.</shortdesc>
 <prolog>
 </prolog>
 <conbody>
-<p><ph conref="../conrefs.dita#prod/productshortname"></ph> contains some features that are useful for developing multi-user applications.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov38650.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov38650.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov38650.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov38650.dita Mon Nov 11 16:51:49 2013
@@ -18,10 +18,15 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminov38650">
 <title>About this guide and the Network Server documentation</title>
+<shortdesc>This guide assumes that you are familiar with
+<ph conref="../conrefs.dita#prod/productshortname"></ph> features and
+tuning.</shortdesc>
 <prolog>
 </prolog>
 <conbody>
-<p>This guide assumes that you are familiar with <ph conref="../conrefs.dita#prod/productshortname"></ph> features and tuning. Before reading this guide, you should first learn about basic <ph conref="../conrefs.dita#prod/productshortname"></ph> functionality
-by reading the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite>. Also, because multi-user environments typically
-have performance and tuning issues, you should read <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p>
+<p>Before reading this guide, you should first learn about basic
+<ph conref="../conrefs.dita#prod/productshortname"></ph> functionality by
+reading the <ph conref="../conrefs.dita#pub/citdevelop"></ph>. Also, because
+multi-user environments typically have performance and tuning issues, you should
+read <ph conref="../conrefs.dita#pub/cittuning"></ph>.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov65220.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov65220.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov65220.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov65220.dita Mon Nov 11 16:51:49 2013
@@ -18,6 +18,9 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminov65220">
 <title>Multi-connection and multi-threading</title>
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> allows
+multiple simultaneous connections to a database, even in embedded mode.
+</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>Multiple connections<indexterm>from single application
@@ -27,8 +30,8 @@ running in embedded mode</indexterm></in
 </metadata>
 </prolog>
 <conbody>
-<p><ph conref="../conrefs.dita#prod/productshortname"></ph> allows multiple simultaneous connections to a database, even
-in embedded mode. <ph conref="../conrefs.dita#prod/productshortname"></ph> is also fully multi-threaded, and you can have
-multiple threads active at the same time. However, JDBC semantics impose some
-limitations on multi-threading. See the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite> for more information.</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> is also fully
+multi-threaded, and you can have multiple threads active at the same time.
+However, JDBC semantics impose some limitations on multi-threading. See the
+<ph conref="../conrefs.dita#pub/citdevelop"></ph> for more information.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov825125.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov825125.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov825125.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov825125.dita Mon Nov 11 16:51:49 2013
@@ -19,10 +19,11 @@ limitations under the License.
 -->
 <concept id="cadminov825125" xml:lang="en-us">
 <title>Connectivity configurations</title>
+<shortdesc>There are several ways to embed
+<ph conref="../conrefs.dita#prod/productshortname"></ph> in a server framework.
+</shortdesc>
 <prolog></prolog>
 <conbody>
-<p>There are several ways to embed <ph conref="../conrefs.dita#prod/productshortname"></ph> in
-a server framework:</p>
 <dl><dlentry>
 <dt>Use the Network Server</dt>
 <dd>This is the easiest way to provide connectivity to multiple users who

Modified: db/derby/docs/trunk/src/adminguide/cadminov825149.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov825149.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov825149.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov825149.dita Mon Nov 11 16:51:49 2013
@@ -18,8 +18,13 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminov825149">
 <title>Embedded servers</title>
+<shortdesc>Because <ph conref="../conrefs.dita#prod/productshortname"></ph> is
+written in the Java programming language, you have great flexibility in how you
+choose to configure your deployment.</shortdesc>
 <prolog>
 </prolog>
 <conbody>
-<p>Because <ph conref="../conrefs.dita#prod/productshortname"></ph> is written in Java, you have great flexibility in how you choose to configure your deployment. For example, you can run <ph conref="../conrefs.dita#prod/productshortname"></ph>, the JDBC server framework, and another application in the same JVM as a single process.</p>
+<p>For example, you can run
+<ph conref="../conrefs.dita#prod/productshortname"></ph>, the JDBC server
+framework, and another application in the same JVM as a single process.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov825266.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov825266.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov825266.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov825266.dita Mon Nov 11 16:51:49 2013
@@ -18,16 +18,20 @@ See the License for the specific languag
 limitations under the License.
 -->
 <concept id="cadminov825266" xml:lang="en-us">
-<title>The Derby Network Server</title>
+<title>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server</title>
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server provides multi-user connectivity to
+<ph conref="../conrefs.dita#prod/productshortname"></ph> databases within a
+single system or over a network.</shortdesc>
 <prolog></prolog>
 <conbody>
-<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Server provides multi-user connectivity to <ph conref="../conrefs.dita#prod/productshortname"></ph> databases
-within a single system or over a network. The Network Server uses the standard
-Distributed Relational Database Architecture (DRDA) protocol to receive and
-reply to queries from clients. Databases are accessed through the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Server by using the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Client driver.</p>
+<p>The Network Server uses the standard Distributed Relational Database
+Architecture (DRDA) protocol to receive and reply to queries from clients.
+Databases are accessed through the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server by using
+the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Client
+driver.</p>
 <p>The Network Server is a solution for multiple JVMs that connect to the
 database, unlike the embedded scenario where only one JVM runs as part of
 the system. When <ph conref="../conrefs.dita#prod/productshortname"></ph> is
@@ -38,20 +42,23 @@ framework, the server framework's connec
 client JDBC applications over a network or the Internet.</p>
 <p>To run the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server, you need to install the following files:<ul>
-<li>On the server side, install <filepath>derby.jar</filepath> and <filepath>derbynet.jar</filepath>.</li>
-<li>On the client side, install <filepath>derbyclient.jar</filepath>.</li>
+<li>On the server side, install <codeph>derby.jar</codeph> and
+<codeph>derbynet.jar</codeph>.</li>
+<li>On the client side, install <codeph>derbyclient.jar</codeph>.</li>
 </ul></p>
-<p>There are several ways to manage the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Server, including:</p>
+<p>There are several ways to manage the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server,
+including:</p>
 <ul>
 <li>Through the command line</li>
-<li>By using .bat and .ksh scripts</li>
+<li>By using <codeph>.bat</codeph> and <codeph>.ksh</codeph> scripts</li>
 <li>With your own Java program (written using the Network Server API)</li>
 <li>By setting Network Server properties</li>
 </ul>
 <p><xref href="cadminapps59125.dita#cadminapps59125"></xref> explains how
-to change existing Java applications that currently run against <ph conref="../conrefs.dita#prod/productshortname"></ph> in
-embedded mode to run against the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+to change existing Java applications that currently run against
+<ph conref="../conrefs.dita#prod/productshortname"></ph> in embedded mode to run
+against the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server.</p>
 <p><xref href="cadminconfig86869.dita#cadminconfig86869"></xref> explains
 how to manage the Network Server by using the command line, including starting
@@ -60,9 +67,10 @@ and stopping it.</p>
 topics for <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server users.</p>
 <p>Because of the differences in JDBC drivers that are used, you might encounter
-differences in functionality when running <ph conref="../conrefs.dita#prod/productshortname"></ph> in
-the Network Server framework as opposed to running it embedded in a user application.
-Refer to <xref href="cadminapps59125.dita#cadminapps59125"></xref> for a complete
-list of the differences between embedded and Network Server configurations.</p>
+differences in functionality when running
+<ph conref="../conrefs.dita#prod/productshortname"></ph> in the Network Server
+framework as opposed to running it embedded in a user application. Refer to
+<xref href="cadminapps59125.dita#cadminapps59125"></xref> for a complete list of
+the differences between embedded and Network Server configurations.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov83312.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov83312.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov83312.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov83312.dita Mon Nov 11 16:51:49 2013
@@ -18,11 +18,12 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminov83312">
 <title>Administrative tools</title>
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> provides
+some tools and features to assist database administrators, including the
+following.</shortdesc>
 <prolog>
 </prolog>
 <conbody>
-<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides some tools
-and features to assist database administrators, including:</p>
 <ul>
 <li>Consistency checker</li>
 <li>Online backup</li>

Modified: db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita Mon Nov 11 16:51:49 2013
@@ -19,6 +19,10 @@ limitations under the License.
 <concept xml:lang="en-us" id="cadminovcliconnect">
 <title>Connecting a client to the Network Server with the SimpleNetworkClientSample
 program</title>
+<shortdesc>The <codeph>SimpleNetworkClientSample</codeph> program is a client
+program that interacts with the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server from
+another JVM.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>SimpleNetworkClientSample program</indexterm>
@@ -26,21 +30,21 @@ program</title>
 </metadata>
 </prolog>
 <conbody>
-<p>The SimpleNetworkClientSample program is a client
-program that interacts with the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server from another JVM.
-The program performs the following tasks:
-<ul>
+<p>The program performs the following tasks:
+<ol>
 <li>Loads the network client driver. (Note that this step is not
 necessary if you are running the client on JDK 1.6 or higher. In that
 environment, the network client driver loads automatically.)</li>
-<li>Obtains a client connection by using the DriverManager.</li>
+<li>Obtains a client connection by using the <codeph>DriverManager</codeph>.</li>
 <li>Obtains a client connection by using a DataSource.</li>
 <li>Tests the database connections by running a sample query.</li>
 <li>Closes the connections and then exits the program.</li>
-</ul></p>
-<p>You must install the following files in the <codeph>%<ph conref="../conrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph> directory before you can run the sample program:
+</ol></p>
+<p>You must install the following files in the
+<codeph>%<ph conref="../conrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph>
+directory before you can run the sample program:
 <ul>
-<li>The source file: <filepath>SimpleNetworkClientSample.java.</filepath></li>
-<li>The compiled class file: <filepath>SimpleNetworkClientSample.class.</filepath></li>
+<li>The source file: <codeph>SimpleNetworkClientSample.java</codeph></li>
+<li>The compiled class file: <codeph>SimpleNetworkClientSample.class</codeph></li>
 </ul></p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita Mon Nov 11 16:51:49 2013
@@ -22,8 +22,8 @@ limitations under the License.
 <shortdesc>This <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server sample program demonstrates how to obtain an embedded connection and
 client connections to the same database by using the Network Server. This
-program shows how to use either the DriverManager or a DataSource to obtain
-client connections.</shortdesc>
+program shows how to use either the <codeph>DriverManager</codeph> or a
+DataSource to obtain client connections.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Network Server<indexterm>sample programs for embedded
 and client connections</indexterm></indexterm></keywords>

Modified: db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita Mon Nov 11 16:51:49 2013
@@ -18,6 +18,9 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminovsrvsmpprgm">
 <title>Overview of the SimpleNetworkServerSample program</title>
+<shortdesc>The <codeph>SimpleNetworkServerSample</codeph> program starts the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server, as well
+as the embedded driver, and waits for clients to connect.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>SimpleNetworkServerSample program</indexterm>
@@ -25,25 +28,25 @@ limitations under the License.
 </metadata>
 </prolog>
 <conbody>
-<p>The SimpleNetworkServerSample program starts the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Server, as well as the embedded driver, and waits for clients to connect. The
-program performs the following tasks.
-<ul>
-<li>Starts the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server by using a property and also loads the embedded driver</li>
+<p>The program performs the following tasks.
+<ol>
+<li>Starts the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server by using a property and also loads the embedded driver</li>
 <li>Determines if the Network Server is running</li>
-<li>Creates the NSSimpleDB database if it is not already
+<li>Creates the <codeph>NSSimpleDB</codeph> database if it is not already
 created</li>
-<li>Obtains an embedded database connection </li>
+<li>Obtains an embedded database connection</li>
 <li>Tests the database connection by executing a sample query</li>
 <li>Allows client connections to connect to the server until you decide to
 stop the server and exit the program</li>
 <li>Closes the connection</li>
 <li>Shuts down the Network Server before exiting the program</li>
-</ul></p>
-<p> To run the sample program, install the following files in
-the <codeph>%<ph conref="../conrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph> directory:
+</ol></p>
+<p> To run the sample program, install the following files in the
+<codeph>%<ph conref="../conrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph>
+directory:
 <ul>
-<li>The source file: <filepath>SimpleNetworkServerSample.java</filepath></li>
-<li>The compiled class file: <filepath>SimpleNetworkServerSample.class</filepath></li>
+<li>The source file: <codeph>SimpleNetworkServerSample.java</codeph></li>
+<li>The compiled class file: <codeph>SimpleNetworkServerSample.class</codeph></li>
 </ul></p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminpartone.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminpartone.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminpartone.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminpartone.dita Mon Nov 11 16:51:49 2013
@@ -17,10 +17,12 @@ limitations under the License.
 -->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminpartone">
-<title>Part one: Derby Server Guide</title>
+<title>Part One: <ph conref="../conrefs.dita#prod/productshortname"></ph> Server
+Guide</title>
 <prolog>
 </prolog>
 <conbody>
-<p>This part of the guide explains the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server and other server frameworks.
-</p>
+<p>This part of the guide explains the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server and
+other server frameworks.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminparttwo.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminparttwo.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminparttwo.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminparttwo.dita Mon Nov 11 16:51:49 2013
@@ -17,7 +17,8 @@ limitations under the License.
 -->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminparttwo">
-<title>Part two: Derby Administration Guide</title>
+<title>Part Two: <ph conref="../conrefs.dita#prod/productshortname"></ph>
+Administration Guide</title>
 <prolog>
 </prolog>
 <conbody>

Modified: db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita Mon Nov 11 16:51:49 2013
@@ -20,13 +20,17 @@ limitations under the License.
  "../dtd/concept.dtd">
 <concept id="cadminpreface11181" xml:lang="en-us">
 <title>Purpose of this guide</title>
+<shortdesc>This guide explains how to use
+<ph conref="../conrefs.dita#prod/productshortname"></ph> in a multiple-client
+environment. It also provides information that a server administrator might need
+to keep <ph conref="../conrefs.dita#prod/productshortname"></ph> running with a
+high level of performance and reliability in a server framework or in a
+multiple-client application server environment.</shortdesc>
 <prolog></prolog>
 <conbody>
-<p>This guide explains how to use <ph conref="../conrefs.dita#prod/productshortname"></ph> in a multiple-client environment.
-It also provides information that a server administrator might need to keep
-<ph conref="../conrefs.dita#prod/productshortname"></ph> running with a high level of performance and reliability in a server framework
-or in a multiple-client application server environment (When running in embedded mode, <ph conref="../conrefs.dita#prod/productshortname"></ph>
-databases typically do not need any administration).</p>
+<p>When running in embedded mode,
+<ph conref="../conrefs.dita#prod/productshortname"></ph> databases typically do
+not need any administration.</p>
 <p>To connect multiple clients with <ph conref="../conrefs.dita#prod/productshortname"></ph>, you can embed <ph conref="../conrefs.dita#prod/productshortname"></ph> in a server
 framework that you choose, or you can use the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server. This
 guide describes these options.</p>

Modified: db/derby/docs/trunk/src/adminguide/cadminpreface22460.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminpreface22460.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminpreface22460.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminpreface22460.dita Mon Nov 11 16:51:49 2013
@@ -18,9 +18,11 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminpreface22460">
 <title>Audience</title>
+<shortdesc>This guide has two parts, each for a different audience.</shortdesc>
 <prolog>
 </prolog>
 <conbody>
-<p>The first part of this guide is intended for developers of client/server
-and multiple-client applications. The second part of this guide is intended for administrators.</p>
+<p>The first part of this guide is intended for developers of client/server and
+multiple-client applications. The second part of this guide is intended for
+administrators.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita Mon Nov 11 16:51:49 2013
@@ -18,11 +18,11 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminpreface23947">
 <title>How this guide is organized</title>
+<shortdesc>This guide includes the following two parts.</shortdesc>
 <prolog>
 </prolog>
 <conbody>
-<p>This guide includes the following two parts:</p>
-<p>Part one: <ph conref="../conrefs.dita#prod/productshortname"></ph> Server Guide</p>
+<p>Part One: <ph conref="../conrefs.dita#prod/productshortname"></ph> Server Guide</p>
 <ul>
 <li><i><xref href="cadminov11108.dita#cadminov11108"/></i>  
 <p>Describes the different options for embedding <ph conref="../conrefs.dita#prod/productshortname"></ph> in a server framework and
@@ -43,7 +43,7 @@ advanced topics for <ph conref="../conre
 <p>Describes several <ph conref="../conrefs.dita#prod/productshortname"></ph>
 Network Server sample programs for Network Server users.</p></li>
 </ul>
-<p>Part two: <ph conref="../conrefs.dita#prod/productshortname"></ph> Administration Guide</p>
+<p>Part Two: <ph conref="../conrefs.dita#prod/productshortname"></ph> Administration Guide</p>
 <ul>
 <li><i><xref href="cadmindbintegrity.dita#cadmindbintegrity"/></i>  
 <p>Describes how to prevent

Modified: db/derby/docs/trunk/src/adminguide/cadminreplication.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminreplication.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminreplication.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminreplication.dita Mon Nov 11 16:51:49 2013
@@ -21,9 +21,8 @@ limitations under the License.
 <concept id="cadminreplication" xml:lang="en-us">
 <title>Replicating databases</title>
 <shortdesc>Replication is an important feature of a robust database management
-system. In <ph conref="../conrefs.dita#prod/productshortname"></ph>, you
-start database replication by using connection URL attributes.
-</shortdesc>
+system. In <ph conref="../conrefs.dita#prod/productshortname"></ph>, you start
+database replication by using connection URL attributes.</shortdesc>
 <prolog><metadata><keywords>
 <indexterm>replicating databases</indexterm>
 <indexterm>database replication</indexterm>
@@ -54,8 +53,8 @@ waiting for the slave. The shipping of t
 performed regularly, and is completely decoupled from the transaction execution
 at the master. This may lead to a few lost transactions if the master crashes.
 </li>
-<li><b>Shared nothing</b>: Apart from the network line, no hardware is assumed to be
-shared.
+<li><b>Shared nothing</b>: Apart from the network line, no hardware is assumed
+to be shared.
 </li>
 <li><b>Replication granularity</b>: The granularity for replication is exactly
 one database. However, one
@@ -88,10 +87,10 @@ to process transactions. For more detail
 <xref href="cadminreplicfailover.dita#cadminreplicfailover"></xref> and
 <xref href="cadminreplicsecurity.dita#cadminreplicsecurity"></xref>.
 </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 the
-<ph conref="../conrefs.dita#pub/citref"></ph> for details.</p>
+<p>Several <ph conref="../conrefs.dita#prod/productshortname"></ph> 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
+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/cadminreplicfailover.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminreplicfailover.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminreplicfailover.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminreplicfailover.dita Mon Nov 11 16:51:49 2013
@@ -20,34 +20,31 @@ limitations under the License.
 -->
 <concept id="cadminreplicfailover" xml:lang="en-us">
 <title>Forcing a failover</title>
-<prolog><metadata><keywords>
-<indexterm>replicating databases<indexterm>forcing failover</indexterm></indexterm>
-<indexterm>database replication<indexterm>forcing failover</indexterm></indexterm>
-</keywords></metadata></prolog>
-<conbody>
-<p>At any time, you can transform the
+<shortdesc>At any time, you can transform the
 <ph conref="../conrefs.dita#prod/productshortname"></ph> database that has the
 slave role into a normal 
 <ph conref="../conrefs.dita#prod/productshortname"></ph> database that can
 process transactions. This transformation from being a slave to becoming an
 active <ph conref="../conrefs.dita#prod/productshortname"></ph> database is
-called <i>failover</i>. During failover, the slave applies the parts of the
-transaction log that have not yet been processed. It then undoes operations that
-belong to uncommitted transactions, resulting in a transaction-consistent state
-that includes all transactions whose commit log record has been sent to the
-slave.</p>
+called <i>failover</i>.</shortdesc>
+<prolog><metadata><keywords>
+<indexterm>replicating databases<indexterm>forcing failover</indexterm></indexterm>
+<indexterm>database replication<indexterm>forcing failover</indexterm></indexterm>
+</keywords></metadata></prolog>
+<conbody>
+<p>During failover, the slave applies the parts of the transaction log that have
+not yet been processed. It then undoes operations that belong to uncommitted
+transactions, resulting in a transaction-consistent state that includes all
+transactions whose commit log record has been sent to the slave.</p>
 <p>You perform failover from the master system. To do so, you connect to the
-database on the master system using
-the <i>failover=true</i> connection URL attribute. For example, for a database
-named <codeph>wombat</codeph>, you might specify the following connection URL:
-</p>
-<codeblock>
-jdbc:derby:wombat;failover=true
-</codeblock>
+database on the master system using the <codeph>failover=true</codeph>
+connection URL attribute. For example, for a database named
+<codeph>wombat</codeph>, you might specify the following connection URL:</p>
+<codeblock>jdbc:derby:wombat;failover=true</codeblock>
 <p>If the network connection between the master system and the slave system is
 lost, you can perform failover from the slave system.</p>
 <p>See the <ph conref="../conrefs.dita#pub/citref"></ph> for details about the
-<i>failover=true</i> attribute.</p>
+<codeph>failover=true</codeph> attribute.</p>
 <p>There is no automatic failover or restart of replication after one of the
 instances has failed.</p>
 </conbody>

Modified: db/derby/docs/trunk/src/adminguide/cadminreplicfailures.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminreplicfailures.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminreplicfailures.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminreplicfailures.dita Mon Nov 11 16:51:49 2013
@@ -20,15 +20,15 @@ limitations under the License.
 -->
 <concept id="cadminreplicfailures" xml:lang="en-us">
 <title>Replication failure handling</title>
+<shortdesc>Replication can encounter several failure situations. The following
+table lists these situations and describes the actions that
+<ph conref="../conrefs.dita#prod/productshortname"></ph> takes as a
+result.</shortdesc>
 <prolog><metadata><keywords>
 <indexterm>replicating databases<indexterm>failure handling</indexterm></indexterm>
 <indexterm>database replication<indexterm>failure handling</indexterm></indexterm>
 </keywords></metadata></prolog>
 <conbody>
-<p>Replication can encounter several failure situations. The following table
-lists these situations and describes the actions that
-<ph conref="../conrefs.dita#prod/productshortname"></ph> takes as a result.
-</p>
 <table>
 <title>Replication failure handling</title>
 <desc>This table lists the possible replication failure situations and describes the actions taken as a result.</desc>
@@ -49,20 +49,21 @@ master tries to reconnect with the slave
 connection is down are buffered in main memory. If the log buffer reaches its
 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 the <ph conref="../conrefs.dita#pub/citref"></ph> for
+<codeph>derby.replication.logBufferSize</codeph> to configure the size limit of
+the buffer; see the <ph conref="../conrefs.dita#pub/citref"></ph> for
 details.</entry>
 </row>
 <row>
 <entry colname="col1">Slave loses connection with master.</entry>
 <entry colname="col2">The slave tries to reestablish the connection with the
 master by listening on the specified host and port. It will not give up until it
-is explicitly requested to do so by either the <i>failover=true</i> or
-<i>stopSlave=true</i> connection URL attribute. If a failover is requested, the
-slave applies all received log records and boots the database as described in
+is explicitly requested to do so by either the <codeph>failover=true</codeph> or
+<codeph>stopSlave=true</codeph> connection URL attribute. If a failover is
+requested, the slave applies all received log records and boots the database as
+described in
 <xref href="cadminreplicfailover.dita#cadminreplicfailover"></xref>. If the
-<i>stopSlave=true</i> attribute is specified, the slave database is shut down
-without further actions.</entry>
+<codeph>stopSlave=true</codeph> attribute is specified, the slave database is
+shut down without further actions.</entry>
 </row>
 <row>
 <entry colname="col1">Two different masters of database D try to replicate to
@@ -99,11 +100,14 @@ keep the buffer from getting full, the r
 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
+"derby.replication.logBufferSize", "derby.replication.maxLogShippingInterval",
+and "derby.replication.minLogShippingInterval" in
 the <ph conref="../conrefs.dita#pub/citref"></ph> for details.</entry>
 </row>
 <row>
 <entry colname="col1">The slave
-<ph conref="../conrefs.dita#prod/productshortname"></ph> instance crashes.</entry>
+<ph conref="../conrefs.dita#prod/productshortname"></ph> instance
+crashes.</entry>
 <entry colname="col2">The master sees this as a lost connection to the slave.
 The master tries to reestablish the connection until the replication log buffer
 is full. Replication is then stopped on the master. Replication must be

Modified: db/derby/docs/trunk/src/adminguide/cadminreplicsecurity.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminreplicsecurity.dita?rev=1540771&r1=1540770&r2=1540771&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminreplicsecurity.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminreplicsecurity.dita Mon Nov 11 16:51:49 2013
@@ -20,39 +20,33 @@ limitations under the License.
 -->
 <concept id="cadminreplicsecurity" xml:lang="en-us">
 <title>Replication and security</title>
+<shortdesc>If you want to perform replication with the security manager enabled,
+you must modify the security policy file on both the master and slave systems to
+allow the master-slave network connection.</shortdesc>
 <prolog><metadata><keywords>
 <indexterm>replicating databases<indexterm>security</indexterm></indexterm>
 <indexterm>database replication<indexterm>security</indexterm></indexterm>
 </keywords></metadata></prolog>
 <conbody>
-<p>If you want to perform replication with the security manager enabled, you
-must modify the security policy file on both the master and slave systems to
-allow the master-slave network connection. The section to be modified is the
-one following this line:</p>
-<codeblock>
-grant codeBase "${derby.install.url}derby.jar"
-</codeblock>
+<p>The section to be modified is the one following this line:</p>
+<codeblock>grant codeBase "${derby.install.url}derby.jar"</codeblock>
 <p>Add the following permission to the policy file on the master system:</p>
-<codeblock>
-  permission java.net.SocketPermission "<i>slaveHost</i>:<i>slavePort</i>", "connect,resolve";
-</codeblock>
+<codeblock>permission java.net.SocketPermission "<i>slaveHost</i>:<i>slavePort</i>", "connect,resolve";</codeblock>
 <p>Add the following permission to the policy file on the slave system:</p>
-<codeblock>
-  permission java.net.SocketPermission "<i>slaveHost</i>", "accept,resolve";
-</codeblock>
+<codeblock>permission java.net.SocketPermission "<i>slaveHost</i>", "accept,resolve";</codeblock>
 <p><i>slaveHost</i> and <i>slavePort</i> are the values you specify for the
-<i>slaveHost=hostname</i> and <i>slavePort=portValue</i> attributes, which are
-described in the <ph conref="../conrefs.dita#pub/citref"></ph>.</p>
+<codeph>slaveHost=<i>hostname</i></codeph> and
+<codeph>slavePort=<i>portValue</i></codeph> attributes, which are described in
+the <ph conref="../conrefs.dita#pub/citref"></ph>.</p>
 <p>See <xref href="tadminnetservbasic.dita#tadminnetservbasic"></xref> for
 details on the security policy file.</p>
-<p>Depending on the security mode <ph
-conref="../conrefs.dita#prod/productshortname"></ph> is running under, the
+<p>Depending on the security mode
+<ph conref="../conrefs.dita#prod/productshortname"></ph> is running under, the
 measures described in the following table are enforced when you specify the
-replication-related connection URL attributes.
-</p>
+replication-related connection URL attributes.</p>
 <table>
-<title>Replication behavior with <ph
-conref="../conrefs.dita#prod/productshortname"></ph> security</title>
+<title>Replication behavior with
+<ph conref="../conrefs.dita#prod/productshortname"></ph> security</title>
 <desc>This table lists the requirements for specifying replication attributes with each of the <ph conref="../conrefs.dita#prod/productshortname"></ph> security modes.</desc>
 <tgroup cols="2" colsep="1" rowsep="1">
 <colspec colname="col1" colnum="1" colwidth="30*"/>
@@ -72,13 +66,14 @@ conref="../conrefs.dita#prod/productshor
 <entry colname="col1">Authentication is turned on</entry>
 <entry colname="col2">Normal <ph
 conref="../conrefs.dita#prod/productshortname"></ph> connection policy: specify
-valid <i>user=userName</i> and <i>password=userPassword</i> attributes</entry>
+valid <codeph>user=<i>userName</i></codeph> and
+<codeph>password=<i>userPassword</i></codeph> attributes</entry>
 </row>
 <row>
 <entry colname="col1">Authorization is turned on</entry>
-<entry colname="col2">The <i>user=userName</i> and <i>password=userPassword</i>
-attributes must be valid, and the user must be the owner of the replicated
-database</entry>
+<entry colname="col2">The <codeph>user=<i>userName</i></codeph> and
+<codeph>password=<i>userPassword</i></codeph> attributes must be valid, and the
+user must be the owner of the replicated database</entry>
 </row>
 </tbody>
 </tgroup>



Mime
View raw message