db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r432721 [1/2] - in /db/derby/docs/branches/10.2/src: adminguide/ devguide/ pt_BR/ref/ ref/ tuning/
Date Fri, 18 Aug 2006 20:49:55 GMT
Author: rhillegas
Date: Fri Aug 18 13:49:52 2006
New Revision: 432721

URL: http://svn.apache.org/viewvc?rev=432721&view=rev
Log:
DERBY-1725: Commit derby-1725-mergeDocs-430831-to-432716.diff. This merges documentation changes from the mainline to the 10.2 trunk from 430831 through 432716. This includes patches to the following JIRAs: DERBY-931 DERBY-1549 DERBY-1570 DERBY-1057 DERBY-1548 DERBY-1551.

Added:
    db/derby/docs/branches/10.2/src/adminguide/cadminappsdiffsreadonly.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/adminguide/cadminappsdiffsreadonly.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecuregrantrevokeaccess.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/devguide/cdevcsecuregrantrevokeaccess.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncacos.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffuncacos.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncasin.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffuncasin.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncatan.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffuncatan.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncceil.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffuncceil.dita
    db/derby/docs/branches/10.2/src/ref/rreffunccos.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffunccos.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncdegrees.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffuncdegrees.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncexp.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffuncexp.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncfloor.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffuncfloor.dita
    db/derby/docs/branches/10.2/src/ref/rreffunclog.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffunclog.dita
    db/derby/docs/branches/10.2/src/ref/rreffunclog10.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffunclog10.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncpi.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffuncpi.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncradians.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffuncradians.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncsin.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffuncsin.dita
    db/derby/docs/branches/10.2/src/ref/rreffunctan.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rreffunctan.dita
    db/derby/docs/branches/10.2/src/ref/rrefsistabssyscolperms.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rrefsistabssyscolperms.dita
    db/derby/docs/branches/10.2/src/ref/rrefsistabssysroutineperms.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rrefsistabssysroutineperms.dita
    db/derby/docs/branches/10.2/src/ref/rrefsistabssystableperms.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rrefsistabssystableperms.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqljgrant.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rrefsqljgrant.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqljrevoke.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/ref/rrefsqljrevoke.dita
    db/derby/docs/branches/10.2/src/tuning/rtunpropersqlauth.dita
      - copied unchanged from r432716, db/derby/docs/trunk/src/tuning/rtunpropersqlauth.dita
Removed:
    db/derby/docs/branches/10.2/src/devguide/rdevcsecure131.dita
    db/derby/docs/branches/10.2/src/devguide/rdevcsecure935.dita
Modified:
    db/derby/docs/branches/10.2/src/adminguide/cadminapps810777.dita
    db/derby/docs/branches/10.2/src/adminguide/derbyadmin.ditamap
    db/derby/docs/branches/10.2/src/adminguide/radminapps810699.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecure36595.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecure42374.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecure865818.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecure865880.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecure866060.dita
    db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap
    db/derby/docs/branches/10.2/src/devguide/rdevcsecure190.dita
    db/derby/docs/branches/10.2/src/devguide/rdevcsecure379.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsqlj81859.dita
    db/derby/docs/branches/10.2/src/ref/refderby.ditamap
    db/derby/docs/branches/10.2/src/ref/rrefexcept71493.dita
    db/derby/docs/branches/10.2/src/ref/rrefjavcsro.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc80004.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc88908.dita
    db/derby/docs/branches/10.2/src/ref/rrefsistabs12085.dita
    db/derby/docs/branches/10.2/src/ref/rrefsistabs12813.dita
    db/derby/docs/branches/10.2/src/ref/rrefsistabs22441.dita
    db/derby/docs/branches/10.2/src/ref/rrefsistabs24045.dita
    db/derby/docs/branches/10.2/src/ref/rrefsistabs24269.dita
    db/derby/docs/branches/10.2/src/ref/rrefsistabs26665.dita
    db/derby/docs/branches/10.2/src/ref/rrefsistabs28114.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj43125.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj55788.dita
    db/derby/docs/branches/10.2/src/tuning/ctunproper22250.dita
    db/derby/docs/branches/10.2/src/tuning/tuningderby.ditamap

Modified: db/derby/docs/branches/10.2/src/adminguide/cadminapps810777.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/cadminapps810777.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/cadminapps810777.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/cadminapps810777.dita Fri Aug 18 13:49:52 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 

Modified: db/derby/docs/branches/10.2/src/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/derbyadmin.ditamap?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/derbyadmin.ditamap (original)
+++ db/derby/docs/branches/10.2/src/adminguide/derbyadmin.ditamap Fri Aug 18 13:49:52 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+ 
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
  "map.dtd">
 <!-- 
@@ -139,6 +139,8 @@
 in Derby"></topicref>
 <topicref href="tadminapps811695.dita" navtitle="Enabling the encrypted user ID and password security mechanism">
 </topicref>
+</topicref>
+<topicref href="cadminappsdiffsreadonly.dita" navtitle="Differences using the Connection.setReadOnly method">
 </topicref>
 </topicref>
 <topicref href="tadminappssettingportnumbers.dita" navtitle="Setting port numbers">

Modified: db/derby/docs/branches/10.2/src/adminguide/radminapps810699.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/radminapps810699.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/radminapps810699.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/radminapps810699.dita Fri Aug 18 13:49:52 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 

Modified: db/derby/docs/branches/10.2/src/devguide/cdevcsecure36595.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevcsecure36595.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecure36595.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecure36595.dita Fri Aug 18 13:49:52 2006
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -19,16 +18,87 @@
 limitations under the License.
 -->
 <concept id="cdevcsecure36595" xml:lang="en-us">
-<title>User authorization</title>
-<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> provides
-user authorization, which is a means of granting users permission to access
-a database (or system).</shortdesc>
+<title>User authorizations</title>
+<shortdesc>When you specify user authorizations, <ph conref="devconrefs.dita#prod/productshortname"></ph> verifies
+that a user has been granted permission to access a system, database, object,
+or SQL action. </shortdesc>
 <prolog><metadata>
-<keywords><indexterm>User authorization</indexterm><indexterm>Authorization</indexterm>
-</keywords>
+<keywords><indexterm>user authorizations<indexterm>overview</indexterm></indexterm>
+<indexterm>authorizations<indexterm>users, overview</indexterm><indexterm>properties<indexterm>derby.database.defaultConnectionMode</indexterm></indexterm
+><indexterm>properties<indexterm>derby.database.sqlAuthorization</indexterm></indexterm><indexterm>properties<indexterm>derby.database.fullAccessUsers</indexterm
+></indexterm><indexterm>properties<indexterm>derby.database.readOnlyAccessUsers</indexterm></indexterm><indexterm>derby.database.defaultConnectionMode
+property<indexterm>description</indexterm></indexterm><indexterm>derby.database.sqlAuthorization
+property<indexterm>description</indexterm></indexterm></indexterm><indexterm>derby.database.fullAccessUsers
+property<indexterm>description</indexterm></indexterm><indexterm>derby.database.readOnlyAccessUsers
+property<indexterm>description</indexterm></indexterm><indexterm>user authorizations<indexterm>changing
+properties</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> allows you to
-distinguish between full (read-write) access and read-only access.</p>
+<p>There are two types of user authorization in <ph conref="devconrefs.dita#prod/productshortname"></ph>,
+connection authorization and SQL authorization. <term>Connection authorization</term> specifies
+the access that users have to connect to a system or database. <term>SQL authorization</term> controls
+the permissions that users have on database objects or for SQL actions. You
+can set the user authorization properties in <ph conref="devconrefs.dita#prod/productshortname"></ph> as
+system-level properties or database-level properties.</p>
+<p>Set system-level user authorizations when you are developing applications,
+or when you want to specify a secure default authorization for all users to
+connect to all of the databases in the system.</p>
+<p>There are several properties that you can set to control database-level
+user authorizations. Some of the properties are general properties that set
+the access mode for all users. Other properties are user specific properties
+that set the type of access for specific user IDs.</p>
+<p>The properties that affect authorization are:<ul>
+<li> The <codeph>derby.database.defaultConnectionMode</codeph> property controls
+the default access mode. Use the <codeph>derby.database.defaultConnectionMode</codeph> property
+to specify the default connection access that users have when they connect
+to the database. If you do not explicitly set the <codeph>derby.database.defaultConnectionMode</codeph> property,
+the default user authorization for a database is <varname>fullAccess</varname>,
+which is read-write access.</li>
+<li>The <codeph>derby.database.sqlAuthorization</codeph> property enables
+SQL standard authorization. Use the <codeph>derby.database.sqlAuthorization</codeph> property
+to specify if object owners can grant and revoke permission for users to perform
+SQL actions on database objects. The default setting for the <codeph>derby.database.sqlAuthorization</codeph> property
+is <varname>FALSE</varname>. When the <codeph>derby.database.sqlAuthorization</codeph> property
+is set to <varname>TRUE</varname>, object owners can use the GRANT and REVOKE
+SQL statements to set the user permissions for specific database objects or
+for specific SQL actions. </li>
+<li>The <codeph>derby.database.fullAccessUsers</codeph> and <codeph>derby.database.readOnlyAccessUsers</codeph> properties
+are user specific properties. Use these properties to specify the user IDs
+that have read-write access and read-only access to a database.</li>
+</ul></p>
+<p>If you do not specify the user authorizations for a specific user ID, the
+user ID inherits whatever authorization is set as the default user authorization
+for the database.</p>
+<note type="tip">If you set the <codeph>derby.database.defaultConnectionMode</codeph> property
+to <varname>noAccess</varname> or <varname>readOnlyAccess</varname>, you should
+allow at least one user read-write access. Otherwise, depending on the default
+connection authorization you specify, you will configure the database so that
+it cannot be accessed or changed.</note>
+<section><title>How user authorization properties work together</title><p>The <codeph>derby.database.defaultConnectionMode</codeph> property
+and the <codeph>derby.database.sqlAuthorization</codeph> property work together.
+The default settings for these properties allow anyone to access and drop
+the database objects that you create. You can change the default access mode
+by specifying different settings for these properties.<ul>
+<li>When the <codeph>derby.database.sqlAuthorization</codeph> property is <varname>FALSE</varname>,
+the ability to read from or write to database objects is determined by the
+setting for the <codeph>derby.database.defaultConnectionMode</codeph> property.
+If the <codeph>derby.database.defaultConnectionMode</codeph> property is set
+to <varname>readOnlyAccess</varname>, users can access all of the database
+objects but they cannot update or drop the objects. </li>
+<li>When the <codeph>derby.database.sqlAuthorization</codeph> property is <varname>TRUE</varname>,
+the ability to read from or write to database objects is further restricted
+to the owner of the database objects. The owner must grant permission for
+others to access the database objects. No one but the owner of an object or
+the database owner can drop the object. </li>
+<li>The access mode specified for the <codeph>derby.database.defaultConnectionMode</codeph> property
+overrides the permissions that are granted by the owner of a database object.
+For example, if a user is granted INSERT privileges on a table but the user
+only has read-only connection authorization, the user cannot insert data into
+the table.</li>
+</ul></p></section>
+<section><title>Changes to connection authorization settings</title><p>Connection
+authorization properties are fixed for the duration of a connection. If you
+change the connection authorization properties during a connection, those
+changes are not in affect until you establish a new connection.</p></section>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.2/src/devguide/cdevcsecure42374.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevcsecure42374.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecure42374.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecure42374.dita Fri Aug 18 13:49:52 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -21,28 +21,30 @@
 <concept id="cdevcsecure42374" xml:lang="en-us">
 <title>Working with user authentication</title>
 <shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> provides
