db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r449063 - in /db/derby/docs/branches/10.2/src: devguide/ getstart/ ref/ tools/ workingwithderby/
Date Fri, 22 Sep 2006 19:37:48 GMT
Author: rhillegas
Date: Fri Sep 22 12:37:47 2006
New Revision: 449063

URL: http://svn.apache.org/viewvc?view=rev&rev=449063
Log:
DERBY-1725: Merge documentation from trunk to 10.2 branch. This merges the following patches: DERBY-1839 (448987), DERBY-1821 (448772), DERBY-1873 (448731), DERBY-1659 (448620).

Modified:
    db/derby/docs/branches/10.2/src/devguide/cdevcsecure10983.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecure21547.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecure864242.dita
    db/derby/docs/branches/10.2/src/devguide/cdevresman89722.dita
    db/derby/docs/branches/10.2/src/devguide/rdevcsecure557.dita
    db/derby/docs/branches/10.2/src/devguide/rdevexudclass.dita
    db/derby/docs/branches/10.2/src/devguide/tdevcsecureunencrypteddb.dita
    db/derby/docs/branches/10.2/src/getstart/cgsinstallingderby.dita
    db/derby/docs/branches/10.2/src/getstart/cgsquck13780.dita
    db/derby/docs/branches/10.2/src/getstart/cgsusingtoolsutils.dita
    db/derby/docs/branches/10.2/src/getstart/rgsdocs10012.dita
    db/derby/docs/branches/10.2/src/getstart/rgslib46043.dita
    db/derby/docs/branches/10.2/src/getstart/rgsquck30197.dita
    db/derby/docs/branches/10.2/src/getstart/tgssetupjavaenvir.dita
    db/derby/docs/branches/10.2/src/ref/rrefcreatefunctionstatement.dita
    db/derby/docs/branches/10.2/src/ref/rrefcreateprocedurestatement.dita
    db/derby/docs/branches/10.2/src/ref/rrefdeclaretemptable.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj15446.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj24513.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj31580.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj40506.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj43125.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqljgrant.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqljrenametablestatement.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqljrevoke.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomrefdescribe.dita
    db/derby/docs/branches/10.2/src/workingwithderby/twwdIntro.dita

Modified: db/derby/docs/branches/10.2/src/devguide/cdevcsecure10983.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevcsecure10983.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecure10983.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecure10983.dita Fri Sep 22 12:37:47 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -20,21 +20,18 @@
 -->
 <concept id="cdevcsecure10983" xml:lang="en-us">
 <title>Notes on the Derby security features</title>
-<shortdesc>Because <ph conref="devconrefs.dita#prod/productshortname"></ph> does
-not support traditional grant and revoke features, the security model has
-some basic limitations.</shortdesc>
+<shortdesc>The<ph conref="devconrefs.dita#prod/productshortname"></ph> security
+model has some basic limitations.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Security features<indexterm>limitations of</indexterm></indexterm>
+<keywords><indexterm>security features<indexterm>limitations</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>For both embedded and client/server systems, it assumes that users are
-trusted. You must trust your full-access users not to perform undesirable
-actions. You lock out non full-access users with database properties, which
-are stored in the database (and in an encrypted database these properties
-are also encrypted). Note, however, for a distributed/embedded system that
-a sophisticated user with the database encryption key might be able to physically
-change those properties in the database files.</p>
+<p>You lock out non full-access users with database properties, which are
+stored in the database (and in an encrypted database these properties are
+also encrypted). Note, however, for a distributed/embedded system that a sophisticated
+user with the database encryption key might be able to physically change those
+properties in the database files.</p>
 <p>In addition, in the <ph conref="devconrefs.dita#prod/productshortname"></ph> system,
 it is not necessary to have a specific connection (or permission to access
 a particular database) to shut down the system. Any authenticated user can

Modified: db/derby/docs/branches/10.2/src/devguide/cdevcsecure21547.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevcsecure21547.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecure21547.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecure21547.dita Fri Sep 22 12:37:47 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -23,8 +23,9 @@
 <shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> provides
 a simple, built-in repository of user names and passwords.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Users<indexterm>Derby's built-in repository</indexterm></indexterm>
-<indexterm>Passwords</indexterm></keywords>
+<keywords><indexterm>users<indexterm>built-in repository</indexterm></indexterm>
+<indexterm>passwords<indexterm>built-in repository</indexterm></indexterm>
+</keywords>
 </metadata></prolog>
 <conbody>
 <p>To use the built-in repository, set <i>derby.authentication.provider</i> to <i>BUILTIN</i>.
@@ -33,7 +34,7 @@
 <codeblock>derby.authentication.provider=BUILTIN</codeblock>
 <p>You can create user names and passwords for <ph conref="devconrefs.dita#prod/productshortname"></ph> users
 by specifying them with the <i>derby.user.UserName</i> property.</p>
-<note>These user names are case-sensitive for user authorization. User names
+<note>These user names are case-sensitive for user authentication. User names
 are <i>SQL92Identifiers</i>. Delimited identifiers are allowed:   <codeblock>derby.user."FRed"=java</codeblock></note>
 <note>For passwords, it is a good idea not to use words that would be easily
 guessed, such as a login name or simple words or numbers. A password should

Modified: db/derby/docs/branches/10.2/src/devguide/cdevcsecure864242.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevcsecure864242.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecure864242.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecure864242.dita Fri Sep 22 12:37:47 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -26,12 +26,14 @@
 Typically you would set these at the same level (database or system) for which
 you configured the external authentication service.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>JNDI properties for user authorization<indexterm>setting</indexterm></indexterm>
+<keywords><indexterm>JNDI properties<indexterm>setting</indexterm></indexterm>
+<indexterm>user authentication<indexterm>JNDI properties, setting</indexterm></indexterm>
+<indexterm>external authentication<indexterm>JNDI properties, setting</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
 <p>The list of supported properties can be found in Appendix A: JNDI Context
-Environment in the Java Naming and Direction API at <synph><var>http://java.sun.com/products/jndi/reference/api/index.html</var></synph>.
+Environment in the Java Naming and Directory API at <synph><var>http://java.sun.com/products/jndi/reference/api/index.html</var></synph>.
 The external directory service must support the property.</p>
 <p>Each JNDI provider has its set of properties that you can set within the <ph
 conref="devconrefs.dita#prod/productshortname"></ph> system.</p>

Modified: db/derby/docs/branches/10.2/src/devguide/cdevresman89722.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevresman89722.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevresman89722.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevresman89722.dita Fri Sep 22 12:37:47 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -23,7 +23,11 @@
 <shortdesc>Normally, you can simply work with the interfaces for <i>javax.sql.DataSource</i>, <codeph><i>javax.sql.ConnectionPoolDataSource</i></codeph
 >, and <codeph><i>javax.sql.XADataSource</i></codeph>, as shown in the following
 examples.</shortdesc>
