You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by sc...@apache.org on 2007/03/14 17:16:04 UTC

svn commit: r518201 - in /db/derby/docs/trunk/src/ref: refderby.ditamap rrefjdbc2_0summary.dita rrefsqlj1080779.dita rrefsqlj1080962.dita rrefsqlj11277.dita rrefsqlj26498.dita rrefsqlj76354.dita rrefsqlj87167.dita

Author: scotsmatrix
Date: Wed Mar 14 09:16:02 2007
New Revision: 518201

URL: http://svn.apache.org/viewvc?view=rev&rev=518201
Log:
DERBY-1920: This patch removes files that are 1-2 sentences only by moving the info into other files. This patch deletes 3 files and creates 1 new file.  Patch derby-1920-ref8.diff was contributed by Kim Haase.

Added:
    db/derby/docs/trunk/src/ref/rrefjdbc2_0summary.dita   (with props)
Removed:
    db/derby/docs/trunk/src/ref/rrefsqlj1080962.dita
    db/derby/docs/trunk/src/ref/rrefsqlj76354.dita
    db/derby/docs/trunk/src/ref/rrefsqlj87167.dita
Modified:
    db/derby/docs/trunk/src/ref/refderby.ditamap
    db/derby/docs/trunk/src/ref/rrefsqlj1080779.dita
    db/derby/docs/trunk/src/ref/rrefsqlj11277.dita
    db/derby/docs/trunk/src/ref/rrefsqlj26498.dita

Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?view=diff&rev=518201&r1=518200&r2=518201
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Wed Mar 14 09:16:02 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
+ 
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
  "map.dtd">
 <!-- 
@@ -133,7 +133,7 @@
 <topicref href="rrefdeclaretemptable.dita" navtitle="DECLARE GLOBAL TEMPORARY TABLE statement">
 </topicref>
 <topicref href="rrefsqlj35981.dita" navtitle="DELETE statement"></topicref>
-<topicref collection-type="family" href="crefsqlj80721.dita" navtitle="DROP Statements">
+<topicref collection-type="family" href="crefsqlj80721.dita" navtitle="DROP statements">
 <topicref href="rrefdropfunctionstatement.dita" navtitle="DROP FUNCTION statement">
 </topicref>
 <topicref href="rrefsqlj59893.dita" navtitle="DROP INDEX statement"></topicref>
@@ -163,9 +163,7 @@
 <topicref href="rrefsqlj32268.dita" navtitle="SET SCHEMA statement"></topicref>
 </topicref>
 <topicref href="rrefsqlj41360.dita" navtitle="SELECT statement"></topicref>
-<topicref collection-type="family" href="rrefsqlj26498.dita" navtitle="UPDATE statement">
-<topicref href="rrefsqlj76354.dita" navtitle="Value"></topicref>
-</topicref>
+<topicref href="rrefsqlj26498.dita" navtitle="UPDATE statement"></topicref>
 </topicref>
 <topicref href="rrefclauses.dita" navtitle="SQL Clauses">
 <topicref collection-type="family" href="rrefsqlj13590.dita" navtitle="CONSTRAINT clause">
@@ -187,12 +185,8 @@
 <topicref collection-type="family" href="rreftableexpression.dita" navtitle="TableExpression">
 <topicref href="rrefsqlj33215.dita" navtitle="TableOrViewExpression"></topicref>
 </topicref>
-<topicref collection-type="family" href="rrefsqlj11277.dita" navtitle="VALUES expression">
-<topicref href="rrefsqlj87167.dita" navtitle="Value"></topicref>
-</topicref>
-<topicref collection-type="family" href="rrefsqlj1080779.dita" navtitle="Expression precedence">
-<topicref href="rrefsqlj1080962.dita" navtitle="Example"></topicref>
-</topicref>
+<topicref href="rrefsqlj11277.dita" navtitle="VALUES expression"></topicref>
+<topicref href="rrefsqlj1080779.dita" navtitle="Expression precedence"></topicref>
 <topicref href="rrefsqlj23075.dita" navtitle="Boolean expression"></topicref>
 <topicref collection-type="family" href="crefsqlj29911.dita" navtitle="Dynamic parameters">
 <topicref href="rrefsqlj1082953.dita" navtitle="Dynamic parameters example ">
@@ -202,11 +196,11 @@
 </topicref>
 </topicref>
 <topicref href="rrefsqlj29840.dita" navtitle="JOIN operations">
-<topicref href="rrefsqlj35034.dita" navtitle="INNER JOIN "></topicref>
-<topicref href="rrefsqlj18922.dita" navtitle="LEFT OUTER JOIN"></topicref>
-<topicref href="rrefsqlj57522.dita" navtitle="RIGHT OUTER JOIN"></topicref>
+<topicref href="rrefsqlj35034.dita" navtitle="INNER JOIN operation"></topicref>
+<topicref href="rrefsqlj18922.dita" navtitle="LEFT OUTER JOIN operation"></topicref>
+<topicref href="rrefsqlj57522.dita" navtitle="RIGHT OUTER JOIN operation"></topicref>
 </topicref>
-<topicref href="rrefqueries.dita" navtitle="SQL Queries">
+<topicref href="rrefqueries.dita" navtitle="SQL queries">
 <topicref href="rrefsqlj21571.dita" navtitle="Query"></topicref>
 <topicref href="rrefscalarsubquery.dita" navtitle="ScalarSubquery"></topicref>
 <topicref href="rreftablesubquery.dita" navtitle="TableSubquery"></topicref>
@@ -216,118 +210,118 @@
 </topicref>
 <topicref href="rrefsqlj33923.dita" navtitle="Aggregates (set functions)">
 </topicref>
-<topicref href="rrefsqlj98067.dita" navtitle="ABS or ABSVAL"></topicref>
+<topicref href="rrefsqlj98067.dita" navtitle="ABS or ABSVAL function"></topicref>
 <topicref href="rreffuncacos.dita" navtitle="ACOS function"></topicref>
 <topicref href="rreffuncasin.dita" navtitle="ASIN function"></topicref>
 <topicref href="rreffuncatan.dita" navtitle="ATAN function"></topicref>
-<topicref href="rrefsqlj32693.dita" navtitle="AVG"></topicref>
-<topicref href="rrefbuiltbigint.dita" navtitle="BIGINT"></topicref>
+<topicref href="rrefsqlj32693.dita" navtitle="AVG function"></topicref>
+<topicref href="rrefbuiltbigint.dita" navtitle="BIGINT function"></topicref>
 <topicref href="rrefcase.dita" navtitle="CASE expressions"></topicref>
