db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1540788 [1/3] - /db/derby/docs/branches/10.10/src/adminguide/
Date Mon, 11 Nov 2013 17:27:56 GMT
Author: chaase3
Date: Mon Nov 11 17:27:54 2013
New Revision: 1540788

URL: http://svn.apache.org/r1540788
Log:
DERBY-6379  Manuals are inconsistent in their use of the <shortdesc> element

Merged DERBY-6379-adminconcepts.diff (except for 4 files for which I will file another patch) to 10.10 doc branch from trunk revision 1540771.

Modified:
    db/derby/docs/branches/10.10/src/adminguide/cadminadvtops.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminapps.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminapps49914.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminapps59125.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminapps811478.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminapps811631.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminapps811656.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminapps811695.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminappsclient.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminappsclientdiffs.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminappsclientsecurity.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminappsclienttracing.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminappsdiffsreadonly.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminappsthenetworkserverandjvms.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminappsusingthederbytoolswiththene.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminappsxawthdriver.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminbckupdb.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminconfig86869.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminconfigoverview.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminconsist01.dita
    db/derby/docs/branches/10.10/src/adminguide/cadmindbintegrity.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminembeddedserver.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup01.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup12677.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup21105.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup67525.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup75469.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminimportidentitycol.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminimportjdbc.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminimportlobs.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminjmxoverview.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminlockvti42553.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminlockvti83889.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminlog800315.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminlog98.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminnetservfileperms.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminnetservsecurity.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminov11108.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminov16172.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminov17524.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminov28261.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminov33597.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminov38650.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminov65220.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminov825125.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminov825149.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminov825266.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminov83312.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminovcliconnect.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminovntsrvsample.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminovsrvsmpprgm.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminpartone.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminparttwo.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminpreface11181.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminpreface22460.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminpreface23947.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminreplication.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminreplicfailover.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminreplicfailures.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminreplicsecurity.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminreplicstartrun.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminreplicstop.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminrollforward.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminservlet98430.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminspace21579.dita
    db/derby/docs/branches/10.10/src/adminguide/cadminssl.dita

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminadvtops.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminadvtops.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminadvtops.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminadvtops.dita Mon Nov 11 17:27:54 2013
@@ -17,10 +17,11 @@ limitations under the License.
 -->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminadvtops">
-<title>Derby Network Server advanced topics</title>
-<prolog>
-</prolog>
+<title><ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server
+advanced topics</title>
+<shortdesc>This section discusses several advanced topics for users of the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>This section discusses several advanced topics for users of the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Server.</p>
 </conbody></concept>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminapps.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminapps.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminapps.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminapps.dita Mon Nov 11 17:27:54 2013
@@ -18,15 +18,17 @@ See the License for the specific languag
 limitations under the License.
 -->
 <concept id="cadminapps" xml:lang="en-us">
-<title>Differences between running Derby in embedded mode and using the Network
-Server</title>
+<title>Differences between running
+<ph conref="../conrefs.dita#prod/productshortname"></ph> in embedded mode and 
+using the Network Server</title>
+<shortdesc>This section describes the differences between running <ph
+conref="../conrefs.dita#prod/productshortname"></ph> in embedded mode and
+using the Network Server.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Network Server<indexterm>Differences with embedded driver</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>This section describes the differences between running <ph
-conref="../conrefs.dita#prod/productshortname"></ph> in embedded mode and
-using the Network Server. Note that there may be undocumented differences
-that have not yet been identified.</p>
+<note>There may be undocumented differences that have not yet been
+identified.</note>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminapps49914.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminapps49914.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminapps49914.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminapps49914.dita Mon Nov 11 17:27:54 2013
@@ -19,6 +19,13 @@ limitations under the License.
 -->
 <concept id="cadminapps49914" xml:lang="en-us">
 <title>User authentication differences</title>
+<shortdesc>When you run <ph conref="../conrefs.dita#prod/productshortname"></ph>
+in embedded mode or when you use the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server, you can
+enable or disable server-side user authentication. However, when you use the
+Network Server, the default security mechanism
+(<codeph>CLEAR_TEXT_PASSWORD_SECURITY</codeph>) requires that you supply both
+the user name and password.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>User authentication differences<indexterm>and Network
 Server</indexterm></indexterm><indexterm>Network Server<indexterm>user authentication
@@ -29,28 +36,28 @@ security properties</indexterm></indexte
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>When running <ph conref="../conrefs.dita#prod/productshortname"></ph> in
-embedded mode or when using the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Server, you can enable or disable server-side user authentication. However,
-when using the Network Server, the default security mechanism (<codeph>CLEAR_TEXT_PASSWORD_SECURITY</codeph>)
-requires that you supply both the user name and password.</p>
-<p>In addition to the default user name and password security mechanism, <i>org.apache.derby.jdbc.ClientDataSource.CLEAR_TEXT_PASSWORD_SECURITY, </i
-> <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server
-supports the following security properties:</p>
+<p>In addition to the default user name and password security mechanism,
+<codeph>org.apache.derby.jdbc.ClientDataSource.CLEAR_TEXT_PASSWORD_SECURITY</codeph>,
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server supports
+the following security properties:</p>
 <ul>
-<li>UserID  (<i>org.apache.derby.jdbc.ClientDataSource.USER_ONLY_SECURITY</i>)
-<p>When using this mechanism, you must specify only the <codeph>user</codeph> property.
-All other mechanisms require you to specify both the user name and the password.</p></li>
-<li>Encrypted UserID and encrypted password (<i>org.apache.derby.jdbc.ClientDataSource.ENCRYPTED_USER_AND_PASSWORD_SECURITY</i>)    <p>When using this mechanism, both password and
-user id are encrypted.</p></li>
+<li>UserID (<codeph>org.apache.derby.jdbc.ClientDataSource.USER_ONLY_SECURITY</codeph>)
+<p>When you use this mechanism, you must specify only the <codeph>user</codeph>
+property. All other mechanisms require you to specify both the user name and the
+password.</p></li>
+<li>Encrypted UserID and encrypted password
+(<codeph>org.apache.derby.jdbc.ClientDataSource.ENCRYPTED_USER_AND_PASSWORD_SECURITY</codeph>)
+<p>When you use this mechanism, both password and user id are encrypted.</p></li>
 </ul>
-<p>The user's name that is specified upon connection is the default schema
-for the connection, if a schema with that name exists. See the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite> for
-more information on schema and user names.</p>
-<p>If you specify any other security mechanism, you will receive an exception.</p>
-<p>To change the default, you can specify another security mechanism either
-as a property or on the URL (using the <codeph>securityMechanism=value</codeph> attribute) when making
-the connection. For details, see
+<p>The user name that is specified upon connection is the default schema for the
+connection, if a schema with that name exists. See the
+<ph conref="../conrefs.dita#pub/citdevelop"></ph> for more information on schema
+and user names.</p>
+<p>If you specify any other security mechanism, you will receive an
+exception.</p>
+<p>To change the default, you can specify another security mechanism either as a
+property or on the URL (using the <codeph>securityMechanism=value</codeph>
+attribute) when you make the connection. For details, see
 <xref href="cadminappsclientsecurity.dita#cadminappsclientsecurity"></xref> and
 "securityMechanism=value attribute" in the 
 <ph conref="../conrefs.dita#pub/citref"></ph>.</p>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminapps59125.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminapps59125.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminapps59125.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminapps59125.dita Mon Nov 11 17:27:54 2013
@@ -17,10 +17,14 @@ limitations under the License.
 -->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminapps59125">
-<title>Using the Network Server with preexisting Derby applications</title>
+<title>Using the Network Server with preexisting
+<ph conref="../conrefs.dita#prod/productshortname"></ph> applications</title>
+<shortdesc>You must modify Java applications that currently run against
+<ph conref="../conrefs.dita#prod/productshortname"></ph> in embedded mode so
+that they work with the <ph conref="../conrefs.dita#prod/productshortname"></ph>
+Network Server.</shortdesc>
 <prolog>
 </prolog>
 <conbody>
-<p>You must modify Java applications that currently run against <ph conref="../conrefs.dita#prod/productshortname"></ph> in
-embedded mode so that they work with the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server. The topics in this section discuss these changes.</p>
+<p>The topics in this section discuss these changes.</p>
 </conbody></concept>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminapps811478.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminapps811478.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminapps811478.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminapps811478.dita Mon Nov 11 17:27:54 2013
@@ -20,16 +20,15 @@ limitations under the License.
 -->
 <concept id="cadminapps811478" xml:lang="en-us">
 <title>XA and the Network Server</title>
