db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r441555 [1/3] - in /db/derby/docs/branches/10.2: ./ lib/ src/adminguide/ src/devguide/ src/pt_BR/ref/ src/ref/ src/tools/ src/workingwithderby/
Date Fri, 08 Sep 2006 16:36:16 GMT
Author: rhillegas
Date: Fri Sep  8 09:36:07 2006
New Revision: 441555

URL: http://svn.apache.org/viewvc?view=rev&rev=441555
Log:
DERBY-1725: Merge documentation patches from the trunk to the 10.2 branch: No JIRA (441134, 440639), DERBY-1821 (441307), DERBY-1765 (441291), DERBY-1821 (441209), DERBY-1072 (441143), DERBY-1805 (440984), DERBY-408 (440981), DERBY-1646 (440851), DERBY-1682 (440848), DERBY-1798 (439838).

Added:
    db/derby/docs/branches/10.2/lib/dita2fo-links.xsl
      - copied unchanged from r441308, db/derby/docs/trunk/lib/dita2fo-links.xsl
    db/derby/docs/branches/10.2/lib/dita2fo-subroutines.xsl
      - copied unchanged from r441308, db/derby/docs/trunk/lib/dita2fo-subroutines.xsl
    db/derby/docs/branches/10.2/lib/dita2fo-titles.xsl
      - copied unchanged from r441308, db/derby/docs/trunk/lib/dita2fo-titles.xsl
    db/derby/docs/branches/10.2/lib/domains2fo.xsl
      - copied unchanged from r441308, db/derby/docs/trunk/lib/domains2fo.xsl
    db/derby/docs/branches/10.2/lib/topic2fo-shell.xsl
      - copied unchanged from r441308, db/derby/docs/trunk/lib/topic2fo-shell.xsl
    db/derby/docs/branches/10.2/lib/topic2foImpl.xsl
      - copied unchanged from r441308, db/derby/docs/trunk/lib/topic2foImpl.xsl
    db/derby/docs/branches/10.2/lib/topicmerge.xsl
      - copied unchanged from r441308, db/derby/docs/trunk/lib/topicmerge.xsl
Modified:
    db/derby/docs/branches/10.2/build.xml
    db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl
    db/derby/docs/branches/10.2/lib/fo2html.xsl
    db/derby/docs/branches/10.2/src/adminguide/radmindrdasecmechanism.dita
    db/derby/docs/branches/10.2/src/devguide/cdevcsecuregrantrevokeaccess.dita
    db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap
    db/derby/docs/branches/10.2/src/devguide/rdevconcepts38274.dita
    db/derby/docs/branches/10.2/src/devguide/rdevconceptsfor.dita
    db/derby/docs/branches/10.2/src/devguide/rdevconceptsinsertrow.dita
    db/derby/docs/branches/10.2/src/devguide/rdevconceptssur.dita
    db/derby/docs/branches/10.2/src/pt_BR/ref/crefsqlj22771.dita
    db/derby/docs/branches/10.2/src/ref/crefsqlj22771.dita
    db/derby/docs/branches/10.2/src/ref/refderby.ditamap
    db/derby/docs/branches/10.2/src/ref/rrefdeclaretemptable.dita
    db/derby/docs/branches/10.2/src/ref/rreffuncxmlparse.dita
    db/derby/docs/branches/10.2/src/ref/rrefscalarsubquery.dita
    db/derby/docs/branches/10.2/src/ref/rrefselectexpression.dita
    db/derby/docs/branches/10.2/src/ref/rrefsistabs12813.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj11277.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj13658.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj14854.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj18922.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj21571.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj21583.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj26498.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj31783.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj32654.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj33602.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj35034.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj35981.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj40506.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj40774.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj41360.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj57522.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqlj81859.dita
    db/derby/docs/branches/10.2/src/ref/rrefsqljrevoke.dita
    db/derby/docs/branches/10.2/src/ref/rreftableexpression.dita
    db/derby/docs/branches/10.2/src/ref/rreftablesubquery.dita
    db/derby/docs/branches/10.2/src/tools/ctools1003034.dita
    db/derby/docs/branches/10.2/src/tools/ctoolsij25986.dita
    db/derby/docs/branches/10.2/src/tools/ctoolsij34525.dita
    db/derby/docs/branches/10.2/src/tools/ctoolsijtools16011.dita
    db/derby/docs/branches/10.2/src/tools/ctoolsijtools20118.dita
    db/derby/docs/branches/10.2/src/tools/ctoolsijtools26429.dita
    db/derby/docs/branches/10.2/src/tools/ctoolsijtools30948.dita
    db/derby/docs/branches/10.2/src/tools/ctoolsijtools37363.dita
    db/derby/docs/branches/10.2/src/tools/ctoolspre23947.dita
    db/derby/docs/branches/10.2/src/tools/derbytools.ditamap
    db/derby/docs/branches/10.2/src/tools/rtools1003161.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsdrvrnmeurl.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomref12281.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomref12333.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomref16653.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomref20382.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomref22318.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomref25570.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomref25753.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomref30679.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomref39042.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijcomref88554.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijpropref10135.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijpropref28146.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijpropref35032.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijpropref41073.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijproprefpassword.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijproprefuser.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijtools16879.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsimport64241.dita
    db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita
    db/derby/docs/branches/10.2/src/tools/ttoolsij11815.dita
    db/derby/docs/branches/10.2/src/tools/ttoolsij30600.dita
    db/derby/docs/branches/10.2/src/tools/ttoolsij97656.dita
    db/derby/docs/branches/10.2/src/tools/ttoolsij98878.dita
    db/derby/docs/branches/10.2/src/tools/ttoolsjarload1002986.dita
    db/derby/docs/branches/10.2/src/tools/ttoolsjarload1003059.dita
    db/derby/docs/branches/10.2/src/tools/ttoolsjarload1003120.dita
    db/derby/docs/branches/10.2/src/workingwithderby/cwwdsummary.dita
    db/derby/docs/branches/10.2/src/workingwithderby/rwwdactivity3.dita
    db/derby/docs/branches/10.2/src/workingwithderby/twwdIntro.dita
    db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity1.dita
    db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity2.dita

Modified: db/derby/docs/branches/10.2/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/build.xml?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/build.xml (original)
+++ db/derby/docs/branches/10.2/build.xml Fri Sep  8 09:36:07 2006
@@ -47,6 +47,14 @@
     <copy todir="${basedir}/src/dtd">
       <fileset dir="${dita.dtd.dir}"/>
     </copy>
+    <copy file="${dita.lib.dir}/dita2fo-shell.xsl" todir="${dita.dir}/xsl"/>
+    <copy file="${dita.lib.dir}/topicmerge.xsl" todir="${dita.dir}/xsl"/>
+    <copy file="${dita.lib.dir}/topic2fo-shell.xsl" todir="${dita.dir}/xsl"/>
+    <copy file="${dita.lib.dir}/dita2fo-titles.xsl" todir="${dita.dir}/xsl/xslfo"/>
+    <copy file="${dita.lib.dir}/topic2foImpl.xsl" todir="${dita.dir}/xsl/xslfo"/>
+    <copy file="${dita.lib.dir}/domains2fo.xsl" todir="${dita.dir}/xsl/xslfo"/>
+    <copy file="${dita.lib.dir}/dita2fo-links.xsl" todir="${dita.dir}/xsl/xslfo"/>
+    <copy file="${dita.lib.dir}/dita2fo-subroutines.xsl" todir="${dita.dir}/xsl/xslfo"/>
     <mkdir dir="${dita.temp.dir}"/>
     <copy todir="${dita.output.dir}/images">
       <fileset dir="${dita.src.dir}/images"/>
@@ -59,7 +67,6 @@
 
   <target name="unpack.dita" unless="dita.available">
     <unjar src="${dita.zip}" dest="${basedir}"/>
-    <copy file="${dita.lib.dir}/dita2fo-shell.xsl" todir="${dita.dir}/xsl"/>
   </target>
  
  <target name="html.workingwithderby" depends="init">

Modified: db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl (original)
+++ db/derby/docs/branches/10.2/lib/dita2fo-shell.xsl Fri Sep  8 09:36:07 2006
@@ -41,7 +41,7 @@
   <xsl:import href="xslfo/topic2foImpl.xsl"/>
   <xsl:import href="xslfo/domains2fo.xsl"/>
   <!-- XSL-FO output with XML syntax; no actual doctype for FO -->
-  <xsl:output method="xml" version="1.0" indent="yes"/>
+  <xsl:output method="xml" version="1.0"/>
   <!-- CONTROL PARAMETERS: -->
   <!-- offset -->
   <xsl:param name="basic-start-indent">72pt</xsl:param>
@@ -93,7 +93,7 @@
       <fox:outline>
         <xsl:attribute name="internal-destination">
           <!-- use id attribute node to generate anchor for PDF bookmark fix bug#1304859 -->
-          <xsl:value-of select="generate-id(@id)"/>
+          <xsl:value-of select="@id"/>
         </xsl:attribute>
         <fox:label>
           <!-- if topic contains navtitle, use that as label for PDF bookmark -->
@@ -390,7 +390,7 @@
        
   </fo:inline>
         <fo:leader leader-pattern="dots"/>
-                <fo:page-number-citation ref-id="{generate-id(@id)}"/>
+                <fo:page-number-citation ref-id="{string(@id)}"/>
     </fo:basic-link>  
 </fo:block>
       <xsl:call-template name="get-tce2-section"/>
@@ -405,7 +405,7 @@
           <xsl:value-of select="*[contains(@class,' topic/title ')]"/>
         </fo:inline>
         <fo:leader leader-pattern="dots"/>
-        <fo:page-number-citation ref-id="{generate-id(@id)}"/>
+        <fo:page-number-citation ref-id="{string(@id)}"/>
         </fo:basic-link>  
  </fo:block>
       <xsl:call-template name="get-tce3-section"/>
@@ -418,7 +418,7 @@
 <fo:basic-link internal-destination="{string(@id)}">
         <xsl:value-of select="*[contains(@class,' topic/title ')]"/>
         <fo:leader leader-pattern="dots"/>
-        <fo:page-number-citation ref-id="{generate-id(@id)}"/>
+        <fo:page-number-citation ref-id="{string(@id)}"/>
            </fo:basic-link>  
    </fo:block>
       <xsl:call-template name="get-tce4-section"/>
