You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ch...@apache.org on 2011/04/29 18:57:57 UTC
svn commit: r1097886 - /db/derby/docs/branches/10.8/src/devguide/
Author: chaase3
Date: Fri Apr 29 16:57:57 2011
New Revision: 1097886
URL: http://svn.apache.org/viewvc?rev=1097886&view=rev
Log:
DERBY-5184 Tables in documentation need introductions and formatting fixes
Merged DERBY-5184-dev.diff to 10.8 code branch from trunk revision 1097882.
Modified:
db/derby/docs/branches/10.8/src/devguide/cdevcollation.dita
db/derby/docs/branches/10.8/src/devguide/cdevconcepts15366.dita
db/derby/docs/branches/10.8/src/devguide/cdevconcepts29416.dita
db/derby/docs/branches/10.8/src/devguide/cdevdvlp40724.dita
db/derby/docs/branches/10.8/src/devguide/cdevsetprop24843.dita
db/derby/docs/branches/10.8/src/devguide/cdevspecialtfgetxxx.dita
db/derby/docs/branches/10.8/src/devguide/rdevconcepts2462.dita
db/derby/docs/branches/10.8/src/devguide/rdevconcepts713.dita
db/derby/docs/branches/10.8/src/devguide/rdevconcepts8424.dita
db/derby/docs/branches/10.8/src/devguide/rdevcsecure190.dita
db/derby/docs/branches/10.8/src/devguide/rdevcsecure557.dita
db/derby/docs/branches/10.8/src/devguide/tdevupgradedb.dita
Modified: db/derby/docs/branches/10.8/src/devguide/cdevcollation.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/cdevcollation.dita?rev=1097886&r1=1097885&r2=1097886&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/cdevcollation.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/cdevcollation.dita Fri Apr 29 16:57:57 2011
@@ -47,7 +47,7 @@ one character at a time for non-metachar
way <ph conref="../conrefs.dita#prod/productshortname"></ph> processes = comparisons.
The comparisons with the = operator compare the entire character string on
left side of the = operator with the entire character string on the right
-side of the = operator. See the <xref href="#cdevcollation/territorylike"></xref> section
+side of the = operator. See the <xref href="cdevcollation.dita#cdevcollation/territorylike"></xref> section
below.</note></section>
<section><title>Territory-based collation</title><p><ph conref="../conrefs.dita#prod/productshortname"></ph> also
supports the ability to define collation rules that are appropriate to a territory,
@@ -71,13 +71,16 @@ processing overhead to all character-bas
<section><title>Database attributes that control collation</title><p>When
you create a <ph conref="../conrefs.dita#prod/productshortname"></ph> database,
the attributes that you set determine the collation that is used with all
-of character data in the database. For example: <table><title>The create database
-attributes that control collation</title>
-<tgroup cols="2"><colspec colname="col1"/><colspec colname="col2"/>
+of character data in the database. The following table shows some examples.</p>
+<table>
+<title>The create database attributes that control collation</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="70*"/>
+<colspec colname="col2" colnum="2" colwidth="30*"/>
<thead>
<row valign="bottom">
-<entry colname="col1">Example create commands</entry>
-<entry colname="col2">Collation is driven by</entry>
+<entry colname="col1">Example Create URLs</entry>
+<entry colname="col2">Collation Is Driven By</entry>
</row>
</thead>
<tbody>
@@ -92,17 +95,17 @@ default collation for <ph conref="../con
is not set.</entry>
</row>
<row>
-<entry colname="col1">jdbc:derby:abcDB;create=true;collation=TERRITORY_BASED </entry>
+<entry colname="col1">jdbc:derby:abcDB;create=true;collation=TERRITORY_BASED</entry>
<entry colname="col2">The territory of the JVM, since the <codeph>territory</codeph> attribute
is not set. <note type="tip">To determine the territory of the JVM, run <codeph>Locale.getDefault()</codeph>.</note></entry>
</row>
<row>
-<entry colname="col1">jdbc:derby:abcDB;create=true;territory=es_MX;collation=TERRITORY_BASED </entry>
+<entry colname="col1">jdbc:derby:abcDB;create=true;territory=es_MX;collation=TERRITORY_BASED</entry>
<entry colname="col2">The <codeph>territory</codeph> attribute.</entry>
</row>
</tbody>
</tgroup>
-</table></p></section>
+</table></section>
<section><title>Collation examples</title><p>With Unicode codepoint collation
(UCS_BASIC), the numerical values of the Unicode encoding of the characters
are used directly for ordering. For example, the FRUIT table contains the NAME
Modified: db/derby/docs/branches/10.8/src/devguide/cdevconcepts15366.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/cdevconcepts15366.dita?rev=1097886&r1=1097885&r2=1097886&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/cdevconcepts15366.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/cdevconcepts15366.dita Fri Apr 29 16:57:57 2011
@@ -26,7 +26,7 @@ for a connection allows a user to specif
should be isolated from other transactions.</shortdesc>
<prolog><metadata>
<keywords><indexterm>Transaction anomalies in generic database systems<indexterm>description</indexterm></indexterm>
-<indexterm>Dirty reads<indexterm>definition</indexterm></indexterm><indexterm>Non-repeatable
+<indexterm>Dirty reads<indexterm>definition</indexterm></indexterm><indexterm>Nonrepeatable
reads<indexterm>definition</indexterm></indexterm><indexterm>Phantom reads<indexterm>definition</indexterm></indexterm>
<indexterm>TRANSACTION_SERIALIZABLE isolation level</indexterm><indexterm>TRANSACTION_REPEATABLE
_READ isolation level</indexterm><indexterm>TRANSACTION_READ _COMMITTED isolation
@@ -57,19 +57,20 @@ if you use the SET ISOLATION statement.
the active transaction only if the call to <i>Connection.setTransactionIsolation</i>
actually changes the isolation level.</p>
<p>The names of the isolation levels are
-different, depending on whether you use a JDBC method or SQL statement. <xref
-href="#cdevconcepts15366/cdevconceptsiso_level"></xref> shows the equivalent
-names for isolation levels whether they are set through the JDBC method or
-an SQL statement.</p>
-<table frame="all" id="cdevconceptsiso_level"><title>Mapping of JDBC transaction
-isolation levels to <ph conref="../conrefs.dita#prod/productshortname"></ph> isolation
+different, depending on whether you use a JDBC method or SQL statement. The
+following table shows the equivalent names for isolation levels whether they are
+set through the JDBC method or an SQL statement.</p>
+<table frame="all">
+<title>Mapping of JDBC transaction isolation levels to
+<ph conref="../conrefs.dita#prod/productshortname"></ph> isolation
levels</title>
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="colspec0" colwidth="260*"/>
-<colspec colname="colspec1" colwidth="186*"/>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="colspec0" colnum="1" colwidth="67*"/>
+<colspec colname="colspec1" colnum="2" colwidth="33*"/>
<thead>
-<row>
-<entry align="left" valign="top">Isolation levels for JDBC</entry>
-<entry align="left" valign="top">Isolation levels for SQL</entry>
+<row valign="bottom">
+<entry colname="colspec0">Isolation Levels for JDBC</entry>
+<entry colname="colspec1">Isolation Levels for SQL</entry>
</row>
</thead>
<tbody>
@@ -97,19 +98,21 @@ levels</title>
</tgroup>
</table>
<p>These levels allow you to avoid particular kinds of transaction anomalies,
-which are described in <xref href="cdevconcepts15366.dita#cdevconcepts15366/cdevconcepts17741"></xref>.</p>
-<table frame="all" id="cdevconcepts17741"><title>Transaction Anomalies</title>
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="48*"/>
-<colspec colname="2" colnum="2" colwidth="51*"/>
+which are described in the following table.</p>
+<table frame="all" id="cdevconcepts17741">
+<title>Transaction anomalies</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="1" colnum="1" colwidth="50*"/>
+<colspec colname="2" colnum="2" colwidth="50*"/>
<thead>
-<row>
+<row valign="bottom">
<entry colname="1">Anomaly</entry>
-<entry align="left" colname="2" valign="bottom">Example</entry>
+<entry colname="2">Example</entry>
</row>
</thead>
<tbody>
<row>
-<entry colname="1">Dirty Reads <p>A dirty read happens when a transaction
+<entry colname="1"><i>Dirty Reads</i> <p>A dirty read happens when a transaction
reads data that is being modified by another transaction that has not yet
committed.</p></entry>
<entry colname="2">Transaction A begins. <codeblock>UPDATE employee SET salary = 31650
@@ -117,9 +120,9 @@ WHERE empno = '000090'</codeblock> Trans
B sees data updated by transaction A. Those updates have not yet been committed.)</entry>
</row>
<row>
-<entry colname="1">Non-Repeatable Reads <p>Non-repeatable reads happen when
+<entry colname="1"><i>Nonrepeatable Reads</i> <p>Nonrepeatable reads happen when
a query returns data that would be different if the query were repeated within
-the same transaction. Non-repeatable reads can occur when other transactions
+the same transaction. Nonrepeatable reads can occur when other transactions
are modifying data that a transaction is reading.</p></entry>
<entry colname="2">Transaction A begins. <codeblock>SELECT * FROM employee
WHERE empno = '000090' </codeblock> Transaction B begins. <codeblock>UPDATE employee SET salary = 30100
@@ -128,7 +131,7 @@ A before transaction A commits.) If Tran
the results will be different.</entry>
</row>
<row>
-<entry colname="1">Phantom Reads <p>Records that appear in a set being read
+<entry colname="1"><i>Phantom Reads</i> <p>Records that appear in a set being read
by another transaction. Phantom reads can occur when other transactions insert
rows that would satisfy the WHERE clause of another transaction's statement.</p></entry>
<entry colname="2">Transaction A begins. <codeblock>SELECT * FROM employee
@@ -148,19 +151,19 @@ of data locked by a particular transacti
schema might also affect whether these anomalies are allowed. A DBMS can lock
either the entire table or only specific rows in order to prevent transaction
anomalies.</p>
-<p><xref href="cdevconcepts15366.dita#cdevconcepts15366/cdevconcepts28076"></xref> shows
-which anomalies are possible under the various locking schemas and isolation
-levels.</p>
-<table frame="all" id="cdevconcepts28076"><title>When Transaction Anomalies
-Are Possible</title>
-<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="55*"/>
-<colspec colname="2" colnum="2" colwidth="20*"/><colspec colname="3" colnum="3"
-colwidth="21*"/>
+<p>The following table shows which anomalies are possible under the various
+locking schemas and isolation levels.</p>
+<table frame="all">
+<title>When transaction anomalies are possible</title>
+<tgroup cols="3" colsep="1" rowsep="1">
+<colspec colname="1" colnum="1" colwidth="50*"/>
+<colspec colname="2" colnum="2" colwidth="25*"/>
+<colspec colname="3" colnum="3" colwidth="25*"/>
<thead>
-<row>
-<entry align="left" colname="1" valign="bottom">Isolation Level</entry>
-<entry align="left" colname="2" valign="bottom">Table-Level Locking</entry>
-<entry align="left" colname="3" valign="bottom">Row-Level Locking</entry>
+<row valign="bottom">
+<entry colname="1">Isolation Level</entry>
+<entry colname="2">Table-Level Locking</entry>
+<entry colname="3">Row-Level Locking</entry>
</row>
</thead>
<tbody>
@@ -198,13 +201,14 @@ all the transaction anomalies listed in
occurring. The type of lock it issues is sometimes called a <i>range lock</i>.</p></li>
<li><codeph>TRANSACTION_REPEATABLE_READ</codeph> <p><codeph>RS</codeph> from
SQL.</p> <p><i>TRANSACTION_REPEATABLE_READ</i> means that <ph conref="../conrefs.dita#prod/productshortname"></ph> issues
-locks to prevent only dirty reads and non-repeatable reads, but not phantoms.
+locks to prevent only dirty reads and nonrepeatable reads, but not phantoms.
It does not issue range locks for selects.</p></li>
<li><codeph>TRANSACTION_READ_COMMITTED</codeph> <p><codeph>CS</codeph> or <codeph>CURSOR
STABILITY</codeph> from SQL.</p> <p><i>TRANSACTION_READ_COMMITTED</i> means
that <ph conref="../conrefs.dita#prod/productshortname"></ph> issues locks
to prevent only dirty reads, not all the transaction anomalies listed in <xref
-href="#cdevconcepts15366/cdevconcepts17741"></xref>.</p> <p><i>TRANSACTION_READ_COMMITTED</i> is
+href="cdevconcepts15366.dita#cdevconcepts15366/cdevconcepts17741"></xref>.</p>
+<p><i>TRANSACTION_READ_COMMITTED</i> is
the default isolation level for transactions.</p></li>
<li><codeph>TRANSACTION_READ_UNCOMMITTED</codeph> <p><codeph>UR</codeph>, <codeph>DIRTY
READ</codeph>, or <codeph>READ UNCOMMITTED</codeph> from SQL.</p> <p>For a
Modified: db/derby/docs/branches/10.8/src/devguide/cdevconcepts29416.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/cdevconcepts29416.dita?rev=1097886&r1=1097885&r2=1097886&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/cdevconcepts29416.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/cdevconcepts29416.dita Fri Apr 29 16:57:57 2011
@@ -68,16 +68,21 @@ all statements that access tables hold a
locks prevent other transactions that update data from accessing the table.
A transaction holds a lock on a table until the transaction commits. <i>So
even a SELECT statement holds a shared lock on a table until its connection
-commits and a new transaction begins. </i></p><table frame="all"><title>Summary
-of Application Behavior with Auto-Commit On or Off</title>
-<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="46*"/>
-<colspec colname="2" colnum="2" colwidth="24*"/><colspec colname="3" colnum="3"
-colwidth="25*"/>
+commits and a new transaction begins. </i></p></li>
+</ul>
+<p>The following table summarizes how applications behave with auto-commit on
+or off.</p>
+<table frame="all">
+<title>Application behavior with auto-commit on or off</title>
+<tgroup cols="3" colsep="1" rowsep="1">
+<colspec colname="1" colnum="1" colwidth="40*"/>
+<colspec colname="2" colnum="2" colwidth="30*"/>
+<colspec colname="3" colnum="3" colwidth="30*"/>
<thead>
-<row>
-<entry align="left" colname="1" valign="bottom">Topic</entry>
-<entry align="left" colname="2" valign="bottom">Auto-Commit On</entry>
-<entry align="left" colname="3" valign="bottom">Auto-Commit Off</entry>
+<row valign="bottom">
+<entry colname="1">Topic</entry>
+<entry colname="2">Auto-Commit On</entry>
+<entry colname="3">Auto-Commit Off</entry>
</row>
</thead>
<tbody>
@@ -114,7 +119,6 @@ isolation mode and table-level locking.<
</row>
</tbody>
</tgroup>
-</table></li>
-</ul>
+</table>
</conbody>
</concept>
Modified: db/derby/docs/branches/10.8/src/devguide/cdevdvlp40724.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/cdevdvlp40724.dita?rev=1097886&r1=1097885&r2=1097886&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/cdevdvlp40724.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/cdevdvlp40724.dita Fri Apr 29 16:57:57 2011
@@ -35,8 +35,7 @@ in Derby</indexterm><indexterm>tables<in
</metadata></prolog>
<conbody>
<note>An in-memory database does not use the file system, but the size limits
-listed in the table
-<xref href="cdevdvlp40724.dita#cdevdvlp40724/cdevdvlp85623"></xref> still
+listed in the table later in this topic still
apply. For some limits, the maximum value is determined by the available main
memory instead of the available disk space and file system limitations.</note>
<p>A database directory contains the following, as shown in the following
@@ -72,14 +71,16 @@ few limitations on the number and size o
The following table shows some size limitations of
<ph conref="../conrefs.dita#prod/productshortname"></ph> databases
and database objects.</p>
-<table id="cdevdvlp85623"><title>Size limits for
-<ph conref="../conrefs.dita#prod/productshortname"></ph> database objects</title>
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="40*"/>
+<table>
+<title>Size limits for <ph conref="../conrefs.dita#prod/productshortname"></ph>
+database objects</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="1" colnum="1" colwidth="40*"/>
<colspec colname="2" colnum="2" colwidth="60*"/>
<thead>
-<row>
-<entry align="left" colname="1" valign="bottom">Type of Object</entry>
-<entry align="left" colname="2" valign="bottom">Limit</entry>
+<row valign="bottom">
+<entry colname="1">Type of Object</entry>
+<entry colname="2">Limit</entry>
</row>
</thead>
<tbody>
Modified: db/derby/docs/branches/10.8/src/devguide/cdevsetprop24843.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/cdevsetprop24843.dita?rev=1097886&r1=1097885&r2=1097886&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/cdevsetprop24843.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/cdevsetprop24843.dita Fri Apr 29 16:57:57 2011
@@ -31,15 +31,16 @@ the <i>derby.properties</i> file, the fi
<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>Summary of ways to set properties</title>
+<title>Ways to set properties</title>
<tgroup cols="2" colsep="1" rowsep="1">
-<colspec colnum="1" colname="1" colwidth="37*"/>
-<colspec colnum="2" colname="2" colwidth="63*"/>
+<colspec colname="1" colnum="1" colwidth="37*"/>
+<colspec colname="2" colnum="2" colwidth="63*"/>
<thead>
-<row>
-<entry colname="1">Type of property</entry>
-<entry colname="2">How you set it</entry></row>
+<row valign="bottom">
+<entry colname="1">Type of Property</entry>
+<entry colname="2">How You Set It</entry></row>
</thead>
<tbody>
<row>
Modified: db/derby/docs/branches/10.8/src/devguide/cdevspecialtfgetxxx.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/cdevspecialtfgetxxx.dita?rev=1097886&r1=1097885&r2=1097886&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/cdevspecialtfgetxxx.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/cdevspecialtfgetxxx.dita Fri Apr 29 16:57:57 2011
@@ -39,9 +39,9 @@ slightly different. This is because JSR
<p>The following table lists the preferred <i>getXXX()</i> method for each
<ph conref="../conrefs.dita#prod/productshortname"></ph> data type.</p>
-<table id="cdevspecialtftab1">
+<table frame="all">
-<title><i>getXXX()</i> Methods Called for Declared SQL Types</title>
+<title><i>getXXX()</i> methods called for declared SQL types</title>
<tgroup cols="3" colsep="1" rowsep="1">
<colspec colname="1" colnum="1" colwidth="50*"/>
@@ -49,10 +49,10 @@ slightly different. This is because JSR
<colspec colname="3" colnum="3" colwidth="25*"/>
<thead>
-<row>
-<entry align="left" colname="1" valign="bottom">Column Type Declared by CREATE FUNCTION</entry>
-<entry align="left" colname="2" valign="bottom"><i>getXXX()</i> Method Called by <ph conref="../conrefs.dita#prod/productshortname"></ph> for JDBC 3.0 and 4.0</entry>
-<entry align="left" colname="3" valign="bottom"><i>getXXX()</i> Method Called by <ph conref="../conrefs.dita#prod/productshortname"></ph> for JSR 169</entry>
+<row valign="bottom">
+<entry colname="1">Column Type Declared by CREATE FUNCTION</entry>
+<entry colname="2"><i>getXXX()</i> Method Called by <ph conref="../conrefs.dita#prod/productshortname"></ph> for JDBC 3.0 and 4.0</entry>
+<entry colname="3"><i>getXXX()</i> Method Called by <ph conref="../conrefs.dita#prod/productshortname"></ph> for JSR 169</entry>
</row>
</thead>
Modified: db/derby/docs/branches/10.8/src/devguide/rdevconcepts2462.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/rdevconcepts2462.dita?rev=1097886&r1=1097885&r2=1097886&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/rdevconcepts2462.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/rdevconcepts2462.dita Fri Apr 29 16:57:57 2011
@@ -23,12 +23,15 @@ limitations under the License.
types. "Yes" means that the lock types are compatible, while "No" means that
they are incompatible.</shortdesc>
<refbody>
-<table frame="all" id="cdevconceptslock_mtrx"><title>Lock Compatibility Matrix</title>
-<tgroup cols="4" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="29*"/>
-<colspec colname="2" colnum="2" colwidth="24*"/><colspec colname="3" colnum="3"
-colwidth="24*"/><colspec colname="4" colnum="4" colwidth="24*"/>
+<table frame="all">
+<title>Lock Compatibility Matrix</title>
+<tgroup cols="4" colsep="1" rowsep="1">
+<colspec colname="1" colnum="1" colwidth="28*"/>
+<colspec colname="2" colnum="2" colwidth="24*"/>
+<colspec colname="3" colnum="3" colwidth="24*"/>
+<colspec colname="4" colnum="4" colwidth="24*"/>
<thead>
-<row>
+<row valign="bottom">
<entry colname="1">Lock Type</entry>
<entry colname="2">Shared</entry>
<entry colname="3">Update</entry>
@@ -38,21 +41,21 @@ colwidth="24*"/><colspec colname="4" col
<tbody>
<row>
<entry colname="1"><b>Shared</b></entry>
-<entry colname="2"> <p>Yes</p></entry>
-<entry colname="3"> <p>Yes</p></entry>
-<entry colname="4"> <p>No</p></entry>
+<entry colname="2">Yes</entry>
+<entry colname="3">Yes</entry>
+<entry colname="4">No</entry>
</row>
<row>
<entry colname="1"><b>Update</b></entry>
-<entry colname="2"> <p>Yes</p></entry>
-<entry colname="3"> <p>No</p></entry>
-<entry colname="4"> <p>No</p></entry>
+<entry colname="2">Yes</entry>
+<entry colname="3">No</entry>
+<entry colname="4">No</entry>
</row>
<row>
<entry colname="1"><b>Exclusive</b></entry>
-<entry colname="2"> <p>No</p></entry>
-<entry colname="3"> <p>No</p></entry>
-<entry colname="4"> <p>No</p></entry>
+<entry colname="2">No</entry>
+<entry colname="3">No</entry>
+<entry colname="4">No</entry>
</row>
</tbody>
</tgroup>
Modified: db/derby/docs/branches/10.8/src/devguide/rdevconcepts713.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/rdevconcepts713.dita?rev=1097886&r1=1097885&r2=1097886&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/rdevconcepts713.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/rdevconcepts713.dita Fri Apr 29 16:57:57 2011
@@ -34,24 +34,28 @@ to server</indexterm></indexterm></keywo
<li>Multiple applications access a single database (possible only when <ph
conref="../conrefs.dita#prod/productshortname"></ph> is running inside a server
framework).</li>
-<li>A single application has more than one <i>Connection</i> to the same database.
- <p>The way you deploy <ph conref="../conrefs.dita#prod/productshortname"></ph> affects
-the ways applications can use multi-threading and connections, as shown in <xref
-href="rdevconcepts713.dita#rdevconcepts713/cdevconcepts40343"></xref>.</p><table
-frame="all" id="cdevconcepts40343"><title>Threading and Connection Modes</title>
-<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="36*"/>
-<colspec colname="2" colnum="2" colwidth="37*"/><colspec colname="3" colnum="3"
-colwidth="27*"/>
+<li>A single application has more than one <i>Connection</i> to the same
+database.</li>
+</ul>
+<p>The way you deploy <ph conref="../conrefs.dita#prod/productshortname"></ph>
+affects the ways applications can use multi-threading and connections, as shown
+in the following table.</p>
+<table frame="all">
+<title>Threading and connection modes</title>
+<tgroup cols="3" colsep="1" rowsep="1">
+<colspec colname="1" colnum="1" colwidth="34*"/>
+<colspec colname="2" colnum="2" colwidth="33*"/>
+<colspec colname="3" colnum="3" colwidth="33*"/>
<thead>
-<row>
-<entry colname="1">Connection mode</entry>
-<entry align="left" colname="2" valign="bottom">Embedded</entry>
-<entry align="left" colname="3" valign="bottom">Server</entry>
+<row valign="bottom">
+<entry colname="1">Connection Mode</entry>
+<entry colname="2">Embedded</entry>
+<entry colname="3">Server</entry>
</row>
</thead>
<tbody>
<row>
-<entry colname="1"><p><i>Multi-Threaded</i></p><p>From an application, using
+<entry colname="1"><i>Multi-Threaded</i> <p>From an application, using
a <i>single</i> <codeph><i>Connection</i></codeph> to a <ph conref="../conrefs.dita#prod/productshortname"></ph> database
and issuing requests against that connection in multiple threads.</p></entry>
<entry colname="2">Supply a single <i>Connection</i> object to separate threads. <ph
@@ -62,7 +66,7 @@ manage multi-threaded operations..</entr
Remote client applications can multi-thread if desired.</entry>
</row>
<row>
-<entry colname="1"><p><i>Multi-Connection</i></p><p>From an application, using
+<entry colname="1"><i>Multi-Connection</i> <p>From an application, using
multiple connections to a <ph conref="../conrefs.dita#prod/productshortname"></ph> database
and issuing requests against those connections on multiple threads.</p></entry>
<entry colname="2">Create individual connections within a single application
@@ -73,7 +77,7 @@ conref="../conrefs.dita#prod/productshor
desired.</entry>
</row>
<row>
-<entry colname="1"><p><i>Multi-User</i></p><p>Multiple applications (or JVMs)
+<entry colname="1"><i>Multi-User</i> <p>Multiple applications (or JVMs)
accessing the same <ph conref="../conrefs.dita#prod/productshortname"></ph> database.
Each user application has its own connection or connections to the database.</p></entry>
<entry colname="2">Not possible. Only one application can access a database
@@ -88,7 +92,6 @@ the same database at the same time throu
</row>
</tbody>
</tgroup>
-</table></li>
-</ul></section>
+</table></section>
</refbody>
</reference>
Modified: db/derby/docs/branches/10.8/src/devguide/rdevconcepts8424.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/rdevconcepts8424.dita?rev=1097886&r1=1097885&r2=1097886&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/rdevconcepts8424.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/rdevconcepts8424.dita Fri Apr 29 16:57:57 2011
@@ -71,25 +71,28 @@ just the actual rows it returns in the r
rows between those two values to prevent another transaction from inserting,
deleting, or updating a row within that range.</p><p>An index must be available
for a range lock. If one is not available, <ph conref="../conrefs.dita#prod/productshortname"></ph> locks
-the entire table.</p><table frame="all" id="cdevconcepts15873"><title>Types
-and scopes of locking</title>
-<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="1159*"/>
-<colspec colname="2" colnum="2" colwidth="979*"/><colspec colname="3" colnum="3"
-colwidth="1759*"/>
+the entire table.</p>
+<p>The following table summarizes the types and scopes of locking.</p>
+<table frame="all">
+<title>Types and scopes of locking</title>
+<tgroup cols="3" colsep="1" rowsep="1">
+<colspec colname="1" colnum="1" colwidth="60*"/>
+<colspec colname="2" colnum="2" colwidth="20*"/>
+<colspec colname="3" colnum="3" colwidth="20*"/>
<thead>
-<row>
-<entry align="left" colname="1" valign="bottom">Transaction Isolation Level</entry>
-<entry align="left" colname="2" valign="bottom">Table-Level Locking</entry>
-<entry align="left" colname="3" valign="bottom">Row-Level Locking</entry>
+<row valign="bottom">
+<entry colname="1">Transaction Isolation Level</entry>
+<entry colname="2">Table-Level Locking</entry>
+<entry colname="3">Row-Level Locking</entry>
</row>
</thead>
<tbody>
<row>
-<entry colname="1">Connection.TRANSACTION_READ_UNCOMMITED (SQL: UR)</entry>
+<entry colname="1">Connection.TRANSACTION_READ_UNCOMMITTED (SQL: UR)</entry>
<entry colname="2">For SELECT statements, table-level locking is never requested
using this isolation level. For other statements, same as for TRANSACTION_READ_COMMITTED.</entry>
<entry colname="3">SELECT statements get no locks. For other statements, same
-as for TRANSACTION_ READ_COMMITTED.</entry>
+as for TRANSACTION_READ_COMMITTED.</entry>
</row>
<row>
<entry colname="1">Connection.TRANSACTION_READ_COMMITTED (SQL: CS) </entry>
Modified: db/derby/docs/branches/10.8/src/devguide/rdevcsecure190.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/rdevcsecure190.dita?rev=1097886&r1=1097885&r2=1097886&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/rdevcsecure190.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/rdevcsecure190.dita Fri Apr 29 16:57:57 2011
@@ -30,17 +30,17 @@ by the type of access that users have to
<section>The following table lists the actions that users can perform based
on the type of access that a user is granted on a database. These actions
apply to regular databases, source databases, and target databases.</section>
-<table frame="all" id="cdevcsecure20486"><title>Actions that are authorized
-by type of access</title>
+<table frame="all">
+<title>Actions that are authorized by type of access</title>
<tgroup cols="3" colsep="1" rowsep="1">
<colspec colname="1" colnum="1" colwidth="50*"/>
<colspec colname="2" colnum="2" colwidth="25*"/>
<colspec colname="3" colnum="3" colwidth="25*"/>
<thead>
-<row>
-<entry align="left" colname="1" valign="bottom">Action</entry>
-<entry align="left" colname="2" valign="bottom">Read-only access</entry>
-<entry align="left" colname="3" valign="bottom">Full access </entry>
+<row valign="bottom">
+<entry colname="1">Action</entry>
+<entry colname="2">Read-only access</entry>
+<entry colname="3">Full access </entry>
</row>
</thead>
<tbody>
Modified: db/derby/docs/branches/10.8/src/devguide/rdevcsecure557.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/rdevcsecure557.dita?rev=1097886&r1=1097885&r2=1097886&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/rdevcsecure557.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/rdevcsecure557.dita Fri Apr 29 16:57:57 2011
@@ -20,19 +20,22 @@ limitations under the License.
-->
<reference id="rdevcsecure557" xml:lang="en-us">
<title>List of user authentication properties</title>
-<shortdesc>This table summarizes the various properties related to user authentication.</shortdesc>
+<shortdesc>The following table summarizes the various properties related to user
+authentication.</shortdesc>
<prolog><metadata>
<keywords><indexterm><indexterm>user authentication</indexterm>properties,
list of</indexterm></keywords>
</metadata></prolog>
<refbody>
-<table frame="all" id="cdevcsecure27690"><title>User authentication properties</title>
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="53*"/>
+<table frame="all">
+<title>User authentication properties</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="1" colnum="1" colwidth="53*"/>
<colspec colname="2" colnum="2" colwidth="45*"/>
<thead>
-<row>
-<entry align="left" colname="1" valign="bottom">Property Name</entry>
-<entry align="left" colname="2" valign="bottom">Use</entry>
+<row valign="bottom">
+<entry colname="1">Property Name</entry>
+<entry colname="2">Use</entry>
</row>
</thead>
<tbody>
Modified: db/derby/docs/branches/10.8/src/devguide/tdevupgradedb.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/tdevupgradedb.dita?rev=1097886&r1=1097885&r2=1097886&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/tdevupgradedb.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/tdevupgradedb.dita Fri Apr 29 16:57:57 2011
@@ -49,17 +49,37 @@ not be available to you until you perfor
</ul></p></context>
<steps>
<step><cmd>To upgrade the database, select the type of upgrade that you want
-to perform:</cmd>
-<choicetable>
-<chhead><choptionhd>Type of upgrade</choptionhd><chdeschd>Action</chdeschd>
-</chhead>
-<chrow><choption>Full upgrade</choption><chdesc>Connect to the database using
-the <codeph>upgrade=true</codeph> database connection URL attribute. For example:<codeblock>jdbc:derby:sample;upgrade=true</codeblock></chdesc>
-</chrow>
-<chrow><choption>Soft upgrade</choption><chdesc>Connect to the database. For
-example: <codeblock>connect 'jdbc:derby:sample'</codeblock>In this example, <codeph>sample</codeph> is
-a database from a previous version of Derby.</chdesc></chrow>
-</choicetable>
+to perform. The following table shows the upgrade types.</cmd>
+<info>
+<table>
+<title>Upgrade types</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Type of Upgrade</entry>
+<entry colname="col2">Action</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">Full upgrade</entry>
+<entry colname="col2">Connect to the database using the
+<codeph>upgrade=true</codeph> database connection URL attribute. For example:
+<codeblock>jdbc:derby:sample;upgrade=true</codeblock></entry>
+</row>
+<row>
+<entry colname="col1">Soft upgrade</entry>
+<entry colname="col2">Connect to the database. For example:
+<codeblock>connect 'jdbc:derby:sample'</codeblock>
+In this example, <codeph>sample</codeph> is a database from a previous version
+of <ph conref="../conrefs.dita#prod/productshortname"></ph>.</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</info>
</step>
</steps>
</taskbody>