db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r208734 [3/4] - in /incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ ref/ tools/
Date Fri, 01 Jul 2005 09:16:00 GMT
Modified: incubator/derby/docs/trunk/src/devguide/cdevstandards805841.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstandards805841.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstandards805841.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstandards805841.dita Fri Jul  1 02:15:43 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/devguide/cdevstandards805893.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstandards805893.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstandards805893.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstandards805893.dita Fri Jul  1 02:15:43 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/devguide/cdevstandards805921.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstandards805921.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstandards805921.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstandards805921.dita Fri Jul  1 02:15:43 2005
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevstandards805921">
-<title>Fewer reserved keywords</title>
-<prolog>
-</prolog>
-<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> has converted several keywords<b> </b>to be
-non-reserved. </p>
-</conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevstandards805949.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstandards805949.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstandards805949.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstandards805949.dita Fri Jul  1 02:15:43 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/devguide/cdevstandards805975.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstandards805975.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstandards805975.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstandards805975.dita Fri Jul  1 02:15:43 2005
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+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,11 +16,12 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevstandards805975">
+<concept id="cdevstandards805975" xml:lang="en-us">
 <title>CLOB, and BLOB</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> supports the standard CLOB and BLOB data types.</p>
-</conbody></concept>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> supports the standard
+CLOB and BLOB data types. BLOB and CLOB values are limited to a maximum of
+2,147,483,647 characters.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevstandards806001.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstandards806001.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstandards806001.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstandards806001.dita Fri Jul  1 02:15:43 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/devguide/cdevstandards806027.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstandards806027.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstandards806027.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstandards806027.dita Fri Jul  1 02:15:43 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/devguide/cdevstandards806118.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstandards806118.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstandards806118.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstandards806118.dita Fri Jul  1 02:15:43 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/devguide/cdevstart16043.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstart16043.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstart16043.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstart16043.dita Fri Jul  1 02:15:43 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/devguide/cdevstart18978.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstart18978.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstart18978.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstart18978.dita Fri Jul  1 02:15:43 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/devguide/cdevstart19524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstart19524.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstart19524.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstart19524.dita Fri Jul  1 02:15:43 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/devguide/cdevstart39409.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstart39409.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstart39409.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstart39409.dita Fri Jul  1 02:15:43 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/devguide/cdevstart41260.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstart41260.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstart41260.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstart41260.dita Fri Jul  1 02:15:43 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/devguide/cdevstart813142.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstart813142.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstart813142.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstart813142.dita Fri Jul  1 02:15:43 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/devguide/cdevstart813545.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstart813545.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstart813545.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstart813545.dita Fri Jul  1 02:15:43 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/devguide/cdevstart98282.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevstart98282.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevstart98282.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevstart98282.dita Fri Jul  1 02:15:43 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/devguide/cdevtricks13019.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevtricks13019.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevtricks13019.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevtricks13019.dita Fri Jul  1 02:15:43 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/devguide/cdevtricks19707.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevtricks19707.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevtricks19707.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevtricks19707.dita Fri Jul  1 02:15:43 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/devguide/cdevtricks21248.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevtricks21248.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevtricks21248.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevtricks21248.dita Fri Jul  1 02:15:43 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/devguide/cdevtricks23426.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevtricks23426.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevtricks23426.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevtricks23426.dita Fri Jul  1 02:15:43 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/devguide/cdevtricks32436.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevtricks32436.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevtricks32436.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevtricks32436.dita Fri Jul  1 02:15:43 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/devguide/cdevtricks39584.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevtricks39584.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevtricks39584.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevtricks39584.dita Fri Jul  1 02:15:43 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/devguide/cdevtricks807337.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevtricks807337.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevtricks807337.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevtricks807337.dita Fri Jul  1 02:15:43 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/devguide/cdevtricks807365.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevtricks807365.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevtricks807365.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevtricks807365.dita Fri Jul  1 02:15:43 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/devguide/cdevtricks807400.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevtricks807400.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevtricks807400.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevtricks807400.dita Fri Jul  1 02:15:43 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/devguide/cdevupgrades.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevupgrades.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevupgrades.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevupgrades.dita Fri Jul  1 02:15:43 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.  
@@ -22,7 +22,7 @@
 conref="devconrefs.dita#prod/productshortname"></ph>, you must first upgrade
 that database.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Upgrading Derby</indexterm><indexterm></indexterm></keywords>
