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 jt...@apache.org on 2005/05/07 00:46:34 UTC

svn commit: r168976 [4/5] - in /incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ ref/ tools/ tuning/

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj1080962.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj1080962.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj1080962.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj1080962.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsqlj1080962" xml:lang="en-us">
 <title>Example</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <example> <codeblock><b>(3+4)*9
 (age &lt; 16 OR age &gt; 65) AND employed = TRUE</b></codeblock></example>
 </refbody>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj11277.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj11277.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj11277.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj11277.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsqlj11277" xml:lang="en-us">
 <title>VALUES expression</title>
-<prolog><metadata><?Pub Caret1?>
+<prolog><metadata>
 <keywords><indexterm>VALUES expression</indexterm></keywords>
 </metadata></prolog>
 <refbody>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj13083.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj13083.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj13083.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj13083.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj13083" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj13083" xml:lang="en-us">
 <title>SUM</title>
 <prolog><metadata>
 <keywords><indexterm>SUM aggregate function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj15147.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj15147.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj15147.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj15147.dita Fri May  6 15:46:20 2005
@@ -22,7 +22,7 @@
 <prolog><metadata>
 <keywords><indexterm>LONG VARCHAR data type</indexterm></keywords>
 </metadata></prolog>
-<refbody><?Pub Caret?>
+<refbody>
 <section> <p>The LONG VARCHAR type allows storage of character strings with
 a maximum length of 32,700 characters. It is identical to VARCHAR, except
 that you do not have to specify a maximum length when creating columns of

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj16762.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj16762.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj16762.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj16762.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj16762" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj16762" xml:lang="en-us">
 <title>LENGTH</title>
 <prolog><metadata>
 <keywords><indexterm>LENGTH function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj18922.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj18922.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj18922.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj18922.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj18922" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj18922" xml:lang="en-us">
 <title>LEFT OUTER JOIN</title>
 <prolog><metadata>
 <keywords><indexterm>LEFT OUTER JOIN expression</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj20204.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj20204.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj20204.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj20204.dita Fri May  6 15:46:20 2005