@@ -431,7 +431,7 @@
 <fo:basic-link internal-destination="{string(@id)}">
         <xsl:value-of select="*/title"/>
         <fo:leader leader-pattern="dots"/>
-        <fo:page-number-citation ref-id="{generate-id(@id)}"/>
+        <fo:page-number-citation ref-id="{string(@id)}"/>
 	</fo:basic-link>
       </fo:block>
       <xsl:call-template name="get-tce5-section"/>
@@ -444,7 +444,7 @@
 	<fo:basic-link internal-destination="{string(@id)}">
         <xsl:value-of select="*/title"/>
         <fo:leader leader-pattern="dots"/>
-        <fo:page-number-citation ref-id="{generate-id(@id)}"/>
+        <fo:page-number-citation ref-id="{string(@id)}"/>
 	</fo:basic-link>
       </fo:block>
       <!--xsl:call-template name="get-tce6-section"/-->

Modified: db/derby/docs/branches/10.2/lib/fo2html.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/lib/fo2html.xsl?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/lib/fo2html.xsl (original)
+++ db/derby/docs/branches/10.2/lib/fo2html.xsl Fri Sep  8 09:36:07 2006
@@ -324,8 +324,8 @@
 </xsl:template>
 
 <xsl:template match="fo:basic-link[@internal-destination]">
-
-  <xsl:variable name="citation-id" select="fo:page-number-citation/@ref-id"/>
+  
+  <xsl:variable name="citation-id" select="@internal-destination"/>
 
   &anchor;<a href="#{$citation-id}">&add-style;<xsl:apply-templates/></a>
 </xsl:template>

Modified: db/derby/docs/branches/10.2/src/adminguide/radmindrdasecmechanism.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/radmindrdasecmechanism.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/radmindrdasecmechanism.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/radmindrdasecmechanism.dita Fri Sep  8 09:36:07 2006
@@ -31,8 +31,12 @@
 use that security mechanism. No other types of connections are accepted. 
 If the derby.drda.securityMechanism property is not set, the Network Server
 accepts any connection which uses a valid security mechanism.</p></section>
-<refsyn><title>Syntax</title><codeblock><ph>derby.drda.securityMechanism = [ USER_ONLY_SECURITY | CLEAR_TEXT_PASSWORD_SECURITY | ENCRYPTED_USER_AND_PASSWORD_SECURITY ] </ph
-></codeblock> </refsyn>
+<refsyn><title>Syntax</title><codeblock><ph>derby.drda.securityMechanism = [ 
+    USER_ONLY_SECURITY | 
+    CLEAR_TEXT_PASSWORD_SECURITY | 
+    ENCRYPTED_USER_AND_PASSWORD_SECURITY | 
+    STRONG_PASSWORD_SUBSTITUTE_SECURITY 
+] </ph></codeblock> </refsyn>
 <section><title>Default</title><p>None. </p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.securityMechanism=USER_ONLY_SECURITY
 </b></codeblock> The server that runs with this setting accepts only client

Modified: db/derby/docs/branches/10.2/src/devguide/cdevcsecuregrantrevokeaccess.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevcsecuregrantrevokeaccess.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevcsecuregrantrevokeaccess.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevcsecuregrantrevokeaccess.dita Fri Sep  8 09:36:07 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "concept.dtd">
 <!-- 
@@ -65,9 +66,9 @@
 and revoked to PUBLIC and to individual users are independent. For example,
 a SELECT privilege on table <codeph>t</codeph> is granted to both PUBLIC and
 to the user <codeph>harry</codeph>. The SELECT privilege is later revoked
-from <codeph>harry</codeph>, but Harry has access to table <codeph>t</codeph> through
-the PUBLIC privilege.</p><note othertype="Exception" type="other">When you
-create a view, trigger, or constraint, <ph conref="devconrefs.dita#prod/productshortname"></ph> first
+from user <codeph>harry</codeph>, but user <codeph>harry</codeph> has access
+to table <codeph>t</codeph> through the PUBLIC privilege.</p><note othertype="Exception"
+type="other">When you create a view, trigger, or constraint, <ph conref="devconrefs.dita#prod/productshortname"></ph> first
 checks to determine if you have the required privileges at the user-level.
 If you have the user-level privileges, the object is created and is dependent
 on that user-level privilege. If you do not have the required privileges at
@@ -95,37 +96,42 @@
 SELECT privileges to PUBLIC. User <codeph>harry</codeph> creates view <codeph>v1</codeph> with
 the statement SELECT * from <codeph>anita.t1</codeph>. The view depends on
 the PUBLIC level privilege that user <codeph>harry</codeph> has on <codeph>t1</codeph> since
-user <codeph>harry</codeph> does not have user-level privileges on table <codeph>t1</codeph>.
-Subsequently, user <codeph>anita</codeph> revokes SELECT privileges from PUBLIC
-on table <codeph>t1</codeph>. As a result, the view <codeph>harry.v1</codeph> is
-dropped. </dd>
+user <codeph>harry</codeph> does not have user-level privileges on table <codeph>t1</codeph> when
+he creates the view <codeph>harry.v1</codeph>. Subsequently, user <codeph>anita</codeph> grants
+SELECT privileges to user <codeph>harry</codeph> on table <codeph>anita.t1</codeph>.
+The view <codeph>harry.v1</codeph> continues to depend on  PUBLIC level privilege
+that user <codeph>harry</codeph> has on <codeph>t1</codeph>. When user <codeph>anita</codeph> revokes
+SELECT privileges from PUBLIC on table <codeph>t1</codeph>, the view <codeph>harry.v1</codeph> is
+dropped.</dd>
 </dlentry></dl></note></section>
 <section><title>Permissions on views, triggers, and constraints</title><p>Views,
 triggers, and constraints operate with the permissions of the owner of the
-view, trigger, or constraint. The For example, Anita wants to create a view
-using the following statement:<codeblock>CREATE VIEW s.v(vc1,vc2,vc3)
+view, trigger, or constraint. For example, user <codeph>anita</codeph> wants
+to create a view using the following statement:<codeblock>CREATE VIEW s.v(vc1,vc2,vc3)
 	AS SELECT t1.c1,t1.c2,f(t1.c3)
   FROM t1 JOIN t2 ON t1.c1 = t2.c1 
-	WHERE t2.c2 = 5</codeblock>Anita needs the following permissions to create
-the view:<ul>
+	WHERE t2.c2 = 5</codeblock>User <codeph>anita</codeph> needs the following
+permissions to create the view:<ul>
 <li>Ownership of the schema <codeph>s</codeph>, so that she can create something
 in the schema</li>
 <li>Ownership of the table <codeph>t1</codeph>, so that she can allow others
 to see columns in the table</li>
-<li>SELECT permission on <codeph>t2.c1</codeph> and <codeph>t2.c2</codeph></li>
-<li>EXECUTE permission on <codeph>f</codeph></li>
-</ul>When the view is created, only Anita has SELECT permission on it. Anita
-can grant SELECT permission on any or all of the columns of view <codeph>s.v</codeph> to
-anyone, even to users who do not have SELECT permission on <codeph>t1</codeph> or <codeph>t2</codeph>,
-or EXECUTE permission on <codeph>f</codeph>. Anita grants SELECT permission
-on view <codeph>s.v</codeph> to Harry. When Harry issues a SELECT statement
-on the view <codeph>s.v</codeph>, <ph conref="devconrefs.dita#prod/productshortname"></ph> checks
-to determine if Harry has SELECT permission on view<codeph>s.v</codeph>. <ph
+<li>SELECT permission on column <codeph>t2.c1</codeph> and column <codeph>t2.c2</codeph></li>
+<li>EXECUTE permission on function <codeph>f</codeph></li>
+</ul>When the view is created, only user <codeph>anita</codeph> has SELECT
+permission on it. User <codeph>anita</codeph> can grant SELECT permission
+on any or all of the columns of view <codeph>s.v</codeph> to anyone, even
+to users that do not have SELECT permission on <codeph>t1</codeph> or <codeph>t2</codeph>,
+or EXECUTE permission on <codeph>f</codeph>. User <codeph>anita</codeph> grants
+SELECT permission on view <codeph>s.v</codeph> to user <codeph>harry</codeph>.
+When  user <codeph>harry</codeph> issues a SELECT statement on the view <codeph>s.v</codeph>, <ph
+conref="devconrefs.dita#prod/productshortname"></ph> checks to determine if
+ user <codeph>harry</codeph> has SELECT permission on view<codeph>s.v</codeph>. <ph
 conref="devconrefs.dita#prod/productshortname"></ph> does not check to determine
-if Harry has SELECT permission on <codeph>t1</codeph>, or <codeph>t2</codeph>,
-or EXECUTE permission on <codeph>f</codeph>. </p><p>Permissions on triggers
-and constraints work the same way as permissions on views. When a view, trigger,
-or constraint is created, <ph conref="devconrefs.dita#prod/productshortname"></ph> checks
+if  user <codeph>harry</codeph> has SELECT permission on <codeph>t1</codeph>,
+or <codeph>t2</codeph>, or EXECUTE permission on <codeph>f</codeph>. </p><p>Permissions
+on triggers and constraints work the same way as permissions on views. When
+a view, trigger, or constraint is created, <ph conref="devconrefs.dita#prod/productshortname"></ph> checks
 that the owner has the required permissions. Other users do not need to have
 those permissions to perform actions on a view, trigger, or constraint. </p><p>If
 the required permissions are revoked from the owner of a view, trigger, or

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?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/branches/10.2/src/devguide/derbydev.ditamap Fri Sep  8 09:36:07 2006
@@ -1581,6 +1581,9 @@
 <relcell>
 <topicref href="cdevcsecure866060.dita" navtitle="Setting the SQL standard authorization mode">
 </topicref>
+<topicref href="../ref/rrefsqljgrant.dita" navtitle="GRANT statement "></topicref>
+<topicref href="../ref/rrefsqljrevoke.dita" navtitle="REVOKE statement ">
+</topicref>
 </relcell>
 </relrow>
 <relrow>

