db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r168976 [2/5] - in /incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Fri, 06 May 2005 22:46:34 GMT
Modified: incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita Fri May  6 15:46:20 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -24,12 +23,12 @@
 <indexterm>Network Server<indexterm>dblook and</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>To use <b>dblook</b> with the Universal Driver, make sure the
-Network Server is running (see <xref href="tadmincbdjhhfd.dita#tadmincbdjhhfd"></xref>),
+<context> <p>To use <b>dblook</b> with the Network Client driver, make sure
+the Network Server is running (see <xref href="tadmincbdjhhfd.dita#tadmincbdjhhfd"></xref>),
 and then include the necessary <ph conref="adminconrefs.dita#prod/productshortname"></ph> and
-Universal Driver connection attributes as part of the database URL. </p></context>
-<example>For example: <codeblock>java org.apache.derby.tools.dblook -d'jdbc:derby:net://localhost:1527/sample:user=&lt;<i>yourusername</i
->>;password=&lt;<i>yourpassword</i>>;'</codeblock></example>
+Network Client driver connection attributes as part of the database URL.</p></context>
+<example><codeblock>java org.apache.derby.tools.dblook -d'jdbc:derby://localhost:1527/sample:
+user=&lt;<i>yourusername</i>>;password=&lt;<i>yourpassword</i>>;'</codeblock></example>
 </taskbody>
 </task>
-<?Pub *0000001719?>
+<?Pub *0000001712?>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita Fri May  6 15:46:20 2005
@@ -50,14 +50,13 @@
 need both lines (if you are installing the IBM JCE on a Sun JDK) and that
 order is important.</note></p></info></step>
 <step><cmd>In order to use the encrypted user id and password during JDBC
-connection using JCC, specify<codeph>9</codeph> as the <codeph>securityMechanism</codeph> in
+connection using the Network Client, specify<codeph>9</codeph> as the <codeph>securityMechanism</codeph> in
 the connection property. </cmd><info>If an encrypted database is booted in
 the Network Server, users can connect to the database without giving the <codeph>bootPassword</codeph>.
 The first connection to the database must provide the <codeph>bootPassword</codeph>,
 but all subsequent connections do not need to supply it. To remove access
 from the encrypted database, use the <codeph>dbshutdown</codeph> option to
-shut down the database. The Network Server and the IBM DB2 JDBC Universal
-Driver both use IBM JCE 1.2.1 to do the encryption.</info></step>
+shut down the database.</info></step>
 </steps>
 </taskbody>
 </task>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita Fri May  6 15:46:20 2005
@@ -21,11 +21,11 @@
 <task id="tadminappschangingyourclasspath" xml:lang="en-us">
 <title>Changing your class path</title>
 <prolog><metadata>
-<keywords><indexterm>db2jcc_license_c.jar</indexterm><indexterm>db2jcc.jar</indexterm>
+<keywords><indexterm>derbyclient.jar</indexterm>
 <indexterm>derby.jar</indexterm><indexterm>derbynet.jar</indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>To use the Network Server and Universal Driver, add the following
+<context> <p>To use the Network Server and Network Client driver, add the following
 jar files to your server class path:</p> </context>
 <steps-unordered>
 <step><cmd>derbynet.jar</cmd><info><p>This jar file contains the Network Server
@@ -35,15 +35,11 @@
 <step><cmd>derby.jar</cmd><info><p>This file must be in your class path to
 use any of the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
 Server functions.</p></info></step>
-<step><cmd>db2jcc.jar</cmd><info><p>This jar file must be in your class path
-to use the DB2 JDBC Universal Driver. The jar file is necessary for client-side
-communication with the Network Server using the DB2 JDBC Universal Driver.
-It needs to be in the client-side class path to use the DB2 JDBC Universal
-Driver to access <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</p></info>
+<step><cmd>derbyclient.jar</cmd><info><p>This jar file must be in your class path
+to use the Network Client driver. The jar file is necessary for client-side
+communication with the Network Server using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Client driver.
+It needs to be in the client-side class path to use the Network Client driver to access <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</p></info>
 </step>
-<step><cmd>db2jcc_license_c.jar</cmd><info><p>This is the license jar file,
-and it must be in your client machine's class path to use the DB2 JDBC Universal
-Driver.</p></info></step>
 </steps-unordered>
 <example><p><ph conref="adminconrefs.dita#prod/productshortname"></ph> provides
 script files for setting the class path to work with the Network Server. The

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfig815357.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfig815357.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfig815357.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfig815357.dita Fri May  6 15:46:20 2005
@@ -25,7 +25,7 @@
 </metadata></prolog>
 <taskbody>
 <context> <p>You can use the NetworkServerControl API to shut down the Network
-Server from within a Java application. To do so, use the following syntax:</p><codeblock><?Pub Caret1?>shutdown();</codeblock> </context>
+Server from within a Java application. To do so, use the following syntax:</p><codeblock>shutdown();</codeblock> </context>
 <example><p>For example, the following command shuts down the Network Server
 running on the current machine using port 1527.</p><codeblock>NetworkServerControl server = new NetworkServerControl();
 server.shutdown();</codeblock></example>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfigalteringthestartnetworkserverscr.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfigalteringthestartnetworkserverscr.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfigalteringthestartnetworkserverscr.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfigalteringthestartnetworkserverscr.dita Fri May  6 15:46:20 2005
@@ -28,7 +28,7 @@
 like in the following example:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl start -p <i>1368</i></codeblock>where <i>1368</i
 > is the new port number.</stepxmp></step>
 <step><cmd>Specify a specific interface (host name or IP address) to listen
-on other than the default (<codeph>l<?Pub Caret1?>ocalhost</codeph>). You
+on other than the default (<codeph>localhost</codeph>). You
 can do this by adding <codeph>-h</codeph> to the following command: </cmd>
 <stepxmp><note type="remember">Before using this option, you should run under
 the Java security manager and enable user authentication.</note><codeblock>java org.apache.derby.drda.NetworkServerControl start -h myhost -p <i>1368</i

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita Fri May  6 15:46:20 2005
@@ -28,7 +28,7 @@
 command line, in the <codeph>.bat</codeph> or <codeph>.ksh</codeph> files
 (loading the properties by executing <codeph>java -D</codeph>), or in the <codeph>derby.properties </codeph>file. </p><p>Properties
 in the command line or in the <codeph>.bat </codeph>or <codeph>.ksh</codeph> files
-take precedence over the properties in the <codeph>derby.properties</codeph><?Pub Caret1?> file.
+take precedence over the properties in the <codeph>derby.properties</codeph> file.
 Arguments given to commands on the command line take precedence over property
 values. </p> <p>You can specify the following properties:</p> </context>
 <steps-unordered>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminlog800206.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminlog800206.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminlog800206.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminlog800206.dita Fri May  6 15:46:20 2005
@@ -35,7 +35,7 @@
 from the <codeph>service.properties</codeph> file.</p> </context>
 <example><p>To check the log location for an existing database, you can retrieve
 the <codeph>logDevice</codeph> attribute as a database property by using the
-following statement:</p><codeblock>V<?Pub Caret1?>ALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice')</codeblock></example>
+following statement:</p><codeblock>VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice')</codeblock></example>
 </taskbody>
 </task>
 <?Pub *0000002185?>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminlogfile.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminlogfile.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminlogfile.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminlogfile.dita Fri May  6 15:46:20 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <?Pub Inc?>
@@ -34,16 +33,15 @@
 file exists, it is overwritten, unless the property <codeph>derby.infolog.append</codeph> is
 set to <codeph>true</codeph>. </p> </context>
 <steps-unordered>