-support for user authentication. <i>User authentication</i> means that <ph
-conref="devconrefs.dita#prod/productshortname"></ph> authenticates a user's
-name and password before allowing that user access to the system.</shortdesc>
+support for user authentication. <term>User authentication</term> means that <ph
+conref="devconrefs.dita#prod/productshortname"></ph> authenticates the name
+and password for a user before allowing that user access to the system.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>User authentication</indexterm><indexterm>Authentication</indexterm>
+<keywords><indexterm>user authentication<indexterm>overview</indexterm></indexterm>
+<indexterm>authentication<indexterm>users, overview</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
 <p>When user authentication is enabled (which it is not by default), the user
 requesting a connection must provide a valid name and password, which <ph
 conref="devconrefs.dita#prod/productshortname"></ph> verifies against the
-repository of users defined for the system. Once <ph conref="devconrefs.dita#prod/productshortname"></ph> authenticates
+repository of users defined for the system. After <ph conref="devconrefs.dita#prod/productshortname"></ph> authenticates
 the user, it grants the user access to the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
 but not necessarily access to the database made in the connection request.
 In the <ph conref="devconrefs.dita#prod/productshortname"></ph> system, access
-to a database is determined by <i>user authorization</i>.</p>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> allows you to
-provide a repository of users in a number of different ways. For example,
+to a database is determined by <xref href="cdevcsecure36595.dita#cdevcsecure36595">user
+authorization</xref>.</p>
+<p>For user authentication, <ph conref="devconrefs.dita#prod/productshortname"></ph> allows
+you to provide a repository of users in a number of different ways. For example,
 you can hook <ph conref="devconrefs.dita#prod/productshortname"></ph> up to
-an external directory service elsewhere in your enterprise, create your own,
-use <ph conref="devconrefs.dita#prod/productshortname"></ph>'s simple mechanism
-for creating a built-in repository of users.</p>
+an external directory service elsewhere in your enterprise, create your own
+directory service, or use <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+simple mechanism for creating a built-in repository of users.</p>
 <p>You can define a repository of users for a particular database or for an
 entire system, depending on whether you use system-wide or database-wide properties.</p>
 <p>When <ph conref="devconrefs.dita#prod/productshortname"></ph> user authentication

Modified: db/derby/docs/branches/10.2/src/devguide/cdevcsecure865818.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevcsecure865818.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecure865818.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecure865818.dita Fri Aug 18 13:49:52 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -19,21 +19,43 @@
 limitations under the License.
 -->
 <concept id="cdevcsecure865818" xml:lang="en-us">
-<title>Setting the default access mode</title>
-<shortdesc>To specify the default access mode for the database, use the <i>derby.database.defaultConnectionMode</i> property.</shortdesc>
+<title>Setting the default connection access mode</title>
+<shortdesc>Use the <codeph>derby.database.defaultConnectionMode</codeph> property
+to specify the default type of access that users have when they connect to
+the database.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Databases<indexterm>controlling access to</indexterm></indexterm>
+<keywords><indexterm>databases<indexterm>controlling access to</indexterm></indexterm>
+<indexterm>derby.database.ConnectionMode property</indexterm><indexterm><indexterm>properties</indexterm>defaultConnectionMode</indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>You can set the property to the following values:</p>
-<ul>
-<li><i>noAccess</i></li>
-<li><i>readOnlyAccess</i></li>
-<li><i>fullAccess</i> (the default)</li>
-</ul>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> validates the
-authorization configuration properties when users set them. It raises an exception
-if a user attempts to set the properties to invalid values. </p>
+<p>The valid settings for the <codeph>derby.database.defaultConnectionMode</codeph> property
+are:<ul>
+<li><varname>noAccess</varname></li>
+<li><varname>readOnlyAccess</varname></li>
+<li><varname>fullAccess</varname></li>
+</ul></p>
+<p>If you do not specify a setting for the <codeph>derby.database.defaultConnectionMode</codeph> property,
+the default access setting is <varname>fullAccess</varname>.</p>
+<p>To set the default connection access mode, specify the access in a CALL
+statement. For example:</p>
+<p>To specify read-write access for the system administrator userID <codeph>sa</codeph> and
+the read-only as the default access for anyone else who connects to the database,
+issue these CALL statements:<codeblock>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+    'derby.database.fullAccessUsers', 'sa')
+
+CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+    'derby.database.defaultConnectionMode',
+    'readOnlyAccess')
+</codeblock></p>
+<p>To specify read-write access for the user ID Fred and no access for other
+users, issue these CALL statements:</p>
+<codeblock>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+    'derby.database.fullAccessUsers', 'Fred')
+
+CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+    'derby.database.defaultConnectionMode',
+    'noAccess')
+</codeblock>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.2/src/devguide/cdevcsecure865880.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevcsecure865880.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecure865880.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecure865880.dita Fri Aug 18 13:49:52 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -19,29 +19,31 @@
 limitations under the License.
 -->
 <concept id="cdevcsecure865880" xml:lang="en-us">
-<title>Setting the access mode for particular users</title>
-<shortdesc>To specify which particular users have full (read-write) access
-to a database, use the <i>derby.database.fullAccessUsers</i> property.</shortdesc>
+<title>Setting the user authorizations for individual users</title>
+<shortdesc>Use the <codeph>derby.database.fullAccessUsers</codeph> and <codeph>derby.database.readOnlyAccessUsers</codeph> properties
+to specify the user IDs that have read-write access and read-only access to
+a database.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Access<indexterm>full (read-write) versus read-only</indexterm></indexterm>
+<keywords><indexterm>databases<indexterm>access for individual users, setting </indexterm></indexterm>
+<indexterm>derby.database.fullAccessUsers property</indexterm><indexterm><indexterm>properties</indexterm>derby.database.fullAccessUsers</indexterm>
+<indexterm>derby.database.readOnlyAccessUsers property</indexterm><indexterm><indexterm>properties</indexterm>derby.database.readOnlyAccessUsers</indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>For example:</p>
-<codeblock>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
-    'derby.database.fullAccessUsers', 'sa,mary')</codeblock>
-<p>To specify which particular users have read-only access to a database,
-use the <i>derby.database.readOnlyAccessUsers</i> property. For example:</p>
-<codeblock>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
-    'derby.database.readOnlyAccessUsers', 'guest,"Fred!"')</codeblock>
-<p>For these properties, you specify users as a comma-separated list (no spaces
-between the comma and the next user).</p>
-<p>For users not specified with either property the access is specified by
-the <i>derby.database.defaultConnectionMode</i> property.</p>
-<note>It is possible to configure a database so that it cannot be changed
-(or even accessed) using the <i>derby.database.defaultConnectionMode</i> property.
-If you set this property to <codeph><i>noAccess</i></codeph> or <codeph><i>readOnlyAccess</i></codeph>,
-be sure to allow at least one user full access.</note>
-<p>See the Javadoc for the utility for more details.</p>
+<p>You can specify multiple user IDs by using a comma-separated list, with
+no spaces between the comma and the next user ID.</p>
+<p>To set the user authorizations for individual users, specify the access
+in a CALL statement. For example:</p>
+<p>To specify read-write access for the system administrator user ID <codeph>sa</codeph> and
+for the user ID <codeph>maria</codeph>, issue this CALL statement:<codeblock>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+    'derby.database.fullAccessUsers', 'sa,maria')
+</codeblock></p>
+<p>To specify read-only access for a guest user ID and for Fred, issue this
+CALL statement:<codeblock>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+    'derby.database.readOnlyAccessUsers', 'guest,Fred')</codeblock></p>
+<p>To specify read-write access for the user ID "Elena!", use delimited identifiers
+for the user ID. For example: <codeblock>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+    'derby.database.fullAccessUsers', '"Elena!"')
+</codeblock></p>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.2/src/devguide/cdevcsecure866060.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevcsecure866060.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecure866060.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecure866060.dita Fri Aug 18 13:49:52 2006
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -19,22 +18,38 @@
 limitations under the License.
 -->
 <concept id="cdevcsecure866060" xml:lang="en-us">