Modified: db/derby/docs/branches/10.2/src/devguide/rdevconcepts38274.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/rdevconcepts38274.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/rdevconcepts38274.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/rdevconcepts38274.dita Fri Sep  8 09:36:07 2006
@@ -33,7 +33,7 @@
 <b>// Updatable statements have some requirements</b>
 <b>// for example, select must be on a single table</b>
 ResultSet uprs = stmt.executeQuery(
-    "SELECT FIRSTNME, LASTNAME, WORKDEPT, BONUS" +
+    "SELECT FIRSTNME, LASTNAME, WORKDEPT, BONUS " +
     "FROM EMPLOYEE FOR UPDATE of BONUS"); // Only bonus can be updated
 
 String theDept="E21";

Modified: db/derby/docs/branches/10.2/src/devguide/rdevconceptsfor.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/rdevconceptsfor.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/rdevconceptsfor.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/rdevconceptsfor.dita Fri Sep  8 09:36:07 2006
@@ -41,7 +41,7 @@
   Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                         ResultSet.CONCUR_UPDATABLE);
   ResultSet uprs = stmt.executeQuery(
-    "SELECT FIRSTNAME, LASTNAME, WORKDEPT, BONUS" +
+    "SELECT FIRSTNAME, LASTNAME, WORKDEPT, BONUS " +
     "FROM EMPLOYEE");
 
   while (uprs.next()) {
@@ -57,7 +57,7 @@
   Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                         ResultSet.CONCUR_UPDATABLE);
   ResultSet uprs = stmt.executeQuery(
-    "SELECT FIRSTNAME, LASTNAME, WORKDEPT, BONUS" +
+    "SELECT FIRSTNAME, LASTNAME, WORKDEPT, BONUS " +
     "FROM EMPLOYEE");
 
   while (uprs.next()) {

Modified: db/derby/docs/branches/10.2/src/devguide/rdevconceptsinsertrow.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/rdevconceptsinsertrow.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/rdevconceptsinsertrow.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/rdevconceptsinsertrow.dita Fri Sep  8 09:36:07 2006
@@ -41,7 +41,7 @@
   Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                         ResultSet.CONCUR_UPDATABLE);
   ResultSet uprs = stmt.executeQuery(
-    "SELECT firstname, lastname, workdept, bonus" +
+    "SELECT firstname, lastname, workdept, bonus " +
     "FROM employee");
   uprs.moveToInsertRow();
   uprs.updateString("FIRSTNAME", "Andreas");

Modified: db/derby/docs/branches/10.2/src/devguide/rdevconceptssur.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/rdevconceptssur.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/rdevconceptssur.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/rdevconceptssur.dita Fri Sep  8 09:36:07 2006
@@ -42,7 +42,7 @@
   Statement stmt = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                         ResultSet.CONCUR_UPDATABLE);
   ResultSet uprs = stmt.executeQuery(
-    "SELECT FIRSTNAME, LASTNAME, WORKDEPT, BONUS" +
+    "SELECT FIRSTNAME, LASTNAME, WORKDEPT, BONUS " +
     "FROM EMPLOYEE");
 
   uprs.absolute(5); // update the fifth row
@@ -57,7 +57,7 @@
   Statement stmt = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                         ResultSet.CONCUR_UPDATABLE);
   ResultSet uprs = stmt.executeQuery(
-    "SELECT FIRSTNAME, LASTNAME, WORKDEPT, BONUS" +
+    "SELECT FIRSTNAME, LASTNAME, WORKDEPT, BONUS " +
     "FROM EMPLOYEE");
   
   uprs.last();

Modified: db/derby/docs/branches/10.2/src/pt_BR/ref/crefsqlj22771.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/pt_BR/ref/crefsqlj22771.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/pt_BR/ref/crefsqlj22771.dita (original)
+++ db/derby/docs/branches/10.2/src/pt_BR/ref/crefsqlj22771.dita Fri Sep  8 09:36:07 2006
@@ -89,7 +89,7 @@
 -- e desta vez a tentativa de recompilar
 -- na hora de executar vai falhar
 ij&gt; <b>execute p1;</b>
-ERROR 42X05: Table 'MINHA_TABELA' does not exist.</codeblock>
+ERROR 42X05: Table/View 'MINHA_TABELA' does not exist.</codeblock>
 </p>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.2/src/ref/crefsqlj22771.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/crefsqlj22771.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/crefsqlj22771.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/crefsqlj22771.dita Fri Sep  8 09:36:07 2006
@@ -80,7 +80,7 @@
 -- and this time the attempt to recompile it
 -- upon execution will fail
 ij&gt; <b>execute p1;</b>
-ERROR 42X05: Table 'MYTABLE' does not exist.</codeblock></p>
+ERROR 42X05: Table/View 'MYTABLE' does not exist.</codeblock></p>
 </conbody>
 </concept>
 

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?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/refderby.ditamap (original)
+++ db/derby/docs/branches/10.2/src/ref/refderby.ditamap Fri Sep  8 09:36:07 2006
@@ -47,11 +47,27 @@
 <topicref href="../devguide/cdevcsecuregrantrevokeaccess.dita" navtitle="SQL standard authorization">
 </topicref>
 <topicref href="rrefsqljgrant.dita" navtitle="GRANT statement "></topicref>
+<topicref href="rrefsistabssyscolperms.dita" navtitle="SYSCOLPERMS"></topicref>
+<topicref href="rrefsistabssystableperms.dita" navtitle="SYSTABLEPERMS"></topicref>
 </relcell>
 </relrow>
 <relrow>
-<relcell></relcell>
-<relcell></relcell>
+<relcell>
+<topicref href="rrefsistabssystableperms.dita" navtitle="SYSTABLEPERMS"></topicref>
+</relcell>
+<relcell>
+<topicref href="rrefsqljgrant.dita" navtitle="GRANT statement "></topicref>
+<topicref href="rrefsqljrevoke.dita" navtitle="REVOKE statement "></topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rrefsistabssyscolperms.dita" navtitle="SYSCOLPERMS"></topicref>
+</relcell>
+<relcell>
+<topicref href="rrefsqljgrant.dita" navtitle="GRANT statement "></topicref>
+<topicref href="rrefsqljrevoke.dita" navtitle="REVOKE statement "></topicref>
+</relcell>
 </relrow>
 </reltable>
 <topicref href="rrefcopyright.dita" navtitle="Copyright"></topicref>

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=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefdeclaretemptable.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefdeclaretemptable.dita Fri Sep  8 09:36:07 2006
@@ -58,7 +58,7 @@
 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
+<section id="rreftemptabledatatype"><title>Data type</title><p>Supported data types
 are: <ul>
 <li>BIGINT</li>
 <li>CHAR</li>

Modified: db/derby/docs/branches/10.2/src/ref/rreffuncxmlparse.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rreffuncxmlparse.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rreffuncxmlparse.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rreffuncxmlparse.dita Fri Sep  8 09:36:07 2006
@@ -18,7 +18,7 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<reference id="rreffuncxmlexists" xml:lang="en-us">
+<reference id="rreffuncxmlparse" xml:lang="en-us">
 <title>XMLPARSE operator</title>
 <shortdesc>XMLPARSE is a SQL/XML operator that you use to parse a character
 string expression into a <ph conref="refconrefs.dita#prod/productshortname"></ph> XML

Modified: db/derby/docs/branches/10.2/src/ref/rrefscalarsubquery.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefscalarsubquery.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefscalarsubquery.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefscalarsubquery.dita Fri Sep  8 09:36:07 2006
@@ -29,7 +29,7 @@
 query must evaluate to a single row with a single column.</p> <p><indexterm>Expression
 subquery</indexterm>Sometimes also called an expression subquery.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>(<i><xref href="rrefsqlj21571.dita#rrefsqlj21571">Query</xref></i>)</b></codeblock> </refsyn>
-<example> <codeblock><b><ph>-- avg always returns a single value, so the subquery is
+<example><title>Examples</title><codeblock><b><ph>-- avg always returns a single value, so the subquery is
 -- a ScalarSubquery</ph>
 SELECT NAME, COMM
   FROM STAFF
@@ -38,14 +38,14 @@
        FROM EMPLOYEE
        WHERE COMM &lt; 5000
        AND EMPLOYEE.LASTNAME = UPPER(STAFF.NAME)
-);
+)
 <ph>-- Introduce a way of "generating" new data values,
 -- using a query which selects from a VALUES clause (which is an 
-alternate form of a fullselect). 
+-- alternate form of a fullselect). 
 -- This query shows how a table can be derived called "X" having 
-2 columns "R1" and "R2" and 1 row of data.
+-- 2 columns "R1" and "R2" and 1 row of data.
 SELECT R1,R2 
-	FROM (VALUES('GROUP 1','GROUP 2')) AS X(R1,R2);</ph>
+	FROM (VALUES('GROUP 1','GROUP 2')) AS X(R1,R2)</ph>
 </b></codeblock> </example>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/ref/rrefselectexpression.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefselectexpression.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefselectexpression.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefselectexpression.dita Fri Sep  8 09:36:07 2006
@@ -61,7 +61,7 @@
 SELECT WORKDEPT, AVG(SALARY)
      FROM EMPLOYEE
      GROUP BY WORKDEPT
