You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2005/07/01 01:12:06 UTC

svn commit: r208694 [1/2] - /incubator/derby/docs/trunk/src/adminguide/

Author: fuzzylogic
Date: Thu Jun 30 16:12:01 2005
New Revision: 208694

URL: http://svn.apache.org/viewcvs?rev=208694&view=rev
Log:
DERBY-381: Changes for review of Derby Server and Admin guide.

Committed for Jeff Levitt <de...@mylevita.com>

Modified:
    incubator/derby/docs/trunk/src/adminguide/adminconrefs.dita
    incubator/derby/docs/trunk/src/adminguide/cadminadvtops.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps811478.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps811631.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps811656.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
    incubator/derby/docs/trunk/src/adminguide/cadminbckupdb.dita
    incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita
    incubator/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita
    incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita
    incubator/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup12677.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup21105.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup63476.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup67525.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita
    incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita
    incubator/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita
    incubator/derby/docs/trunk/src/adminguide/cadminlog800315.dita
    incubator/derby/docs/trunk/src/adminguide/cadminlog98.dita
    incubator/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita
    incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov16172.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov17524.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov28261.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov33597.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov65220.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov825125.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov825149.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov83312.dita
    incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
    incubator/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita
    incubator/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita
    incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita
    incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita
    incubator/derby/docs/trunk/src/adminguide/cadminpreface11181.dita
    incubator/derby/docs/trunk/src/adminguide/cadminpreface22460.dita
    incubator/derby/docs/trunk/src/adminguide/cadminpreface23947.dita
    incubator/derby/docs/trunk/src/adminguide/cadminpreface30074.dita
    incubator/derby/docs/trunk/src/adminguide/cadminrollforward.dita
    incubator/derby/docs/trunk/src/adminguide/cadminservlet98430.dita
    incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita
    incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
    incubator/derby/docs/trunk/src/adminguide/radminapps810699.dita
    incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita
    incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
    incubator/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfig.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita
    incubator/derby/docs/trunk/src/adminguide/radminconsist24642.dita
    incubator/derby/docs/trunk/src/adminguide/radminconsist30301.dita
    incubator/derby/docs/trunk/src/adminguide/radminconsist38781.dita
    incubator/derby/docs/trunk/src/adminguide/radmincopyright.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita
    incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita
    incubator/derby/docs/trunk/src/adminguide/radminlog800241.dita
    incubator/derby/docs/trunk/src/adminguide/radminlog800279.dita
    incubator/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita
    incubator/derby/docs/trunk/src/adminguide/radminovnssample.dita
    incubator/derby/docs/trunk/src/adminguide/radminsampleprograms.dita
    incubator/derby/docs/trunk/src/adminguide/radminservlet810694.dita
    incubator/derby/docs/trunk/src/adminguide/radminservlet810717.dita
    incubator/derby/docs/trunk/src/adminguide/radminservlet810796.dita
    incubator/derby/docs/trunk/src/adminguide/radminservlet810822.dita
    incubator/derby/docs/trunk/src/adminguide/radminservlet810910.dita
    incubator/derby/docs/trunk/src/adminguide/radmintrademderby.dita
    incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita
    incubator/derby/docs/trunk/src/adminguide/tadminadv804451.dita
    incubator/derby/docs/trunk/src/adminguide/tadminapps811302.dita
    incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita
    incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita
    incubator/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita
    incubator/derby/docs/trunk/src/adminguide/tadminappsruntimeinfo.dita
    incubator/derby/docs/trunk/src/adminguide/tadminappssettingportnumbers.dita
    incubator/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig813694.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig814934.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig814963.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig815333.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig815357.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig815768.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig815822.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig815853.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigalteringthestartnetworkserverscr.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigsysteminformation.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfiguringthenetworkserver.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita
    incubator/derby/docs/trunk/src/adminguide/tadmincrtdbbkup.dita
    incubator/derby/docs/trunk/src/adminguide/tadminhubbkup44.dita
    incubator/derby/docs/trunk/src/adminguide/tadminlog800206.dita
    incubator/derby/docs/trunk/src/adminguide/tadminlogfile.dita
    incubator/derby/docs/trunk/src/adminguide/tadminnetservrun.dita
    incubator/derby/docs/trunk/src/adminguide/tadminovclirun.dita
    incubator/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita
    incubator/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita
    incubator/derby/docs/trunk/src/adminguide/tadmintracefacility.dita

