db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scotsmat...@apache.org
Subject svn commit: r522592 [1/2] - /db/derby/docs/trunk/src/adminguide/
Date Mon, 26 Mar 2007 19:03:47 GMT
Author: scotsmatrix
Date: Mon Mar 26 12:03:40 2007
New Revision: 522592

URL: http://svn.apache.org/viewvc?view=rev&rev=522592
Log:
DERBY-1590: Updated the conrefs for the Admin Guide. Patch derby-1590-adminguide.diff submitted by Kim Haase.

Modified:
    db/derby/docs/trunk/src/adminguide/cadminadvtops.dita
    db/derby/docs/trunk/src/adminguide/cadminapps.dita
    db/derby/docs/trunk/src/adminguide/cadminapps49914.dita
    db/derby/docs/trunk/src/adminguide/cadminapps59125.dita
    db/derby/docs/trunk/src/adminguide/cadminapps810777.dita
    db/derby/docs/trunk/src/adminguide/cadminapps811478.dita
    db/derby/docs/trunk/src/adminguide/cadminapps811631.dita
    db/derby/docs/trunk/src/adminguide/cadminapps811656.dita
    db/derby/docs/trunk/src/adminguide/cadminappsclient.dita
    db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita
    db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
    db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
    db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita
    db/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita
    db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita
    db/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita
    db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita
    db/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita
    db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita
    db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita
    db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita
    db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
    db/derby/docs/trunk/src/adminguide/cadminov11108.dita
    db/derby/docs/trunk/src/adminguide/cadminov16172.dita
    db/derby/docs/trunk/src/adminguide/cadminov17524.dita
    db/derby/docs/trunk/src/adminguide/cadminov28261.dita
    db/derby/docs/trunk/src/adminguide/cadminov33597.dita
    db/derby/docs/trunk/src/adminguide/cadminov38650.dita
    db/derby/docs/trunk/src/adminguide/cadminov65220.dita
    db/derby/docs/trunk/src/adminguide/cadminov825125.dita
    db/derby/docs/trunk/src/adminguide/cadminov825149.dita
    db/derby/docs/trunk/src/adminguide/cadminov825266.dita
    db/derby/docs/trunk/src/adminguide/cadminov83312.dita
    db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
    db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita
    db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita
    db/derby/docs/trunk/src/adminguide/cadminpartone.dita
    db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita
    db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita
    db/derby/docs/trunk/src/adminguide/cadminrollforward.dita
    db/derby/docs/trunk/src/adminguide/cadminservlet98430.dita
    db/derby/docs/trunk/src/adminguide/cadminspace21579.dita
    db/derby/docs/trunk/src/adminguide/radminapps810699.dita
    db/derby/docs/trunk/src/adminguide/radminapps811974.dita
    db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
    db/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita
    db/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita
    db/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita
    db/derby/docs/trunk/src/adminguide/radminconsist30301.dita
    db/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita
    db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita
    db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita
    db/derby/docs/trunk/src/adminguide/radminovnssample.dita
    db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita
    db/derby/docs/trunk/src/adminguide/radmintrademderby.dita
    db/derby/docs/trunk/src/adminguide/tadminapps811302.dita
    db/derby/docs/trunk/src/adminguide/tadminapps811345.dita
    db/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita
    db/derby/docs/trunk/src/adminguide/tadminappssettingportnumbers.dita
    db/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita
    db/derby/docs/trunk/src/adminguide/tadminconfig815768.dita
    db/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita
    db/derby/docs/trunk/src/adminguide/tadminconfigsysteminformation.dita
    db/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita
    db/derby/docs/trunk/src/adminguide/tadminlogfile.dita
    db/derby/docs/trunk/src/adminguide/tadminovclirun.dita
    db/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita
    db/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita

Modified: db/derby/docs/trunk/src/adminguide/cadminadvtops.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminadvtops.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminadvtops.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminadvtops.dita Mon Mar 26 12:03:40 2007
@@ -21,6 +21,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This section discusses several advanced topics for users of the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+<p>This section discusses several advanced topics for users of the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminapps.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminapps.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminapps.dita Mon Mar 26 12:03:40 2007
@@ -25,7 +25,7 @@
 </metadata></prolog>
 <conbody>
 <p>This section describes the differences between running <ph
-conref="adminconrefs.dita#prod/productshortname"></ph> in embedded mode and
+conref="../conrefs.dita#prod/productshortname"></ph> in embedded mode and
 using the Network Server. Note that there may be undocumented differences
 that have not yet been identified.</p>
 </conbody>

Modified: db/derby/docs/trunk/src/adminguide/cadminapps49914.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps49914.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminapps49914.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminapps49914.dita Mon Mar 26 12:03:40 2007
@@ -29,13 +29,13 @@
 <indexterm>org.apache.derby.jdbc.ClientDataSource.STRONG_PASSWORD_SUBSTITUTE_SECURITY</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>When running <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
-embedded mode or when using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+<p>When running <ph conref="../conrefs.dita#prod/productshortname"></ph> in
+embedded mode or when using the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server, you can enable or disable server-side user authentication. However,
 when using the Network Server, the default security mechanism (<codeph>CLEAR_TEXT_PASSWORD_SECURITY</codeph>)
 requires that you supply both the user name and password.</p>
 <p>In addition to the default user name and password security mechanism, <i>org.apache.derby.jdbc.ClientDataSource.CLEAR_TEXT_PASSWORD_SECURITY, </i
-> <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server
+> <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server
 supports the following security properties:</p>
 <ul>
 <li>UserID  (<i>org.apache.derby.jdbc.ClientDataSource.USER_ONLY_SECURITY</i>)
@@ -49,7 +49,7 @@
 never sent in any form across the network.</p></li>
 </ul>
 <p>The user's name that is specified upon connection is the default schema
-for the connection, if a schema with that name exists. See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
+for the connection, if a schema with that name exists. See the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite> for
 more information on schema and user names.</p>
 <p>If you specify any other security mechanism, you will receive an exception.</p>
 <p>To change the default, you can specify another security mechanism either
@@ -57,7 +57,7 @@
 the connection. For details, see
 <xref href="cadminappsclientsecurity.dita#cadminappsclientsecurity"></xref> and
 "securityMechanism=value attribute" in the 
-<ph conref="adminconrefs.dita#pub/citref"></ph>.</p>
+<ph conref="../conrefs.dita#pub/citref"></ph>.</p>
 <p>Whether the security mechanism you specify for the client actually takes
 effect depends upon the setting of the 
 <codeph>derby.drda.securityMechanism</codeph> property for the Network Server. 

Modified: db/derby/docs/trunk/src/adminguide/cadminapps59125.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps59125.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminapps59125.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminapps59125.dita Mon Mar 26 12:03:40 2007
@@ -21,6 +21,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p>You must modify Java applications that currently run against <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
-embedded mode so that they work with the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server. The topics in this section discuss these changes.</p>
+<p>You must modify Java applications that currently run against <ph conref="../conrefs.dita#prod/productshortname"></ph> in
+embedded mode so that they work with the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server. The topics in this section discuss these changes.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminapps810777.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps810777.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminapps810777.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminapps810777.dita Mon Mar 26 12:03:40 2007
@@ -24,7 +24,7 @@
 tmtype="reg" trademark="DB2">DB2</tm> Driver for JDBC</title>
 <shortdesc>You can use the <tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg"
 trademark="IBM">IBM</tm> <tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg"