-     ORDER BY 1;</b></codeblock></p> <p>If there is no GROUP BY clause, but
+     ORDER BY 1</b></codeblock></p> <p>If there is no GROUP BY clause, but
 a <i>SelectItem</i> contains an aggregate not in a subquery, the query is
 implicitly grouped. The entire table is the single group.</p> <p>The HAVING
 clause restricts a grouped table, specifying a search condition (much like
@@ -106,10 +106,10 @@
 WHERE t.TABLENAME = 'FLIGHTS' AND t.TABLEID = col.
 REFERENCEID AND t.TABLEID = cons.TABLEID 
 AND cons.CONSTRAINTID = checks.CONSTRAINTID 
-ORDER BY CONSTRAINTNAME;
+ORDER BY CONSTRAINTNAME
 <ph>-- This example shows the use of the DISTINCT clause</ph>
 SELECT DISTINCT ACTNO
-FROM EMP_ACT;
+FROM EMP_ACT
 <ph>-- This example shows how to rename an expression 
 -- Using the EMPLOYEE table, list the department number (WORKDEPT) and 
 -- maximum departmental salary (SALARY) renamed as BOSS 
@@ -121,6 +121,6 @@
 	HAVING MAX(SALARY) &lt; (SELECT AVG(SALARY)
 				FROM EMPLOYEE
 				WHERE NOT WORKDEPT = EMP_COR.WORKDEPT) 
-	ORDER BY BOSS;</b></codeblock> </example>
+	ORDER BY BOSS</b></codeblock> </example>
 </refbody>
 </reference>

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?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsistabs12813.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsistabs12813.dita Fri Sep  8 09:36:07 2006
@@ -48,7 +48,7 @@
 <entry colname="2">CHAR</entry>
 <entry colname="3">36</entry>
 <entry colname="4">false</entry>
-<entry colname="5">A uunique identifier for the dependent.</entry>
+<entry colname="5">A unique identifier for the dependent.</entry>
 </row>
 <row>
 <entry colname="1">DEPENDENTFINDER</entry>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj11277.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj11277.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj11277.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj11277.dita Fri Sep  8 09:36:07 2006
@@ -44,14 +44,14 @@
 the column's default value into the column. Another way to insert the default
 value into the column is to omit the column from the column list and only
 insert values into other columns in the table.</p> </refsyn>
-<example> <codeblock><b><ph>-- 3 rows of 1 column</ph>
-VALUES (1),(2),(3);
+<example><title>Examples</title><codeblock><b><ph>-- 3 rows of 1 column</ph>
+VALUES (1),(2),(3)
 <ph>-- 3 rows of 1 column</ph>
-VALUES 1, 2, 3; 
+VALUES 1, 2, 3 
 <ph>-- 1 row of 3 columns</ph>
-VALUES (1, 2, 3);
+VALUES (1, 2, 3)
 <ph>-- 3 rows of 2 columns</ph>
-VALUES (1,21),(2,22),(3,23);
+VALUES (1,21),(2,22),(3,23)
 <ph>-- constructing a derived table</ph>
 VALUES ('orange', 'orange'), ('apple', 'red'),
 ('banana', 'yellow')
@@ -62,7 +62,7 @@
     ('E41', 'DATABASE ADMINISTRATION', 'E01')
 <ph>-- insert a row with a DEFAULT value for the MAJPROJ column</ph>
 INSERT INTO PROJECT (PROJNO, PROJNAME, DEPTNO, RESPEMP, PRSTDATE, MAJPROJ) 
-VALUES ('PL2101', 'ENSURE COMPAT PLAN', 'B01', '000020', CURRENT_DATE, DEFAULT);
+VALUES ('PL2101', 'ENSURE COMPAT PLAN', 'B01', '000020', CURRENT_DATE, DEFAULT)
 
 <ph>-- using a built-in function</ph>
 VALUES CURRENT_DATE

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj13658.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj13658.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj13658.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj13658.dita Fri Sep  8 09:36:07 2006
@@ -52,9 +52,8 @@
 </refsyn>
 <example>
 <codeblock><b>-- order by the correlation name NATION
--- order by the correlation name NATION
 SELECT CITY_NAME, COUNTRY AS NATION 
 FROM CITIES 
-ORDER BY NATION;
+ORDER BY NATION
 </b></codeblock>
 </example></refbody></reference>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj14854.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj14854.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj14854.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj14854.dita Fri Sep  8 09:36:07 2006
@@ -39,7 +39,7 @@
 <codeblock><b>-- SELECT COUNT(*)
 -- FROM SAMP.STAFF
 -- GROUP BY ID
--- HAVING SALARY &gt; 15000;</b></codeblock></p>
+-- HAVING SALARY &gt; 15000</b></codeblock></p>
 <p>Aggregates in the HAVING clause do not need to appear in the SELECT list.
 If the HAVING clause contains a subquery, the subquery can refer to the outer
 query block if and only if it refers to a grouping column.</p>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj18922.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj18922.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj18922.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj18922.dita Fri Sep  8 09:36:07 2006
@@ -24,7 +24,7 @@
 </metadata></prolog>
 <refbody>
 <section> <p>A LEFT OUTER JOIN is one of the <xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN
-operations</xref>s that allow you to specify a join clause. It preserves the
+operations</xref> that allow you to specify a join clause. It preserves the
 unmatched rows from the first (left) table, joining them with a NULL row in
 the shape of the second (right) table.</p></section>
 <refsyn><title>Syntax</title><codeblock><b><i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> LEFT [ OUTER ] JOIN <i
@@ -41,7 +41,7 @@
 FROM Countries 
 LEFT OUTER JOIN Cities
 ON CITIES.COUNTRY_ISO_CODE = COUNTRIES.COUNTRY_ISO_CODE
-WHERE REGION = 'Asia';
+WHERE REGION = 'Asia'
 
 <b>-- use the synonymous syntax, LEFT JOIN, to achieve exactly 
 -- the same results as in the example above
@@ -50,7 +50,7 @@
 FROM COUNTRIES 
 LEFT JOIN CITIES 
 ON CITIES.COUNTRY_ISO_CODE = COUNTRIES.COUNTRY_ISO_CODE
-WHERE REGION = 'Asia';
+WHERE REGION = 'Asia'
 </codeblock></example>
 <example><title>Example 2</title><codeblock><b>
 -- Join the EMPLOYEE and DEPARTMENT tables, 
@@ -64,7 +64,7 @@
 SELECT EMPNO, LASTNAME, WORKDEPT, DEPTNAME 
    FROM SAMP.EMPLOYEE LEFT OUTER JOIN SAMP.DEPARTMENT 
    ON WORKDEPT = DEPTNO 
-   AND YEAR(BIRTHDATE) &lt; 1930;
+   AND YEAR(BIRTHDATE) &lt; 1930
 
 <b>-- List every department with the employee number and 
 -- last name of the manager,
@@ -72,6 +72,6 @@
 </b>
 SELECT DEPTNO, DEPTNAME, EMPNO, LASTNAME
       FROM DEPARTMENT LEFT OUTER JOIN EMPLOYEE
-	    ON MGRNO = EMPNO;</codeblock> </example>
+	    ON MGRNO = EMPNO</codeblock> </example>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj21571.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj21571.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj21571.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj21571.dita Fri Sep  8 09:36:07 2006
@@ -57,15 +57,15 @@
 </ul></p></section>
 <example><title>Examples</title><codeblock><b><ph>-- a Select expression </ph>
 SELECT *
-FROM ORG;
+FROM ORG
 
 <ph>-- a subquery </ph>
 SELECT *
-FROM (SELECT CLASS_CODE FROM CL_SCHED) AS CS;
+FROM (SELECT CLASS_CODE FROM CL_SCHED) AS CS
 
 -- a subquery
 SELECT *
-FROM (SELECT CLASS_CODE FROM CL_SCHED) AS CS (CLASS_CODE);
+FROM (SELECT CLASS_CODE FROM CL_SCHED) AS CS (CLASS_CODE)
 
 <ph>-- a UNION
 -- returns all rows from columns DEPTNUMB and MANAGER 
@@ -75,10 +75,10 @@
 SELECT DEPTNUMB, MANAGER 
 FROM ORG
 UNION ALL
-VALUES (1,2), (3,4);
+VALUES (1,2), (3,4)
 
 <ph>-- a values expression</ph>
-VALUES (1,2,3);</b>
+VALUES (1,2,3)</b>
 <b>-- List the employee numbers (EMPNO) of all employees in the EMPLOYEE table 
 -- whose department number (WORKDEPT) either begins with 'E' or 
 -- who are assigned to projects in the EMP_ACT table 
@@ -89,7 +89,7 @@
   UNION
   SELECT EMPNO
      FROM EMP_ACT
-     WHERE PROJNO IN('MA2100', 'MA2110', 'MA2112');</b>
+     WHERE PROJNO IN('MA2100', 'MA2110', 'MA2112')</b>
 <b>-- Make the same query as in the previous example
 -- and "tag" the rows from the EMPLOYEE table with 'emp' and 
 -- the rows from the EMP_ACT table with 'emp_act'. 
@@ -101,7 +101,7 @@
      WHERE WORKDEPT LIKE 'E%'
   UNION
   SELECT EMPNO, 'emp_act' FROM EMP_ACT
-     WHERE PROJNO IN('MA2100', 'MA2110', 'MA2112');</b>
+     WHERE PROJNO IN('MA2100', 'MA2110', 'MA2112')</b>
 <b>-- Make the same query as in the previous example, 
 -- only use UNION ALL so that no duplicate rows are eliminated
 SELECT EMPNO
@@ -110,7 +110,7 @@
   UNION ALL
   SELECT EMPNO
      FROM EMP_ACT
-     WHERE PROJNO IN('MA2100', 'MA2110', 'MA2112');</b>
+     WHERE PROJNO IN('MA2100', 'MA2110', 'MA2112')</b>
 <b>-- Make the same query as in the previous example, 
 -- only include an additional two employees currently not in any table and 
 -- tag these rows as "new"
@@ -122,6 +122,6 @@
      FROM EMP_ACT
      WHERE PROJNO IN('MA2100', 'MA2110', 'MA2112')
   UNION
-     VALUES ('NEWAAA', 'new'), ('NEWBBB', 'new');</b></codeblock> </example>
+     VALUES ('NEWAAA', 'new'), ('NEWBBB', 'new')</b></codeblock> </example>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj21583.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj21583.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj21583.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj21583.dita Fri Sep  8 09:36:07 2006
@@ -25,7 +25,7 @@
 </metadata></prolog>
 <refbody>
 <section> <p>The FROM clause is a mandatory clause in a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref>.</i> It
-specifies the tables (<xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref>)
+specifies the tables (<i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i>)
 from which the other clauses of the query can access columns for use in expressions. </p></section>
 <refsyn><title>Syntax</title> <codeblock><b>FROM TableExpression [ , TableExpression ] *</b></codeblock> </refsyn>
 <example> <codeblock><b>SELECT Cities.city_id
@@ -35,7 +35,7 @@
 SELECT TABLENAME, ISINDEX 
 FROM SYS.SYSTABLES T, SYS.SYSCONGLOMERATES C
 WHERE T.TABLEID = C.TABLEID
-ORDER BY TABLENAME, ISINDEX;
+ORDER BY TABLENAME, ISINDEX
 <ph>-- force the join order</ph>
 SELECT *
 FROM Flights, FlightAvailability
@@ -48,7 +48,7 @@
 FROM COUNTRIES LEFT OUTER JOIN CITIES
 ON COUNTRIES.COUNTRY_ISO_CODE = CITIES.COUNTRY_ISO_CODE
 LEFT OUTER JOIN FLIGHTS
-ON Cities.AIRPORT = FLIGHTS.DEST_AIRPORT;</b></codeblock> </example>
+ON Cities.AIRPORT = FLIGHTS.DEST_AIRPORT</b></codeblock> </example>
 </refbody>
 </reference>
 

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj26498.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj26498.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj26498.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj26498.dita Fri Sep  8 09:36:07 2006
@@ -47,19 +47,19 @@
 <p>Specifying
 DEFAULT for the update value sets the value of the column to the default defined
 for that table.</p> </refsyn>
-<example><title>Example</title> <codeblock><b><ph>-- All the employees except the manager of 
-department (WORKDEPT) 'E21' have been temporarily reassigned. 
+<example><title>Example</title> <codeblock><b><ph>-- All the employees except the manager of
+-- department (WORKDEPT) 'E21' have been temporarily reassigned. 
 -- Indicate this by changing their job (JOB) to NULL and their pay
 -- (SALARY, BONUS, COMM) values to zero in the EMPLOYEE table.</ph> 
 UPDATE EMPLOYEE
   SET JOB=NULL, SALARY=0, BONUS=0, COMM=0
   WHERE WORKDEPT = 'E21' AND JOB &lt;&gt; 'MANAGER'
 
--- PROMOTE the job (JOB) of certain employees to MANAGER
+-- PROMOTE the job (JOB) of employees without a specific job title to MANAGER
 UPDATE EMPLOYEE
 	SET JOB = 'MANAGER'
-	WHERE CURRENT OF CURS1;
-<ph>-- Increase the project staffing (PRSTAFF) by 1.5 for all projects</ph>
+	WHERE JOB IS NULL;
+<ph>// Increase the project staffing (PRSTAFF) by 1.5 for all projects</ph>
 stmt.executeUpdate("UPDATE PROJECT SET PRSTAFF = "
 "PRSTAFF + 1.5" +
 "WHERE CURRENT OF" + ResultSet.getCursorName());
@@ -68,7 +68,7 @@
 -- to its DEFAULT value which is NULL</ph>
 UPDATE EMPLOYEE
   SET JOB = DEFAULT
-  WHERE EMPNO = '000290';
+  WHERE EMPNO = '000290'
 </b></codeblock> </example>
 <section><title>Statement dependency system</title> <p>A searched
 update statement depends on the table being updated, all of its conglomerates

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj31783.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj31783.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj31783.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj31783.dita Fri Sep  8 09:36:07 2006
@@ -42,7 +42,7 @@
 </refsyn>
 <section>
 <p><note>The use of the FOR UPDATE clause is not mandatory to obtain an updatable 
-JDBC ResultSets. As long as the statement used to generate the JDBC ResultSet meets 
+JDBC ResultSet. As long as the statement used to generate the JDBC ResultSet meets 
 the requirements for updatable cursor, it is sufficient for the JDBC Statement that 
 generates the JDBC ResultSet to have concurrency mode 
 <codeph>ResultSet.CONCUR_UPDATABLE</codeph> for the ResultSet to be updatable.
@@ -52,7 +52,7 @@
 cursors, see <cite><ph
 conref="refconrefs.dita#pub/cittuning"></ph></cite>.</p> 
 </section>
-<example> <codeblock><b>SELECT RECEIVED, SOURCE, SUBJECT, NOTE_TEXT FROM SAMP.IN_TRAY FOR UPDATE;
+<example> <codeblock><b>SELECT RECEIVED, SOURCE, SUBJECT, NOTE_TEXT FROM SAMP.IN_TRAY FOR UPDATE
 </b></codeblock> </example>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj32654.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj32654.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj32654.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj32654.dita Fri Sep  8 09:36:07 2006
@@ -43,7 +43,7 @@
 FROM Flights
 GROUP BY orig_airport
 
-SELECT MAX(city), region
+SELECT MAX(city_name), region
 FROM Cities, Countries
 WHERE Cities.country_ISO_code = Countries.country_ISO_code
 GROUP BY region
@@ -57,7 +57,7 @@
 AVG(OTHERS.SALARY) AS AVGSALARY,
 COUNT(*) AS EMPCOUNT
 FROM SAMP.EMPLOYEE OTHERS
-GROUP BY OTHERS.WORKDEPT;
+GROUP BY OTHERS.WORKDEPT
 </b></codeblock> </example>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj33602.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj33602.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj33602.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj33602.dita Fri Sep  8 09:36:07 2006
@@ -37,7 +37,7 @@
 boolean value. </p> <p>In addition, there are the more common boolean expressions.
 Specific boolean operators listed in Table 10, take one or more operands;
 the expressions return a boolean value.</p> </refsyn>
-<example> <codeblock><b>
+<example><title>Example</title><codeblock><b>
 <ph>-- find the flights where no business-class seats have
 -- been booked</ph>
 SELECT *
@@ -50,7 +50,7 @@
 -- to each row of the result.</ph>
 SELECT SAMP.EMP_ACT.*, LASTNAME
   FROM SAMP.EMP_ACT, SAMP.EMPLOYEE
-  WHERE EMP_ACT.EMPNO = EMPLOYEE.EMPNO;
+  WHERE EMP_ACT.EMPNO = EMPLOYEE.EMPNO
 <ph>-- Determine the employee number and salary of sales representatives 
 -- along with the average salary and head count of their departments.
 -- This query must first create a new-column-name specified in the AS clause 
@@ -66,7 +66,7 @@
     GROUP BY OTHERS.WORKDEPT
    )AS DINFO
  WHERE THIS_EMP.JOB = 'SALESREP'