Modified: incubator/derby/docs/trunk/src/adminguide/adminconrefs.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/adminconrefs.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/adminconrefs.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/adminconrefs.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -35,7 +35,7 @@
 <concept id="vers" xml:lang="en-us">
 <title>Version and release numbers</title>
 <conbody>
-<p><ph id="fullversionnumber">Open Source</ph></p>
+<p><ph id="fullversionnumber">Version 10.1</ph></p>
 </conbody>
 </concept>
 <concept id="pub" xml:lang="en-us">

Modified: incubator/derby/docs/trunk/src/adminguide/cadminadvtops.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminadvtops.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminadvtops.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminadvtops.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -103,6 +103,6 @@
 </dlentry></dl></dd>
 </dlentry></dl>
 <section><title>Universal Driver System information</title><p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server is compatible with the DB2 JDBC Universal Driver release 1.2 and higher.</p></section>
+Server is compatible with the DB2 JDBC Universal Driver release 2.4 and higher.</p></section>
 </conbody>
 </concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps811478.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps811478.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps811478.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps811478.dita Thu Jun 30 16:12:01 2005
@@ -3,7 +3,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps811631.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps811631.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps811631.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps811631.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps811656.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps811656.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps811656.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps811656.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminbckupdb.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminbckupdb.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminbckupdb.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminbckupdb.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -18,8 +18,7 @@
 -->
 <concept id="cadminhubbkup01" xml:lang="en-us">
 <title>Using the backup procedure to perform an online backup</title>
-<shortdesc>The SYSCS_UTIL.SYSCS_BACKUP_DATABASE procedure locks the database
-and performs the copy operation.</shortdesc>
+<shortdesc>The SYSCS_UTIL.SYSCS_BACKUP_DATABASE procedure locks the database so that any connection trying to write to the database will be frozen until the backup completes. Database reads can continue while the backup is running.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Backup procedure</indexterm><indexterm>SYSCS_BACKUP_DATABASE()
 system procedure</indexterm></keywords>
@@ -29,8 +28,8 @@
 takes a string argument that represents the location in which to back up the
 database. Typically, you provide the full path to the backup directory. (Relative
 paths are interpreted as relative to the current directory, not to the derby.system.home directory.)</p>
-<p>For example, to specify a backup location of <filepath>c:/mybackups/2004-06-01</filepath> for a database that is currently open, use the following statement (forward slashes are used as path separators in SQL commands):</p>
-<codeblock><b>CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE('c:/mybackups/2004-06-01')</b></codeblock>
+<p>For example, to specify a backup location of <filepath>c:/mybackups/2005-06-01</filepath> for a database that is currently open, use the following statement (forward slashes are used as path separators in SQL commands):</p>
+<codeblock><b>CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE('c:/mybackups/2005-06-01')</b></codeblock>
 <p>The <i>SYSCS_UTIL.SYSCS_BACKUP_DATABASE()</i> procedure puts the database
 into a state in which it can be safely copied, then copies the entire original
 database directory (including data files, online transaction log files, and
@@ -52,8 +51,8 @@
 cs.close();
 System.out.println("backed up database to "+backupdirectory);
 }</codeblock>
-<p>For a database that was backed up on 2004-06-01, the previous commands copy the current
-database to a directory of the same name in <i>c:/mybackups/2004-06-01</i>.</p>
+<p>For a database that was backed up on 2005-06-01, the previous commands copy the current
+database to a directory of the same name in <i>c:/mybackups/2005-06-01</i>.</p>
 <p>Uncommitted transactions do not appear in the backed-up database.</p>
 <note>Do not back up different databases with the same name to the same backup
 directory. If a database of the same name already exists in the backup directory,

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup12677.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup12677.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup12677.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup12677.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -26,8 +26,8 @@
 to performing an offline backup. </p>
 <p>For example, on Windows systems, the following operating system command 
 backs up a (closed) database that is named <i>sample</i> and that is located in <filepath>d:\mydatabases</filepath> by