-<title>Setting user authorization</title>
-<shortdesc>Typically, you configure user authorization for a particular database.
-However, <ph conref="devconrefs.dita#prod/productshortname"></ph> also allows
-you to configure user authorization for the system, which is useful during
-development and for specifying a secure default access for all databases in
-the system.</shortdesc>
+<title>Setting the SQL standard authorization mode</title>
+<shortdesc>Use the <codeph>derby.database.sqlAuthorization</codeph> property
+to enable SQL standard authorization.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>User authorization<indexterm>for databases</indexterm></indexterm>
+<keywords><indexterm>databases<indexterm>SQL standard authorization, setting</indexterm></indexterm>
+<indexterm>derby.database.sqlAuthorization property</indexterm><indexterm><indexterm>properties</indexterm>derby.database.sqlAuthorization</indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>To control access to a particular database, set database-level properties
-that specify which users have full (read-write) access to the database and
-which users have read-only access to the database. Users not specified by
-either property inherit the default access for the database (none, read-only,
-or full read-write access). When not explicitly set, the default access for
-a database is full (read-write) access.</p>
+<p>The <codeph>derby.database.sqlAuthorization</codeph> property controls
+the ability for object owners to grant and revoke permission for users to
+perform actions on database objects. </p>
+<p>The valid settings for the <codeph>derby.database.sqlAuthorization</codeph> property
+are:<ul>
+<li><varname>TRUE</varname></li>
+<li><varname>FALSE</varname></li>
+</ul>The default setting for the <codeph>derby.database.sqlAuthorization</codeph> property
+is <varname>FALSE</varname>.</p>
+<p>After you set the <codeph>derby.database.sqlAuthorization</codeph> property
+to <varname>TRUE</varname>, you cannot set the property back to <varname>FALSE</varname>.</p>
+<p>You can set the <codeph>derby.database.sqlAuthorization</codeph> property
+as a system property or as a database property. If you set this property as
+a system property before you create the databases, all new databases will
+automatically have SQL authorization enabled. If the databases already exists,
+you can set this property only as a database property.</p>
+<p>To enable SQL standard authorization for the entire system, set the <codeph>derby.database.sqlAuthorization</codeph> property
+as a system property:<codeblock><b>derby.database.sqlAuthorization=true</b></codeblock></p>
+<p>To enable SQL standard authorization for a specific database, set the <codeph>derby.database.sqlAuthorization</codeph> property
+as a database property:</p>
+<codeblock>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+    'derby.database.sqlAuthorization',
+    'true')
+</codeblock>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap Fri Aug 18 13:49:52 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
  "map.dtd">
-<!--  
+<!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
@@ -865,7 +865,8 @@
 </topicref>
 </relcell>
 <relcell>
-<topicref href="cdevconcepts28351.dita" navtitle="Updatable result sets"></topicref>
+<topicref href="cdevconcepts28351.dita" navtitle="Updatable result sets">
+</topicref>
 <topicref href="cdevconcepts23987.dita" navtitle="Result sets and auto-commit">
 </topicref>
 <topicref href="cdevconcepts22641.dita" navtitle="Scrollable result sets">
@@ -876,7 +877,8 @@
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cdevconcepts28351.dita" navtitle="Updatable result sets"></topicref>
+<topicref href="cdevconcepts28351.dita" navtitle="Updatable result sets">
+</topicref>
 </relcell>
 <relcell>
 <topicref href="cdevconcepts23987.dita" navtitle="Result sets and auto-commit">
@@ -1173,7 +1175,7 @@
 </topicref>
 <topicref href="cdevcsecure37241.dita" navtitle="Users and authorization identifiers">
 </topicref>
-<topicref href="cdevcsecure36595.dita" navtitle="User authorization"></topicref>
+<topicref href="cdevcsecure36595.dita" navtitle="User authorizations"></topicref>
 <topicref href="cdevcsecure24366.dita" navtitle="Encrypting databases on disk">
 </topicref>
 <topicref href="cdevcsecure90988.dita" navtitle="Signed jar files"></topicref>
@@ -1195,7 +1197,7 @@
 <relcell>
 <topicref href="cdevcsecure42374.dita" navtitle="Working with user authentication">
 </topicref>
-<topicref href="cdevcsecure36595.dita" navtitle="User authorization"></topicref>
+<topicref href="cdevcsecure36595.dita" navtitle="User authorizations"></topicref>
 </relcell>
 </relrow>
 <relrow>
@@ -1206,7 +1208,7 @@
 <relcell>
 <topicref href="cdevcsecure37241.dita" navtitle="Users and authorization identifiers">
 </topicref>
-<topicref href="cdevcsecure36595.dita" navtitle="User authorization"></topicref>
+<topicref href="cdevcsecure36595.dita" navtitle="User authorizations"></topicref>
 <topicref href="cdevcsecure24366.dita" navtitle="Encrypting databases on disk">
 </topicref>
 <topicref href="cdevcsecure90988.dita" navtitle="Signed jar files"></topicref>
@@ -1224,21 +1226,19 @@
 </topicref>
 </relcell>
 <relcell>
-<topicref href="cdevcsecure36595.dita" navtitle="User authorization"></topicref>
+<topicref href="cdevcsecure36595.dita" navtitle="User authorizations"></topicref>
 <topicref href="cdevcsecure24366.dita" navtitle="Encrypting databases on disk">
 </topicref>
 <topicref href="cdevcsecure90988.dita" navtitle="Signed jar files"></topicref>
 <topicref href="cdevcsecure10983.dita" navtitle="Notes on the Derby security features">
 </topicref>
-<topicref href="cdevcsecure51876.dita" navtitle="User authentication and authorization examples">
-</topicref>
 <topicref href="cdevcbabejdfj.dita" navtitle="Running Derby under a security manager">
 </topicref>
 </relcell>
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cdevcsecure36595.dita" navtitle="User authorization"></topicref>
+<topicref href="cdevcsecure36595.dita" navtitle="User authorizations"></topicref>
 </relcell>
 <relcell>
 <topicref href="cdevcsecure24366.dita" navtitle="Encrypting databases on disk">
@@ -1246,8 +1246,6 @@
 <topicref href="cdevcsecure90988.dita" navtitle="Signed jar files"></topicref>
 <topicref href="cdevcsecure10983.dita" navtitle="Notes on the Derby security features">
 </topicref>
-<topicref href="cdevcsecure51876.dita" navtitle="User authentication and authorization examples">
-</topicref>
 <topicref href="cdevcbabejdfj.dita" navtitle="Running Derby under a security manager">
 </topicref>
 </relcell>
@@ -1509,13 +1507,15 @@
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cdevcsecure865818.dita" navtitle="Setting the default access mode">
+<topicref href="cdevcsecure865818.dita" navtitle="Setting the default connection access mode">
 </topicref>
 </relcell>
 <relcell>
-<topicref href="cdevcsecure865880.dita" navtitle="Setting the access mode for particular users">
+<topicref href="cdevcsecure865880.dita" navtitle="Setting the user authorizations for individual users">
 </topicref>
-<topicref href="rdevcsecure935.dita" navtitle="Notes on user authorization">
+<topicref href="cdevcsecure865880.dita" navtitle="Setting the user authorizations for individual users">
+</topicref>
+<topicref href="cdevcsecuregrantrevokeaccess.dita" navtitle="SQL standard authorization">
 </topicref>
 <topicref href="rdevcsecure379.dita" navtitle="User authorization exceptions">
 </topicref>
@@ -1523,49 +1523,49 @@
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cdevcsecure865880.dita" navtitle="Setting the access mode for particular users">
+<topicref href="cdevcsecure865880.dita" navtitle="Setting the user authorizations for individual users">
 </topicref>
 </relcell>
 <relcell>
-<topicref href="rdevcsecure935.dita" navtitle="Notes on user authorization">
+<topicref href="cdevcsecure865818.dita" navtitle="Setting the default connection access mode">
 </topicref>
-<topicref href="rdevcsecure379.dita" navtitle="User authorization exceptions">
+<topicref href="cdevcsecure865880.dita" navtitle="Setting the user authorizations for individual users">
 </topicref>
-<topicref href="rdevcsecure131.dita" navtitle="Examples of user authorization">
+<topicref href="rdevcsecure379.dita" navtitle="User authorization exceptions">
 </topicref>
 </relcell>
 </relrow>
 <relrow>
 <relcell>
-<topicref href="rdevcsecure935.dita" navtitle="Notes on user authorization">
+<topicref href="cdevcsecure866060.dita" navtitle="Setting the SQL standard authorization mode">
 </topicref>
 </relcell>
 <relcell>
-<topicref href="rdevcsecure379.dita" navtitle="User authorization exceptions">
+<topicref href="cdevcsecuregrantrevokeaccess.dita" navtitle="SQL standard authorization">
 </topicref>
-<topicref href="cdevcsecure37241.dita" navtitle="Users and authorization identifiers">
+<topicref href="rdevcsecure190.dita" navtitle="Read-only and full access permissions">
+</topicref>
+<topicref href="rdevcsecure379.dita" navtitle="User authorization exceptions">
 </topicref>
 </relcell>
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cdevcsecure866060.dita" navtitle="Setting user authorization">
+<topicref href="rdevcsecure190.dita" navtitle="Read-only and full access permissions">
 </topicref>
 </relcell>
 <relcell>
-<topicref href="rdevcsecure190.dita" navtitle="Read-only and full access permissions">
-</topicref>
-<topicref href="rdevcsecure131.dita" navtitle="Examples of user authorization">
+<topicref href="cdevcsecuregrantrevokeaccess.dita" navtitle="SQL standard authorization">
 </topicref>
 </relcell>
 </relrow>
 <relrow>
 <relcell>