-	   AND THIS_EMP.WORKDEPT = DINFO.DEPTNO;</b></codeblock> </example>
+	   AND THIS_EMP.WORKDEPT = DINFO.DEPTNO</b></codeblock> </example>
 </refbody>
 </reference>
 

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj35034.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj35034.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj35034.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj35034.dita Fri Sep  8 09:36:07 2006
@@ -24,7 +24,7 @@
 <keywords><indexterm>INNER JOIN expression</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>An INNER JOIN is a <xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref> that
+<section> <p>An INNER JOIN is a <xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operation</xref> that
 allows you to specify an explicit join clause. </p></section>
 <refsyn><title>Syntax</title> <codeblock><b><i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> [ INNER ] JOIN <i
 ><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref></i> { ON <i>booleanExpression</i> }</b></codeblock> <p>You can specify the join clause by specifying ON
@@ -34,7 +34,7 @@
 to the current SELECT. In the following example, the ON clause refers to the
 current tables:   <codeblock><b>SELECT *
 FROM SAMP.EMPLOYEE INNER JOIN SAMP.STAFF
-ON EMPLOYEE.SALARY &lt; STAFF.SALARY;
+ON EMPLOYEE.SALARY &lt; STAFF.SALARY
 </b></codeblock></p> <p>The ON clause can reference tables not being joined
 and does not have to reference either of the tables being joined (though typically
 it does). </p> </refsyn>
@@ -44,7 +44,7 @@
 -- to each row of the result
 SELECT SAMP.EMP_ACT.*, LASTNAME
      FROM SAMP.EMP_ACT JOIN SAMP.EMPLOYEE
-     ON EMP_ACT.EMPNO = EMPLOYEE.EMPNO;
+     ON EMP_ACT.EMPNO = EMPLOYEE.EMPNO
 -- Join the EMPLOYEE and DEPARTMENT tables, 
 -- select the employee number (EMPNO), 
 -- employee surname (LASTNAME), 
@@ -55,7 +55,7 @@
 SELECT EMPNO, LASTNAME, WORKDEPT, DEPTNAME 
      FROM SAMP.EMPLOYEE JOIN SAMP.DEPARTMENT 
      ON WORKDEPT = DEPTNO 
-     AND YEAR(BIRTHDATE) &lt; 1930;
+     AND YEAR(BIRTHDATE) &lt; 1930
 
 <ph>-- Another example of "generating" new data values, </ph>
 -- using a query which selects from a VALUES clause (which is an 
@@ -67,20 +67,20 @@
 AS VALUESTABLE1(C1, C2)
 JOIN (VALUES (3, 2), (1, 2),
 (0, 3)) AS VALUESTABLE2(c1, c2)
-ON VALUESTABLE1.c1 = VALUESTABLE2.c1;
-
-This results in:
-<ph>  C1         |C2         |C1         |2
------------------------------------------------
-3          |4          |3          |2
-1          |5          |1          |2
-
+ON VALUESTABLE1.c1 = VALUESTABLE2.c1
+-- This results in:
+-- C1         |C2         |C1         |2
+-- -----------------------------------------------
+-- 3          |4          |3          |2
+-- 1          |5          |1          |2
+ 
+<ph>  
 -- List every department with the employee number and 
 -- last name of the manager</ph>
 
 SELECT DEPTNO, DEPTNAME, EMPNO, LASTNAME
 	FROM DEPARTMENT INNER JOIN EMPLOYEE
-	ON MGRNO = EMPNO;
+	ON MGRNO = EMPNO
 
 <ph>-- List every employee number and last name 
 -- with the employee number and last name of their manager</ph>
@@ -88,7 +88,7 @@
 	FROM EMPLOYEE E INNER JOIN	
 	DEPARTMENT INNER JOIN EMPLOYEE M 
         ON MGRNO = M.EMPNO
-        ON E.WORKDEPT = DEPTNO;</b></codeblock> </example>
+        ON E.WORKDEPT = DEPTNO</b></codeblock> </example>
 </refbody>
 </reference>
 

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj35981.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj35981.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj35981.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj35981.dita Fri Sep  8 09:36:07 2006
@@ -36,10 +36,10 @@
 the current row of an open, updatable cursor. For more information
 about updatable cursors, see <xref
 href="rrefsqlj41360.dita#rrefsqlj41360"></xref>.</p></section>
-<section><title>Examples</title> <codeblock><b>DELETE FROM SAMP.IN_TRAY;
+<section><title>Examples</title> <codeblock><b>DELETE FROM SAMP.IN_TRAY
 
 stmt.executeUpdate("DELETE FROM SAMP.IN_TRAY WHERE CURRENT OF " +
-	resultSet.getCursorName())</b></codeblock></section>
+	resultSet.getCursorName());</b></codeblock></section>
 <section><title>Statement dependency system</title>
 <p>A searched delete statement depends on the table being updated,
 all of its conglomerates (units of storage such as heaps or indexes), and

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=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj40506.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj40506.dita Fri Sep  8 09:36:07 2006
@@ -34,8 +34,8 @@
 </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. Replace line 13 with