-copying it to the directory <filepath>c:\mybackups\2004-06-01</filepath>:</p>
-<codeblock>xcopy d:\mydatabases\sample c:\mybackups\2004-06-01\sample /s /i</codeblock>
+copying it to the directory <filepath>c:\mybackups\2005-06-01</filepath>:</p>
+<codeblock>xcopy d:\mydatabases\sample c:\mybackups\2005-06-01\sample /s /i</codeblock>
 <p>If you are not using Windows, substitute the appropriate operating
 system command for copying a directory and all contents to a new location.</p>
 <note>On Windows systems, do not attempt to update a database while it is being

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup21105.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup21105.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup21105.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup21105.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup63476.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup63476.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup63476.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup63476.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup67525.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup67525.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup67525.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup67525.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -27,8 +27,8 @@
 <ul>
 <li>If you are using an operating system command to back up the database,
 you must explicitly copy the log file as well, as shown in the following example:
-  <codeblock>xcopy d:\mydatabases\sample c:\mybackups\2004-06-01\sample /s /i
-xcopy h:\janet\tourslog\log c:\mybackups\2004-06-01\sample\log /s /i</codeblock></li>
+  <codeblock>xcopy d:\mydatabases\sample c:\mybackups\2005-06-01\sample /s /i
+xcopy h:\janet\tourslog\log c:\mybackups\2005-06-01\sample\log /s /i</codeblock></li>
 </ul>
 <p>If you are not using Windows, substitute the appropriate operating system
 command for copying a directory and all of its contents to a new location.</p>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminlog800315.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminlog800315.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminlog800315.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminlog800315.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminlog98.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminlog98.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminlog98.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminlog98.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov16172.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov16172.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov16172.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov16172.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov17524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov17524.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov17524.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov17524.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov28261.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov28261.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov28261.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov28261.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov33597.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov33597.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov33597.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov33597.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov65220.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov65220.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov65220.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov65220.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov825125.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov825125.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov825125.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov825125.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov825149.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov825149.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov825149.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov825149.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov83312.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov83312.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov83312.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov83312.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -29,13 +29,13 @@
 program that interacts with the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server from another JVM.
 The program performs the following tasks:
 <ul>
-<li>Loads the Network Client driver</li>
+<li>Loads the network client driver</li>
 <li>Obtains a client connection by using the DriverManager</li>
 <li>Obtains a client connection by using a DataSource</li>
 <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\programs\nserverdemo\</codeph> directory before you can run the sample program:
+<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:
 <ul>
 <li>The source file: <filepath>SimpleNetworkClientSample.java</filepath></li>
 <li>The compiled class file: <filepath>SimpleNetworkClientSample.class</filepath></li>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -40,7 +40,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\programs\nserverdemo\</codeph> directory:
+the <codeph>%<ph conref="adminconrefs.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: incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -20,6 +20,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This part of the guide explains the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server.
+<p>This part of the guide explains the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server and other server frameworks.
 </p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminpreface11181.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminpreface11181.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminpreface11181.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminpreface11181.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminpreface22460.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminpreface22460.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminpreface22460.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminpreface22460.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminpreface23947.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminpreface23947.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminpreface23947.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminpreface23947.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminpreface30074.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminpreface30074.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminpreface30074.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminpreface30074.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminrollforward.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminrollforward.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminrollforward.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminrollforward.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/cadminservlet98430.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminservlet98430.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminservlet98430.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminservlet98430.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -30,7 +30,7 @@
 <p>For example, if <i>derby.war</i> is installed in WebSphere Application
 Server with a context root of <filepath>cns</filepath>, the URL of the server
 is:</p>
-<codeblock>http://server[:port]/cns/derbynet</codeblock>
+<codeblock>http://&lt;server>[:port]/derby/derbynet</codeblock>
 <note>A servlet engine is not part of the Network Server. </note>
 <p>The servlet takes the following optional configuration parameters:</p>
 <dl><dlentry>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -32,12 +32,15 @@
 or index is dropped, even if the space is no longer needed. However, <ph conref="adminconrefs.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 the SYSCS_UTIL.SYSCS_COMPRESS_TABLE procedure to reclaim