-<topicref href="rdevcsecure190.dita" navtitle="Read-only and full access permissions">
+<topicref href="cdevcsecuregrantrevokeaccess.dita" navtitle="SQL standard authorization">
 </topicref>
 </relcell>
 <relcell>
-<topicref href="rdevcsecure131.dita" navtitle="Examples of user authorization">
+<topicref href="cdevcsecure866060.dita" navtitle="Setting the SQL standard authorization mode">
 </topicref>
 </relcell>
 </relrow>
@@ -2194,10 +2194,12 @@
 <topicref href="cdevconcepts28351.dita" navtitle="Updatable result sets">
 <topicref href="cdevconcepts30811.dita" navtitle="Requirements for updatable result sets">
 </topicref>
-<topicref href="rdevconceptsfor.dita" navtitle="Forward only updatable result sets"> </topicref>
-<topicref href="rdevconceptssur.dita" navtitle="Scrollable updatable result sets"> </topicref>
+<topicref href="rdevconceptsfor.dita" navtitle="Forward only updatable result sets">
+</topicref>
+<topicref href="rdevconceptssur.dita" navtitle="Scrollable updatable result sets">
+</topicref>
 <topicref href="rdevconceptsinsertrow.dita" navtitle="Inserting rows
-with updatable result sets"> </topicref>
+with updatable result sets"></topicref>
 <topicref href="tdevconcepts41704.dita" navtitle="Naming or accessing the name of a cursor">
 </topicref>
 <topicref href="rdevconcepts38274.dita" navtitle="Extended updatable result set example">
@@ -2329,17 +2331,15 @@
 <topicref href="cdevcsecure36595.dita" navtitle="User authorization">
 <topicref href="cdevcsecure866060.dita" navtitle="Setting user authorization">
 <topicref href="cdevcsecure865818.dita" navtitle="Setting the default access mode">
-</topicref>
 <topicref href="cdevcsecure865880.dita" navtitle="Setting the access mode for particular users">
 </topicref>
-<topicref href="rdevcsecure935.dita" navtitle="Notes on user authorization">
+</topicref>
+<topicref href="cdevcsecuregrantrevokeaccess.dita" navtitle="Grant and revoke access control">
 </topicref>
 <topicref href="rdevcsecure379.dita" navtitle="User authorization exceptions">
 </topicref>
 </topicref>
 <topicref href="rdevcsecure190.dita" navtitle="Read-only and full access permissions">
-</topicref>
-<topicref href="rdevcsecure131.dita" navtitle="Examples of user authorization">
 </topicref>
 </topicref>
 <topicref href="cdevcsecure24366.dita" navtitle="Encrypting databases on disk">

Modified: db/derby/docs/branches/10.2/src/devguide/rdevcsecure190.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/rdevcsecure190.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/rdevcsecure190.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/rdevcsecure190.dita Fri Aug 18 13:49:52 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -20,23 +20,26 @@
 -->
 <reference id="rdevcsecure190" xml:lang="en-us">
 <title>Read-only and full access permissions</title>
-<shortdesc>This table shows which actions read-only and full-access users
-are permitted to perform on regular or source databases and on target databases.</shortdesc>
+<shortdesc>The actions that users can perform on a Derby database is determined
+by the type of access that users have to the database objects.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Permissions</indexterm><indexterm>Read-only access<indexterm>definition</indexterm></indexterm>
-<indexterm>Full access<indexterm>definition</indexterm></indexterm></keywords>
+<keywords><indexterm>permissions<indexterm>read-only access</indexterm></indexterm>
+<indexterm>permissions<indexterm>full access</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<table frame="all" id="cdevcsecure20486"><title>Permissions for Read-Only
-and Full-Access Users</title>
+<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>
 <tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="37*"/>
 <colspec colname="2" colnum="2" colwidth="21*"/><colspec colname="3" colnum="3"
 colwidth="36*"/>
 <thead>
 <row>
 <entry align="left" colname="1" valign="bottom">Action</entry>
-<entry align="left" colname="2" valign="bottom">Read-Only Users</entry>
-<entry align="left" colname="3" valign="bottom">Full-Access Users</entry>
+<entry align="left" colname="2" valign="bottom">Read-only access</entry>
+<entry align="left" colname="3" valign="bottom">Full access </entry>
 </row>
 </thead>
 <tbody>

Modified: db/derby/docs/branches/10.2/src/devguide/rdevcsecure379.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/rdevcsecure379.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/rdevcsecure379.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/rdevcsecure379.dita Fri Aug 18 13:49:52 2006
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -20,11 +19,21 @@
 -->
 <reference id="rdevcsecure379" xml:lang="en-us">
 <title>User authorization exceptions</title>
-<shortdesc>If a user is not authorized to connect to the database specified
-in the connection request, <i>SQLException</i> 04501 is raised.</shortdesc>
-<prolog></prolog>
+<shortdesc>SQL exceptions are returned when errors occur with user authorizations.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>SQL exceptions<indexterm>user authorizations</indexterm></indexterm>
+<indexterm>user authorizations<indexterm>SQL exceptions</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <refbody>
-<section><p>If a user with <i>readOnlyAccess</i> attempts to write to a database, <i>SQLException</i> 08004 <codeph><i>-
-connection refused</i></codeph> is raised.</p></section>
+<section><p><ph conref="devconrefs.dita#prod/productshortname"></ph> validates
+the database properties when you set the properties. An exception is returned
+if you specify an invalid value when you set these properties. </p><p>After
+you set the <codeph>derby.database.sqlAuthorization</codeph> property to <varname>TRUE</varname>,
+you cannot set the property back to <varname>FALSE</varname>.</p><p>If a user
+attempts to connect to a database but is not authorized to connect to that
+database, the SQLException 04501 is returned. </p><p>If a user with read-only
+access attempts to write to a database, the SQLException 08004 <codeph>- connection
+refused</codeph> is returned.</p></section>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsqlj81859.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsqlj81859.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsqlj81859.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/rrefsqlj81859.dita Fri Aug 18 13:49:52 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../../dtd/reference.dtd">
 <!--

Modified: db/derby/docs/branches/10.2/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/refderby.ditamap?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/refderby.ditamap (original)
+++ db/derby/docs/branches/10.2/src/ref/refderby.ditamap Fri Aug 18 13:49:52 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
  "map.dtd">
 <!-- 
@@ -28,6 +29,27 @@
 <vrmlist><vrm version="10"/></vrmlist>
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
+<!--BELOW - This relationship table is not complete. There wasn't a reltable for the ref manual, so it was added for 10.2 to document the new SQL statements and to enable a link to the Dev Guide.  Each topic (preferably in the order that they appear in the book) should be listed in the reltable and links added. The left side represents the source topic and the right side represents the topics that the source should link to.-->
+<reltable>
+<relrow>
+<relcell>
+<topicref href="rrefsqljgrant.dita" navtitle="GRANT statement "></topicref>
+</relcell>
+<relcell>
+<topicref href="rrefsqljrevoke.dita" navtitle="REVOKE statement "></topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rrefsqljrevoke.dita" navtitle="REVOKE statement "></topicref>
+</relcell>
+<relcell>
+<topicref href="../devguide/cdevcsecuregrantrevokeaccess.dita" navtitle="SQL standard authorization">
+</topicref>
+<topicref href="rrefsqljgrant.dita" navtitle="GRANT statement "></topicref>
+</relcell>
+</relrow>
+</reltable>
 <topicref href="rrefcopyright.dita" navtitle="Copyright"></topicref>
 <topicref collection-type="family" href="crefmpref1002477.dita" navtitle="About this guide">
 <topicref href="crefmpref11181.dita" navtitle="Purpose of this document">
@@ -100,11 +122,13 @@
 <topicref href="rrefsqlj42082.dita" navtitle="DROP TRIGGER statement"></topicref>
 <topicref href="rrefsqlj61102.dita" navtitle="DROP VIEW statement"></topicref>
 </topicref>
+<topicref href="rrefsqljgrant.dita" navtitle="GRANT statement"></topicref>
 <topicref collection-type="family" href="crefsqljrenamestatements.dita" navtitle="RENAME statements">
 <topicref href="rrefsqlj95598.dita" navtitle="RENAME INDEX statement"></topicref>
 <topicref href="rrefsqljrenametablestatement.dita" navtitle="RENAME TABLE statement ">
 </topicref>
 </topicref>
+<topicref href="rrefsqljrevoke.dita" navtitle="REVOKE statement"></topicref>
 <topicref collection-type="family" href="crefsqlj35312.dita" navtitle="SET statements">
 <topicref href="rrefsqlj32268.dita" navtitle="SET SCHEMA statement"></topicref>
 <topicref href="rrefsqlj41180.dita" navtitle="SET CURRENT ISOLATION statement">
@@ -154,14 +178,16 @@
 <topicref href="rrefsqlj33923.dita" navtitle="Aggregates (set functions)">
 </topicref>
 <topicref href="rrefsqlj98067.dita" navtitle="ABS or ABSVAL"></topicref>
+<topicref href="rreffuncacos.dita" navtitle="ACOS function"></topicref>
+<topicref href="rreffuncasin.dita" navtitle="ASIN function"></topicref>
+<topicref href="rreffuncatan.dita" navtitle="ATAN function"></topicref>
 <topicref href="rrefsqlj32693.dita" navtitle="AVG"></topicref>
 <topicref href="rrefbuiltbigint.dita" navtitle="BIGINT"></topicref>
 <topicref href="rrefsqlj33562.dita" navtitle="CAST"></topicref>
+<topicref href="rreffuncceil.dita" navtitle="CEIL or CEILING function"></topicref>
 <topicref href="rrefbuiltchar.dita" navtitle="CHAR"></topicref>