-<topicref href="rrefsqlj33562.dita" navtitle="CAST"></topicref>
+<topicref href="rrefsqlj33562.dita" navtitle="CAST function"></topicref>
 <topicref href="rreffuncceil.dita" navtitle="CEIL or CEILING function"></topicref>
-<topicref href="rrefbuiltchar.dita" navtitle="CHAR"></topicref>
-<topicref href="rrefsqlj40899.dita" navtitle="Concatenation"></topicref>
+<topicref href="rrefbuiltchar.dita" navtitle="CHAR function"></topicref>
+<topicref href="rrefsqlj40899.dita" navtitle="Concatenation operator"></topicref>
 <topicref href="rreffunccos.dita" navtitle="COS function"></topicref>
-<topicref href="rrefsqlj38716.dita" navtitle="COUNT"></topicref>
-<topicref href="rrefsqlj66113.dita" navtitle="COUNT(*)"></topicref>
-<topicref href="rrefsqljcurrentdate.dita" navtitle="CURRENT DATE"></topicref>
-<topicref href="rrefsqlj34177.dita" navtitle="CURRENT_DATE"></topicref>
-<topicref href="rrefcurrentisolation.dita" navtitle="CURRENT ISOLATION"></topicref>
-<topicref href="rrefsqljcurrentschema.dita" navtitle="CURRENT SCHEMA"></topicref>
-<topicref href="rrefsqlj1055824.dita" navtitle="CURRENT TIME"></topicref>
-<topicref href="rrefsqlj33772.dita" navtitle="CURRENT_TIME"></topicref>
-<topicref href="rrefsqljcurrenttimestamp.dita" navtitle="CURRENT TIMESTAMP">
-</topicref>
-<topicref href="rrefsqlj15866.dita" navtitle="CURRENT_TIMESTAMP"></topicref>
-<topicref href="rrefsqlj42324.dita" navtitle="CURRENT_USER"></topicref>
-<topicref href="rrefdatefunc.dita" navtitle="DATE"></topicref>
-<topicref href="rrefdayfunc.dita" navtitle="DAY"></topicref>
+<topicref href="rrefsqlj38716.dita" navtitle="COUNT function"></topicref>
+<topicref href="rrefsqlj66113.dita" navtitle="COUNT(*) function"></topicref>
+<topicref href="rrefsqljcurrentdate.dita" navtitle="CURRENT DATE function"></topicref>
+<topicref href="rrefsqlj34177.dita" navtitle="CURRENT_DATE function"></topicref>
+<topicref href="rrefcurrentisolation.dita" navtitle="CURRENT ISOLATION function"></topicref>
+<topicref href="rrefsqljcurrentschema.dita" navtitle="CURRENT SCHEMA function"></topicref>
+<topicref href="rrefsqlj1055824.dita" navtitle="CURRENT TIME function"></topicref>
+<topicref href="rrefsqlj33772.dita" navtitle="CURRENT_TIME function"></topicref>
+<topicref href="rrefsqljcurrenttimestamp.dita" navtitle="CURRENT TIMESTAMP function">
+</topicref>
+<topicref href="rrefsqlj15866.dita" navtitle="CURRENT_TIMESTAMP function"></topicref>
+<topicref href="rrefsqlj42324.dita" navtitle="CURRENT_USER function"></topicref>
+<topicref href="rrefdatefunc.dita" navtitle="DATE function"></topicref>
+<topicref href="rrefdayfunc.dita" navtitle="DAY function"></topicref>
 <topicref href="rreffuncdegrees.dita" navtitle="DEGREES function"></topicref>
-<topicref href="rrefbuiltdouble.dita" navtitle="DOUBLE"></topicref>
+<topicref href="rrefbuiltdouble.dita" navtitle="DOUBLE function"></topicref>
 <topicref href="rreffuncexp.dita" navtitle="EXP function"></topicref>
 <topicref href="rreffuncfloor.dita" navtitle="FLOOR function"></topicref>
-<topicref href="rrefhourfunc.dita" navtitle="HOUR"></topicref>
-<topicref href="rrefidentityvallocal.dita" navtitle="IDENTITY_VAL_LOCAL">
+<topicref href="rrefhourfunc.dita" navtitle="HOUR function"></topicref>
+<topicref href="rrefidentityvallocal.dita" navtitle="IDENTITY_VAL_LOCAL function">
 </topicref>
-<topicref href="rrefbuiltinteger.dita" navtitle="INTEGER"></topicref>
-<topicref href="rrefsqlj42049.dita" navtitle="LCASE or LOWER"></topicref>
-<topicref href="rrefsqlj16762.dita" navtitle="LENGTH"></topicref>
+<topicref href="rrefbuiltinteger.dita" navtitle="INTEGER function"></topicref>
+<topicref href="rrefsqlj42049.dita" navtitle="LCASE or LOWER function"></topicref>
+<topicref href="rrefsqlj16762.dita" navtitle="LENGTH function"></topicref>
 <topicref href="rreffunclog.dita" navtitle="LN or LOG function"></topicref>
 <topicref href="rreffunclog10.dita" navtitle="LOG10 function"></topicref>
-<topicref href="rrefsqlj61998.dita" navtitle="LOCATE"></topicref>
-<topicref href="rrefsqlj97870.dita" navtitle="LTRIM"></topicref>
-<topicref href="rrefsqlj27781.dita" navtitle="MAX"></topicref>
-<topicref href="rrefsqlj33520.dita" navtitle="MIN"></topicref>
-<topicref href="rrefminutefunc.dita" navtitle="MINUTE"></topicref>
-<topicref href="rrefsqljmod.dita" navtitle="MOD"></topicref>
-<topicref href="rrefmonthfunc.dita" navtitle="MONTH"></topicref>
+<topicref href="rrefsqlj61998.dita" navtitle="LOCATE function"></topicref>
+<topicref href="rrefsqlj97870.dita" navtitle="LTRIM function"></topicref>
+<topicref href="rrefsqlj27781.dita" navtitle="MAX function"></topicref>
+<topicref href="rrefsqlj33520.dita" navtitle="MIN function"></topicref>
+<topicref href="rrefminutefunc.dita" navtitle="MINUTE function"></topicref>
+<topicref href="rrefsqljmod.dita" navtitle="MOD function"></topicref>
+<topicref href="rrefmonthfunc.dita" navtitle="MONTH function"></topicref>
 <topicref href="rrefcasenullif.dita" navtitle="NULLIF expressions"></topicref>
 <topicref href="rreffuncpi.dita" navtitle="PI function"></topicref>
 <topicref href="rreffuncradians.dita" navtitle="RADIANS function"></topicref>