-<prolog></prolog>
+<prolog><metadata>
+<keywords><indexterm>properties<indexterm>DataSource</indexterm></indexterm>
+<indexterm><indexterm>DataSource</indexterm>properties</indexterm><indexterm><indexterm>DataSource</indexterm>getting</indexterm>
+</keywords>
+</metadata></prolog>
 <conbody>
 <codeblock>
 <b>//
@@ -50,14 +54,14 @@
 is to be accessed, then one should call <i>setDatabaseName</i>("/local1/db/wombat")
 on the data source object. </p></li>
 <li><i>CreateDatabase</i>   <p>Optional. Sets a property to create a database
-the next time the <i>XADataSource.getXAConection()</i> method is called. The
-string <i>createString</i> is always "create" (or possibly null). (Use the
-method <codeph><i>setDatabaseName()</i></codeph> to define the name of the
-database.)</p></li>
+the next time the <i>getConnection</i> method of a data source object is called.
+The string <i>createString</i> is always "create" (or possibly null). (Use
+the method <codeph><i>setDatabaseName()</i></codeph> to define the name of
+the database.)</p></li>
 <li><i>ShutdownDatabase</i>   <p>Optional. Sets a property to shut down a
 database. The string <i>shutDownString</i> is always "shutdown" (or possibly
-null). Shuts down the database the next time <codeph><i>XADataSource.getXAConnection().getConnection()</i></codeph> method
-is called.</p></li>
+null). Shuts down the database the next time <codeph><i>getConnection</i></codeph> method
+of a data source object is called.</p></li>
 <li><i>DataSourceName</i>   <p>Optional. Name for ConnectionPooledDataSource
 or XADataSource. Not used by the data source object. Used for informational
 purpose only. </p></li>

Modified: db/derby/docs/branches/10.2/src/devguide/rdevcsecure557.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/rdevcsecure557.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/rdevcsecure557.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/rdevcsecure557.dita Fri Sep 22 12:37:47 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -19,10 +19,14 @@
 limitations under the License.
 -->
 <reference id="rdevcsecure557" xml:lang="en-us">
-<title>List of user-authentication properties</title>
+<title>List of user authentication properties</title>
 <shortdesc>This 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>
+<table frame="all" id="cdevcsecure27690"><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>
@@ -46,19 +50,19 @@
 the server.</entry>
 </row>
 <row>
-<entry colname="1"><i>derby.authentication.ldap.searchAuthDN, derby.authentication.ldap.searchAuthPW, <ph
-conref="devconrefs.dita#prod/productshortname"></ph>.authentication.ldap.searchFilter, </i> and <codeph><i> <ph
-conref="devconrefs.dita#prod/productshortname"></ph>.authentication. ldap.searchBase</i></codeph></entry>
-<entry colname="2">Configures the way DN searches are performed.</entry>
+<entry colname="1"><i>derby.authentication.ldap.searchAuthDN, derby.authentication.ldap.searchAuthPW,
+derby.authentication.ldap.searchFilter,</i> and <i>derby.authentication.ldap.searchBase</i></entry>
+<entry colname="2">Configures the way that DN searches are performed.</entry>
 </row>
 <row>
 <entry colname="1"><i>derby.user.UserName</i></entry>
-<entry colname="2">Creates a user name and password for <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
-built-in user repository.</entry>
+<entry colname="2">Creates a user name and password for the built-in user
+repository in<ph conref="devconrefs.dita#prod/productshortname"></ph>.</entry>
 </row>
 <row>
 <entry colname="1"><i>java.naming.*</i></entry>
-<entry colname="2">JNDI properties. See Appendix A in the JNDI API reference for more information about these.</entry>
+<entry colname="2">JNDI properties. See Appendix A in the JNDI API reference
+for more information about these properties.</entry>
 </row>
 </tbody>
 </tgroup>

Modified: db/derby/docs/branches/10.2/src/devguide/rdevexudclass.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/rdevexudclass.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/rdevexudclass.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/rdevexudclass.dita Fri Sep 22 12:37:47 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -20,8 +20,11 @@
 -->
 <reference id="rdevexudclass" xml:lang="en-us">
 <title>Example of setting a user-defined class</title>
-<shortdesc>A very simple example of a class that implements the <i>org.apache.derby.authentication</i> interface.</shortdesc>
-<prolog></prolog>
+<shortdesc>A very simple example of a class that implements the <i>org.apache.derby.authentication.UserAuthenticator </i> interface.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>user-defined classes<indexterm>setting</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <refbody>
 <example> <codeblock>import org.apache.derby.authentication.UserAuthenticator;
 import java.io.FileInputStream;
@@ -31,7 +34,7 @@
   * A simple example of a specialized Authentication scheme.
   * The system property 'derby.connection.requireAuthentication'
   * must be set
-  * to true and 'derby.connection.specificAuthentication' must
+  * to true and 'derby.authentication.provider' must
   * contain the full class name of the overriden authentication
   * scheme,  i.e., the name of this class.
   *

Modified: db/derby/docs/branches/10.2/src/devguide/tdevcsecureunencrypteddb.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/tdevcsecureunencrypteddb.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/tdevcsecureunencrypteddb.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/tdevcsecureunencrypteddb.dita Fri Sep 22 12:37:47 2006
@@ -44,7 +44,7 @@
 consuming process because it involves encrypting all of the existing data
 in the database. If the process is interrupted before completion, all the
 changes are rolled back the next time that the database is booted. If the
-interruption occurs immediately after the database is encryped but before
+interruption occurs immediately after the database is encrypted but before
 the connection is returned to the application, you might not be able to boot
 the database without the boot password or external encryption key. In these
 rare circumstances, you should try to boot the database with the boot password
@@ -54,8 +54,8 @@
 disk space is required to store the old version of the data to restore the
 database back to it's original state if the encryption is interrupted or returns
 errors. All of the temporary disk space is released back to the operating
-system after the database is encrypted.</note><p>To encrypting an existing
-unencrypted database:</p></context>
+system after the database is encrypted.</note><p>To encrypt an existing unencrypted
+database:</p></context>
 <steps>
 <step><cmd>Specify the <i>dataEncryption=true</i> attribute and either the <i>encryptionKey</i> attribute
 or the <i>bootPassword</i> attribute in a URL and boot the database.</cmd>

Modified: db/derby/docs/branches/10.2/src/getstart/cgsinstallingderby.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/cgsinstallingderby.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/cgsinstallingderby.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/cgsinstallingderby.dita Fri Sep 22 12:37:47 2006
@@ -57,9 +57,11 @@
 utilities and setting up the environment.</li>
 <li>The <filepath>javadoc</filepath> subdirectory contains the <codeph>api</codeph> documentation
 that was generated from source code comments.</li>
-<li>The <filepath>doc</filepath> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation.</li>
-<li>The <filepath>lib</filepath> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> jar
+<li>The <filepath>docs</filepath> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation.</li>
+<li>The <filepath>lib</filepath> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> jar 
 files.</li>