-<topicref href="rrefsqlj16762.dita" navtitle="LENGTH"></topicref>
 <topicref href="rrefsqlj40899.dita" navtitle="Concatenation"></topicref>
-<topicref href="rrefcasenullif.dita" navtitle="NULLIF and CASE expressions">
-</topicref>
+<topicref href="rreffunccos.dita" navtitle="COS function"></topicref>
 <topicref href="rrefsqlj38716.dita" navtitle="COUNT"></topicref>
 <topicref href="rrefsqlj66113.dita" navtitle="COUNT(*)"></topicref>
 <topicref href="rrefsqljcurrentdate.dita" navtitle="CURRENT DATE"></topicref>
@@ -176,25 +202,37 @@
 <topicref href="rrefsqlj42324.dita" navtitle="CURRENT_USER"></topicref>
 <topicref href="rrefdatefunc.dita" navtitle="DATE"></topicref>
 <topicref href="rrefdayfunc.dita" navtitle="DAY"></topicref>
+<topicref href="rreffuncdegrees.dita" navtitle="DEGREES function"></topicref>
 <topicref href="rrefbuiltdouble.dita" navtitle="DOUBLE"></topicref>
+<topicref href="rreffuncexp.dita" navtitle="EXP function"></topicref>
+<topicref href="rreffuncfloor.dita" navtitle="FLOOR function"></topicref>
 <topicref href="rrefhourfunc.dita" navtitle="HOUR"></topicref>
 <topicref href="rrefidentityvallocal.dita" navtitle="IDENTITY_VAL_LOCAL">
 </topicref>
 <topicref href="rrefbuiltinteger.dita" navtitle="INTEGER"></topicref>
-<topicref href="rrefsqlj61998.dita" navtitle="LOCATE"></topicref>
 <topicref href="rrefsqlj42049.dita" navtitle="LCASE or LOWER"></topicref>
+<topicref href="rrefsqlj16762.dita" navtitle="LENGTH"></topicref>
+<topicref href="rreffunclog.dita" navtitle="LN or LOG function"></topicref>
+<topicref href="rreffunclog10.dita" navtitle="LOG10 function"></topicref>
+<topicref href="rrefsqlj61998.dita" navtitle="LOCATE"></topicref>
 <topicref href="rrefsqlj97870.dita" navtitle="LTRIM"></topicref>
 <topicref href="rrefsqlj27781.dita" navtitle="MAX"></topicref>
 <topicref href="rrefsqlj33520.dita" navtitle="MIN"></topicref>
 <topicref href="rrefminutefunc.dita" navtitle="MINUTE"></topicref>
 <topicref href="rrefsqljmod.dita" navtitle="MOD"></topicref>
 <topicref href="rrefmonthfunc.dita" navtitle="MONTH"></topicref>
+<topicref href="rrefcasenullif.dita" navtitle="NULLIF and CASE expressions">
+</topicref>
+<topicref href="rreffuncpi.dita" navtitle="PI function"></topicref>
+<topicref href="rreffuncradians.dita" navtitle="RADIANS function"></topicref>
 <topicref href="rrefsqlj32613.dita" navtitle="RTRIM"></topicref>
 <topicref href="rrefsecondfunc.dita" navtitle="SECOND"></topicref>
 <topicref href="rrefsqlj25228.dita" navtitle="SESSION_USER"></topicref>
+<topicref href="rreffuncsin.dita" navtitle="SIN function"></topicref>
 <topicref href="rrefbuiltsmallint.dita" navtitle="SMALLINT"></topicref>
 <topicref href="rrefsqlj73147.dita" navtitle="SQRT"></topicref>
 <topicref href="rrefsqlj93082.dita" navtitle="SUBSTR"></topicref>
+<topicref href="rreffunctan.dita" navtitle="TAN function"></topicref>
 <topicref href="rrefsqlj13083.dita" navtitle="SUM"></topicref>
 <topicref href="rreftimefunc.dita" navtitle="TIME"></topicref>
 <topicref href="rreftimestampfunc.dita" navtitle="TIMESTAMP"></topicref>
@@ -304,6 +342,7 @@
 <topicref collection-type="family" href="rrefsistabs38369.dita" navtitle="Derby System Tables">
 <topicref href="rrefsistabs28114.dita" navtitle="SYSALIASES"></topicref>
 <topicref href="rrefsistabs26665.dita" navtitle="SYSCHECKS"></topicref>
+<topicref href="rrefsistabssyscolperms.dita" navtitle="SYSCOLPERMS"></topicref>
 <topicref href="rrefsistabs22441.dita" navtitle="SYSCOLUMNS"></topicref>
 <topicref href="rrefsistabs39391.dita" navtitle="SYSCONGLOMERATES"></topicref>
 <topicref href="rrefsistabs23241.dita" navtitle="SYSCONSTRAINTS"></topicref>
@@ -311,10 +350,13 @@
 <topicref href="rrefsistabs40972.dita" navtitle="SYSFILES"></topicref>
 <topicref href="rrefsistabs13420.dita" navtitle="SYSFOREIGNKEYS"></topicref>
 <topicref href="rrefsistabs33921.dita" navtitle="SYSKEYS"></topicref>
+<topicref href="rrefsistabssysroutineperms.dita" navtitle="SYSROUTINEPERMS">
+</topicref>
 <topicref href="rrefsistabs12085.dita" navtitle="SYSSCHEMAS"></topicref>
 <topicref href="rrefsistabslilanguageitemsysstatistics.dita" navtitle="SYSSTATISTICS">
 </topicref>
 <topicref href="rrefsistabs33768.dita" navtitle="SYSSTATEMENTS"></topicref>
+<topicref href="rrefsistabssystableperms.dita" navtitle="SYSTABLEPERMS"></topicref>
 <topicref href="rrefsistabs24269.dita" navtitle="SYSTABLES"></topicref>
 <topicref href="rrefsistabs79888.dita" navtitle="SYSTRIGGERS"></topicref>
 <topicref href="rrefsistabs24045.dita" navtitle="SYSVIEWS"></topicref>
@@ -423,11 +465,16 @@
 </topicref>
 </topicref>
 <topicref collection-type="family" href="rrefjdbc4_0summary.dita" navtitle="JDBC 4.0-only features ">
-<topicref href="rrefjdbc4_0sqlexception.dita" navtitle="Refined subclasses of SQLException"></topicref>
-<topicref href="rrefjdbc4_0connection.dita" navtitle="java.sql.Connection"></topicref>
-<topicref href="rrefjdbc4_0databaseMetaData.dita" navtitle="java.sql.DatabaseMetaData"></topicref>
-<topicref href="rrefjdbc4_0statement.dita" navtitle="java.sql.Statement"></topicref>
-<topicref href="rrefjdbc4_0dataSource.dita" navtitle="javax.sql.DataSource"></topicref>
+<topicref href="rrefjdbc4_0sqlexception.dita" navtitle="Refined subclasses of SQLException">
+</topicref>
+<topicref href="rrefjdbc4_0connection.dita" navtitle="java.sql.Connection">
+</topicref>
+<topicref href="rrefjdbc4_0databaseMetaData.dita" navtitle="java.sql.DatabaseMetaData">
+</topicref>
+<topicref href="rrefjdbc4_0statement.dita" navtitle="java.sql.Statement">
+</topicref>
+<topicref href="rrefjdbc4_0dataSource.dita" navtitle="javax.sql.DataSource">
+</topicref>
 </topicref>
 <topicref collection-type="family" href="rrefjdbc1020262.dita" navtitle="JDBC escape syntax ">
 <topicref href="rrefjdbc70824.dita" navtitle="JDBC escape keyword for call statements">

Modified: db/derby/docs/branches/10.2/src/ref/rrefexcept71493.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefexcept71493.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefexcept71493.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefexcept71493.dita Fri Aug 18 13:49:52 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -19,6 +20,10 @@
 -->
 <reference id="rrefexcept71493" xml:lang="en-us">
 <title>SQLState and error message reference</title>
+<prolog><metadata>
+<keywords><indexterm>error messages</indexterm><indexterm>SQLState reference</indexterm>
+</keywords>
+</metadata></prolog>
 <refbody>
 <section><p>The following tables list <i>SQLStates</i> for exceptions. Exceptions
 that begin with an <i>X</i> are specific to <ph conref="refconrefs.dita#prod/productshortname"></ph>.
@@ -36,7 +41,8 @@
 <tbody>
 <row>
 <entry colname="col1">01001</entry>
-<entry colname="col2">An attempt to update or delete an already deleted row was made: No row was updated or deleted.</entry>
+<entry colname="col2">An attempt to update or delete an already deleted row
+was made: No row was updated or deleted.</entry>
 </row>
 <row>
 <entry colname="col1">01003       </entry>
@@ -1471,7 +1477,7 @@
 so the statement cannot be evaluated.  </entry>
 </row>
 <row>
-<entry colname="col1"> 42Y70</entry>
+<entry colname="col1">42Y70</entry>
 <entry colname="col2">The user specified an illegal join order. This could
 be caused by a join column from an inner table being passed as a parameter
 to an external virtual table.  </entry>
@@ -1487,7 +1493,7 @@
 that cannot be dropped using DROP STATEMENT. It is part of a trigger. </entry>
 </row>
 <row>
-<entry colname="col1"> 42Y83</entry>
+<entry colname="col1">42Y83</entry>
 <entry colname="col2">An untyped null is not permitted as an argument to aggregate &lt;<i>aggregateName</i>>.
  Please cast the null to a suitable type. </entry>
 </row>
@@ -1669,6 +1675,10 @@
 '&lt;<i>triggerName</i>>' triggers.  </entry>
 </row>
 <row>