+<shortdesc>Both the <ph conref="../conrefs.dita#prod/productshortname"></ph>
+embedded driver and the Network Server provide XA support. The Network Server
+provides DRDA level 7 support. DRDA clients that support XAMGR, such as the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> network client, can
+send XA requests to the Network Server.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>XA<indexterm>and Network Server</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>Both the <ph conref="../conrefs.dita#prod/productshortname"></ph> embedded
-driver and the Network Server provide XA support. The Network Server provides
-DRDA level 7 support. DRDA clients that support XAMGR, such as the
-Derby network client, can send XA requests to
-the Network Server. </p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminapps811631.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminapps811631.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminapps811631.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminapps811631.dita Mon Nov 11 17:27:54 2013
@@ -19,12 +19,11 @@ limitations under the License.
 <concept xml:lang="en-us" id="cadminapps811631">
 <title>Security mechanism options when user authentication is enabled on the 
 Network Server</title>
-<prolog>
-</prolog>
-<conbody>
-<p>When user authentication is enabled in 
+<shortdesc>When user authentication is enabled in 
 <ph conref="../conrefs.dita#prod/productshortname"></ph>, you can use either of
-the following security mechanisms:</p>
+the following security mechanisms.</shortdesc>
+<prolog></prolog>
+<conbody>
 <ul>
 <li>Clear text user name and password security, the default</li>
 <li>Encrypted user name and password security</li>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminapps811656.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminapps811656.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminapps811656.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminapps811656.dita Mon Nov 11 17:27:54 2013
@@ -19,11 +19,15 @@ limitations under the License.
 <concept xml:lang="en-us" id="cadminapps811656">
 <title>Security mechanism options when user authentication is disabled on the 
 Network Server</title>
-<prolog>
-</prolog>
+<shortdesc>When user authentication is turned off in
+<ph conref="../conrefs.dita#prod/productshortname"></ph>, you can use any of the
+security mechanism options.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>When user authentication is turned off in <ph conref="../conrefs.dita#prod/productshortname"></ph>, you can use any
-of the security mechanism options.</p>
-<p>You must provide a user and password for all security mechanisms except <i>USER_ONLY_SECURITY</i>. However, because user authentication
-is disabled in the <ph conref="../conrefs.dita#prod/productshortname"></ph> server, the user name and password that you supply does not have to be one recognized as valid by <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
+<p>You must provide a user and password for all security mechanisms except
+<codeph>USER_ONLY_SECURITY</codeph>. However, because user authentication is
+disabled in the <ph conref="../conrefs.dita#prod/productshortname"></ph> server,
+the user name and password that you supply do not have to be among those
+recognized as valid by
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
 </conbody></concept>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminapps811695.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminapps811695.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminapps811695.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminapps811695.dita Mon Nov 11 17:27:54 2013
@@ -19,22 +19,23 @@ limitations under the License.
 -->
 <concept id="cadminapps811695" xml:lang="en-us">
 <title>Enabling the encrypted user ID and password security mechanism</title>
+<shortdesc>To use the encrypted user ID and password security mechanism, you
+need a Java environment with a JCE (Java Cryptography Extension) which supports
+the Diffie-Hellman algorithm with a public prime of 256 bits.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Encrypted User ID and password<indexterm>using with Network
 Server</indexterm></indexterm><indexterm>Java Cryptography Extension (JCE)</indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>To use the encrypted user ID and password security mechanism,
-you need a Java environment with a JCE (Java Cryptography Extension)
-which supports the Diffie-Hellman algorithm with a public prime of
-256 bits. The Java Platform, Standard Edition (Java SE) requires a public prime
-of 512 bits or more.</p>
+<p>The Java Platform, Standard Edition (Java SE) requires a public prime of
+512 bits or more.</p>
 <p>To use the encrypted user id and password security mechanism during
-JDBC connection using the network client, specify the <codeph>securityMechanism</codeph> in
-the connection property. <note>If an encrypted database is booted in
-the Network Server, users can connect to the database without giving the <codeph>bootPassword</codeph>.
-The first connection to the database must provide the <codeph>bootPassword</codeph>,
+JDBC connection using the network client, specify the
+<codeph>securityMechanism</codeph> in the connection property.
+<note>If an encrypted database is booted in the Network Server, users can
+connect to the database without giving the <codeph>bootPassword</codeph>. The
+first connection to the database must provide the <codeph>bootPassword</codeph>,
 but all subsequent connections do not need to supply it. To remove access
 from the encrypted database, use the <codeph>shutdown=true</codeph> option
 to shut down the database.</note></p>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminappsclient.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminappsclient.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminappsclient.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminappsclient.dita Mon Nov 11 17:27:54 2013
@@ -21,34 +21,34 @@ limitations under the License.
 <title>Accessing the Network Server by using the network client driver</title>
 <shortdesc>When connecting to the Network Server, your application needs to
 load a driver and connection URL that is specific to the Network Server. In
-addition, you must specify a user name and password if you are using authentication.</shortdesc>
+addition, you must specify a user name and password if you are using
+authentication.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Network client driver</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>The driver that you need to access the Network Server is: <codeblock>org.apache.derby.jdbc.ClientDriver</codeblock></p>
-<p>The syntax of the URL that is required to access the Network Server is:<codeblock>jdbc:derby://&lt;<i>server</i>&gt;[:&lt;<i>port</i>&gt;]/
-&lt;<i>databaseName</i>&gt;[;&lt;URL attribute&gt;=&lt;value&gt; [;...]]
-</codeblock>where the <codeph>&lt;URL attribute&gt;</codeph> is either a <ph
+<p>The driver that you need to access the Network Server is:
+<codeblock>org.apache.derby.jdbc.ClientDriver</codeblock></p>
+<p>The syntax of the URL that is required to access the Network Server is:
+<codeblock>jdbc:derby://<i>server</i>[:<i>port</i>]/
+<i>databaseName</i>[;<i>URL-attribute</i>=<i>value</i> [;...]]</codeblock>
+where the <codeph><i>URL-attribute</i></codeph> is either a <ph
 conref="../conrefs.dita#prod/productshortname"></ph> embedded or network
 client attribute.</p>
 <p>To access an in-memory database using the Network Server, the syntax is:</p>
-<codeblock>jdbc:derby://&lt;<i>server</i>&gt;[:&lt;<i>port</i>&gt;]/memory:
-&lt;<i>databaseName</i>&gt;[;&lt;URL attribute&gt;=&lt;value&gt; [;...]]
-</codeblock>
+<codeblock>jdbc:derby://<i>server</i>[:<i>port</i>]/memory:
+<i>databaseName</i>[;<i>URL-attribute</i>=<i>value</i> [;...]]</codeblock>
 <p>For more information, see "Using in-memory databases" in the
 <ph conref="../conrefs.dita#pub/citdevelop"></ph>.</p>
-<p>
-For both driver and DataSource access, the database name (including path), 
-user, password  and other attribute values must consist of
-characters that can be converted to UTF-8.  The total byte length of the 
-database name plus attributes when converted to UTF-8 must not exceed 255 
-bytes; keep in mind that in UTF-8, a character may occupy from 1 to 4 bytes.
-You may be able to work around this restriction for long paths or 
-paths that include multibyte characters by setting the 
-<codeph>derby.system.home</codeph> system property when starting the Network 
-Server and accessing the database with a relative path that is shorter and 
-does not include multibyte characters.</p>
+<p>For both driver and DataSource access, the database name (including path), 
+user, password, and other attribute values must consist of characters that can
+be converted to UTF-8.  The total byte length of the database name plus
+attributes when converted to UTF-8 must not exceed 255 bytes; keep in mind that
+in UTF-8, a character may occupy from 1 to 4 bytes. You may be able to work
+around this restriction for long paths or paths that include multibyte
+characters by setting the <codeph>derby.system.home</codeph> system property
+when starting the Network Server and accessing the database with a relative path
+that is shorter and does not include multibyte characters.</p>
 <p>The following table shows standard JDBC DataSource properties.</p>
 <table>
 <title>Standard JDBC DataSource properties</title>
@@ -70,55 +70,61 @@ does not include multibyte characters.</
 </thead>
 <tbody>
 <row>
-<entry colname="col1">databaseName</entry>
-<entry colname="col2">String</entry>
-<entry colname="col3">The name of the database. This property is required.</entry>
+<entry colname="col1"><codeph>databaseName</codeph></entry>
+<entry colname="col2"><codeph>String</codeph></entry>
+<entry colname="col3">The name of the database. This property is
+required.</entry>
 <entry colname="COLSPEC0">None</entry>
-<entry colname="col4">This property is also available using EmbeddedDataSource.</entry>
+<entry colname="col4">This property is also available using
+<codeph>EmbeddedDataSource</codeph>.</entry>
 </row>
 <row>
-<entry colname="col1">dataSourceName</entry>
-<entry colname="col2">String</entry>
+<entry colname="col1"><codeph>dataSourceName</codeph></entry>
+<entry colname="col2"><codeph>String</codeph></entry>
 <entry colname="col3">The data source name.</entry>
 <entry colname="COLSPEC0">None</entry>