-trademark="DB2">DB2</tm> Driver for JDBC instead of the <ph conref="adminconrefs.dita#prod/productshortname"></ph> network
+trademark="DB2">DB2</tm> Driver for JDBC instead of the <ph conref="../conrefs.dita#prod/productshortname"></ph> network
 client driver to connect to the Network Server. </shortdesc>
 <prolog><metadata>
 <keywords><indexterm>drivers<indexterm>DB2 Driver for JDBC, overview</indexterm></indexterm>
@@ -33,7 +33,7 @@
 </metadata></prolog>
 <conbody>
 <p>You can use the <tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg"
-trademark="DB2">DB2</tm> Driver for JDBC instead of the <ph conref="adminconrefs.dita#prod/productshortname"></ph> network
+trademark="DB2">DB2</tm> Driver for JDBC instead of the <ph conref="../conrefs.dita#prod/productshortname"></ph> network
 client driver to connect to the Network Server. Your application needs to
 load the driver and connection URL that is specific to the Network Server.
 In addition, you specify a user name and password. If you have not set up
@@ -47,7 +47,7 @@
 </ul></p>
 <p>The syntax of the URL that is required to access the Network Server is:</p>
 <codeblock>jdbc:derby:net://&lt;<i>server</i>&gt;[:&lt;<i>port</i>&gt;]/
-&lt;<i>databaseName</i>&gt;[;&lt;<ph conref="adminconrefs.dita#prod/productshortname"></ph> URL attribute&gt;=&lt;value&gt; [;...]]
+&lt;<i>databaseName</i>&gt;[;&lt;<ph conref="../conrefs.dita#prod/productshortname"></ph> URL attribute&gt;=&lt;value&gt; [;...]]
 [:&lt;Universal Driver attribute&gt;=&lt;value&gt;; [...;]]</codeblock>
 <p>After you specify the database name and attributes, you can include attributes
 for the <tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg" trademark="DB2">DB2</tm> Driver
@@ -70,13 +70,13 @@
 by setting the property <i>derby.system.home</i> in either the <codeph><i>derby.properties</i></codeph> file
 or in the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
 trademark="Java">Java</tm> environment when you start the Network Server.
-See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
+See the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite> for
 more information about defining the system home.</dd>
 </dlentry><dlentry>
-<dt><i><ph conref="adminconrefs.dita#prod/productlowercase"></ph> URL attribute=value</i></dt>
+<dt><i><ph conref="../conrefs.dita#prod/productlowercase"></ph> URL attribute=value</i></dt>
 <dd>Optional database connection URL attributes that are supported by <ph
-conref="adminconrefs.dita#prod/productshortname"></ph>. See the <cite><ph
-conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for more information.</dd>
+conref="../conrefs.dita#prod/productshortname"></ph>. See the <cite><ph
+conref="../conrefs.dita#pub/citdevelop"></ph></cite> for more information.</dd>
 </dlentry><dlentry>
 <dt><i>Universal Driver Attribute=value</i></dt>
 <dd><p>Optional database connection URL attributes that are supported by the <tm
@@ -124,7 +124,7 @@
 </dlentry></dl></dd>
 </dlentry></dl>
 <section><title><tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg" trademark="DB2">DB2</tm> Driver
-for JDBC System information</title><p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+for JDBC System information</title><p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server is compatible with the <tm tmclass="ibm" tmowner="IBM Corporation"
 tmtype="reg" trademark="DB2">DB2</tm> Driver for JDBC release 2.4 and higher.</p></section>
 </conbody>

Modified: db/derby/docs/trunk/src/adminguide/cadminapps811478.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps811478.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminapps811478.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminapps811478.dita Mon Mar 26 12:03:40 2007
@@ -25,7 +25,7 @@
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>Both the <ph conref="adminconrefs.dita#prod/productshortname"></ph> embedded
+<p>Both the <ph conref="../conrefs.dita#prod/productshortname"></ph> embedded
 driver and the Network Server provide XA support. The Network Server provides
 DRDA level 7 support. DRDA clients that support XAMGR, such as the
 Derby network client, can send XA requests to

Modified: db/derby/docs/trunk/src/adminguide/cadminapps811631.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps811631.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminapps811631.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminapps811631.dita Mon Mar 26 12:03:40 2007
@@ -23,7 +23,7 @@
 </prolog>
 <conbody>
 <p>When user authentication is enabled in 
-<ph conref="adminconrefs.dita#prod/productshortname"></ph>, you can use any of
+<ph conref="../conrefs.dita#prod/productshortname"></ph>, you can use any of
 the following security mechanisms:</p>
 <ul>
 <li>Clear text user name and password security, the default</li>

Modified: db/derby/docs/trunk/src/adminguide/cadminapps811656.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps811656.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminapps811656.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminapps811656.dita Mon Mar 26 12:03:40 2007
@@ -22,8 +22,8 @@
 <prolog>
 </prolog>
 <conbody>
-<p>When user authentication is turned off in <ph conref="adminconrefs.dita#prod/productshortname"></ph>, you can use any
+<p>When user authentication is turned off in <ph conref="../conrefs.dita#prod/productshortname"></ph>, you can use any
 of the security mechanism options.</p>
 <p>You must provide a user and password for all security mechanisms except <i>USER_ONLY_SECURITY</i>. However, because user authentication
-is disabled in the <ph conref="adminconrefs.dita#prod/productshortname"></ph> server, the user name and password that you supply does not have to be one recognized as valid by <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</p>
+is disabled in the <ph conref="../conrefs.dita#prod/productshortname"></ph> server, the user name and password that you supply does not have to be one recognized as valid by <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminappsclient.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclient.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclient.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclient.dita Mon Mar 26 12:03:40 2007
@@ -30,7 +30,7 @@
 <p>The syntax of the URL that is required to access the Network Server is:<codeblock>jdbc:derby://&lt;<i>server</i>&gt;[:&lt;<i>port</i>&gt;]/
 &lt;<i>databaseName</i>&gt;[;&lt;URL attribute&gt;=&lt;value&gt; [;...]]
 </codeblock>where the <codeph>&lt;URL attribute&gt;</codeph> is either a <ph
-conref="adminconrefs.dita#prod/productshortname"></ph> embedded or network
+conref="../conrefs.dita#prod/productshortname"></ph> embedded or network
 client attribute.</p>
 <table><title>Standard JDBC DataSource properties</title>
 <tgroup cols="5"><colspec colname="col1" colwidth="110*"/><colspec colname="col2"
@@ -184,11 +184,11 @@
 <row>
 <entry colname="col1">connectionAttributes</entry>
 <entry colname="col2">String</entry>
-<entry colname="COLSPEC2">Set to the list of <ph conref="adminconrefs.dita#prod/productshortname"></ph> embedded
+<entry colname="COLSPEC2">Set to the list of <ph conref="../conrefs.dita#prod/productshortname"></ph> embedded
 connection attributes separated by semicolons.</entry>
 <entry colname="col3">Various</entry>
 <entry colname="COLSPEC3">This property is also available using EmbeddedDataSource.
-See the <ph conref="adminconrefs.dita#pub/citref"></ph> for more information
+See the <ph conref="../conrefs.dita#pub/citref"></ph> for more information
 about the various connection attributes.</entry>
 </row>
 </tbody>

Modified: db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita Mon Mar 26 12:03:40 2007
@@ -24,7 +24,7 @@
 driver</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>The following are known differences that exist between the <ph conref="adminconrefs.dita#prod/productshortname"></ph> embedded