+<li>The <filepath>test</filepath> subdirectory contains regression tests for <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</li>
+<li>The <filepath>frameworks</filepath> subdirectory contains older style scripts for executing utilities and setting up the environment. These are provided in this release for backward compatibility. In a next release, they will be deprecated in favor of the scripts in the <filepath>bin</filepath> directory. </li>
 </ul></p>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.2/src/getstart/cgsquck13780.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/cgsquck13780.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/cgsquck13780.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/cgsquck13780.dita Fri Sep 22 12:37:47 2006
@@ -31,7 +31,7 @@
 a server framework that allows multiple network connections. (The framework
 itself starts an instance of <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
 runs in an embedded environment. However, the client applications do not run
-in the embedded environment. )</p>
+in the embedded environment.)</p>
 <p>You can also embed <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
 any Java server framework. </p>
 <p>See the <cite><ph conref="gsconrefs.dita#pub/citadmin"></ph></cite> for

Modified: db/derby/docs/branches/10.2/src/getstart/cgsusingtoolsutils.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/cgsusingtoolsutils.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/cgsusingtoolsutils.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/cgsusingtoolsutils.dita Fri Sep 22 12:37:47 2006
@@ -45,7 +45,7 @@
 Server, use the following commands: <ul>
 <li>For the <cmdname>dblook</cmdname> tool, call the script and specify the
 -d option and the full URL to the Network Server database. For example: <codeph>dblook
--d 'jdbc:derby://localhost/myDB;user=usr;'</codeph> </li>
+-d 'jdbc:derby://localhost/myDB;user=usr'</codeph> </li>
 <li>For the <cmdname>ij</cmdname> tool, issue the command <codeph>set DERBY_OPTS=-Dij.protocol=jdbc:derby://localhost/</codeph> and
 then start <cmdname>ij</cmdname> by issuing the command <codeph>ij</codeph>.</li>
 <li>For the <cmdname>sysinfo</cmdname> tool, issue the command <codeph>NetworkServerControl

Modified: db/derby/docs/branches/10.2/src/getstart/rgsdocs10012.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/rgsdocs10012.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/rgsdocs10012.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/rgsdocs10012.dita Fri Sep 22 12:37:47 2006
@@ -34,7 +34,7 @@
 <tbody>
 <row>
 <entry colname="1"><codeph>|</codeph></entry>
-<entry colname="2">“or.” Choose one of the items</entry>
+<entry colname="2">or. Choose one of the items</entry>
 </row>
 <row>
 <entry colname="1"><codeph>[ ]</codeph></entry>
@@ -61,8 +61,6 @@
   ON <b><i>TableName</i></b> ( <b><i>SimpleColumnName</i></b> [ , <b><i>SimpleColumnName</i></b> ] * ) </b></codeblock></p></section>
 <section><p>Command-line syntax for running Java programs and utilities (as
 well as examples) always begins with the word <i>java</i>: <codeblock>java org.apache.derby.tools.ij</codeblock></p></section>
-<section><p>In addition, this documentation uses the IBM Software Development
-Kit style for setting JVM arguments and properties. If you use another Java
-Virtual Machine, the way you set JVM arguments and properties might be different.</p></section>
+<section><p>This documentation attempts to be JVM neutral, but any command line examples or syntax using JVM specific references should be verified with your JVM documentation.</p></section>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/getstart/rgslib46043.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/rgslib46043.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/rgslib46043.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/rgslib46043.dita Fri Sep 22 12:37:47 2006
@@ -24,7 +24,7 @@
 <prolog><metadata>
 <keywords><indexterm>derbyclient.jar</indexterm><indexterm>derby.jar</indexterm>
 <indexterm>derbytools.jar</indexterm><indexterm>Sample application libraries</indexterm>
-<indexterm>Sample database libraries</indexterm></keywords>
+<indexterm>Sample database libraries</indexterm><indexterm>derbyrun.jar</indexterm></keywords>
 </metadata></prolog>
 <refbody>
 <table frame="all"><title>Derby libraries and their use</title>
@@ -38,7 +38,7 @@
 </thead>
 <tbody>
 <row>
-<entry nameend="2" namest="1"><b>Engine libraries</b>   <p>You always need
+<entry nameend="2" namest="1"><b>Engine library</b>   <p>You always need
 this library for embedded environments. For client/server environments, you
 only need this library on the server.</p></entry>
 </row>
@@ -57,7 +57,11 @@
 (such as ij, dblook, and import/export). </entry>
 </row>
 <row>
-<entry nameend="2" namest="1"><b>The Network Server libraries</b></entry>
+<entry colname="1">derbyrun.jar</entry>
+<entry colname="2">Executable jar file that can be used to start the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools. </entry>
+</row>
+<row>
+<entry nameend="2" namest="1"><b>The Network Server library</b></entry>
 </row>
 <row>
 <entry colname="1">derbynet.jar</entry>
@@ -65,7 +69,7 @@
 Server.</entry>
 </row>
 <row>
-<entry nameend="2" namest="1"><b>The network client libraries</b></entry>
+<entry nameend="2" namest="1"><b>The network client library</b></entry>
 </row>
 <row>
 <entry colname="1">derbyclient.jar</entry>

Modified: db/derby/docs/branches/10.2/src/getstart/rgsquck30197.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/rgsquck30197.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/rgsquck30197.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/rgsquck30197.dita Fri Sep 22 12:37:47 2006
@@ -36,10 +36,10 @@
 </ul></p></section>
 <section><p>For the <ph conref="gsconrefs.dita#prod/productshortname"></ph>-provided
 network client driver, the format for the database connection URL for connecting
-to a database is this:   <codeblock>jdbc:derby://&lt;server>[:&lt;port>]/
-<i>databaseName</i>[;<i>URLAttributes</i>=&lt;value> [;...]]</codeblock>where
+to a database is this:   <codeblock>jdbc:derby://&lt;server>[:&lt;port>]/<i>databaseName</i>[;<i>URLAttributes</i>=&lt;value>[;...]]</codeblock>where
 the &lt;server> and &lt;port> specify the host name (or IP address) and port
-number where the server is listening for requests. The <i>URLAttributes</i> can
+number where the server is listening for requests and <i>databaseName</i> is the 
+name of the database you want to connect to. The <i>URLAttributes</i> can
 be either <ph conref="gsconrefs.dita#prod/productshortname"></ph> embedded
 or network client attributes. See the <ph conref="gsconrefs.dita#pub/citadmin"></ph> for
 more information on accessing the Network Server by using the network client.</p></section>

Modified: db/derby/docs/branches/10.2/src/getstart/tgssetupjavaenvir.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/getstart/tgssetupjavaenvir.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/getstart/tgssetupjavaenvir.dita (original)
+++ db/derby/docs/branches/10.2/src/getstart/tgssetupjavaenvir.dita Fri Sep 22 12:37:47 2006
@@ -22,7 +22,7 @@
 <title>Setting up your environment</title>
 <shortdesc>You need to set several environment variables so that the scripts
 that are included with the <ph conref="gsconrefs.dita#prod/productshortname"></ph> <codeph>bin</codeph> distribution