-<entry colname="col4">This property is also available using EmbeddedDataSource.</entry>
+<entry colname="col4">This property is also available using
+<codeph>EmbeddedDataSource</codeph>.</entry>
 </row>
 <row>
-<entry colname="col1">description</entry>
-<entry colname="col2">String</entry>
+<entry colname="col1"><codeph>description</codeph></entry>
+<entry colname="col2"><codeph>String</codeph></entry>
 <entry colname="col3">A description of the data source.</entry>
 <entry colname="COLSPEC0">None</entry>
-<entry colname="col4">This property is also available using EmbeddedDataSource.</entry>
+<entry colname="col4">This property is also available using
+<codeph>EmbeddedDataSource</codeph>.</entry>
 </row>
 <row>
-<entry colname="col1">user</entry>
-<entry colname="col2">String</entry>
+<entry colname="col1"><codeph>user</codeph></entry>
+<entry colname="col2"><codeph>String</codeph></entry>
 <entry colname="col3">The user's account name.</entry>
-<entry colname="COLSPEC0"><i>user</i></entry>
+<entry colname="COLSPEC0"><codeph>user</codeph></entry>
 <entry colname="col4">Default is APP. This property is also available using
-EmbeddedDataSource.</entry>
+<codeph>EmbeddedDataSource</codeph>.</entry>
 </row>
 <row>
-<entry colname="col1">password</entry>
-<entry colname="col2">String</entry>
+<entry colname="col1"><codeph>password</codeph></entry>
+<entry colname="col2"><codeph><codeph>String</codeph></codeph></entry>
 <entry colname="col3">The user's database password.</entry>
-<entry colname="COLSPEC0"><i>password</i></entry>
-<entry colname="col4">This property is also available using EmbeddedDataSource.</entry>
+<entry colname="COLSPEC0"><codeph>password</codeph></entry>
+<entry colname="col4">This property is also available using
+<codeph>EmbeddedDataSource</codeph>.</entry>
 </row>
 <row>
-<entry colname="col1">serverName</entry>
-<entry colname="col2">String</entry>
+<entry colname="col1"><codeph>serverName</codeph></entry>
+<entry colname="col2"><codeph><codeph>String</codeph></codeph></entry>
 <entry colname="col3">The host name or TCP/IP address where the server is
 listening for requests.</entry>
 <entry colname="COLSPEC0">None</entry>
-<entry colname="col4">Default is "localhost".</entry>
+<entry colname="col4">Default is <codeph>localhost</codeph>.</entry>
 </row>
 <row>
-<entry colname="col1">portNumber</entry>
-<entry colname="col2">Integer</entry>
-<entry colname="col3">The port number where the server is listening for requests.</entry>
+<entry colname="col1"><codeph>portNumber</codeph></entry>
+<entry colname="col2"><codeph>Integer</codeph></entry>
+<entry colname="col3">The port number where the server is listening for
+requests.</entry>
 <entry colname="COLSPEC0">None</entry>
-<entry colname="col4">Default is "1527".</entry>
+<entry colname="col4">Default is <codeph>1527</codeph>.</entry>
 </row>
 </tbody>
 </tgroup>
@@ -144,60 +150,64 @@ listening for requests.</entry>
 </thead>
 <tbody>
 <row>
-<entry colname="col1">traceFile</entry>
-<entry colname="col2">String</entry>
+<entry colname="col1"><codeph>traceFile</codeph></entry>
+<entry colname="col2"><codeph><codeph>String</codeph></codeph></entry>
 <entry colname="col3">The filename for tracing output. Setting this property
-turns on tracing. See <xref href="cadminappsclienttracing.dita#cadminappsclienttracing"></xref>.</entry>
-<entry colname="COLSPEC1"><i>traceFile</i></entry>
+turns on tracing. See
+<xref href="cadminappsclienttracing.dita#cadminappsclienttracing"></xref>.</entry>
+<entry colname="COLSPEC1"><codeph>traceFile</codeph></entry>
 <entry colname="col4">None</entry>
 </row>
 <row>
-<entry colname="col1">traceDirectory</entry>
-<entry colname="col2">String</entry>
+<entry colname="col1"><codeph>traceDirectory</codeph></entry>
+<entry colname="col2"><codeph><codeph>String</codeph></codeph></entry>
 <entry colname="col3">The directory for the tracing output. Each connection
-will send output to a separate file. Setting this property turns on tracing.
-See <xref href="cadminappsclienttracing.dita#cadminappsclienttracing"></xref>.</entry>
-<entry colname="COLSPEC1"><i>traceDirectory</i></entry>
+will send output to a separate file. Setting this property turns on tracing. See
+<xref href="cadminappsclienttracing.dita#cadminappsclienttracing"></xref>.</entry>
+<entry colname="COLSPEC1"><codeph>traceDirectory</codeph></entry>
 <entry colname="col4">None</entry>
 </row>
 <row>
-<entry colname="col1">traceLevel</entry>
-<entry colname="col2">Integer</entry>
-<entry colname="col3">The level of client tracing if <i>traceFile</i> or <i>traceDirectory</i> are
-set.</entry>
-<entry colname="COLSPEC1"><i>traceLevel</i></entry>
-<entry colname="col4">The default is TRACE_ALL.</entry>
-</row>
-<row>
-<entry colname="col1">traceFileAppend</entry>
-<entry colname="col2">Boolean</entry>
-<entry colname="col3">Value is true if tracing output should append to the
-existing trace file.</entry>
-<entry colname="COLSPEC1"><i>traceFileAppend</i></entry>
-<entry colname="col4">The default is false.</entry>
-</row>
-<row>
-<entry colname="col1">securityMechanism</entry>
-<entry colname="col2">Integer</entry>
-<entry colname="col3">The security mechanism. See <xref href="cadminappsclientsecurity.dita#cadminappsclientsecurity"></xref>.</entry>
-<entry colname="COLSPEC1"><i>securityMechanism</i></entry>
-<entry colname="col4">The default is USER_ONLY _SECURITY.</entry>
+<entry colname="col1"><codeph>traceLevel</codeph></entry>
+<entry colname="col2"><codeph>Integer</codeph></entry>
+<entry colname="col3">The level of client tracing if <codeph>traceFile</codeph>
+or <codeph>traceDirectory</codeph> is set.</entry>
+<entry colname="COLSPEC1"><codeph>traceLevel</codeph></entry>
+<entry colname="col4">The default is <codeph>TRACE_ALL</codeph>.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>traceFileAppend</codeph></entry>
+<entry colname="col2"><codeph>Boolean</codeph></entry>
+<entry colname="col3">Value is <codeph>true</codeph> if tracing output should
+append to the existing trace file.</entry>
+<entry colname="COLSPEC1"><codeph>traceFileAppend</codeph></entry>
+<entry colname="col4">The default is <codeph>false</codeph>.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>securityMechanism</codeph></entry>
+<entry colname="col2"><codeph>Integer</codeph></entry>
+<entry colname="col3">The security mechanism. See
+<xref href="cadminappsclientsecurity.dita#cadminappsclientsecurity"></xref>.</entry>
+<entry colname="COLSPEC1"><codeph>securityMechanism</codeph></entry>
+<entry colname="col4">The default is <codeph>USER_ONLY_SECURITY</codeph>.</entry>
 </row>
 <row>
-<entry colname="col1">retrieveMessageText</entry>
-<entry colname="col2">Boolean</entry>
+<entry colname="col1"><codeph>retrieveMessageText</codeph></entry>
+<entry colname="col2"><codeph>Boolean</codeph></entry>
 <entry colname="col3">Retrieve message text from the server. A stored procedure
-is called to retrieve the message text with each <i>SQLException</i> and might
-start a new unit of work. Set this property to false if you do not want the
-performance impact or when starting new units of work.</entry>
-<entry colname="COLSPEC1"><i>retrieveMessageText</i></entry>
-<entry colname="col4">The default is true.</entry>
+is called to retrieve the message text with each <codeph>SQLException</codeph>
+and might start a new unit of work. Set this property to <codeph>false</codeph>
+if you do not want the performance impact or when starting new units of
+work.</entry>
+<entry colname="COLSPEC1"><codeph>retrieveMessageText</codeph></entry>
+<entry colname="col4">The default is <codeph>true</codeph>.</entry>
 </row>
 <row>
-<entry colname="col1">ssl</entry>
-<entry colname="col2">String</entry>
-<entry colname="col3">The SSL mode for the client connection. See <xref href="cadminssl.dita#cadminssl"></xref></entry>
-<entry colname="COLSPEC1"><i>ssl</i></entry>
+<entry colname="col1"><codeph>ssl</codeph></entry>
+<entry colname="col2"><codeph>String</codeph></entry>
+<entry colname="col3">The SSL mode for the client connection. See
+<xref href="cadminssl.dita#cadminssl"></xref>.</entry>
+<entry colname="COLSPEC1"><codeph>ssl</codeph></entry>
 <entry colname="col4">The default is <codeph>off</codeph>.</entry>
 </row>
 </tbody>