-this: For example, if a transaction locks the entire Flights table in share
+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
 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

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj40774.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj40774.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj40774.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj40774.dita Fri Sep  8 09:36:07 2006
@@ -43,18 +43,18 @@
 <li>UNION expressions</li>
 </ul></p> <p>For more information about Query, see <xref href="rrefsqlj21571.dita#rrefsqlj21571"></xref>.</p> </refsyn>
 <example> <codeblock><b>INSERT INTO COUNTRIES
-      VALUES ('Taiwan', 'TW', 'Asia');
+      VALUES ('Taiwan', 'TW', 'Asia')
 
 -- Insert a new department into the DEPARTMENT table,
 -- but do not assign a manager to the new department
 INSERT INTO DEPARTMENT (DEPTNO, DEPTNAME, ADMRDEPT)
-	VALUES ('E31', 'ARCHITECTURE', 'E01');
+	VALUES ('E31', 'ARCHITECTURE', 'E01')
 <ph>-- Insert two new departments using one statement 
 -- into the DEPARTMENT table as in the previous example, 
 -- but do not assign a manager to the new department.</ph>
 INSERT INTO DEPARTMENT (DEPTNO, DEPTNAME, ADMRDEPT)
 	VALUES ('B11', 'PURCHASING', 'B01'),
-	('E41', 'DATABASE ADMINISTRATION', 'E01');
+	('E41', 'DATABASE ADMINISTRATION', 'E01')
 <ph>--  Create a temporary table MA_EMP_ACT with the 
 -- same columns as the EMP_ACT table. 
 -- Load MA_EMP_ACT with the rows from the EMP_ACT
@@ -75,12 +75,12 @@
 	WHERE SUBSTR(PROJNO, 1, 2) = 'MA';
 <ph>-- Insert the DEFAULT value for the LOCATION column</ph>
 INSERT INTO DEPARTMENT
-      VALUES ('E31', 'ARCHITECTURE', '00390', 'E01', DEFAULT);
+      VALUES ('E31', 'ARCHITECTURE', '00390', 'E01', DEFAULT)
 </b></codeblock> </example>
 <section><title>Statement dependency system</title> <p>The INSERT
 statement depends on the table being inserted into, all of the conglomerates
 (units of storage such as heaps or indexes) for that table, and any other
-table named in the query. Any statement that creates or drops an index or
+table named in the statement. Any statement that creates or drops an index or
 a constraint for the target table of a prepared INSERT statement invalidates
 the prepared INSERT statement.</p> </section>
 </refbody>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj41360.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj41360.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj41360.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj41360.dita Fri Sep  8 09:36:07 2006
@@ -41,22 +41,22 @@
 SELECT statement using the WITH {RR|RS|CS|UR} syntax.</p></section>
 
 <example><title>Example</title> <codeblock><b><ph>-- lists the names of the expression 
-SAL+BONUS+COMM as TOTAL_PAY and
+-- SAL+BONUS+COMM as TOTAL_PAY and
 -- orders by the new name TOTAL_PAY</ph>
- SELECT FIRSTNME, SALARY+BONUS+COMM AS TOTAL_PAY
+SELECT FIRSTNME, SALARY+BONUS+COMM AS TOTAL_PAY
      FROM EMPLOYEE
-     ORDER BY TOTAL_PAY;
+     ORDER BY TOTAL_PAY
 <ph>-- creating an updatable cursor with a FOR UPDATE clause 
 -- to update the start date (PRSTDATE) and the end date (PRENDATE)
 -- columns in the PROJECT table</ph>
 SELECT PROJNO, PRSTDATE, PRENDATE
       FROM PROJECT
-      FOR UPDATE OF PRSTDATE, PRENDATE;
+      FOR UPDATE OF PRSTDATE, PRENDATE
 <ph>-- set the isolation level to RR for this statement only </ph>
 SELECT * 
 FROM Flights 
 WHERE flight_id BETWEEN 'AA1111' AND 'AA1112' 
-WITH RR;</b></codeblock> <p>A SELECT statement returns a <i>ResultSet</i>.
+WITH RR</b></codeblock> <p>A SELECT statement returns a <i>ResultSet</i>.
 A <i>cursor</i> is a pointer to a specific row in <i>ResultSet</i>. In Java
 applications, all <i>ResultSets</i>  have an underlying associated SQL
 cursor, often referred to as the result set's cursor. The cursor can

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj57522.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj57522.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj57522.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj57522.dita Fri Sep  8 09:36:07 2006
@@ -24,7 +24,7 @@
 </metadata></prolog>
 <refbody>
 <section> <p>A RIGHT OUTER JOIN is one of the <xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN
-operations</xref>s that allow you to specify a JOIN clause. It preserves the
+operations</xref> that allow you to specify a JOIN clause. It preserves the
 unmatched rows from the second (right) table, joining them with a NULL in
 the shape of the first (left) table. A LEFT OUTER JOIN B is equivalent to
 B RIGHT OUTER JOIN A, with the columns in a different order.</p></section>
@@ -42,7 +42,7 @@
 SELECT COUNTRIES.COUNTRY, CITIES.CITY_NAME 
 FROM CITIES 
 RIGHT OUTER JOIN COUNTRIES 
-ON CITIES.COUNTRY_ISO_CODE = COUNTRIES.COUNTRY_ISO_CODE;
+ON CITIES.COUNTRY_ISO_CODE = COUNTRIES.COUNTRY_ISO_CODE
 
 <b>-- get all countries in Africa and corresponding cities, including
 -- countries without any cities
@@ -51,7 +51,7 @@
 FROM CITIES 
 RIGHT OUTER JOIN COUNTRIES 
 ON CITIES.COUNTRY_ISO_CODE = COUNTRIES.COUNTRY_ISO_CODE
-WHERE Countries.region = 'Africa';
+WHERE Countries.region = 'Africa'
 
 <b>-- use the synonymous syntax, RIGHT JOIN, to achieve exactly
 -- the same results as in the example above
@@ -60,7 +60,7 @@
 FROM CITIES 
 RIGHT JOIN COUNTRIES 
 ON CITIES.COUNTRY_ISO_CODE = COUNTRIES.COUNTRY_ISO_CODE
-WHERE Countries.region = 'Africa';
+WHERE Countries.region = 'Africa'
 </codeblock> </example>
 <example><title>Example 2</title><codeblock><b>-- a TableExpression can be a joinOperation. Therefore
 -- you can have multiple join operations in a FROM clause
@@ -71,6 +71,6 @@
 	FROM EMPLOYEE E RIGHT OUTER JOIN	
 	DEPARTMENT RIGHT OUTER JOIN EMPLOYEE M 
         ON MGRNO = M.EMPNO
-        ON E.WORKDEPT = DEPTNO;</codeblock></example>
+        ON E.WORKDEPT = DEPTNO</codeblock></example>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj81859.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj81859.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj81859.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj81859.dita Fri Sep  8 09:36:07 2006
@@ -38,6 +38,8 @@
 <li>increase the width of a VARCHAR, CHAR VARYING, and CHARACTER VARYING column</li>
 <li>override row-level locking for the table (or drop the override)</li>
 <li>change the increment value and start value of the identity column</li>
+<li>change the nullability constraint for a column</li>
+<li>change the default value for a column</li>
 </ul></p></section>
 <section><title>Syntax</title><codeblock><b>ALTER TABLE <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i>
 {
@@ -45,7 +47,7 @@
     ADD <i><xref href="rrefsqlj13590.dita#rrefsqlj13590">CONSTRAINT clause</xref></i> |
     DROP { PRIMARY KEY | FOREIGN KEY constraint-name | UNIQUE 
 	 constraint-name | CHECK constraint-name | CONSTRAINT constraint-name }
-    ALTER <i><xref href="rrefsqlj81859.dita#rrefsqlj81859/rrefsqlj37860">column-alteration</xref></i> |
+    ALTER [ COLUMN ] <i><xref href="rrefsqlj81859.dita#rrefsqlj81859/rrefsqlj37860">column-alteration</xref></i> |
     LOCKSIZE { ROW | TABLE }
 }</b></codeblock></section>
 <example id="rrefaltercolumndef"> <title>column-definition</title><codeblock><b><i><xref
@@ -54,7 +56,9 @@
 [ [ WITH ] DEFAULT {<i>ConstantExpression</i> | NULL } ]</b></codeblock></example>
 <example id="rrefsqlj37860"><title>column-alteration</title><codeblock><b><i>column-Name</i> SET DATA TYPE VARCHAR(integer) |
 <i>column-name</i> SET INCREMENT BY integer-constant |
-<i>column-name</i> RESTART WITH integer-constant</b> </codeblock></example>
+<i>column-name</i> RESTART WITH integer-constant |
+<i>column-name</i> [ NOT ] NULL |
+<i>column-name</i> [ WITH ] DEFAULT default-value</b> </codeblock></example>
 <section><p>In the column-alteration, SET INCREMENT BY integer-constant, specifies
 the interval between consecutive values of the identity column. The next value
 to be generated for the identity column will be determined from the last assigned
@@ -133,6 +137,12 @@
 the integer-constant. You must previously define the column with the IDENTITY
 attribute (SQLSTATE 42837). If there are existing rows in the table, the values
 in the column for which the SET INCREMENT default was added do not change.</p></li>
+<li>Modifying the nullability constraint of a column.
+    <p>You can add the NOT NULL constraint to an existing column. To do so
+        there must not be existing NULL values for the column in the table.</p>
+    <p>You can remove the NOT NULL constraint from an existing column. To do
+        so the column must not be used in a PRIMARY KEY or UNIQUE constraint.</p></li>
+<li>Changing the default value for a column.</li>
 </ul></p></section>
 <section><title>Setting defaults</title><p>You can specify a default value
 for a new column. A default value is the value that is inserted into a column