-<step><cmd>Turn on connection and disconnection logging through
-the servlet interface or by using the following command:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl logconnections on [-h &lt;<i
+<step><cmd>Turn on connection and disconnection logging through the servlet
+interface or by using the following command:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl logconnections on [-h &lt;<i
 >hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;] </codeblock></stepxmp></step>
 <step><cmd>Turn connection logging off through the servlet interface or by
 using the following command:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl logconnections off [-h &lt;<i>hostname</i>&gt;][-p &lt;<i
 >portnumber</i>&gt;] </codeblock></stepxmp></step>
 </steps-unordered>
 <postreq>See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
-more information about <codeph>derby.log</codeph>. See the DB2 UDB documentation
-for information about the Universal Driver's error reporting.</postreq>
+more information about <codeph>derby.log</codeph>.</postreq>
 </taskbody>
 </task>
-<?Pub *0000002707?>
+<?Pub *0000002615?>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminovclirun.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminovclirun.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminovclirun.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminovclirun.dita Fri May  6 15:46:20 2005
@@ -22,7 +22,7 @@
 <title>Running the SimpleNetworkClientSample program</title>
 <taskbody>
 <context> <p>To connect to the Network Server that has been started as part
-of the SimpleNetworkServerSample program: </p><?Pub Caret1?></context>
+of the SimpleNetworkServerSample program: </p></context>
 <steps>
 <step><cmd>Open a command prompt and change directories to the <codeph>%<ph
 conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\programs\nserverdemo</codeph> directory,
@@ -34,11 +34,8 @@
 following jar files: </cmd>
 <substeps>
 <substep><cmd>The current directory (".")</cmd></substep>
-<substep><cmd>db2jcc.jar</cmd><info>This jar file must be in your CLASSPATH
-to use the DB2 JDBC Universal Driver.</info></substep>
-<substep><cmd>db2jcc_license_c.jar</cmd><info>This jar file is the license
-file for the Universal Driver for <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</info>
-</substep>
+<substep><cmd>derbyclient.jar</cmd><info>This jar file must be in your CLASSPATH
+to use the Network Client driver.</info></substep>
 </substeps>
 </step>
 <step><cmd>After you have set up your environment correctly, execute the application
@@ -46,8 +43,7 @@
 <stepresult>You should receive output similar to the following if the program
 runs successfully: <codeblock>Starting Sample client program
 Got a client connection via the DriverManager.
-connection from datasource; getDriverName = 
-	IBM DB2 JDBC Universal Driver Architecture
+connection from datasource; 
 Got a client connection via a DataSource.
 Testing the connection obtained via DriverManager by executing a sample query
 number of rows in sys.systables = 16

Modified: incubator/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita Fri May  6 15:46:20 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -27,16 +26,14 @@
 is the directory where you installed <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</cmd>
 </step>
 <step><cmd>Set the CLASSPATH to the current directory (".") and also include
-the following jar files in order to use the Network Server and the DB2 JDBC
-Universal Driver:</cmd>
+the following jar files in order to use the Network Server and the Network
+Client driver:</cmd>
 <substeps>
 <substep><cmd>derbynet.jar</cmd><info><p>The Network Server jar file. It must
 be in your CLASSPATH to use any of the Network Server functions.</p></info>
 </substep>
-<substep><cmd>db2jcc.jar</cmd><info><p>This jar file must be in your CLASSPATH
-to use the DB2 JDBC Universal Driver.</p></info></substep>
-<substep><cmd>db2jcc_license_c.jar</cmd><info><p>This jar file is the license
-file for the Universal Driver.</p></info></substep>
+<substep><cmd>derbyclient.jar</cmd><info><p>This jar file must be in your
+CLASSPATH to use the Network Client driver.</p></info></substep>
 <substep><cmd>derby.jar</cmd><info><p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> database
 engine jar file.</p></info></substep>
 </substeps>
@@ -44,8 +41,8 @@
 <step><cmd>Test the CLASSPATH settings by running the following Java command:</cmd>
 <stepxmp><codeblock> java org.apache.derby.tools.sysinfo</codeblock></stepxmp>
 <stepresult>This command will show the <ph conref="adminconrefs.dita#prod/productshortname"></ph> jar
-files that are in the CLASSPATH as well as the DB2 JDBC Universal Driver along
-with their respective versions.</stepresult></step>
+files that are in the CLASSPATH along with their respective versions.</stepresult>
+</step>
 <step><cmd>After you have set up your environment correctly, execute the application
 from the same directory: </cmd><stepxmp><codeblock>java nserverdemo.NsSample</codeblock></stepxmp>
 <stepresult>You should receive output similar to the following if the program
@@ -62,9 +59,8 @@
 	dbUrl =jdbc:derby:NSSampledb;
 [NsSampleClientThread] Thread id - 2; started.
 [NsSampleWork] Thread id - 2; requests database connection, 
-	dbUrl =jdbc:derby:net://localhost:1621/
-	NSSampledb;create=true:retrieveMessagesFromServerOnGetMessage=true;
-	deferPrepares=true;
+	dbUrl =jdbc:derby://localhost:1621/
+	NSSampledb;deferPrepares=true;
 Connection number: 3.
 [NsSampleWork] Thread id - 1 selected 1 row [313,Derby36   ,1.7686243E23,9620]
 [NsSampleWork] Thread id - 1 selected 1 row [313,Derby36   ,1.7686243E23,9620]
@@ -102,4 +98,4 @@
 </ul></result>
 </taskbody>
 </task>
-<?Pub *0000005749?>
+<?Pub *0000005514?>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita Fri May  6 15:46:20 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -54,21 +53,18 @@
 While my app is busy with embedded work, ij might connect like this:
 
         $ java -Dij.user=me -Dij.password=pw -Dij.protocol=
-			jdbc:derby:net:\\localhost:1527\ org.apache.derby.tools.ij
-        ij&gt; connect 'NSSimpleDB:retrieveMessagesFromServerOnGetMessage=true;';
-Watch that punctuation.  Put a ':' before the jcc
-attributes and a ';' after each one (even the last).
-
+			jdbc:derby:\\localhost:1527\ org.apache.derby.tools.ij
+        ij&gt; connect 'NSSimpleDB';
 
 Clients can continue to connect:
 Press [Enter] to stop Server</codeblock></stepresult></step>
 </steps>
-<result><p>Running the SimpleNetworkServerSample program will
-also create the following new directories and files:  <ul>
+<result><p>Running the SimpleNetworkServerSample program will also create
+the following new directories and files:  <ul>
 <li>NSSimpleDB <p>This directory makes up the NSSimpleDB database.</p></li>
 <li>derby.log  <p>This log file contains <ph conref="adminconrefs.dita#prod/productshortname"></ph> progress
 and error messages.</p></li>
 </ul></p></result>
 </taskbody>
 </task>
-<?Pub *0000003609?>
+<?Pub *0000003456?>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminspace43.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminspace43.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminspace43.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminspace43.dita Fri May  6 15:46:20 2005
@@ -41,7 +41,7 @@
 uses less memory and disk space but is slower. To force the operation to run
 in sequential mode, substitute a non-zero smallint value for the third argument.
 The following example shows how to force the procedure to run in sequential
-mode:</p><codeblock>call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('APP', 'FLIGHTAVAILABILITY', 1);</codeblock><?Pub Caret1?></example>
+mode:</p><codeblock>call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('APP', 'FLIGHTAVAILABILITY', 1);</codeblock></example>
 <postreq>For more information about this command, see the <cite><ph conref="adminconrefs.dita#pub/citref"></ph></cite>.</postreq>
 </taskbody>
 </task>

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts15366.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts15366.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts15366.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts15366.dita Fri May  6 15:46:20 2005
@@ -22,7 +22,7 @@
 <prolog><metadata>
 <keywords><indexterm>Transaction anomalies in generic database systems<indexterm>description</indexterm></indexterm>
 <indexterm>java.sql.Connection.TRANSACTION_READ_UNCOMMITTED</indexterm><indexterm>java.sql.Connection.TRANSACTION_READ_COMMITTED</indexterm>
-<indexterm>java.sql.Connection.<?Pub Caret?>TRANSACTION_READ_COMMITTED</indexterm>
+<indexterm>java.sql.Connection.TRANSACTION_READ_COMMITTED</indexterm>
 <indexterm>java.sql.Connection.TRANSACTION_SERIALIZABLE</indexterm><indexterm>Dirty
 reads<indexterm>definition</indexterm></indexterm><indexterm>Non-repeatable
 reads<indexterm>definition</indexterm></indexterm><indexterm>Phantom reads<indexterm>definition</indexterm></indexterm>

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts23987.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts23987.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts23987.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts23987.dita Fri May  6 15:46:20 2005
@@ -29,7 +29,7 @@
 more information), issuing a commit will cause all result sets on your connection
 to be closed.</p>
 <p>The JDBC program is not required to have auto-commit off when using updatable