+<p>The following are known differences that exist between the <ph conref="../conrefs.dita#prod/productshortname"></ph> embedded
 driver and the network client driver. Note that there may be undocumented
 differences that have not yet been identified. Some differences with the network
 client may be changed in future releases to match the embedded driver functionality.<ul>

Modified: db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita Mon Mar 26 12:03:40 2007
@@ -19,7 +19,7 @@
 -->
 <reference id="cadminappsclientsecurity" xml:lang="en-us">
 <title>Network client security</title>
-<shortdesc>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Client allows you to select a security mechanism by specifying a value for
 the <codeph>securityMechanism</codeph> property.</shortdesc>
 <prolog><metadata>
@@ -35,7 +35,7 @@
 and deploy your own DataSource objects, invoke the <codeph>DataSource.setSecurityMechanism</codeph> method
 after you create a DataSource object.</li>
 </ul><xref href="cadminappsclientsecurity.dita#cadminappsclientsecurity/radminappsclientsecuritytable"></xref> lists
-the security mechanisms that the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+the security mechanisms that the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Client supports, and the corresponding property value to specify to obtain
 this securityMechanism. The default security mechanism is the user id only
 if no password is set. If the password is set, the default security mechanism

Modified: db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita Mon Mar 26 12:03:40 2007
@@ -19,7 +19,7 @@
 -->
 <reference id="cadminappsclienttracing" xml:lang="en-us">
 <title>Network client tracing</title>
-<shortdesc>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 client provides a tracing facility to collect JDBC trace information and view
 protocol flows.</shortdesc>
 <prolog><metadata>

Modified: db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita Mon Mar 26 12:03:40 2007
@@ -23,7 +23,7 @@
 <title>The Network Server and JVMs</title>
 <prolog></prolog>
 <conbody>
-<p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server is compatible with <ph><tm tmclass="special" tmowner="Sun Microsystems, Inc."
+<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server is compatible with <ph><tm tmclass="special" tmowner="Sun Microsystems, Inc."
 tmtype="tm" trademark="Java">Java</tm> 2 Platform, Standard Edition, v 1.3.1
 (J2SE)</ph> and above.</p>
 </conbody>

Modified: db/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita Mon Mar 26 12:03:40 2007
@@ -21,6 +21,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> tools <codeph>ij</codeph> and <codeph>dblook</codeph> work in embedded
+<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> tools <codeph>ij</codeph> and <codeph>dblook</codeph> work in embedded
 mode and client/server mode.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita Mon Mar 26 12:03:40 2007
@@ -19,8 +19,8 @@
 -->
 <concept id="cadminconfig86869" xml:lang="en-us">
 <title>Managing the Derby Network Server</title>
-<shortdesc>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server can run as a stand-alone server, with <ph conref="adminconrefs.dita#prod/productshortname"></ph> as
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server can run as a stand-alone server, with <ph conref="../conrefs.dita#prod/productshortname"></ph> as
 an embedded part of the application. </shortdesc>
 <prolog></prolog>
 <conbody>

Modified: db/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita Mon Mar 26 12:03:40 2007
@@ -21,11 +21,11 @@
 <title>Overview</title>
 <prolog></prolog>
 <conbody>
-<p>You start the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server using the command line or using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Server
-API. (<ph conref="adminconrefs.dita#prod/productshortname"></ph> provides
+<p>You start the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server using the command line or using the <ph conref="../conrefs.dita#prod/productshortname"></ph> Server
+API. (<ph conref="../conrefs.dita#prod/productshortname"></ph> provides
 scripts for you to use to start the server from the command line.) Before
-starting the server, you will probably set certain <ph conref="adminconrefs.dita#prod/productshortname"></ph> and
+starting the server, you will probably set certain <ph conref="../conrefs.dita#prod/productshortname"></ph> and
 Network Server properties.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita Mon Mar 26 12:03:40 2007
@@ -27,7 +27,7 @@
 </metadata></prolog>
 <conbody>
 <p>Typically, these procedures are used to speed up the copy operation involved
-in an online backup. In this scenario, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does
+in an online backup. In this scenario, <ph conref="../conrefs.dita#prod/productshortname"></ph> does
 not perform the copy operation for you. You use the SYSCS_UTIL.SYSCS_FREEZE_DATABASE
 procedure to lock the database, and then you explicitly copy the database
 directory by using operating system commands. </p>
@@ -43,7 +43,7 @@
 system procedure to continue working with the database. Only after SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE
 has been specified can transactions once again write to the database. Read
 operations can proceed while the database is "frozen."</p>
-<note>To ensure a consistent backup of the database, <ph conref="adminconrefs.dita#prod/productshortname"></ph> might
+<note>To ensure a consistent backup of the database, <ph conref="../conrefs.dita#prod/productshortname"></ph> might
 block applications that attempt to write to a frozen database until the backup
 is completed and the SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE system procedure is
 called.</note>

Modified: db/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita Mon Mar 26 12:03:40 2007
@@ -20,7 +20,7 @@
 -->
 <concept id="cadminhubbkup98797" xml:lang="en-us">
 <title>Backing up and restoring databases</title>
-<shortdesc><ph conref="adminconrefs.dita#prod/productshortname"></ph> provides
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> provides
 a way to back up a database while it is online. You can also restore a full
 backup from a specified location.</shortdesc>
 <prolog><metadata>

Modified: db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita Mon Mar 26 12:03:40 2007
@@ -25,7 +25,7 @@
 to help minimize</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> provides a tool
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides a tool
 to monitor and display locking information. This tool can help you create
 applications that minimize deadlock. It can also help you locate the cause
 of deadlock when it does occur.</p>

Modified: db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita Mon Mar 26 12:03:40 2007
@@ -44,8 +44,8 @@
 <note>Use derby.locks.deadlockTrace with care. Setting this property
 can alter the timing of the application, severely affect performance, and
 produce a very large derby.log file.</note>
-<p>For information about how to set properties, and information about the specific properties that are mentioned in this topic, see <cite><ph conref="adminconrefs.dita#pub/cittuning"></ph></cite>.</p>
-<p>Here is an example of an error message when <ph conref="adminconrefs.dita#prod/productshortname"></ph> aborts
+<p>For information about how to set properties, and information about the specific properties that are mentioned in this topic, see <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p>
+<p>Here is an example of an error message when <ph conref="../conrefs.dita#prod/productshortname"></ph> aborts
 a transaction because of a deadlock:</p>
 <codeblock>--SQLException Caught--
 
@@ -59,10 +59,10 @@
 Waiting XID : {758, U} , APP, update employee set bonus=150 where salary=23840
 Granted XID : {752, X} The selected victim is XID : 752</codeblock>
 <note>You can use the derby.locks.waitTimeout and derby.locks.deadlockTimeout properties
-to configure how long <ph conref="adminconrefs.dita#prod/productshortname"></ph> waits
+to configure how long <ph conref="../conrefs.dita#prod/productshortname"></ph> waits
 for a lock to be released, or when to begin deadlock checking. For more information
-about these properties, see the section that discusses controlling <ph conref="adminconrefs.dita#prod/productshortname"></ph> application
-behavior in the <i><ph conref="adminconrefs.dita#pub/citdevelop"></ph></i>.</note>
+about these properties, see the section that discusses controlling <ph conref="../conrefs.dita#prod/productshortname"></ph> application
+behavior in the <i><ph conref="../conrefs.dita#pub/citdevelop"></ph></i>.</note>
 </conbody>
 </concept>
 

Modified: db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita Mon Mar 26 12:03:40 2007
@@ -24,7 +24,7 @@
 Server<indexterm>and security changes</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>By default, the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+<p>By default, the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server will only listen on the localhost. Clients must use the localhost host
 name to connect. By default, clients cannot access the Network Server from
 another host. To enable connections from other hosts, set the derby.drda.host

Modified: db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita Mon Mar 26 12:03:40 2007
@@ -21,7 +21,7 @@
 <title>Accessing the Network Server by using a DataSource</title>
 <prolog></prolog>
 <conbody>
-<p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Client driver DataSources
 <codeph>org.apache.derby.jdbc.ClientDataSource</codeph> and
 <codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph>

Modified: db/derby/docs/trunk/src/adminguide/cadminov11108.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov11108.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov11108.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov11108.dita Mon Mar 26 12:03:40 2007
@@ -21,5 +21,5 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This section describes how to use <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a multi-user (or "server") environment.</p>
+<p>This section describes how to use <ph conref="../conrefs.dita#prod/productshortname"></ph> in a multi-user (or "server") environment.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov16172.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov16172.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov16172.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov16172.dita Mon Mar 26 12:03:40 2007
@@ -23,7 +23,7 @@
 <keywords><indexterm>Isolation levels</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> supports SERIALIZABLE
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> supports SERIALIZABLE
 (RR), REPEATABLE (RS), READ COMMITTED (CS), and READ UNCOMMITTED (UR) isolation
 levels.</p>
 <dl><dlentry>
@@ -41,8 +41,8 @@
 <dd>UR provides maximum concurrency, if uncommitted values are allowed in
 the query. It is typically used if approximate results are acceptable.</dd>
 </dlentry></dl>
-<p>See "Types and Scope of Locks in <ph conref="adminconrefs.dita#prod/productshortname"></ph> Systems"
-in the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
+<p>See "Types and Scope of Locks in <ph conref="../conrefs.dita#prod/productshortname"></ph> Systems"
+in the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite> for
 more information.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov17524.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov17524.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov17524.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov17524.dita Mon Mar 26 12:03:40 2007
@@ -21,20 +21,20 @@
 <title>Derby in a server framework</title>
 <prolog></prolog>
 <conbody>
-<p>In a sense, <ph conref="adminconrefs.dita#prod/productshortname"></ph> is
+<p>In a sense, <ph conref="../conrefs.dita#prod/productshortname"></ph> is
 always an embedded product. You can embed it in an application in which users
 access the database from a single JVM or you can embed it in a server framework
-(an application that allows users from different JVMs to connect to <ph conref="adminconrefs.dita#prod/productshortname"></ph> simultaneously).
-When <ph conref="adminconrefs.dita#prod/productshortname"></ph> is embedded
-in an application, the local JDBC driver calls the local <ph conref="adminconrefs.dita#prod/productshortname"></ph> database.
-When <ph conref="adminconrefs.dita#prod/productshortname"></ph> is embedded
+(an application that allows users from different JVMs to connect to <ph conref="../conrefs.dita#prod/productshortname"></ph> simultaneously).
+When <ph conref="../conrefs.dita#prod/productshortname"></ph> is embedded
+in an application, the local JDBC driver calls the local <ph conref="../conrefs.dita#prod/productshortname"></ph> database.
+When <ph conref="../conrefs.dita#prod/productshortname"></ph> is embedded
 in a server framework, the server framework's connectivity software provides
 data to multiple client JDBC applications over a network or the Internet.</p>
 <p>For local or remote multi-user connectivity (multiple users who access <ph
-conref="adminconrefs.dita#prod/productshortname"></ph> from different JVMs),
-use the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+conref="../conrefs.dita#prod/productshortname"></ph> from different JVMs),
+use the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server. If you require features that are not included in the Network Server,
-you can embed the basic <ph conref="adminconrefs.dita#prod/productshortname"></ph> product
+you can embed the basic <ph conref="../conrefs.dita#prod/productshortname"></ph> product
 in another server framework.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov28261.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov28261.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov28261.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov28261.dita Mon Mar 26 12:03:40 2007