-<topicref href="rrefsqlj32613.dita" navtitle="RTRIM"></topicref>
-<topicref href="rrefsecondfunc.dita" navtitle="SECOND"></topicref>
-<topicref href="rrefsqlj25228.dita" navtitle="SESSION_USER"></topicref>
+<topicref href="rrefsqlj32613.dita" navtitle="RTRIM function"></topicref>
+<topicref href="rrefsecondfunc.dita" navtitle="SECOND function"></topicref>
+<topicref href="rrefsqlj25228.dita" navtitle="SESSION_USER function"></topicref>
 <topicref href="rreffuncsin.dita" navtitle="SIN function"></topicref>
-<topicref href="rrefbuiltsmallint.dita" navtitle="SMALLINT"></topicref>
-<topicref href="rrefsqlj73147.dita" navtitle="SQRT"></topicref>
-<topicref href="rrefsqlj93082.dita" navtitle="SUBSTR"></topicref>
-<topicref href="rrefsqlj13083.dita" navtitle="SUM"></topicref>
+<topicref href="rrefbuiltsmallint.dita" navtitle="SMALLINT function"></topicref>
+<topicref href="rrefsqlj73147.dita" navtitle="SQRT function"></topicref>
+<topicref href="rrefsqlj93082.dita" navtitle="SUBSTR function"></topicref>
+<topicref href="rrefsqlj13083.dita" navtitle="SUM function"></topicref>
 <topicref href="rreffunctan.dita" navtitle="TAN function"></topicref>
-<topicref href="rreftimefunc.dita" navtitle="TIME"></topicref>
-<topicref href="rreftimestampfunc.dita" navtitle="TIMESTAMP"></topicref>
-<topicref href="rrefsqlj29930.dita" navtitle="UCASE or UPPER"></topicref>
-<topicref href="rrefsqlj42476.dita" navtitle="USER"></topicref>
-<topicref href="rrefbuiltvarchar.dita" navtitle="VARCHAR"></topicref>
+<topicref href="rreftimefunc.dita" navtitle="TIME function"></topicref>
+<topicref href="rreftimestampfunc.dita" navtitle="TIMESTAMP function"></topicref>
+<topicref href="rrefsqlj29930.dita" navtitle="UCASE or UPPER function"></topicref>
+<topicref href="rrefsqlj42476.dita" navtitle="USER function"></topicref>
+<topicref href="rrefbuiltvarchar.dita" navtitle="VARCHAR function"></topicref>
 <topicref href="rreffuncxmlexists.dita" navtitle="XMLEXISTS operator"></topicref>
 <topicref href="rreffuncxmlparse.dita" navtitle="XMLPARSE operator"></topicref>
 <topicref href="rreffuncxmlquery.dita" navtitle="XMLQUERY operator"></topicref>
 <topicref href="rreffuncxmlserialize.dita" navtitle="XMLSERIALIZE operator">
 </topicref>
-<topicref href="rrefyearfunc.dita" navtitle="YEAR"></topicref>
+<topicref href="rrefyearfunc.dita" navtitle="YEAR function"></topicref>
 </topicref>
 <topicref href="crefsqlbuiltinsystemfunctions.dita" navtitle="Built-in system functions">
-<topicref href="rrefsyscschecktablefunc.dita" navtitle="SYSCS_UTIL.SYSCS_CHECK_TABLE">
+<topicref href="rrefsyscschecktablefunc.dita" navtitle="SYSCS_UTIL.SYSCS_CHECK_TABLE system function">
 </topicref>
-<topicref href="rrefgetdbpropfunc.dita" navtitle="SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY">
+<topicref href="rrefgetdbpropfunc.dita" navtitle="SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY system function">
 </topicref>
-<topicref href="rrefsyscsruntimestatsfunc.dita" navtitle="SYSCS_UTIL.SYSCS_GET_RUNTIMESTATISTICS">
+<topicref href="rrefsyscsruntimestatsfunc.dita" navtitle="SYSCS_UTIL.SYSCS_GET_RUNTIMESTATISTICS system function">
 </topicref>
 </topicref>
 <topicref href="crefsqlbuiltinsystemprocedures.dita" navtitle="Built-in system procedures">
 <!--(Laura - March 2007) The topics in this section are intentionally not listed alphabetical order. They are listed by group of information. For example, the COMPRESS and INPLACE_COMPRESS topics are listed together; the IMPORT and EXPORT topics are listed together.-->
-<topicref href="rrefbackupdbproc.dita" navtitle="SYSCS_UTIL.SYSCS_BACKUP_DATABASE">
+<topicref href="rrefbackupdbproc.dita" navtitle="SYSCS_UTIL.SYSCS_BACKUP_DATABASE system procedure">
 </topicref>
-<topicref href="rrefbackupdbnowaitproc.dita" navtitle="SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT">
+<topicref href="rrefbackupdbnowaitproc.dita" navtitle="SYSC_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT system procedure">
 </topicref>
-<topicref href="rrefbackupdbenablelogproc.dita" navtitle="SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE">
+<topicref href="rrefbackupdbenablelogproc.dita" navtitle="SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE system procedure">
 </topicref>
-<topicref href="rrefbackupdbenablelognowaitproc.dita" navtitle="SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT">
+<topicref href="rrefbackupdbenablelognowaitproc.dita" navtitle="SYSC_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT system procedure">
 </topicref>
-<topicref href="rrefcheckpointdbproc.dita" navtitle="SYSCS_UTIL.SYSCS_CHECKPOINT_DATABASE">
+<topicref href="rrefcheckpointdbproc.dita" navtitle="SYSCS_UTIL.SYSCS_CHECKPOINT_DATABASE system procedure">
 </topicref>
-<topicref href="rrefaltertablecompress.dita" navtitle="SYSCS_UTIL.SYSCS_COMPRESS_TABLE">
+<topicref href="rrefaltertablecompress.dita" navtitle="SYSCS_UTIL.SYSCS_COMPRESS_TABLE system procedure">
 </topicref>
-<topicref href="rrefproceduresinplacecompress.dita" navtitle="SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE">
+<topicref href="rrefproceduresinplacecompress.dita" navtitle="SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE system procedure">
 </topicref>
-<topicref href="rrefdisablelogproc.dita" navtitle="SYSCS_UTIL.SYSCS_DISABLE_LOG_ARCHIVE_MODE">
+<topicref href="rrefdisablelogproc.dita" navtitle="SYSCS_UTIL.SYSCS_DISABLE_LOG_ARCHIVE_MODE system procedure">
 </topicref>
-<topicref href="rrefexportproc.dita" navtitle="SYSCS_UTIL.SYSCS_EXPORT_TABLE">
+<topicref href="rrefexportproc.dita" navtitle="SYSCS_UTIL.SYSCS_EXPORT_TABLE system procedure">
 </topicref>