-ResultSets.<?Pub Caret?></p>
+ResultSets.</p>
 </conbody>
 </concept>
 <?Pub *0000001456?>

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts29416.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts29416.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts29416.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts29416.dita Fri May  6 15:46:20 2005
@@ -60,7 +60,7 @@
 locks prevent other transactions that update data from accessing the table.
 A transaction holds a lock on a table until the transaction commits. <i>So
 even a SELECT statement holds a shared lock on a table until its connection
-commits and a new transaction begins. </i></p><?Pub Caret?><table frame="all">
+commits and a new transaction begins. </i></p><table frame="all">
 <title>Summary of Application Behavior with Auto-Commit On or Off</title>
 <tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="46*"/>
 <colspec colname="2" colnum="2" colwidth="24*"/><colspec colname="3" colnum="3"

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts30811.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts30811.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts30811.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts30811.dita Fri May  6 15:46:20 2005
@@ -24,7 +24,7 @@
 <indexterm>Cursors<indexterm>updatable</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>Only specific SELECT statements-<?Pub Caret?> simple accesses of a single
+<p>Only specific SELECT statements- simple accesses of a single
 table-allow you to update or delete rows as you step through them.</p>
 <p>For more information, see "SELECT statement" and "FOR UPDATE clause" in
 the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts65864.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts65864.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts65864.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts65864.dita Fri May  6 15:46:20 2005
@@ -33,7 +33,7 @@
 <p>In addition, some programmers might share a statement among multiple threads
 to avoid the overhead of each thread's having its own. Using the single statement
 cache, threads can share the same statement from <i>different connections</i>.
-For more information, see <?Pub Caret?>in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
+For more information, see in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
 </conbody>
 </concept>
 <?Pub *0000001100?>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure30032.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure30032.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure30032.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure30032.dita Fri May  6 15:46:20 2005
@@ -50,7 +50,7 @@
 authentication using an external service. The application can be a single-user
 application with an embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> engine
 or a multi-user application server.</title>
-<image href="authentic_os.gif" placement="break"><alt>Derb<?Pub Caret?>y user
+<image href="authentic_os.gif" placement="break"><alt>Derby user
 authentication using an external service.</alt></image>
 </fig>
 <p><ph conref="devconrefs.dita#prod/productshortname"></ph> always runs embedded

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure37241.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure37241.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure37241.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure37241.dita Fri May  6 15:46:20 2005
@@ -35,7 +35,7 @@
 quotes, are limited to 128 characters, and have other limitations.</p>
 <p>User names must be valid authorization identifiers even if user authentication
 is turned off, and even if all users are allowed access to all databases.</p>
-<p>For more information about <i>SQL92Identifiers</i>, see<?Pub Caret?> the <cite><ph
+<p>For more information about <i>SQL92Identifiers</i>, see the <cite><ph
 conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
 </conbody>
 </concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure862382.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure862382.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure862382.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure862382.dita Fri May  6 15:46:20 2005
@@ -42,7 +42,7 @@
 certificates for classes loaded from signed jar files. See <xref href="cdevcsecure90988.dita#cdevcsecure90988"></xref>.</p>  <fig
 expanse="column"><title>Some of the <ph conref="devconrefs.dita#prod/productshortname"></ph> security
 mechanisms at work in a client/server environment</title>
-<image href="security_os.gif" placement="break"><alt>Some of the Derby<?Pub Caret?>
+<image href="security_os.gif" placement="break"><alt>Some of the Derby
 security mechanisms at work in a client/server environment.</alt></image>
 </fig> <fig expanse="column"><title>Another <ph conref="devconrefs.dita#prod/productshortname"></ph> security
 mechanism, disk encryption, protects data when the recipient might not know

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure864642.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure864642.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure864642.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure864642.dita Fri May  6 15:46:20 2005
@@ -25,7 +25,7 @@
 to the specified database only.</p>
 <p>You set the property once for each user. To delete a user, set that user's
 password to null.</p>
-<codeblock><b><b>-- adding the user sa with password '<ph conref="devconrefs.dita#prod/productlowercase"></ph>pass<?Pub Caret?>'</b>
+<codeblock><b><b>-- adding the user sa with password '<ph conref="devconrefs.dita#prod/productlowercase"></ph>pass'</b>
 CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.user.sa', '<ph conref="devconrefs.dita#prod/productlowercase"></ph>pass')
 <b>-- adding the user mary with password 'little7xylamb'</b>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure864692.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure864692.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure864692.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure864692.dita Fri May  6 15:46:20 2005
@@ -25,7 +25,7 @@
 to all databases in the system.</p>
 <p>You set the value of this system-wide property once for each user, so you
 can set it several times. To delete a user, remove that user from the file.</p>
-<p>You can define this property in the usual ways- <?Pub Caret?>typically
+<p>You can define this property in the usual ways- typically
 in the <i>derby.properties</i> file. For more information about setting properties,
 see <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
 <p>Here is a sample excerpt from the <i>derby.properties</i> file:</p>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure865880.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure865880.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure865880.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure865880.dita Fri May  6 15:46:20 2005
@@ -21,7 +21,7 @@
 <title>Setting the access mode for particular users</title>
 <prolog><metadata>
 <keywords><indexterm>Access<indexterm>full (read-write) versus read-only</indexterm></indexterm>
-<indexterm>UserUtility</indexterm><indexterm>com.ibm.derby.database.UserUtility</indexterm>
+<indexterm>UserUtility</indexterm><indexterm>org.apache.derby.database.UserUtility</indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
@@ -41,7 +41,7 @@
 (or even accessed) using the <i>derby.database.defaultConnectionMode</i> property.
 If you set this property to <codeph><i>noAccess</i></codeph> or <codeph><i>readOnlyAccess</i></codeph>,
 be sure to allow at least one user full access.</note>
-<p><?Pub Caret1?>See the Javadoc for the utility or <xref href="rdevcsecure131.dita#rdevcsecure131"></xref> for
+<p>See the Javadoc for the utility or <xref href="rdevcsecure131.dita#rdevcsecure131"></xref> for
 more details.</p>
 </conbody>
 </concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure866716.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure866716.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure866716.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure866716.dita Fri May  6 15:46:20 2005
