db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1541073 - /db/derby/docs/trunk/src/devguide/
Date Tue, 12 Nov 2013 14:21:53 GMT
Author: chaase3
Date: Tue Nov 12 14:21:52 2013
New Revision: 1541073

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

Modified 37 Developer's Guide topics.

Patch: DERBY-6379-devguide.diff

Modified:
    db/derby/docs/trunk/src/devguide/cdevconcepts28351.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure871387.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure96815.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy15818.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy17604.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy857611.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy857648.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop11561.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop12821.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop13074.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop16827.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop23308.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop24222.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop24843.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop32443.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop34818.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop44147.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop824451.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop824500.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop824533.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop824615.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop824983.dita
    db/derby/docs/trunk/src/devguide/cdevspecial45786.dita
    db/derby/docs/trunk/src/devguide/derbydev.ditamap
    db/derby/docs/trunk/src/devguide/rdevadvjdbc965.dita
    db/derby/docs/trunk/src/devguide/rdevconcepts38274.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure871406.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure871422.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure871439.dita
    db/derby/docs/trunk/src/devguide/rdevdeploy856845.dita
    db/derby/docs/trunk/src/devguide/rdevdeploy856880.dita
    db/derby/docs/trunk/src/devguide/rdevdeploy856912.dita
    db/derby/docs/trunk/src/devguide/rdevdeploy856948.dita
    db/derby/docs/trunk/src/devguide/tdevcsecurenewbootpw.dita
    db/derby/docs/trunk/src/devguide/tdevcsecurenewextkey.dita

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts28351.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevconcepts28351.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts28351.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts28351.dita Tue Nov 12 14:21:52 2013
@@ -21,37 +21,30 @@ limitations under the License.
 <concept id="cdevconcepts28351" xml:lang="en-us">
 <title>Updatable result sets</title>
 <shortdesc>