-<topicref href="rrefexportselectionproc.dita" navtitle="SYSCS_UTIL.SYSCS_EXPORT_QUERY">
+<topicref href="rrefexportselectionproc.dita" navtitle="SYSCS_UTIL.SYSCS_EXPORT_QUERY system procedure">
 </topicref>
-<topicref href="rrefimportdataproc.dita" navtitle="SYSCS_UTIL.SYSCS_IMPORT_DATA">
+<topicref href="rrefimportdataproc.dita" navtitle="SYSCS_UTIL.SYSCS_IMPORT_DATA system procedure">
 </topicref>
-<topicref href="rrefimportproc.dita" navtitle="SYSCS_UTIL.SYSCS_IMPORT_TABLE">
+<topicref href="rrefimportproc.dita" navtitle="SYSCS_UTIL.SYSCS_IMPORT_TABLE system procedure">
 </topicref>
-<topicref href="rreffreezedbproc.dita" navtitle="SYSCS_UTIL.SYSCS_FREEZE_DATABASE">
+<topicref href="rreffreezedbproc.dita" navtitle="SYSCS_UTIL.SYSCS_FREEZE_DATABASE system procedure">
 </topicref>
-<topicref href="rrefunfreezedbproc.dita" navtitle="SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE">
+<topicref href="rrefunfreezedbproc.dita" navtitle="SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE system procedure">
 </topicref>
-<topicref href="rrefsetdbpropproc.dita" navtitle="SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY">
+<topicref href="rrefsetdbpropproc.dita" navtitle="SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY system procedure">
 </topicref>
-<topicref href="rrefsqlj38831.dita" navtitle="SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS">
+<topicref href="rrefsqlj38831.dita" navtitle="SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS system procedure">
 </topicref>
-<topicref href="rrefsetstatstimingproc.dita" navtitle="SYSCS_UTIL.SYSCS_SET_STATISTICS_TIMING">
+<topicref href="rrefsetstatstimingproc.dita" navtitle="SYSCS_UTIL.SYSCS_SET_STATISTICS_TIMING system procedure">
 </topicref>
 </topicref>
 <topicref href="crefsqlj31068.dita" navtitle="Data types">
@@ -343,65 +337,67 @@
 </topicref>
 <topicref href="rrefsqlj58560.dita" navtitle="Data type assignments and comparison, sorting, and ordering">
 </topicref>
-<topicref href="rrefsqlj30435.dita" navtitle="BIGINT"></topicref>
-<topicref href="rrefblob.dita" navtitle="BLOB"></topicref>
-<topicref href="rrefsqlj13733.dita" navtitle="CHAR"></topicref>
-<topicref href="rrefsqlj57924.dita" navtitle="CHAR FOR BIT DATA"></topicref>
-<topicref href="rrefclob.dita" navtitle="CLOB"></topicref>
-<topicref href="rrefsqlj18730.dita" navtitle="DATE"></topicref>
-<topicref href="rrefsqlj15260.dita" navtitle="DECIMAL"></topicref>
-<topicref href="rrefsqlj42002.dita" navtitle="DOUBLE "></topicref>
-<topicref href="rrefsqljdoubleprecision.dita" navtitle="DOUBLE PRECISION">
-</topicref>
-<topicref href="rrefsqlj27281.dita" navtitle="FLOAT"></topicref>
-<topicref href="rrefsqlj10696.dita" navtitle="INTEGER"></topicref>
-<topicref href="rrefsqlj15147.dita" navtitle="LONG VARCHAR"></topicref>
-<topicref href="rrefsqlj30118.dita" navtitle="LONG VARCHAR FOR BIT DATA">
-</topicref>
-<topicref href="rrefsqlj12362.dita" navtitle="NUMERIC"></topicref>
-<topicref href="rrefsqlj14122.dita" navtitle="REAL"></topicref>
-<topicref href="rrefsqlj16221.dita" navtitle="SMALLINT"></topicref>
-<topicref href="rrefsqlj21908.dita" navtitle="TIME"></topicref>
-<topicref href="rrefsqlj27620.dita" navtitle="TIMESTAMP"></topicref>
-<topicref href="rrefsqlj41207.dita" navtitle="VARCHAR"></topicref>
-<topicref href="rrefsqlj32714.dita" navtitle="VARCHAR FOR BIT DATA"></topicref>
+<topicref href="rrefsqlj30435.dita" navtitle="BIGINT data type"></topicref>
+<topicref href="rrefblob.dita" navtitle="BLOB data type"></topicref>
+<topicref href="rrefsqlj13733.dita" navtitle="CHAR data type"></topicref>
+<topicref href="rrefsqlj57924.dita" navtitle="CHAR FOR BIT DATA data type"></topicref>
+<topicref href="rrefclob.dita" navtitle="CLOB data type"></topicref>
+<topicref href="rrefsqlj18730.dita" navtitle="DATE data type"></topicref>
+<topicref href="rrefsqlj15260.dita" navtitle="DECIMAL data type"></topicref>
+<topicref href="rrefsqlj42002.dita" navtitle="DOUBLE data type"></topicref>
+<topicref href="rrefsqljdoubleprecision.dita" navtitle="DOUBLE PRECISION data type">
+</topicref>
+<topicref href="rrefsqlj27281.dita" navtitle="FLOAT data type"></topicref>
+<topicref href="rrefsqlj10696.dita" navtitle="INTEGER data type"></topicref>
+<topicref href="rrefsqlj15147.dita" navtitle="LONG VARCHAR data type"></topicref>
+<topicref href="rrefsqlj30118.dita" navtitle="LONG VARCHAR FOR BIT DATA data type">
+</topicref>
+<topicref href="rrefsqlj12362.dita" navtitle="NUMERIC data type"></topicref>
+<topicref href="rrefsqlj14122.dita" navtitle="REAL data type"></topicref>
+<topicref href="rrefsqlj16221.dita" navtitle="SMALLINT data type"></topicref>
+<topicref href="rrefsqlj21908.dita" navtitle="TIME data type"></topicref>
+<topicref href="rrefsqlj27620.dita" navtitle="TIMESTAMP data type"></topicref>
+<topicref href="rrefsqlj41207.dita" navtitle="VARCHAR data type"></topicref>
+<topicref href="rrefsqlj32714.dita" navtitle="VARCHAR FOR BIT DATA data type"></topicref>
 <topicref href="rrefsqljtypexml.dita" navtitle="XML data type"></topicref>
 </topicref>
 </topicref>
 <topicref href="rrefkeywords29722.dita" navtitle="SQL reserved words"></topicref>
 <topicref href="rrefsql9241891.dita" navtitle="Derby support for SQL-92 features ">
 </topicref>