+<keywords><indexterm>Upgrading Derby</indexterm></keywords>
 </metadata></prolog>
 <conbody>
 <p>Upgrading involves writing changes to the system tables, so it is not possible

Modified: incubator/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ incubator/derby/docs/trunk/src/devguide/derbydev.ditamap Fri Jul  1 02:15:43 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.  
@@ -19,16 +19,16 @@
 <map title="Developer's Guide">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2004"/>
+<copyryear year="1997, 2005"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>
 <prodname>Derby Developer's Guide</prodname>
-<vrmlist><vrm version="10"/></vrmlist>
+<vrmlist><vrm version="10.1"/></vrmlist>
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
 <topicref href="rdevcopyright.dita" navtitle="Copyright"></topicref>
-<topicref collection-type="family" href="cdevdgpref29520.dita" navtitle="About This Document">
+<topicref collection-type="family" href="cdevdgpref29520.dita" navtitle="About this guide">
 <topicref href="cdevdgpref11181.dita" navtitle="Purpose of this guide"></topicref>
 <topicref href="cdevdgpref24290.dita" navtitle="Audience"></topicref>
 <topicref href="cdevdgpref23947.dita" navtitle="How this guide Is Organized">
@@ -151,10 +151,10 @@
 <topicref href="cdevdeploy11201.dita" navtitle="Accessing a read-only database in a zip/jar file">
 </topicref>
 <topicref collection-type="family" href="tdevdeploy39856.dita" navtitle="Accessing databases within a jar file using the classpath">
-<topicref href="cdevdeploy18716.dita" navtitle="Connecting to databases with ambiguous paths to databases in the file system">
-</topicref>
-<topicref href="cdevdeploy856333.dita" navtitle="Connecting to databases when the path is ambiguous because of databases in the classpath">
-</topicref>
+<topicref href="cdevdeploy18716.dita" navtitle="Connecting to databases with ambiguous paths to databases in the file
+system"></topicref>
+<topicref href="cdevdeploy856333.dita" navtitle="Connecting to databases when the path is ambiguous because of databases
+in the classpath"></topicref>
 </topicref>
 <topicref href="cdevdeploy82529.dita" navtitle="Databases on read-only media and DatabaseMetaData">
 </topicref>
@@ -211,7 +211,7 @@
 </topicref>
 </topicref>
 </topicref>
-<topicref collection-type="family" href="cdevconcepts19524.dita" navtitle="Controlling Derby Application Behavior">
+<topicref collection-type="family" href="cdevconcepts19524.dita" navtitle="Controlling Derby application behavior">
 <topicref collection-type="family" href="cdevconcepts38375.dita" navtitle="The JDBC Connection and Transaction Model">
 <topicref collection-type="family" href="cdevconcepts36881.dita" navtitle="Connections">
 <topicref href="cdevconcepts838179.dita" navtitle="Statements"></topicref>
@@ -471,8 +471,6 @@
 <topicref href="cdevstandards805841.dita" navtitle="Unique constraints and nulls">
 </topicref>
 <topicref href="cdevstandards805893.dita" navtitle="NOT NULL characteristic">
-</topicref>
-<topicref href="cdevstandards805921.dita" navtitle="Fewer reserved keywords">
 </topicref>
 <topicref href="cdevstandards805949.dita" navtitle="DECIMAL max precision">
 </topicref>

Modified: incubator/derby/docs/trunk/src/devguide/devconrefs.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/devconrefs.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/devconrefs.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/devconrefs.dita Fri Jul  1 02:15:43 2005
@@ -4,7 +4,7 @@
  "../dtd/ditabase.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/devguide/rdevadvjdbc034.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevadvjdbc034.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevadvjdbc034.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevadvjdbc034.dita Fri Jul  1 02:15:43 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/devguide/rdevadvjdbc965.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevadvjdbc965.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevadvjdbc965.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevadvjdbc965.dita Fri Jul  1 02:15:43 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/devguide/rdevconcepts1119.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevconcepts1119.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevconcepts1119.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevconcepts1119.dita Fri Jul  1 02:15:43 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/devguide/rdevconcepts2462.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevconcepts2462.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevconcepts2462.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevconcepts2462.dita Fri Jul  1 02:15:43 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/devguide/rdevconcepts38274.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevconcepts38274.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevconcepts38274.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevconcepts38274.dita Fri Jul  1 02:15:43 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/devguide/rdevconcepts600.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevconcepts600.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevconcepts600.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevconcepts600.dita Fri Jul  1 02:15:43 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/devguide/rdevconcepts713.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevconcepts713.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevconcepts713.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevconcepts713.dita Fri Jul  1 02:15:43 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,84 +16,77 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevconcepts713">