@@ -224,39 +234,54 @@ performance impact or when starting new 
 </thead>
 <tbody>
 <row>
-<entry colname="col1">connectionAttributes</entry>
-<entry colname="col2">String</entry>
-<entry colname="COLSPEC2">Set to the list of <ph conref="../conrefs.dita#prod/productshortname"></ph> embedded
-connection attributes separated by semicolons.</entry>
+<entry colname="col1"><codeph>connectionAttributes</codeph></entry>
+<entry colname="col2"><codeph>String</codeph></entry>
+<entry colname="COLSPEC2">Set to the list of
+<ph conref="../conrefs.dita#prod/productshortname"></ph> embedded connection
+attributes separated by semicolons.</entry>
 <entry colname="col3">Various</entry>
-<entry colname="COLSPEC3">This property is also available using EmbeddedDataSource.
-See the <ph conref="../conrefs.dita#pub/citref"></ph> for more information
-about the various connection attributes.</entry>
-</row>
-<row>
-<entry colname="col1">createDatabase</entry>
-<entry colname="col2">String</entry>
-<entry colname="COLSPEC2">If set to "create", create the database specified with databaseName property.</entry>
-<entry colname="col3"><i>create</i></entry>
-<entry colname="COLSPEC3">This property is also available using EmbeddedDataSource.
-See the <ph conref="../conrefs.dita#pub/citref"></ph> for more information.
-Similar to setting connectionAttribute to "create=true". Only "create" is allowed, other values equate to null. The result of conflicting settings of createDatabase, shutdownDatabase and connectionAttributes is undefined.</entry>
-</row>
-<row>
-<entry colname="col1">shutdownDatabase</entry>
-<entry colname="col2">String</entry>
-<entry colname="COLSPEC2">If set to "shutdown", shutdown the database specified with databaseName property.</entry>
-<entry colname="col3"><i>shutdown</i></entry>
-<entry colname="COLSPEC3">This property is also available using EmbeddedDataSource.
-See the <ph conref="../conrefs.dita#pub/citref"></ph> for more information.
-Similar to setting connectionAttribute to "shutdown=true". Only "shutdown" is allowed, other values equate to null. The result of conflicting settings of createDatabase, shutdownDatabase and connectionAttributes is undefined.
-If authentication <b>and</b> sqlAuthorization are both enabled, database shutdown is restricted to the database owner.
+<entry colname="COLSPEC3">This property is also available using
+<codeph>EmbeddedDataSource</codeph>. See the
+<ph conref="../conrefs.dita#pub/citref"></ph> for more information about the
+various connection attributes.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>createDatabase</codeph></entry>
+<entry colname="col2"><codeph>String</codeph></entry>
+<entry colname="COLSPEC2">If set to <codeph>create</codeph>, create the database
+specified with the <codeph>databaseName</codeph> property.</entry>
+<entry colname="col3"><codeph>create</codeph></entry>
+<entry colname="COLSPEC3">This property is also available using
+<codeph>EmbeddedDataSource</codeph>. See the
+<ph conref="../conrefs.dita#pub/citref"></ph> for more information. Similar to
+setting <codeph>connectionAttribute</codeph> to <codeph>create=true</codeph>.
+Only <codeph>create</codeph> is allowed; other values equate to
+<codeph>null</codeph>. The result of conflicting settings of
+<codeph>createDatabase</codeph>, <codeph>shutdownDatabase</codeph>, and
+<codeph>connectionAttributes</codeph> is undefined.</entry>
+</row>
+<row>
+<entry colname="col1"><codeph>shutdownDatabase</codeph></entry>
+<entry colname="col2"><codeph>String</codeph></entry>
+<entry colname="COLSPEC2">If set to <codeph>shutdown</codeph>, shut down the
+database specified with the <codeph>databaseName</codeph> property.</entry>
+<entry colname="col3"><codeph>shutdown</codeph></entry>
+<entry colname="COLSPEC3">This property is also available using
+<codeph>EmbeddedDataSource</codeph>. See the
+<ph conref="../conrefs.dita#pub/citref"></ph> for more information. Similar to
+setting <codeph>connectionAttribute</codeph> to <codeph>shutdown=true</codeph>.
+Only <codeph>shutdown</codeph> is allowed; other values equate to
+<codeph>null</codeph>. The result of conflicting settings of
+<codeph>createDatabase</codeph>, <codeph>shutdownDatabase</codeph>, and
+<codeph>connectionAttributes</codeph> is undefined.
+If authentication <b>and</b> SQL authorization are both enabled, database
+shutdown is restricted to the database owner.
 </entry>
 </row>
 </tbody>
 </tgroup>
 </table>
-<p>Note that <i>setAttributesAsPassword</i>, which is available for the embedded
-DataSource, is not available for the client DataSource.</p>
+<note>The <codeph>setAttributesAsPassword</codeph> property, which is available
+for the embedded DataSource, is not available for the client DataSource.</note>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminappsclientdiffs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminappsclientdiffs.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminappsclientdiffs.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminappsclientdiffs.dita Mon Nov 11 17:27:54 2013
@@ -19,18 +19,28 @@ limitations under the License.
 -->
 <concept id="cadminappsclientdiffs" xml:lang="en-us">
 <title>Differences between the embedded client and the network client driver</title>
+<shortdesc>The following are known differences that exist between the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> embedded driver and the
+network client driver.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Network client driver<indexterm>differences with embedded
 driver</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>The following are known differences that exist between the <ph conref="../conrefs.dita#prod/productshortname"></ph> embedded
-driver and the network client driver. Note that there may be undocumented
-differences that have not yet been identified. Some differences with the network
-client may be changed in future releases to match the embedded driver functionality.<ul>
-<li>Error messages and SQLStates can differ between the network client and
-embedded driver.</li>
-<li>Treatment of error situations encountered during batch processing with java.sql.Statement, java.sql.PreparedStatement and java.sql.CallableStatement is different. With the embedded driver processing stops when an error is encountered; with the network client driver processing continues, but an appropriate value as defined in the java.sql.Statement api is returned in the resulting update count array.</li>
+<p>There may be undocumented differences that have not yet been identified. Some
+differences with the network client may be changed in future releases to match
+the embedded driver functionality.
+<ul>
+<li>Error messages and <codeph>SQLState</codeph>s can differ between the network
+client and embedded driver.</li>
+<li>Treatment of error situations encountered during batch processing with
+<codeph>java.sql.Statement</codeph>,
+<codeph>java.sql.PreparedStatement</codeph>, and
+<codeph>java.sql.CallableStatement</codeph> is different. With the embedded
+driver, processing stops when an error is encountered; with the network client
+driver, processing continues, but an appropriate value as defined in the
+<codeph>java.sql.Statement</codeph> API is returned in the resulting update
+count array.</li>
 <li>To use an encrypted user id and password, you need to have the IBM's Java
 Cryptography Extension (JCE) Version 1.2.1 or later.</li>
 </ul></p>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminappsclientsecurity.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminappsclientsecurity.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminappsclientsecurity.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminappsclientsecurity.dita Mon Nov 11 17:27:54 2013
@@ -30,20 +30,22 @@ the <codeph>securityMechanism</codeph> p
 <conbody>
 <p>You can set the <codeph>securityMechanism</codeph> property in one of the
 following ways:</p><ul>
-<li>When you are using the <codeph>DriverManager</codeph> interface, set <codeph>securityMechanism</codeph> in
-a <codeph>java.util.Properties</codeph> object before you invoke the form
-of the <codeph>getConnection</codeph> method, which includes the <codeph>java.util.Properties</codeph> parameter.</li>
+<li>When you are using the <codeph>DriverManager</codeph> interface, set
+<codeph>securityMechanism</codeph> in a <codeph>java.util.Properties</codeph>
+object before you invoke the form of the <codeph>getConnection</codeph> method,
+which includes the <codeph>java.util.Properties</codeph> parameter.</li>
 <li>When you are using the <codeph>DataSource</codeph> interface to create
-and deploy your own DataSource objects, invoke the <codeph>DataSource.setSecurityMechanism</codeph> method
-after you create a DataSource object.</li>
+and deploy your own DataSource objects, invoke the
+<codeph>DataSource.setSecurityMechanism</codeph> method after you create a
+DataSource object.</li>
 </ul>
 <p>The following table lists the security mechanisms that the
 <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Client supports, and the corresponding property value to specify to obtain
-this security mechanism. The default security mechanism is the user id only
-if no password is set. If the password is set, the default security mechanism
-is both the user id and password. The default user is APP if no other user
-is specified.</p>
+Client supports, and the corresponding property value to specify to obtain this
+security mechanism. The default security mechanism is the user id only if no
+password is set. If the password is set, the default security mechanism is both
+the user id and password. The default user is APP if no other user is
+specified.</p>
 <table>
 <title>Security mechanisms supported by the
 <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Client</title>