+<entry colname="col1">42Z9D</entry>
+<entry colname="col2">Procedures that modify SQL data are not allowed in <i>before</i> triggers.</entry>
+</row>
+<row>
 <entry colname="col1">42Z9E</entry>
 <entry colname="col2">Constraint '&lt;<i>constraintName</i>>' is not a &lt;<i>value</i>>
 constraint.  </entry>
@@ -1981,8 +1991,8 @@
 </row>
 <row>
 <entry colname="col1">X0Y69</entry>
-<entry colname="col2">&lt;<i>value</i>> is not permitted because trigger &lt;<i>triggerName</i>>
-is active on &lt;<i>value</i>>.      </entry>
+<entry colname="col2">&lt;<i>value</i>> is not supported in trigger &lt;<i>triggerName</i>>
+.      </entry>
 </row>
 <row>
 <entry colname="col1">X0Y70   </entry>
@@ -3043,7 +3053,8 @@
 </row>
 <row>
 <entry colname="col1">XJ086</entry>
-<entry colname="col2">This method cannot be invoked while the cursor is not on the insert row or if the concurrency of this ResultSet object is CONCUR_READ_ONLY.</entry>
+<entry colname="col2">This method cannot be invoked while the cursor is not
+on the insert row or if the concurrency of this ResultSet object is CONCUR_READ_ONLY.</entry>
 </row>
 </tbody>
 </tgroup>

Modified: db/derby/docs/branches/10.2/src/ref/rrefjavcsro.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjavcsro.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjavcsro.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjavcsro.dita Fri Aug 18 13:49:52 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,16 +18,14 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefjavcsro" xml:lang="en-us">
 <title>java.sql.Connection.setReadOnly </title>
 <prolog><metadata>
 <keywords><indexterm>java.sql.Connection.setReadOnly</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p><i>java.sql.Connection.setReadOnly</i> is supported.</p></section>
+<section><p><i>java.sql.Connection.setReadOnly</i> is supported.</p><p>See
+the section <i>Differences using the Connection.setReadOnly method</i> in
+the <ph conref="refconrefs.dita#pub/citref"></ph> for more information.</p></section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc80004.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc80004.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc80004.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc80004.dita Fri Aug 18 13:49:52 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -20,8 +21,8 @@
 <reference id="rrefjdbc80004" xml:lang="en-us">
 <title>java.sql.Connection </title>
 <prolog><metadata>
-<keywords><indexterm>Scrollable insensitive cursors (JDBC)</indexterm><indexterm>Scrollable 
-insensitive cursors</indexterm><indexterm>Cursors<indexterm>scrollable insensitive</indexterm></indexterm>
+<keywords><indexterm>Scrollable insensitive cursors (JDBC)</indexterm><indexterm>Scrollable
+ insensitive cursors</indexterm><indexterm>Cursors<indexterm>scrollable insensitive</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
@@ -55,7 +56,6 @@
 the only result set types supported. If you request <i>TYPE_SCROLL_SENSITIVE</i>, <ph
 conref="refconrefs.dita#prod/productshortname"></ph> issues an <i>SQLWarning</i> and
 returns a <i>TYPE_SCROLL_INSENSITIVE ResultSet</i>. <p> These methods support
-both <i>ResultSet.CONCUR_READ_ONLY</i> and <i>ResultSet.CONCUR_UPDATABLE</i> concurrencies.
-</p></section>
+both <i>ResultSet.CONCUR_READ_ONLY</i> and <i>ResultSet.CONCUR_UPDATABLE</i> concurrencies. </p></section>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc88908.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc88908.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc88908.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc88908.dita Fri Aug 18 13:49:52 2006
@@ -20,67 +20,173 @@
 <reference id="rrefjdbc88908" xml:lang="en-us">
 <title>JDBC escape syntax for fn keyword</title>
 <prolog><metadata>
-<keywords><indexterm>fn (JDBC escape keyword)</indexterm><indexterm>substring
-(JDBC scalar function)</indexterm><indexterm>mod (JDBC scalar function)</indexterm>
-<indexterm>locate (JDBC scalar function)</indexterm><indexterm>abs (JDBC scalar
-function)</indexterm><indexterm>sqrt (JDBC scalar function)</indexterm><indexterm>concat
-(JDBC scalar function)</indexterm><indexterm>TIMESTAMPADD function</indexterm>
-<indexterm>TIMESTAMPDIFF function</indexterm></keywords>
+<keywords><indexterm>fn<indexterm>JDBC escape keyword</indexterm><indexterm>JDBC <indexterm>escape
+keyword</indexterm></indexterm><indexterm>escape keyword<indexterm>JDBC </indexterm></indexterm></indexterm>
+<indexterm>JDBC<indexterm>escape functions</indexterm></indexterm><indexterm>substring<indexterm>JDBC
+scalar function</indexterm></indexterm><indexterm>mod<indexterm>JDBC scalar
+function</indexterm></indexterm><indexterm>locate<indexterm>JDBC scalar function</indexterm></indexterm>
+<indexterm>abs<indexterm>JDBC scalar function</indexterm></indexterm><indexterm>sqrt<indexterm>JDBC
+scalar function</indexterm></indexterm><indexterm>concat<indexterm>JDBC scalar
+function</indexterm></indexterm><indexterm>TIMESTAMPADD function<indexterm>JDBC
+scalar function</indexterm></indexterm><indexterm>TIMESTAMPDIFF function<indexterm>JDBC
+scalar function</indexterm></indexterm><indexterm>acos<indexterm>JDBC scalar
+function</indexterm></indexterm><indexterm>asin<indexterm>JDBC scalar function</indexterm></indexterm>
+<indexterm>atan<indexterm>JDBC scalar function</indexterm></indexterm><indexterm>ceiling<indexterm>JDBC
+scalar function</indexterm></indexterm><indexterm>cos<indexterm>JDBC scalar
+function</indexterm></indexterm><indexterm>degrees<indexterm>JDBC scalar function</indexterm></indexterm>
+<indexterm>exp<indexterm>JDBC scalar function</indexterm></indexterm><indexterm>floor<indexterm>JDBC
+scalar function</indexterm><indexterm>log<indexterm>JDBC scalar function</indexterm></indexterm><indexterm>log10<indexterm>JDBC
+scalar function</indexterm></indexterm><indexterm>pi<indexterm>JDBC scalar
+function</indexterm></indexterm><indexterm>radians<indexterm>JDBC scalar function</indexterm></indexterm><indexterm>sin<indexterm>JDBC
+scalar function</indexterm></indexterm></indexterm><indexterm>tan<indexterm>JDBC
+scalar function</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The fn keyword allows the use of several scalar functions. The
-function name follows the keyword fn.</p></section>
+<section> <p>You can specify functions in JDBC escape syntax, by using the <parmname>fn</parmname> keyword.</p></section>
 <refsyn><title>Syntax</title><codeblock><b>{fn <i>functionCall</i>}</b></codeblock><p>where <i>functionCall</i> is