+<reference id="rdevconcepts713" xml:lang="en-us">
 <title>Deployment options and threading and connection modes</title>
 <prolog><metadata>
-<keywords>
-<indexterm>Deployment modes<indexterm>threading/connection modes
-and</indexterm></indexterm>
-<indexterm>Multi-threaded applications</indexterm>
-<indexterm>Multiple connections<indexterm>from single application
-running in embedded mode</indexterm><indexterm>from multiple applications
-connecting to server</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Deployment modes<indexterm>threading/connection modes
+and</indexterm></indexterm><indexterm>Multi-threaded applications</indexterm>
+<indexterm>Multiple connections<indexterm>from single application running
+in embedded mode</indexterm><indexterm>from multiple applications connecting
+to server</indexterm></indexterm></keywords>
+</metadata></prolog>
 <refbody>
-<section><p>A database can be available to multiple connections in the following situations:</p></section><section>
-<ul>
-<li>Multiple applications access a single database (possible only when <ph conref="devconrefs.dita#prod/productshortname"></ph> is
-running inside a server framework).</li>
-<li>A single application has more than one <i>Connection</i> to
-the same database.  
-<p>The way you deploy <ph conref="devconrefs.dita#prod/productshortname"></ph> affects the ways applications
-can use multi-threading and connections, as shown in <xref href="rdevconcepts713.dita#rdevconcepts713/cdevconcepts40343"/>.</p>
-<table id="cdevconcepts40343" frame="all">
-<title>Threading and
-Connection Modes</title>
-<tgroup cols="3" colsep="1" rowsep="1">
-<colspec colnum="1" colname="1" colwidth="36*"/>
-<colspec colnum="2" colname="2" colwidth="37*"/>
-<colspec colnum="3" colname="3" colwidth="27*"/>
+<section><p>A database can be available to multiple connections in the following
+situations:</p></section>
+<section> <ul>
+<li>Multiple applications access a single database (possible only when <ph
+conref="devconrefs.dita#prod/productshortname"></ph> is running inside a server
+framework).</li>
+<li>A single application has more than one <i>Connection</i> to the same database.
+  <p>The way you deploy <ph conref="devconrefs.dita#prod/productshortname"></ph> affects
+the ways applications can use multi-threading and connections, as shown in <xref
+href="rdevconcepts713.dita#rdevconcepts713/cdevconcepts40343"></xref>.</p><table
+frame="all" id="cdevconcepts40343"><title>Threading and Connection Modes</title>
+<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="36*"/>
+<colspec colname="2" colnum="2" colwidth="37*"/><colspec colname="3" colnum="3"
+colwidth="27*"/>
 <thead>
 <row>
 <entry colname="1">Connection mode</entry>
-<entry colname="2" valign="bottom" align="left">Embedded</entry>
-<entry colname="3" valign="bottom" align="left">Server</entry></row>
+<entry align="left" colname="2" valign="bottom">Embedded</entry>
+<entry align="left" colname="3" valign="bottom">Server</entry>
+</row>
 </thead>
 <tbody>
 <row>