@@ -25,13 +25,13 @@
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>To support multi-user access, <ph conref="adminconrefs.dita#prod/productshortname"></ph> utilizes
-row-level locking. However, you can configure <ph conref="adminconrefs.dita#prod/productshortname"></ph> to
+<p>To support multi-user access, <ph conref="../conrefs.dita#prod/productshortname"></ph> utilizes
+row-level locking. However, you can configure <ph conref="../conrefs.dita#prod/productshortname"></ph> to
 use table-level locking in environments that have few concurrent transactions
 (for example, a read-only database) . Table-level locking is preferable if
 there are few or no writes to the server, while row-level locking is essential
 for good performance if many clients write to the server concurrently. The <ph
-conref="adminconrefs.dita#prod/productshortname"></ph> optimizer tunes lock
+conref="../conrefs.dita#prod/productshortname"></ph> optimizer tunes lock
 choice for queries automatically.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov33597.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov33597.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov33597.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov33597.dita Mon Mar 26 12:03:40 2007
@@ -21,5 +21,5 @@
 <prolog>
 </prolog>
 <conbody>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> contains some features that are useful for developing multi-user applications.</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> contains some features that are useful for developing multi-user applications.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov38650.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov38650.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov38650.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov38650.dita Mon Mar 26 12:03:40 2007
@@ -21,7 +21,7 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This guide assumes that you are familiar with <ph conref="adminconrefs.dita#prod/productshortname"></ph> features and tuning. Before reading this guide, you should first learn about basic <ph conref="adminconrefs.dita#prod/productshortname"></ph> functionality
-by reading the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite>. Also, because multi-user environments typically
-have performance and tuning issues, you should read <cite><ph conref="adminconrefs.dita#pub/cittuning"></ph></cite>.</p>
+<p>This guide assumes that you are familiar with <ph conref="../conrefs.dita#prod/productshortname"></ph> features and tuning. Before reading this guide, you should first learn about basic <ph conref="adminconrefs.dita#prod/productshortname"></ph> functionality
+by reading the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite>. Also, because multi-user environments typically
+have performance and tuning issues, you should read <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov65220.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov65220.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov65220.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov65220.dita Mon Mar 26 12:03:40 2007
@@ -27,8 +27,8 @@
 </metadata>
 </prolog>
 <conbody>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> allows multiple simultaneous connections to a database, even
-in embedded mode. <ph conref="adminconrefs.dita#prod/productshortname"></ph> is also fully multi-threaded, and you can have
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> allows multiple simultaneous connections to a database, even
+in embedded mode. <ph conref="../conrefs.dita#prod/productshortname"></ph> is also fully multi-threaded, and you can have
 multiple threads active at the same time. However, JDBC semantics impose some
-limitations on multi-threading. See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for more information.</p>
+limitations on multi-threading. See the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite> for more information.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov825125.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov825125.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov825125.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov825125.dita Mon Mar 26 12:03:40 2007
@@ -21,25 +21,25 @@
 <title>Connectivity configurations</title>
 <prolog></prolog>
 <conbody>
-<p>There are several ways to embed <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
+<p>There are several ways to embed <ph conref="../conrefs.dita#prod/productshortname"></ph> in
 a server framework:</p>
 <dl><dlentry>
 <dt>Use the Network Server</dt>
 <dd>This is the easiest way to provide connectivity to multiple users who