@@ -25,7 +25,7 @@
 is an alpha-numeric string used to generate the encryption key. The length
 of the encryption key depends on the algorithm used:</p>
 <ul>
-<li>AES (128, 192,<?Pub Caret?> and 256 bits)</li>
+<li>AES (128, 192, and 256 bits)</li>
 <li>DES (the default) (56 bits)</li>
 <li>DESede (168 bits)</li>
 <li>All other algorithms (128 bits)</li>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure96815.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure96815.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure96815.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure96815.dita Fri May  6 15:46:20 2005
@@ -31,7 +31,7 @@
 of JCE (such as JCE 1.2). More information on JCE 1.2.1, including a product
 download, can be found at: <synph><var>http://java.sun.com/products/jce/index.html</var></synph>. </p> <p>Any
 attempt to create or access an encrypted database without the libraries for
-an implementation of JCE of the proper version, or without Java<?Pub Caret?>
+an implementation of JCE of the proper version, or without Java
 2 Platform, Standard Edition, v 1.2 (J2SE) or higher, raises an exception;
 you will not be able to create or boot the database.</p> <note>The JCE installation
 documentation describes configuring (registering) the JCE software. You do

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy18639.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy18639.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy18639.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy18639.dita Fri May  6 15:46:20 2005
@@ -30,7 +30,7 @@
 properties can only be set on a system-wide basis. If so, deploy the entire
 system directory along with the properties file. Deploy only those databases
 that you wish to include. Setting properties programmatically can simplify
-this step- you will not have to worry about deploying the system directory/<?Pub Caret?>properties
+this step- you will not have to worry about deploying the system directory/properties
 file.</li>
 </ul>
 <p>Before deploying your application, read <xref href="cdevdvlp19297.dita#cdevdvlp19297"></xref>.</p>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdeploy30736.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdeploy30736.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdeploy30736.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdeploy30736.dita Fri May  6 15:46:20 2005
@@ -31,7 +31,7 @@
 includes Java class files and other resources. Storing application code simplifies
 application deployment, since it reduces the potential for problems with a
 user's class path.</p>
-<p>In an embedded environment, when application logic is stored in the database, <?Pub Caret?><ph
+<p>In an embedded environment, when application logic is stored in the database, <ph
 conref="devconrefs.dita#prod/productshortname"></ph> can access classes loaded
 by the <ph conref="devconrefs.dita#prod/productshortname"></ph> class loader
 from stored jar files. </p>

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

Modified: incubator/derby/docs/trunk/src/devguide/cdevdvlp13018.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdvlp13018.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdvlp13018.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdvlp13018.dita Fri May  6 15:46:20 2005
@@ -27,7 +27,7 @@
 up by specifying a Java <i>system property</i> called <codeph><i>derby.system.home</i></codeph>.
 If you do not specify the system directory when starting up <ph conref="devconrefs.dita#prod/productshortname"></ph>,
 the current directory becomes the system directory.</p>
-<p><?Pub Caret1?><ph conref="devconrefs.dita#prod/productshortname"></ph> uses
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> uses
 the <i>derby.system.home</i> property to determine which directory is its
 system directory - and thus what databases are in its system, where to create
 new databases, and what configuration parameters to use. See <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite> for

Modified: incubator/derby/docs/trunk/src/devguide/cdevdvlp14839.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdvlp14839.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdvlp14839.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdvlp14839.dita Fri May  6 15:46:20 2005
@@ -28,7 +28,7 @@
 tmtype="tm" trademark="Java">Java</tm> 2 Platform, Standard Edition and is
 not specific to <ph conref="devconrefs.dita#prod/productshortname"></ph>. It consists of the <i>java.sql</i> and <i>javax.sql</i> packages,
 which is a set of classes and interfaces that make it possible to access databases
-(from a number of different vendors, not just <ph conref="devconrefs.dita#prod/productshortname"></ph>) from a <?Pub Caret?>Java
+(from a number of different vendors, not just <ph conref="devconrefs.dita#prod/productshortname"></ph>) from a Java
 application.</p>
 <p>To develop <ph conref="devconrefs.dita#prod/productshortname"></ph> applications successfully, you will need to learn JDBC.
 This section does not teach you how to program with the JDBC API.</p>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdvlp27610.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdvlp27610.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdvlp27610.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdvlp27610.dita Fri May  6 15:46:20 2005
@@ -22,7 +22,7 @@
 <prolog><metadata>
 <keywords><indexterm>Derby system</indexterm><indexterm>System directory</indexterm>
 <indexterm>System<indexterm>description</indexterm></indexterm><indexterm>derby.properties
-file</indexterm><indexterm>Properties<indexterm>defined for system in derby<?Pub Caret?>.properties</indexterm></indexterm>
+file</indexterm><indexterm>Properties<indexterm>defined for system in derby.properties</indexterm></indexterm>
 <indexterm>Error log</indexterm><indexterm>derby.log</indexterm></keywords>
 </metadata></prolog>
 <conbody>

Modified: incubator/derby/docs/trunk/src/devguide/cdevdvlp40724.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevdvlp40724.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevdvlp40724.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevdvlp40724.dita Fri May  6 15:46:20 2005
@@ -56,7 +56,7 @@
 information, see <xref href="cdevdeploy11201.dita#cdevdeploy11201"></xref>.</p>
 <fig expanse="column" id="rdevdvlp31476"><title><ph conref="devconrefs.dita#prod/productshortname"></ph> database
 directories contain files and directories used by the software.</title>
-<image href="dbcont.gif" placement="break"><alt>A Derby<?Pub Caret?> database
+<image href="dbcont.gif" placement="break"><alt>A Derby database
 directory containing files and directories.</alt></image>
 </fig>
 <p><ph conref="devconrefs.dita#prod/productshortname"></ph> imposes relatively

Modified: incubator/derby/docs/trunk/src/devguide/cdevresman19524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevresman19524.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevresman19524.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevresman19524.dita Fri May  6 15:46:20 2005
@@ -45,7 +45,7 @@
 Extensions" in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
 <p>This chapter describes the <ph conref="devconrefs.dita#prod/productshortname"></ph> classes that implement the APIs and provides
 some implementation-specific details.</p>
-<note>All of the classes described in this chapter require a Java<?Pub Caret?>
+<note>All of the classes described in this chapter require a Java
 2 Platform, Standard Edition, v 1.2 (J2SE) or higher environment.</note>
 <ul>
 <li><xref href="rdevresman79556.dita#rdevresman79556"></xref></li>

Modified: incubator/derby/docs/trunk/src/devguide/cdevspecial27988.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevspecial27988.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevspecial27988.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevspecial27988.dita Fri May  6 15:46:20 2005
@@ -28,7 +28,7 @@
 <p>Methods invoked within an application are called application-side methods.
 Methods invoked within <ph conref="devconrefs.dita#prod/productshortname"></ph> are
 called database-side procedures.</p>
-<p>An application-<?Pub Caret?>side method can be exactly the same as a database-side
+<p>An application-side method can be exactly the same as a database-side
 procedure. The only difference is where you invoke them. You write the method
 only once. Where you invoke the method-within the application or within an
 SQL statement-determines whether it is an "application-side" or a "database-side"

Modified: incubator/derby/docs/trunk/src/devguide/cdevspecial28907.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevspecial28907.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevspecial28907.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevspecial28907.dita Fri May  6 15:46:20 2005
@@ -27,7 +27,7 @@
 <p>In order to preserve transactional atomicity, database-side JDBC procedures
 that use nested connections: <ul>
 <li>cannot issue a commit or rollback, unless called within a CALL statement.