-<entry colname="1">
-<p><i>Multi-Threaded</i></p>
-<p>From an
-application, using a <i>single</i> <codeph><i>Connection</i></codeph> to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database and issuing requests against
-that connection in multiple threads.</p></entry>
-<entry colname="2">Supply a single <i>Connection</i> object
-to separate threads. <ph conref="devconrefs.dita#prod/productshortname"></ph> ensures that only one operation is applied
-at a time for consistency. Server frameworks automatically manage multi-threaded
-operations. For more information, see <xref href="cdevconcepts19173.dita#cdevconcepts19173"/>.</entry>
+<entry colname="1"><p><i>Multi-Threaded</i></p><p>From an application, using
+a <i>single</i> <codeph><i>Connection</i></codeph> to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database
+and issuing requests against that connection in multiple threads.</p></entry>
+<entry colname="2">Supply a single <i>Connection</i> object to separate threads. <ph
+conref="devconrefs.dita#prod/productshortname"></ph> ensures that only one
+operation is applied at a time for consistency. Server frameworks automatically
+manage multi-threaded operations. For more information, see <xref href="cdevconcepts19173.dita#cdevconcepts19173"></xref>.</entry>
 <entry colname="3">Server frameworks can automatically multi-thread operations.
-Remote client applications can multi-thread if desired.</entry></row>
+Remote client applications can multi-thread if desired.</entry>
+</row>
 <row>
-<entry colname="1">
-<p><i>Multi-Connection</i></p>
-<p>From
-an application, using multiple connections to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database and issuing
-requests against those connections on multiple threads.</p>
-<p>(You must have
-a multi-user license to have more than one connection to <ph conref="devconrefs.dita#prod/productshortname"></ph>.)</p></entry>
+<entry colname="1"><p><i>Multi-Connection</i></p><p>From an application, using
+multiple connections to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database
+and issuing requests against those connections on multiple threads.</p></entry>
 <entry colname="2">Create individual connections within a single application
 and use the appropriate connection for each JDBC request. The connections
-can all be to the same database, or can be to different databases in the same <ph conref="devconrefs.dita#prod/productshortname"></ph> system.</entry>
+can all be to the same database, or can be to different databases in the same <ph
+conref="devconrefs.dita#prod/productshortname"></ph> system.</entry>
 <entry colname="3">Remote client applications can establish the multiple connections
-desired.</entry></row>
+desired.</entry>
+</row>
 <row>
-<entry colname="1">
-<p><i>Multi-User</i></p>
-<p>Multiple applications
-(or JVMs) accessing the same <ph conref="devconrefs.dita#prod/productshortname"></ph> database. Each user application has
-its own connection or connections to the database.</p></entry>
+<entry colname="1"><p><i>Multi-User</i></p><p>Multiple applications (or JVMs)
+accessing the same <ph conref="devconrefs.dita#prod/productshortname"></ph> database.
+Each user application has its own connection or connections to the database.</p></entry>
 <entry colname="2">Not possible. Only one application can access a database
 at a time, and only one application can access a specific system at a time.
-When using a pre-1.4 JVM, <ph conref="devconrefs.dita#prod/productshortname"></ph> might not prevent multiple applications
-from concurrently accessing the same <ph conref="devconrefs.dita#prod/productshortname"></ph> system, but do not allow
+When using a pre-1.4 JVM, <ph conref="devconrefs.dita#prod/productshortname"></ph> might
+not prevent multiple applications from concurrently accessing the same <ph
+conref="devconrefs.dita#prod/productshortname"></ph> system, but do not allow
 this because such access can corrupt the databases involved.</entry>
 <entry colname="3">Only one server should access a database at a time. Multiple
 remote client applications can access the same server, and thus can access
-the same database at the same time through that server.</entry></row>
+the same database at the same time through that server.</entry>
+</row>
 </tbody>
 </tgroup>
 </table></li>
 </ul></section>
-</refbody></reference>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevconcepts8424.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevconcepts8424.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevconcepts8424.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevconcepts8424.dita Fri Jul  1 02:15:43 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/devguide/rdevconcepts88082.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevconcepts88082.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevconcepts88082.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevconcepts88082.dita Fri Jul  1 02:15:43 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,22 +16,20 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevconcepts88082">
+<reference id="rdevconcepts88082" xml:lang="en-us">
 <title>Simple non-updatable ResultSets</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <refbody>