-are accessing <ph conref="adminconrefs.dita#prod/productshortname"></ph> databases
-from different JVMs. The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server provides this kind of connectivity to <ph conref="adminconrefs.dita#prod/productshortname"></ph> databases
+are accessing <ph conref="../conrefs.dita#prod/productshortname"></ph> databases
+from different JVMs. The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server provides this kind of connectivity to <ph conref="../conrefs.dita#prod/productshortname"></ph> databases
 within a single system or over a network.</dd>
 </dlentry><dlentry>
 <dt>Purchase another server framework</dt>
-<dd>You can use <ph conref="adminconrefs.dita#prod/productshortname"></ph> within
+<dd>You can use <ph conref="../conrefs.dita#prod/productshortname"></ph> within
 many server frameworks, such as IBM WebSphere Application Server.</dd>
 </dlentry><dlentry>
 <dt>Write your own framework</dt>
-<dd><ph conref="adminconrefs.dita#prod/productshortname"></ph>'s flexibility
+<dd><ph conref="../conrefs.dita#prod/productshortname"></ph>'s flexibility
 allows other configurations as well. For example, rather than embedding <ph
-conref="adminconrefs.dita#prod/productshortname"></ph> in a server that communicates
-with a client that uses JDBC, you can embed <ph conref="adminconrefs.dita#prod/productshortname"></ph> within
+conref="../conrefs.dita#prod/productshortname"></ph> in a server that communicates
+with a client that uses JDBC, you can embed <ph conref="../conrefs.dita#prod/productshortname"></ph> within
 a servlet in a web server that communicates with a browser using HTTP.</dd>
 </dlentry></dl>
 </conbody>

Modified: db/derby/docs/trunk/src/adminguide/cadminov825149.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov825149.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov825149.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov825149.dita Mon Mar 26 12:03:40 2007
@@ -21,5 +21,5 @@
 <prolog>
 </prolog>
 <conbody>
-<p>Because <ph conref="adminconrefs.dita#prod/productshortname"></ph> is written in Java, you have great flexibility in how you choose to configure your deployment. For example, you can run <ph conref="adminconrefs.dita#prod/productshortname"></ph>, the JDBC server framework, and another application in the same JVM as a single process.</p>
+<p>Because <ph conref="../conrefs.dita#prod/productshortname"></ph> is written in Java, you have great flexibility in how you choose to configure your deployment. For example, you can run <ph conref="adminconrefs.dita#prod/productshortname"></ph>, the JDBC server framework, and another application in the same JVM as a single process.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminov825266.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov825266.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov825266.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov825266.dita Mon Mar 26 12:03:40 2007
@@ -21,27 +21,27 @@
 <title>The Derby Network Server</title>
 <prolog></prolog>
 <conbody>
-<p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server provides multi-user connectivity to <ph conref="adminconrefs.dita#prod/productshortname"></ph> databases
+<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server provides multi-user connectivity to <ph conref="../conrefs.dita#prod/productshortname"></ph> databases
 within a single system or over a network. The Network Server uses the standard
 Distributed Relational Database Architecture (DRDA) protocol to receive and
-reply to queries from clients. Databases are accessed through the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server by using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+reply to queries from clients. Databases are accessed through the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server by using the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Client driver.</p>
 <p>The Network Server is a solution for multiple JVMs that connect to the
 database, unlike the embedded scenario where only one JVM runs as part of
-the system. When <ph conref="adminconrefs.dita#prod/productshortname"></ph> is
+the system. When <ph conref="../conrefs.dita#prod/productshortname"></ph> is
 embedded in a single-JVM application, the embedded JDBC driver calls the local <ph
-conref="adminconrefs.dita#prod/productshortname"></ph> database. When <ph
-conref="adminconrefs.dita#prod/productshortname"></ph> is embedded in a server
+conref="../conrefs.dita#prod/productshortname"></ph> database. When <ph
+conref="../conrefs.dita#prod/productshortname"></ph> is embedded in a server
 framework, the server framework's connectivity software provides data to multiple
 client JDBC applications over a network or the Internet.</p>
-<p>To run the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+<p>To run the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server, you need to install the following files:<ul>
 <li>On the server side, install <filepath>derby.jar</filepath> and <filepath>derbynet.jar</filepath>.</li>
 <li>On the client side, install <filepath>derbyclient.jar</filepath>.</li>
 </ul></p>
-<p>There are several ways to manage the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+<p>There are several ways to manage the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server, including:</p>
 <ul>
 <li>Through the command line</li>
@@ -51,8 +51,8 @@
 <li>By setting Network Server properties</li>
 </ul>
 <p><xref href="cadminapps59125.dita#cadminapps59125"></xref> explains how
-to change existing Java applications that currently run against <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
-embedded mode to run against the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+to change existing Java applications that currently run against <ph conref="../conrefs.dita#prod/productshortname"></ph> in
+embedded mode to run against the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server.</p>
 <p><xref href="cadminconfig86869.dita#cadminconfig86869"></xref> explains
 how to manage the Network Server by using the command line, including starting
@@ -60,10 +60,10 @@
 <p><xref href="cadminservlet98430.dita#cadminservlet98430"></xref> explains
 how to use the servlet interface to manage the Network Server.</p>
 <p><xref href="cadminadvtops.dita#cadminadvtops"></xref> contains advanced
-topics for <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+topics for <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server users.</p>
 <p>Because of the differences in JDBC drivers that are used, you might encounter
-differences in functionality when running <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
+differences in functionality when running <ph conref="../conrefs.dita#prod/productshortname"></ph> in
 the Network Server framework as opposed to running it embedded in a user application.
 Refer to <xref href="cadminapps59125.dita#cadminapps59125"></xref> for a complete
 list of the differences between embedded and Network Server configurations.</p>

Modified: db/derby/docs/trunk/src/adminguide/cadminov83312.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov83312.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov83312.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov83312.dita Mon Mar 26 12:03:40 2007
@@ -21,7 +21,7 @@
 <prolog>
 </prolog>
 <conbody>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> provides some tools and features to assist database administrators, including:</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides some tools and features to assist database administrators, including:</p>
 <ul>
 <li>Consistency checker</li>
 <li>Online backup</li>

Modified: db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita Mon Mar 26 12:03:40 2007
@@ -27,7 +27,7 @@
 </prolog>
 <conbody>
 <p>The SimpleNetworkClientSample program is a client