-that space. The procedure returns the reclaimed space to the operating system.
-By default, the SYSCS_UTIL.SYSCS_COMPRESS_TABLE procedure instructs <ph conref="adminconrefs.dita#prod/productshortname"></ph> to
-compress the table and its related indexes concurrently, which can use a lot
-of temporary disk space and memory.</p>
-<example><p> For example, after you have determined that the FlightAvailability
+of unused space, use either the SYSCS_UTIL.SYSCS_COMPRESS_TABLE or SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE
+procedure to reclaim that space. SYSCS_COMPRESS_TABLE is guaranteed to recover
+the maximum amount of free space, at the cost of temporarily creating new
+tables and indexes before the statement in committed. SYSCS_INPLACE_COMPRESS
+attempts to reclaim space within the same table, but cannot guarantee it will
+recover all available space. The difference between the two procedures is
+that unlike SYSCS_COMPRESS_TABLE, the SYSCS_INPLACE_COMPRESS procedure uses
+no temporary files and moves rows around within the same conglomerate.</p>
+<example><p>As an example, after you have determined that the FlightAvailability
 table and its related indexes have too much unused space, you could reclaim
 that space with the following command:</p><codeblock>call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('APP', 'FLIGHTAVAILABILITY', 0);</codeblock><p> The
 third parameter in the SYSCS_UTIL.SYSCS_COMPRESS_TABLE() procedure determines

Modified: incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap (original)
+++ incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE map PUBLIC "-//IBM//DTD DITA Map//EN"
  "../dtd/map.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminapps810699.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminapps810699.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminapps810699.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminapps810699.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -22,15 +22,15 @@
 <section><title>Example 1</title><p>The following example connects to the
 default server name localhost on the default port, 1527, and to the database
 sample. It specifies the user and password URL attributes. You must set these
-attributes before attempting to connect to the server.</p><codeblock>jdbc:derby://localhost:1527/sample;user=judy;password=no12see;</codeblock></section>
+attributes before attempting to connect to the server.</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
 driver attributes:  <codeblock>jdbc:derby://localhost:1527/sample;create=true;user=judy;
-password=no12see;</codeblock></p></section>
+password=no12see</codeblock></p></section>
 <section><title>Example 3</title><p>This example connects to the default server
 name localhost on the default port, 1527, and includes the path in the database
 name portion of the URL.</p><codeblock>jdbc:derby://localhost:1527/c:/my-db-dir/my-db-name;user=judy;
-password=no12see;</codeblock></section>
+password=no12see</codeblock></section>
 <section><title>Example 4</title><p>The following example shows how to use
 the network client driver to connect the network client to the Network Server:</p><codeblock>String databaseURL = "jdbc:derby://localhost:1527/sample";
 <b>// Load Derby Network Client driver class</b>

Modified: incubator/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfig.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfig.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfig.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfig.dita Thu Jun 30 16:12:01 2005
@@ -3,7 +3,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita Thu Jun 30 16:12:01 2005
@@ -3,7 +3,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminconsist24642.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconsist24642.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconsist24642.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconsist24642.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminconsist30301.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconsist30301.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconsist30301.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconsist30301.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminconsist38781.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconsist38781.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconsist38781.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconsist38781.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radmincopyright.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmincopyright.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmincopyright.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmincopyright.dita Thu Jun 30 16:12:01 2005
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -14,15 +16,11 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-
 <reference id="radmincopyright" xml:lang="en-us">
 <title>Copyright</title>
-<shortdesc>First Edition (August 2004)</shortdesc>
+<shortdesc>Second Edition (July 2005)</shortdesc>
 <refbody>
-<section><p>Copyright 1997, 2004 The Apache Software Foundation or its licensors,
+<section><p>Copyright 1997, 2005 The Apache Software Foundation or its licensors,
 as applicable.</p><p>Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.   You may
 obtain a copy of the License at<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
@@ -32,4 +30,3 @@
 the specific language governing permissions and   limitations under the License.</p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita Thu Jun 30 16:12:01 2005
@@ -3,7 +3,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  
@@ -31,7 +31,7 @@
 will listen on all interfaces. Ensure that you are running under the security
 manager and that user authorization is enabled before you enable remote
 connections with this property. </section>
-<refsyn><title>Syntax</title> <codeblock>derby.drda.host = <i>hostname</i></codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock>derby.drda.host=<i>hostname</i></codeblock> </refsyn>
 <section><title>Default</title> <p>If no host name is specified, the Network Server
 listens on the loopback address of the current machine (localhost).</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.host=myhost</b></codeblock> </example>

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita Thu Jun 30 16:12:01 2005
@@ -3,7 +3,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita Thu Jun 30 16:12:01 2005
@@ -3,7 +3,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita Thu Jun 30 16:12:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.  

Modified: incubator/derby/docs/trunk/src/adminguide/radminlog800241.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminlog800241.dita?rev=208694&r1=208693&r2=208694&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminlog800241.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminlog800241.dita Thu Jun 30 16:12:01 2005
@@ -3,7 +3,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 you may not use this file except in compliance with the License.