@@ -62,18 +64,19 @@ is specified.</p>
 <tbody>
 <row>
 <entry colname="col1">User id and password</entry>
-<entry colname="col2">ClientDataSource.CLEAR_TEXT_PASSWORD_SECURITY
+<entry colname="col2"><codeph>ClientDataSource.CLEAR_TEXT_PASSWORD_SECURITY</codeph>
 (0x03)</entry>
 <entry colname="col3">Default if password is set</entry>
 </row>
 <row>
 <entry colname="col1">User id only</entry>
-<entry colname="col2">ClientDataSource.USER_ONLY_SECURITY (0x04)</entry>
+<entry colname="col2"><codeph>ClientDataSource.USER_ONLY_SECURITY</codeph>
+(0x04)</entry>
 <entry colname="col3">Default if password is not set</entry>
 </row>
 <row>
 <entry colname="col1">Encrypted user id and encrypted password</entry>
-<entry colname="col2">ClientDataSource.ENCRYPTED_USER_AND_PASSWORD_SECURITY
+<entry colname="col2"><codeph>ClientDataSource.ENCRYPTED_USER_AND_PASSWORD_SECURITY</codeph>
 (0x09)</entry>
 <entry colname="col3">Encryption requires a JCE implementation that supports
 the Diffie-Hellman algorithm with a public prime of 256 bits.</entry>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminappsclienttracing.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminappsclienttracing.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminappsclienttracing.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminappsclienttracing.dita Mon Nov 11 17:27:54 2013
@@ -29,25 +29,31 @@ protocol flows.</shortdesc>
 <section><p>There are various ways to obtain trace output. However, the easiest
 way to obtain trace output is to use the <codeph>traceFile=<i>path</i></codeph> attribute
 on the URL in <codeph>ij</codeph>. The following example shows all tracing
-going to the file <codeph>trace.out</codeph> from an <codeph>ij</codeph> session.<codeblock>ij>connect 'jdbc:derby://localhost:1527/mydb;
-create=true;traceFile=trace.out;user=user1;password=secret4me';</codeblock></p>
+going to the file <codeph>trace.out</codeph> from an <codeph>ij</codeph>
+session.</p>
+<codeblock>ij><b>connect 'jdbc:derby://localhost:1527/mydb;
+create=true;traceFile=trace.out;user=user1;password=secret4me';</b></codeblock>
 <p>To append trace information to the specified file, use the
 <codeph>traceFileAppend=true</codeph> URL attribute in addition to 
 <codeph>traceFile=<i>path</i></codeph>.</p>
-<p>For more information, see "traceFile=path attribute" and "traceFileAppend=true
-attribute" in the <ph conref="../conrefs.dita#pub/citref"></ph>.</p></section>
-<section><title>Implementing ClientDataSource tracing</title><p>You can use
-one of three methods to collect tracing data while obtaining connections from
-the ClientDataSource:<ul>
-<li>Use the <codeph>setLogWriter(java.io.PrintWriter)</codeph> method of ClientDataSource
-and set the <codeph>PrintWriter</codeph> to a non-null value.</li>
-<li>Use the <codeph>setTraceFile(String filename)</codeph> method of ClientDataSource.</li>
-<li>Use the <codeph>setTraceDirectory(String dirname)</codeph> method of ClientDataSource
-to trace each connection flow in its own file for programs that have multiple
-connections.</li>
+<p>For more information, see "traceFile=path attribute" and
+"traceFileAppend=true attribute" in the
+<ph conref="../conrefs.dita#pub/citref"></ph>.</p></section>
+<section><title>Implementing ClientDataSource tracing</title>
+<p>You can use one of three methods to collect tracing data while obtaining
+connections from the <codeph>ClientDataSource</codeph>:
+<ul>
+<li>Use the <codeph>setLogWriter(java.io.PrintWriter)</codeph> method of
+<codeph>ClientDataSource</codeph> and set the <codeph>PrintWriter</codeph> to a
+non-null value.</li>
+<li>Use the <codeph>setTraceFile(String filename)</codeph> method of
+<codeph>ClientDataSource</codeph>.</li>
+<li>Use the <codeph>setTraceDirectory(String dirname)</codeph> method of
+<codeph>ClientDataSource</codeph> to trace each connection flow in its own file
+for programs that have multiple connections.</li>
 </ul></p>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides three
-ClientDataSource implementations. You can use the
+<codeph>ClientDataSource</codeph> implementations. You can use the
 <codeph>org.apache.derby.jdbc.ClientDataSource</codeph> class on
 Java SE 5 and above (except Java SE 8 Compact Profiles), in applications that
 call JDBC 3 or JDBC 4.0 methods. You can use the
@@ -57,20 +63,26 @@ call JDBC 4.1 or JDBC 4.2 methods. You m
 <codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph>class on
 Java SE 8 Compact Profile 2 or 3.</p>
 </section>
-<section><title>Implementing DriverManager tracing</title><p>Use one of the
-following two options to enable and collect tracing information while obtaining
-connections using the DriverManager:<ul>
-<li>Use the <codeph>setLogWriter(java.io.PrintWriter)</codeph> method of DriverManager
-and set the <codeph>PrintWriter</codeph> to a non null-value.</li>
-<li>Use the <codeph>traceFile=<i>path</i></codeph> or <codeph>traceDirectory=<i>path</i></codeph> URL
-attributes to set these properties prior to creating the connection with the <codeph>DriverManager.getConnection()</codeph> method.
-For more information, see "traceFile=path attribute" and "traceDirectory=path
-attribute" in the <ph conref="../conrefs.dita#pub/citref"></ph>.</li>
+<section><title>Implementing DriverManager tracing</title>
+<p>Use one of the following two options to enable and collect tracing
+information while obtaining connections using the
+<codeph>DriverManager</codeph>:
+<ul>
+<li>Use the <codeph>setLogWriter(java.io.PrintWriter)</codeph> method of
+<codeph>DriverManager</codeph> and set the <codeph>PrintWriter</codeph> to a
+non null-value.</li>
+<li>Use the <codeph>traceFile=<i>path</i></codeph> or
+<codeph>traceDirectory=<i>path</i></codeph> URL attributes to set these
+properties prior to creating the connection with the
+<codeph>DriverManager.getConnection()</codeph> method. For more information, see
+"traceFile=path attribute" and "traceDirectory=path attribute" in the
+<ph conref="../conrefs.dita#pub/citref"></ph>.</li>
 </ul></p></section>
-<section><title>Changing the default trace level</title><p>The default trace
-level is <codeph>ClientDataSource.TRACE_ALL</codeph>. You can choose the tracing
-level by calling the <codeph>setTraceLevel(int level)</codeph> method or by
-setting the <codeph>traceLevel=<i>value</i></codeph> URL attribute:</p>
+<section><title>Changing the default trace level</title>
+<p>The default trace level is <codeph>ClientDataSource.TRACE_ALL</codeph>. You
+can choose the tracing level by calling the
+<codeph>setTraceLevel(int level)</codeph> method or by setting the
+<codeph>traceLevel=<i>value</i></codeph> URL attribute:</p>
 <codeblock>String url = "jdbc:derby://samplehost.example.com:1528/mydb" +
  ";traceFile=/u/user1/trace.out" +
  ";traceLevel=" +
