db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r436974 [2/3] - in /db/derby/docs/branches/10.2: ./ lib/ src/adminguide/ src/devguide/ src/getstart/ src/images/ src/pt_BR/getstart/ src/pt_BR/ref/ src/ref/ src/tools/ src/tuning/ src/workingwithderby/
Date Fri, 25 Aug 2006 22:00:05 GMT
Modified: db/derby/docs/branches/10.2/src/ref/rrefdayfunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefdayfunc.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefdayfunc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefdayfunc.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,23 +18,19 @@
 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 xml:lang="en-us" id="rrefdayfunc">
+<reference id="rrefdayfunc" xml:lang="en-us">
 <title>DAY</title>
+<shortdesc>The DAY function returns the day part of a value.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>DAY function</indexterm>
-</keywords>
-</metadata>
-</prolog><refbody>
-<section>
-<p>The DAY function returns the day part of a value.  The argument
-must be a date, timestamp, or a valid character string representation of a
-date or timestamp that is neither a CLOB nor a LONG VARCHAR.  The result of
-the function is a large integer. If the argument can be null, the result can
-be null; if the argument is null, the result is the null value.</p>
-<p>The
-other rules depend on the data type of the argument specified: 
-<ul>
+<keywords><indexterm>DAY function</indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<section> <p>The argument must be a date, timestamp, or a valid character
+string representation of a date or timestamp that is not a CLOB, LONG VARCHAR,
+or XML value.  The result of the function is a large integer. If the argument
+can be null, the result can be null; if the argument is null, the result is
+the null value.</p> <p>The other rules depend on the data type of the argument
+specified:  <ul>
 <li>If the argument is a date, timestamp, or valid string representation of
 a date or timestamp:  The result is the day part of the value, which is an
 integer between 1 and 31. </li>
@@ -39,10 +38,8 @@
 the day part of the value, which is an integer between -99 and 99. A nonzero
 result has the same sign as the argument.</li>
 </ul></p></section>
-<refsyn><title>Syntax</title>
-<codeblock><b>DAY ( <i>expression</i> )</b></codeblock>
-</refsyn>
-<example>
-<codeblock><b>values day('2005-08-02');</b></codeblock>
-<p>The resulting value is 2.</p>
-</example></refbody></reference>
+<refsyn><title>Syntax</title> <codeblock><b>DAY ( <i>expression</i> )</b></codeblock> </refsyn>
+<example> <codeblock><b>values day('2006-08-02');</b></codeblock> <p>The resulting
+value is 2.</p> </example>
+</refbody>
+</reference>

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?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefdeclaretemptable.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefdeclaretemptable.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -19,22 +20,23 @@
 -->
 <reference id="rrefdeclaretemptable" xml:lang="en-us">
 <title>DECLARE GLOBAL TEMPORARY TABLE statement</title>
+<shortdesc>The DECLARE GLOBAL TEMPORARY TABLE statement defines a temporary
+table for the current connection. </shortdesc>
 <prolog><metadata>
 <keywords><indexterm>DECLARE GLOBAL TEMPORARY TABLE statement</indexterm>
-<indexterm>Tables<indexterm>Temporary</indexterm></indexterm></keywords>
+<indexterm>tables<indexterm>temporary</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p>The DECLARE GLOBAL TEMPORARY TABLE statement defines a temporary
-table for the current connection. These tables do not reside in the system
-catalogs and are not persistent. Temporary tables exist only during the connection
-that declared them and cannot be referenced outside of that connection. When
-the connection closes, the rows of the table are deleted, and the in-memory
-description of the temporary table is dropped.</p></section>
+<section><p>These tables do not reside in the system catalogs and are not
+persistent. Temporary tables exist only during the connection that declared
+them and cannot be referenced outside of that connection. When the connection
+closes, the rows of the table are deleted, and the in-memory description of
+the temporary table is dropped.</p></section>
 <section><p>Temporary tables are useful when: <ul>
-<li>the table structure is not known before using an application.</li>
-<li>other users do not need the same table structure.</li>
-<li>data in the temporary table is needed while using the application.</li>
-<li>the table can be declared and dropped without holding the locks on the
+<li>The table structure is not known before using an application.</li>
+<li>Other users do not need the same table structure.</li>
+<li>Data in the temporary table is needed while using the application.</li>
+<li>The table can be declared and dropped without holding the locks on the
 system catalog.</li>
 </ul></p></section>
 <section><title>Syntax</title> <codeblock><b>DECLARE GLOBAL TEMPORARY TABLE <i><xref
@@ -112,15 +114,15 @@
 -- This select statement is referencing the "myapp.t1" physical 
 -- table since the table was not qualified by SESSION.
 
-</codeblock> <p>Note that temporary tables can only be declared in the SESSION
-schema. You should never declare a physical schema with the SESSION name.</p> <p>The
+</codeblock> <note>Temporary tables can be declared only in the SESSION schema.
+You should never declare a physical schema with the SESSION name.</note><p>The
 following is a list of DB2 UDB DECLARE GLOBAL TEMPORARY TABLE functions that
 are not supported by <ph conref="refconrefs.dita#prod/productshortname"></ph>: <ul>
 <li>IDENTITY column-options </li>
 <li>IDENTITY attribute in copy-options</li>
 <li>AS (fullselect) DEFINITION ONLY</li>
 <li>NOT LOGGED ON ROLLBACK PRESERVE ROWS</li>
-<li> IN tablespace-name</li>
+<li>IN tablespace-name</li>
 <li>PARTITIONING KEY</li>
 <li>WITH REPLACE </li>
 </ul> </p></section>
@@ -132,25 +134,26 @@
 <li>CREATE VIEW</li>
 <li>LOCK</li>
 <li>RENAME</li>
-</ul></p> <p>Temporary tables cannot be specified in referential constraints.</p> <p>There
-is no check constraints support for columns.</p> <p>The following data types
+</ul></p><p>Temporary tables cannot be specified in referential constraints.</p><p>There
+is no support for check constraints on columns.</p><p>The following data types
 cannot be used with Declared Global Temporary Tables: <ul>
 <li>BLOB</li>
 <li>CLOB</li>
 <li>LONG VARCHAR</li>
-</ul></p> <p>Temporary tables cannot be referenced in a triggered-SQL-statement.</p> <p>If
-a statement performing an insert, update, or delete to the temporary table
-encounters an error, all the rows of the table are deleted.</p></section>
+<li>XML</li>
+</ul></p><p>Temporary tables cannot be referenced in a triggered-SQL-statement.</p><p>If
+a statement that performs an insert, update, or delete to the temporary table
+encounters an error, all the rows of the temporary table are deleted.</p></section>
 <section><title>Restrictions Specific to Derby</title> <p><ph conref="refconrefs.dita#prod/productshortname"></ph> does