-run correctly.</shortdesc>
+run correctly. These scripts need to be run in an appropriate command line environment, i.e. a "Command Prompt" on Windows or a shell on Unix.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Derby<indexterm>environment setup</indexterm></indexterm>
 <indexterm>environment variables<indexterm>DERBY_HOME</indexterm></indexterm>
@@ -39,10 +39,16 @@
 <step><cmd>Set the <ph conref="gsconrefs.dita#prod/productinstallpath"></ph> environment
 variable to the location where you extracted the <ph conref="gsconrefs.dita#prod/productshortname"></ph> bin
 distribution.</cmd><stepxmp>For example, if you installed <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
-the c:\<ph conref="gsconrefs.dita#prod/productinstallname"></ph> directory,
+the c:\<ph conref="gsconrefs.dita#prod/productinstallname"></ph> directory on Windows, or the /opt/<ph conref="gsconrefs.dita#prod/productinstallname"></ph> directory on Unix,
 use the following command to set the <ph conref="gsconrefs.dita#prod/productinstallpath"></ph> environment
-variable:  <codeblock>set <ph conref="gsconrefs.dita#prod/productinstallpath"></ph>=c:\<ph
-conref="gsconrefs.dita#prod/productinstallname"></ph></codeblock></stepxmp>
+variable:</stepxmp> 
+<choicetable>
+<chhead><choptionhd>Operating System</choptionhd><chdeschd>Command</chdeschd>
+</chhead>
+<chrow><choption>UNIX</choption><chdesc><codeph>export <ph conref="gsconrefs.dita#prod/productinstallpath"></ph>=/opt/<ph conref="gsconrefs.dita#prod/productinstallname"></ph></codeph></chdesc>
+</chrow>
+<chrow><choption>Windows</choption><chdesc><codeph>set <ph conref="gsconrefs.dita#prod/productinstallpath"></ph>=c:\<ph conref="gsconrefs.dita#prod/productinstallname"></ph></codeph></chdesc></chrow>
+</choicetable>
 </step>
 <step><cmd>Set the JAVA_HOME environment variable. The JAVA_HOME environment
 variable is used by the scripts to locate the JVM and Java applications. </cmd>
@@ -63,15 +69,15 @@
 </chhead>
 <chrow><choption>UNIX</choption><chdesc><codeph>export PATH="$<ph conref="gsconrefs.dita#prod/productinstallpath"></ph>/bin:$PATH"</codeph></chdesc>
 </chrow>
-<chrow><choption>Windows</choption><chdesc><codeph>set PATH=%<ph conref="gsconrefs.dita#prod/productinstallpath"></ph>\bin;%PATH%</codeph></chdesc>
+<chrow><choption>Windows</choption><chdesc><codeph>set PATH=%<ph conref="gsconrefs.dita#prod/productinstallpath"></ph>%\bin;%PATH%</codeph></chdesc>
 </chrow>
 </choicetable>
 <info>When the <ph conref="gsconrefs.dita#prod/productinstallpath"></ph> environment
-variable is set in the PATH environment variable, you can use shortened commands
+variable is set and the underlying bin directory is included in the PATH environment variable, you can use shortened commands
 to start the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools. </info>
 </step>
 <step><cmd>Verify that the DERBY_HOME and the JAVA_HOME environment variables
-are set correctly, and that the $DERBY_HOME/bin directory is added to the
+are set correctly, and that the DERBY_HOME/bin directory is added to the
 PATH environment variable. </cmd><stepxmp>Use the following command to check
 the settings: <codeblock>sysinfo </codeblock></stepxmp><stepresult>If the
 environment variables are set correctly, the sysinfo command displays information

Modified: db/derby/docs/branches/10.2/src/ref/rrefcreatefunctionstatement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefcreatefunctionstatement.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefcreatefunctionstatement.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefcreatefunctionstatement.dita Fri Sep 22 12:37:47 2006
@@ -23,14 +23,20 @@
 <shortdesc>The CREATE FUNCTION statement allows you to create Java functions,
 which you can then use in an expression.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>CREATE FUNCTION statement</indexterm></keywords>