-program that interacts with the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server from another JVM.
+program that interacts with the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server from another JVM.
 The program performs the following tasks:
 <ul>
 <li>Loads the network client driver. (Note that this step is not
@@ -38,7 +38,7 @@
 <li>Tests the database connections by running a sample query.</li>
 <li>Closes the connections and then exits the program.</li>
 </ul></p>
-<p>You must install the following files in the <codeph>%<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph> directory before you can run the sample program:
+<p>You must install the following files in the <codeph>%<ph conref="../conrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph> directory before you can run the sample program:
 <ul>
 <li>The source file: <filepath>SimpleNetworkClientSample.java.</filepath></li>
 <li>The compiled class file: <filepath>SimpleNetworkClientSample.class.</filepath></li>

Modified: db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita Mon Mar 26 12:03:40 2007
@@ -19,7 +19,7 @@
 -->
 <concept id="cadminovntsrvsample" xml:lang="en-us">
 <title>Network Server sample programs for embedded and client connections</title>
-<shortdesc>This <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+<shortdesc>This <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server sample program demonstrates how to obtain an embedded connection and
 client connections to the same database by using the Network Server. This
 program shows how to use either the DriverManager or a DataSource to obtain

Modified: db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita Mon Mar 26 12:03:40 2007
@@ -25,11 +25,11 @@
 </metadata>
 </prolog>
 <conbody>
-<p>The SimpleNetworkServerSample program starts the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+<p>The SimpleNetworkServerSample program starts the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Server, as well as the embedded driver, and waits for clients to connect. The
 program performs the following tasks.
 <ul>
-<li>Starts the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server by using a property and also loads the embedded driver</li>
+<li>Starts the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server by using a property and also loads the embedded driver</li>
 <li>Determines if the Network Server is running</li>
 <li>Creates the NSSimpleDB database if it is not already
 created</li>
@@ -41,7 +41,7 @@
 <li>Shuts down the Network Server before exiting the program</li>
 </ul></p>
 <p> To run the sample program, install the following files in
-the <codeph>%<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph> directory:
+the <codeph>%<ph conref="../conrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph> directory:
 <ul>
 <li>The source file: <filepath>SimpleNetworkServerSample.java</filepath></li>
 <li>The compiled class file: <filepath>SimpleNetworkServerSample.class</filepath></li>

Modified: db/derby/docs/trunk/src/adminguide/cadminpartone.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminpartone.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminpartone.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminpartone.dita Mon Mar 26 12:03:40 2007
@@ -21,6 +21,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This part of the guide explains the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server and other server frameworks.
+<p>This part of the guide explains the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server and other server frameworks.
 </p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita Mon Mar 26 12:03:40 2007
@@ -22,13 +22,13 @@
 <title>Purpose of this guide</title>
 <prolog></prolog>
 <conbody>
-<p>This guide explains how to use <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a multiple-client environment.
+<p>This guide explains how to use <ph conref="../conrefs.dita#prod/productshortname"></ph> in a multiple-client environment.
 It also provides information that a server administrator might need to keep
-<ph conref="adminconrefs.dita#prod/productshortname"></ph> running with a high level of performance and reliability in a server framework
-or in a multiple-client application server environment (When running in embedded mode, <ph conref="adminconrefs.dita#prod/productshortname"></ph>
+<ph conref="../conrefs.dita#prod/productshortname"></ph> running with a high level of performance and reliability in a server framework
+or in a multiple-client application server environment (When running in embedded mode, <ph conref="../conrefs.dita#prod/productshortname"></ph>
 databases typically do not need any administration).</p>
-<p>To connect multiple clients with <ph conref="adminconrefs.dita#prod/productshortname"></ph>, you can embed <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a server
-framework that you choose, or you can use the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server. This
+<p>To connect multiple clients with <ph conref="../conrefs.dita#prod/productshortname"></ph>, you can embed <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a server
+framework that you choose, or you can use the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server. This
 guide describes these options.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita Mon Mar 26 12:03:40 2007
@@ -22,13 +22,13 @@
 </prolog>
 <conbody>
 <p>This guide includes the following two parts:</p>
-<p>Part one: <ph conref="adminconrefs.dita#prod/productshortname"></ph> Server Guide</p>
+<p>Part one: <ph conref="../conrefs.dita#prod/productshortname"></ph> Server Guide</p>
 <ul>
 <li><i><xref href="cadminov11108.dita#cadminov11108"/></i>  
-<p>Describes the different options for embedding <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a server framework and
+<p>Describes the different options for embedding <ph conref="../conrefs.dita#prod/productshortname"></ph> in a server framework and
 explains the Network Server option.</p></li>
 <li><i><xref href="cadminapps59125.dita#cadminapps59125"/></i>  
-<p>Describes how to change existing <ph conref="adminconrefs.dita#prod/productshortname"></ph> applications to work with the
+<p>Describes how to change existing <ph conref="../conrefs.dita#prod/productshortname"></ph> applications to work with the
 Network Server.</p></li>
 <li><i><xref href="cadminconfig86869.dita#cadminconfig86869"/></i>  
 <p>Describes how to use shell scripts, the command
@@ -37,12 +37,12 @@
 <p>Describes how to use the servlet interface to manage the Network Server.</p></li>
 <li><i><xref href="cadminadvtops.dita#cadminadvtops"/></i> 
 <p>Describes
-advanced topics for <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server users.</p></li>
+advanced topics for <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server users.</p></li>
 </ul>
-<p>Part two: <ph conref="adminconrefs.dita#prod/productshortname"></ph> Administration Guide</p>
+<p>Part two: <ph conref="../conrefs.dita#prod/productshortname"></ph> Administration Guide</p>
 <ul>
 <li><i><xref href="cadminconsist01.dita#cadminconsist01"/></i>  
-<p>Describes how to check the consistency of <ph conref="adminconrefs.dita#prod/productshortname"></ph> databases.</p></li>
+<p>Describes how to check the consistency of <ph conref="../conrefs.dita#prod/productshortname"></ph> databases.</p></li>
 <li><i><xref href="cadminhubbkup98797.dita#cadminhubbkup98797"/></i>  
 <p>Describes how to back up a database when it is online.</p></li>
 <li><i><xref href="cadminlog98.dita#cadminlog98"/></i>  

Modified: db/derby/docs/trunk/src/adminguide/cadminrollforward.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminrollforward.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminrollforward.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminrollforward.dita Mon Mar 26 12:03:40 2007
@@ -20,7 +20,7 @@
 -->
 <concept id="cadminrollforward" xml:lang="en-us">
 <title>Roll-forward recovery</title>
-<shortdesc><ph conref="adminconrefs.dita#prod/productshortname"></ph> supports
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> supports
 roll-forward recovery to restore a damaged database to the most recent state
 before a failure occurred.</shortdesc>
 <prolog><metadata>
@@ -30,7 +30,7 @@
 recovery</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> restores a database
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> restores a database
 from full backup and replays all the transactions after the backup. All the
 log files after a backup are required to replay the transactions after the
 backup. By default, the database keeps only logs that are required for crash-recovery.
@@ -40,7 +40,7 @@
 <p>In roll-forward recovery the log archival mode ensures that all old log
 files are available. The log files are available only from the time that the
 log archival mode is enabled. </p>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> uses the following
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> uses the following
 information to restore the database: <ul>
 <li>The backup copy of the database</li>
 <li>The set of archived logs</li>
@@ -52,7 +52,7 @@
 have a backup copy of the database, all the archived logs since the backup
 was created, and the active log files. All the log files should be in the
 database log directory.</p>
-<p>There are two types of log files in <ph conref="adminconrefs.dita#prod/productshortname"></ph>:
+<p>There are two types of log files in <ph conref="../conrefs.dita#prod/productshortname"></ph>:
 active logs and online archived logs.</p>
 <dl><dlentry>
 <dt>Active logs</dt>
@@ -131,7 +131,7 @@
 URL:</p>
 <p><i>rollForwardRecoveryFrom=&lt;Path&gt;</i></p>
 <p>For more information, see the rollForwardRecoveryFrom=&lt;Path&gt; section
-in the <ph conref="adminconrefs.dita#pub/citref"></ph>.</p>
+in the <ph conref="../conrefs.dita#pub/citref"></ph>.</p>
 <p>After a database is restored from full backup, transactions from the online
 archived logs and active logs are replayed.</p>
 </conbody>

Modified: db/derby/docs/trunk/src/adminguide/cadminservlet98430.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminservlet98430.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminservlet98430.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminservlet98430.dita Mon Mar 26 12:03:40 2007
@@ -23,8 +23,8 @@
 remotely. To use the servlet interface, the servlet must be registered with
 an Application Server, and derby.system.home must be known to the Application Server.</shortdesc>
 <conbody>
-<p>A Web application archive (WAR) file, <i>derby.war</i>, for the <ph conref="adminconrefs.dita#prod/productshortname"></ph> 
-Network Server is available in <i>$<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>/lib.</i> This
+<p>A Web application archive (WAR) file, <i>derby.war</i>, for the <ph conref="../conrefs.dita#prod/productshortname"></ph> 
+Network Server is available in <i>$<ph conref="../conrefs.dita#prod/productinstallpath"></ph>/lib.</i> This
 file registers the Network Server's servlet at the relative path <i>/derbynet</i>.
 See the documentation for your Application Server for instructions on how
 to install it.</p>

Modified: db/derby/docs/trunk/src/adminguide/cadminspace21579.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminspace21579.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminspace21579.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminspace21579.dita Mon Mar 26 12:03:40 2007
@@ -19,18 +19,18 @@
 -->
 <concept id="cadminspace21579" xml:lang="en-us">
 <title>Reclaiming unused space</title>
-<shortdesc>A <ph conref="adminconrefs.dita#prod/productshortname"></ph> table
+<shortdesc>A <ph conref="../conrefs.dita#prod/productshortname"></ph> table
 or index (sometimes called a <i>conglomerate</i>) can contain unused space
 after large amounts of data have been deleted or updated.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Compressing tables and indexes</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>This happens because, by default, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does
+<p>This happens because, by default, <ph conref="../conrefs.dita#prod/productshortname"></ph> does
 not return unused space to the operating system. After a page has been allocated
-to a table or index, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does
+to a table or index, <ph conref="../conrefs.dita#prod/productshortname"></ph> does
 not automatically return the page to the operating system until the table
-or index is dropped, even if the space is no longer needed. However, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does
+or index is dropped, even if the space is no longer needed. However, <ph conref="../conrefs.dita#prod/productshortname"></ph> does
 provide a way to reclaim unused space in tables and associated indexes.</p>
 <p>If you determine that a table and its indexes have a significant amount
 of unused space, use either the SYSCS_UTIL.SYSCS_COMPRESS_TABLE or SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE
@@ -47,12 +47,12 @@
 third parameter in the SYSCS_UTIL.SYSCS_COMPRESS_TABLE() procedure determines
 whether the operation will run in sequential or non-sequential mode. If you
 specify <codeph>0</codeph> for the third argument in the procedure, the operation
-will run in non-sequential mode. In sequential mode,<ph conref="adminconrefs.dita#prod/productshortname"></ph> compresses
+will run in non-sequential mode. In sequential mode,<ph conref="../conrefs.dita#prod/productshortname"></ph> compresses
 the table and indexes sequentially, one at a time. Sequential compression
 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></example>
-<section>For more information about this command, see the <cite><ph conref="adminconrefs.dita#pub/citref"></ph></cite>.</section>
+<section>For more information about this command, see the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>.</section>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/radminapps810699.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminapps810699.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminapps810699.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminapps810699.dita Mon Mar 26 12:03:40 2007
@@ -39,14 +39,14 @@
 >jdbc:derby:net://localhost:1527/sample:user=judy;password=no12see;
 retrieveMessagesFromServerOnGetMessage=true;</codeblock></section>
 <section><title>Example 2</title><p>The following example specifies the attributes
-for both <ph conref="adminconrefs.dita#prod/productshortname"></ph> and the <tm
+for both <ph conref="../conrefs.dita#prod/productshortname"></ph> and the <tm
 tmclass="ibm" tmowner="IBM Corporation" tmtype="reg" trademark="DB2">DB2</tm> Driver
 for JDBC:  <codeblock>jdbc:derby:net://localhost:1527/sample;create=true:user=judy;
 password=no12see;retrieveMessagesFromServerOnGetMessage=true;</codeblock></p></section>
 <section><title>Example 3</title><p>This example connects to the default server
 name <i>localhost</i> on the default port, <i>1527</i>, and includes the path
 in the database name portion of the URL. The database name must be delimited
-by double quotation marks and you cannot specify <ph conref="adminconrefs.dita#prod/productshortname"></ph> attributes
+by double quotation marks and you cannot specify <ph conref="../conrefs.dita#prod/productshortname"></ph> attributes
 on the URL.</p><codeblock>jdbc:derby:net://localhost:1527/"c:/my-db-dir/my-db-name":user=judy;
 password=no12see;retrieveMessagesFromServerOnGetMessage=true;</codeblock></section>
 <section><title>Example 4</title><p>The following is a sample program fragment

Modified: db/derby/docs/trunk/src/adminguide/radminapps811974.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminapps811974.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminapps811974.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminapps811974.dita Mon Mar 26 12:03:40 2007
@@ -34,7 +34,7 @@
 the exception message to the error: <codeblock>ERROR 42Z24: Overflow occurred in identity for column 'Y' in table 'AI':
 SQLSTATE: 22003: The resulting value is outside the range 
 for the data type INTEGER.</codeblock></p></section>
-<section><p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> embedded
+<section><p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> embedded
 driver, however, would generate two SQL exceptions:<codeblock>ERROR 42Z24: Overflow occurred in identity for column 'Y' in table 'AI'. 
 </codeblock> <codeblock>ERROR 22003: The resulting value is outside the range for the data type INTEGER.</codeblock></p></section>
 <section><p>This is because the network client driver reports only one SQLException

Modified: db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita Mon Mar 26 12:03:40 2007
@@ -23,7 +23,7 @@
 <section>
 <p>The following examples specify the user and password URL attributes. 
 To enable user authentication, the  property <i>derby.connection.requireAuthentication</i>
-must be set to true, otherwise, <ph conref="adminconrefs.dita#prod/productshortname"></ph>
+must be set to true, otherwise, <ph conref="../conrefs.dita#prod/productshortname"></ph>
 does not require a user name and password. For a multi-user product, you would
 typically set it for the system in the <i>derby.properties</i> file for your
 server, since it is in a trusted environment. Below is a sample
@@ -37,7 +37,7 @@
 sample.</p>
 <codeblock>jdbc:derby://localhost:1527/sample;user=judy;password=no12see</codeblock></section>
 <section><title>Example 2</title><p>The following example specifies both <ph
-conref="adminconrefs.dita#prod/productshortname"></ph> and Network Client
+conref="../conrefs.dita#prod/productshortname"></ph> and Network Client
 driver attributes:  <codeblock>jdbc:derby://localhost:1527/sample;create=true;user=judy;
 password=no12see</codeblock></p></section>
 <section><title>Example 3</title><p>This example connects to the default server

Modified: db/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita Mon Mar 26 12:03:40 2007
@@ -21,7 +21,7 @@
 <title>Updatable Result Sets</title>
 <conbody>
 <p>The functionality of updatable result sets in a server environment are similar
-to an embedded environment in <ph conref="adminconrefs.dita#prod/productshortname"></ph>,
+to an embedded environment in <ph conref="../conrefs.dita#prod/productshortname"></ph>,
 with the exception of the following differences:<ul>
 <li>The Network Client requires that there be at least one column in the select
 list from the target table. For example, the following statement will fail

Modified: db/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita Mon Mar 26 12:03:40 2007
@@ -29,7 +29,7 @@
 <section><title>Default</title> <p>If the derby.system.home property
 has been set, it is the default. Otherwise, the default is the current directory.</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.traceDirectory=c:/<ph
-conref="adminconrefs.dita#prod/productshortname"></ph>/trace</b></codeblock> </example>
+conref="../conrefs.dita#prod/productshortname"></ph>/trace</b></codeblock> </example>
 <section><title>Static or dynamic</title> <p>Dynamic. System values can be
 changed by using commands or the servlet interface after the Network Server has
 been started.</p> </section>

Modified: db/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita Mon Mar 26 12:03:40 2007
@@ -27,8 +27,8 @@
 <p>Use the derby.drda.startNetworkServer property to simplify
 embedding the Network Server in your Java application. When you set 
 derby.drda.startNetworkServer to true, the Network Server will automatically 
-start when you start <ph conref="adminconrefs.dita#prod/productshortname"></ph> 
-(in this context, <ph conref="adminconrefs.dita#prod/productshortname"></ph>
+start when you start <ph conref="../conrefs.dita#prod/productshortname"></ph> 
+(in this context, <ph conref="../conrefs.dita#prod/productshortname"></ph>
 will start when the embedded driver is loaded). Only one Network Server
 can be started in a JVM.</p>
 <p>NOTE:
@@ -41,7 +41,7 @@
 <section><title>Default</title><p>False.</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.startNetworkServer=true</b></codeblock> </example>
 <section><title>Static or dynamic</title><p>Static. You must shut down the
-Network Server and restart <ph conref="adminconrefs.dita#prod/productshortname"></ph> for
+Network Server and restart <ph conref="../conrefs.dita#prod/productshortname"></ph> for
 this change to take effect.</p> </section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/adminguide/radminconsist30301.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminconsist30301.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminconsist30301.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminconsist30301.dita Mon Mar 26 12:03:40 2007
@@ -25,7 +25,7 @@
 </metadata></prolog>
 <refbody>
 <section><p>The SYSCS_UTIL.SYSCS_CHECK_TABLE() function checks the consistency
-of a <ph conref="adminconrefs.dita#prod/productshortname"></ph> table. In
+of a <ph conref="../conrefs.dita#prod/productshortname"></ph> table. In
 particular, the <i>SYSCS_UTIL.SYSCS_CHECK_TABLE</i> function verifies the
 following conditions:<ul>
 <li>Base tables are internally consistent</li>

Modified: db/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita Mon Mar 26 12:03:40 2007
@@ -27,9 +27,9 @@
 mechanism is used to detect when clients disconnect unexpectedly.  A <i>keepalive
 probe</i> is sent to the client if a long time (by default, more than two
 hours) passes with no other data being sent or received.
-The <ph conref="adminconrefs.dita#prod/productlowercase"></ph>.drda.keepAlive property is used to detect and clean up connections for
+The <ph conref="../conrefs.dita#prod/productlowercase"></ph>.drda.keepAlive property is used to detect and clean up connections for
 clients on powered-off machines or clients that have disconnected unexpectedly.</p></section>
-<section><p>If the property is set to false, <ph conref="adminconrefs.dita#prod/productshortname"></ph> will
+<section><p>If the property is set to false, <ph conref="../conrefs.dita#prod/productshortname"></ph> will
 not attempt to clean up disconnected clients. The keepAlive mechanism might
 be disabled if clients need to resume work without reconnecting even after
 being disconnected from the network for some time. To disable keepAlive probes

Modified: db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita Mon Mar 26 12:03:40 2007
@@ -24,7 +24,7 @@
 </metadata></prolog>
 <refbody>
 <section><p>You can start the Network Server in another thread automatically
-when <ph conref="adminconrefs.dita#prod/productshortname"></ph> starts by setting
+when <ph conref="../conrefs.dita#prod/productshortname"></ph> starts by setting
 the <i>derby.drda.startNetworkServer</i> property (see <xref href="tadminconfigsettingnetwrokserverproperties.dita#tadminconfigsettingnetwrokserverproperties"></xref>), or you can start it by using a program. The following example shows how to start the Network Server by using a program:</p></section>
 <example> <codeblock>import org.apache.derby.drda.NetworkServerControl;
 import java.net.InetAddress;
@@ -35,8 +35,8 @@
 by using either the embedded driver or the Network Client driver.
 The server framework's attempt to boot the local JDBC driver is ignored because
 it has already been booted within the application's JVM. The server framework
-simply accesses the instance of <ph conref="adminconrefs.dita#prod/productshortname"></ph> that is already booted. There is no conflict between the application and the server framework.</p></section>
-<section><p>The remote client can then connect through the <ph conref="adminconrefs.dita#prod/productshortname"></ph> client
+simply accesses the instance of <ph conref="../conrefs.dita#prod/productshortname"></ph> that is already booted. There is no conflict between the application and the server framework.</p></section>
+<section><p>The remote client can then connect through the <ph conref="../conrefs.dita#prod/productshortname"></ph> client
 driver:</p></section>
 <section><p> <codeblock>String nsURL="jdbc:derby://localhost:1527/sample";  
 java.util.Properties props = new java.util.Properties();
@@ -51,7 +51,7 @@
 Class.forName("org.apache.derby.jdbc.ClientDriver").newInstance();
 Connection conn = DriverManager.getConnection(nsURL, props);
 
-/*interact with <ph conref="adminconrefs.dita#prod/productshortname"></ph>*/
+/*interact with <ph conref="../conrefs.dita#prod/productshortname"></ph>*/
 Statement s = conn.createStatement();
 
 ResultSet rs = s.executeQuery(

Modified: db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita Mon Mar 26 12:03:40 2007
@@ -29,7 +29,7 @@
 org.apache.derby.jdbc.ClientDataSource ds =
    new org.apache.derby.jdbc.ClientDataSource();
 
-// DatabaseName can include <ph conref="adminconrefs.dita#prod/productshortname"></ph> URL Attributes
+// DatabaseName can include <ph conref="../conrefs.dita#prod/productshortname"></ph> URL Attributes
 ds.setDatabaseName(<i>database</i>);
 
 if (user != null)

Modified: db/derby/docs/trunk/src/adminguide/radminovnssample.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminovnssample.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminovnssample.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminovnssample.dita Mon Mar 26 12:03:40 2007
@@ -44,7 +44,7 @@
 a client connection to the Network Server to perform database operations. </li>
 <li>Waits for the client threads to finish the tasks. </li>
 <li>Shuts down the Network Server at the end of the demonstration.</li>
-</ul></p><p>You must install the following files in the <codeph>%<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph
+</ul></p><p>You must install the following files in the <codeph>%<ph conref="../conrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph
 > directory before you can run the sample program: <ul>
 <li><filepath>NsSample.java</filepath> <p>This is the entry point into the
 sample program. The program starts up two client threads. The first client

Modified: db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita Mon Mar 26 12:03:40 2007
@@ -25,6 +25,6 @@
 </metadata>
 </prolog>
 <refbody>
-<section><p>This section describes several <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server sample
+<section><p>This section describes several <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server sample
 programs for Network Server users.</p></section>
 </refbody></reference>

Modified: db/derby/docs/trunk/src/adminguide/radmintrademderby.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radmintrademderby.dita?view=diff&rev=522592&r1=522591&r2=522592
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radmintrademderby.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radmintrademderby.dita Mon Mar 26 12:03:40 2007
@@ -21,7 +21,7 @@
 <title>Trademarks</title>
 <body>
 <p>The following terms are trademarks or registered trademarks of other companies
-and have been used in at least one of the documents in the <ph conref="adminconrefs.dita#prod/productlongname"></ph> documentation
+and have been used in at least one of the documents in the <ph conref="../conrefs.dita#prod/productlongname"></ph> documentation
 library:</p>
 <p>Cloudscape, DB2, DB2 Universal Database, DRDA, and IBM are trademarks of
 International Business Machines Corporation in the United States, other countries,



Mime
View raw message