@@ -192,7 +202,17 @@
 <ph>-- increase the width of a VARCHAR column</ph>
 ALTER TABLE SAMP.EMP_PHOTO ALTER PHOTO_FORMAT SET DATA TYPE VARCHAR(30);
 <ph>-- change the lock granularity of a table</ph>
-ALTER TABLE SAMP.SALES LOCKSIZE TABLE;</b></codeblock></section>
+ALTER TABLE SAMP.SALES LOCKSIZE TABLE;
+
+<ph>-- Remove the NOT NULL constraint from the MANAGER column</ph>
+ALTER TABLE Employees ALTER COLUMN Manager NULL;
+<ph>-- Add the NOT NULL constraint to the SSN column</ph>
+ALTER TABLE Employees ALTER COLUMN ssn NOT NULL;
+
+<ph>-- Change the default value for the SALARY column</ph>
+ALTER TABLE Employees ALTER COLUMN Salary DEFAULT 1000.0
+
+</b></codeblock></section>
 <section><title>Results</title><p>An ALTER TABLE statement causes all statements
 that are dependent on the table being altered to be recompiled before their
 next execution. ALTER TABLE is not allowed if there are any open cursors that

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=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqljrevoke.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqljrevoke.dita Fri Sep  8 09:36:07 2006
@@ -2,28 +2,30 @@
  
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "reference.dtd">
-<!-- 
-Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
+<!--
+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.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
-Licensed under the Apache License, Version 2.0 (the "License");  
-you may not use this file except in compliance with the License.  
-You may obtain a copy of the License at      
+http://www.apache.org/licenses/LICENSE-2.0
 
-http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.-->
 <reference id="rrefsqljrevoke" xml:lang="en-us">
 <title>REVOKE statement </title>
 <shortdesc>Use the REVOKE statement to remove permissions from a specific
 user or from all users to perform actions on database objects.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>REVOKE statement</indexterm><indexterm>SQL statements<indexterm>REVOKE</indexterm></indexterm>
-</keywords>
+<keywords><indexterm>REVOKE statement<indexterm>syntax</indexterm></indexterm>
+<indexterm>SQL statements<indexterm>REVOKE</indexterm></indexterm><indexterm>REVOKE
+statement<indexterm>limitations</indexterm></indexterm><indexterm>privileges<indexterm>tables
+and columns, revoking</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
 <section> <p>The following types of permissions can be revoked:<ul>
@@ -77,14 +79,14 @@
 only on the specified columns.</p></section>
 <section id="revokegrantees"><title>grantees</title><codeblock><b>{	<i>authorization ID</i> | PUBLIC } [,{ <i>authorization ID</i> | PUBLIC } ] *</b
 ></codeblock><p>You can revoke the privileges from specific users or from
-all users. Use the keyword PUBLIC to specify all users. When PUBLIC is specified,
-the privileges affect all current and future users. The privileges revoked
-from PUBLIC and to individual users are independent privileges. For example,
+all users. Use the keyword PUBLIC to specify all users. The privileges revoked
+from PUBLIC and from individual users are independent privileges. For example,
 a SELECT privilege on table <codeph>t</codeph> is granted to both PUBLIC and
 to the authorization ID <codeph>harry</codeph>. The SELECT privilege is later
-revoked from the authorization ID <codeph>harry</codeph>, but Harry can access
-the table <codeph>t</codeph> through the PUBLIC privilege.</p><note type="restriction">You
-cannot revoke the privileges of the owner of an object.</note></section>
+revoked from the authorization ID <codeph>harry</codeph>, but the authorization
+ID <codeph>harry</codeph> can access the table <codeph>t</codeph> through
+the PUBLIC privilege.</p><note type="restriction">You cannot revoke the privileges
+of the owner of an object.</note></section>
 <section id="revokeroutinename"><title>routine-designator</title><codeblock><b>
   {
 		<i>qualified-name</i> [ signature ]
@@ -95,16 +97,71 @@
 not try to determine if you have other privileges that can replace the privileges
 that are being revoked. For more information, see "SQL standard authorization"
 in the <ph conref="refconrefs.dita#pub/citdevelop">Derby Developer's Guide</ph>.</p></section>
+<section><title>Limitations</title><p>The following limitations apply to the
+REVOKE statement:</p><dl><dlentry>
+<dt>Table-level privileges</dt>
+<dd>All of the table-level privilege types for a specified grantee and table
+ID are stored in one row in the SYSTABLEPERMS system table. For example, when <codeph>user2</codeph> is
+granted the SELECT and DELETE privileges on table <codeph>user1.t1</codeph>,
+a row is added to the SYSTABLEPERMS table. The GRANTEE field contains <codeph>user2</codeph> and
+the TABLEID contains <codeph>user1.t1</codeph>. The SELECTPRIV and DELETEPRIV
+fields are set to Y. The remaining privilege type fields are set to N.<p>When
+a grantee creates an object that relies on one of the privilege types, the <ph
+conref="refconrefs.dita#prod/productshortname"></ph> engine tracks the dependency
+of the object on the specific row in the SYSTABLEPERMS table. For example, <codeph>user2</codeph> creates
+the view <codeph>v1</codeph> by using the statement <codeph>SELECT * FROM
+user1.t1</codeph>, the dependency manager tracks the dependency of view <codeph>v1</codeph> on
+the row in SYSTABLEPERMS for GRANTEE(<codeph>user2</codeph>), TABLEID(<codeph>user1.t1</codeph>).
+The dependency manager knows only that the view is dependent on a privilege
+type in that specific row, but does not track exactly which privilege type
+the view is dependent on.</p><p>When a REVOKE statement for a table-level
+privilege is issued for a grantee and table ID, all of the objects that are
+dependent on the grantee and table ID are dropped. For example, if <codeph>user1</codeph> revokes
+the DELETE privilege on table <codeph>t1</codeph> from <codeph>user2</codeph>,
+the row in SYSTABLEPERMS for GRANTEE(<codeph>user2</codeph>), TABLEID(<codeph>user1.t1</codeph>)
+is modified by the REVOKE statement. The dependency manager sends a revoke
+invalidation message to the view <codeph>user2.v1</codeph> and the view is
+dropped even though the view is not dependent on the DELETE privilege for
+GRANTEE(<codeph>user2</codeph>), TABLEID(<codeph>user1.t1</codeph>).</p></dd>
+</dlentry><dlentry>
+<dt>Column-level privileges</dt>
+<dd>Only one type of privilege for a specified grantee and table ID are stored
+in one row in the SYSCOLPERMS system table. For example, when <codeph>user2</codeph> is
+granted the SELECT privilege on table <codeph>user1.t1</codeph> for columns
+c12 and c13, a row is added to the SYSCOLPERMS. The GRANTEE field contains <codeph>user2</codeph>,
+the TABLEID contains <codeph>user1.t1</codeph>, the TYPE field contains <codeph>S</codeph>,
+and the COLUMNS field contains <codeph>c12, c13</codeph>.<p>When a grantee
+creates an object that relies on the privilege type and the subset of columns
+in a table ID, the <ph conref="refconrefs.dita#prod/productshortname"></ph> engine
+tracks the dependency of the object on the specific row in the SYSCOLPERMS
+table. For example, <codeph>user2</codeph> creates the view <codeph>v1</codeph> by
+using the statement <codeph>SELECT c11 FROM user1.t1</codeph>, the dependency
+manager tracks the dependency of view <codeph>v1</codeph> on the row in SYSCOLPERMS
+for GRANTEE(<codeph>user2</codeph>), TABLEID(<codeph>user1.t1</codeph>), TYPE(S).
+The dependency manager knows that the view is dependent on the SELECT privilege
+type, but does not track exactly which columns the view is dependent on.</p><p>When
+a REVOKE statement for a column-level privilege is issued for a grantee, table
+ID, and type, all of the objects that are dependent on the grantee, table
+ID, and type are dropped. For example, if <codeph>user1</codeph> revokes the
+SELECT privilege on column <codeph>c12</codeph> on table <codeph>user1.t1</codeph> from <codeph>user2</codeph>,
+the row in SYSCOLPERMS for GRANTEE(<codeph>user2</codeph>), TABLEID(<codeph>user1.t1</codeph>),
+TYPE(S) is modified by the REVOKE statement. The dependency manager sends
+a revoke invalidation message to the view <codeph>user2.v1</codeph> and the
+view is dropped even though the view is not dependent on the column <codeph>c12</codeph> for
+GRANTEE(<codeph>user2</codeph>), TABLEID(<codeph>user1.t1</codeph>), TYPE(S).</p></dd>
+</dlentry></dl></section>
 <example> <title>Revoke examples</title><p>To revoke the SELECT privilege
-on table t from the authorization IDs <codeph>maria</codeph> and <codeph>harry</codeph>,
+on table <codeph>t</codeph> from the authorization IDs <codeph>maria</codeph> and <codeph>harry</codeph>,
 use the following syntax:<codeblock><b>REVOKE SELECT ON TABLE t FROM maria,harry</b> </codeblock></p><p>To
-revoke the UPDATE and TRIGGER privileges on table t from the authorization
-IDs <codeph>anita</codeph> and <codeph>zhi</codeph>, use the following syntax:<codeblock><b>REVOKE UPDATE, TRIGGER ON TABLE t FROM anita,zhi</b> </codeblock
-></p><p>To revoke the SELECT privilege on table s.v from all users, use the
-following syntax:<codeblock><b>REVOKE SELECT ON TABLE s.v FROM PUBLIC</b></codeblock></p><p>To
-revoke the UPDATE privilege on columns c1 and c2 of table s.v from all users,
-use the following syntax:<codeblock><b>REVOKE UPDATE (c1,c2) ON TABLE s.v FROM PUBLIC</b></codeblock></p><p>To
-revoke the EXECUTE privilege on procedure p from the authorization ID <codeph>george</codeph>,
-use the following syntax:</p><codeblock><b>REVOKE EXECUTE ON PROCEDURE p FROM george RESTRICT</b> </codeblock></example>
+revoke the UPDATE and TRIGGER privileges on table <codeph>t</codeph> from
+the authorization IDs <codeph>anita</codeph> and <codeph>zhi</codeph>, use
+the following syntax:<codeblock><b>REVOKE UPDATE, TRIGGER ON TABLE t FROM anita,zhi</b> </codeblock></p><p>To
+revoke the SELECT privilege on table <codeph>s.v</codeph> from all users,
+use the following syntax:<codeblock><b>REVOKE SELECT ON TABLE s.v FROM PUBLIC</b></codeblock></p><p>To
+revoke the UPDATE privilege on columns <codeph>c1</codeph> and <codeph>c2</codeph> of
+table <codeph>s.v</codeph> from all users, use the following syntax:<codeblock><b>REVOKE UPDATE (c1,c2) ON TABLE s.v FROM PUBLIC</b></codeblock></p
+><p>To revoke the EXECUTE privilege on procedure <codeph>p</codeph> from the
+authorization ID <codeph>george</codeph>, use the following syntax:</p><codeblock><b>REVOKE EXECUTE ON PROCEDURE p FROM george RESTRICT</b> </codeblock
+></example>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/ref/rreftableexpression.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rreftableexpression.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rreftableexpression.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rreftableexpression.dita Fri Sep  8 09:36:07 2006
@@ -55,8 +55,7 @@
 }
 </b></codeblock>
 </refsyn>