-<topicref href="rrefsistabs38369.dita" navtitle="Derby System Tables">
-<topicref href="rrefsistabs28114.dita" navtitle="SYSALIASES"></topicref>
-<topicref href="rrefsistabs26665.dita" navtitle="SYSCHECKS"></topicref>
-<topicref href="rrefsistabssyscolperms.dita" navtitle="SYSCOLPERMS"></topicref>
-<topicref href="rrefsistabs22441.dita" navtitle="SYSCOLUMNS"></topicref>
-<topicref href="rrefsistabs39391.dita" navtitle="SYSCONGLOMERATES"></topicref>
-<topicref href="rrefsistabs23241.dita" navtitle="SYSCONSTRAINTS"></topicref>
-<topicref href="rrefsistabs12813.dita" navtitle="SYSDEPENDS"></topicref>
-<topicref href="rrefsistabs40972.dita" navtitle="SYSFILES"></topicref>
-<topicref href="rrefsistabs13420.dita" navtitle="SYSFOREIGNKEYS"></topicref>
-<topicref href="rrefsistabs33921.dita" navtitle="SYSKEYS"></topicref>
-<topicref href="rrefsistabssysroutineperms.dita" navtitle="SYSROUTINEPERMS">
-</topicref>
-<topicref href="rrefsistabs12085.dita" navtitle="SYSSCHEMAS"></topicref>
-<topicref href="rrefsistabslilanguageitemsysstatistics.dita" navtitle="SYSSTATISTICS">
-</topicref>
-<topicref href="rrefsistabs33768.dita" navtitle="SYSSTATEMENTS"></topicref>
-<topicref href="rrefsistabssystableperms.dita" navtitle="SYSTABLEPERMS"></topicref>
-<topicref href="rrefsistabs24269.dita" navtitle="SYSTABLES"></topicref>
-<topicref href="rrefsistabs79888.dita" navtitle="SYSTRIGGERS"></topicref>
-<topicref href="rrefsistabs24045.dita" navtitle="SYSVIEWS"></topicref>
+<topicref href="rrefsistabs38369.dita" navtitle="Derby system tables">
+<topicref href="rrefsistabs28114.dita" navtitle="SYSALIASES system table"></topicref>
+<topicref href="rrefsistabs26665.dita" navtitle="SYSCHECKS system table"></topicref>
+<topicref href="rrefsistabssyscolperms.dita" navtitle="SYSCOLPERMS system table"></topicref>
+<topicref href="rrefsistabs22441.dita" navtitle="SYSCOLUMNS system table"></topicref>
+<topicref href="rrefsistabs39391.dita" navtitle="SYSCONGLOMERATES system table"></topicref>
+<topicref href="rrefsistabs23241.dita" navtitle="SYSCONSTRAINTS system table"></topicref>
+<topicref href="rrefsistabs12813.dita" navtitle="SYSDEPENDS system table"></topicref>
+<topicref href="rrefsistabs40972.dita" navtitle="SYSFILES system table"></topicref>
+<topicref href="rrefsistabs13420.dita" navtitle="SYSFOREIGNKEYS system table"></topicref>
+<topicref href="rrefsistabs33921.dita" navtitle="SYSKEYS system table"></topicref>
+<topicref href="rrefsistabssysroutineperms.dita" navtitle="SYSROUTINEPERMS system table">
+</topicref>
+<topicref href="rrefsistabs12085.dita" navtitle="SYSSCHEMAS system table"></topicref>
+<topicref href="rrefsistabslilanguageitemsysstatistics.dita" navtitle="SYSSTATISTICS system table">
+</topicref>
+<topicref href="rrefsistabs33768.dita" navtitle="SYSSTATEMENTS system table"></topicref>
+<topicref href="rrefsistabssystableperms.dita" navtitle="SYSTABLEPERMS system table"></topicref>
+<topicref href="rrefsistabs24269.dita" navtitle="SYSTABLES system table"></topicref>
+<topicref href="rrefsistabs79888.dita" navtitle="SYSTRIGGERS system table"></topicref>
+<topicref href="rrefsistabs24045.dita" navtitle="SYSVIEWS system table"></topicref>
 </topicref>
 <topicref collection-type="family" href="rrefexcept16677.dita" navtitle="Derby exception messages and SQL states">
 <topicref href="rrefexcept71493.dita" navtitle="SQLState and error message reference">
 </topicref>
 </topicref>
-<topicref collection-type="family" href="crefjdbc12657.dita" navtitle="JDBC Reference">
-<topicref href="crefjdbc25142.dita" navtitle="Core JDBC java.sql Classes, Interfaces, and Methods">
+<topicref collection-type="family" href="crefjdbc12657.dita" navtitle="JDBC reference">
+<topicref href="crefjdbc25142.dita" navtitle="Core JDBC java.sql classes, interfaces, and methods">
 </topicref>
-<topicref href="rrefjdbc32052.dita" navtitle="java.sql.Driver"></topicref>
-<topicref collection-type="family" href="rrefjdbc34565.dita" navtitle="java.sql.DriverManager.getConnection">
+<topicref href="rrefjdbc32052.dita" navtitle="java.sql.Driver interface">
+<topicref href="rrefjdbc34954.dita" navtitle="java.sql.Driver.getPropertyInfo method"></topicref>
+</topicref>
+<topicref collection-type="family" href="rrefjdbc34565.dita" navtitle="java.sql.DriverManager.getConnection method">
 <topicref href="rrefjdbc27433.dita" navtitle="Derby database connection
 URL syntax"></topicref>
 <topicref href="rrefjdbc37352.dita" navtitle="Syntax of database connection URLs for applications with embedded databases ">
@@ -410,21 +406,19 @@
 <topicref href="rrefjdbc10889.dita" navtitle="Attributes of the Derby database connection URL ">
 </topicref>
 </topicref>
-<topicref href="rrefjdbc34954.dita" navtitle="java.sql.Driver.getPropertyInfo ">
-</topicref>
-<topicref collection-type="family" href="rrefjdbc27734.dita" navtitle="java.sql.Connection ">
-<topicref href="rrefjavcsti.dita" navtitle="java.sql.Connection.setTransactionIsolation ">
+<topicref collection-type="family" href="rrefjdbc27734.dita" navtitle="java.sql.Connection interface">
+<topicref href="rrefjavcsti.dita" navtitle="java.sql.Connection.setTransactionIsolation method">
 </topicref>