+<keywords><indexterm>CREATE FUNCTION statement</indexterm><indexterm><indexterm>SQL
+statements</indexterm>CREATE FUNCTION</indexterm><indexterm>functions<indexterm>creating</indexterm></indexterm>
+</keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Syntax</title> <codeblock><b>CREATE FUNCTION <i><xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionname"
+<section><p>The function owner and the database owner automatically gain the
+EXECUTE privilege on the function, and are able to grant this privilege to
+other users. The EXECUTE privileges cannot be revoked from the function and
+database owners.</p></section>
+<refsyn><title>Syntax</title> <codeblock><b>CREATE FUNCTION <i><xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionname"
 >function-name</xref></i> ( [ <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionparameter">FunctionParameter</xref
 > 
    [, <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionparameter">FunctionParameter</xref>] ] * ) RETURNS DataType [ <xref
-href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionelement">FunctionElement</xref> ] *</b></codeblock></section>
+href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionelement">FunctionElement</xref> ] *</b></codeblock></refsyn>
 <example id="rrefcrprofunctionname"><title>function-Name</title><codeblock><b>[ <i><xref
 href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
 href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock><p>If

Modified: db/derby/docs/branches/10.2/src/ref/rrefcreateprocedurestatement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefcreateprocedurestatement.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefcreateprocedurestatement.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefcreateprocedurestatement.dita Fri Sep 22 12:37:47 2006
@@ -20,15 +20,23 @@
 -->
 <reference id="rrefcreateprocedurestatement" xml:lang="en-us">
 <title>CREATE PROCEDURE statement</title>
+<prolog><metadata>
+<keywords><indexterm>CREATE PROCEDURE statement</indexterm><indexterm><indexterm>SQL
+statements</indexterm>CREATE PROCEDURE</indexterm><indexterm>procedures<indexterm>creating</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <refbody>
 <section><p>The CREATE PROCEDURE statement allows you to create Java stored
-procedures, which you can then call using the CALL PROCEDURE statement.</p></section>
-<section><title>Syntax</title><codeblock><b>CREATE PROCEDURE <i><xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedurename"
+procedures, which you can then call using the CALL PROCEDURE statement.</p><p>The
+procedure owner and the database owner automatically gain the EXECUTE privilege
+on the procedure, and are able to grant this privilege to other users. The
+EXECUTE privileges cannot be revoked from the procedure and database owners.</p></section>
+<refsyn><title>Syntax</title><codeblock><b>CREATE PROCEDURE <i><xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedurename"
 >procedure-Name</xref></i> ( [ <xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedureparameter">ProcedureParameter</xref
 >
    [, <xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedureparameter">ProcedureParameter</xref>] ] * )
 [ <xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedureelement">ProcedureElement</xref> ] *</b></codeblock
-></section>
+></refsyn>
 <example id="rrefcrproprocedurename"><title>procedure-Name</title><codeblock><b>[ <i><xref
 href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
 href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></example>

Modified: db/derby/docs/branches/10.2/src/ref/rrefdeclaretemptable.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefdeclaretemptable.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefdeclaretemptable.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefdeclaretemptable.dita Fri Sep 22 12:37:47 2006
@@ -24,7 +24,8 @@
 table for the current connection. </shortdesc>
 <prolog><metadata>
 <keywords><indexterm>DECLARE GLOBAL TEMPORARY TABLE statement</indexterm>
-<indexterm>tables<indexterm>temporary</indexterm></indexterm></keywords>
+<indexterm>tables<indexterm>temporary</indexterm></indexterm><indexterm><indexterm>SQL
+statements</indexterm>DECLARE GLOBAL TEMPORARY TABLE</indexterm></keywords>
 </metadata></prolog>
 <refbody>
 <section><p>These tables do not reside in the system catalogs and are not
@@ -58,12 +59,13 @@
 more information on <codeph>column-definition</codeph>. <codeph>DECLARE GLOBAL
 TEMPORARY TABLE</codeph> does not allow <codeph>generated-column-spec</codeph> in
 the <codeph>column-definition</codeph>.</p></section>
-<section id="rreftemptabledatatype"><title>Data type</title><p>Supported data types
-are: <ul>
+<section id="rreftemptabledatatype"><title>Data type</title><p>Supported data
+types are: <ul>
 <li>BIGINT</li>
 <li>CHAR</li>
 <li>DATE</li>
 <li>DECIMAL</li>
+<li>DOUBLE</li>
 <li>DOUBLE PRECISION</li>
 <li>FLOAT</li>
 <li>INTEGER</li>
@@ -126,34 +128,41 @@
 <li>PARTITIONING KEY</li>
 <li>WITH REPLACE </li>
 </ul> </p></section>
-<section><title>Restrictions on Declared Global Temporary Tables</title> <p>Temporary
+<section><title>Restrictions on Declared Global Temporary Tables</title> <p><ph
+conref="refconrefs.dita#prod/productshortname"></ph> does not support the
+following features on temporary tables. Some of these features are specific
+to temporary tables and some are specific to <ph conref="refconrefs.dita#prod/productshortname"></ph>.</p><p>Temporary
 tables cannot be specified in the following statements: <ul>
 <li>ALTER TABLE </li>
+<li>CREATE INDEX</li>
 <li>CREATE SYNONYM</li>
 <li>CREATE TRIGGER</li>
 <li>CREATE VIEW</li>
-<li>LOCK</li>
+<li>GRANT</li>
+<li>LOCK TABLE</li>
 <li>RENAME</li>
-</ul></p><p>Temporary tables cannot be specified in referential constraints.</p><p>There
-is no support for check constraints on columns.</p><p>The following data types
-cannot be used with Declared Global Temporary Tables: <ul>
+<li>REVOKE</li>
+</ul></p><p>You cannot use the following features with temporary tables:</p><ul>
+<li>Synonyms, triggers and views on SESSION schema tables (including physical
+tables and temporary tables) </li>
+<li>Caching statements that reference SESSION schema tables and views</li>
+<li>Temporary tables cannot be specified in referential constraints and primary
+keys</li>
+<li>Temporary tables cannot be referenced in a triggered-SQL-statement</li>
+<li>Check constraints on columns</li>
+<li>Generated-column-spec</li>
+<li>Importing into temporary tables</li>
+</ul> <p>If a statement that performs an insert, update, or delete to the
+temporary table encounters an error, all the rows of the temporary table are
+deleted.</p><p>The following data types cannot be used with Declared Global
+Temporary Tables: <ul>
 <li>BLOB</li>
+<li>CHAR FOR BIT DATA</li>
 <li>CLOB</li>
 <li>LONG VARCHAR</li>
+<li>LONG VARCHAR FOR BIT DATA</li>
+<li>VARCHAR FOR BIT DATA</li>
 <li>XML</li>
-</ul></p><p>Temporary tables cannot be referenced in a triggered-SQL-statement.</p><p>If
-a statement that performs an insert, update, or delete to the temporary table
-encounters an error, all the rows of the temporary table are deleted.</p></section>
-<section><title>Restrictions Specific to Derby</title> <p><ph conref="refconrefs.dita#prod/productshortname"></ph> does
-not support the following features on temporary tables:</p> <ul>
-<li>Indexes</li>
-<li>Synonyms, triggers and views on SESSION schema tables (including physical
-tables and temporary tables)</li>
-<li>LOCK TABLE</li>
-<li>Constraints and primary keys</li>
-<li>Generated-column-spec</li>
-<li>Importing into temporary tables</li>
-</ul> <p>Statements that reference SESSION schema tables and views are not
-cached.</p></section>
+</ul></p></section>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj15446.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj15446.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj15446.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj15446.dita Fri Sep 22 12:37:47 2006
@@ -1,4 +1,6 @@
 <?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,19 +17,32 @@
 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="rrefsqlj15446" xml:lang="en-us">
 <title>CREATE VIEW statement</title>
 <prolog><metadata>
-<keywords><indexterm>CREATE VIEW statement</indexterm><indexterm>Views<indexterm>creating</indexterm></indexterm>
+<keywords><indexterm>CREATE VIEW statement</indexterm><indexterm><indexterm>SQL
+statements</indexterm>CREATE VIEW</indexterm><indexterm>views<indexterm>creating</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
 <section> <p>Views are virtual tables formed by a query. A view is a dictionary
-object that you can use until you drop it.</p> <p>Views are not updatable.</p> <p>If
-a qualified view name is specified, the schema name cannot begin with <i>SYS</i>.</p></section>
+object that you can use until you drop it. Views are not updatable.</p><p>If
+a qualified view name is specified, the schema name cannot begin with <i>SYS</i>.</p><p>The
+view owner automatically gains the SELECT privilege on the view. The SELECT
+privilege cannot be revoked from the view owner. The database owner automatically
+gains the SELECT privilege on the view and is able to grant this privilege
+to other users. The SELECT privilege cannot be revoked from the database owner.</p><p>The
+view owner can only grant the SELECT privilege to other users if the view
+owner also owns the underlying objects. </p><p>If the underlying objects that
+the view references are not owned by the view owner, the view owner must be
+granted the appropriate privileges. For example, if the authorization ID <codeph>user2</codeph> attempts
+to create a view called <codeph>user2.v2</codeph> that references table <codeph>user1.t1</codeph> and
+function <codeph>user1.f_abs()</codeph>, then <codeph>user2</codeph> must
+have the SELECT privilege on table <codeph>user1.t1</codeph> and the EXECUTE
+privilege on function <codeph>user1.f_abs()</codeph>. </p><p>The privilege
+to grant the SELECT privilege cannot be revoked. If a required privilege on
+one of the underlying objects that the view references is revoked, then the
+view is dropped.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>CREATE VIEW <i><xref href="rrefviewname.dita#rrefviewname">view-Name</xref></i>
     [ ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i> [, <i><xref
 href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i>] * ) ]
@@ -68,4 +83,3 @@
 external scalar function  <i>SIN.</i></p> </section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj24513.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj24513.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj24513.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj24513.dita Fri Sep 22 12:37:47 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -20,18 +21,27 @@
 <reference id="rrefsqlj24513" xml:lang="en-us">
 <title>CREATE TABLE statement</title>
 <prolog><metadata>
-<keywords><indexterm>CREATE TABLE statement</indexterm><indexterm>Defaults</indexterm>
-<indexterm>Column defaults</indexterm></keywords>
+<keywords><indexterm>CREATE TABLE statement</indexterm><indexterm><indexterm>SQL
+statements</indexterm>CREATE TABLE</indexterm><indexterm>tables<indexterm>creating</indexterm></indexterm>
+</keywords>
 </metadata></prolog>
 <refbody>
 <section> <p>A CREATE TABLE statement creates a table. Tables contain columns
 and constraints, rules to which data must conform. Table-level constraints
 specify a column or columns. Columns have a data type and can specify column
-constraints (column-level constraints).</p><p>For information about constraints,
-see <xref href="rrefsqlj13590.dita#rrefsqlj13590"></xref>.</p><p>You can specify
-a default value for a column. A default value is the value to be inserted
-into a column if no other value is specified. If not explicitly specified,
-the default value of a column is NULL. See <xref href="rrefsqlj30540.dita#rrefsqlj30540/sqlj64478"></xref>.</p><p>You
+constraints (column-level constraints).</p><p>The table owner and the database
+owner automatically gain the following privileges on the table and are able
+to grant these privileges to other users:<ul>
+<li>INSERT</li>
+<li>SELECT</li>
+<li>REFERENCES</li>
+<li>TRIGGER</li>
+<li>UPDATE</li>
+</ul>These privileges cannot be revoked from the table and database owners.</p><p>For
+information about constraints, see <xref href="rrefsqlj13590.dita#rrefsqlj13590"></xref>.</p><p>You
+can specify a default value for a column. A default value is the value to
+be inserted into a column if no other value is specified. If not explicitly
+specified, the default value of a column is NULL. See <xref href="rrefsqlj30540.dita#rrefsqlj30540/sqlj64478"></xref>.</p><p>You
 can specify storage properties such as page size for a table by calling the <codeph>SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY</codeph> system
 procedure.</p><p>If a qualified table name is specified, the schema name cannot
 begin with <i>SYS</i>.</p></section>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj31580.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj31580.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj31580.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj31580.dita Fri Sep 22 12:37:47 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,36 +18,37 @@
 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="rrefsqlj31580" xml:lang="en-us">
 <title>CREATE SCHEMA statement</title>
 <prolog><metadata>
-<keywords><indexterm>CREATE SCHEMA statement</indexterm><indexterm>Schemas<indexterm>creating</indexterm></indexterm>
+<keywords><indexterm>CREATE SCHEMA statement</indexterm><indexterm><indexterm>SQL
+statements</indexterm>CREATE SCHEMA</indexterm><indexterm>schemas<indexterm>creating</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
 <section> <p>A schema is a way to logically group objects in a single collection
 and provide a unique namespace for objects. </p></section>
-<refsyn><title>Syntax</title> <codeblock><b>CREATE SCHEMA <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i></b></codeblock> <p>The
-CREATE SCHEMA statement is used to create a schema. A schema name cannot exceed
-128 characters. Schema names must be unique within the database.</p> </refsyn>
-<example> <codeblock><b><ph>-- Create a schema for employee-related tables</ph>
-CREATE SCHEMA EMP;
-<ph>-- Create a schema for airline-related tables</ph>
-CREATE SCHEMA Flights
-<ph>-- Create a table called "Availability" in each schema</ph>
-CREATE TABLE FLIGHTS.AVAILABILITY
+<refsyn><title>Syntax</title> <codeblock><b>CREATE SCHEMA { [ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> AUTHORIZATION <i
+>user-name</i> ] | [ <i>schemaName</i> ] | 
+[ AUTHORIZATION <i>user-name</i> ] }</b>
+</codeblock> <p>The CREATE SCHEMA statement is used to create a schema. A
+schema name cannot exceed 128 characters. Schema names must be unique within
+the database.</p> </refsyn>
+<example><title>CREATE SCHEMA examples</title><p>To create a schema for airline-related
+tables and give the authorization ID <codeph>anita</codeph> access to all
+of the objects that use the schema, use the following syntax:<codeblock><b>CREATE SCHEMA FLIGHTS AUTHORIZATION anita</b> </codeblock></p><p>To
+create a schema employee-related tables, use the following syntax:<codeblock><b>CREATE SCHEMA EMP</b> </codeblock></p><p>To
+create a schema that uses the same name as the authorization ID <codeph>takumi</codeph>,
+use the following syntax:<codeblock><b>CREATE SCHEMA AUTHORIZATION takumi</b> </codeblock></p><p>To
+create a table called <codeph>availability</codeph> in the <codeph>EMP</codeph> and <codeph>FLIGHTS</codeph> schemas,
+use the following syntax:<codeblock><b>CREATE TABLE FLIGHTS.AVAILABILITY
 	(FLIGHT_ID CHAR(6) NOT NULL, SEGMENT_NUMBER INT NOT NULL,
 	FLIGHT_DATE DATE NOT NULL, ECONOMY_SEATS_TAKEN INT,
 	BUSINESS_SEATS_TAKEN INT, FIRSTCLASS_SEATS_TAKEN INT, 
 	CONSTRAINT FLT_AVAIL_PK
-	PRIMARY KEY (FLIGHT_ID, SEGMENT_NUMBER, FLIGHT_DATE));
-
-CREATE TABLE EMP.AVAILABILITY
+	PRIMARY KEY (FLIGHT_ID, SEGMENT_NUMBER, FLIGHT_DATE))</b> </codeblock></p><codeblock><b>CREATE TABLE EMP.AVAILABILITY
 	(HOTEL_ID INT NOT NULL, BOOKING_DATE DATE NOT NULL, ROOMS_TAKEN INT,
-	CONSTRAINT HOTELAVAIL_PK PRIMARY KEY (HOTEL_ID, BOOKING_DATE));</b></codeblock> </example>
+	CONSTRAINT HOTELAVAIL_PK PRIMARY KEY (HOTEL_ID, BOOKING_DATE))
+</b></codeblock> </example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj40506.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj40506.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj40506.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj40506.dita Fri Sep 22 12:37:47 2006
@@ -1,4 +1,6 @@
 <?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,33 +17,33 @@
 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="rrefsqlj40506" xml:lang="en-us">
 <title>LOCK TABLE statement</title>
 <prolog><metadata>
-<keywords><indexterm>LOCK TABLE statement</indexterm><indexterm>Tables<indexterm>locking</indexterm></indexterm>
-<indexterm>Lock escalation<indexterm>by user</indexterm></indexterm></keywords>
+<keywords><indexterm>LOCK TABLE statement</indexterm><indexterm><indexterm>SQL
+statements</indexterm>LOCK TABLE</indexterm><indexterm>tables<indexterm>locking</indexterm></indexterm>
+<indexterm>lock escalation<indexterm>by user</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>Allows a user to explicitly acquire a shared or exclusive table
-lock on the specified table. The table lock lasts until the end of the current
-transaction. </p><p>Explicitly locking a table is useful for:   <ul>
-<li>avoiding the overhead of multiple row locks on a table (in other words,
-user-initiated lock escalation)</li>
-<li>avoiding deadlocks</li>
+<section> <p>The LOCK TABLE statement allows you to explicitly acquire a shared
+or exclusive table lock on the specified table. The table lock lasts until
+the end of the current transaction. </p><p>To lock a table, you must either
+be the database owner or the table owner.</p><p>Explicitly locking a table
+is useful to:   <ul>
+<li>Avoid the overhead of multiple row locks on a table (in other words, user-initiated
+lock escalation)</li>
+<li>Avoid deadlocks</li>
 </ul></p><p>You cannot lock system tables with this statement.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>LOCK TABLE <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i> IN { SHARE | EXCLUSIVE } MODE</b
 ></codeblock><p>Once a table is locked in either mode, a transaction does
-not acquire any subsequent row-level locks on a table. 
-For example, if a transaction locks the entire Flights table in share
-mode in order to read data, a particular statement might need to lock a particular
+not acquire any subsequent row-level locks on a table.  For example, if a
+transaction locks the entire <codeph>Flights</codeph> table in share mode
+in order to read data, a particular statement might need to lock a particular
 row in exclusive mode in order to update the row. However, the previous table-level
-lock on <i>Hotels</i> forces the exclusive lock to be table-level as well.</p><p>If
-the specified lock cannot be acquired because another connection already holds
-a lock on the table, a statement-level exception is raised (<i>SQLState</i> X0X02)
-after the deadlock timeout period.</p> </refsyn>
+lock on the <codeph>Hotels</codeph> table forces the exclusive lock to be
+table-level as well.</p><p>If the specified lock cannot be acquired because
+another connection already holds a lock on the table, a statement-level exception
+is raised (<i>SQLState</i> X0X02) after the deadlock timeout period.</p> </refsyn>
 <example><codeblock><b><ph>-- lock the entire table in share mode to avoid
 -- a large number of row locks</ph>
 LOCK TABLE Flights IN SHARE MODE;
@@ -78,4 +80,3 @@
 -- INSERT INTO PEOPLE . . .</b></codeblock> </example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj43125.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj43125.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj43125.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj43125.dita Fri Sep 22 12:37:47 2006
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
- 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -21,14 +20,14 @@
 <reference id="rrefsqlj43125" xml:lang="en-us">
 <title>CREATE TRIGGER statement</title>
 <prolog><metadata>
-<keywords><indexterm>CREATE TRIGGER statement</indexterm><indexterm>Triggers<indexterm>creating</indexterm></indexterm>
-<indexterm>Triggers<indexterm>defining when they fire</indexterm></indexterm>
-<indexterm>Triggers<indexterm>and database events</indexterm></indexterm>
-<indexterm>Triggers<indexterm>and the referencing clause</indexterm><indexterm>referencing
-old and new values</indexterm></indexterm><indexterm>Triggers<indexterm>statement
-versus row triggers</indexterm></indexterm><indexterm>Triggers<indexterm>the
-triggered-SQL-statement</indexterm></indexterm><indexterm>Triggers<indexterm>order
-of execution</indexterm></indexterm><indexterm>Triggers<indexterm>and recursion</indexterm></indexterm>
+<keywords><indexterm>CREATE TRIGGER statement</indexterm><indexterm>SQL statements<indexterm>CREATE
+TRIGGER</indexterm></indexterm><indexterm>triggers<indexterm>creating</indexterm></indexterm>
+<indexterm>triggers<indexterm>defining when they fire</indexterm></indexterm>
+<indexterm>triggers<indexterm>database events</indexterm></indexterm><indexterm>triggers<indexterm>referencing
+clause</indexterm><indexterm>referencing old and new values</indexterm></indexterm>
+<indexterm>triggers<indexterm>statement versus row triggers</indexterm></indexterm>
+<indexterm>triggers<indexterm>triggered-SQL-statement</indexterm></indexterm>
+<indexterm>triggers<indexterm>order of execution</indexterm></indexterm><indexterm>triggers<indexterm>recursion</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
@@ -42,13 +41,16 @@
 other tables, sending e-mail, and other useful actions.</p><p>You can define
 any number of triggers for a single table, including multiple triggers on
 the same table for the same event.</p><p>You can create a trigger in any schema
-except one that starts with <i>SYS</i>. The trigger need not reside in the
-same schema as the table on which it is defined.</p><p>If a qualified trigger
-name is specified, the schema name cannot begin with <i>SYS</i>.</p></section>
+where you are the schema owner. To create a trigger on a table that you do
+not own, you must be granted the TRIGGER privilege on that table. The database
+owner can also create triggers on any table in any schema.</p><p>The trigger
+does not need to reside in the same schema as the table on which the trigger
+is defined.</p><p>If a qualified trigger name is specified, the schema name
+cannot begin with <i>SYS</i>.</p></section>
 <refsyn id="syn001"><title>Syntax</title><codeblock><b>CREATE TRIGGER <i><xref
 href="rreftriggername.dita#rreftriggername">TriggerName</xref></i>
 { AFTER | NO CASCADE BEFORE } 
-{ INSERT | DELETE | UPDATE } [ OF <i>column-Name</i> [, <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i>]* ]
+{ INSERT | DELETE | UPDATE [ OF <i>column-Name</i> [, <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i>]* ] }
 ON <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i>
 [ <i><xref href="rrefsqlj89752.dita#rrefsqlj89752">ReferencingClause</xref></i> ]
 FOR EACH { ROW | STATEMENT } MODE DB2SQL 

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqljgrant.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqljgrant.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqljgrant.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqljgrant.dita Fri Sep 22 12:37:47 2006
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
- 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "reference.dtd">
 <!-- 
@@ -35,9 +34,11 @@
 <li>Create a trigger on a table.</li>
 <li>Update data in a table or in a subset of columns in a table.</li>
 <li>Run a specified function or procedure.</li>
-</ul></p><p>When a table, view, function, or procedure is created, only the
-object owner has full privileges on the object. No other users have any privileges
-on the object until the object owner grants privileges to the users. </p><p>The
+</ul></p><p>Before you issue a GRANT statement, check that the <codeph>derby.database.sqlAuthorization</codeph> property
+is set to <codeph>true</codeph>. The <codeph>derby.database.sqlAuthorization</codeph> property
+enables the SQL Authorization mode.</p><p>You can grant privileges to database
+objects that you are authorized to grant. See the CREATE statement for the
+database object that you want to grant privileges on for more information.</p><p>The
 syntax that you use for the GRANT statement depends on whether you are granting
 privileges to a table or to a routine.</p></section>
 <section><title>Syntax for tables</title><codeblock><b>GRANT <i><xref href="rrefsqljgrant.dita#rrefsqljgrant/grantprivtype">privilege-type</xref></i
@@ -70,7 +71,8 @@
 to create a trigger on the specified table.</p><p>Use the UPDATE privilege
 type to grant permission to use the UPDATE statement on the specified table.
 If a column list is specified, the permission applies only to the specified
-columns.</p></section>
+columns. To update a row using a statement that includes a WHERE clause, you
+must have SELECT permission on the columns in the row that you want to update. </p></section>
 <section id="grantgrantees"><title>grantees</title><codeblock><b>{	<i>authorization ID</i> | PUBLIC } [,{ <i>authorization ID</i> | PUBLIC } ] *</b
 ></codeblock><p>You can grant privileges for specific users or for all users.
 Use the keyword PUBLIC to specify all users. When PUBLIC is specified, the

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqljrenametablestatement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqljrenametablestatement.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqljrenametablestatement.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqljrenametablestatement.dita Fri Sep 22 12:37:47 2006
@@ -1,4 +1,6 @@
 <?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,17 +17,17 @@
 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="rrefsqljrenamestatements" xml:lang="en-us">
 <title>RENAME TABLE statement </title>
 <prolog><metadata>
-<keywords><indexterm>RENAME TABLE statement</indexterm></keywords>
+<keywords><indexterm>RENAME TABLE statement</indexterm><indexterm><indexterm>SQL
+statements</indexterm>RENAME TABLE</indexterm><indexterm><indexterm>tables</indexterm>renaming</indexterm>
+</keywords>
 </metadata></prolog>
 <refbody>
 <section> <p>RENAME TABLE allows you to rename an existing table in any schema
-(except the schema <i>SYS</i>).</p></section>
+(except the schema <i>SYS</i>). </p><p>To rename a table, you must either
+be the database owner or the table owner.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>RENAME TABLE <i>table-Name</i> TO <i><xref
 href="rrefnewtablename.dita#rrefnewtablename">new-Table-Name</xref></i></b></codeblock> <p>If
 there is a view or foreign key that references the table, attempts to rename
@@ -33,10 +35,9 @@
 or triggers on the table, attempts to rename it will also generate an error.</p> </refsyn>
 <example> <codeblock><b>RENAME TABLE SAMP.EMP_ACT TO EMPLOYEE_ACT</b></codeblock> <p>Also
 see <xref href="rrefsqlj81859.dita#rrefsqlj81859"></xref> for more information.</p> </example>
-<section><title>Statement dependency system</title> <p>If there
-is an index defined on the table, the table can be renamed.</p> <p>RENAME
-TABLE is not allowed if there are any open cursors that reference the table
-being altered.</p> </section>
+<section><title>Statement dependency system</title> <p>If there is an index
+defined on the table, the table can be renamed.</p> <p>The RENAME TABLE statement
+is not allowed if there are any open cursors that reference the table that
+is being altered.</p> </section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqljrevoke.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqljrevoke.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqljrevoke.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqljrevoke.dita Fri Sep 22 12:37:47 2006
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
- 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "reference.dtd">
 <!--
@@ -29,7 +28,7 @@
 </metadata></prolog>
 <refbody>
 <section> <p>The following types of permissions can be revoked:<ul>
-<li>Delete a specific table.</li>
+<li>Delete data from a specific table.</li>
 <li>Insert data into a specific table.</li>
 <li>Create a foreign key reference to the named table or to a subset of columns
 from a table.</li>
@@ -37,7 +36,10 @@
 <li>Create a trigger on a table.</li>
 <li>Update data in a table or in a subset of columns in a table.</li>
 <li>Run a specified routine (function or procedure).</li>
-</ul></p><p>Only the owner of an object can revoke privileges from an object.</p><p>The
+</ul></p><p>Before you issue a REVOKE statement, check that the <codeph>derby.database.sqlAuthorization</codeph> property
+is set to <codeph>true</codeph>. The <codeph>derby.database.sqlAuthorization</codeph> property
+enables the SQL Authorization mode.</p><p>You can revoke privileges from an
+object if you are the owner of the object or the database owner.</p><p>The
 syntax that you use for the REVOKE statement depends on whether you are revoking
 privileges to a table or to a routine.</p></section>
 <section><title>Syntax for tables</title><codeblock><b>REVOKE <i><xref href="rrefsqljrevoke.dita#rrefsqljrevoke/revokeptype">privilege-type</xref

Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijcomrefdescribe.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijcomrefdescribe.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijcomrefdescribe.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijcomrefdescribe.dita Fri Sep 22 12:37:47 2006
@@ -24,10 +24,10 @@
 <refbody>
 <refsyn>
 <title>Syntax</title>
-<codeblock><b>DESCRIBE <i>table-Name</i></b></codeblock> 
+<codeblock><b>DESCRIBE { <i>table-Name</i> | <i>view-Name</i> }</b></codeblock> 
 </refsyn>
 <section><title>Description</title>
-<p>Provides a decription of the specified table. For a list of tables in the current schema, use the <xref href="rtoolsijcomrefshow.dita#rtoolsijcomrefshow/showtables">Show Tables</xref> command. For a list of available schemas, use the <xref href="rtoolsijcomrefshow.dita#rtoolsijcomrefshow/showschemas">Show Schemas</xref> command.</p>
+<p>Provides a decription of the specified table or view. For a list of tables in the current schema, use the <xref href="rtoolsijcomrefshow.dita#rtoolsijcomrefshow/showtables">Show Tables</xref> command. For a list of views in the current schema, use the <xref href="rtoolsijcomrefshow.dita#rtoolsijcomrefshow/showviews">Show Views</xref> command. For a list of available schemas, use the <xref href="rtoolsijcomrefshow.dita#rtoolsijcomrefshow/showschemas">Show Schemas</xref> command.</p>
 </section>
 <example><title>Example</title>
 <codeblock>ij&gt; <b>describe airlines;</b>

Modified: db/derby/docs/branches/10.2/src/workingwithderby/twwdIntro.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/workingwithderby/twwdIntro.dita?view=diff&rev=449063&r1=449062&r2=449063
==============================================================================
--- db/derby/docs/branches/10.2/src/workingwithderby/twwdIntro.dita (original)
+++ db/derby/docs/branches/10.2/src/workingwithderby/twwdIntro.dita Fri Sep 22 12:37:47 2006
@@ -39,7 +39,7 @@
 <context><p>Derby is a full featured, open source relational database engine.
 It is written and implemented completely in Java, and provides users with a
 small footprint standards-based database engine that can be tightly embedded
-into any Java based solution. Derby insures data integrity and provides sophisticated
+into any Java based solution. Derby ensures data integrity and provides sophisticated
 transaction support. In its default configuration there is no separate
 database server to be installed or maintained by the end user. For more information
 on Derby visit the Derby website at: <xref format="html" href="http://db.apache.org/derby"



Mime
View raw message