@@ -20,7 +20,7 @@
 <reference id="rrefsqlj20204" xml:lang="en-us">
 <title>Storing values of one numeric data type in columns of another numeric
 data type</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section><p>An attempt to put a floating-point type of a larger storage size
 into a location of a smaller size fails only if the value cannot be stored
 in the smaller-size location. For example:   <codeblock><b>create table mytable (r REAL, d DOUBLE PRECISION);</b>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj21571.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj21571.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj21571.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj21571.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsqlj21571" xml:lang="en-us">
 <title>Query</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section> <p>A query creates a virtual table based on existing tables or constants
 built into tables.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>{

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj24513.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj24513.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj24513.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj24513.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj24513" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj24513" xml:lang="en-us">
 <title>CREATE TABLE statement</title>
 <prolog><metadata>
 <keywords><indexterm>CREATE TABLE statement</indexterm></keywords>
@@ -130,8 +130,8 @@
 level can see increment values generated by itself and previous nesting levels,
 all the way to the top-level SQL statement that initiated the recursive triggers.
 You can only have 16 levels of trigger recursion.</p> </section>
-<example> <codeblock><b>CREATE TABLE HOTELAVAILABILITY
-	(HOTEL_ID INT NOT NULL, BOOKING_DATE DATE NOT NULL,
+<example><codeblock><b>CREATE TABLE HOTELAVAILABILITY
+     (HOTEL_ID INT NOT NULL, BOOKING_DATE DATE NOT NULL,
 	ROOMS_TAKEN INT DEFAULT 0, PRIMARY KEY (HOTEL_ID, BOOKING_DATE));
 <ph>-- the table-level primary key definition allows you to
 -- include two columns in the primary key definition</ph>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj25228.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj25228.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj25228.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj25228.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj25228" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj25228" xml:lang="en-us">
 <title>SESSION_USER</title>
 <prolog><metadata>
 <keywords><indexterm>SESSION_USER (function)</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj27767.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj27767.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj27767.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj27767.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsqlj27767" xml:lang="en-us">
 <title>Numeric type promotion in expressions</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section><p>In expressions that use only integer types, <ph conref="refconrefs.dita#prod/productshortname"></ph> promotes
 the type of the result to at least INTEGER. In expressions that mix integer
 with non-integer types, <ph conref="refconrefs.dita#prod/productshortname"></ph> promotes

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj29930.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj29930.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj29930.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj29930.dita Fri May  6 15:46:20 2005
@@ -29,7 +29,7 @@
 <refsyn><title>Format</title><codeblock><b>UCASE or UPPER ( <i>CharacterExpression</i> ) </b></codeblock><p>If
 the parameter type is CHAR , the return type is CHAR. Otherwise, the return
 type is VARCHAR.   <note>UPPER and LOWER follow the database locale. See <i><xref
-href="rrefattrib56769.dita#rrefattrib56769"><?Pub Caret?></xref></i> for more
+href="rrefattrib56769.dita#rrefattrib56769"></xref></i> for more
 information about specifying locale.</note></p><p>The length and maximum length
 of the returned value are the same as the length and maximum length of the
 parameter. </p> </refsyn>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj30118.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj30118.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj30118.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj30118.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj30118" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj30118" xml:lang="en-us">
 <title>LONG VARCHAR FOR BIT DATA</title>
 <prolog><metadata>
 <keywords><indexterm>LONG VARCHAR FOR BIT DATA  type</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj30540.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj30540.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj30540.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj30540.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsqlj30540" xml:lang="en-us">
 <title>column-definition</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <example> <codeblock><b><i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref></i> <i>DataType</i>
     [ <i><xref href="rrefsqlj16095.dita#rrefsqlj16095"></xref></i> ]*
     [ <i><xref href="rrefsqlj37836.dita#rrefsqlj37836"></xref></i> ]

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj31580.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj31580.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj31580.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj31580.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj31580" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj31580" xml:lang="en-us">
 <title>CREATE SCHEMA statement</title>
 <prolog><metadata>
 <keywords><indexterm>CREATE SCHEMA statement</indexterm><indexterm>Schemas<indexterm>creating</indexterm></indexterm>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj31648.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj31648.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj31648.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj31648.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj31648" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj31648" xml:lang="en-us">
 <title>DROP SCHEMA statement</title>
 <prolog><metadata>
 <keywords><indexterm>DROP SCHEMA statement</indexterm><indexterm>Schemas<indexterm>dropping</indexterm></indexterm>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj31783.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj31783.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj31783.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj31783.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj31783" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj31783" xml:lang="en-us">
 <title>FOR UPDATE clause</title>
 <prolog><metadata>
 <keywords><indexterm>FOR UPDATE clause</indexterm><indexterm>Cursors</indexterm>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj32268.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj32268.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj32268.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj32268.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj32268" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj32268" xml:lang="en-us">
 <title>SET SCHEMA statement</title>
 <prolog><metadata>
 <keywords><indexterm>SET SCHEMA statement</indexterm><indexterm>Schemas<indexterm>changing

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj32613.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj32613.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj32613.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj32613.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj32613" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj32613" xml:lang="en-us">
 <title>RTRIM</title>
 <prolog><metadata>
 <keywords><indexterm>RTRIM (function)</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj32654.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj32654.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj32654.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj32654.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj32654" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj32654" xml:lang="en-us">
 <title>GROUP BY clause</title>
 <prolog><metadata>
 <keywords><indexterm>GROUP BY clause</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj32693.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj32693.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj32693.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj32693.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj32693" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj32693" xml:lang="en-us">
 <title>AVG</title>
 <prolog><metadata>
 <keywords><indexterm>AVG aggregate function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj33520.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj33520.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj33520.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj33520.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj33520" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj33520" xml:lang="en-us">
 <title>MIN</title>
 <prolog><metadata>
 <keywords><indexterm>MIN aggregate function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj33602.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj33602.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj33602.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj33602.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj33602" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj33602" xml:lang="en-us">
 <title>WHERE clause</title>
 <prolog><metadata>
 <keywords><indexterm>WHERE clause</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj33772.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj33772.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj33772.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj33772.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj33772" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj33772" xml:lang="en-us">
 <title>CURRENT_TIME</title>
 <prolog><metadata>
 <keywords><indexterm>CURRENT_TIME function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj34177.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj34177.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj34177.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj34177.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj34177" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj34177" xml:lang="en-us">
 <title>CURRENT_DATE</title>
 <prolog><metadata>
 <keywords><indexterm>CURRENT_DATE function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj35034.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj35034.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj35034.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj35034.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj35034" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj35034" xml:lang="en-us">
 <title>INNER JOIN </title>
 <prolog><metadata>
 <keywords><indexterm>INNER JOIN expression</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj35981.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj35981.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj35981.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj35981.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj35981" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj35981" xml:lang="en-us">
 <title>DELETE statement</title>
 <prolog><metadata>
 <keywords><indexterm>DELETE statement</indexterm><indexterm>Read-write VTIs<indexterm>and

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj37836.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj37836.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj37836.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj37836.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsqlj37836" xml:lang="en-us">
 <title>generated-column-spec</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <example> <codeblock><b>[ [ WITH ] DEFAULT {<i>ConstantExpression</i> | NULL }
 |
 [ GENERATED ALWAYS AS IDENTITY 

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj37860.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj37860.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj37860.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj37860.dita Fri May  6 15:46:20 2005
@@ -18,7 +18,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefsqlj37860" xml:lang="en-us">
-<title>column-alteration </title><?Pub Caret1?>
+<title>column-alteration </title>
 <prolog><metadata>
 <keywords><indexterm>Data types<indexterm>modifying</indexterm></indexterm>
 </keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj38716.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj38716.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj38716.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj38716.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj38716" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj38716" xml:lang="en-us">
 <title>COUNT</title>
 <prolog><metadata>
 <keywords><indexterm>COUNT aggregate function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj38831.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj38831.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj38831.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj38831.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsqlj38831" xml:lang="en-us">
 <title>SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section><p>The <codeph>SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS()</codeph> system
 procedure turns a connection's runtime statistics on or off. By default, the
 runtime statistics are turned off. When the <codeph>runtimestatistics</codeph> attribute

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj40899.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj40899.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj40899.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj40899.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj40899" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj40899" xml:lang="en-us">
 <title>Concatenation</title>
 <prolog><metadata>
 <keywords><indexterm>Concatenation function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj41180.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj41180.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj41180.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj41180.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj41180" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj41180" xml:lang="en-us">
 <title>SET CURRENT ISOLATION statement</title>
 <prolog><metadata>
 <keywords><indexterm>SET ISOLATION statement</indexterm><indexterm>ISOLATION</indexterm>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj41207.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj41207.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj41207.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj41207.dita Fri May  6 15:46:20 2005
@@ -24,7 +24,7 @@
 </metadata></prolog>
 <refbody>
 <section> <p>VARCHAR provides for variable-length storage of strings.</p></section>
-<refsyn><?Pub Caret?><title>Syntax</title> <codeblock><b>{ VARCHAR | CHAR VARYING | CHARACTER VARYING }(<i>length</i>) </b></codeblock> <p><i>length</i
+<refsyn><title>Syntax</title> <codeblock><b>{ VARCHAR | CHAR VARYING | CHARACTER VARYING }(<i>length</i>) </b></codeblock> <p><i>length</i
 > is an unsigned integer constant, and it must not be greater than the constraint
 of the integer used to specify the length, the value <i>java.lang.Integer.MAX_VALUE</i>. </p><p>The
 maximum length for a VARCHAR string is 32,672 characters. </p> </refsyn>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj41360.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj41360.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj41360.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj41360.dita Fri May  6 15:46:20 2005
@@ -18,7 +18,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefsqlj41360" xml:lang="en-us">
-<title>SELECT statement</title><?Pub Caret?>
+<title>SELECT statement</title>
 <prolog><metadata>
 <keywords><indexterm>SELECT statement</indexterm><indexterm>ORDER BY clause<indexterm>needed
 to guarantee order of results</indexterm></indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj42002.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj42002.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj42002.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj42002.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj42002" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj42002" xml:lang="en-us">
 <title>DOUBLE </title>
 <prolog><metadata>
 <keywords><indexterm>DOUBLE data type</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj42049.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj42049.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj42049.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj42049.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj42049" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj42049" xml:lang="en-us">
 <title>LCASE or LOWER</title>
 <prolog><metadata>
 <keywords><indexterm>LCASE or LOWER (function)</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj42324.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj42324.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj42324.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj42324.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj42324" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj42324" xml:lang="en-us">
 <title>CURRENT_USER</title>
 <prolog><metadata>
 <keywords><indexterm>CURRENT_USER function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj57522.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj57522.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj57522.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj57522.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj57522" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj57522" xml:lang="en-us">
 <title>RIGHT OUTER JOIN</title>
 <prolog><metadata>
 <keywords><indexterm>RIGHT OUTER JOIN expression</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj58560.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj58560.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj58560.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj58560.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsqlj58560" xml:lang="en-us">
 <title>Data type assignments and comparison, sorting, and ordering</title>
-<refbody><?Pub Caret1?>
+<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>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj61998.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj61998.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj61998.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj61998.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj61998" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj61998" xml:lang="en-us">
 <title>LOCATE</title>
 <prolog><metadata>
 <keywords><indexterm>LOCATE function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj66113.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj66113.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj66113.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj66113.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj66113" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj66113" xml:lang="en-us">
 <title>COUNT(*)</title>
 <prolog><metadata>
 <keywords><indexterm>COUNT(*) aggregate function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj73147.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj73147.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj73147.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj73147.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj73147" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj73147" xml:lang="en-us">
 <title>SQRT</title>
 <prolog><metadata>
 <keywords><indexterm>SQRT (function)</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj75638.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj75638.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj75638.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj75638.dita Fri May  6 15:46:20 2005
@@ -18,7 +18,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefsqlj75638" xml:lang="en-us">
-<title>Supported territories </title><?Pub Caret1?>
+<title>Supported territories </title>
 <prolog><metadata>
 <keywords><indexterm>Territories<indexterm>supported</indexterm></indexterm>
 </keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj76354.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj76354.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj76354.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj76354.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsqlj76354" xml:lang="en-us">
 <title>Value</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <example> <codeblock><b><i>Expression</i> | DEFAULT</b></codeblock></example>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj87167.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj87167.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj87167.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj87167.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsqlj87167" xml:lang="en-us">
 <title>Value</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <example> <codeblock><b><b><i>Expression</i></b> | DEFAULT</b></codeblock></example>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj89752.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj89752.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj89752.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj89752.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsqlj89752" xml:lang="en-us">
 <title>ReferencingClause</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <example> <codeblock><b>REFERENCING
 {
 { OLD | NEW } [ AS ] correlation-Name [ { OLD | NEW } [ AS ] correlation-Name ] | 

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj91438.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj91438.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj91438.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj91438.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsqlj91438" xml:lang="en-us">
 <title>searchCondition</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section><p>A <i>searchCondition</i> is any <xref href="rrefsqlj23075.dita#rrefsqlj23075"></xref> that
 meets the requirements specified in <xref href="rrefsqlj13590.dita#rrefsqlj13590/sqlj57077"></xref>.</p></section>
 <section><p>If a <i>constraint-Name</i> is not specified, <ph conref="refconrefs.dita#prod/productshortname"></ph> generates

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj93082.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj93082.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj93082.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj93082.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj93082" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj93082" xml:lang="en-us">
 <title>SUBSTR</title>
 <prolog><metadata>
 <keywords><indexterm>SUBSTR (function)</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj97870.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj97870.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj97870.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj97870.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj97870" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj97870" xml:lang="en-us">
 <title>LTRIM</title>
 <prolog><metadata>
 <keywords><indexterm>LTRIM (function)</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqlj98067.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqlj98067.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqlj98067.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqlj98067.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqlj98067" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqlj98067" xml:lang="en-us">
 <title>ABS or ABSVAL</title>
 <prolog><metadata>
 <keywords><indexterm>ABS or ABSVAL (function)</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqljcurrentdate.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqljcurrentdate.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqljcurrentdate.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqljcurrentdate.dita Fri May  6 15:46:20 2005
@@ -24,6 +24,6 @@
 </metadata></prolog>
 <refbody>
 <section> <p>CURRENT DATE is a synonym for <xref href="rrefsqlj34177.dita#rrefsqlj34177"></xref>.</p></section>
-</refbody><?Pub Caret1?>
+</refbody>
 </reference>
 <?Pub *0000000530?>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqljcurrentschema.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqljcurrentschema.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqljcurrentschema.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqljcurrentschema.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqljcurrentschema" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqljcurrentschema" xml:lang="en-us">
 <title>CURRENT SCHEMA</title>
 <prolog><metadata>
 <keywords><indexterm>SET SCHEMA statement</indexterm><indexterm>Schemas<indexterm>changing

Modified: incubator/derby/docs/trunk/src/ref/rrefsqljcurrenttimestamp.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqljcurrenttimestamp.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqljcurrenttimestamp.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqljcurrenttimestamp.dita Fri May  6 15:46:20 2005
@@ -24,6 +24,6 @@
 </metadata></prolog>
 <refbody>
 <section> <p>CURRENT TIMESTAMP is a synonym for <xref href="rrefsqlj15866.dita#rrefsqlj15866"></xref>.</p></section>
-</refbody><?Pub Caret1?>
+</refbody>
 </reference>
 <?Pub *0000000550?>

Modified: incubator/derby/docs/trunk/src/ref/rrefsqljmod.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsqljmod.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsqljmod.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsqljmod.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefsqljmod" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefsqljmod" xml:lang="en-us">
 <title>MOD</title>
 <prolog><metadata>
 <keywords><indexterm>MOD function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rrefstringlimits.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefstringlimits.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefstringlimits.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefstringlimits.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefstringlimits" xml:lang="en-us">
 <title>String limitations</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <table frame="all"><title>String limitations</title><desc>The following table
 contains limitations on string values in <ph conref="refconrefs.dita#prod/productshortname"></ph>.</desc>
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="colspec0" colwidth="228*"/>

Modified: incubator/derby/docs/trunk/src/ref/rrefsyscsruntimestatsfunc.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsyscsruntimestatsfunc.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsyscsruntimestatsfunc.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsyscsruntimestatsfunc.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefsyscsruntimestatsfunc" xml:lang="en-us">
 <title>SYSCS_UTIL.SYSCS_GET_RUNTIMESTATISTICS</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section><p>The <codeph>SYSCS_UTIL.SYSCS_GET_RUNTIMESTATISTICS</codeph> function
 returns a VARCHAR(32762) value representing the query execution plan and run
 time statistics for a java.sql.ResultSet. A query execution plan is a tree

Modified: incubator/derby/docs/trunk/src/ref/rreftablename.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rreftablename.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rreftablename.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rreftablename.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rreftablename" xml:lang="en-us">
 <title>table-Name</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section><p>A <i>table-Name</i> represents a table. You can qualify a <i>table-Name</i> with
 a <i>schema-Name</i>.</p></section>
 <section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname"></xref>.</i> ] <i><xref

Modified: incubator/derby/docs/trunk/src/ref/rreftemptabledatatype.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rreftemptabledatatype.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rreftemptabledatatype.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rreftemptabledatatype.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rreftemptabledatatype" xml:lang="en-us">
 <title>Data-type</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section><p>Supported data-types are: <ul>
 <li>BIGINT</li>
 <li>CHAR</li>

Modified: incubator/derby/docs/trunk/src/ref/rreftemptableoncommit.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rreftemptableoncommit.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rreftemptableoncommit.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rreftemptableoncommit.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rreftemptableoncommit" xml:lang="en-us">
 <title>ON COMMIT</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section><p>Specifies the action taken on the global temporary table when
 a COMMIT operation is performed.</p></section>
 <section><title>DELETE ROWS</title> <p>All rows of the table will be deleted

Modified: incubator/derby/docs/trunk/src/ref/rreftimefunc.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rreftimefunc.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rreftimefunc.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rreftimefunc.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rreftimefunc" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rreftimefunc" xml:lang="en-us">
 <title>TIME</title>
 <prolog><metadata>
 <keywords><indexterm>TIME function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rreftimestampfunc.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rreftimestampfunc.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rreftimestampfunc.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rreftimestampfunc.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rreftimestampfunc" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rreftimestampfunc" xml:lang="en-us">
 <title>TIMESTAMP</title>
 <prolog><metadata>
 <keywords><indexterm>TIMESTAMP function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/ref/rreftrademderby.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rreftrademderby.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rreftrademderby.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rreftrademderby.dita Fri May  6 15:46:20 2005
@@ -18,7 +18,7 @@
  "../dtd/topic.dtd">
 <topic id="rreftrademderby" xml:lang="en-us">
 <title>Trademarks</title>
-<body><?Pub Caret1?>
+<body>
 <p>The following terms are trademarks of International Business Machines Corporation
 in the United States, other countries, or both, and have been used in at least
 one of the documents in the DB2 UDB documentation library.</p>

Modified: incubator/derby/docs/trunk/src/ref/rreftriggername.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rreftriggername.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rreftriggername.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rreftriggername.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rreftriggername" xml:lang="en-us">
 <title>TriggerName</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section><p>A<i> TriggerName</i> refers to a trigger created by a user.</p></section>
 <section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname"></xref></i> . ] <i><xref
 href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>

Modified: incubator/derby/docs/trunk/src/ref/rrefunfreezedbproc.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefunfreezedbproc.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefunfreezedbproc.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefunfreezedbproc.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefunfreezedbproc" xml:lang="en-us">
 <title>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section><p>The <codeph>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE</codeph> system
 procedure unfreezes a database after backup.</p></section>
 <section><title>Syntax</title> <codeblock>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()</codeblock> <p>No

Modified: incubator/derby/docs/trunk/src/ref/rrefviewname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefviewname.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefviewname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefviewname.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/reference.dtd">
 <reference id="rrefviewname" xml:lang="en-us">
 <title>view-Name</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section><p>A <i>view-Name</i> represents a table or a view. You can qualify
 a <i>view-Name</i> with a <i>schema-Name</i>.</p></section>
 <section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname"></xref>.</i> ] <i><xref

Modified: incubator/derby/docs/trunk/src/ref/rrefyearfunc.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefyearfunc.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefyearfunc.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefyearfunc.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-<reference id="rrefyearfunc" xml:lang="en-us"><?Pub Caret1?>
+<reference id="rrefyearfunc" xml:lang="en-us">
 <title>YEAR</title>
 <prolog><metadata>
 <keywords><indexterm>YEAR function</indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/tools/ctoolsijtools16011.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ctoolsijtools16011.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ctoolsijtools16011.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ctoolsijtools16011.dita Fri May  6 15:46:20 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,58 +16,56 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="ctoolsijtools16011">
+<concept id="ctoolsijtools16011" xml:lang="en-us">
 <title>Database connection URLs</title>
 <prolog><metadata>
-<keywords>
-</keywords>
-</metadata>
-</prolog>
+<keywords></keywords>
+</metadata></prolog>
 <conbody>
 <p>A JDBC URL provides a way of identifying a database so that the appropriate
-driver recognizes it and connects to it. In the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> documents, a JDBC
-URL is referred to as a database connection URL.</p>
-<p>After the driver is loaded, an application must specify the correct database connection URL to
-connect to a specific database. The <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database connection URL allows you to accomplish
-tasks other than simply connecting. For more information about the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database connection URLs,
-see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</p>
-<p>A JDBC URL always starts with <i>jdbc:</i>. After that,
-the format for the database connection URL depends on the JDBC driver. </p>
-<p>For the <ph conref="toolsconrefs.dita#prod/productshortname"></ph>-provided embedded driver listed above, here is the
-format for the database connection URL for connecting to an existing database:  
-<ul>
-<li>jdbc:derby:<i><xref href="ctoolsijtools16011.dita#ctoolsijtools16011/rtoolsijtools16246">databaseName</xref></i>;<i><xref href="ctoolsijtools16011.dita#ctoolsijtools16011/rtoolsijtools12861">URLAttributes</xref></i></li>
+driver recognizes it and connects to it. In the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> documents,
+a JDBC URL is referred to as a database connection URL.</p>
+<p>After the driver is loaded, an application must specify the correct database
+connection URL to connect to a specific database. The <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database
+connection URL allows you to accomplish tasks other than simply connecting.
+For more information about the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database
+connection URLs, see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</p>
+<p>A JDBC URL always starts with <i>jdbc:</i>. After that, the format for
+the database connection URL depends on the JDBC driver. </p>
+<p>Here is the format for the database connection URL for connecting to an
+existing database using the embedded driver:   <ul>
+<li>jdbc:derby:<i><xref href="ctoolsijtools16011.dita#ctoolsijtools16011/rtoolsijtools16246">databaseName</xref></i>;<i><xref
+href="ctoolsijtools16011.dita#ctoolsijtools16011/rtoolsijtools12861">URLAttributes</xref></i></li>
 </ul></p>
-<p>For the JCC driver listed above, here is the format for the database connection URL for connecting
-to an existing database:  
-<ul>
-<li>jdbc:db2://<i>host:port</i>/<i><xref href="ctoolsijtools16011.dita#ctoolsijtools16011/rtoolsijtools16246">databaseName</xref></i></li>
+<p>The format for the database connection URL for connecting to an existing
+database using the Network Client is:   <ul>
+<li>jdbc:derby://<i>host:port</i>/<i><xref href="ctoolsijtools16011.dita#ctoolsijtools16011/rtoolsijtools16246">databaseName</xref></i></li>
 </ul></p>
-<p>URL attributes can be passed to the JCC driver by using double quotes (")
-around the database name portion of the URL, as follows:  
-<ul>
-<li>jdbc:db2://<i>host:port</i>/<i>"<xref href="ctoolsijtools16011.dita#ctoolsijtools16011/rtoolsijtools16246">databaseName</xref>;URLAttributes";</i></li>
+<p>URL attributes can be passed to the Network Client driver by using double
+quotes (") around the database name portion of the URL, as follows:   <ul>
+<li>jdbc:derby://<i>host:port</i>/<i>"<xref href="ctoolsijtools16011.dita#ctoolsijtools16011/rtoolsijtools16246">databaseName</xref>;URLAttributes";</i
+></li>
 </ul></p>
-<p>The italicized items stand for something the user fills in:  
-<ul>
-<li><i id="rtoolsijtools16246">databaseName</i>  
-<p>The name of the database you want to connect to</p></li>
-<li><i id="rtoolsijtools12861">URLAttributes</i>  
-<p>One or more of the supported attributes of the database connection URL, such as ;<i>territory=ll_CC</i> or ;<i>create=true</i>.
-For more information, see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</p></li>
-<li><i>host</i>  
-<p>The name of the machine where the server
-is running. It can be the name of the machine or the address.</p></li>
-<li><i id="rtoolsijtools27024">port</i>  
-<p>The port number
-of the server framework</p></li>
+<p>The italicized items stand for something the user fills in:   <ul>
+<li><i id="rtoolsijtools16246">databaseName</i>   <p>The name of the database
+you want to connect to</p></li>
+<li><i id="rtoolsijtools12861">URLAttributes</i>   <p>One or more of the supported
+attributes of the database connection URL, such as ;<i>territory=ll_CC</i> or
+;<i>create=true</i>. For more information, see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</p></li>
+<li><i>host</i>   <p>The name of the machine where the server is running.
+It can be the name of the machine or the address.</p></li>
+<li><i id="rtoolsijtools27024">port</i>   <p>The port number of the server
+framework</p></li>
 </ul></p>
-<section id="ctoolsabtproto"><title>About Protocols</title>
-<p>Officially, the portion of the database connection URL called the protocol is <i>jdbc:</i>, just as<i> http://</i> is a protocol in Web URLs.
-However, the second portion of the database connection URL (everything between <i>jdbc:</i> and <i>databaseName</i>), which is called the
-subprotocol, is informally considered part of the protocol. Later in this
-book you might see references to protocol. Consider protocol to be everything
-that comes before <i>databaseName</i>.</p></section>
-<section><p>For complete information about the database connection URL, see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</p></section>
-</conbody></concept>
+<section id="ctoolsabtproto"><title>About Protocols</title> <p>Officially,
+the portion of the database connection URL called the protocol is <i>jdbc:</i>,
+just as<i> http://</i> is a protocol in Web URLs. However, the second portion
+of the database connection URL (everything between <i>jdbc:</i> and <i>databaseName</i>),
+which is called the subprotocol, is informally considered part of the protocol.
+Later in this book you might see references to protocol. Consider protocol
+to be everything that comes before <i>databaseName</i>.</p></section>
+<section><p>For complete information about the database connection URL, see
+the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</p></section>
+</conbody>
+</concept>
+<?Pub *0000004247?>

Modified: incubator/derby/docs/trunk/src/tools/ctoolsimportidentitycol.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ctoolsimportidentitycol.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ctoolsimportidentitycol.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ctoolsimportidentitycol.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
  "../dtd/concept.dtd">
 <concept id="ctoolsimportidentitycol" xml:lang="en-us">
 <title>Importing into tables with identity columns</title>
-<conbody><?Pub Caret1?>
+<conbody>
 <p>You can use the SYSCS_UTIL.SYSCS_IMPORT_DATA procedure to import data into
 a table that contains an identity column.  If the identity column is defined
 as GENERATED ALWAYS, an identity value is generated for a table row whenever

Modified: incubator/derby/docs/trunk/src/tools/ctoolsusingdblook.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ctoolsusingdblook.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ctoolsusingdblook.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ctoolsusingdblook.dita Fri May  6 15:46:20 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,28 +16,32 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="ctoolsusingdblook">
+<concept id="ctoolsusingdblook" xml:lang="en-us">
 <title>Using dblook</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <conbody>
-<p>The syntax for the command to launch the <codeph>dblook</codeph> utility is:</p>
+<p>The syntax for the command to launch the <codeph>dblook</codeph> utility
+is:</p>
 <codeblock>java org.apache.derby.tools.dblook -d &lt;databaseURL&gt; [OPTIONS]</codeblock>
-<p>The value for <synph><var>databaseUrl</var></synph> is the complete URL for the database.
-Where appropriate, the URL includes any connection attributes or properties
-that might be required to access the database. </p>
-<p>For example, to connect to the database 'myDB', the URL would simply be <codeph>'jdbc:derby:myDB';</codeph> to connect using the Network Server to a database
-'C:/private/tmp/myDB' on a remote server (port 1527), the URL would be:</p>
-<codeblock>'jdbc:derby:net://localhost:1527/"C:/private/tmp/myDB"
+<p>The value for <synph><var>databaseUrl</var></synph> is the complete URL
+for the database. Where appropriate, the URL includes any connection attributes
+or properties that might be required to access the database. </p>
+<p>For example, to connect to the database 'myDB', the URL would simply be <codeph>'jdbc:derby:myDB';</codeph> to
+connect using the Network Server to a database 'C:/private/tmp/myDB' on a
+remote server (port 1527), the URL would be:</p>
+<codeblock>'jdbc:derby://localhost:1527/"C:/private/tmp/myDB"
 :user=someusr;password=somepwd;'</codeblock>
-<p>As with other <ph conref="toolsconrefs.dita#prod/productshortname"></ph> utilities, you must ensure that no other JVMs
-are started against the database when you call the <codeph>dblook</codeph> utility,
-or an exception will occur and will print to the <codeph>dblook.log</codeph>. If
-this exception is thrown, the <codeph>dblook</codeph> utility will quit. To recover,
-you must ensure that no other <ph conref="toolsconrefs.dita#prod/productshortname"></ph> applications running in a separate
-JVM are connected to the source database. These connections need to be shutdown.
-Once all existing JVMs running against the database have been shutdown, the <codeph>dblook</codeph> utility will execute successfully. You can also start the <ph conref="toolsconrefs.dita#prod/productshortname"></ph>
-Network server and run the <codeph>dblook</codeph> utility as a client application
+<p>As with other <ph conref="toolsconrefs.dita#prod/productshortname"></ph> utilities,
+you must ensure that no other JVMs are started against the database when you
+call the <codeph>dblook</codeph> utility, or an exception will occur and will
+print to the <codeph>dblook.log</codeph>. If this exception is thrown, the <codeph>dblook</codeph> utility
+will quit. To recover, you must ensure that no other <ph conref="toolsconrefs.dita#prod/productshortname"></ph> applications
+running in a separate JVM are connected to the source database. These connections
+need to be shutdown. Once all existing JVMs running against the database have
+been shutdown, the <codeph>dblook</codeph> utility will execute successfully.
+You can also start the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> Network
+server and run the <codeph>dblook</codeph> utility as a client application
 while other clients are connected to the server.</p>
-</conbody></concept>
+</conbody>
+</concept>
+<?Pub *0000002629?>

Modified: incubator/derby/docs/trunk/src/tools/rtools1003161.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/rtools1003161.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/rtools1003161.dita (original)
+++ incubator/derby/docs/trunk/src/tools/rtools1003161.dita Fri May  6 15:46:20 2005
@@ -26,12 +26,12 @@
 <section><p><ph conref="toolsconrefs.dita#prod/productshortname"></ph> class path requirements:</p></section>
 <section><p>
 <ul>
-<li>To use <codeph>ij</codeph>, you must have <i>derbytools.jar </i> in your class path. If you are using the embedded driver, you must also
-include<i>derbytools.jar </i>.</li>
+<li>To use <codeph>ij</codeph>, you must have <i>derbytools.jar</i> in your class path. If you are using the embedded driver, you must also
+include<i>derbytools.jar</i>.</li>
 <li>To use the import and export utilities and the database class utilities,
-you must have <i>derby.jar </i> and <i>derbytools.jar </i>in your class path.</li>
-<li>To use sysinfo, either <i>derby.jar</i> or <i>derbytools.jar, </i> must be in your class path.</li>
+you must have <i>derby.jar</i> and <i>derbytools.jar</i> in your class path.</li>
+<li>To use sysinfo, either <i>derby.jar</i> or <i>derbytools.jar</i> must be in your class path.</li>
 <li>To use <ph conref="toolsconrefs.dita#prod/productshortname"></ph> tools from a client with the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> Network Server,
-you must have <i>db2jcc.jar</i> and <i>db2jcc_license_c.jar</i> in your class path. See the <cite><ph conref="toolsconrefs.dita#pub/citadmin"></ph></cite> for more information.</li>
+you must have <i>derbyclient.jar</i> in your class path. See the <cite><ph conref="toolsconrefs.dita#pub/citadmin"></ph></cite> for more information.</li>
 </ul></p></section>
 </refbody></reference>

Modified: incubator/derby/docs/trunk/src/tools/rtoolscopyright.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/rtoolscopyright.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/rtoolscopyright.dita (original)
+++ incubator/derby/docs/trunk/src/tools/rtoolscopyright.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <?Pub Inc?>
-<reference id="rtoolscopyright" xml:lang="en-us"><?Pub Caret?>
+<reference id="rtoolscopyright" xml:lang="en-us">
 <title>Copyright</title>
 <shortdesc>First Edition (August 2004)</shortdesc>
 <refbody>

Modified: incubator/derby/docs/trunk/src/tools/rtoolsdblookexamples.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/rtoolsdblookexamples.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/rtoolsdblookexamples.dita (original)
+++ incubator/derby/docs/trunk/src/tools/rtoolsdblookexamples.dita Fri May  6 15:46:20 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,17 +16,15 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsdblookexamples">
+<reference id="rtoolsdblookexamples" xml:lang="en-us">
 <title>dblook examples</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <refbody>
 <section><p>The following examples demonstrate how the various <codeph>dblook</codeph> utility
 options might be specified from a command line.  Each example is preceded
-by a brief description of how the <codeph>dblook</codeph> utility behaves given
-the specified options.</p></section><example>
-<codeblock>Dump the DDL for everything in database 'sample' (in the current directory)
+by a brief description of how the <codeph>dblook</codeph> utility behaves
+given the specified options.</p></section>
+<example> <codeblock>Dump the DDL for everything in database 'sample' (in the current directory)
 to the console.
 <b>java org.apache.derby.tools.dblook -d jdbc:derby:sample
 </b>
@@ -53,7 +53,7 @@
 </b>Dump the DDL for all objects in remote database 'sample' on 'localhost:1527'
 with schema 'SAMP' to the console.
 <b>java org.apache.derby.tools.dblook -d 
-	'jdbc:derby:net://localhost:1527/"C:/temp/sample":
+	'jdbc:derby://localhost:1527/"C:/temp/sample":
 	user=someusr;password=somepwd;' -z samp
 </b>
 
@@ -77,8 +77,10 @@
 to the console.
 <b>java org.apache.derby.tools.dblook -d jdbc:derby:sample -noview
 </b></codeblock></example>
-<section><p>Status messages are printed to the output (either a -o filename, if specified,
-or the console) as SQL script comments. These status messages serve as headers
-to show which types of database objects are being (or have been) processed
-by the dblook utility.</p></section>
-</refbody></reference>
+<section><p>Status messages are printed to the output (either a -o filename,
+if specified, or the console) as SQL script comments. These status messages
+serve as headers to show which types of database objects are being (or have
+been) processed by the dblook utility.</p></section>
+</refbody>
+</reference>
+<?Pub *0000003735?>

Modified: incubator/derby/docs/trunk/src/tools/rtoolsijcomref34110.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/rtoolsijcomref34110.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/rtoolsijcomref34110.dita (original)
+++ incubator/derby/docs/trunk/src/tools/rtoolsijcomref34110.dita Fri May  6 15:46:20 2005
@@ -23,7 +23,7 @@
 <keywords><indexterm>Strings in ij</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<refsyn><title>Syntax</title><codeblock><b>'<i><?Pub Caret1?>Text</i>'</b></codeblock> </refsyn>
+<refsyn><title>Syntax</title><codeblock><b>'<i>Text</i>'</b></codeblock> </refsyn>
 <section><title>Description</title><p>Some <codeph>ij</codeph> commands require
 strings. <codeph>ij</codeph> strings are represented by the same literal format
 as SQL strings and are delimited by single quotation marks. To include a single

Modified: incubator/derby/docs/trunk/src/tools/rtoolsijtools16879.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/rtoolsijtools16879.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/rtoolsijtools16879.dita (original)
+++ incubator/derby/docs/trunk/src/tools/rtoolsijtools16879.dita Fri May  6 15:46:20 2005
@@ -30,9 +30,8 @@
 <li><i>org.apache.derby.jdbc.EmbeddedDriver</i>  
 <p>For embedded
 environments, when <ph conref="toolsconrefs.dita#prod/productshortname"></ph> runs in the same JVM as the application</p></li>
-<li><i>com.ibm.db2.jcc.DB2Driver</i>  
-<p>For JCC clients
-connecting to the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> Network Server</p></li>
+<li><i>org.apache.derby.jdbc.ClientDriver</i>  
+<p>For using the Network Client to connect to the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> Network Server</p></li>
 </ul></p></section>
 <section><p>You can use <codeph>ij</codeph> to connect to any database that supplies a JDBC
 driver. For those databases, you would need to load the supplied JDBC driver.</p></section>

Modified: incubator/derby/docs/trunk/src/tools/rtoolstrademderby.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/rtoolstrademderby.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/rtoolstrademderby.dita (original)
+++ incubator/derby/docs/trunk/src/tools/rtoolstrademderby.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 
 <!DOCTYPE topic PUBLIC "-//IBM//DTD DITA Topic//EN"
  "../dtd/topic.dtd">
-<topic id="rtoolstrademderby" xml:lang="en-us"><?Pub Caret?>
+<topic id="rtoolstrademderby" xml:lang="en-us">
 <title>Trademarks</title>
 <body>
 <p>The following terms are trademarks of International Business Machines Corporation

Modified: incubator/derby/docs/trunk/src/tools/toolsconrefs.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/toolsconrefs.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/toolsconrefs.dita (original)
+++ incubator/derby/docs/trunk/src/tools/toolsconrefs.dita Fri May  6 15:46:20 2005
@@ -31,7 +31,7 @@
 <p><ph id="productinstallpath">DERBY_INSTALL</ph></p>
 <p><ph id="productlowercase">derby</ph></p>
 </conbody>
-</concept><?Pub Caret?>
+</concept>
 <concept id="vers" xml:lang="en-us">
 <title>Version and release numbers</title>
 <conbody>

Modified: incubator/derby/docs/trunk/src/tools/ttoolsij11815.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ttoolsij11815.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ttoolsij11815.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ttoolsij11815.dita Fri May  6 15:46:20 2005
@@ -34,7 +34,7 @@
 You can start ij by running the ij scripts in the /frameworks/embedded/bin/
 directory or in the /frameworks/NetworkServer/bin/ directory.</p> </context>
 <example>To start ij, run the script provided or use this command:   <codeblock><xref
-href="#ttoolsij11815/rtoolsij42358">java</xref> [&lt;<i><xref href="ttoolsij11815.dita#ttoolsij11815/rtoolsij26546">options</xref></i>><?Pub Caret?>] org.apache.derby.tools.ij [-p &lt;<i
+href="#ttoolsij11815/rtoolsij42358">java</xref> [&lt;<i><xref href="ttoolsij11815.dita#ttoolsij11815/rtoolsij26546">options</xref></i>>] org.apache.derby.tools.ij [-p &lt;<i
 ><xref href="ttoolsij11815.dita#ttoolsij11815/rtoolsij40855">propertyFile</xref></i>>] [&lt;<i><xref
 href="#ttoolsij11815/rtoolsij39639">inputFile</xref></i>>]</codeblock>The
 command line items are:    <ul>

Modified: incubator/derby/docs/trunk/src/tools/ttoolsij30600.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ttoolsij30600.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ttoolsij30600.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ttoolsij30600.dita Fri May  6 15:46:20 2005
@@ -33,7 +33,7 @@
 start ij with an <xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032"></xref> of <b>jdbc:derby:</b> and
 an <xref href="rtoolsijpropref28146.dita#rtoolsijpropref28146"></xref> of <b>sample</b>,
 use the following command:   <codeblock>java -Dij.protocol=jdbc:derby: -Dij.database=toursDB
-    org.apache.derby.too<?Pub Caret?>ls.ij</codeblock></p><p>To start ij with
+    org.apache.derby.tools.ij</codeblock></p><p>To start ij with
 two named connections, using the <xref href="rtoolsijpropref10135.dita#rtoolsijpropref10135"></xref> property,
 use the following command:   <codeblock>java -Dij.connection.toursDB=jdbc:derby:toursDB 
 -Dij.connection.History=jdbc:derby:History 

Modified: incubator/derby/docs/trunk/src/tools/ttoolsij97656.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ttoolsij97656.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ttoolsij97656.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ttoolsij97656.dita Fri May  6 15:46:20 2005
@@ -62,7 +62,7 @@
 ij&gt; protocol 'jdbc:derby:';
 ij&gt; connect 'toursDB';
 ij&gt;
-<?Pub Caret?>
+
 D:&gt;java -Dij.protocol.myprotocolName=jdbc:derby:
     org.apache.derby.tools.ij
 ij version 10.0

Modified: incubator/derby/docs/trunk/src/tools/ttoolsij98878.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ttoolsij98878.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ttoolsij98878.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ttoolsij98878.dita Fri May  6 15:46:20 2005
@@ -37,7 +37,7 @@
 <result><note type="note">If you name an input file as a command-line argument
 or if you use the <xref href="rtoolsijcomref28886.dita#rtoolsijcomref28886">Run</xref> command,
 ij echoes input from a file. If you redirect standard input to come from a
-file, ij does not echo commands.</note><?Pub Caret?></result>
+file, ij does not echo commands.</note></result>
 <example><p>You can save output in any of the following ways: </p><ul>
 <li>By redirecting output to a file:<codeblock>java -Djdbc.drivers=org.apache.derby.jdbc.EmbeddedDriver
     org.apache.derby.tools.ij &lt;<i>myscript.sql</i>&gt; &lt;<i>myoutput.txt</i>>

Modified: incubator/derby/docs/trunk/src/tools/ttoolsjarload1002986.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ttoolsjarload1002986.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ttoolsjarload1002986.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ttoolsjarload1002986.dita Fri May  6 15:46:20 2005
@@ -21,7 +21,7 @@
 <title>Adding a Jar File</title>
 <taskbody>
 <context> <p>To add a jar file using SQL syntax:   <codeblock>CALL SQL.install_jar('<xref
-href="ttoolsjarload1003120.dita#ttoolsjarload1003120/rtoolsjarload41400"><?Pub Caret1?>jarFilePath</xref>', qualifiedJarName, 0)</codeblock></p></context>
+href="ttoolsjarload1003120.dita#ttoolsjarload1003120/rtoolsjarload41400">jarFilePath</xref>', qualifiedJarName, 0)</codeblock></p></context>
 </taskbody>
 </task>
 <?Pub *0000000530?>

Modified: incubator/derby/docs/trunk/src/tools/ttoolsjarload1003059.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ttoolsjarload1003059.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ttoolsjarload1003059.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ttoolsjarload1003059.dita Fri May  6 15:46:20 2005
@@ -21,7 +21,7 @@
 <title>Removing a jar file</title>
 <taskbody>
 <context> <p>To remove a jar file using SQL syntax:   <codeblock>CALL SQLJ.remove_jar ('<xref
-href="ttoolsjarload1003120.dita#ttoolsjarload1003120/rtoolsjarload41400">ja<?Pub Caret?>rFilePath</xref>', qualifiedJarName, 0)</codeblock></p></context>
+href="ttoolsjarload1003120.dita#ttoolsjarload1003120/rtoolsjarload41400">jarFilePath</xref>', qualifiedJarName, 0)</codeblock></p></context>
 </taskbody>
 </task>
 <?Pub *0000000535?>

Modified: incubator/derby/docs/trunk/src/tools/ttoolsjarload1003120.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/ttoolsjarload1003120.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/ttoolsjarload1003120.dita (original)
+++ incubator/derby/docs/trunk/src/tools/ttoolsjarload1003120.dita Fri May  6 15:46:20 2005
@@ -30,7 +30,7 @@
 <step id="rtoolsjarload12321"><cmd>qualifiedJarName   </cmd><stepxmp><p>The <ph
 conref="toolsconrefs.dita#prod/productshortname"></ph> name of the jar file,
 qualified by the schema name. Two examples:   <codeblock>MYSCHEMA.Sample1 -- a delimited identifier.
-</codeblock></p></stepxmp><stepxmp><codeblock>MYSCHEMA."Sample2"</codeblock><?Pub Caret?></stepxmp>
+</codeblock></p></stepxmp><stepxmp><codeblock>MYSCHEMA."Sample2"</codeblock></stepxmp>
 </step>
 </steps-unordered>
 </taskbody>

Modified: incubator/derby/docs/trunk/src/tuning/ctundepth1002853.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctundepth1002853.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctundepth1002853.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctundepth1002853.dita Fri May  6 15:46:20 2005
@@ -27,7 +27,7 @@
 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 "<?Pub Caret?>CONSTRAINT clause" in the <cite><ph conref="tunconrefs.dita#pub/citref"></ph></cite> for
+table. See "CONSTRAINT clause" in the <cite><ph conref="tunconrefs.dita#pub/citref"></ph></cite> for
 more information.</li>
 <li>When you explicitly create an index on a table with a CREATE INDEX statement. </li>
 </ul></p>

Modified: incubator/derby/docs/trunk/src/tuning/ctundepth32379.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctundepth32379.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctundepth32379.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctundepth32379.dita Fri May  6 15:46:20 2005
@@ -31,7 +31,7 @@
 <li>Your application can use <i>PreparedStatements</i> instead of <i>Statements</i>.
   <p><i>PreparedStatements</i> are JDBC objects that you prepare (compile)
 once and execute multiple times. (See <xref href="ctundepth32379.dita#ctundepth32379/ctundepth42475"
-type="fig"><?Pub Caret?></xref>.) If your application executes statements
+type="fig"></xref>.) If your application executes statements
 that are almost but not exactly alike, use <i>PreparedStatements</i>, which
 can contain dynamic or IN parameters. Instead of using the literals for changing
 parameters, use question marks (?) as placeholders for such parameters. Provide

Modified: incubator/derby/docs/trunk/src/tuning/ctundepth853133.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctundepth853133.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctundepth853133.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctundepth853133.dita Fri May  6 15:46:20 2005
@@ -86,7 +86,7 @@
 <p>Consider this second, more complex query:   <codeblock><b><ph></ph>SELECT Country
 FROM Countries
 WHERE Region = 'Central America'</b></codeblock></p>
-<p>When executed, this query involves two nodes-<?Pub Caret?> one to retrieve
+<p>When executed, this query involves two nodes- one to retrieve
 qualifying rows (the restriction is done at this node) and one to project
 the requested columns. So, at bottom, there is a <i>TableScanResultSet</i> for
 scanning the table. The qualifier (Region = 'Central America') is evaluated

Modified: incubator/derby/docs/trunk/src/tuning/ctunpropref1002477.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/ctunpropref1002477.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/ctunpropref1002477.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/ctunpropref1002477.dita Fri May  6 15:46:20 2005
@@ -26,7 +26,7 @@
 <li><xref href="ctunpropref22460.dita#ctunpropref22460"></xref></li>
 <li><xref href="ctunpropref23947.dita#ctunpropref23947"></xref></li>
 </ul>
-<p>For general information about the <ph conref="tunconrefs.dita#prod/productshortname"></ph> <?Pub Caret1?>documentation,
+<p>For general information about the <ph conref="tunconrefs.dita#prod/productshortname"></ph> documentation,
 such as a complete list of books, conventions, and further reading, see <cite><ph
 conref="tunconrefs.dita#pub/citgetstart"></ph></cite>.</p>
 </conbody>

Modified: incubator/derby/docs/trunk/src/tuning/rtuncopyright.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtuncopyright.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtuncopyright.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtuncopyright.dita Fri May  6 15:46:20 2005
@@ -22,7 +22,7 @@
 <title>Copyright</title>
 <shortdesc>First Edition (August 2004)</shortdesc>
 <refbody>
-<section><p>Copyright 1997, 2004<?Pub Caret?> The Apache Software Foundation
+<section><p>Copyright 1997, 2004 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

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper13766.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper13766.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper13766.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper13766.dita Fri May  6 15:46:20 2005
@@ -54,7 +54,7 @@
 conref="tunconrefs.dita#pub/citdevelop"></ph>.</cite></p> </section>
 <refsyn><title>Syntax</title> <codeblock><b>derby.authentication.provider={
     LDAP |
-<?Pub Caret?>    BUILTIN |
+    BUILTIN |
     <b><i>classProviderName</i></b> }</b></codeblock> </refsyn>
 <section><title>Default</title> <p>BUILTIN</p> </section>
 <example><title>Example</title> <codeblock><b><ph>-- system-wide property</ph>

Modified: incubator/derby/docs/trunk/src/tuning/rtunproper25581.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tuning/rtunproper25581.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tuning/rtunproper25581.dita (original)
+++ incubator/derby/docs/trunk/src/tuning/rtunproper25581.dita Fri May  6 15:46:20 2005
@@ -46,7 +46,7 @@
 derby.authentication.server=ldap://godfrey:9090
 <ph>##LDAP example</ph>
 derby.authentication.server=//godfrey:9090
-<ph><?Pub Caret1?>-- database-wide property</ph>
+<ph>-- database-wide property</ph>
 CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.authentication.server',
     'godfrey:9090')</b></codeblock> </example>