-<topicref href="rrefjavcsro.dita" navtitle="java.sql.Connection.setReadOnly ">
+<topicref href="rrefjavcsro.dita" navtitle="java.sql.Connection.setReadOnly method">
 </topicref>
-<topicref href="rrefjavciro.dita" navtitle="java.sql.Connection.isReadOnly ">
+<topicref href="rrefjavciro.dita" navtitle="java.sql.Connection.isReadOnly method">
 </topicref>
 <topicref href="crefjavccns.dita" navtitle="Connection functionality not supported">
 </topicref>
 </topicref>
-<topicref collection-type="family" href="rrefjdbc15905.dita" navtitle="java.sql.DatabaseMetaData ">
+<topicref collection-type="family" href="rrefjdbc15905.dita" navtitle="java.sql.DatabaseMetaData interface">
 <topicref href="rrefdmrs.dita" navtitle="DatabaseMetaData result sets"></topicref>
-<topicref href="rrefgpc1.dita" navtitle="getProcedureColumnsgetProcedureColumns">
+<topicref href="rrefgpc1.dita" navtitle="java.sql.DatabaseMetaData.getProcedureColumns method">
 </topicref>
 <topicref href="rrefpgc1.dita" navtitle="Parameters to getProcedureColumns">
 </topicref>
@@ -433,58 +427,59 @@
 <topicref href="rrefdmdfns1.dita" navtitle="DatabaseMetaData functionality not supported">
 </topicref>
 </topicref>
-<topicref collection-type="family" href="rrefjdbc40794.dita" navtitle="java.sql.Statement ">
+<topicref collection-type="family" href="rrefjdbc40794.dita" navtitle="java.sql.Statement interface">
 <topicref href="rrefso2.dita" navtitle="ResultSet objects "></topicref>
 </topicref>
-<topicref collection-type="family" href="rrefjdbc20485.dita" navtitle="java.sql.CallableStatement ">
+<topicref collection-type="family" href="rrefjdbc20485.dita" navtitle="java.sql.CallableStatement interface">
 <topicref href="rrefjavcallstatout.dita" navtitle="CallableStatements and OUT Parameters ">
 </topicref>
 <topicref href="rrefjdbc75719.dita" navtitle="CallableStatements and INOUT Parameters ">
 </topicref>
 </topicref>
-<topicref href="rrefjdbc16643.dita" navtitle="java.sql.SQLException "></topicref>
-<topicref collection-type="family" href="rrefjdbc29874.dita" navtitle="java.sql.PreparedStatement ">
+<topicref href="rrefjdbc16643.dita" navtitle="java.sql.SQLException class"></topicref>
+<topicref collection-type="family" href="rrefjdbc29874.dita" navtitle="java.sql.PreparedStatement interface">
 <topicref href="rrefjavsqlprst.dita" navtitle="Prepared statements and streaming columns ">
 </topicref>
 </topicref>
-<topicref collection-type="family" href="rrefjdbc23502.dita" navtitle="java.sql.ResultSet ">
+<topicref collection-type="family" href="rrefjdbc23502.dita" navtitle="java.sql.ResultSet interface">
 <topicref href="rrefjavsqlrssc.dita" navtitle="ResultSets and streaming columns ">
 </topicref>
 </topicref>
-<topicref href="rrefjdbc38274.dita" navtitle="java.sql.ResultSetMetaData ">
+<topicref href="rrefjdbc38274.dita" navtitle="java.sql.ResultSetMetaData interface">
 </topicref>
-<topicref href="rrefjdbc30469.dita" navtitle="java.sql.SQLWarning "></topicref>
-<topicref href="rrefjdbcrefsqlxml.dita" navtitle="java.sql.SQLXML"></topicref>
+<topicref href="rrefjdbc30469.dita" navtitle="java.sql.SQLWarning class"></topicref>
+<topicref href="rrefjdbcrefsqlxml.dita" navtitle="java.sql.SQLXML interface"></topicref>
 <topicref href="rrefjdbc20377.dita" navtitle="Mapping of java.sql.Types to SQL types">
+<topicref collection-type="family" href="rrefjdbc96386.dita" navtitle="Mapping of java.sql.Blob and java.sql.Clob interfaces">
+<topicref href="crefjavbclobnot.dita" navtitle="Notes on mapping of java.sql.Blob and java.sql.Clob interfaces"></topicref>
 </topicref>
-<topicref collection-type="family" href="rrefjdbc96386.dita" navtitle="java.sql.Blob and java.sql.Clob">
-<topicref href="crefjavbclobnot.dita" navtitle="Notes"></topicref>
 </topicref>
-<topicref href="rrefjdbc80004.dita" navtitle="java.sql.Connection "></topicref>
-<topicref href="rrefjdbc77156.dita" navtitle="java.sql.ResultSet"></topicref>
-<topicref href="rrefjdbc59162.dita" navtitle="java.sql.Statement "></topicref>
-<topicref href="rrefjdbc99392.dita" navtitle="java.sql.PreparedStatement ">
+<topicref collection-type="family" href="rrefjdbc2_0summary.dita" navtitle="JDBC 2.0 features">
+<topicref href="rrefjdbc52637.dita" navtitle="java.sql.CallableStatement interface: supported JDBC 2.0 methods">
 </topicref>
-<topicref href="rrefjdbc52637.dita" navtitle="java.sql.CallableStatement ">
+<topicref href="rrefjdbc80004.dita" navtitle="java.sql.Connection interface: supported JDBC 2.0 methods"></topicref>
+<topicref href="rrefjdbc66688.dita" navtitle="java.sql.DatabaseMetaData interface: supported JDBC 2.0 methods">
 </topicref>
-<topicref href="rrefjdbc66688.dita" navtitle="java.sql.DatabaseMetaData">
+<topicref href="rrefjdbc99392.dita" navtitle="java.sql.PreparedStatement interface: supported JDBC 2.0 methods">
 </topicref>
-<topicref href="rrefjdbc71949.dita" navtitle="java.sql.ResultSetMetaData">
+<topicref href="rrefjdbc77156.dita" navtitle="java.sql.ResultSet interface: supported JDBC 2.0 methods"></topicref>
+<topicref href="rrefjdbc71949.dita" navtitle="java.sql.ResultSetMetaData interface: supported JDBC 2.0 methods"></topicref>
+<topicref href="rrefjdbc59162.dita" navtitle="java.sql.Statement interface: supported JDBC 2.0 methods"></topicref>
 </topicref>
-<topicref href="rrefjdbc87220.dita" navtitle="java.sql.BatchUpdateException">
+<topicref href="rrefjdbc87220.dita" navtitle="java.sql.BatchUpdateException class">
 </topicref>
 <topicref href="rrefjdbcjsr169.dita" navtitle="JDBC Package for Connected Device Configuration/Foundation Profile
 (JSR169)"></topicref>