-<example>
-<codeblock><b><ph>-- SELECT from a Join expression </ph>
+<example><title>Example</title><codeblock><b><ph>-- SELECT from a Join expression </ph>
 SELECT E.EMPNO, E.LASTNAME, M.EMPNO, M.LASTNAME
  FROM EMPLOYEE E LEFT OUTER JOIN
    	DEPARTMENT INNER JOIN EMPLOYEE M 

Modified: db/derby/docs/branches/10.2/src/ref/rreftablesubquery.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rreftablesubquery.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rreftablesubquery.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rreftablesubquery.dita Fri Sep  8 09:36:07 2006
@@ -41,8 +41,7 @@
 <refsyn><title>Syntax</title>
 <codeblock><b>(<i><xref href="rrefsqlj21571.dita#rrefsqlj21571">Query</xref></i>)</b></codeblock>
 </refsyn>
-<example>
-<codeblock><b><ph>-- a subquery used as a TableExpression in a FROM clause</ph>
+<example><title>Example</title><codeblock><b><ph>-- a subquery used as a TableExpression in a FROM clause</ph>
 SELECT VirtualFlightTable.flight_ID
 FROM
     (SELECT flight_ID, orig_airport, dest_airport
@@ -74,5 +73,5 @@
 WHERE COMM &gt; 
 (SELECT AVG(BONUS + 800)
      FROM EMPLOYEE
-     WHERE COMM &lt; 5000);</b></codeblock>
+     WHERE COMM &lt; 5000)</b></codeblock>
 </example></refbody></reference>

Modified: db/derby/docs/branches/10.2/src/tools/ctools1003034.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ctools1003034.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ctools1003034.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ctools1003034.dita Fri Sep  8 09:36:07 2006
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,15 +17,13 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="ctools1003034">
+<concept id="ctools1003034" xml:lang="en-us">
 <title>Java 2 Platform, Standard Edition, Version 1.3</title>
 <prolog><metadata>
-<keywords>
-</keywords>
-</metadata>
-</prolog>
+<keywords></keywords>
+</metadata></prolog>
 <conbody>
-<p>All <ph conref="toolsconrefs.dita#prod/productshortname"></ph> tools require Java 2 Platform, Standard Edition, Version
-1.3 or later.</p>
-</conbody></concept>
+<p>All <ph conref="toolsconrefs.dita#prod/productshortname"></ph> tools require
+the Java 2 Platform, Standard Edition, Version 1.3 or later.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/branches/10.2/src/tools/ctoolsij25986.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ctoolsij25986.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ctoolsij25986.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ctoolsij25986.dita Fri Sep  8 09:36:07 2006
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,16 +17,20 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="ctoolsij25986">
+<concept id="ctoolsij25986" xml:lang="en-us">
 <title>Using ij commands</title>
 <prolog><metadata>
-<keywords>
-</keywords>
-</metadata>
-</prolog>
+<keywords></keywords>
+</metadata></prolog>
 <conbody>
-<p>ij accepts a number of different commands that let you execute SQL statements
-or run scripts. Each ij statement must end with a semicolon.</p>
-<p>For complete information about ij commands, see <xref href="rtoolsijcomref25570.dita#rtoolsijcomref25570"/>. </p>
-</conbody></concept>
+<p>The primary purpose of ij is to allow the execution of <ph conref="toolsconrefs.dita#prod/productshortname"></ph> SQL
+statements interactively or via scripts. Since SQL statements can be quite
+long ij uses the semicolon to mark the end of statement or command. All statements
+must be terminated with a semicolon. ij uses properties, listed later in this
+guide, to simplify its use. ij also recognizes specialized commands that
+extends its functionality such as the ability to create and test cursors
+and prepared statements, transaction control and more. For complete information
+about ij commands, see <xref href="rtoolsijcomref25570.dita#rtoolsijcomref25570"></xref> later
+in the Tools Guide.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/branches/10.2/src/tools/ctoolsij34525.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ctoolsij34525.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ctoolsij34525.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ctoolsij34525.dita Fri Sep  8 09:36:07 2006
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,18 +17,17 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="ctoolsij34525">
+<concept id="ctoolsij34525" xml:lang="en-us">
 <title>Using ij</title>
-<shortdesc>ij is <ph conref="toolsconrefs.dita#prod/productshortname"></ph>'s interactive JDBC scripting tool. It is a simple utility for running scripts against a <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database.</shortdesc>
+<shortdesc>ij is <ph conref="toolsconrefs.dita#prod/productshortname"></ph>'s
+interactive JDBC scripting tool. It is a simple utility for running scripts
+or interactive queries against a <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database.</shortdesc>
 <prolog><metadata>
-<keywords>
-</keywords>
-</metadata>
-</prolog>
+<keywords></keywords>
+</metadata></prolog>
 <conbody>
-<p>ij is a Java application,
-which you start from a command window such as an MS-DOS Command Window or
-the UNIX shell. ij provides several commands for ease in accessing a variety
-of JDBC features through scripts.</p>
-</conbody></concept>
+<p>ij is a Java application, which you start from a command window such as
+an MS-DOS Command Window or the UNIX shell. ij provides several non-SQL commands
+for ease in accessing a variety of JDBC features for testing.</p>
+</conbody>
+</concept>

Modified: db/derby/docs/branches/10.2/src/tools/ctoolsijtools16011.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ctoolsijtools16011.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ctoolsijtools16011.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ctoolsijtools16011.dita Fri Sep  8 09:36:07 2006
@@ -34,27 +34,25 @@
 <p>A JDBC URL always starts with <i>jdbc:</i>. After that, the format for
 the database connection URL depends on the JDBC driver. </p>
 <p>Here is the format for the database connection URL for connecting to an
-existing database using the embedded driver:   <ul>
+existing <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database
+using the embedded driver:   <ul>
 <li>jdbc:derby:<i>databaseName</i>;<i>URLAttributes</i></li>
 </ul></p>
-<p>The format for the database connection URL for connecting to an existing
-database using the Network Client is:   <ul>
-<li>jdbc:derby://<i>host:port</i>/<i>databaseName</i></li>
-</ul></p>
-<p>URL attributes can be passed to the Network Client driver by using double
-quotes (") around the database name portion of the URL, as follows:   <ul>
-<li>jdbc:derby://<i>host:port</i>/<i>"databaseName;URLAttributes";</i
-></li>
+<p>The format for the database connection URL for connecting to an existing <ph
+conref="toolsconrefs.dita#prod/productshortname"></ph> database using the
+Network Client is:   <ul>
+<li>jdbc:derby://<i>host:port</i>/<i>databaseName</i>;<i>URLAttributes</i></li>
 </ul></p>
 <p>The italicized items stand for something the user fills in:   <ul>
 <li><i id="rtoolsijtools16246">databaseName</i>   <p>The name of the database
-you want to connect to</p></li>
+you want to connect to. This might also include the file system path to the
+database.</p></li>
 <li><i id="rtoolsijtools12861">URLAttributes</i>   <p>One or more of the supported
-attributes of the database connection URL, such as ;<i>territory=ll_CC</i> or
-;<i>create=true</i>. For more information, see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</p></li>
+attributes of the database connection URL, such as ;<i>upgrade=true</i>, <i>create=true</i> or <i>territory=ll_CC</i>.
+For more information, see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</p></li>
 <li><i>host</i>   <p>The name of the machine where the server is running.
 It can be the name of the machine or the address.</p></li>
-<li><i id="rtoolsijtools27024">port</i>   <p>The port number of the server
+<li><i id="rtoolsijtools27024">port</i>   <p>The port number used by the server
 framework</p></li>
 </ul></p>
 <section id="ctoolsabtproto"><title>About Protocols</title> <p>Officially,
@@ -68,4 +66,3 @@
 the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</p></section>
 </conbody>
 </concept>
-

Modified: db/derby/docs/branches/10.2/src/tools/ctoolsijtools20118.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ctoolsijtools20118.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ctoolsijtools20118.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ctoolsijtools20118.dita Fri Sep  8 09:36:07 2006
@@ -18,7 +18,7 @@
 limitations under the License.
 -->
 <concept id="ctoolsijtools20118" xml:lang="en-us">
-<title>JDBC basics</title>
+<title>JDBC connection basics</title>
 <shortdesc>Most of the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> tools
 are JDBC applications. A JDBC application is one that uses the classes in
 the <i>java.sql</i> package to interact with a DBMS.</shortdesc>
@@ -26,6 +26,12 @@
 <keywords></keywords>
 </metadata></prolog>
 <conbody>
-<p>When you work with JDBC applications, you need to know about several concepts.</p>
+<p>When you work with JDBC applications, you need to know about several concepts.
+The most basic is the <i>connection</i>. A <i>JDBC connection</i> is the object
+through which commands are sent to the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> engine
+and responses are returned to the program. Establishing a <i>connection</i> to
+a specific database is done by specifying a appropriate database <i>URL</i>.
+The following sections provide background information to help in understanding
+the Derby database connection URL.</p>
 </conbody>
 </concept>



Mime
View raw message