-  </li><?Pub Caret1?>
+  </li>
 <li>cannot change connection attributes such as auto-commit.  </li>
 <li>cannot modify the data in a table used by the parent statement that called
 the procedure, using INSERT, UPDATE, or DELETE. For example, if a SELECT statement

Modified: incubator/derby/docs/trunk/src/devguide/cdevspecial29620.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevspecial29620.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevspecial29620.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevspecial29620.dita Fri May  6 15:46:20 2005
@@ -23,7 +23,7 @@
 <keywords><indexterm>Nested connections<indexterm>getting</indexterm></indexterm>
 <indexterm>Database-side JDBC procedures<indexterm>using nested connections</indexterm></indexterm>
 <indexterm>Nested connections<indexterm>getting</indexterm></indexterm></keywords>
-</metadata></prolog><?Pub Caret?>
+</metadata></prolog>
 <conbody>
 <p>Most database-side JDBC Procedures need to share the same transaction space
 as the statements that called them for the following reasons:</p>

Modified: incubator/derby/docs/trunk/src/devguide/cdevspecial45786.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevspecial45786.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevspecial45786.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevspecial45786.dita Fri May  6 15:46:20 2005
@@ -30,7 +30,7 @@
 the exception if:</p>
 <ul>
 <li>The exception is an <i>SQLException</i></li>
-<li>The range of the <i>SQLState</i> is 38001-<?Pub Caret?>38999</li>
+<li>The range of the <i>SQLState</i> is 38001-38999</li>
 </ul>
 <p>(This conforms to the SQL99 standard.)</p>
 </conbody>

Modified: incubator/derby/docs/trunk/src/devguide/devconrefs.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/devconrefs.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/devconrefs.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/devconrefs.dita Fri May  6 15:46:20 2005
@@ -18,7 +18,7 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<?Pub Caret?>
+
 <dita>
 <concept id="prod" xml:lang="en-us">
 <title>Product specific entities</title>

Modified: incubator/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita Fri May  6 15:46:20 2005
@@ -27,7 +27,7 @@
 Standard Edition, v 1.4 (J2SE) environments.</note></section>
 <section><p>The holdable cursor feature permits an application to keep cursors
 open after implicit or explicit commits. By default, the cursors are held
-open after a commit. Starting with Java<?Pub Caret?> 2 Platform, Standard
+open after a commit. Starting with Java 2 Platform, Standard
 Edition, v 1.4 (J2SE), cursors can be created with close when a commit occurs
 option. Such cursors will be automatically closed when a commit happens. Cursors
 are automatically closed when a transaction aborts, whether or not they have

Modified: incubator/derby/docs/trunk/src/devguide/rdevcopyright.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcopyright.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcopyright.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcopyright.dita Fri May  6 15:46:20 2005
@@ -29,7 +29,7 @@
 required by applicable law or agreed to in writing, software   distributed
 under the License is distributed on an "AS IS" BASIS,   WITHOUT WARRANTIES
 OR CONDITIONS OF ANY KIND, either express or implied.   See the License for
-the specific language governing permissions and   limitations under the License.<?Pub Caret?></p></section>
+the specific language governing permissions and   limitations under the License.</p></section>
 </refbody>
 </reference>
 <?Pub *0000001046?>

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita Fri May  6 15:46:20 2005
@@ -42,7 +42,7 @@
 </row>
 <row>
 <entry colname="1"><i>derby.authentication.server</i></entry>
-<entry colname="2">For LDAP<?Pub Caret?> user authentication, specifies the
+<entry colname="2">For LDAP user authentication, specifies the
 location of the server.</entry>
 </row>
 <row>

Modified: incubator/derby/docs/trunk/src/devguide/rdevtrademderby.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevtrademderby.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevtrademderby.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevtrademderby.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<?Pub Caret?>
+
 <topic id="rdevtrademderby" xml:lang="en-us">
 <title>Trademarks</title>
 <body>

Modified: incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita Fri May  6 15:46:20 2005
@@ -41,7 +41,7 @@
         "WHERE CURRENT OF UPDATABLESTATEMENT");</codeblock><p>Typically, you
 do not assign a name to the cursor, but let the system generate one for you
 automatically. You can determine the system-generated cursor name of a <i>ResultSet</i> generated
-by a SELECT statement using the <codeph><i>ResultSet</i></codeph> class's <codeph><i>getCursorName</i></codeph> method.</p><?Pub Caret?><codeblock
+by a SELECT statement using the <codeph><i>ResultSet</i></codeph> class's <codeph><i>getCursorName</i></codeph> method.</p><codeblock
 >PreparedStatement ps2 = conn.prepareStatement(
     "UPDATE employee SET bonus = ? WHERE CURRENT OF "+
         Updatable.getCursorName());</codeblock></context>

Modified: incubator/derby/docs/trunk/src/devguide/tdevdeploy26887.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdeploy26887.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdeploy26887.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdeploy26887.dita Fri May  6 15:46:20 2005
@@ -47,7 +47,7 @@
 or to an output stream.</cmd><info>For information, see <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.<codeblock>derby.stream.error.file=c:/temp/mylog.LOG</codeblock
 ></info></step>
 </steps>
-<result>Be sure to set these properties so<?Pub Caret?> that they are deployed
+<result>Be sure to set these properties so that they are deployed
 with the database.  For more information, see <xref href="cdevdeploy18639.dita#cdevdeploy18639"></xref>.</result>
 </taskbody>
 </task>

Modified: incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita Fri May  6 15:46:20 2005
@@ -41,7 +41,7 @@
 jdbc:derby:classpath:/<i>databasePathWithinArchive</i></codeblock></info>
 </step>
 </steps>
-<result> <p>For example:</p><?Pub Caret?><codeblock>jdbc:derby:/products/boiledfood
+<result> <p>For example:</p><codeblock>jdbc:derby:/products/boiledfood
 jdbc:derby:classpath:/products/boiledfood</codeblock></result>
 </taskbody>
 </task>

Modified: incubator/derby/docs/trunk/src/getstart/cgs22227.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgs22227.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgs22227.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgs22227.dita Fri May  6 15:46:20 2005
@@ -16,7 +16,7 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<?Pub Caret?>
+
 <concept id="cgs22227" xml:lang="en-us">
 <title> Read the release notes</title>
 <prolog><metadata>

Modified: incubator/derby/docs/trunk/src/getstart/cgs28881.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgs28881.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgs28881.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgs28881.dita Fri May  6 15:46:20 2005
@@ -16,7 +16,7 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<?Pub Caret?>
+
 <concept id="cgs28881" xml:lang="en-us">
 <title>Browse the Derby documents</title>
 <conbody>

Modified: incubator/derby/docs/trunk/src/getstart/cgs80725.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgs80725.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgs80725.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgs80725.dita Fri May  6 15:46:20 2005
@@ -31,7 +31,7 @@
 <li>Turning off auto-commit</li>
 <li>Creating a table</li>
 <li>Inserting and selecting data</li>
-<li>Dropping a table</li><?Pub Caret?>
+<li>Dropping a table</li>
 <li>Disconnecting</li>
 <li>Shutting down a <ph conref="gsconrefs.dita#prod/productshortname"></ph> system</li>
 </ul></p>