-one of the following functions:</p><codeblock><b>concat (<b><i>CharacterExpression</i></b>, <b><i>CharacterExpression</i></b>)</b></codeblock><p>Character
-string formed by appending the second string to the first; if either string
-is null, the result is NULL. {fn concat (<i>CharacterExpression</i>, <i>CharacterExpression</i>)
-is equivalent to built-in syntax { CharacterExpression || CharacterExpression
-}. For more details, see <xref href="rrefsqlj40899.dita#rrefsqlj40899"></xref>.</p><codeblock><b><i>sqrt (<b><i>FloatingPointExpression</i></b>)</i
-></b></codeblock><p>Square root of floating point number.</p><p>{fn sqrt (<i>FloatingPointExpression</i>)}
-is equivalent to built-in syntax  <xref href="rrefsqlj73147.dita#rrefsqlj73147/i1195048">SQRT(FloatingPointExpression)</xref>.
-For more details see <xref href="rrefsqlj73147.dita#rrefsqlj73147"></xref>.</p><codeblock><b>abs (<b><i>NumericExpression</i></b>)</b></codeblock
-><p>Absolute value of number. {fn abs(<i>NumericExpression</i>)} is equivalent
-to built-in syntax <xref href="rrefsqlj98067.dita#rrefsqlj98067/i1195049">ABSOLUTE(NumericExpression)</xref>.
-For more details see <xref href="rrefsqlj98067.dita#rrefsqlj98067"></xref>.</p><codeblock><b>locate(<b><i>CharacterExpression</i></b>,<b><i>CharacterExpression</i
-></b> [, <b><i>startIndex</i></b>] )</b></codeblock><p>Position in the second <i>CharacterExpression</i> of
-the first occurrence of the first <i>CharacterExpression</i>, searching from
-the beginning of the second character expression, unless <i>startIndex</i> is
-specified. {fn locate(<i>CharacterExpression</i>,<i>CharacterExpression</i> [, <i>startIndex</i>]
+the name of one of the following scalar functions:</p><dl><dlentry>
+<dt>abs</dt>
+<dd>Returns the absolute value of a number.<codeblock><b>abs(<i>NumericExpression</i>)</b></codeblock><p>The
+JDBC escape syntax {fn abs(<i>NumericExpression</i>)} is equivalent to the
+built-in syntax <xref href="rrefsqlj98067.dita#rrefsqlj98067/i1195049">ABSOLUTE(NumericExpression)</xref>.
+For more information, see the <xref href="rrefsqlj98067.dita#rrefsqlj98067"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>acos</dt>
+<dd>Returns the arc cosine of a specified number.<codeblock><b>acos(<i>number</i>)</b></codeblock><p>The
+JDBC escape syntax {fn acos(<i>number</i>)} is equivalent to the built-in
+syntax ACOS(number). For more information, see the <xref href="rreffuncacos.dita#rreffuncacos">ACOS</xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>asin</dt>
+<dd>Returns the arc sine of a specified number.<codeblock><b>asin(<i>number</i>)</b></codeblock><p>The
+JDBC escape syntax {fn asin(<i>number</i>)} is equivalent to the built-in
+syntax ASIN(number). For more information, see the <xref href="rreffuncasin.dita#rreffuncasin">ASIN</xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>atan</dt>
+<dd>Returns the arc tangent of a specified number.<codeblock><b>atan(<i>number</i>)</b></codeblock><p>The
+JDBC escape syntax {fn atan(<i>number</i>)} is equivalent to the built-in
+syntax ATAN(number). For more information, see the <xref href="rreffuncatan.dita#rreffuncatan">ATAN</xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>ceiling</dt>
+<dd>Rounds the specified number up, and returns the smallest number that is
+greater than or equal to the specified number.<codeblock><b>ceiling(<i>number</i>)</b></codeblock><p>The
+JDBC escape syntax {fn ceiling(<i>number</i>)} is equivalent to the built-in
+syntax CEILING(number). For more information, see the <xref href="rreffuncceil.dita#rreffuncceil"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>concat</dt>
+<dd>Returns the concatenation of character strings.<codeblock><b>concat(<i>CharacterExpression</i>, <i>CharacterExpression</i>)</b></codeblock><p
+>Character string formed by appending the second string to the first string.
+If either string is null, the result is NULL. The JDBC escape syntax {fn concat
+(<i>CharacterExpression</i>, <i>CharacterExpression</i>) is equivalent to
+the built-in syntax { CharacterExpression || CharacterExpression }. For more
+information, see the <xref href="rrefsqlj40899.dita#rrefsqlj40899"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>cos</dt>
+<dd>Returns the cosine of a specified number.<codeblock><b>cos(<i>number</i>)</b></codeblock><p>The
+JDBC escape syntax {fn cos(<i>number</i>)} is equivalent to the built-in syntax
+COS(number). For more information, see the <xref href="rreffunccos.dita#rreffunccos"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>degrees</dt>
+<dd>Converts a specified number from radians to degrees.<codeblock><b>degrees(<i>number</i>)</b></codeblock><p>The
+JDBC escape syntax {fn degrees(<i>number</i>)} is equivalent to the built-in
+syntax DEGREES(number). For more information, see the <xref href="rreffuncdegrees.dita#rreffuncdegrees"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>exp</dt>
+<dd>Returns <term>e</term> raised to the power of the specified number.<codeblock><b>exp(<i>number</i>)</b></codeblock><p>The
+JDBC escape syntax {fn exp(<i>number</i>)} is equivalent to the built-in syntax
+EXP(number). For more information, see the <xref href="rreffuncexp.dita#rreffuncexp"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>floor</dt>
+<dd>Rounds the specified number down, and returns the largest number that
+is less than or equal to the specified number.<codeblock><b>floor(<i>number</i>)</b></codeblock><p>The
+JDBC escape syntax {fn floor(<i>number</i>)} is equivalent to the built-in
+syntax FLOOR(number). For more information, see the <xref href="rreffuncfloor.dita#rreffuncfloor"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>locate</dt>
+<dd>Returns the position in the second <i>CharacterExpression</i> of the first
+occurrence of the first <i>CharacterExpression</i>. Searches from the beginning
+of the second <i>CharacterExpression</i>, unless the <i>startIndex</i> parameter
+is specified.<codeblock><b>locate(<i>CharacterExpression</i>,<i>CharacterExpression</i> [, <i>startIndex</i>] )</b></codeblock><p> The
+JDBC escape syntax {fn locate(<i>CharacterExpression</i>,<i>CharacterExpression</i> [, <i>startIndex</i>]
 )} is equivalent to the built-in syntax <xref href="rrefsqlj61998.dita#rrefsqlj61998/i1195050">LOCATE(CharacterExpression,
-CharacterExpression [, StartPosition] )</xref>. For more details see <xref
-href="rrefsqlj61998.dita#rrefsqlj61998"></xref>.</p><codeblock><b>substring(<b><i>CharacterExpression</i></b>, <b><i>startIndex</i></b>, <b><i>length</i
-></b>)</b></codeblock><p>A character string formed by extracting <i>length</i> characters
-from the CharacterExpression beginning at <i>startIndex</i>; the index starts
-with 1.</p><codeblock><b>mod(<b><i>integer_type</i></b>, <b><i>integer_type</i></b>)</b></codeblock><p>MOD
-returns the remainder (modulus) of argument 1 divided by argument 2. The result
-is negative only if argument 1 is negative. For more details, see <xref href="rrefsqljmod.dita#rrefsqljmod"></xref>.</p><note>Any <ph
-conref="refconrefs.dita#prod/productshortname"></ph> built-in function is
-allowed in this syntax, not just those listed in this section.</note><codeblock><b>TIMESTAMPADD( <i>interval</i>, <i>integerExpression</i>, <i>timestampExpression</i
-> )</b></codeblock><p>Use the <codeph>TIMESTAMPADD</codeph> function to add
-the value of an interval to a timestamp. The function applies the integer
-to the specified timestamp based on the interval type and returns the sum
-as a new timestamp. You can subtract from the timestamp by using negative
-integers.</p><p>Note that <codeph>TIMESTAMPADD</codeph> is a JDBC escaped
-function, and is only accessible using the JDBC escape function syntax.</p><p>To
+CharacterExpression [, StartPosition] )</xref>. For more information, see
+the <xref href="rrefsqlj61998.dita#rrefsqlj61998"></xref>. function</p></dd>
+</dlentry><dlentry>
+<dt>log</dt>
+<dd>Returns the natural logarithm (base <term>e</term>) of the specified number.<codeblock><b>log(<i>number</i>)</b> </codeblock><p>The
+JDBC escape syntax {fn log(<i>number</i>)} is equivalent to the built-in syntax
+LOG(number). For more information, see the <xref href="rreffunclog.dita#rreffunclog"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>log10</dt>
+<dd>Returns the base-10 logarithm of the specified number.<codeblock><b>log10(<i>number</i>)</b></codeblock><p>The
+JDBC escape syntax {fn log10(<i>number</i>)} is equivalent to the built-in
+syntax LOG10(number). For more information, see the <xref href="rreffunclog10.dita#rreffunclog10"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>mod</dt>
+<dd> Returns the remainder (modulus) of argument 1 divided by argument 2.
+The result is negative only if argument 1 is negative.<codeblock><b>mod(<i>integer_type</i>, <i>integer_type</i>)</b></codeblock><p>For
+more information, see the <xref href="rrefsqljmod.dita#rrefsqljmod"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>pi</dt>
+<dd>Returns an value that is closer than any other value to <term>pi</term>.<codeblock><b>pi()</b></codeblock><p>The
+JDBC escape syntax {fn pi()} is equivalent to the built-in syntax PI(). For
+more information, see the <xref href="rreffuncpi.dita#rreffuncpi"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>radians</dt>
+<dd>Converts a specified number from degrees to radians.<codeblock><b>radians(<i>number</i>)</b></codeblock><p>The
+JDBC escape syntax {fn radians(<i>number</i>)} is equivalent to the built-in
+syntax RADIANS(number). For more information, see the <xref href="rreffuncradians.dita#rreffuncradians"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>sin</dt>
+<dd>Returns the sine of a specified number.<codeblock><b>sin(<i>number</i>)</b></codeblock><p>The
+JDBC escape syntax {fn sin(<i>number</i>)} is equivalent to the built-in syntax
+SIN(number). For more information, see the <xref href="rreffuncsin.dita#rreffuncsin">SIN</xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>sqrt</dt>
+<dd>Returns the square root of floating point number.<codeblock><b>sqrt(<i>FloatingPointExpression</i>)</b></codeblock><p>The
+JDBC escape syntax {fn sqrt (<i>FloatingPointExpression</i>)} is equivalent
+to the built-in syntax  <xref href="rrefsqlj73147.dita#rrefsqlj73147/i1195048">SQRT(FloatingPointExpression)</xref>.
+For more information, see the <xref href="rrefsqlj73147.dita#rrefsqlj73147"></xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>substring</dt>
+<dd>Forms a character string by extracting <i>length</i> characters from the <i>CharacterExpression</i> beginning
+at <i>startIndex</i>. The index of the first character in the <i>CharacterExpression</i> is
+1.<codeblock><b>substring(<i>CharacterExpression</i>, <i>startIndex</i>, <i>length</i>)</b></codeblock></dd>
+</dlentry><dlentry>
+<dt>tan</dt>
+<dd>Returns the tangent of a specified number.<codeblock><b>tan(<i>number</i>)</b></codeblock><p>The
+JDBC escape syntax {fn tan(<i>number</i>)} is equivalent to the built-in syntax
+TAN(number). For more information, see the <xref href="rreffunctan.dita#rreffunctan">TAN</xref> function.</p></dd>
+</dlentry><dlentry>
+<dt>TIMESTAMPADD</dt>
+<dd>Use the <codeph>TIMESTAMPADD</codeph> function to add the value of an
+interval to a timestamp. The function applies the integer to the specified
+timestamp based on the interval type and returns the sum as a new timestamp.
+You can subtract from the timestamp by using negative integers.<p>The <codeph>TIMESTAMPADD</codeph> is
+a JDBC escaped function, and is only accessible by using the JDBC escape function
+syntax.</p><codeblock><b>TIMESTAMPADD( <i>interval</i>, <i>integerExpression</i>, <i>timestampExpression</i> )</b></codeblock><p>To
 perform <codeph>TIMESTAMPADD</codeph> on dates and times, it is necessary
-to convert them to timestamps. Dates are converted to timestamps by putting
-00:00:00.0 in the time-of-day fields. Times are converted to timestamps by
-putting the current date in the date fields.</p><p>Note that you should not
-put a datetime column inside a timestamp arithmetic function in WHERE clauses
-because the optimizer will not use any index on the column.</p><codeblock><b>TIMESTAMPDIFF( interval, timestampExpression1, timestampExpression2 )</b
-></codeblock><p>Use the <codeph>TIMESTAMPDIFF</codeph> function to find the
-difference between two timestamp values at a specified interval. For example,
-the function can return the number of minutes between two specified timestamps.</p><p>Note
-that <codeph>TIMESTAMPDIFF</codeph> is a JDBC escaped function, and is only
-accessible using the JDBC escape function syntax.</p><p>To perform <codeph>TIMESTAMPDIFF</codeph> on
-dates and times, it is necessary to convert them to timestamps. Dates are
-converted to timestamps by putting 00:00:00.0 in the time-of-day fields. Times
-are converted to timestamps by putting the current date in the date fields.</p><p>Note
-that you should not put a datetime column inside a timestamp arithmetic function
-in WHERE clauses because the optimizer will not use any index on the column.</p></refsyn>
+to convert the dates and times to timestamps. Dates are converted to timestamps
+by putting 00:00:00.0 in the time-of-day fields. Times are converted to timestamps
+by putting the current date in the date fields.</p><p>You should not put a
+datetime column inside of a timestamp arithmetic function in WHERE clauses
+because the optimizer will not use any index on the column.</p></dd>
+</dlentry><dlentry>
+<dt>TIMESTAMPDIFF</dt>
+<dd>Use the <codeph>TIMESTAMPDIFF</codeph> function to find the difference
+between two timestamp values at a specified interval. For example, the function
+can return the number of minutes between two specified timestamps.<p>The <codeph>TIMESTAMPDIFF</codeph> is
+a JDBC escaped function, and is only accessible by using the JDBC escape function
+syntax.</p><codeblock><b>TIMESTAMPDIFF( <i>interval</i>, <i>timestampExpression1</i>, <i>timestampExpression2</i> )</b></codeblock><p>To
+perform <codeph>TIMESTAMPDIFF</codeph> on dates and times, it is necessary
+to convert the dates and times to timestamps. Dates are converted to timestamps
+by putting 00:00:00.0 in the time-of-day fields. Times are converted to timestamps
+by putting the current date in the date fields.</p><p>You should not put a
+datetime column inside of a timestamp arithmetic function in WHERE clauses
+because the optimizer will not use any index on the column.</p></dd>
+</dlentry></dl></refsyn>
 <section><title>Valid intervals for TIMESTAMPADD and TIMESTAMPDIFF</title>The <codeph>TIMESTAMPADD</codeph> and <codeph>TIMESTAMPDIFF</codeph> functions
-can be used to perform arithmetic with timestamps. These two functions use
-the following valid intervals for arithmetic operations:<ul>
+are used to perform arithmetic with timestamps. These two functions use the
+following valid intervals for arithmetic operations:<ul>
 <li>SQL_TSI_DAY</li>
 <li>SQL_TSI_FRAC_SECOND</li>
 <li>SQL_TSI_HOUR</li>
@@ -91,10 +197,11 @@
 <li>SQL_TSI_WEEK</li>
 <li>SQL_TSI_YEAR</li>
 </ul></section>
-<example><title>Examples of TIMESTAMPADD and TIMESTAMPDIFF</title><codeblock><b>{fn TIMESTAMPADD( SQL_TSI_MONTH, 1, CURRENT_TIMESTAMP)}</b></codeblock
-><p>Returns a timestamp value one month later than the current timestamp.</p><codeblock><b>{fn TIMESTAMPDIFF(SQL_TSI_WEEK, CURRENT_TIMESTAMP, 
-  timestamp('2001-01-01-12.00.00.000000'))}</b
-></codeblock><p>Returns the number of weeks between now and the specified
-time on January 1, 2001.</p></example>
+<example><title>Examples for the TIMESTAMPADD and TIMESTAMPDIFF escape functions </title><p>To
+return a timestamp value one month later than the current timestamp, use the
+following syntax:</p><codeblock><b>{fn TIMESTAMPADD( SQL_TSI_MONTH, 1, CURRENT_TIMESTAMP)}</b></codeblock><p>To
+return the number of weeks between now and the specified time on January 1,
+2008, use the following syntax:</p><codeblock><b>{fn TIMESTAMPDIFF(SQL_TSI_WEEK, CURRENT_TIMESTAMP, 
+  timestamp('2008-01-01-12.00.00.000000'))}</b></codeblock></example>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsistabs12085.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsistabs12085.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsistabs12085.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsistabs12085.dita Fri Aug 18 13:49:52 2006
@@ -21,8 +21,8 @@
 <reference id="rrefsistabs12085" xml:lang="en-us">
 <title>SYSSCHEMAS</title>
 <refbody>
-<section><p>Describes the schemas within the current database.   <table pgwide="1"
-frame="all">
+<section><p>Describes the schemas within the current database.   
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="26*"/>
 <colspec colname="2" colnum="2" colwidth="15*"/><colspec colname="3" colnum="3"
 colwidth="11*"/><colspec colname="4" colnum="4" colwidth="14*"/><colspec colname="5"

Modified: db/derby/docs/branches/10.2/src/ref/rrefsistabs12813.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsistabs12813.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsistabs12813.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsistabs12813.dita Fri Aug 18 13:49:52 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -19,12 +20,15 @@
 -->
 <reference id="rrefsistabs12813" xml:lang="en-us">
 <title>SYSDEPENDS</title>
+<shortdesc>The SYSDEPENDS table stores the dependency relationships between
+persistent objects in the database.</shortdesc>
 <refbody>
-<section><p>Describes the dependency relationships between persistent objects
-in the database. Persistent objects can be dependents (they depend on other
-objects) and/or providers (other objects depend on them).</p></section>
-<section><p>Providers are tables, conglomerates, and constraints. Dependents
-are views.   <table pgwide="1" frame="all">
+<section><p>Persistent objects can be dependents or providers. Dependents
+are objects that depend on other objects. Providers are objects that other
+objects depend on. <ul>
+<li>Dependents are views, constraints, or triggers.</li>
+<li>Providers are tables, conglomerates, constraints, or privileges.</li>
+</ul></p><p><table frame="all" pgwide="1">
 <tgroup cols="5" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="28*"/>
 <colspec colname="2" colnum="2" colwidth="24*"/><colspec colname="3" colnum="3"
 colwidth="11*"/><colspec colname="4" colnum="4" colwidth="13*"/><colspec colname="5"
@@ -44,7 +48,7 @@
 <entry colname="2">CHAR</entry>
 <entry colname="3">36</entry>
 <entry colname="4">false</entry>
-<entry colname="5">unique identifier for the dependent</entry>
+<entry colname="5">A uunique identifier for the dependent.</entry>
 </row>
 <row>
 <entry colname="1">DEPENDENTFINDER</entry>
@@ -52,14 +56,15 @@
 is not part of the public API.</entry>
 <entry colname="3">1</entry>
 <entry colname="4">false</entry>
-<entry colname="5">system type describing the view</entry>
+<entry colname="5">A system type that describes the view, constraint, or trigger
+that is the dependent.</entry>
 </row>
 <row>
 <entry colname="1">PROVIDERID</entry>
 <entry colname="2">CHAR</entry>
 <entry colname="3">36</entry>
 <entry colname="4">false</entry>
-<entry colname="5">unique identifier for the provider</entry>
+<entry colname="5">A unique identifier for the provider.</entry>
 </row>
 <row>
 <entry colname="1">PROVIDERFINDER</entry>
@@ -67,8 +72,8 @@
 not part of the public API.</entry>
 <entry colname="3">1</entry>
 <entry colname="4">false</entry>
-<entry colname="5">system type describing the tables, conglomerates, and constraints
-that are providers</entry>
+<entry colname="5">A system type that describes the table, conglomerate, constraint,
+and privilege that is the provider</entry>
 </row>
 </tbody>
 </tgroup>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsistabs22441.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsistabs22441.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsistabs22441.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsistabs22441.dita Fri Aug 18 13:49:52 2006
@@ -21,7 +21,7 @@
 <title>SYSCOLUMNS</title>
 <refbody>
 <section><p>Describes the columns within all tables in the current database:
-  <table pgwide="1" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="29*"/>
 <colspec colname="2" colnum="2" colwidth="23*"/><colspec colname="3" colnum="3"
 colwidth="10*"/><colspec colname="4" colnum="4" colwidth="11*"/><colspec colname="5"

Modified: db/derby/docs/branches/10.2/src/ref/rrefsistabs24045.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsistabs24045.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsistabs24045.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsistabs24045.dita Fri Aug 18 13:49:52 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +18,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefsistabs24045" xml:lang="en-us">
 <title>SYSVIEWS</title>
 <refbody>
@@ -71,4 +71,3 @@
 </table></p></section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefsistabs24269.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsistabs24269.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsistabs24269.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsistabs24269.dita Fri Aug 18 13:49:52 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +18,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefsistabs24269" xml:lang="en-us">
 <title>SYSTABLES</title>
 <refbody>
@@ -84,4 +84,3 @@
 </table></p></section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefsistabs26665.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsistabs26665.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsistabs26665.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsistabs26665.dita Fri Aug 18 13:49:52 2006
@@ -22,7 +22,7 @@
 <title>SYSCHECKS</title>
 <refbody>
 <section><p>Describes the check constraints within the current database. 
- <table pgwide="1" frame="all">
+<table pgwide="1" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="27*"/>
 <colspec colname="2" colnum="2" colwidth="24*"/><colspec colname="3" colnum="3"
 colwidth="9*"/><colspec colname="4" colnum="4" colwidth="13*"/><colspec colname="5"

Modified: db/derby/docs/branches/10.2/src/ref/rrefsistabs28114.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsistabs28114.dita?rev=432721&r1=432720&r2=432721&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsistabs28114.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsistabs28114.dita Fri Aug 18 13:49:52 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 



Mime
View raw message