-not support the following on temporary tables:</p> <ul>
-<li>index support</li>
-<li>synonyms, triggers and views on SESSION schema tables (including physical
+not support the following features on temporary tables:</p> <ul>
+<li>Indexes</li>
+<li>Synonyms, triggers and views on SESSION schema tables (including physical
 tables and temporary tables)</li>
 <li>LOCK TABLE</li>
-<li>constraints and primary keys</li>
-<li>generated-column-spec</li>
-<li>importing into temporary tables</li>
-</ul> <p>Any statements referencing SESSION schema tables and views will not
-be cached.</p></section>
+<li>Constraints and primary keys</li>
+<li>Generated-column-spec</li>
+<li>Importing into temporary tables</li>
+</ul> <p>Statements that reference SESSION schema tables and views are not
+cached.</p></section>
 </refbody>
 </reference>

Modified: db/derby/docs/branches/10.2/src/ref/rrefexcept71493.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefexcept71493.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefexcept71493.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefexcept71493.dita Fri Aug 25 14:59:58 2006
@@ -202,6 +202,23 @@
 </row>
 </tbody>
 </tgroup>
+</table><table><title> Class Code 10: XQuery Error</title>
+<tgroup cols="2"><colspec colname="col1" colwidth="129*"/><colspec colname="col2"
+colwidth="673*"/>
+<thead>
+<row>
+<entry colname="col1">SQLSTATE </entry>
+<entry colname="col2">Message Text</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">10000</entry>
+<entry colname="col2">Encountered error while evaluating XML query expression
+for &lt;<i>operatorName</i>> operator; see next exception for details.</entry>
+</row>
+</tbody>
+</tgroup>
 </table><table><title> Class Code 21: Cardinality Violation</title>
 <tgroup cols="2"><colspec colname="col1" colwidth="129*"/><colspec colname="col2"
 colwidth="673*"/>
@@ -234,6 +251,30 @@
 for details.</entry>
 </row>
 <row>
+<entry colname="col1">2200L
+ </entry>
+<entry colname="col2">Values assigned to XML columns must be well-formed DOCUMENT
+nodes.
+ 
+
+
+ 
+</entry>
+</row>
+<row>
+<entry colname="col1">2200M</entry>
+<entry colname="col2">Failed to parse XMLPARSE operand; see next exception
+for details.</entry>
+</row>
+<row>
+<entry colname="col1">2200V
+</entry>
+<entry colname="col2">Invalid context item for &lt;operatorName> operator;
+context items must be well-formed DOCUMENT nodes.
+ 
+</entry>
+</row>
+<row>
 <entry colname="col1">22001</entry>
 <entry colname="col2">A truncation error was encountered trying to shrink &lt;<i>value</i>>
 '&lt;<i>value</i>>' to length &lt;<i>value</i>></entry>
@@ -1610,7 +1651,7 @@
 in table '&lt;<i>tableName</i>>'. </entry>
 </row>
 <row>
-<entry colname="col1"> 42Z25</entry>
+<entry colname="col1">42Z25</entry>
 <entry colname="col2">INTERNAL ERROR identity counter. Update was called without
  arguments with <codeblock>current value = NULL</codeblock>.      </entry>
 </row>
@@ -1632,6 +1673,69 @@
 <entry colname="col1">42Z53</entry>
 <entry colname="col2">INTERNAL ERROR: Do not know what type of activation
 to generate for node choice &lt;<i>value</i>>. </entry>
+</row>
+<row>
+<entry colname="col1">42Z70</entry>
+<entry colname="col2">Binding directly to an XML value is not allowed; try
+using XMLPARSE.</entry>
+</row>
+<row>
+<entry colname="col1">42Z71</entry>
+<entry colname="col2">XML values are not allowed in top-level result sets;
+try using XMLSERIALIZE.
+</entry>
+</row>
+<row>
+<entry colname="col1">42Z72</entry>
+<entry colname="col2">XML syntax error; missing keyword(s): ''&lt;keyword>''.</entry>
+</row>
+<row>
+<entry colname="col1">42Z73</entry>
+<entry colname="col2">Invalid target type for XMLSERIALIZE: ''&lt;sqlType>''.
+</entry>
+</row>
+<row>
+<entry colname="col1">42Z74
+</entry>
+<entry colname="col2">XML feature not supported: ''&lt;featureKeyWord>''.
+ 
+</entry>
+</row>
+<row>
+<entry colname="col1">42Z75</entry>
+<entry colname="col2">XML query expression must be a string literal.</entry>
+</row>
+<row>
+<entry colname="col1">42Z76</entry>
+<entry colname="col2">Multiple XML context items are not allowed.</entry>
+</row>
+<row>
+<entry colname="col1">42Z77</entry>
+<entry colname="col2">Context item must have type ''XML''; ''&lt;sqlType>''
+is not allowed.
+ 
+
+ </entry>
+</row>
+<row>
+<entry colname="col1">42Z78</entry>
+<entry colname="col2">Failed to locate ''&lt;externalAPIName>' API or implementation
+classes.  XML operations are not permitted unless these classes are in your
+classpath.
+  
+ 
+
+ </entry>
+</row>
+<row>
+<entry colname="col1">42Z79</entry>
+<entry colname="col2">Unable to determine the parameter type for XMLPARSE;
+try using a CAST.</entry>
+</row>
+<row>
+<entry colname="col1">42Z7Z</entry>
+<entry colname="col2">Encountered unexpected error while processing XML; see
+next exception for details.</entry>
 </row>
 <row>
 <entry colname="col1">42Z90</entry>

Modified: db/derby/docs/branches/10.2/src/ref/rrefhourfunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefhourfunc.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefhourfunc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefhourfunc.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,24 +18,22 @@
 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="rrefhourfunc" xml:lang="en-us">
 <title>HOUR</title>
+<shortdesc>The HOUR function returns the hour part of a value.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>HOUR function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The HOUR function returns the hour part of a value.  The argument
-must be a time, timestamp, or a valid character string representation of a
-time or timestamp that is neither a CLOB nor a LONG VARCHAR.  The result of
-the function is a large integer. If the argument can be null, the result can
-be null; if the argument is null, the result is the null value.</p> <p>The
-other rules depend on the data type of the argument specified:  <ul>
+<section> <p>The argument must be a time, timestamp, or a valid character
+string representation of a time or timestamp that is not a CLOB, LONG VARCHAR,
+or XML value.  The result of the function is a large integer. If the argument
+can be null, the result can be null; if the argument is null, the result is
+the null value.</p> <p>The other rules depend on the data type of the argument
+specified:  <ul>
 <li>If the argument is a date, timestamp, or valid string representation of
-a date or timestamp:  The result is the hour part of the value,
-which is an integer between 0 and 24. </li>
+a date or timestamp:  The result is the hour part of the value, which is an
+integer between 0 and 24. </li>
 <li>If the argument is a time duration or timestamp duration: The result is
 the hour part of the value, which is an integer between -99 and 99. A nonzero
 result has the same sign as the argument.</li>
@@ -43,4 +44,3 @@
 WHERE HOUR(STARTING) BETWEEN 12 AND 17</b></codeblock> </example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc20377.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc20377.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc20377.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc20377.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,19 +18,20 @@
 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="rrefjdbc20377" xml:lang="en-us">
 <title>Mapping of java.sql.Types to SQL types</title>
+<shortdesc>In Derby, the java.sql.Types are mapped to SQL data types</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>java.sql.Types<indexterm>mapped to SQL types</indexterm></indexterm>
+<indexterm>SQL types<indexterm>mapped to java.sql.Types</indexterm></indexterm>
 <indexterm>JDBC types<indexterm>mapped to SQL types</indexterm><indexterm>for
-JDBC and SQL types</indexterm></indexterm><indexterm>Type correspondence</indexterm>
-</keywords>
+JDBC and SQL types</indexterm></indexterm><indexterm>data types<indexterm>JDBC
+types to SQL types</indexterm></indexterm><indexterm>java.sql.Types<indexterm>LONGVARBINARY</indexterm></indexterm>
+<indexterm>java.sql.Types<indexterm>LONGVARCHAR</indexterm></indexterm><indexterm>java.sql.Types<indexterm>FLOAT
+data type</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p><xref href="rrefjdbc20377.dita#rrefjdbc20377/jdbc31241"></xref> shows the mapping of <i>java.sql.Types</i> to
+<section><p>The following table shows the mapping of <i>java.sql.Types</i> to
 SQL types.   <table frame="all" id="jdbc31241"><title>Mapping of java.sql.Types
 to SQL Types</title>
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="30*"/>
@@ -76,8 +80,7 @@
 <entry colname="2">DOUBLE PRECISION</entry>
 </row>
 <row>
-<entry colname="1">FLOAT<indexterm>FLOAT data type<indexterm>java.sql type
-converted to DOUBLE PRECISION when retrieved</indexterm></indexterm></entry>
+<entry colname="1">FLOAT</entry>
 <entry colname="2">DOUBLE PRECISION<sup><xref href="rrefjdbc20377.dita#rrefjdbc20377/chdbdbhh">2</xref></sup></entry>
 </row>
 <row>
@@ -85,11 +88,11 @@
 <entry colname="2">INTEGER</entry>
 </row>
 <row>
-<entry colname="1">LONGVARBINARY<indexterm>LONGVARBINARY</indexterm></entry>
+<entry colname="1">LONGVARBINARY</entry>
 <entry colname="2">LONG VARCHAR FOR BIT DATA</entry>
 </row>
 <row>
-<entry colname="1">LONGVARCHAR<indexterm>LONGVARCHAR</indexterm></entry>
+<entry colname="1">LONGVARCHAR</entry>
 <entry colname="2">LONG VARCHAR</entry>
 </row>
 <row>
@@ -109,6 +112,10 @@
 <entry colname="2">SMALLINT</entry>
 </row>
 <row>
+<entry colname="1">SQLXML<sup><xref href="rrefjdbc20377.dita#rrefjdbc20377/sqlxml">3</xref></sup></entry>
+<entry colname="2">XML</entry>
+</row>
+<row>
 <entry colname="1">TIME</entry>
 <entry colname="2">TIME</entry>
 </row>
@@ -127,12 +134,17 @@
 </tbody>
 </tgroup>
 </table> <note othertype="Notes" type="other"><ol>
-<li id="chdhcccj"><indexterm>Mapping<indexterm>of SQL types to java.sql.Types</indexterm></indexterm>BIT
-is only valid in JDBC 2.0 and earlier environments.</li>
+<li id="chdhcccj">BIT is only valid in JDBC 2.0 and earlier environments.</li>
 <li id="chdbdbhh">Values can be passed in using the FLOAT type code; however,
 these are stored as DOUBLE PRECISION values, and so always have the type code
 DOUBLE when retrieved.</li>
+<li id="sqlxml">SQLXML is only valid in JDBC 4.0 and later environments. SQLXML
+corresponds to the SQL type XML in <ph conref="refconrefs.dita#prod/productshortname"></ph>.
+ However, <ph conref="refconrefs.dita#prod/productshortname"></ph> does not
+recognize the java.sql.Types.SQLXML data type and does not support any JDBC-side
+operations for the XML data type.  Support for XML and the related operators
+is implemented only at the SQL layer.  See <xref href="rrefsqljtypexml.dita#rrefsqljtypexml">XML
+data types</xref> for more. </li>
 </ol> </note></p></section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefminutefunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefminutefunc.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefminutefunc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefminutefunc.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,21 +18,19 @@
 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="rrefminutefunc" xml:lang="en-us">
 <title>MINUTE</title>
+<shortdesc>The MINUTE function returns the minute part of a value. </shortdesc>
 <prolog><metadata>
 <keywords><indexterm>MINUTE function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The MINUTE function returns the minute part of a value.  The
-argument must be a time, timestamp, or a valid character string representation
-of a time or timestamp that is neither a CLOB nor a LONG VARCHAR.  The result
-of the function is a large integer. If the argument can be null, the result
-can be null; if the argument is null, the result is the null value.</p> <p>The
-other rules depend on the data type of the argument specified:  <ul>
+<section> <p> The argument must be a time, timestamp, or a valid character
+string representation of a time or timestamp that is not a CLOB, LONG VARCHAR,
+or XML value.  The result of the function is a large integer. If the argument
+can be null, the result can be null; if the argument is null, the result is
+the null value.</p> <p>The other rules depend on the data type of the argument
+specified:  <ul>
 <li>If the argument is a date, timestamp, or valid string representation of
 a date or timestamp:  The result is the minute part of the value, which is
 an integer between 0 and 59.</li>
@@ -42,4 +43,3 @@
 SELECT * FROM table1 WHERE MINUTE(ending) &lt; 60;</b></codeblock> </example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefmonthfunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefmonthfunc.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefmonthfunc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefmonthfunc.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,21 +18,19 @@
 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="rrefmonthfunc" xml:lang="en-us">
 <title>MONTH</title>
+<shortdesc>The MONTH function returns the month part of a value.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>MONTH function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The MONTH function returns the month part of a value.  The argument
-must be a date, timestamp, or a valid character string representation of a
-date or timestamp that is neither a CLOB nor a LONG VARCHAR.  The result of
-the function is a large integer. If the argument can be null, the result can
-be null; if the argument is null, the result is the null value. </p> <p>The
-other rules depend on the data type of the argument specified:  <ul>
+<section> <p>The argument must be a date, timestamp, or a valid character
+string representation of a date or timestamp that is not a CLOB, LONG VARCHAR,
+or XML value.  The result of the function is a large integer. If the argument
+can be null, the result can be null; if the argument is null, the result is
+the null value. </p> <p>The other rules depend on the data type of the argument
+specified:  <ul>
 <li>If the argument is a date, timestamp, or valid string representation of
 a date or timestamp:  The result is the month part of the value, which is
 an integer between 1 and 12.</li>
@@ -43,4 +44,3 @@
 WHERE MONTH(BIRTHDATE) = 12</b></codeblock> </example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefsecondfunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsecondfunc.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsecondfunc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsecondfunc.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,21 +18,19 @@
 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="rrefsecondfunc" xml:lang="en-us">
 <title>SECOND</title>
+<shortdesc>The SECOND function returns the seconds part of a value.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>SECOND function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The SECOND function returns the seconds part of a value.  The
-argument must be a time, timestamp, or a valid character string representation
-of a time or timestamp that is neither a CLOB nor a LONG VARCHAR.  The result
-of the function is a large integer. If the argument can be null, the result
-can be null; if the argument is null, the result is the null value.</p> <p>The
-other rules depend on the data type of the argument specified:  <ul>
+<section> <p>The argument must be a time, timestamp, or a valid character
+string representation of a time or timestamp that is not a CLOB, LONG VARCHAR,
+or XML value.  The result of the function is a large integer. If the argument
+can be null, the result can be null; if the argument is null, the result is
+the null value.</p> <p>The other rules depend on the data type of the argument
+specified:  <ul>
 <li>If the argument is a date, timestamp, or valid string representation of
 a date or timestamp:  The result is the seconds part of the value, which is
 an integer between 0 and 59.</li>
@@ -43,4 +44,3 @@
 the value 30.</p> </example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj33562.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj33562.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj33562.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj33562.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,20 +18,17 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefsqlj33562" xml:lang="en-us">
 <title>CAST</title>
+<shortdesc>The CAST function converts a value from one data type to another
+and provides a data type to a dynamic parameter (?) or a NULL value.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>CAST function</indexterm><indexterm>Conversions<indexterm>of
-SQL-92 data types using CAST</indexterm></indexterm><indexterm>Conversions<indexterm>using
-CAST function (explicit)</indexterm></indexterm></keywords>
+<keywords><indexterm>CAST function</indexterm><indexterm>conversions<indexterm>SQL-92
+data types using CAST</indexterm></indexterm><indexterm>conversions<indexterm>CAST
+function (explicit)</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>CAST converts a value from one data type to another and provides
-a data type to a dynamic parameter (?) or a NULL value.</p> <p>CAST expressions
-are permitted anywhere expressions are permitted.</p></section>
+<section> <p>CAST expressions are permitted anywhere expressions are permitted.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>CAST ( [ <i>Expression</i> | NULL | ? ]
     AS <i>Datatype</i>)</b></codeblock> <p>The data type to which you are
 casting an expression is the <i>target type</i>. The data type of the expression
@@ -40,7 +40,7 @@
 conversions between data types are valid. The first column on the table lists
 the source types, while the first row lists the target types. A "Y" indicates
 that the source to the target is a valid conversion.</desc>
-<tgroup cols="19"><colspec colname="colspec0" colwidth="330*"/><colspec colname="col2"
+<tgroup cols="20"><colspec colname="colspec0" colwidth="330*"/><colspec colname="col2"
 colwidth="84*"/><colspec colname="col3" colwidth="84*"/><colspec colname="col4"
 colwidth="84*"/><colspec colname="col5" colwidth="84*"/><colspec colname="col6"
 colwidth="81*"/><colspec colname="colspec1" colwidth="84*"/><colspec colname="colspec9"
@@ -49,7 +49,8 @@
 colwidth="84*"/><colspec colname="colspec4" colwidth="87*"/><colspec colname="colspec3"
 colwidth="81*"/><colspec colname="colspec2" colwidth="84*"/><colspec colname="colspec10"
 colwidth="84*"/><colspec colname="colspec13" colwidth="84*"/><colspec colname="colspec12"
-colwidth="84*"/><colspec colname="colspec11" colwidth="84*"/>
+colwidth="84*"/><colspec colname="colspec11" colwidth="84*"/><colspec colname="COLSPEC14"
+colwidth="84*"/>
 <thead>
 <row>
 <entry colname="colspec0" valign="top">Types</entry>
@@ -206,6 +207,9 @@
 A
 M
 P</lines></entry>
+<entry colname="COLSPEC14" valign="top"> <lines>X
+M
+L</lines></entry>
 </row>
 </thead>
 <tbody>
@@ -229,6 +233,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">INTEGER</entry>
@@ -250,6 +255,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">BIGINT</entry>
@@ -271,6 +277,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DECIMAL</entry>
@@ -292,6 +299,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">REAL</entry>
@@ -313,6 +321,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DOUBLE</entry>
@@ -334,6 +343,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">FLOAT</entry>
@@ -355,6 +365,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CHAR</entry>
@@ -376,6 +387,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">VARCHAR</entry>
@@ -397,6 +409,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">LONG VARCHAR</entry>
@@ -418,6 +431,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CHAR FOR BIT DATA</entry>
@@ -439,6 +453,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">VARCHAR FOR BIT DATA</entry>
@@ -460,6 +475,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">LONG VARCHAR FOR BIT DATA</entry>
@@ -481,6 +497,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CLOB</entry>
@@ -502,6 +519,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">BLOB</entry>
@@ -523,6 +541,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DATE</entry>
@@ -544,6 +563,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">TIME</entry>
@@ -565,9 +585,10 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
-<entry colname="colspec0">TIME STAMP</entry>
+<entry colname="colspec0">TIMESTAMP</entry>
 <entry colname="col2">-</entry>
 <entry colname="col3">-</entry>
 <entry colname="col4">-</entry>
@@ -586,10 +607,33 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC14">-</entry>
+</row>
+<row>
+<entry colname="colspec0">XML</entry>
+<entry colname="col2">-</entry>
+<entry colname="col3">-</entry>
+<entry colname="col4">-</entry>
+<entry colname="col5">-</entry>
+<entry colname="col6">-</entry>
+<entry colname="colspec1">-</entry>
+<entry colname="colspec9">-</entry>
+<entry colname="colspec8">-</entry>
+<entry colname="colspec7">-</entry>
+<entry colname="colspec6">-</entry>
+<entry colname="colspec5">-</entry>
+<entry colname="colspec4">-</entry>
+<entry colname="colspec3">-</entry>
+<entry colname="colspec2">-</entry>
+<entry colname="colspec10">-</entry>
+<entry colname="colspec13">-</entry>
+<entry colname="colspec12">-</entry>
+<entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">Y</entry>
 </row>
 </tbody>
 </tgroup>
-</table></p> <p>If a conversion is valid, CASTs are allowed. Size incompatibilities
+</table></p><p>If a conversion is valid, CASTs are allowed. Size incompatibilities
 between the source and target types might cause runtime errors.</p> </section>
 <section><title>Notes</title> <p>In this discussion, the <ph conref="refconrefs.dita#prod/productshortname"></ph> SQL-92
 data types are categorized as follows:   <ul>
@@ -598,8 +642,10 @@
 <li>approximate numeric (FLOAT, REAL, DOUBLE PRECISION)</li>
 </ul></li>
 <li><i>string</i>   <ul>
-<li>character string (CLOB, CHAR, VARCHAR, <xref href="rrefsqlj15147.dita#rrefsqlj15147">LONG VARCHAR</xref>)</li>
-<li>bit string (BLOB, CHAR FOR BIT DATA, VARCHAR FOR BIT DATA, <xref href="rrefsqlj30118.dita#rrefsqlj30118">LONG VARCHAR FOR BIT DATA</xref>)</li>
+<li>character string (CLOB, CHAR, VARCHAR, <xref href="rrefsqlj15147.dita#rrefsqlj15147">LONG
+VARCHAR</xref>)</li>
+<li>bit string (BLOB, CHAR FOR BIT DATA, VARCHAR FOR BIT DATA, <xref href="rrefsqlj30118.dita#rrefsqlj30118">LONG
+VARCHAR FOR BIT DATA</xref>)</li>
 </ul></li>
 <li><i>date/time</i>   <ul>
 <li><xref href="rrefsqlj18730.dita#rrefsqlj18730"></xref></li>
@@ -642,6 +688,8 @@
 FROM FLIGHTS
 -- cast a SMALLINT to a BIGINT
 VALUES CAST (CAST (12 as SMALLINT) as BIGINT)</b></codeblock> </example>
+<section><title>Conversions of XML values</title><p>An XML value cannot be
+converted to a non-XML type.  To convert an XML value to a string, you must
+use the SQL/XML serialization operator XMLSERIALIZE.</p> </section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rrefsqlj58560.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefsqlj58560.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefsqlj58560.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefsqlj58560.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,16 +18,18 @@
 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="rrefsqlj58560" xml:lang="en-us">
 <title>Data type assignments and comparison, sorting, and ordering</title>
+<shortdesc></shortdesc>
+<prolog><metadata>
+<keywords><indexterm>data types<indexterm>assignments and comparisions</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <refbody>
 <table><title>Assignments allowed by <ph conref="refconrefs.dita#prod/productshortname"></ph></title>
 <desc>This table displays valid assignments between data types in <ph conref="refconrefs.dita#prod/productshortname"></ph>.
 A "Y" indicates that the assignment is valid.</desc>
-<tgroup cols="19"><colspec colname="colspec0" colwidth="350*"/><colspec colname="col2"
+<tgroup cols="20"><colspec colname="colspec0" colwidth="350*"/><colspec colname="col2"
 colwidth="84*"/><colspec colname="col3" colwidth="84*"/><colspec colname="col4"
 colwidth="84*"/><colspec colname="col5" colwidth="84*"/><colspec colname="col6"
 colwidth="81*"/><colspec colname="colspec1" colwidth="84*"/><colspec colname="colspec9"
@@ -33,7 +38,8 @@
 colwidth="84*"/><colspec colname="colspec4" colwidth="87*"/><colspec colname="colspec3"
 colwidth="81*"/><colspec colname="colspec2" colwidth="84*"/><colspec colname="colspec10"
 colwidth="84*"/><colspec colname="colspec13" colwidth="84*"/><colspec colname="colspec12"
-colwidth="84*"/><colspec colname="colspec11" colwidth="84*"/>
+colwidth="84*"/><colspec colname="colspec11" colwidth="84*"/><colspec colname="COLSPEC14"
+colwidth="84*"/>
 <thead>
 <row>
 <entry colname="colspec0" valign="top">Types</entry>
@@ -190,6 +196,9 @@
 A
 M
 P</lines></entry>
+<entry colname="COLSPEC14" valign="top"> <lines>X
+M
+L</lines></entry>
 </row>
 </thead>
 <tbody>
@@ -213,6 +222,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">INTEGER</entry>
@@ -234,6 +244,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">BIGINT</entry>
@@ -255,6 +266,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DECIMAL</entry>
@@ -276,6 +288,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">REAL</entry>
@@ -297,6 +310,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DOUBLE</entry>
@@ -318,6 +332,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">FLOAT</entry>
@@ -339,6 +354,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CHAR</entry>
@@ -360,6 +376,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">VARCHAR</entry>
@@ -381,6 +398,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">LONG VARCHAR</entry>
@@ -402,6 +420,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CHAR FOR BIT DATA</entry>
@@ -423,6 +442,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">VARCHAR FOR BIT DATA</entry>
@@ -444,6 +464,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">LONG VARCHAR FOR BIT DATA</entry>
@@ -465,6 +486,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CLOB</entry>
@@ -486,6 +508,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">BLOB</entry>
@@ -507,6 +530,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DATE</entry>
@@ -528,6 +552,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">TIME</entry>
@@ -549,6 +574,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">-</entry>
 </row>
 <row>
 <entry colname="colspec0">TIME STAMP</entry>
@@ -570,14 +596,37 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC14">-</entry>
+</row>
+<row>
+<entry colname="colspec0">XML</entry>
+<entry colname="col2">-</entry>
+<entry colname="col3">-</entry>
+<entry colname="col4">-</entry>
+<entry colname="col5">-</entry>
+<entry colname="col6">-</entry>
+<entry colname="colspec1">-</entry>
+<entry colname="colspec9">-</entry>
+<entry colname="colspec8">-</entry>
+<entry colname="colspec7">-</entry>
+<entry colname="colspec6">-</entry>
+<entry colname="colspec5">-</entry>
+<entry colname="colspec4">-</entry>
+<entry colname="colspec3">-</entry>
+<entry colname="colspec2">-</entry>
+<entry colname="colspec10">-</entry>
+<entry colname="colspec13">-</entry>
+<entry colname="colspec12">-</entry>
+<entry colname="colspec11">-</entry>
+<entry colname="COLSPEC14">Y</entry>
 </row>
 </tbody>
 </tgroup>
 </table>
-<table><title>Comparisons allowed by Derby</title>
-<desc>This table displays valid comparisons between data types in <ph conref="refconrefs.dita#prod/productshortname"></ph>.
+<table><title>Comparisons allowed by Derby</title><desc>This table displays
+valid comparisons between data types in <ph conref="refconrefs.dita#prod/productshortname"></ph>.
 A "Y" indicates that the comparison is allowed.</desc>
-<tgroup cols="19"><colspec colname="colspec0" colwidth="350*"/><colspec colname="col2"
+<tgroup cols="20"><colspec colname="colspec0" colwidth="350*"/><colspec colname="col2"
 colwidth="83*"/><colspec colname="col3" colwidth="83*"/><colspec colname="col4"
 colwidth="83*"/><colspec colname="col5" colwidth="83*"/><colspec colname="col6"
 colwidth="80*"/><colspec colname="colspec1" colwidth="83*"/><colspec colname="colspec9"
@@ -586,7 +635,8 @@
 colwidth="83*"/><colspec colname="colspec4" colwidth="86*"/><colspec colname="colspec3"
 colwidth="80*"/><colspec colname="colspec2" colwidth="83*"/><colspec colname="colspec10"
 colwidth="83*"/><colspec colname="colspec13" colwidth="75*"/><colspec colname="colspec12"
-colwidth="89*"/><colspec colname="colspec11" colwidth="89*"/>
+colwidth="89*"/><colspec colname="colspec11" colwidth="89*"/><colspec colname="COLSPEC15"
+colwidth="89*"/>
 <thead>
 <row>
 <entry colname="colspec0" valign="top">Types</entry>
@@ -743,6 +793,9 @@
 A
 M
 P</lines></entry>
+<entry colname="COLSPEC15" valign="top"> <lines>X
+M
+L</lines></entry>
 </row>
 </thead>
 <tbody>
@@ -766,6 +819,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">INTEGER</entry>
@@ -787,6 +841,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">BIGINT</entry>
@@ -808,6 +863,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DECIMAL</entry>
@@ -829,6 +885,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">REAL</entry>
@@ -850,6 +907,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DOUBLE</entry>
@@ -871,6 +929,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">FLOAT</entry>
@@ -892,6 +951,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CHAR</entry>
@@ -913,6 +973,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">VARCHAR</entry>
@@ -934,6 +995,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">LONG VARCHAR</entry>
@@ -955,6 +1017,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CHAR FOR BIT DATA</entry>
@@ -976,6 +1039,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">VARCHAR FOR BIT DATA</entry>
@@ -997,6 +1061,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">LONG VARCHAR FOR BIT DATA</entry>
@@ -1018,6 +1083,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">CLOB</entry>
@@ -1039,6 +1105,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">BLOB</entry>
@@ -1060,6 +1127,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">DATE</entry>
@@ -1081,6 +1149,7 @@
 <entry colname="colspec13">Y</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">TIME</entry>
@@ -1102,6 +1171,7 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">Y</entry>
 <entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 <row>
 <entry colname="colspec0">TIME STAMP</entry>
@@ -1123,10 +1193,32 @@
 <entry colname="colspec13">-</entry>
 <entry colname="colspec12">-</entry>
 <entry colname="colspec11">Y</entry>
+<entry colname="COLSPEC15">-</entry>
+</row>
+<row>
+<entry colname="colspec0">XML</entry>
+<entry colname="col2">-</entry>
+<entry colname="col3">-</entry>
+<entry colname="col4">-</entry>
+<entry colname="col5">-</entry>
+<entry colname="col6">-</entry>
+<entry colname="colspec1">-</entry>
+<entry colname="colspec9">-</entry>
+<entry colname="colspec8">-</entry>
+<entry colname="colspec7">-</entry>
+<entry colname="colspec6">-</entry>
+<entry colname="colspec5">-</entry>
+<entry colname="colspec4">-</entry>
+<entry colname="colspec3">-</entry>
+<entry colname="colspec2">-</entry>
+<entry colname="colspec10">-</entry>
+<entry colname="colspec13">-</entry>
+<entry colname="colspec12">-</entry>
+<entry colname="colspec11">-</entry>
+<entry colname="COLSPEC15">-</entry>
 </row>
 </tbody>
 </tgroup>
 </table>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rreftimefunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rreftimefunc.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rreftimefunc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rreftimefunc.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,21 +18,18 @@
 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="rreftimefunc" xml:lang="en-us">
 <title>TIME</title>
+<shortdesc>The TIME function returns a time from a value.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>TIME function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The TIME function returns a time from a value.  The argument
-must be a time, timestamp, or a valid string representation of a time or timestamp
-that is not a CLOB or LONG VARCHAR. The result of the function is a time.
-If the argument can be null, the result can be null; if the argument is null,
-the result is the null value. </p> <p>The other rules depend on the data type
-of the argument specified:  <ul>
+<section> <p>The argument must be a time, timestamp, or a valid string representation
+of a time or timestamp that is not a CLOB, LONG VARCHAR, or XML value. The
+result of the function is a time. If the argument can be null, the result
+can be null; if the argument is null, the result is the null value. </p> <p>The
+other rules depend on the data type of the argument specified:  <ul>
 <li>If the argument is a time: The result is that time.</li>
 <li>If the argument is a timestamp: The result is the time part of the timestamp.</li>
 <li>If the argument is a string: The result is the time represented by the
@@ -40,4 +40,3 @@
 the current time is 5:03 PM, the value returned is <codeph>17:03:00</codeph>.</p> </example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/ref/rreftimestampfunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rreftimestampfunc.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rreftimestampfunc.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rreftimestampfunc.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+ 
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,22 +18,20 @@
 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="rreftimestampfunc" xml:lang="en-us">
 <title>TIMESTAMP</title>
+<shortdesc>The TIMESTAMP function returns a timestamp from a value or a pair
+of values.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>TIMESTAMP function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <p>The TIMESTAMP function returns a timestamp from a value or a
-pair of values.</p> <p>The rules for the arguments depend on whether the second
-argument is specified:  <ul>
+<section> <p>The rules for the arguments depend on whether the second argument
+is specified:  <ul>
 <li>If only one argument is specified: It must be a timestamp, a valid string
-representation of a timestamp, or a string of length 14 that is not a CLOB
-or LONG VARCHAR. A string of length 14 must be a string of digits that represents
-a valid date and time in the form <i>yyyyxxddhhmmss</i>, where <i>yyyy</i> is
+representation of a timestamp, or a string of length 14 that is not a CLOB,
+LONG VARCHAR, or XML value. A string of length 14 must be a string of digits
+that represents a valid date and time in the form <i>yyyyxxddhhmmss</i>, where <i>yyyy</i> is
 the year, <i>xx</i> is the month, <i>dd</i> is the day, <i>hh</i> is the hour, <i>mm</i> is
 the minute, and <i>ss</i> is the seconds.</li>
 <li>If both arguments are specified: The first argument must be a date or
@@ -48,8 +49,7 @@
 </ul></p></section>
 <refsyn><title>Syntax</title> <codeblock><b>TIMESTAMP ( <i>expression</i> [, <i>expression</i> ] )</b></codeblock> </refsyn>
 <example> <p>Assume the column START_DATE (date) has a value equivalent to
-1988-12-25, and the column START_TIME (time) has a value equivalent to 17.12.30.</p> <codeblock><b>TIMESTAMP(START_DATE, START_TIME)</b></codeblock
-> <p>Returns the value '1988-12-25-17.12.30.000000'.</p> </example>
+1998-12-25, and the column START_TIME (time) has a value equivalent to 17.12.30.</p> <codeblock><b>TIMESTAMP(START_DATE, START_TIME)</b></codeblock
+> <p>Returns the value '1998-12-25-17.12.30.000000'.</p> </example>
 </refbody>
 </reference>
-

Modified: db/derby/docs/branches/10.2/src/tools/ctoolsimport27052.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ctoolsimport27052.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ctoolsimport27052.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ctoolsimport27052.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?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,52 +18,60 @@
 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="ctoolsimport27052">
+<concept id="ctoolsimport27052" xml:lang="en-us">
 <title>Bulk import/export requirements and considerations</title>
 <prolog><metadata>
-<keywords>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>import<indexterm>requirements</indexterm></indexterm>
+<indexterm>import<indexterm>limitations</indexterm></indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<dl>
-<dlentry><dt>The table must exist.</dt>
-<dd>For you to import data into a table, the table must already exist in <ph conref="toolsconrefs.dita#prod/productshortname"></ph>.
-The table does not have to be empty. If the table is not empty, bulk import
-performs single inserts which results in slower performance.</dd></dlentry>
-<dlentry><dt>Create indexes and primary key, foreign key, and unique constraints
-first.</dt>
+<dl><dlentry>
+<dt>The table must exist</dt>
+<dd>For you to import data into a table, the table must already exist in <ph
+conref="toolsconrefs.dita#prod/productshortname"></ph>. The table does not
+have to be empty. If the table is not empty, bulk import performs single inserts
+which results in slower performance.</dd>
+</dlentry><dlentry>
+<dt>Create indexes and primary key, foreign key, and unique constraints first</dt>
 <dd> To avoid a separate create index step, create indexes and primary keys
 on tables before you import data. However, if your memory and disk spaces
 resources are limited, you can build the indexes and primary keys after importing
-data.</dd></dlentry>
-<dlentry><dt>Data types.</dt>
-<dd>You can import and export only data of the non-binary, <i>built-in</i> data types. <ph conref="toolsconrefs.dita#prod/productshortname"></ph> implicitly converts the strings to the
-data type of the receiving column. If any of the implicit conversions fail,
-the whole import is aborted. For example, "3+7" cannot be converted
-into an integer. An export that encounters a runtime error stops. 
-<note>You cannot import or export the binary data types: BLOB, CLOB, CHAR FOR BIT
-DATA, VARCHAR FOR BIT DATA, or LONG VARCHAR FOR BIT DATA. </note></dd></dlentry>
-<dlentry><dt>Locking during import.</dt>
-<dd>Import procedures use the same isolation level as the connection in
-which they are executed to insert data into tables. During import, the entire
-table is exclusively locked irrespective of the isolation level.</dd></dlentry>
-<dlentry><dt>Locking during export.</dt>
-<dd>Export procedures use the same isolation level as the connection in
-which they are executed to fetch data from tables.</dd></dlentry>
-<dlentry><dt>Import behavior on tables with triggers.</dt>
-<dd>The import procedure fires INSERT triggers when data is appended to
-the table. The REPLACE option is not allowed when triggers are enabled on
-the table.</dd></dlentry>
-<dlentry><dt>Restrictions on the REPLACE option.</dt>
+data.</dd>
+</dlentry><dlentry>
+<dt>Data types</dt>
+<dd>You can import and export only data of the non-binary, <i>built-in</i> data
+types. <ph conref="toolsconrefs.dita#prod/productshortname"></ph> implicitly
+converts the strings to the data type of the receiving column. If any of the
+implicit conversions fail, the whole import is aborted. For example, "3+7"
+cannot be converted into an integer. An export that encounters a runtime error
+stops.  <note>You cannot import or export the binary data types: BLOB, CLOB,
+CHAR FOR BIT DATA, VARCHAR FOR BIT DATA, or LONG VARCHAR FOR BIT DATA. Additionally,
+you cannot import or export the XML data type.</note></dd>
+</dlentry><dlentry>
+<dt>Locking during import</dt>
+<dd>Import procedures use the same isolation level as the connection in which
+they are executed to insert data into tables. During import, the entire table
+is exclusively locked irrespective of the isolation level.</dd>
+</dlentry><dlentry>
+<dt>Locking during export</dt>
+<dd>Export procedures use the same isolation level as the connection in which
+they are executed to fetch data from tables.</dd>
+</dlentry><dlentry>
+<dt>Import behavior on tables with triggers</dt>
+<dd>The import procedure fires INSERT triggers when data is appended to the
+table. The REPLACE option is not allowed when triggers are enabled on the
+table.</dd>
+</dlentry><dlentry>
+<dt>Restrictions on the REPLACE option</dt>
 <dd>If a table that receives imported data already contains data, you can
 either replace or append to the existing data. You can use the REPLACE option
 on tables that have dependent tables, but the replaced data must maintain
 referential integrity, otherwise the import operation will be rolled back.
-You cannot use the REPLACE option if the table has enabled triggers.</dd></dlentry>
-<dlentry><dt>Restrictions on tables.</dt>
-<dd>You cannot use import procedures to import data into a system table
-or a declared temporary table.</dd></dlentry>
-</dl>
-</conbody></concept>
+You cannot use the REPLACE option if the table has enabled triggers.</dd>
+</dlentry><dlentry>
+<dt>Restrictions on tables</dt>
+<dd>You cannot use import procedures to import data into a system table or
+a declared temporary table.</dd>
+</dlentry></dl>
+</conbody>
+</concept>

Modified: db/derby/docs/branches/10.2/src/tools/derbytools.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/derbytools.ditamap?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/derbytools.ditamap (original)
+++ db/derby/docs/branches/10.2/src/tools/derbytools.ditamap Fri Aug 25 14:59:58 2006
@@ -20,7 +20,7 @@
 <map title="Tools and Utilities Guide">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2005"/>
+<copyryear year="2004, 2006"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>

Modified: db/derby/docs/branches/10.2/src/tools/rtoolscopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolscopyright.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolscopyright.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolscopyright.dita Fri Aug 25 14:59:58 2006
@@ -21,10 +21,19 @@
 <reference id="rtoolscopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 1997, 2006 The Apache Software Foundation or its licensors,
-as applicable.</p><p>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<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.jpg"/></p>
+<p>Copyright 2004, 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+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
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>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

Modified: db/derby/docs/branches/10.2/src/tuning/ctundepth1002853.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tuning/ctundepth1002853.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/tuning/ctundepth1002853.dita (original)
+++ db/derby/docs/branches/10.2/src/tuning/ctundepth1002853.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?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 +18,19 @@
 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 id="ctundepth1002853" xml:lang="en-us">
 <title>Create useful indexes</title>
-<prolog></prolog>
+<shortdesc>Indexes are useful when a query contains a WHERE clause.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>indexes<indexterm>guidance, creating</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <conbody>
-<p>Indexes are useful when a query contains a WHERE clause. Without a WHERE
-clause, <ph conref="tunconrefs.dita#prod/productshortname"></ph> is <i>supposed</i> to return all the data in the table, and
-so a table scan is the correct (if not desirable) behavior. (More about that
-in <xref href="ctundepth36205.dita#ctundepth36205"></xref>.)</p>
-<p><ph conref="tunconrefs.dita#prod/productshortname"></ph> creates indexes on tables in the following situations:   <ul>
+<p>Without a WHERE clause, <ph conref="tunconrefs.dita#prod/productshortname"></ph> is <i>supposed</i> to
+return all the data in the table, and so a table scan is the correct (if not
+desirable) behavior. (More about that in <xref href="ctundepth36205.dita#ctundepth36205"></xref>.)</p>
+<p><ph conref="tunconrefs.dita#prod/productshortname"></ph> creates indexes
+on tables in the following situations:   <ul>
 <li>When you define a primary key, unique, or foreign key constraint on a
 table. See "CONSTRAINT clause" in the <cite><ph conref="tunconrefs.dita#pub/citref"></ph></cite> for
 more information.</li>
@@ -34,15 +38,15 @@
 </ul></p>
 <p>For an index to be useful for a particular statement, one of the columns
 in the statement's WHERE clause must be the first column in the index's key.
-  <note>For a complete discussion of how indexes work and when they are useful, see <xref href="ctunoptimz33368.dita#ctunoptimz33368"></xref> and <xref
-href="ctunoptimz30217.dita#ctunoptimz30217"></xref>.</note></p>
+  <note>For a complete discussion of how indexes work and when they are useful,
+see <xref href="ctunoptimz33368.dita#ctunoptimz33368"></xref> and <xref href="ctunoptimz30217.dita#ctunoptimz30217"></xref>.</note></p>
 <p>Indexes provide some other benefits as well:   <ul>
-<li>If all the data requested are in the index, <ph conref="tunconrefs.dita#prod/productshortname"></ph> does not have to go
-to the table at all. (See <xref href="ctunoptimz30768.dita#ctunoptimz30768"></xref>.)</li>
-<li>For operations that require a sort (ORDER BY), if <ph conref="tunconrefs.dita#prod/productshortname"></ph> uses the index
-to retrieve the data, it does not have to perform a separate sorting step
-for some of these operations in some situations. (See <xref href="ctunoptimz27036.dita#ctunoptimz27036"></xref>.)</li>
-</ul> <note><ph conref="tunconrefs.dita#prod/productshortname"></ph> does not support indexing long columns like CLOB and BLOB.</note></p>
+<li>If all the data requested are in the index, <ph conref="tunconrefs.dita#prod/productshortname"></ph> does
+not have to go to the table at all. (See <xref href="ctunoptimz30768.dita#ctunoptimz30768"></xref>.)</li>
+<li>For operations that require a sort (ORDER BY), if <ph conref="tunconrefs.dita#prod/productshortname"></ph> uses
+the index to retrieve the data, it does not have to perform a separate sorting
+step for some of these operations in some situations. (See <xref href="ctunoptimz27036.dita#ctunoptimz27036"></xref>.)</li>
+</ul> <note><ph conref="tunconrefs.dita#prod/productshortname"></ph> does
+not support indexing on columns with data types like BLOB, CLOB, and XML.</note></p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/branches/10.2/src/tuning/ctunperf98197.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tuning/ctunperf98197.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/tuning/ctunperf98197.dita (original)
+++ db/derby/docs/branches/10.2/src/tuning/ctunperf98197.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?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,110 +18,138 @@
 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="ctunperf98197">
+<concept id="ctunperf98197" xml:lang="en-us">
 <title>Use the appropriate getXXX and setXXX methods for the type</title>
+<shortdesc>For performance reasons, use the recommended <i>getXXX</i> method
+when retrieving values, and use the recommended <i>setXXX</i> method when
+setting values for parameters.</shortdesc>
 <prolog><metadata>
-<keywords>
+<keywords><indexterm>methods<indexterm>getxxx</indexterm></indexterm><indexterm>methods<indexterm>setxxx</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>JDBC is permissive. It lets you use <i>java.sql.ResultSet.getFloat</i> to retrieve an int, <i>java.sql.ResultSet.getObject</i> to retrieve any type, and so on.  (<i>java.sql.ResultSet </i>and <i>java.sql.CallableStatement</i> provide <i>getXXX</i> methods, and <i>java .sql.PreparedStatement</i> and <i>java.sql.CallableStatement</i> provide <i>setXXX</i> methods.) This permissiveness is convenient but expensive in terms
-of performance.</p>
-<p>For performance reasons, use the recommended <i>getXXX</i> method when retrieving values, and use the recommended <i>setXXX</i> method when setting values for parameters.</p>
-<p><xref href="ctunperf98197.dita#ctunperf98197/ctunperf31241"/> shows the recommended <i>getXXX</i> methods for given <i>java.sql</i> (JDBC) types,
-and their corresponding SQL types.  
-<table id="ctunperf31241" frame="all">
+<p>JDBC is permissive. It lets you use <i>java.sql.ResultSet.getFloat</i> to
+retrieve an int, <i>java.sql.ResultSet.getObject</i> to retrieve any type,
+and so on.  (<i>java.sql.ResultSet </i>and <i>java.sql.CallableStatement</i> provide <i>getXXX</i> methods,
+and <i>java .sql.PreparedStatement</i> and <i>java.sql.CallableStatement</i> provide <i>setXXX</i> methods.)
+This permissiveness is convenient but expensive in terms of performance.</p>
+<p>The following table shows the recommended <i>getXXX</i> methods for given <i>java.sql</i> (JDBC)
+types, and their corresponding SQL types.   <table frame="all" id="ctunperf31241">
 <title>Mapping of java.sql.Types to SQL types</title>
-<tgroup cols="3" colsep="1" rowsep="1">
-<colspec colnum="1" colname="1" colwidth="36*"/>
-<colspec colnum="2" colname="2" colwidth="30*"/>
-<colspec colnum="3" colname="3" colwidth="34*"/>
+<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="36*"/>
+<colspec colname="2" colnum="2" colwidth="30*"/><colspec colname="3" colnum="3"
+colwidth="34*"/>
 <thead>
 <row>
 <entry colname="1">Recommended <b><i>getXXX</i></b> Method</entry>
 <entry colname="2"><b><i>java.sql.Types</i></b></entry>
-<entry colname="3">SQL types</entry></row>
+<entry colname="3">SQL types</entry>
+</row>
 </thead>
 <tbody>
 <row>
 <entry colname="1"><i>getLong</i></entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3">BIGINT</entry></row>
+<entry colname="3">BIGINT</entry>
+</row>
 <row>
 <entry colname="1"><i>getBytes</i></entry>
 <entry colname="2">BINARY</entry>
-<entry colname="3">CHAR FOR BIT DATA</entry></row>
+<entry colname="3">CHAR FOR BIT DATA</entry>
+</row>
+<row>
+<entry colname="1"><i>getBlob</i></entry>
+<entry colname="2">BLOB</entry>
+<entry colname="3">BLOB</entry>
+</row>
 <row>
 <entry colname="1"><i>getString</i></entry>
 <entry colname="2">CHAR</entry>
-<entry colname="3">CHAR</entry></row>
+<entry colname="3">CHAR</entry>
+</row>
+<row>
+<entry colname="1"><i>getClob</i></entry>
+<entry colname="2">CLOB</entry>
+<entry colname="3">CLOB</entry>
+</row>
 <row>
 <entry colname="1"><i>getDate</i></entry>
 <entry colname="2">DATE</entry>
-<entry colname="3">DATE</entry></row>
+<entry colname="3">DATE</entry>
+</row>
 <row>
 <entry colname="1"><i>getBigDecimal</i></entry>
 <entry colname="2">DECIMAL</entry>
-<entry colname="3">DECIMAL</entry></row>
+<entry colname="3">DECIMAL</entry>
+</row>
 <row>
 <entry colname="1"><i>getDouble</i></entry>
 <entry colname="2">DOUBLE</entry>
-<entry colname="3">DOUBLE PRECISION</entry></row>
+<entry colname="3">DOUBLE PRECISION</entry>
+</row>
 <row>
 <entry colname="1"><i>getDouble</i></entry>
 <entry colname="2">FLOAT</entry>
-<entry colname="3">DOUBLE PRECISION</entry></row>
+<entry colname="3">DOUBLE PRECISION</entry>
+</row>
 <row>
 <entry colname="1"><i>getInt</i></entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3">INTEGER</entry></row>
+<entry colname="3">INTEGER</entry>
+</row>
 <row>
 <entry colname="1"><i>getBinaryStream</i></entry>
 <entry colname="2">LONGVARBINARY</entry>
-<entry colname="3">LONG VARCHAR FOR BIT DATA</entry></row>
+<entry colname="3">LONG VARCHAR FOR BIT DATA</entry>
+</row>
 <row>
 <entry colname="1"><i>getAsciiStream, getUnicodeStream</i></entry>
 <entry colname="2">LONGVARCHAR</entry>
-<entry colname="3">LONG VARCHAR</entry></row>
+<entry colname="3">LONG VARCHAR</entry>
+</row>
 <row>
 <entry colname="1"><i>getBigDecimal</i></entry>
 <entry colname="2">NUMERIC</entry>
-<entry colname="3">DECIMAL</entry></row>
+<entry colname="3">DECIMAL</entry>
+</row>
 <row>
 <entry colname="1"><i>getFloat</i></entry>
 <entry colname="2">REAL</entry>
-<entry colname="3">REAL</entry></row>
+<entry colname="3">REAL</entry>
+</row>
 <row>
 <entry colname="1"><i>getShort</i></entry>
 <entry colname="2">SMALLINT</entry>
-<entry colname="3">SMALLINT</entry></row>
+<entry colname="3">SMALLINT</entry>
+</row>
 <row>
 <entry colname="1"><i>getTime</i></entry>
 <entry colname="2">TIME</entry>
-<entry colname="3">TIME</entry></row>
+<entry colname="3">TIME</entry>
+</row>
 <row>
 <entry colname="1"><i>getTimestamp</i></entry>
 <entry colname="2">TIMESTAMP</entry>
-<entry colname="3">TIMESTAMP</entry></row>
+<entry colname="3">TIMESTAMP</entry>
+</row>
 <row>
 <entry colname="1"><i>getBytes</i></entry>
 <entry colname="2">VARBINARY</entry>
-<entry colname="3">VARCHAR FOR BIT DATA</entry></row>
+<entry colname="3">VARCHAR FOR BIT DATA</entry>
+</row>
 <row>
 <entry colname="1"><i>getString</i></entry>
 <entry colname="2">VARCHAR</entry>
-<entry colname="3">VARCHAR</entry></row>
+<entry colname="3">VARCHAR</entry>
+</row>
 <row>
-<entry colname="1">getBlob</entry>
-<entry colname="2">BLOB</entry>
-<entry colname="3">BLOB</entry></row>
-<row>
-<entry colname="1">getClob</entry>
-<entry colname="2">CLOB</entry>
-<entry colname="3">CLOB</entry></row>
+<entry colname="1">None supported. You must use XMLSERIALIZE and then the
+corresponding getXXX method.</entry>
+<entry colname="2">SQLXML</entry>
+<entry colname="3">XML</entry>
+</row>
 </tbody>
 </tgroup>
 </table></p>
-</conbody></concept>
+</conbody>
+</concept>

Modified: db/derby/docs/branches/10.2/src/tuning/ctuntransform25857.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tuning/ctuntransform25857.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/tuning/ctuntransform25857.dita (original)
+++ db/derby/docs/branches/10.2/src/tuning/ctuntransform25857.dita Fri Aug 25 14:59:58 2006
@@ -1,4 +1,7 @@
 <?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,33 +18,47 @@
 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="ctuntransform25857">
+<concept id="ctuntransform25857" xml:lang="en-us">
 <title>Materialization</title>
+<shortdesc><term>Materialization</term> means that a subquery is evaluated
+only once. There are several types of subqueries that can be materialized.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Subqueries<indexterm>materialization of</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>subqueries<indexterm>materialization</indexterm></indexterm>
+<indexterm><indexterm>materialization</indexterm>subqueries</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p><i>Materialization</i> means that a subquery is evaluated
-only once. A subquery can be materialized if it is a noncorrelated expression
-subquery. A correlated subquery is one that references columns in the outer
-query, and so has to be evaluated for each row in the outer query. </p>
-<p>For example:   
-<codeblock><b>SELECT * FROM Staff WHERE id = (SELECT MAX(manager) FROM Org)</b></codeblock></p>
-<p>In this statement, the subquery needs to be evaluated only once.</p>
-<p>This type of subquery must return only one row. If evaluating the subquery
-causes a cardinality violation (if it returns more than one row), an exception
-will be thrown at the beginning of execution. </p>
-<p>Subquery materialization is detected prior to optimization, which allows
-the optimizer to see a materialized subquery as an unknown constant value.
-The comparison is thus optimizable.</p>
-<p>In other words, the original statement is transformed into the following
-two statements:   
-<codeblock><b><b><i>constant</i></b> = SELECT MAX(manager) FROM Org
+<section><title>Expression subqueries that are not correlated</title><p>A
+subquery can be materialized if it is a noncorrelated expression subquery.
+A correlated subquery is one that references columns in the outer query, and
+so has to be evaluated for each row in the outer query.</p><p>For example:
+   <codeblock><b>SELECT * FROM Staff WHERE id = (SELECT MAX(manager) FROM Org)</b></codeblock></p><p>In
+this statement, the subquery needs to be evaluated only once.</p><p>This type
+of subquery must return only one row. If evaluating the subquery causes a
+cardinality violation (if it returns more than one row), an exception is thrown
+when the subquery is run. </p><p>Subquery materialization is detected before
+optimization, which allows the <ph conref="tunconrefs.dita#prod/productshortname"></ph> optimizer
+to see a materialized subquery as an unknown constant value. The comparison
+is therefore optimizable. </p><p>The original statement is transformed into
+the following two statements:    <codeblock><b><i>constant</i></b> = SELECT MAX(manager) FROM Org
 SELECT * FROM Staff
-WHERE id = <b><i>constant</i></b></b></codeblock></p>
-<p>The second statement is optimizable.</p>
-</conbody></concept>
+WHERE id = <b><i>constant</i></b></codeblock></p><p>The second statement is
+optimizable.</p></section>
+<section><title>Subqueries that cannot be flattened</title><p>Materialization
+of a subquery can also occur when the subquery is nonflattenable and there
+is an equijoin between the subquery and another FROM table in the query. </p><p>For
+example:   <codeblock>SELECT i, a  FROM t1, 
+   (SELECT DISTINCT a FROM T2) x1  
+WHERE t1.i = x1.a AND t1.i in (1, 3, 5, 7) </codeblock>In this example, the
+subquery x1 is noncorrelated because it does not reference any of the columns
+from the outer query. The subquery is nonflattenable because of the DISTINCT
+keyword. <ph conref="tunconrefs.dita#prod/productshortname"></ph> does not
+flatten DISTINCT subqueries. This subquery is eligible for materialization.
+Since there is an equijoin predicate between the subquery x1 and the table
+t1 (namely, t1.i = x1.a), the <ph conref="tunconrefs.dita#prod/productshortname"></ph> optimizer
+will consider performing a hash join between t1 and x1 (with x1 as the inner
+operand). If that approach yields the best cost, <ph conref="tunconrefs.dita#prod/productshortname"></ph> materializes
+the subquery x1 to perform the hash join. The subquery is evaluated only a
+single time and the results are stored in an in-memory hash table. <ph conref="tunconrefs.dita#prod/productshortname"></ph> then
+executes the join using the in-memory result set for x1.</p></section>
+</conbody>
+</concept>

Modified: db/derby/docs/branches/10.2/src/tuning/rtuncopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tuning/rtuncopyright.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/tuning/rtuncopyright.dita (original)
+++ db/derby/docs/branches/10.2/src/tuning/rtuncopyright.dita Fri Aug 25 14:59:58 2006
@@ -21,10 +21,19 @@
 <reference id="rtuncopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 1997, 2006 The Apache Software Foundation
-or its licensors, as applicable.</p><p>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<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.jpg"/></p>
+<p>Copyright 2004, 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+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
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>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

Modified: db/derby/docs/branches/10.2/src/tuning/tuningderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tuning/tuningderby.ditamap?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/tuning/tuningderby.ditamap (original)
+++ db/derby/docs/branches/10.2/src/tuning/tuningderby.ditamap Fri Aug 25 14:59:58 2006
@@ -21,7 +21,7 @@
 <map title="Tuning Derby">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2005"/>
+<copyryear year="2004, 2006"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>

Modified: db/derby/docs/branches/10.2/src/workingwithderby/WorkingWithDerby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/workingwithderby/WorkingWithDerby.ditamap?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/workingwithderby/WorkingWithDerby.ditamap (original)
+++ db/derby/docs/branches/10.2/src/workingwithderby/WorkingWithDerby.ditamap Fri Aug 25 14:59:58 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--       File Edit date of Contribution:  May 10, 2006         -->
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
+ "../dtd/map.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with

Modified: db/derby/docs/branches/10.2/src/workingwithderby/cwwdactivities.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/workingwithderby/cwwdactivities.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/workingwithderby/cwwdactivities.dita (original)
+++ db/derby/docs/branches/10.2/src/workingwithderby/cwwdactivities.dita Fri Aug 25 14:59:58 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--       File Edit date of Contribution:  May 10, 2006         -->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
+ "../dtd/concept.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with

Modified: db/derby/docs/branches/10.2/src/workingwithderby/cwwdsummary.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/workingwithderby/cwwdsummary.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/workingwithderby/cwwdsummary.dita (original)
+++ db/derby/docs/branches/10.2/src/workingwithderby/cwwdsummary.dita Fri Aug 25 14:59:58 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--       File Edit date of Contribution:  May 10, 2006         -->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
+ "../dtd/concept.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with

Modified: db/derby/docs/branches/10.2/src/workingwithderby/rwwdactivity3.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/workingwithderby/rwwdactivity3.dita?rev=436974&r1=436973&r2=436974&view=diff
==============================================================================
--- db/derby/docs/branches/10.2/src/workingwithderby/rwwdactivity3.dita (original)
+++ db/derby/docs/branches/10.2/src/workingwithderby/rwwdactivity3.dita Fri Aug 25 14:59:58 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--       File Edit date of Contribution:  May 10, 2006         -->
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with



Mime
View raw message