@@ -136,7 +148,7 @@ DriverManager.getConnection(url,"user1",
 </row>
 <row>
 <entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_ALL</entry>
-<entry colname="col2">0xFFFFFFFF;</entry>
+<entry colname="col2">0xFFFFFFFF</entry>
 </row>
 </tbody>
 </tgroup>
@@ -145,11 +157,12 @@ DriverManager.getConnection(url,"user1",
 techniques:</p>
 <ul>
 <li>Use bitwise OR operators ( | ) with two or more trace values. For example,
-to trace PROTOCOL flows and connection calls, specify this value for traceLevel:
+to trace PROTOCOL flows and connection calls, specify this value for
+<codeph>traceLevel</codeph>:
 <codeblock>TRACE_PROTOCOL_FLOWS | TRACE_CONNECTION_CALLS</codeblock></li>
 <li>Use a bitwise complement operator ( ~ ) with a trace value to specify
 all except a certain trace. For example, to trace everything except PROTOCOL
-flows, specify this value for traceLevel:
+flows, specify this value for <codeph>traceLevel</codeph>:
 <codeblock>~TRACE_PROTOCOL_FLOWS</codeblock></li>
 </ul>
 <p>For more information, see "traceLevel=value attribute" in the

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminappsdiffsreadonly.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminappsdiffsreadonly.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminappsdiffsreadonly.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminappsdiffsreadonly.dita Mon Nov 11 17:27:54 2013
@@ -20,14 +20,15 @@ limitations under the License.
 -->
 <concept id="radminappsdiffsreadonly" xml:lang="en-us">
 <title>Differences using the Connection.setReadOnly method</title>
+<shortdesc>In embedded mode, when the <codeph>Connection.setReadOnly</codeph>
+method has <codeph>true</codeph> as the parameter, the connection is marked as a
+read-only connection. When you use the Network Server, the
+<codeph>Connection.setReadOnly(true)</codeph> method is ignored, and the
+connection is not marked as a read-only connection.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Connection.setReadOnly method<indexterm>differences in
 configuration modes</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>In the embedded mode, when the Connection.setReadOnly method has <codeph>true</codeph> as
-the parameter, the connection is marked as a read-only connection. When using
-a Network Server, the Connection.setReadOnly(true) method is ignored and the
-connection is not marked as a read-only connection.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminappsthenetworkserverandjvms.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminappsthenetworkserverandjvms.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminappsthenetworkserverandjvms.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminappsthenetworkserverandjvms.dita Mon Nov 11 17:27:54 2013
@@ -21,11 +21,11 @@ limitations under the License.
 
 <concept id="cadminappsthenetworkserverandjvms" xml:lang="en-us">
 <title>The Network Server and Java Virtual Machines (JVMs)</title>
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server is compatible with Java Platform, Standard Edition (Java SE)
+@MINIMUM_JDK@ and above.</shortdesc>
 <prolog></prolog>
 <conbody>
-<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server
-is compatible with Java Platform, Standard Edition (Java SE) @MINIMUM_JDK@
-and above.</p>
 </conbody>
 </concept>
 

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminappsusingthederbytoolswiththene.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminappsusingthederbytoolswiththene.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminappsusingthederbytoolswiththene.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminappsusingthederbytoolswiththene.dita Mon Nov 11 17:27:54 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="cadminappsusingthederbytoolswiththene">
-<title>Using the Derby tools with the Network Server</title>
+<title>Using the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
+with the Network Server</title>
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
+<codeph>ij</codeph> and <codeph>dblook</codeph> work in embedded mode and
+client/server mode.</shortdesc>
 <prolog>
 </prolog>
 <conbody>
-<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> tools <codeph>ij</codeph> and <codeph>dblook</codeph> work in embedded
-mode and client/server mode.</p>
 </conbody></concept>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminappsxawthdriver.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminappsxawthdriver.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminappsxawthdriver.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminappsxawthdriver.dita Mon Nov 11 17:27:54 2013
@@ -19,13 +19,14 @@ limitations under the License.
 -->
 <concept id="cadminappsxawthdriver" xml:lang="en-us">
 <title>Using XA with the network client driver</title>
+<shortdesc>You can access XA support for the Network Server by using the network
+client driver's XA DataSource interface.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>XA<indexterm>Using with the network client driver</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<section><p>You can access XA support for the Network Server by using the
-network client driver's XA DataSource interface.</p>
+<section>
 <p>You can use the <codeph>org.apache.derby.jdbc.ClientXADataSource</codeph>
 class on Java SE 5 and above (except Java SE 8 Compact Profiles), in
 applications that call JDBC 3 or JDBC 4.0 methods. You can use the
@@ -40,7 +41,8 @@ objects returned from the DataSource wil
 or not you are using a DataSource whose name ends in "40".
 </p></section>
 <example><p>The following example illustrates how to obtain an XA connection
-with the network client driver:</p><codeblock>import org.apache.derby.jdbc.ClientXADataSource;
+with the network client driver:</p>
+<codeblock>import org.apache.derby.jdbc.ClientXADataSource;
 import javax.sql.XAConnection;
 ...
 

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminbckupdb.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminbckupdb.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminbckupdb.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminbckupdb.dita Mon Nov 11 17:27:54 2013
@@ -25,12 +25,11 @@ online (when it is running).</shortdesc>
 <prolog></prolog>
 <conbody>
 <p>After you back up a database, make sure the backup copy is not corrupt. To
-do this, run the SYSCS_UTIL.SYSCS_CHECK_TABLE system function on all the tables
-in the backup copy. Do not discard the previous backup until you have verified
-the consistency of the current one. See
+do this, run the <codeph>SYSCS_UTIL.SYSCS_CHECK_TABLE</codeph> system function
+on all the tables in the backup copy. Do not discard the previous backup until
+you have verified the consistency of the current one. See
 <xref href="cadminconsist01.dita#cadminconsist01"></xref> for more
 information.</p>
 <p>The topics in this section describe how to back up a database.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminconfig86869.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminconfig86869.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminconfig86869.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminconfig86869.dita Mon Nov 11 17:27:54 2013
@@ -18,30 +18,31 @@ See the License for the specific languag
 limitations under the License.
 -->
 <concept id="cadminconfig86869" xml:lang="en-us">
-<title>Managing the Derby Network Server</title>
+<title>Managing the <ph conref="../conrefs.dita#prod/productshortname"></ph>
+Network Server</title>
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server can be run in either of the following configurations.</shortdesc>
 <prolog></prolog>
 <conbody>
-<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-    Server can be run in either of these configurations:</p>
-    <ul>
-        <li>As <xref format="html" scope="external"
-                href="http://db.apache.org/derby/papers/DerbyTut/ns_intro.html#ns_intro">a stand-alone server</xref>,
-            in which case it is an independent Java process embedding the 
-            <ph conref="../conrefs.dita#prod/productshortname"></ph> 
-            database engine</li>
-        <li>As <xref format="html" scope="external"
-                href="http://db.apache.org/derby/papers/DerbyTut/ns_intro.html#Embedded+Server">an embedded server</xref>,
-            in which case it is embedded within another Java application,
-            and both the Network Server framework and the 
-            <ph conref="../conrefs.dita#prod/productshortname"></ph> 
-            database engine are loaded by the Java application</li>
-    </ul>
+<ul>
+<li>As <xref format="html" scope="external" 
+href="http://db.apache.org/derby/papers/DerbyTut/ns_intro.html#ns_intro">a
+stand-alone server</xref>, in which case it is an independent Java process
+embedding the <ph conref="../conrefs.dita#prod/productshortname"></ph> database
+engine</li>
+<li>As <xref format="html" scope="external"
+href="http://db.apache.org/derby/papers/DerbyTut/ns_intro.html#Embedded+Server">an
+embedded server</xref>, in which case it is embedded within another Java
+application, and both the Network Server framework and the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> database engine are
+loaded by the Java application</li>
+</ul>
 <p>You can use Java Management Extensions (JMX) technology to monitor and manage
 <ph conref="../conrefs.dita#prod/productshortname"></ph> and the Network Server.
 For information on how to do this, see
 <xref href="cadminjmxoverview.dita#cadminjmxoverview"></xref>.</p>
 <p>
-You can manage the Network Server by using shell scripts, the command line,
-or the Network Server API.</p>
+You can manage the Network Server by using shell scripts, the command line, or
+the Network Server API.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminconfigoverview.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminconfigoverview.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminconfigoverview.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminconfigoverview.dita Mon Nov 11 17:27:54 2013
@@ -18,14 +18,18 @@ See the License for the specific languag
 limitations under the License.
 -->
 <concept id="cadminconfigoverview" xml:lang="en-us">
-<title>Overview</title>
+<title>Overview of <ph conref="../conrefs.dita#prod/productshortname"></ph>
+Network Server management</title>
+<shortdesc>You can start the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server by using
+the command line or by using the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server
+API.</shortdesc>
 <prolog></prolog>
 <conbody>
-<p>You start the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Server using the command line or using the <ph conref="../conrefs.dita#prod/productshortname"></ph> Server
-API. (<ph conref="../conrefs.dita#prod/productshortname"></ph> provides
-scripts for you to use to start the server from the command line.) Before
-starting the server, you will probably set certain <ph conref="../conrefs.dita#prod/productshortname"></ph> and
-Network Server properties.</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides scripts for
+you to use to start the server from the command line. Before starting the
+server, you will probably set certain
+<ph conref="../conrefs.dita#prod/productshortname"></ph> and Network Server properties.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminconsist01.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminconsist01.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminconsist01.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminconsist01.dita Mon Nov 11 17:27:54 2013
@@ -20,18 +20,20 @@ limitations under the License.
 <concept id="cadminconsist01" xml:lang="en-us">
 <title>Checking database consistency</title>
 <shortdesc>After you perform a backup, or if you experience hardware or
-operating system failure, you can use the SYSCS_UTIL.SYSCS_CHECK_TABLE system
-function to verify that the database is still consistent.</shortdesc>
+operating system failure, you can use the
+<codeph>SYSCS_UTIL.SYSCS_CHECK_TABLE</codeph> system function to verify that the
+database is still consistent.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Consistency<indexterm>checking database</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>It is recommended that you run SYSCS_UTIL.SYSCS_CHECK_TABLE on all the tables
-in a database offline after you back it up. Do not discard the previous backup
-until you have verified the consistency of the current one. Otherwise, check
-consistency only if there are indications that such a check is needed, because a
-consistency check can take a long time on a large database.</p>
+<p>It is recommended that you run
+<codeph>SYSCS_UTIL.SYSCS_CHECK_TABLE</codeph> on all the tables in a database
+offline after you back it up. Do not discard the previous backup until you have
+verified the consistency of the current one. Otherwise, check consistency only
+if there are indications that such a check is needed, because a consistency
+check can take a long time on a large database.</p>
 <p>See the <ph conref="../conrefs.dita#pub/citref"></ph> for details about this
 system function.</p>
 </conbody>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadmindbintegrity.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadmindbintegrity.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadmindbintegrity.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadmindbintegrity.dita Mon Nov 11 17:27:54 2013
@@ -36,9 +36,10 @@ failure, system crash, or software crash
 do the following:</p>
 <ul>
 <li>Do not touch any files or directories in the database directory, including
-the <i>log</i> and <i>seg0</i> directories and the <i>service.properties</i>
-file. Editing, adding, or deleting files in this directory may cause data
-corruption and leave the database in a non-recoverable state.</li>
+the <codeph>log</codeph> and <codeph>seg0</codeph> directories and the
+<codeph>service.properties</codeph> file. Editing, adding, or deleting files in
+this directory may cause data corruption and leave the database in a
+non-recoverable state.</li>
 <li>Do not enable disk write caching on the hard drive that holds the database.
 Disable write caching if it is turned on (it is enabled by default on many
 Windows systems). Disk write caching can increase operating system performance.

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminembeddedserver.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminembeddedserver.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminembeddedserver.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminembeddedserver.dita Mon Nov 11 17:27:54 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="cadminembeddedserver">
 <title>How to start an embedded server from an application</title>
+<shortdesc>In one thread, the embedding application starts the local JDBC driver
+for its own access.</shortdesc>
 <prolog>
 </prolog>
 <conbody>
-<p>In one thread, the embedding application starts the local JDBC driver for
-its own access.</p>
 <codeblock>/*
     If you are running on JDK 6 or higher, you do not
     need to invoke Class.forName(). In that environment, the

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup01.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup01.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup01.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup01.dita Mon Nov 11 17:27:54 2013
@@ -20,9 +20,9 @@ limitations under the License.
 -->
 <concept id="cadminhubbkup01" xml:lang="en-us">
 <title>Using the backup procedures to perform an online backup</title>
-<shortdesc>Use the SYSCS_UTIL.SYSCS_BACKUP_DATABASE procedure or one of the
-other system backup procedures to perform an
-online backup of a database to a specified location.</shortdesc>
+<shortdesc>Use the <codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</codeph> procedure
+or one of the other system backup procedures to perform an online backup of a
+database to a specified location.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Backup procedure</indexterm><indexterm>SYSCS_BACKUP_DATABASE()
 system procedure</indexterm></keywords>
@@ -30,114 +30,117 @@ system procedure</indexterm></keywords>
 <conbody>
 <p>The backup procedures are as follows:</p>
 <ul>
-<li>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</li>
-<li>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT</li>
-<li>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE</li>
-<li>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT </li>
+<li><codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</codeph></li>
+<li><codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT</codeph></li>
+<li><codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE</codeph></li>
+<li><codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT</codeph></li>
 </ul>
-<p>Use the SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE or
-SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT
+<p>Use the
+<codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE</codeph> or
+<codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT</codeph>
 procedure if you want to make it possible to perform a roll-forward recovery of
 a damaged database. See
 <xref href="cadminrollforward.dita#cadminrollforward"></xref> for details.</p>
-<p>The NOWAIT versions of the procedures do not wait for transactions
-in progress with unlogged operations to complete before proceeding with the
-backup; instead, they return an error immediately.</p>
+<p>The <codeph>NOWAIT</codeph> versions of the procedures do not wait for
+transactions in progress with unlogged operations to complete before proceeding
+with the backup; instead, they return an error immediately.</p>
 <p>See the <ph conref="../conrefs.dita#pub/citref"></ph> for details about these
 system procedures.</p>
-<p>All four of these system procedures take a string argument
-that represents the location in which to back up the database. Typically,
-you provide the full path to the backup directory. (Relative paths are interpreted
-as relative to the current directory, not to the derby.system.home directory.)</p>
-<p>For example, to specify a backup location of <filepath>c:/mybackups/2012-04-01</filepath> for
-a database that is currently open, use the following statement (forward slashes
-are used as path separators in SQL commands):</p>
+<p>All four of these system procedures take a string argument that represents
+the location in which to back up the database. Typically, you provide the full
+path to the backup directory. (Relative paths are interpreted as relative to the
+current directory, not to the <codeph>derby.system.home</codeph> directory.)</p>
+<p>For example, to specify a backup location of
+<codeph>c:/mybackups/2012-04-01</codeph> for a database that is currently open,
+use the following statement (forward slashes are used as path separators in SQL
+commands):</p>
 <codeblock><b>CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE('c:/mybackups/2012-04-01')</b></codeblock>
-<p>The SYSCS_UTIL.SYSCS_BACKUP_DATABASE or
-SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT procedure puts the database
-into a state in which it can be safely copied. The procedure then copies the
-entire original database directory (including data files, online transaction log
-files, and jar files) to the specified backup directory. Files that are not
-within the original database directory (for example, <i>derby.properties</i>)
-are <i>not</i> copied. With the exception of a few cases mentioned in 
+<p>The <codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</codeph> or
+<codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT</codeph> procedure puts the
+database into a state in which it can be safely copied. The procedure then
+copies the entire original database directory (including data files, online
+transaction log files, and jar files) to the specified backup directory. Files
+that are not within the original database directory (for example,
+<codeph>derby.properties</codeph>) are <i>not</i> copied. With the exception of
+a few cases mentioned in
 <xref href="cadminhubbkup01.dita#cadminhubbkup01/hubbkupunlogged"></xref>,
 the procedure does not block concurrent transactions at any time.</p>
 <p>A backup made with the
-SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE or
-SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT procedure is
-not a full copy of the database, but depends on the log files created in the
-database since the backup. An attempt to access the backup directly will
-invalidate the backup. The result could include a corrupted database, missing
-data, errors during a subsequent attempt at restoring the database, or database
-corruption errors encountered only once the restored database is being used. The
-only supported way to access this kind of backup is to restore the database as
-documented in <xref href="cadminrollforward.dita#cadminrollforward"></xref>.</p>
+<codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE</codeph> or
+<codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT</codeph>
+procedure is not a full copy of the database, but depends on the log files
+created in the database since the backup. An attempt to access the backup
+directly will invalidate the backup. The result could include a corrupted
+database, missing data, errors during a subsequent attempt at restoring the
+database, or database corruption errors encountered only once the restored
+database is being used. The only supported way to access this kind of backup is
+to restore the database as documented in
+<xref href="cadminrollforward.dita#cadminrollforward"></xref>.</p>
 <p>The following example shows how to back up a database to a directory with
 a name that reflects the current date:</p>
-<codeblock>public static void backUpDatabase(Connection conn)throws SQLException
-{
-<b>// Get today's date as a string:</b>
-java.text.SimpleDateFormat todaysDate = 
-   new java.text.SimpleDateFormat("yyyy-MM-dd");
-String backupdirectory = "c:/mybackups/" +
-   todaysDate.format((java.util.Calendar.getInstance()).getTime());
+<codeblock>public static void backUpDatabase(Connection conn) 
+        throws SQLException {
+    <b>// Get today's date as a string:</b>
+    java.text.SimpleDateFormat todaysDate = 
+        new java.text.SimpleDateFormat("yyyy-MM-dd");
+    String backupdirectory = "c:/mybackups/" +
+        todaysDate.format((java.util.Calendar.getInstance()).getTime());
 
-CallableStatement cs = conn.prepareCall("CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE(?)"); 
-cs.setString(1, backupdirectory);
-cs.execute(); 
-cs.close();
-System.out.println("backed up database to "+backupdirectory);
+    CallableStatement cs =
+        conn.prepareCall("CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE(?)"); 
+    cs.setString(1, backupdirectory);
+    cs.execute(); 
+    cs.close();
+    System.out.println("backed up database to " + backupdirectory);
 }</codeblock>
 <p>For a database that was backed up on 2012-04-01, the previous commands
-copy the current database to a directory of the same name in <i>c:/mybackups/2012-04-01</i>.</p>
+copy the current database to a directory of the same name in
+<codeph>c:/mybackups/2012-04-01</codeph>.</p>
 <p>Uncommitted transactions do not appear in the backed-up database.</p>
 <note>Do not back up different databases with the same name to the same backup
 directory. If a database of the same name already exists in the backup directory,
 it is assumed to be an older version and is overwritten.</note>
 <section id="hubbkupunlogged"><title>Unlogged Operations</title>
-<p>
-For some operations, Derby does not log because it can keep the database
-consistent without logging the data.
-</p>
-<p>The SYSCS_UTIL.SYSCS_BACKUP_DATABASE procedure will issue an error if there
-are any unlogged operations in the same transaction as the backup procedure.</p>
+<p>For some operations, <ph conref="../conrefs.dita#prod/productshortname"></ph>
+does not log because it can keep the database consistent without logging the
+data.</p>
+<p>The <codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</codeph> procedure will issue an
+error if there are any unlogged operations in the same transaction as the backup
+procedure.</p>
 <p>If any unlogged operations are in progress in other transactions in the
-system when the backup starts, this procedure will block until those transactions
-are complete before performing the backup.</p>
-<p>Derby automatically converts unlogged operations to logged mode if they
-are started while the backup is in progress (except operations that maintain
-application jar files in the database). Procedures to install, replace, and
-remove jar files in a database are blocked while the backup is in progress.</p>
-<p>If you do not want backup to block until unlogged operations in other transactions
-are complete, use the SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT procedure. 
-This procedure issues an error immediately at the start of the backup if there
-are any transactions in progress with unlogged operations, instead of waiting
-for those transactions to complete.</p>
-<p>Unlogged operations include:
-<ol>
+system when the backup starts, this procedure will block until those
+transactions are complete before performing the backup.</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> automatically
+converts unlogged operations to logged mode if they are started while the backup
+is in progress (except operations that maintain application jar files in the
+database). Procedures to install, replace, and remove jar files in a database
+are blocked while the backup is in progress.</p>
+<p>If you do not want backup to block until unlogged operations in other
+transactions are complete, use the
+<codeph>SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT</codeph> procedure. This
+procedure issues an error immediately at the start of the backup if there are
+any transactions in progress with unlogged operations, instead of waiting for
+those transactions to complete.</p>
+<p>Unlogged operations include:</p>
+<ul>
 <li>Index creation.
-<p>
-Only CREATE INDEX is logged, not all the data inserts into the
-index. The reason inserts into the index are not logged is:
-if there is a failure , it will just drop the index.
-</p><p>
-If you create an index when the backup is in progress, it will be
-slower because it has to be logged.
-</p><p>
-Foreign Keys , Primary Keys create backing indexes. Adding those keys
-to an existing table with data will also run slower.
-</p></li>
-<li>Import to an empty table or replacing all the data in a table.
-<p>
-In this case also, data inserts into table are not logged. Internally,
-Derby creates a new table for the import and changes the catalogs to
-point to the new table and drops the original table when import
-completes.
-</p><p>
-If you perform such an import operation when backup is in progress ,
-it will be slower because data is logged.
-</p></li>
-</ol>
-</p></section>
+<p>Only CREATE INDEX is logged, not all the data inserts into the index. The
+reason inserts into the index are not logged is that if there is a failure, it
+will just drop the index.</p>
+<p>If you create an index when the backup is in progress, it will be slower,
+because it has to be logged.</p>
+<p>Foreign keys and primary keys create backing indexes. Adding those keys to an
+existing table with data will also run slower.</p>
+</li>
+<li>Importing to an empty table or replacing all the data in a table.
+<p>In this case also, data inserts into the table are not logged. Internally,
+<ph conref="../conrefs.dita#prod/productshortname"></ph> creates a new table for
+the import, changes the catalogs to point to the new table, and drops the
+original table when the import completes.</p>
+<p>If you perform such an import operation when backup is in progress, it will
+be slower because data is logged.</p>
+</li>
+</ul>
+</section>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup12677.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup12677.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup12677.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup12677.dita Mon Nov 11 17:27:54 2013
@@ -27,21 +27,23 @@ commands to copy the database directory.
 <p><note type="important">You must shut down the database before you perform an
 offline backup.</note></p>
 <p>For example, on Windows systems, the following operating system command 
-backs up a (closed) database that is named <i>sample</i> and that is located in <filepath>d:\mydatabases</filepath> by
-copying it to the directory <filepath>c:\mybackups\2012-04-01</filepath>:</p>
-<codeblock>xcopy d:\mydatabases\sample c:\mybackups\2012-04-01\sample /s /i</codeblock>
+backs up a (closed) database that is named <codeph>sample</codeph> and that is
+located in <codeph>d:\mydatabases</codeph> by copying it to the directory
+<codeph>c:\mybackups\2012-04-01</codeph>:</p>
+<codeblock><b>xcopy d:\mydatabases\sample c:\mybackups\2012-04-01\sample /s /i</b></codeblock>
 <p>If you are not using Windows, substitute the appropriate operating
 system command for copying a directory and all contents to a new location.</p>
 <note>On Windows systems, do not attempt to update a database while it is being
 backed up in this way. Attempting to update a database during an offline
-backup will generate a java.io.IOException. Using online backups prevents
-this from occurring.</note>
+backup will generate a <codeph>java.io.IOException</codeph>. Using online
+backups prevents this from occurring.</note>
 <p>For large systems, shutting down the database might not be convenient.
-To back up a database without having to shut it down, you can use an online backup.</p>
+To back up a database without having to shut it down, you can use an online
+backup.</p>
 <p>After you back up a database, make sure the backup copy is not corrupt. To
-do this, run the SYSCS_UTIL.SYSCS_CHECK_TABLE system function on all the tables
-in the backup copy. Do not discard the previous backup until you have verified
-the consistency of the current one. See
+do this, run the <codeph>SYSCS_UTIL.SYSCS_CHECK_TABLE</codeph> system function
+on all the tables in the backup copy. Do not discard the previous backup until
+you have verified the consistency of the current one. See
 <xref href="cadminconsist01.dita#cadminconsist01"></xref> for more
 information.</p>
 </conbody>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup21105.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup21105.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup21105.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup21105.dita Mon Nov 11 17:27:54 2013
@@ -18,8 +18,8 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminhubbkup21105">
 <title>Backing up encrypted databases</title>
-<shortdesc>When you back up an encrypted database, both the backup and the log files
-remain encrypted.</shortdesc>
+<shortdesc>When you back up an encrypted database, both the backup and the log
+files remain encrypted.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>Encrypted databases<indexterm>backing up</indexterm></indexterm>

Modified: db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup67525.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup67525.dita?rev=1540788&r1=1540787&r2=1540788&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup67525.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/cadminhubbkup67525.dita Mon Nov 11 17:27:54 2013
@@ -19,28 +19,31 @@ limitations under the License.
 -->
 <concept id="cadminhubbkup67525" xml:lang="en-us">
 <title>When the log is in a non-default location</title>
+<shortdesc>If you put the database log in a non-default location prior to
+backing up the database, be aware of the following requirements.</shortdesc>
 <prolog></prolog>
 <conbody>
-<note>Read <xref href="cadminlog98.dita#cadminlog98"></xref> to find out about
-the default location of the database log.</note>
-<p>If you put the database log in a non-default location prior to backing
-up the database, be aware of the following requirements:</p>
 <ul>
 <li>If you are using an operating system command to back up the database,
-you must explicitly copy the log file as well, as shown in the following example:
-  <codeblock>xcopy d:\mydatabases\sample c:\mybackups\2012-04-01\sample /s /i
-xcopy h:\janet\tourslog\log c:\mybackups\2012-04-01\sample\log /s /i</codeblock></li>
-</ul>
+you must explicitly copy the log file as well, as shown in the following
+example:
+<codeblock><b>xcopy d:\mydatabases\sample c:\mybackups\2012-04-01\sample /s /i
+xcopy h:\janet\tourslog\log c:\mybackups\2012-04-01\sample\log /s /i</b></codeblock>
 <p>If you are not using Windows, substitute the appropriate operating system
 command for copying a directory and all of its contents to a new location.</p>
+</li>
+</ul>
 <ul>
-<li>Edit the <i>logDevice</i> entry in <i>service.properties</i> of the database
-backup so that it points to the correct location for the log. In the previous
-example, the log was moved to the default location for a log, so you can remove
-the <i>logDevice</i> entry entirely, or leave the <i>logDevice</i> entry as is and wait
-until the database is restored to edit the entry.</li>
+<li>Edit the <codeph>logDevice</codeph> entry in the
+<codeph>service.properties</codeph> file of the database backup so that it
+points to the correct location for the log. In the previous example, the log was
+moved to the default location for a log, so you can remove the
+<codeph>logDevice</codeph> entry entirely, or leave the
+<codeph>logDevice</codeph> entry as is and wait until the database is restored
+to edit the entry.</li>
 </ul>
 <p>See <xref href="cadminlog98.dita#cadminlog98"></xref> for information about
-putting the log in a non-default location.</p>
+the default location of the database log and about putting the log in a
+non-default location.</p>
 </conbody>
 </concept>



Mime
View raw message