Modified: incubator/derby/docs/trunk/src/getstart/cgschoos.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgschoos.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgschoos.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgschoos.dita Fri May  6 15:46:20 2005
@@ -27,7 +27,7 @@
 in a Java Developer Kit. A JRE contains a JVM and provides the ability to
 run Java applications. However, JREs do not include the tools and utilities
 necessary to develop applications. If you are planning to develop applications,
-you should install a Java Developer Kit.</note></p><?Pub Caret1?>
+you should install a Java Developer Kit.</note></p>
 </conbody>
 </concept>
 <?Pub *0000001953?>

Modified: incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita Fri May  6 15:46:20 2005
@@ -20,7 +20,7 @@
 <title>The Derby documents</title>
 <conbody>
 <p><ph conref="gsconrefs.dita#prod/productshortname"></ph> comes with a complete
-set of documentation that describes <?Pub Caret?><ph conref="gsconrefs.dita#prod/productshortname"></ph> concepts
+set of documentation that describes <ph conref="gsconrefs.dita#prod/productshortname"></ph> concepts
 and tasks, and includes reference information.</p>
 </conbody>
 </concept>

Modified: incubator/derby/docs/trunk/src/getstart/cgsinsta.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsinsta.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsinsta.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsinsta.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 limitations under the License.
 -->
 <concept id="cgsinsta" xml:lang="en-us">
-<title>Installing and working with Derby<?Pub Caret?></title>
+<title>Installing and working with Derby</title>
 <conbody>
 <p>If you are new to <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
 JDBC programming, the following topics will help you begin using the product.

Modified: incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita Fri May  6 15:46:20 2005
@@ -22,7 +22,7 @@
 <p>In order to install <ph conref="gsconrefs.dita#prod/productshortname"></ph> you
 must first download the <ph conref="gsconrefs.dita#prod/productshortname"></ph> zip
 or tar archive from the <ph conref="gsconrefs.dita#prod/productshortname"></ph> web
-site at <xref format="html" href="http://incubator.apache.org/derby/derby_downloads.html"><?Pub Caret?><ph
+site at <xref format="html" href="http://incubator.apache.org/derby/derby_downloads.html"><ph
 conref="gsconrefs.dita#paths/pathdownload"></ph></xref>.</p>
 <p>Extract the file. The contents will be extracted into a directory named <codeph>apache-derby-10.0</codeph> that
 contains two subdirectories:<ol>

Modified: incubator/derby/docs/trunk/src/getstart/cgsintdo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsintdo.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsintdo.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsintdo.dita Fri May  6 15:46:20 2005
@@ -26,9 +26,8 @@
 and runs in the same Java virtual machine (JVM) as the application.</li>
 <li>Embedded in a multiuser application such as a web server, an application
 server, or a shared development environment.</li>
-<li>Embedded in a server framework. <?Pub Caret?>You can use the Network Server
-with the IBM DB2 Universal JDBC driver (see <xref href="rgslib56653.dita#rgslib56653"></xref>)
-or a server of your own choice.</li>
+<li>Embedded in a server framework. You can use the Network Server
+with the Network Client driver or a server of your own choice.</li>
 </ul></p>
 </conbody>
 </concept>

Modified: incubator/derby/docs/trunk/src/getstart/cgsintro.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsintro.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsintro.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsintro.dita Fri May  6 15:46:20 2005
@@ -23,7 +23,7 @@
 <p>Welcome to <ph conref="gsconrefs.dita#prod/productshortname"></ph>! <ph
 conref="gsconrefs.dita#prod/productshortname"></ph> is a relational database
 management system (RDBMS) that is based on <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> and SQL. This section<?Pub Caret?>
+tmtype="tm" trademark="Java">Java</tm> and SQL. This section
 describes <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</p>
 </conbody>
 </concept>

Modified: incubator/derby/docs/trunk/src/getstart/cgsintsr.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsintsr.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsintsr.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsintsr.dita Fri May  6 15:46:20 2005
@@ -18,7 +18,7 @@
  "../dtd/concept.dtd">
 <?Pub Inc?>
 <concept id="cgsinstr" xml:lang="en-us">
-<title>System r<?Pub Caret?>equirements</title>
+<title>System requirements</title>
 <conbody>
 <p><ph conref="gsconrefs.dita#prod/productshortname"></ph> is a database engine
 written completely in Java; it will run in any certified Java Virtual Machine

Modified: incubator/derby/docs/trunk/src/getstart/cgslib19524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgslib19524.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgslib19524.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgslib19524.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 limitations under the License.
 -->
 <concept id="cgslib19524" xml:lang="en-us">
-<title>Derby <?Pub Caret?>libraries and scripts: complete reference </title>
+<title>Derby libraries and scripts: complete reference </title>
 <prolog><metadata>
 <keywords><indexterm>Libraries</indexterm><indexterm>Class path</indexterm>
 </keywords>

Modified: incubator/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita Fri May  6 15:46:20 2005
@@ -21,7 +21,7 @@
 <conbody>
 <p>If you cannot run the scripts for the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools
 and utilities, you must complete certain steps manually. The following topics
-show how to <?Pub Caret?>set your environment and run the tools manually. </p>
+show how to set your environment and run the tools manually. </p>
 </conbody>
 </concept>
 <?Pub *0000001230?>

Modified: incubator/derby/docs/trunk/src/getstart/cgsnsexample.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsnsexample.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsnsexample.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsnsexample.dita Fri May  6 15:46:20 2005
@@ -33,7 +33,7 @@
 DriverManager class or the DataSource class to establish client connections.</p></li>
 <li>Network Server demo <p>This program (NsSample) starts the Network Server
 and shows you how to establish both client/server and embedded connections
-to the same database using the Network Server<?Pub Caret?>, all in one JVM.</p></li>
+to the same database using the Network Server, all in one JVM.</p></li>
 </ul></p>
 </conbody>
 </concept>

Modified: incubator/derby/docs/trunk/src/getstart/cgsquck13780.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsquck13780.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsquck13780.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsquck13780.dita Fri May  6 15:46:20 2005
@@ -30,7 +30,7 @@
 framework itself starts an instance of <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
 runs in an embedded environment. However, the client applications do not run
 in the embedded environment. )</p>
-<p>You can also <?Pub Caret?>embed <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
+<p>You can also embed <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
 any Java server framework. </p>
 <p>See the <cite><ph conref="gsconrefs.dita#pub/citadmin"></ph></cite> for
 more information on how to run <ph conref="gsconrefs.dita#prod/productshortname"></ph> on

Modified: incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita Fri May  6 15:46:20 2005
@@ -21,7 +21,7 @@
 <conbody>
 <p>This chapter is for experienced JDBC programmers who already know how to
 set the class path, how to run a Java program, and how to use a JDBC driver.</p>
-<p>For more detailed information on the topics covered in this section<?Pub Caret?>,
+<p>For more detailed information on the topics covered in this section,
 see the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite> and
 the <cite><ph conref="gsconrefs.dita#pub/citutilities"></ph></cite>.</p>
 </conbody>

Modified: incubator/derby/docs/trunk/src/getstart/cgsquck35643.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsquck35643.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsquck35643.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsquck35643.dita Fri May  6 15:46:20 2005
@@ -26,7 +26,7 @@
 <p>An environment in which only a single application can access a database
 at one time, and no network access occurs. When an application starts an instance
 of <ph conref="gsconrefs.dita#prod/productshortname"></ph> within its JVM,
-the application runs<?Pub Caret?> in an embedded environment. Loading the
+the application runs in an embedded environment. Loading the
 embedded driver starts <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</p>
 </conbody>
 </concept>

Modified: incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita Fri May  6 15:46:20 2005
@@ -26,7 +26,7 @@
 See the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite> for
 more information on <ph conref="gsconrefs.dita#prod/productshortname"></ph> environments.</p>
 <dl><dlentry>