-<section><p>Here is an excerpt from a sample JDBC application that generates a <i>ResultSet</i> with a simple SELECT statement and then processes
-the rows.</p></section><example>
-<codeblock>Connection conn = DriverManager.getConnection(
+<section><p>Here is an excerpt from a sample JDBC application that generates
+a <i>ResultSet</i> with a simple SELECT statement and then processes the rows.</p></section>
+<example> <codeblock>Connection conn = DriverManager.getConnection(
     "jdbc:derby:sample");
 Statement s = conn.createStatement();
 s.execute("set schema 'SAMP'");
 <b>//note that autocommit is on--it is on by default in JDBC</b>
 ResultSet rs = s.executeQuery(
     "SELECT empno, firstnme, lastname, salary, bonus, comm "
-				 + 12 "FROM samp.employee");
+				 + "FROM samp.employee");
 <b>/** a standard JDBC ResultSet. It maintains a 
   *  cursor that points to the current row of data. The cursor 
   *  moves down one row each time the method next() is called.
@@ -56,4 +56,5 @@
 // the transaction commits automatically and releases
 //shared locks</b>
 s.close();</codeblock></example>
-</refbody></reference>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita Fri Jul  1 02:15:43 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.  
@@ -33,7 +33,7 @@
 are automatically closed when a transaction aborts, whether or not they have
 been specified to be held open.</p></section>
 <section> <note> Holdable cursors do not work with XA transactions, in <ph conref="devconrefs.dita#prod/productshortname"></ph>
-Version 10, therefore cursors should be opened with holdability false when
+Version 10.1, therefore cursors should be opened with holdability false when
 working with XA transactions.</note></section>
 <section><p>To specify whether a cursor should be held open after a commit
 takes place, supply one of the following <i>ResultSet</i> parameters to the <codeph><i>Connection</i></codeph> method <codeph><i>createStatement</i

Modified: incubator/derby/docs/trunk/src/devguide/rdevcopyright.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcopyright.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcopyright.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcopyright.dita Fri Jul  1 02:15:43 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="rdevcopyright" xml:lang="en-us">
 <title>Copyright</title>
-<shortdesc>First Edition (August 2004)</shortdesc>
+<shortdesc>First 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/devguide/rdevcsecure125.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure125.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure125.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure125.dita Fri Jul  1 02:15:43 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/devguide/rdevcsecure131.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure131.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure131.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure131.dita Fri Jul  1 02:15:43 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/devguide/rdevcsecure13713.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure13713.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure13713.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure13713.dita Fri Jul  1 02:15:43 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,47 +16,47 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure13713">
+<reference id="rdevcsecure13713" xml:lang="en-us">
 <title>User authentication example in a single-user, embedded environment</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <refbody>
-<section><p>In this example, <ph conref="devconrefs.dita#prod/productshortname"></ph> is embedded in a single-user application that
-is deployed in a number of different and potentially insecure ways. For that
-reason, the application developer has decided to encrypt the database and
-to turn on user authentication using <ph conref="devconrefs.dita#prod/productshortname"></ph>'s built-in user authentication,
+<section><p>In this example, <ph conref="devconrefs.dita#prod/productshortname"></ph> is
+embedded in a single-user application that is deployed in a number of different
+and potentially insecure ways. For that reason, the application developer
+has decided to encrypt the database and to turn on user authentication using <ph
+conref="devconrefs.dita#prod/productshortname"></ph>'s built-in user authentication,
 which will not require connections to an LDAP server. The end-user must know
-the <i>bootPassword</i> to boot the database and the user
-name and password to connect to the database. Even if the database ended up
-in an e-mail, only the intended recipient would be able to access data in
-the database. The application developer has decided not to use any user authorization
-features, since each database will accept only a single user. In that situation,
-the default full-access connection mode is acceptable.</p></section>
-<section><p>When creating the database, the application developer encrypts the database
-by using the following connection URL:</p></section><example>
-<codeblock><b>jdbc:derby:wombat;create=true;dataEncryption=true;
+the <i>bootPassword</i> to boot the database and the user name and password
+to connect to the database. Even if the database ended up in an e-mail, only
+the intended recipient would be able to access data in the database. The application
+developer has decided not to use any user authorization features, since each
+database will accept only a single user. In that situation, the default full-access
+connection mode is acceptable.</p></section>
+<section><p>When creating the database, the application developer encrypts
+the database by using the following connection URL:</p></section>
+<example> <codeblock><b>jdbc:derby:wombat;create=true;dataEncryption=true;
     bootPassword=sxy90W348HHn</b></codeblock></example>
-<section><p>Before deploying the database, the application developer turns on user
-authentication, sets the authentication provider to BUILTIN, creates a single
-user and password, and disallows system-wide properties to protect the database-wide
-security property settings:</p></section><example>
-<codeblock><b>SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+<section><p>Before deploying the database, the application developer turns
+on user authentication, sets the authentication provider to BUILTIN, creates
+a single user and password, and disallows system-wide properties to protect
+the database-wide security property settings:</p></section>
+<example> <codeblock><b>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.connection.requireAuthentication', 'true')
 
-SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.authentication.provider', 'BUILTIN')
 
-SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.user.enduser', 'red29PlaNe')
 
 CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.database.propertiesOnly', true')</b></codeblock></example>
-<section><p>When the user connects (and boots) the database, the user has to provide
-the <i>bootPassword</i>, the user name, and the password.
-The following example shows how to provide those in a connection URL, although the
-application programmer would probably provide GUI windows to allow the end
-user to type those in:</p></section><example>
-<codeblock><b>jdbc:derby:wombat;bootPassword=sxy90W348HHn;
+<section><p>When the user connects (and boots) the database, the user has
+to provide the <i>bootPassword</i>, the user name, and the password. The following
+example shows how to provide those in a connection URL, although the application
+programmer would probably provide GUI windows to allow the end user to type
+those in:</p></section>
+<example> <codeblock><b>jdbc:derby:wombat;bootPassword=sxy90W348HHn;
     user=enduser;password=red29PlaNe</b></codeblock></example>
-</refbody></reference>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure190.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure190.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure190.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure190.dita Fri Jul  1 02:15:43 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/devguide/rdevcsecure26537.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure26537.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure26537.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure26537.dita Fri Jul  1 02:15:43 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/devguide/rdevcsecure305.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure305.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure305.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure305.dita Fri Jul  1 02:15:43 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/devguide/rdevcsecure379.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure379.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure379.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure379.dita Fri Jul  1 02:15:43 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/devguide/rdevcsecure557.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita Fri Jul  1 02:15:43 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/devguide/rdevcsecure608.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure608.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure608.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure608.dita Fri Jul  1 02:15:43 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,31 +16,25 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure608">
+<reference id="rdevcsecure608" xml:lang="en-us">
 <title>Libraries for LDAP user authentication</title>
 <prolog><metadata>
-<keywords>
-<indexterm>jndid<indexterm>required for LDAP user authorization</indexterm></indexterm>
+<keywords><indexterm>jndid<indexterm>required for LDAP user authorization</indexterm></indexterm>
 <indexterm>ldap.jar<indexterm>required for LDAP user authorization</indexterm></indexterm>
-<indexterm>providerutil.jar<indexterm>required for LDAP user
-authentication</indexterm></indexterm>
+<indexterm>providerutil.jar<indexterm>required for LDAP user authentication</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <refbody>
-<section><p>To use an LDAP directory service with <ph conref="devconrefs.dita#prod/productshortname"></ph>, you need the following
-libraries in your classpath:</p></section><section>
-<ul>
-<li><i>jndi.jar</i>  
-<p>JNDI classes</p></li>
-<li><i>ldap.jar</i>  
-<p>LDAP provider from Sun</p></li>
-<li><i>providerutil.jar</i>  
-<p>JNDI classes for a provider</p></li>
+<section><p>To use an LDAP directory service with <ph conref="devconrefs.dita#prod/productshortname"></ph>,
+you need the following libraries in your classpath:</p></section>
+<section> <ul>
+<li><i>jndi.jar</i>   <p>JNDI classes</p></li>
+<li><i>ldap.jar</i>   <p>LDAP provider from Sun</p></li>
+<li><i>providerutil.jar</i>   <p>JNDI classes for a provider</p></li>
 </ul></section>
-<section><p><ph conref="devconrefs.dita#prod/productshortname"></ph> does not provide these libraries; they are available from Sun on
-the JNDI page at Use the 1.1.x versions of these libraries, not the 1.2.x
-versions. You might need to do two separate downloads to obtain all the required
-libraries.</p></section>
-</refbody></reference>
+<section><p><ph conref="devconrefs.dita#prod/productshortname"></ph> does
+not provide these libraries; they are available from Sun on the JNDI page.
+Use the 1.1.x versions of these libraries, not the 1.2.x versions. You might
+need to do two separate downloads to obtain all the required libraries.</p></section>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/devguide/rdevcsecure622.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure622.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure622.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure622.dita Fri Jul  1 02:15:43 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/devguide/rdevcsecure766.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure766.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure766.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure766.dita Fri Jul  1 02:15:43 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/devguide/rdevcsecure871406.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure871406.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure871406.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure871406.dita Fri Jul  1 02:15:43 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/devguide/rdevcsecure871422.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure871422.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure871422.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure871422.dita Fri Jul  1 02:15:43 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/devguide/rdevcsecure871439.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure871439.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure871439.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure871439.dita Fri Jul  1 02:15:43 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/devguide/rdevcsecure935.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevcsecure935.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevcsecure935.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevcsecure935.dita Fri Jul  1 02:15:43 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/devguide/rdevdeploy856845.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdeploy856845.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdeploy856845.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdeploy856845.dita Fri Jul  1 02:15:43 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/devguide/rdevdeploy856880.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdeploy856880.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdeploy856880.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdeploy856880.dita Fri Jul  1 02:15:43 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/devguide/rdevdeploy856912.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdeploy856912.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdeploy856912.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdeploy856912.dita Fri Jul  1 02:15:43 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/devguide/rdevdeploy856948.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdeploy856948.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdeploy856948.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdeploy856948.dita Fri Jul  1 02:15:43 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/devguide/rdevdvlp22102.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdvlp22102.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdvlp22102.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdvlp22102.dita Fri Jul  1 02:15:43 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/devguide/rdevdvlp38881.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdvlp38881.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdvlp38881.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdvlp38881.dita Fri Jul  1 02:15:43 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,6 @@
 <section><p>The standard <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC connection URL, which you can use for tasks besides
 connecting to a database, is</p></section><example>
 <codeblock>jdbc:derby:[subsubprotocol:][<i>databaseName</i>][;<i>attribute</i>=<i>value</i>]*</codeblock></example>
-<section><p><i><ph conref="devconrefs.dita#prod/productshortname"></ph></i> is always the <i>subprotocol</i> for connecting to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database.</p></section>
 <section><p><i>Subsubprotocol</i>, which is not typically specified,
 determines how <ph conref="devconrefs.dita#prod/productshortname"></ph> looks for a database: in a directory, in a class
 path, or in a jar file. Subsubprotocol is one of the following:</p></section><section>

Modified: incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita Fri Jul  1 02:15:43 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/devguide/rdevexudclass.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevexudclass.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevexudclass.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevexudclass.dita Fri Jul  1 02:15:43 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/devguide/rdevprocsqle.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevprocsqle.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevprocsqle.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevprocsqle.dita Fri Jul  1 02:15:43 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/devguide/rdevresman79556.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevresman79556.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevresman79556.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevresman79556.dita Fri Jul  1 02:15:43 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/devguide/rdevtrademderby.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevtrademderby.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevtrademderby.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevtrademderby.dita Fri Jul  1 02:15:43 2005
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE topic PUBLIC "-//IBM//DTD DITA Topic//EN"
  "../dtd/topic.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.  
@@ -17,31 +16,15 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
 <topic id="rdevtrademderby" xml:lang="en-us">
 <title>Trademarks</title>
 <body>
-<p>The following terms are trademarks of International Business Machines Corporation
-in the United States, other countries, or both, and have been used in at least
-one of the documents in the DB2 UDB documentation library.</p>
-<table colsep="0" expanse="column" frame="none">
-<tgroup cols="2">
-<tbody>
-<row>
-<entry><lines>Cloudscape
-DB2
-DB2 Universal Database
-</lines></entry>
-<entry> <lines>DRDA
-IBM
-WebSphere</lines></entry>
-</row>
-</tbody>
-</tgroup>
-</table>
 <p>The following terms are trademarks or registered trademarks of other companies
 and have been used in at least one of the documents in the <ph conref="devconrefs.dita#prod/productlongname"></ph> documentation
 library:</p>
+<p>Cloudscape, DB2, DB2 Universal Database, DRDA, and IBM are trademarks of
+International Business Machines Corporation in the United States, other countries,
+or both.</p>
 <p>Microsoft, Windows, Windows NT, and the Windows logo are trademarks of
 Microsoft Corporation in the United States, other countries, or both. </p>
 <p>Java and all Java-based trademarks are trademarks of Sun Microsystems,
@@ -52,4 +35,3 @@
 of others.</p>
 </body>
 </topic>
-

Modified: incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita Fri Jul  1 02:15:43 2005
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
+ "../dtd/task.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,9 +16,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
- "../dtd/task.dtd">
 <task id="tdevconcepts41704" xml:lang="en-us">
 <title>Naming or accessing the name of a cursor</title>
 <prolog><metadata>
@@ -31,20 +30,22 @@
 the <codeph><i>setCursorName</i></codeph> method of the <codeph><i>Statement</i></codeph> interface.
 You assign the name to a cursor before executing the <codeph><i>Statement</i></codeph> that
 will generate it.</p><codeblock>Statement s3 = conn.createStatement();
-<b>// name the statement so we can reference the result set
-// it generates</b>
+// name the statement so we can reference the result set
+// it generates
 s3.setCursorName("UPDATABLESTATEMENT");
-<b>// we will be able to use the following statement later
-//to access the current row of the cursor</b>
+// we will be able to use the following statement later
+// to access the current row of the cursor
+// a result set needs to be obtained prior to using the
+// WHERE CURRENT syntax
+ResultSet rs = s3.executeQuery("select * from 
+    FlightBookings FOR UPDATE of number_seats");
 PreparedStatement ps2 = conn.prepareStatement(
-     "UPDATE FlightBookings SET number_seats = ? " +
-        "WHERE CURRENT OF UPDATABLESTATEMENT");</codeblock><p>Typically, you
+    "UPDATE FlightBookings SET number_seats = ? " +
+       "WHERE CURRENT OF UPDATABLESTATEMENT");</codeblock><p>Typically, you
 do not assign a name to the cursor, but let the system generate one for you
 automatically. You can determine the system-generated cursor name of a <i>ResultSet</i> generated
-by a SELECT statement using the <codeph><i>ResultSet</i></codeph> class's <codeph><i>getCursorName</i></codeph> method.</p><codeblock
->PreparedStatement ps2 = conn.prepareStatement(
+by a SELECT statement using the <codeph><i>ResultSet</i></codeph> class's <codeph><i>getCursorName</i></codeph> method.</p><codeblock>PreparedStatement ps2 = conn.prepareStatement(
     "UPDATE employee SET bonus = ? WHERE CURRENT OF "+
         Updatable.getCursorName());</codeblock></context>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/devguide/tdevconcepts839040.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevconcepts839040.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevconcepts839040.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevconcepts839040.dita Fri Jul  1 02:15:43 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/devguide/tdevcsecure81850.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevcsecure81850.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevcsecure81850.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevcsecure81850.dita Fri Jul  1 02:15:43 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/devguide/tdevcsecure82556.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevcsecure82556.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevcsecure82556.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevcsecure82556.dita Fri Jul  1 02:15:43 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/devguide/tdevdeploy19136.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdeploy19136.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdeploy19136.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdeploy19136.dita Fri Jul  1 02:15:43 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/devguide/tdevdeploy26887.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdeploy26887.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdeploy26887.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdeploy26887.dita Fri Jul  1 02:15:43 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/devguide/tdevdeploy33704.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdeploy33704.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdeploy33704.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdeploy33704.dita Fri Jul  1 02:15:43 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/devguide/tdevdeploy39856.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita Fri Jul  1 02:15:43 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/devguide/tdevdvlp12233.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp12233.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp12233.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp12233.dita Fri Jul  1 02:15:43 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.  



Mime
View raw message