-<topicref collection-type="family" href="rrefjdbc32593.dita" navtitle="JDBC 3.0-only features ">
-<topicref href="rrefjdbcjavasqlconnection30.dita" navtitle="java.sql.Connection ">
+<topicref collection-type="family" href="rrefjdbc32593.dita" navtitle="JDBC 3.0 features ">
+<topicref href="rrefjdbcjavasqlconnection30.dita" navtitle="java.sql.Connection interface: supported JDBC 3.0 methods">
 </topicref>
-<topicref href="rrefjdbcdatabasemetadata30.dita" navtitle="java.sql.DatabaseMetaData ">
+<topicref href="rrefjdbcdatabasemetadata30.dita" navtitle="java.sql.DatabaseMetaData interface: supported JDBC 3.0 methods">
 </topicref>
-<topicref href="rrefjdbcparametermetadata30.dita" navtitle="java.sql.ParameterMetaData ">
+<topicref href="rrefjdbcparametermetadata30.dita" navtitle="java.sql.ParameterMetaData interface: supported JDBC 3.0 methods">
 </topicref>
-<topicref href="rrefjdbcjavasqlpreparedstatement30.dita" navtitle="java.sql.PreparedStatement">
+<topicref href="rrefjdbcjavasqlpreparedstatement30.dita" navtitle="java.sql.PreparedStatement interface: supported JDBC 3.0 methods">
 </topicref>
-<topicref collection-type="family" href="rrefjdbcjavasqlsavepoint.dita" navtitle="java.sql.Savepoint ">
+<topicref collection-type="family" href="rrefjdbcjavasqlsavepoint.dita" navtitle="java.sql.Savepoint interface">
 <topicref href="crefjavsavesetroll.dita" navtitle="Setting and rolling back to a savepoint ">
 </topicref>
 <topicref href="crefjavsaverel.dita" navtitle="Releasing a savepoint "></topicref>
@@ -493,20 +488,20 @@
 </topicref>
 </topicref>
 <topicref collection-type="family" href="rrefjdbcjavasqlstatement30.dita"
-navtitle="java.sql.Statement">
+navtitle="java.sql.Statement interface: supported JDBC 3.0 methods">
 <topicref href="crefjavstateautogen.dita" navtitle="Autogenerated keys"></topicref>
 </topicref>
 </topicref>
 <topicref collection-type="family" href="rrefjdbc4_0summary.dita" navtitle="JDBC 4.0-only features ">
 <topicref href="rrefjdbc4_0sqlexception.dita" navtitle="Refined subclasses of SQLException">
 </topicref>
-<topicref href="rrefjdbc4_0connection.dita" navtitle="java.sql.Connection">
+<topicref href="rrefjdbc4_0connection.dita" navtitle="java.sql.Connection interface: JDBC 4.0 features">
 </topicref>
-<topicref href="rrefjdbc4_0databaseMetaData.dita" navtitle="java.sql.DatabaseMetaData">
+<topicref href="rrefjdbc4_0databaseMetaData.dita" navtitle="java.sql.DatabaseMetaData interface: JDBC 4.0 features">
 </topicref>
-<topicref href="rrefjdbc4_0statement.dita" navtitle="java.sql.Statement">
+<topicref href="rrefjdbc4_0statement.dita" navtitle="java.sql.Statement interface: JDBC 4.0 features">
 </topicref>
-<topicref href="rrefjdbc4_0dataSource.dita" navtitle="javax.sql.DataSource">
+<topicref href="rrefjdbc4_0dataSource.dita" navtitle="javax.sql.DataSource interface: JDBC 4.0 features">
 </topicref>
 </topicref>
 <topicref collection-type="family" href="rrefjdbc1020262.dita" navtitle="JDBC escape syntax ">
@@ -528,31 +523,31 @@
 </topicref>
 </topicref>
 <topicref href="rrefattrib24612.dita" navtitle="Setting attributes for the database connection URL ">
-<topicref href="rrefattrib42100.dita" navtitle="bootPassword=key"></topicref>
-<topicref href="rrefattrib26867.dita" navtitle="create=true"></topicref>
-<topicref href="rrefcreatefrom.dita" navtitle="createFrom=Path"></topicref>
-<topicref href="rrefattrib17246.dita" navtitle="databaseName=nameofDatabase">
+<topicref href="rrefattrib42100.dita" navtitle="bootPassword=key attribute"></topicref>
+<topicref href="rrefattrib26867.dita" navtitle="create=true attribute"></topicref>
+<topicref href="rrefcreatefrom.dita" navtitle="createFrom=path attribute"></topicref>
+<topicref href="rrefattrib17246.dita" navtitle="databaseName=nameofDatabase attribute">
 </topicref>
-<topicref href="rrefattrib15290.dita" navtitle="dataEncryption=true"></topicref>
-<topicref href="rrefattribencryptkey.dita" navtitle="encryptionKey=key"></topicref>
-<topicref href="rrefattrib88843.dita" navtitle="encryptionProvider=providerName">
+<topicref href="rrefattrib15290.dita" navtitle="dataEncryption=true attribute"></topicref>
+<topicref href="rrefattribencryptkey.dita" navtitle="encryptionKey=key attribute"></topicref>
+<topicref href="rrefattrib88843.dita" navtitle="encryptionProvider=providerName attribute">
 </topicref>
-<topicref href="rrefattrib60346.dita" navtitle="encryptionAlgorithm=algorithm">
+<topicref href="rrefattrib60346.dita" navtitle="encryptionAlgorithm=algorithm attribute">
 </topicref>
-<topicref href="rrefattrib72457.dita" navtitle="logDevice=logDirectoryPath">
+<topicref href="rrefattrib72457.dita" navtitle="logDevice=logDirectoryPath attribute">
 </topicref>
-<topicref href="rrefattribnewencryptkey.dita" navtitle="newEncryptionKey=new encryption key">
+<topicref href="rrefattribnewencryptkey.dita" navtitle="newEncryptionKey=key attribute">
 </topicref>
-<topicref href="rrefattribnewbootpw.dita" navtitle="newBootPassword=new password">
+<topicref href="rrefattribnewbootpw.dita" navtitle="newBootPassword=newPassword attribute">
 </topicref>
-<topicref href="rrefattrib42686.dita" navtitle="password=userPassword"></topicref>
-<topicref href="rrefrestorefrom.dita" navtitle="restoreFrom=Path"></topicref>
-<topicref href="rrefrollforward.dita" navtitle="rollForwardRecoveryFrom=Path">
+<topicref href="rrefattrib42686.dita" navtitle="password=userPassword attribute"></topicref>
+<topicref href="rrefrestorefrom.dita" navtitle="restoreFrom=path attribute"></topicref>
+<topicref href="rrefrollforward.dita" navtitle="rollForwardRecoveryFrom=path attribute">
 </topicref>
