svn commit: r524113 - in /db/derby/docs/trunk/src/adminguide: cadminapps811656.dita cadminov38650.dita cadminov825149.dita cadminpreface11181.dita

[sc...@apache.org]

Author: scotsmatrix
Date: Fri Mar 30 08:08:10 2007
New Revision: 524113

URL: http://svn.apache.org/viewvc?view=rev&rev=524113
Log:
DERBY-1590: updated the conrefs in the adminguide to use the global conrefs file. Patch derby-1590-adminguide-2.diff was contributed by Kim Haase.

Modified:
    db/derby/docs/trunk/src/adminguide/cadminapps811656.dita
    db/derby/docs/trunk/src/adminguide/cadminov38650.dita
    db/derby/docs/trunk/src/adminguide/cadminov825149.dita
    db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita

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=524113&r1=524112&r2=524113
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminapps811656.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminapps811656.dita Fri Mar 30 08:08:10 2007
@@ -25,5 +25,5 @@
 <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="../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>
+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="../conrefs.dita#prod/productshortname"></ph>.</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=524113&r1=524112&r2=524113
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov38650.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov38650.dita Fri Mar 30 08:08:10 2007
@@ -21,7 +21,7 @@
 <prolog>
 </prolog>
 <conbody>
-<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
+<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="../conrefs.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/cadminov825149.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov825149.dita?view=diff&rev=524113&r1=524112&r2=524113
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov825149.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov825149.dita Fri Mar 30 08:08:10 2007
@@ -21,5 +21,5 @@
 <prolog>
 </prolog>
 <conbody>
-<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>
+<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="../conrefs.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/cadminpreface11181.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita?view=diff&rev=524113&r1=524112&r2=524113
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita Fri Mar 30 08:08:10 2007
@@ -27,7 +27,7 @@
 <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="../conrefs.dita#prod/productshortname"></ph>, you can embed <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a server
+<p>To connect multiple clients with <ph conref="../conrefs.dita#prod/productshortname"></ph>, you can embed <ph conref="../conrefs.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>