-<dt>client/server environme<?Pub Caret?>nt</dt>
+<dt>client/server environment</dt>
 <dd><p>When multiple applications connect to <ph conref="gsconrefs.dita#prod/productshortname"></ph> over
 the network, they are running in a client/server environment. <ph conref="gsconrefs.dita#prod/productshortname"></ph> runs
 embedded in a server framework that allows multiple network connections. (The

Modified: incubator/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita Fri May  6 15:46:20 2005
@@ -25,7 +25,7 @@
 <ol>
 <li>Simple example</li>
 <li><ph conref="gsconrefs.dita#prod/productshortname"></ph> Network Server
-e<?Pub Caret?>xamples</li>
+examples</li>
 </ol>
 </conbody>
 </concept>

Modified: incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita Fri May  6 15:46:20 2005
@@ -19,7 +19,7 @@
 <concept id="cgsusingsysinfo" xml:lang="en-us">
 <title>Using sysinfo</title>
 <conbody>
-<p><ph conref="gsconrefs.dita#prod/productshortname"></ph>'s sysinfo<?Pub Caret?>
+<p><ph conref="gsconrefs.dita#prod/productshortname"></ph>'s sysinfo
 tool displays information about your Java environment and your version of <ph
 conref="gsconrefs.dita#prod/productshortname"></ph>. The sysinfo script sets
 the appropriate environment variables, including the class path, and executes

Modified: incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita Fri May  6 15:46:20 2005
@@ -42,6 +42,6 @@
 commands to start the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools.</li>
 </ol>
 <p>For more information on scripts, see <xref href="rgslib27507.dita#rgslib27507"></xref>.</p>
-</conbody><?Pub Caret?>
+</conbody>
 </concept>
 <?Pub *0000002628?>

Modified: incubator/derby/docs/trunk/src/getstart/gsconrefs.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/gsconrefs.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/gsconrefs.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/gsconrefs.dita Fri May  6 15:46:20 2005
@@ -57,7 +57,7 @@
 <concept id="paths" xml:lang="en-us">
 <title>Paths</title>
 <conbody>
-<p><ph id="pathdownload">h<?Pub Caret1?>ttp://incubator.apache.org/derby/derby_downloads.html</ph></p>
+<p><ph id="pathdownload">http://incubator.apache.org/derby/derby_downloads.html</ph></p>
 </conbody>
 </concept>
 </dita>

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

Modified: incubator/derby/docs/trunk/src/getstart/rgsdocs10012.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs10012.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs10012.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs10012.dita Fri May  6 15:46:20 2005
@@ -18,7 +18,7 @@
 -->
 <reference id="rgsdocs10012" xml:lang="en-us">
 <title>SQL syntax</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section><p> SQL syntax is presented in modified BNF notation. The meta-symbols
 of BNF are:   <table expanse="column" frame="all" rowheader="firstcol">
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="30*"/>

Modified: incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita Fri May  6 15:46:20 2005
@@ -56,7 +56,7 @@
 (No javadoc is provided for the JDBC API, which is part of the Java™ 2 Platform,
 Standard Edition) For more information about the classes in the API, see the <cite><ph
 conref="gsconrefs.dita#pub/citref"></ph></cite>.</p></dd>
-</dlentry></dl></section><?Pub Caret1?>
+</dlentry></dl></section>
 </refbody>
 </reference>
 <?Pub *0000003532?>

Modified: incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 limitations under the License.
 -->
 <reference id="rgsdocs18277" xml:lang="en-us">
-<title>Typographical c<?Pub Caret?>onventions</title>
+<title>Typographical conventions</title>
 <refbody>
 <section><p>This documentation uses some typographical conventions to highlight
 elements of the SQL language, operating system commands, and the Java programming

Modified: incubator/derby/docs/trunk/src/getstart/rgsdocs37966.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs37966.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs37966.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs37966.dita Fri May  6 15:46:20 2005
@@ -18,7 +18,7 @@
 -->
 <reference id="rgsdocs37966" xml:lang="en-us">
 <title>Documentation conventions</title>
-<refbody><?Pub Caret1?>
+<refbody>
 <section> Terminology, syntax, and typographical conventions of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation.</section>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita Fri May  6 15:46:20 2005
@@ -24,7 +24,7 @@
 <dt>environment</dt>
 <dd>The method your application uses to interact with <ph conref="gsconrefs.dita#prod/productshortname"></ph>.
 An environment is sometimes referred to as a <i>framework</i>. The two types
-of environments are the <i>embedded environment</i> and the <?Pub Caret?><i>client/server
+of environments are the <i>embedded environment</i> and the <i>client/server
 environment.</i></dd>
 </dlentry></dl></p></section>
 </refbody>

Modified: incubator/derby/docs/trunk/src/getstart/rgslib27507.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgslib27507.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgslib27507.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgslib27507.dita Fri May  6 15:46:20 2005
@@ -17,7 +17,7 @@
 limitations under the License.
 -->
 <reference id="rgslib27507" xml:lang="en-us">
-<title>Scripts provided by Derby<?Pub Caret?></title>
+<title>Scripts provided by Derby</title>
 <refbody>
 <section><p><ph conref="gsconrefs.dita#prod/productshortname"></ph> provides
 scripts in the <i>/bin</i> directory. Each script comes in two flavors, one

Modified: incubator/derby/docs/trunk/src/getstart/rgslib46043.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgslib46043.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgslib46043.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgslib46043.dita Fri May  6 15:46:20 2005
@@ -17,49 +17,61 @@
 limitations under the License.
 -->
 <reference id="rgslib46043" xml:lang="en-us">
-<title>Libraries provided by Derby<?Pub Caret?></title>
+<title>Libraries provided by Derby</title>
+<prolog><metadata>
+<keywords><indexterm>derbyclient.jar</indexterm><indexterm>derby.jar</indexterm>
+<indexterm>derbytools.jar</indexterm><indexterm>Sample application libraries</indexterm>
+<indexterm>Sample database libraries</indexterm></keywords>
+</metadata></prolog>
 <refbody>
 <table frame="all">
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="50*"/>
 <colspec colname="2" colnum="2" colwidth="50*"/>
 <thead>
 <row>
-<entry colname="1">Library Name and Path</entry>
+<entry colname="1">Library name and path</entry>
 <entry colname="2">Use</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry nameend="2" namest="1"><b>Engine Libraries. </b>   <p>You always need
+<entry nameend="2" namest="1"><b>Engine libraries</b>   <p>You always need
 this library for embedded environments. For client/server environments, you
 only need this library on the server.</p></entry>
 </row>
 <row>
-<entry colname="1"><indexterm>derby.jar</indexterm>derby.jar</entry>
+<entry colname="1">derby.jar</entry>
 <entry colname="2">For embedded databases </entry>
 </row>
 <row>
-<entry nameend="2" namest="1"><b>Tools Libraries</b>   <p>For embedded environments,
+<entry nameend="2" namest="1"><b>Tools libraries</b>   <p>For embedded environments,
 you need a library in the class path to use a tool. For a client/server environment,
 you need a library on the client only.</p></entry>
 </row>
 <row>
-<entry colname="1"><indexterm>derbytools.jar</indexterm>derbytools.jar</entry>
+<entry colname="1">derbytools.jar</entry>
 <entry colname="2">Required for running all the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools
 (such as ij, dblook, and import/export). </entry>
 </row>
 <row>
-<entry nameend="2" namest="1"><b><ph><indexterm>Sample application libraries</indexterm></ph><ph><indexterm>Sample
-database libraries</indexterm></ph>The Network Server Libraries</b></entry>
+<entry nameend="2" namest="1"><b>The Network Server libraries</b></entry>
 </row>
 <row>
 <entry colname="1">derbynet.jar</entry>
 <entry colname="2">Required to start the <ph conref="gsconrefs.dita#prod/productshortname"></ph> Network
 Server.</entry>
 </row>
+<row>
+<entry nameend="2" namest="1"><b>The Network Client libraries</b></entry>
+</row>
+<row>
+<entry colname="1">derbyclient.jar</entry>
+<entry colname="2">Required to use the <ph conref="gsconrefs.dita#prod/productshortname"></ph> Network
+Client driver.</entry>
+</row>
 </tbody>
 </tgroup>
 </table>
 </refbody>
 </reference>
-<?Pub *0000002480?>
+<?Pub *0000002831?>

Modified: incubator/derby/docs/trunk/src/getstart/rgslib56653.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgslib56653.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgslib56653.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgslib56653.dita Fri May  6 15:46:20 2005
@@ -17,40 +17,17 @@
 limitations under the License.
 -->
 <reference id="rgslib56653" xml:lang="en-us">
-<title> Libraries not provided by Derby<?Pub Caret?></title>
+<title> Libraries not provided by Derby</title>
 <refbody>
-<section><p>The <ph conref="gsconrefs.dita#prod/productshortname"></ph> Network
-Server requires a JDBC client that talks DRDA. The IBM DB2 JDBC Universal
-driver is available for download from <xref format="html" href="http://www.ibm.com/developerworks/cloudscape">IBM
-developerWorks</xref> and includes the two jar files listed in the table below: <table>
-<tgroup cols="2"><colspec colname="col1"/><colspec colname="col2"/>
-<thead>
-<row>
-<entry colname="col1" valign="top">Library name</entry>
-<entry colname="col2" valign="top">Use</entry>
-</row>
-</thead>
-<tbody>
-<row>
-<entry colname="col1">db2jcc.jar</entry>
-<entry colname="col2">Required to use the DB2 JDBC Universal Driver. You need
-to put this jar file in your client class path to run your application.</entry>
-</row>
-<row>
-<entry colname="col1">db2jcc_license_c.jar</entry>
-<entry colname="col2">Required to use the DB2 JDBC Universal Driver. You need
-to put this jar file in the client class path to run your application.</entry>
-</row>
-</tbody>
-</tgroup>
-</table>In a Java Development Kit Version 1.3 environment, some special <ph
-conref="gsconrefs.dita#prod/productshortname"></ph> features require that
-you install additional libraries and place them in your class path (Environments
-using Java Development Kit, Version 1.4 includes all of these libraries): <ul>
+<section><p>In a Java Development Kit Version 1.3 environment,
+some special <ph conref="gsconrefs.dita#prod/productshortname"></ph> features
+require that you install additional libraries and place them in your class
+path (Environments using Java Development Kit, Version 1.4 includes all of
+these libraries): <ul>
 <li>LDAP (see the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite>)</li>
 <li>JTA (see the <cite><ph conref="gsconrefs.dita#pub/citref"></ph></cite>)</li>
 <li>JDBC 2.0 Extensions (see the <cite><ph conref="gsconrefs.dita#pub/citref"></ph></cite>)</li>
 </ul></p></section>
 </refbody>
 </reference>
-<?Pub *0000002580?>
+<?Pub *0000001568?>

Modified: incubator/derby/docs/trunk/src/getstart/rgsquck30197.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsquck30197.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsquck30197.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsquck30197.dita Fri May  6 15:46:20 2005
@@ -30,7 +30,7 @@
 <li><i>databaseName</i>   <p>The name of the database that you want to connect
 to</p></li>
 <li><i>URLAttributes</i>   <p>One or more of the supported attributes of the
-database connection URL, such as ;<i>locale=ll_CC</i> or ;<i>create=true</i>. </p><p><?Pub Caret?>For
+database connection URL, such as ;<i>locale=ll_CC</i> or ;<i>create=true</i>. </p><p>For
 more information, see the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite>.</p></li>
 </ul></p></section>
 </refbody>

Modified: incubator/derby/docs/trunk/src/getstart/rgsquck35368.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsquck35368.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsquck35368.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsquck35368.dita Fri May  6 15:46:20 2005
@@ -24,7 +24,7 @@
 <li>org.apache.derby.jdbc.EmbeddedDriver   <p> A driver for embedded environments,
 when <ph conref="gsconrefs.dita#prod/productshortname"></ph> runs in the same
 JVM as the application.</p></li>
-<li>com.ibm.db2.jcc.DB2Driver   <p>A driver <?Pub Caret?>for the Network Server
+<li>org.apache.derby.jdbc.ClientDriver   <p>A driver for the Network Server
 environment. The Network Server sets up a client/server environment.</p></li>
 </ul></section>
 </refbody>

Modified: incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita Fri May  6 15:46:20 2005
@@ -20,7 +20,7 @@
 <title>Libraries and class path</title>
 <refbody>
 <section><p>See <xref href="cgslib19524.dita#cgslib19524"></xref> in the appendix
-for a complete description of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> <?Pub Caret?>libraries.</p></section>
+for a complete description of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> libraries.</p></section>
 </refbody>
 </reference>
 <?Pub *0000001159?>

Modified: incubator/derby/docs/trunk/src/getstart/rgstrademderby.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgstrademderby.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgstrademderby.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgstrademderby.dita Fri May  6 15:46:20 2005
@@ -16,7 +16,7 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<?Pub Caret?>
+
 <topic id="rgstrademderby" xml:lang="en-us">
 <title>Trademarks</title>
 <body>

Modified: incubator/derby/docs/trunk/src/getstart/tgs26250.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/tgs26250.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/tgs26250.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/tgs26250.dita Fri May  6 15:46:20 2005
@@ -48,7 +48,7 @@
 <substep><cmd>Enter the following in a command window or shell: </cmd><stepxmp><codeblock>java org.apache.derby.tools.ij
 ij&gt; connect 'jdbc:derby:&lt;<i>dbname</i>>;create=true';</codeblock>where &lt;<i>dbname</i>>
 is the name of the database you are connecting to.</stepxmp></substep>
-<substep><cmd>To exit <?Pub Caret?>the ij utility, enter:</cmd><stepxmp><codeblock>ij&gt; exit;</codeblock> </stepxmp>
+<substep><cmd>To exit the ij utility, enter:</cmd><stepxmp><codeblock>ij&gt; exit;</codeblock> </stepxmp>
 </substep>
 </substeps>
 </step>

Modified: incubator/derby/docs/trunk/src/getstart/tgs36360.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/tgs36360.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/tgs36360.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/tgs36360.dita Fri May  6 15:46:20 2005
@@ -22,7 +22,7 @@
 <context> <p>During installation, you chose a base directory where the software
 was installed and should have named it <ph conref="gsconrefs.dita#prod/productinstallname"></ph>.
 This document refers to that directory as the <ph conref="gsconrefs.dita#prod/productshortname"></ph> base
-directory.</p><p>If you plan to use the scripts in the <codeph>/frameworks/embedded/bin</codeph><?Pub Caret?> directory
+directory.</p><p>If you plan to use the scripts in the <codeph>/frameworks/embedded/bin</codeph> directory
 and if your operating system supports it, create an environment variable called <ph
 conref="gsconrefs.dita#prod/productinstallpath"></ph> and set its value to
 the path of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> base



Mime
View raw message