-<topicref href="rrefattrib16471.dita" navtitle="shutdown=true"></topicref>
-<topicref href="rrefattrib56769.dita" navtitle="territory=ll_CC"></topicref>
-<topicref href="rrefattrib10035.dita" navtitle="user=userName"></topicref>
-<topicref href="rrefattrib34183.dita" navtitle="(no attributes)"></topicref>
+<topicref href="rrefattrib16471.dita" navtitle="shutdown=true attribute"></topicref>
+<topicref href="rrefattrib56769.dita" navtitle="territory=ll_CC attribute"></topicref>
+<topicref href="rrefattrib10035.dita" navtitle="user=userName attribute"></topicref>
+<topicref href="rrefattrib34183.dita" navtitle="Creating a connection without specifying attributes"></topicref>
 </topicref>
 <topicref collection-type="family" href="rrefjta16677.dita" navtitle="J2EE Compliance: Java Transaction API and javax.sql Extensions">
 <topicref href="rrefjta94396.dita" navtitle="JVM and libraries for J2EE features">

Added: db/derby/docs/trunk/src/ref/rrefjdbc2_0summary.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc2_0summary.dita?view=auto&rev=518201
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc2_0summary.dita (added)
+++ db/derby/docs/trunk/src/ref/rrefjdbc2_0summary.dita Wed Mar 14 09:16:02 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+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      
+
+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.
+-->
+
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
+<reference id="rrefjdbc2_0summary" xml:lang="en-us">
+<title>JDBC 2.0 features</title>
+<prolog><metadata>
+<keywords>
+<indexterm>JDBC 2.0</indexterm>
+</keywords>
+</metadata></prolog>
+<refbody>
+<section>
+<p>
+This section documents the methods available since JDBC 2.0 that are supported
+by <ph conref="refconrefs.dita#prod/productshortname"></ph>.
+</p>
+</section>
+</refbody>
+</reference>

Propchange: db/derby/docs/trunk/src/ref/rrefjdbc2_0summary.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/docs/trunk/src/ref/rrefsqlj1080779.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj1080779.dita?view=diff&rev=518201&r1=518200&r2=518201
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj1080779.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj1080779.dita Wed Mar 14 09:16:02 2007
@@ -41,6 +41,9 @@
 <section><p>You can explicitly specify precedence by placing expressions within
 parentheses. An expression within parentheses is evaluated before any operations
 outside the parentheses are applied to it.</p></section>
+<example><title>Example</title>
+<codeblock><b>(3+4)*9
+(age &lt; 16 OR age &gt; 65) AND employed = TRUE</b></codeblock></example>
 </refbody>
 </reference>
 

Modified: db/derby/docs/trunk/src/ref/rrefsqlj11277.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj11277.dita?view=diff&rev=518201&r1=518200&r2=518201
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj11277.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj11277.dita Wed Mar 14 09:16:02 2007
@@ -31,13 +31,13 @@
 and statements wherever subqueries are permitted, and as the source of values
 for an INSERT statement.</p> </section>
 <refsyn><title>Syntax</title> <codeblock><b>{
-    VALUES ( <i><xref href="rrefsqlj87167.dita#rrefsqlj87167">Value</xref></i> {, <i><xref
-href="rrefsqlj87167.dita#rrefsqlj87167">Value</xref></i> }* )
-        [ , ( <i><xref href="rrefsqlj87167.dita#rrefsqlj87167">Value</xref></i> {, <i><xref
-href="rrefsqlj87167.dita#rrefsqlj87167">Value</xref></i> }* ) ]* |
-    VALUES <i><xref href="rrefsqlj87167.dita#rrefsqlj87167">Value</xref></i> [ , <i><xref
-href="rrefsqlj87167.dita#rrefsqlj87167">Value</xref></i> ]* |
- }</b></codeblock> <p>The first form constructs multi-column rows. The second
+    VALUES ( <i>Value</i> {, <i>Value</i> }* )
+        [ , ( <i>Value</i> {, <i>Value</i> }* ) ]* |
+    VALUES <i>Value</i> [ , <i>Value</i> ]* |
+ }</b></codeblock> 
+<p>where <i>Value</i> is defined as</p>
+<codeblock><b><i>Expression</i> | DEFAULT</b></codeblock>
+<p>The first form constructs multi-column rows. The second
 form constructs single-column rows, each expression being the value of the
 column of the row.</p> <p>The DEFAULT keyword is allowed only if the VALUES
 expression is in an INSERT statement. Specifying DEFAULT for a column inserts

Modified: db/derby/docs/trunk/src/ref/rrefsqlj26498.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj26498.dita?view=diff&rev=518201&r1=518200&r2=518201
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj26498.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj26498.dita Wed Mar 14 09:16:02 2007
@@ -26,18 +26,17 @@
 <refbody>
 <refsyn><title>Syntax</title> <codeblock><b>{
     UPDATE <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i>
-        SET <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> = <i><xref
-href="rrefsqlj76354.dita#rrefsqlj76354">Value</xref></i>
-        [ , <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> = <i><xref
-href="rrefsqlj76354.dita#rrefsqlj76354">Value</xref></i>} ]*
+        SET <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> = <i>Value</i>
+        [ , <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> = <i>Value</i>} ]*
         [<i><xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref></i>] |
     UPDATE <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i>
-        SET <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> = <i><xref
-href="rrefsqlj76354.dita#rrefsqlj76354">Value</xref></i>
-        [ , <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> = <i><xref
-href="rrefsqlj76354.dita#rrefsqlj76354">Value</xref></i> ]*
+        SET <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> = <i>Value</i>
+        [ , <i><xref href="rrefcolumnname.dita#rrefcolumnname">column-Name</xref></i> = <i>Value</i> ]*
         <i><xref href="rrefsqlj15309.dita#rrefsqlj15309">WHERE CURRENT OF</xref></i>
-}</b></codeblock> <p>The first syntactical form, called a searched update, updates the value of
+}</b></codeblock> 
+<p>where <varname>Value</varname> is defined as follows:</p>
+<codeblock><b><i>Expression</i> | DEFAULT</b></codeblock>
+<p>The first syntactical form, called a searched update, updates the value of
 one or more columns for all rows of the table for which the WHERE clause evaluates to TRUE.</p>
 <p>The second syntactical form, called a positioned update, updates one or more columns on the
 current row of an open, updatable cursor. If columns were specified in the