-Updatable result sets in <ph
-conref="../conrefs.dita#prod/productshortname"></ph> can be updated by
-using result set update methods
-(<codeph>updateRow()</codeph>,<codeph>deleteRow()</codeph> and
+Updatable result sets in
+<ph conref="../conrefs.dita#prod/productshortname"></ph> can be updated by using
+result set update methods
+(<codeph>updateRow()</codeph>, <codeph>deleteRow()</codeph>, and
 <codeph>insertRow()</codeph>), or by using positioned update or delete
-queries.
-</shortdesc>
+queries.</shortdesc>
 <prolog></prolog>
 <conbody>
 <section>
-
 <p> Both scrollable and non-scrollable result sets can be updatable in <ph
-conref="../conrefs.dita#prod/productshortname"></ph>. 
-</p>
-
+conref="../conrefs.dita#prod/productshortname"></ph>.</p>
 <p> If the query which was executed to create the result set is not updatable, 
 <ph conref="../conrefs.dita#prod/productshortname"></ph> will downgrade
 the concurrency mode to <codeph>ResultSet.CONCUR_READ_ONLY</codeph>,
 and add a warning about this on the <codeph>ResultSet</codeph>. The
 compilation of the query fails if the result set cannot be updatable,
 and contains a <codeph>FOR UPDATE</codeph> clause. </p>
-
 <p>Positioned updates and deletes can be performed if the query 
 contains <codeph>FOR UPDATE</codeph> or if the concurrency mode for
 the result set is <codeph>ResultSet.CONCUR_UPDATABLE</codeph>.</p>
-
 <p>To use the result set update methods, the concurrency mode for the
 result set must be <codeph>ResultSet.CONCUR_UPDATABLE</codeph>. 
 The query does not need to contain <codeph>FOR UPDATE</codeph> to
 use these methods. </p>
-
 <p>Updatable cursors lock the current row with an update lock when
 positioned on the row, regardless of isolation level. Therefore, to
 avoid excessive locking of rows, only use concurrency mode
@@ -59,10 +52,7 @@ avoid excessive locking of rows, only us
 UPDATE</codeph> clause when you actually need to update the rows.
 For more information about locking, see 
 <xref href="cdevconcepts36402.dita">Types and scope of locks in Derby
-systems.</xref>
-
-</p>
+systems.</xref></p>
 </section>
-
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevcsecure871387.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevcsecure871387.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure871387.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure871387.dita Tue Nov 12 14:21:52 2013
@@ -18,6 +18,8 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevcsecure871387">
 <title>Examples of Java security policy files for embedded Derby</title>
+<shortdesc>This section provides several examples of security policy
+files.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>Policy files<indexterm>examples</indexterm></indexterm>

Modified: db/derby/docs/trunk/src/devguide/cdevcsecure96815.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevcsecure96815.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure96815.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure96815.dita Tue Nov 12 14:21:52 2013
@@ -20,18 +20,17 @@ limitations under the License.
 -->
 <concept id="cdevcsecure96815" xml:lang="en-us">
 <title>Requirements for Derby encryption</title>
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> supports
+disk encryption and requires an encryption provider.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Encryption<indexterm>providers</indexterm></indexterm>
 <indexterm>Data encryption<indexterm>providers</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>
-<ph conref="../conrefs.dita#prod/productshortname"></ph> supports disk
-encryption and requires an encryption provider. An encryption provider
-implements the Java cryptography concepts. The Java Runtime Environment (JRE)
-for Java SE includes Java Cryptographic Extensions (JCE, part of the
-Java Cryptography Architecture) and one or more default encryption providers.
-For more information, see the <i><xref format="html"
+<p>An encryption provider implements the Java cryptography concepts. The Java
+Runtime Environment (JRE) for Java SE includes Java Cryptographic Extensions
+(JCE, part of the Java Cryptography Architecture) and one or more default
+encryption providers. For more information, see the <i><xref format="html"
 href="http://download.oracle.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html"
 scope="external">Java Cryptography Architecture (JCA) Reference Guide</xref></i>.
 </p>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy15818.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdeploy15818.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy15818.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy15818.dita Tue Nov 12 14:21:52 2013
@@ -20,24 +20,25 @@ limitations under the License.
 -->
 <concept id="cdevdeploy15818" xml:lang="en-us">
 <title>Create jar files for your application</title>
-<shortdesc>Include any Java classes in a jar file that are intended for <ph
-conref="../conrefs.dita#prod/productshortname"></ph> class loading, except
-the following classes:</shortdesc>
+<shortdesc>Include any Java classes in a jar file that are intended for
+<ph conref="../conrefs.dita#prod/productshortname"></ph> class loading, except
+the following classes.</shortdesc>
 <prolog></prolog>
 <conbody>
 <ul>
 <li>The standard Java packages (<i>java.*</i>, <i>javax.*</i>)
-  <p><ph conref="../conrefs.dita#prod/productshortname"></ph> does not prevent
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> does not prevent
 you from storing such a jar file in the database, but these classes <i>are
 never loaded</i> from the jar file.</p></li>
-<li>The classes that are supplied with your Java environment (for example, <i>sun.*</i>)</li>
+<li>The classes that are supplied with your Java environment</li>
 </ul>
 <p>A running <ph conref="../conrefs.dita#prod/productshortname"></ph> system
 can load classes from any number of jar files from any number of schemas and
 databases.</p>
-<p>Create jar files intended for <ph conref="../conrefs.dita#prod/productshortname"></ph> database
-class loading the same way you create a jar file for inclusion in a user's
-classpath. For example, consider an application targeted at travel agencies: </p>
+<p>Create jar files intended for
+<ph conref="../conrefs.dita#prod/productshortname"></ph> database class loading
+the same way you create a jar file for inclusion in a user's classpath. For
+example, consider an application targeted at travel agencies:</p>
 <codeblock><b>jar cf travelagent.jar travelagent/*.class.</b></codeblock>
 <p>Various IDEs have tools to generate a list of contents for a jar file based
 on your application. If your application requires classes from other jar files,

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy17604.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdeploy17604.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy17604.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy17604.dita Tue Nov 12 14:21:52 2013
@@ -22,12 +22,13 @@ limitations under the License.
 <title>Dynamic changes to jar files or to the database jar classpath</title>
 <shortdesc>When you store jar files in a single database and make those jar
 files available to that database, it is possible to make changes to jar files
-or to change the database jar "classpath" dynamically (without having to reboot).</shortdesc>
+or to change the database jar "classpath" dynamically (without having to
+reboot).</shortdesc>
 <prolog></prolog>
 <conbody>
 <p>That is, when you install or replace a jar file within an SQL statement
-or change the database jar "classpath" (the <i>derby.database.classpath</i> property<codeph><i>),</i></codeph> <ph
-conref="../conrefs.dita#prod/productshortname"></ph> is able to load the new
-classes right away without your having to reboot.</p>
+or change the database jar "classpath" (the <i>derby.database.classpath</i>
+property), <ph conref="../conrefs.dita#prod/productshortname"></ph> is able to
+load the new classes right away without your having to reboot.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy21645.dita Tue Nov 12 14:21:52 2013
@@ -21,17 +21,18 @@ limitations under the License.
 <concept id="cdevdeploy21645" xml:lang="en-us">
 <title>Enable database class loading with a property</title>
 <shortdesc>Once you have added one or more jar files to a database, you must
-set the database jar classpath by including the jar file or files in the <i>derby.database.classpath</i> property
-to enable <ph conref="../conrefs.dita#prod/productshortname"></ph> to load
-classes from the jar files.</shortdesc>
+set the database jar classpath by including the jar file or files in the
+<i>derby.database.classpath</i> property to enable
+<ph conref="../conrefs.dita#prod/productshortname"></ph> to load classes from
+the jar files.</shortdesc>
 <prolog></prolog>
 <conbody>
 <p>This property, which behaves like a classpath, specifies the jar files
-to be searched for classes and resources and the order in which they are searched.
-If <ph conref="../conrefs.dita#prod/productshortname"></ph> does not find
-a needed class stored in the database, it can retrieve the class from the
-user's classpath. (<ph conref="../conrefs.dita#prod/productshortname"></ph> first
-looks in the user's classpath before looking in the database.)</p>
+to be searched for classes and resources and the order in which they are
+searched. If <ph conref="../conrefs.dita#prod/productshortname"></ph> does not
+find a needed class stored in the database, it can retrieve the class from the
+user's classpath. (<ph conref="../conrefs.dita#prod/productshortname"></ph>
+first looks in the user's classpath before looking in the database.)</p>
 <ul>
 <li>Separate jar files with a colon (<codeph>:</codeph>).</li>
 <li>Use fully qualified identifiers for the jar files (schema name and jar

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita Tue Nov 12 14:21:52 2013
@@ -22,7 +22,8 @@ limitations under the License.
 <title>Add the jar file or files to the database</title>
 <shortdesc>Use a set of procedures to install, replace, and remove jar files
 in a database. When you install a jar file in a database, you give it a <ph
-conref="../conrefs.dita#prod/productshortname"></ph> jar name, which is an <codeph>SQL92Identifier</codeph>.</shortdesc>
+conref="../conrefs.dita#prod/productshortname"></ph> jar name, which is an
+<codeph>SQL92Identifier</codeph>.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>jar files<indexterm>installing, removing, and replacing</indexterm></indexterm>
 </keywords>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy857611.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdeploy857611.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy857611.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy857611.dita Tue Nov 12 14:21:52 2013
@@ -20,18 +20,20 @@ limitations under the License.
 -->
 <concept id="cdevdeploy857611" xml:lang="en-us">
 <title>Requirements for dynamic changes</title>
-<shortdesc>Certain conditions must be met for <ph conref="../conrefs.dita#prod/productshortname"></ph> to
-be able to load the new classes right away without you having to reboot.</shortdesc>
+<shortdesc>Certain conditions must be met for
+<ph conref="../conrefs.dita#prod/productshortname"></ph> to be able to load the
+new classes right away without your having to reboot.</shortdesc>
 <prolog></prolog>
 <conbody>
 <ul>
 <li>You <i>originally configured</i> database-level class loading for the
-database correctly. Turning on the database-level class loading property requires
-setting the <i>derby.database.classpath</i> property with
-valid two-part names, then rebooting.</li>
-<li>If changes to the <i>derby.database.classpath</i> property are needed
-to reflect new jar files, you change the property to a valid value.</li>
+database correctly. Turning on the database-level class loading property
+requires setting the <i>derby.database.classpath</i> property with valid
+two-part names, then rebooting.</li>
+<li>If changes to the <i>derby.database.classpath</i> property are needed to
+reflect new jar files, you change the property to a valid value.</li>
 </ul>
-<p>If these requirements are not met, you will have to reboot to see the changes.</p>
+<p>If these requirements are not met, you will have to reboot to see the
+changes.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy857648.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdeploy857648.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy857648.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy857648.dita Tue Nov 12 14:21:52 2013
@@ -20,17 +20,22 @@ limitations under the License.
 -->
 <concept id="cdevdeploy857648" xml:lang="en-us">
 <title>Notes on dynamic changes</title>
+<shortdesc>Remember the following items when you make dynamic changes to jar
+files or to the classpath.</shortdesc>
 <prolog></prolog>
 <conbody>
-<p>When you are changing the <i>derby.database.classpath</i> property, all
+<ul>
+<li>When you are changing the <i>derby.database.classpath</i> property, all
 classes loaded from database jar files are reloaded, even for a jar file that
-has not changed.</p>
-<p>Remember that the user's classpath is searched first.</p>
-<p>Any existing prepared statements will use the previously loaded classes
-unless they require class loading, in which case they will fail with a <i>ClassNotFound</i> error.</p>
-<p>Cached objects do not match objects created with newly loaded classes.
-For example, an in-memory <i>Customer</i> object will not match a new <i>Customer</i> object
-if the <i>Customer</i> class has been reloaded, and it will
-raise a <i>ClassCastException</i>.</p>
+has not changed.</li>
+<li>Remember that the user's classpath is searched first.</li>
+<li>Any existing prepared statements will use the previously loaded classes
+unless they require class loading, in which case they will fail with a
+<i>ClassNotFound</i> error.</li>
+<li>Cached objects do not match objects created with newly loaded classes.
+For example, an in-memory <i>Customer</i> object will not match a new
+<i>Customer</i> object if the <i>Customer</i> class has been reloaded, and it
+will raise a <i>ClassCastException</i>.</li>
+</ul>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop11561.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop11561.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop11561.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop11561.dita Tue Nov 12 14:21:52 2013
@@ -18,6 +18,11 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevsetprop11561">
 <title>Changing the system-wide properties programmatically</title>
+<shortdesc>You can set properties programmatically -- either in application code
+before booting the <ph conref="../conrefs.dita#prod/productshortname"></ph>
+driver or as a command-line option to the Java Virtual Machine (JVM) when
+booting the application that starts up
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>system properties<indexterm>setting on command line</indexterm></indexterm>
@@ -27,14 +32,9 @@ limitations under the License.
 </metadata>
 </prolog>
 <conbody>
-<p>You can set properties programmatically -- either in application code before
-booting the <ph conref="../conrefs.dita#prod/productshortname"></ph> driver or
-as a command-line option to the Java Virtual
-Machine (JVM) when booting the application that starts up
-<ph conref="../conrefs.dita#prod/productshortname"></ph>. When you set
-properties programmatically, these properties persist only for the duration of
-the application. Properties set programmatically are not written to the
-<i>derby.properties</i> file or made persistent in any other way by
+<p>When you set properties programmatically, these properties persist only for
+the duration of the application. Properties set programmatically are not written
+to the <i>derby.properties</i> file or made persistent in any other way by
 <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
 <note>Setting properties programmatically works only for the application that
 starts up <ph conref="../conrefs.dita#prod/productshortname"></ph>; for example,

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop12821.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop12821.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop12821.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop12821.dita Tue Nov 12 14:21:52 2013
@@ -18,6 +18,11 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevsetprop12821">
 <title>Setting database-wide properties</title>
+<shortdesc>Database-wide properties, which affect a single database, are stored
+within the database itself. This allows different databases within a single
+<ph conref="../conrefs.dita#prod/productshortname"></ph> system to have
+different properties and ensures that the properties are correctly retained when
+a database is moved away from its original system or copied.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>database-wide properties<indexterm>setting</indexterm></indexterm>
@@ -29,22 +34,22 @@ of</indexterm></indexterm>
 </metadata>
 </prolog>
 <conbody>
-<p>Database-wide properties, which affect a single database, are stored within
-the database itself. This allows different databases within a single <ph conref="../conrefs.dita#prod/productshortname"></ph> system
-to have different properties and ensures that the properties are correctly
-retained when a database is moved away from its original system or copied.</p>
 <p>You should use database-wide properties wherever possible for ease
 of deployment and for security.</p>
-<p>You set and verify database-wide properties using system procedures within SQL statements.</p>
+<p>You set and verify database-wide properties using system procedures within
+SQL statements.</p>
 <p>To set a property, you connect to the database, create a statement, and
 then use the <codeph>SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY</codeph> procedure,
 passing the name of the property and the value.</p>
 <p>To check the current value of a property, you connect to the database,
-create a statement, and then use the <codeph>SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY</codeph> function, passing in the name of the property.  </p>
-<p>If you specify an invalid value, <ph conref="../conrefs.dita#prod/productshortname"></ph> uses the default value for
-the property. (If you call the
+create a statement, and then use the
+<codeph>SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY</codeph> function, passing in the
+name of the property.</p>
+<p>If you specify an invalid value,
+<ph conref="../conrefs.dita#prod/productshortname"></ph> uses the default value
+for the property. (If you call the
 <codeph>SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY</codeph> function, however, it
 displays the invalid value.)</p>
-<p>See the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite> for more information on how to use these system
-functions and procedures.</p>
+<p>See the <ph conref="../conrefs.dita#pub/citref"></ph> for more information on
+how to use these system functions and procedures.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop13074.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop13074.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop13074.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop13074.dita Tue Nov 12 14:21:52 2013
@@ -19,18 +19,18 @@ limitations under the License.
 -->
 <concept id="cdevsetprop13074" xml:lang="en-us">
 <title>Changing the system-wide properties by using the derby.properties file</title>
+<shortdesc>You can set persistent system-wide properties in a text file called
+<i>derby.properties</i>, which must be placed in the directory specified by the
+<i>derby.system.home</i> property.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>derby.properties file</indexterm>
 <indexterm>system-wide properties<indexterm>setting</indexterm></indexterm>
 <indexterm>derby.system.home<indexterm>determining location of derby.properties</indexterm></indexterm>
 </keywords></metadata></prolog>
 <conbody>
-<p>You can set persistent system-wide properties in a text file called
-<i>derby.properties</i>, which must be placed in the directory specified by the
-<i>derby.system.home</i> property. There is one <i>derby.properties</i>
-file per system, not one per database. The file must be created in the system
-directory. In a client/server environment, that directory is on the server.
-(For more information about a
+<p>There is one <i>derby.properties</i> file per system, not one per database.
+The file must be created in the system directory. In a client/server
+environment, that directory is on the server. (For more information about a
 <ph conref="../conrefs.dita#prod/productshortname"></ph> system and the system
 directory, see <xref href="cdevdvlp27610.dita#cdevdvlp27610"></xref>.)</p>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> does <i>not</i>:

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop16827.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop16827.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop16827.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop16827.dita Tue Nov 12 14:21:52 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="cdevsetprop16827">
 <title>Setting system-wide properties</title>
+<shortdesc>You can set system-wide properties programmatically (as a
+command-line option to the JVM when starting the application or within
+application code) or in the text file <i>derby.properties</i>.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>derby.properties file</indexterm>
@@ -26,7 +29,4 @@ limitations under the License.
 </metadata>
 </prolog>
 <conbody>
-<p>You can set system-wide properties programmatically (as a command-line
-option to the JVM when starting the application or within application code)
-or in the text file <i>derby.properties</i>.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop23308.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop23308.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop23308.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop23308.dita Tue Nov 12 14:21:52 2013
@@ -18,6 +18,7 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevsetprop23308">
 <title>Precedence of properties</title>
+<shortdesc>The search order for properties is as follows.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>Properties<indexterm>precedence of</indexterm></indexterm>
@@ -25,14 +26,14 @@ limitations under the License.
 </metadata>
 </prolog>
 <conbody>
-<p>The search order for properties is:  
 <ol>
 <li>System-wide properties set programmatically (as a command-line option
 to the JVM when starting the application or within application code)</li>
 <li>Database-wide properties</li>
 <li>System-wide properties set in the <i>derby.properties</i> file</li>
-</ol></p>
+</ol>
 <p>This means, for example, that system-wide properties set programmatically
-override database-wide properties and system-wide properties set in the <i>derby.properties</i> file, and that database-wide properties
-override system-wide properties set in the <i>derby.properties</i> file.</p>
+override database-wide properties and system-wide properties set in the
+<i>derby.properties</i> file, and that database-wide properties override
+system-wide properties set in the <i>derby.properties</i> file.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop24222.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop24222.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop24222.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop24222.dita Tue Nov 12 14:21:52 2013
@@ -19,12 +19,13 @@ limitations under the License.
 -->
 <concept id="cdevsetprop24222" xml:lang="en-us">
 <title>Setting Derby properties</title>
+<shortdesc>This section covers the different ways of setting
+properties.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Configuring Derby</indexterm>
 <indexterm>Derby properties<indexterm>setting</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>This section covers the different ways of setting properties.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop24843.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop24843.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop24843.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop24843.dita Tue Nov 12 14:21:52 2013
@@ -18,6 +18,11 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevsetprop24843">
 <title>Setting properties in a client/server environment</title>
+<shortdesc>In a client/server environment, you must set the system properties
+for the <i>server</i>'s system. That means that when you are using the
+<i>derby.properties</i> file, the file exists in the <i>server</i>'s
+<i>derby.system.home</i> directory. Client applications can set database-wide
+properties because they are set via SQL statements.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>properties<indexterm>in client/server mode</indexterm></indexterm>
@@ -25,12 +30,6 @@ limitations under the License.
 </metadata>
 </prolog>
 <conbody>
-<p>In a client/server environment, you must set the system properties for
-the <i>server</i>'s system. That means that when you are using
-the <i>derby.properties</i> file, the file exists in the <i>server</i>'s
-<i>derby.system.home</i> directory.
-Client applications can set database-wide properties because they are set via
-SQL statements.</p>
 <p>The following table summarizes the ways to set properties.</p>
 <table frame="all">
 <title>Ways to set properties</title>

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop32443.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop32443.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop32443.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop32443.dita Tue Nov 12 14:21:52 2013
@@ -18,6 +18,12 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevsetprop32443">
 <title>Properties case study</title>
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> allows you
+a lot of freedom in configuring your system. This freedom can be confusing if
+you do not understand how properties work. You also have the option of not
+setting any properties and instead using the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> defaults, which are
+tuned for a single-user embedded system.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>properties<indexterm>implications of having various ways to set</indexterm></indexterm>
@@ -25,12 +31,6 @@ limitations under the License.
 </metadata>
 </prolog>
 <conbody>
-<p><ph conref="../conrefs.dita#prod/productshortname"></ph> allows you a lot of
-freedom in configuring your system. This freedom can be confusing if you do not
-understand how properties work. You also have the option of not setting any
-properties and instead using the
-<ph conref="../conrefs.dita#prod/productshortname"></ph> defaults, which are
-tuned for a single-user embedded system.</p>
 <p>Imagine the following scenario of an embedded environment:</p>
 <p>Your system has a <i>derby.properties</i> file, a text file in the system
 directory, which you have created and named <i>system_directory</i>. Your

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop34818.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop34818.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop34818.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop34818.dita Tue Nov 12 14:21:52 2013
@@ -17,13 +17,13 @@ limitations under the License.
 -->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevsetprop34818">
-<title>Working with <ph conref="../conrefs.dita#prod/productshortname"></ph> properties</title>
-<prolog>
-</prolog>
+<title>Working with <ph conref="../conrefs.dita#prod/productshortname"></ph>
+properties</title>
+<shortdesc>This section describes how to use
+<ph conref="../conrefs.dita#prod/productshortname"></ph> properties.</shortdesc>
+<prolog></prolog>
 <conbody>
-<p>This section describes how to use
-<ph conref="../conrefs.dita#prod/productshortname"></ph> properties. For
-details on specific properties, see the
+<p>For details on specific properties, see the
 "<ph conref="../conrefs.dita#prod/productshortname"></ph> properties" section of
 the <ph conref="../conrefs.dita#pub/citref"></ph>.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop44147.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop44147.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop44147.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop44147.dita Tue Nov 12 14:21:52 2013
@@ -18,17 +18,19 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevsetprop44147">
 <title>Making dynamic or static changes to properties</title>
-<prolog>
-</prolog>
+<shortdesc>Properties set in the <i>derby.properties</i> file and on the command
+line of the application that boots
+<ph conref="../conrefs.dita#prod/productshortname"></ph> are <i>always</i>
+static, because <ph conref="../conrefs.dita#prod/productshortname"></ph> reads
+this file and those parameters only at startup.</shortdesc>
+<prolog></prolog>
 <conbody>
-<note>Properties set in the <i>derby.properties</i> file and on the command line of the application that boots <ph conref="../conrefs.dita#prod/productshortname"></ph> are <i>always</i> static, because <ph conref="../conrefs.dita#prod/productshortname"></ph> reads this file and
-those parameters only at startup.</note>
 <p>Only properties set in the following ways have the potential to be dynamic:
- 
 <ul>
 <li>As database-wide properties</li>
 <li>As system-wide properties via a <i>Properties</i> object
-in the application in which the <ph conref="../conrefs.dita#prod/productshortname"></ph> engine is embedded</li>
+in the application in which the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> engine is embedded</li>
 </ul></p>
 <p>See the "<ph conref="../conrefs.dita#prod/productshortname"></ph> properties"
 section of the <ph conref="../conrefs.dita#pub/citref"></ph> for information

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop824451.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop824451.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop824451.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop824451.dita Tue Nov 12 14:21:52 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="cdevsetprop824451">
 <title>Scope of properties</title>
+<shortdesc>You use properties to configure a
+<ph conref="../conrefs.dita#prod/productshortname"></ph> system, database, or
+conglomerate.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>properties<indexterm>scope of</indexterm></indexterm>
@@ -27,9 +30,6 @@ limitations under the License.
 </metadata>
 </prolog>
 <conbody>
-<p>You use properties to configure a
-<ph conref="../conrefs.dita#prod/productshortname"></ph> system, database, or
-conglomerate.
 <ul>
 <li><i>system-wide</i>  
 <p>Most properties can be set on a <i>system-wide</i> basis; that is, you set a
@@ -42,7 +42,7 @@ system, see <xref href="cdevdvlp27610.di
 <p>Some properties can also be set on a <i>database-wide</i> basis. That is, the
 property is true for the selected database only and not for the other databases
 in the system unless it is set individually within each of them.</p></li>
-</ul></p>
+</ul>
 <p>For properties that affect conglomerates, changing the value of such
 properties affects only conglomerates that are created after the change.
 Conglomerates created earlier are unaffected.</p>

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop824500.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop824500.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop824500.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop824500.dita Tue Nov 12 14:21:52 2013
@@ -18,6 +18,8 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevsetprop824500">
 <title>Persistence of properties</title>
+<shortdesc>A database-wide property always has persistence. That is, its value
+is stored in the database.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>Properties<indexterm>persistence of</indexterm></indexterm>
@@ -25,10 +27,10 @@ limitations under the License.
 </metadata>
 </prolog>
 <conbody>
-<p>A database-wide property always has persistence. That is, its value is
-stored in the database. Typically, it is in effect until you explicitly change
+<p>Typically, a database-wide property is in effect until you explicitly change
 the property or until you set a system-wide property with precedence over
-database-wide properties (see <xref href="cdevsetprop23308.dita#cdevsetprop23308"/>).</p>
+database-wide properties (see
+<xref href="cdevsetprop23308.dita#cdevsetprop23308"/>).</p>
 <p>To disable or turn off a database-wide property setting, set its value to
 null. This has the effect of removing the property from the list of database
 properties and restoring the system property setting, if there is one (and if

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop824533.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop824533.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop824533.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop824533.dita Tue Nov 12 14:21:52 2013
@@ -18,6 +18,10 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevsetprop824533">
 <title>Protection of database-wide properties</title>
+<shortdesc>There is one important exception to the search order for properties
+described above: When you set the <i>derby.database.propertiesOnly</i> property
+to <i>true</i>, database-wide properties cannot be overridden by system-wide
+properties.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>derby.database.propertiesOnly</indexterm>
@@ -27,13 +31,10 @@ embedded environment</indexterm></indext
 </metadata>
 </prolog>
 <conbody>
-<p>There is one important exception to the search order for properties described
-above: When you set the <i>derby.database.propertiesOnly</i> property
-to <i>true</i>, database-wide properties cannot be overridden
-by system-wide properties.</p>
 <p>This property ensures that a database's environment cannot be modified
 by the environment in which it is booted. Any application running in an embedded
-environment can set this property to <codeph>true</codeph> for security reasons.</p>
+environment can set this property to <codeph>true</codeph> for security
+reasons.</p>
 <p>See the "<ph conref="../conrefs.dita#prod/productshortname"></ph> properties"
 section of the <ph conref="../conrefs.dita#pub/citref"></ph> for details on the
 <i>derby.database.propertiesOnly</i> property.</p>

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop824615.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop824615.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop824615.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop824615.dita Tue Nov 12 14:21:52 2013
@@ -18,6 +18,12 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevsetprop824615">
 <title>Dynamic versus static properties</title>
+<shortdesc>Most properties are dynamic; that means you can set them while
+<ph conref="../conrefs.dita#prod/productshortname"></ph> is running, and their
+values change without requiring a reboot of
+<ph conref="../conrefs.dita#prod/productshortname"></ph>. In some cases, this
+change takes place immediately; in some cases, it takes place at the next
+connection.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>Static properties</indexterm>
@@ -27,12 +33,10 @@ limitations under the License.
 </metadata>
 </prolog>
 <conbody>
-<p>Most properties are dynamic; that means you can set them while <ph conref="../conrefs.dita#prod/productshortname"></ph> is
-running, and their values change without requiring a reboot of <ph conref="../conrefs.dita#prod/productshortname"></ph>.
-In some cases, this change takes place immediately; in some cases, it takes
-place at the next connection.</p>
 <p>Some properties are static, which means changes to their values will not
-take effect while <ph conref="../conrefs.dita#prod/productshortname"></ph> is running. You must restart or set them before
-(or while) starting <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
-<p>For more information, see <xref href="cdevsetprop44147.dita#cdevsetprop44147"/>.</p>
+take effect while <ph conref="../conrefs.dita#prod/productshortname"></ph> is
+running. You must restart or set them before (or while) starting
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
+<p>For more information, see
+<xref href="cdevsetprop44147.dita#cdevsetprop44147"/>.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop824983.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop824983.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop824983.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop824983.dita Tue Nov 12 14:21:52 2013
@@ -18,12 +18,11 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevsetprop824983">
 <title>Verifying system properties</title>
-<prolog>
-</prolog>
-<conbody>
-<p>You can find out the value of a system property if you set it
+<shortdesc>You can find out the value of a system property if you set it
 programmatically. You cannot find out the value of a system property if you set
-it in the <i>derby.properties</i> file.</p>
+it in the <i>derby.properties</i> file.</shortdesc>
+<prolog></prolog>
+<conbody>
 <p>For example, if you set the value of the
 <codeph>derby.storage.pageSize</codeph> system-wide property in your program or
 on the command line, the following code will retrieve its value from the System

Modified: db/derby/docs/trunk/src/devguide/cdevspecial45786.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevspecial45786.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial45786.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial45786.dita Tue Nov 12 14:21:52 2013
@@ -22,7 +22,7 @@ limitations under the License.
 <title>User-defined SQLExceptions</title>
 <shortdesc>When the execution of a database-side method raises an error, <ph
 conref="../conrefs.dita#prod/productshortname"></ph> wraps that exception
-in an <i>SQLException</i> with an <codeph><i>SQLState</i></codeph> of 38000.</shortdesc>
+in an <i>SQLException</i> with an <i>SQLState</i> of 38000.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>SQLExceptions<indexterm>user-defined (38001-38999)</indexterm></indexterm>
 </keywords>

Modified: db/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Tue Nov 12 14:21:52 2013
@@ -2005,9 +2005,9 @@ with updatable result sets"></topicref>
 </topicref>
 </topicref>
 <topicref href="tdevcsecurenewkeyoverview.dita" navtitle="Encrypting databases with a new key">
-<topicref href="tdevcsecurenewbootpw.dita" linking="sourceonly" navtitle="Encrypting databases with a new boot password">
+<topicref href="tdevcsecurenewbootpw.dita" navtitle="Encrypting databases with a new boot password">
 </topicref>
-<topicref href="tdevcsecurenewextkey.dita" linking="sourceonly" navtitle="Encrypting databases with a new external key">
+<topicref href="tdevcsecurenewextkey.dita" navtitle="Encrypting databases with a new external key">
 </topicref>
 </topicref>
 <topicref href="cdevcsecure60146.dita" navtitle="Booting an encrypted database">

Modified: db/derby/docs/trunk/src/devguide/rdevadvjdbc965.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevadvjdbc965.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevadvjdbc965.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevadvjdbc965.dita Tue Nov 12 14:21:52 2013
@@ -18,6 +18,8 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rdevadvjdbc965">
 <title>DriverPropertyInfo array example</title>
+<shortdesc>The following code shows how to use a <i>DriverPropertyInfo</i>
+array.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>getpropertyinfo<indexterm>using</indexterm></indexterm>
@@ -25,12 +27,12 @@ limitations under the License.
 </metadata>
 </prolog>
 <refbody>
-<section><p>Here is some example code:</p></section><example>
+<example>
 <codeblock>import java.sql.*;
 import java.util.Properties;
-<b>// start with the least amount of information
-// to see the full list of choices
-// we could also enter with a URL and Properties
+<b>// Start with the least amount of information
+// to see the full list of choices.
+// We could also enter with a URL and Properties
 // provided by a user.</b>
 String url = "jdbc:derby:";
 Properties info = new Properties();
@@ -39,13 +41,13 @@ for (;;)
         {
         DriverPropertyInfo[] attributes = cDriver.getPropertyInfo(
             url, info);
-        <b> // zero length means a connection attempt can be made</b>
+        <b> // Zero length means a connection attempt can be made</b>
         if (attributes.length == 0)
         break;
-<b>        // insert code here to process the array, e.g.,
+<b>        // Insert code here to process the array; for example,
         // display all options in a GUI and allow the user to
         // pick and then set the attributes in info or URL.</b>
         }
-<b>// try the connection</b>
+<b>// Try the connection</b>
 Connection conn = DriverManager.getConnection(url, info);</codeblock></example>
 </refbody></reference>

Modified: db/derby/docs/trunk/src/devguide/rdevconcepts38274.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevconcepts38274.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevconcepts38274.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevconcepts38274.dita Tue Nov 12 14:21:52 2013
@@ -18,6 +18,8 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rdevconcepts38274">
 <title>Extended updatable result set example</title>
+<shortdesc>The following code example shows how to program updatable result
+sets.</shortdesc>
 <prolog>
 </prolog>
 <refbody><example>
@@ -58,7 +60,6 @@ uprs.close();
 stmt.close();
 <b>// Close connection if the application does not need it any more</b>
 conn.close();
-
 </codeblock>
 </example>
 </refbody></reference>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure871406.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevcsecure871406.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure871406.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure871406.dita Tue Nov 12 14:21:52 2013
@@ -20,14 +20,15 @@ limitations under the License.
 -->
 <reference id="rdevcsecure871406" xml:lang="en-us">
 <title>Java security policy file example 1</title>
+<shortdesc>This security policy file grants permission to run
+<ph conref="../conrefs.dita#prod/productshortname"></ph> and access all
+databases under the <ph conref="../conrefs.dita#prod/productshortname"></ph>
+system home when it is specified by the system property
+<i>derby.system.home</i>.</shortdesc>
 <prolog></prolog>
 <refbody>
-<example> <codeblock><b>/* Grants permission to run <ph conref="../conrefs.dita#prod/productshortname"></ph> and access all       */
-/* databases under the <ph conref="../conrefs.dita#prod/productshortname"></ph> system home               */
-/* when it is specified by the system property         */
-/* derby.system.home                                   */
-
-/* Note derby.system.home must be an absolute pathname */</b>
+<example>
+<codeblock><b>/* Note derby.system.home must be an absolute pathname */</b>
 
 grant codeBase "file://f:/<ph conref="../conrefs.dita#prod/productlowercase"></ph>/lib/derby.jar" {
 

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure871422.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevcsecure871422.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure871422.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure871422.dita Tue Nov 12 14:21:52 2013
@@ -20,13 +20,14 @@ limitations under the License.
 -->
 <reference id="rdevcsecure871422" xml:lang="en-us">
 <title>Java security policy file example 2</title>
+<shortdesc>This security policy file grants permission to run
+<ph conref="../conrefs.dita#prod/productshortname"></ph> and access all
+databases under the <ph conref="../conrefs.dita#prod/productshortname"></ph>
+system home when it defaults to the current directory.</shortdesc>
 <prolog></prolog>
 <refbody>
-<example> <codeblock><b>/* Grants permission to run <ph conref="../conrefs.dita#prod/productshortname"></ph> and access all */
-/* databases under the <ph conref="../conrefs.dita#prod/productshortname"></ph> system home         */
-/* when it defaults to the current directory     */</b>
-
-grant codeBase "file://f:/<ph conref="../conrefs.dita#prod/productlowercase"></ph>/lib/derby.jar" {
+<example>
+<codeblock>grant codeBase "file://f:/<ph conref="../conrefs.dita#prod/productlowercase"></ph>/lib/derby.jar" {
   permission java.lang.RuntimePermission "createClassLoader";
   permission java.util.PropertyPermission "derby.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure871439.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevcsecure871439.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure871439.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure871439.dita Tue Nov 12 14:21:52 2013
@@ -20,12 +20,15 @@ limitations under the License.
 -->
 <reference id="rdevcsecure871439" xml:lang="en-us">
 <title>Java security policy file example 3</title>
+<shortdesc>This security policy file grants permission to run
+<ph conref="../conrefs.dita#prod/productshortname"></ph> and access a single
+database (salesdb) under the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> system
+home.</shortdesc>
 <prolog></prolog>
 <refbody>
-<example> <codeblock><b>/* Grants permission to run <ph conref="../conrefs.dita#prod/productshortname"></ph> and access a single  */
-/* database (salesdb) under the <ph conref="../conrefs.dita#prod/productshortname"></ph> system home      */
-
-/* Note derby.system.home must be an absolute pathname */</b>
+<example>
+<codeblock><b>/* Note derby.system.home must be an absolute pathname */</b>
 
 grant codeBase "file://f:/<ph conref="../conrefs.dita#prod/productlowercase"></ph>/lib/derby.jar" {
 

Modified: db/derby/docs/trunk/src/devguide/rdevdeploy856845.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevdeploy856845.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdeploy856845.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdeploy856845.dita Tue Nov 12 14:21:52 2013
@@ -20,6 +20,8 @@ limitations under the License.
 -->
 <reference id="rdevdeploy856845" xml:lang="en-us">
 <title>Installing jar files</title>
+<shortdesc>The following examples show how to use the
+<codeph>sqlj.install_jar</codeph> procedure.</shortdesc>
 <prolog></prolog>
 <refbody>
 <example> <codeblock><b>-- SQL  statement</b>

Modified: db/derby/docs/trunk/src/devguide/rdevdeploy856880.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevdeploy856880.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdeploy856880.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdeploy856880.dita Tue Nov 12 14:21:52 2013
@@ -20,6 +20,8 @@ limitations under the License.
 -->
 <reference id="rdevdeploy856880" xml:lang="en-us">
 <title>Removing jar files</title>
+<shortdesc>The following example shows how to use the
+<codeph>sqlj.remove_jar</codeph> procedure.</shortdesc>
 <prolog></prolog>
 <refbody>
 <example> <codeblock><b>-- SQL  statement</b>

Modified: db/derby/docs/trunk/src/devguide/rdevdeploy856912.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevdeploy856912.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdeploy856912.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdeploy856912.dita Tue Nov 12 14:21:52 2013
@@ -20,6 +20,8 @@ limitations under the License.
 -->
 <reference id="rdevdeploy856912" xml:lang="en-us">
 <title>Replacing jar files</title>
+<shortdesc>The following example shows how to use the
+<codeph>sqlj.replace_jar</codeph> procedure.</shortdesc>
 <prolog></prolog>
 <refbody>
 <example> <codeblock><b>-- SQL  statement</b>

Modified: db/derby/docs/trunk/src/devguide/rdevdeploy856948.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevdeploy856948.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdeploy856948.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdeploy856948.dita Tue Nov 12 14:21:52 2013
@@ -18,10 +18,9 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
 <reference xml:lang="en-us" id="rdevdeploy856948">
 <title>Jar file examples</title>
-<prolog>
-</prolog>
+<shortdesc>See "System procedures for storing jar files in a database" in the
+<ph conref="../conrefs.dita#pub/citref"></ph> for reference information about
+the jar file system procedures and complete syntax.</shortdesc>
+<prolog></prolog>
 <refbody>
-<section><p>See the <ph conref="../conrefs.dita#pub/citref"></ph> for reference
-information about the jar file system procedures and complete syntax.</p>
-</section>
 </refbody></reference>

Modified: db/derby/docs/trunk/src/devguide/tdevcsecurenewbootpw.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevcsecurenewbootpw.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevcsecurenewbootpw.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevcsecurenewbootpw.dita Tue Nov 12 14:21:52 2013
@@ -20,9 +20,10 @@ limitations under the License.
 -->
 <task id="tdevcsecurenewbootpw" xml:lang="en-us">
 <title>Encrypting databases with a new boot password</title>
-<shortdesc>You can apply a new boot password to a <ph conref="../conrefs.dita#prod/productshortname"></ph> database
-by specifying the <i>newBootPassword=newPassword</i> attribute on the connection
-URL when you boot the database.</shortdesc>
+<shortdesc>You can apply a new boot password to a
+<ph conref="../conrefs.dita#prod/productshortname"></ph> database by specifying
+the <i>newBootPassword=newPassword</i> attribute on the connection URL when you
+boot the database.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>encrypting databases<indexterm>new boot password</indexterm></indexterm>
 <indexterm>databases<indexterm>encrypting, new boot password</indexterm></indexterm>
@@ -41,10 +42,10 @@ recovery, the database cannot be encrypt
 </ul></prereq>
 <context><p>When you use the <i>newBootPassword=newPassword</i> attribute, a new
 encryption key is generated internally by the engine, and the key is protected
-using the new boot password. The newly generated encryption key encrypts the database,
-including the existing data. You cannot change the encryption provider or
-encryption algorithm when you apply a new boot password.</p><p>To encrypt
-a database  with a new boot password:</p></context>
+using the new boot password. The newly generated encryption key encrypts the
+database, including the existing data. You cannot change the encryption provider
+or encryption algorithm when you apply a new boot password.</p>
+<p>To encrypt a database  with a new boot password:</p></context>
 <steps>
 <step><cmd>Specify the <i>newBootPassword=newPassword</i> attribute in a URL and
 reboot the database.</cmd>

Modified: db/derby/docs/trunk/src/devguide/tdevcsecurenewextkey.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevcsecurenewextkey.dita?rev=1541073&r1=1541072&r2=1541073&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevcsecurenewextkey.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevcsecurenewextkey.dita Tue Nov 12 14:21:52 2013
@@ -20,9 +20,10 @@ limitations under the License.
 -->
 <task id="tdevcsecurenewextkey" xml:lang="en-us">
 <title>Encrypting databases with a new external encryption key</title>
-<shortdesc>You can apply a new external encryption key to a <ph conref="../conrefs.dita#prod/productshortname"></ph> database
-by specifying the <i>newEncryptionKey=key</i> attribute on the connection URL
-when you boot the database.</shortdesc>
+<shortdesc>You can apply a new external encryption key to a
+<ph conref="../conrefs.dita#prod/productshortname"></ph> database by specifying
+the <i>newEncryptionKey=key</i> attribute on the connection URL when you boot
+the database.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>encrypting databases<indexterm>new external key</indexterm></indexterm>
 <indexterm>databases<indexterm>encrypting, new external key</indexterm></indexterm>
@@ -40,7 +41,8 @@ recovery, the database cannot be encrypt
 <i>newBootPassword=newPassword</i> attribute</xref> to encrypt the
 database.</li>
 </ul></prereq>
-<context><p>To encrypt a database with a new external encryption key:</p></context>
+<context><p>To encrypt a database with a new external encryption key:</p>
+</context>
 <steps>
 <step><cmd>Specify the <i>newEncryptionKey=key</i> attribute in a URL and reboot
 the database.</cmd><stepxmp>For example, if you use the following URL to reboot



Mime
View raw message