db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r208692 - /incubator/derby/docs/trunk/src/getstart/
Date Thu, 30 Jun 2005 22:52:29 GMT
Author: fuzzylogic
Date: Thu Jun 30 15:52:25 2005
New Revision: 208692

URL: http://svn.apache.org/viewcvs?rev=208692&view=rev
Log:
DERBY-379: Changes from review of Getting Started manual

Committed for Jeff Levitt <derby@mylevita.com>

Modified:
    incubator/derby/docs/trunk/src/getstart/cgs22227.dita
    incubator/derby/docs/trunk/src/getstart/cgs28881.dita
    incubator/derby/docs/trunk/src/getstart/cgs80725.dita
    incubator/derby/docs/trunk/src/getstart/cgschoos.dita
    incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita
    incubator/derby/docs/trunk/src/getstart/cgsinsta.dita
    incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
    incubator/derby/docs/trunk/src/getstart/cgsintdo.dita
    incubator/derby/docs/trunk/src/getstart/cgsintro.dita
    incubator/derby/docs/trunk/src/getstart/cgsintsr.dita
    incubator/derby/docs/trunk/src/getstart/cgslib19524.dita
    incubator/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita
    incubator/derby/docs/trunk/src/getstart/cgsnsexample.dita
    incubator/derby/docs/trunk/src/getstart/cgsquck13780.dita
    incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita
    incubator/derby/docs/trunk/src/getstart/cgsquck35643.dita
    incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita
    incubator/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita
    incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita
    incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita
    incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap
    incubator/derby/docs/trunk/src/getstart/gsconrefs.dita
    incubator/derby/docs/trunk/src/getstart/rgscopyright.dita
    incubator/derby/docs/trunk/src/getstart/rgsdocs10012.dita
    incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita
    incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita
    incubator/derby/docs/trunk/src/getstart/rgsdocs37966.dita
    incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita
    incubator/derby/docs/trunk/src/getstart/rgslib27507.dita
    incubator/derby/docs/trunk/src/getstart/rgslib46043.dita
    incubator/derby/docs/trunk/src/getstart/rgslib56653.dita
    incubator/derby/docs/trunk/src/getstart/rgsquck30197.dita
    incubator/derby/docs/trunk/src/getstart/rgsquck35368.dita
    incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita
    incubator/derby/docs/trunk/src/getstart/rgstrademderby.dita
    incubator/derby/docs/trunk/src/getstart/tgs26250.dita
    incubator/derby/docs/trunk/src/getstart/tgs36360.dita
    incubator/derby/docs/trunk/src/getstart/tgsrunningij.dita
    incubator/derby/docs/trunk/src/getstart/tgssetupjavaenvir.dita

Modified: incubator/derby/docs/trunk/src/getstart/cgs22227.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgs22227.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgs22227.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgs22227.dita Thu Jun 30 15:52:25 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/getstart/cgs28881.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgs28881.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgs28881.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgs28881.dita Thu Jun 30 15:52:25 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/getstart/cgs80725.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgs80725.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgs80725.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgs80725.dita Thu Jun 30 15:52:25 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/getstart/cgschoos.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgschoos.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgschoos.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgschoos.dita Thu Jun 30 15:52:25 2005
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
+<!--  
+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.  
+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.
+-->
+
 <concept id="cgschoos" xml:lang="en-us">
 <title>Choosing an installer</title>
 <conbody>

Modified: incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita Thu Jun 30 15:52:25 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/getstart/cgsinsta.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsinsta.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsinsta.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsinsta.dita Thu Jun 30 15:52:25 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/getstart/cgsinstallingderby.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita Thu Jun 30 15:52:25 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.  
@@ -23,14 +23,23 @@
 must first download the <ph conref="gsconrefs.dita#prod/productshortname"></ph> zip
 or tar archive from the <ph conref="gsconrefs.dita#prod/productshortname"></ph> web
 site at <xref format="html" href="http://incubator.apache.org/derby/derby_downloads.html"><ph
-conref="gsconrefs.dita#paths/pathdownload"></ph></xref>.</p>
-<p>Extract the file. The contents will be extracted into a directory named <codeph>apache-derby-10.0</codeph> that
-contains two subdirectories:<ol>
-<li>The <codeph>lib</codeph> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> jar
-files. </li>
+conref="gsconrefs.dita#paths/pathdownload"></ph></xref>. This downloads page
+includes provides several distributions of <ph conref="gsconrefs.dita#prod/productshortname"></ph>,
+including snapshot packages as well as stable-version binary distributions.
+You will also find information on accessing the active source distributions
+for <ph conref="gsconrefs.dita#prod/productshortname"></ph>. The distributions
+come in <i>bin</i>, <i>lib</i> and <i>src</i> packages. This guide assumes
+that you have downloaded the <i>bin</i> distribution package.</p>
+<p>Extract the downloaded package. The extracted installation contains several
+subdirectories:<ul>
+<li>The <codeph>demo</codeph> subdirectory contains demonstration programs.</li>
+<li>The <codeph>frameworks</codeph> subdirectory contains scripts for executing
+utilities and setting up the environment.</li>
 <li>The <codeph>javadoc</codeph> subdirectory contains the <codeph>api</codeph> documentation
 that was generated from source code comments.</li>
-</ol></p>
+<li>The <codeph>doc</codeph> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation.</li>
+<li>The <codeph>lib</codeph> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> jar
+files.</li>
+</ul></p>
 </conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/getstart/cgsintdo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsintdo.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsintdo.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsintdo.dita Thu Jun 30 15:52:25 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/getstart/cgsintro.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsintro.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsintro.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsintro.dita Thu Jun 30 15:52:25 2005
@@ -3,7 +3,7 @@
  "../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/getstart/cgsintsr.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsintsr.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsintsr.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsintsr.dita Thu Jun 30 15:52:25 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/getstart/cgslib19524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgslib19524.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgslib19524.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgslib19524.dita Thu Jun 30 15:52:25 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/getstart/cgsmanuallysetting.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita Thu Jun 30 15:52:25 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/getstart/cgsnsexample.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsnsexample.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsnsexample.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsnsexample.dita Thu Jun 30 15:52:25 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/getstart/cgsquck13780.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsquck13780.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsquck13780.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsquck13780.dita Thu Jun 30 15:52:25 2005
@@ -3,7 +3,7 @@
  "../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/getstart/cgsquck19524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita Thu Jun 30 15:52:25 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/getstart/cgsquck35643.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsquck35643.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsquck35643.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsquck35643.dita Thu Jun 30 15:52:25 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/getstart/cgsquck70629.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita Thu Jun 30 15:52:25 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,32 +18,12 @@
 -->
 <concept id="cgsquck70629" xml:lang="en-us">
 <title>Environments in which Derby can run</title>
-<conbody>
-<p>Before you configure your system to run <ph conref="gsconrefs.dita#prod/productshortname"></ph>,
+<shortdesc>Before you configure your system to run <ph conref="gsconrefs.dita#prod/productshortname"></ph>,
 it is useful to understand something about the different environments in which <ph
 conref="gsconrefs.dita#prod/productshortname"></ph> can run, because these
-environments affect the classpath, driver name, and database connection URL.
-See the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite> for
+environments affect the classpath, driver name, and database connection URL.</shortdesc>
+<conbody>
+<p>See the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite> for
 more information on <ph conref="gsconrefs.dita#prod/productshortname"></ph> environments.</p>
-<dl><dlentry>
-<dt>client/server environment</dt>
-<dd><p>When multiple applications connect to <ph conref="gsconrefs.dita#prod/productshortname"></ph> over
-the network, they are running in a client/server environment. <ph conref="gsconrefs.dita#prod/productshortname"></ph> runs
-embedded in a server framework that allows multiple network connections. (The
-framework itself starts up an instance of <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
-is running in an embedded environment. However, the client applications are
-not in the embedded environment. See the <cite><ph conref="gsconrefs.dita#pub/citadmin"></ph></cite> for
-more information on how to run <ph conref="gsconrefs.dita#prod/productshortname"></ph> on
-a server.)</p><p>It is also possible to embed <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
-any Java server framework. </p></dd>
-</dlentry><dlentry>
-<dt>embedded environment</dt>
-<dd><p>When an application starts up an instance of <ph conref="gsconrefs.dita#prod/productshortname"></ph> within
-its JVM, the application is said to run in an <i>embedded environment</i>.
-In this environment, only a single application can access a database at one
-time, and no network access occurs. Loading the embedded driver starts <ph
-conref="gsconrefs.dita#prod/productshortname"></ph>.</p></dd>
-</dlentry></dl>
 </conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita Thu Jun 30 15:52:25 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/getstart/cgsusingsysinfo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita Thu Jun 30 15:52:25 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/getstart/cgsusingtoolsutils.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita Thu Jun 30 15:52:25 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.  
@@ -23,11 +23,12 @@
 ij, and sysinfo. <ph conref="gsconrefs.dita#prod/productshortname"></ph> utilities
 include the import, export and database class utilities. The /frameworks/embedded/bin
 directory contains scripts for running some of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools
-and utilities in embedded mode.</p>
-<p>You can find similar scripts for running tools and utilities for the Network
-Server in the /frameworks/NetworkServer/bin directory. The scripts have descriptive
-names such as <codeph>sysinfo.bat</codeph> or <codeph>ij.ksh</codeph>. Like
-the classpath scripts, these scripts end with different extensions depending
+and utilities in embedded mode. You can find similar scripts for running tools
+and utilities for the Network Server in the /frameworks/NetworkServer/bin
+directory. In discussion of these tools and utilities in embedded mode, the /frameworks/embedded/bin
+directory is referred to as the /bin directory unless stated otherwise.</p>
+<p>The scripts have descriptive names such as <codeph>sysinfo.bat</codeph> or <codeph>ij.ksh</codeph>.
+Like the classpath scripts, these scripts end with different extensions depending
 on your environment. Windows scripts have a .bat extension, while Unix scripts
 have a .ksh extension. You might need to modify these scripts in order for
 the tools and utilities to run properly on Windows and Unix platforms.</p>
@@ -44,4 +45,3 @@
 <p>For more information on scripts, see <xref href="rgslib27507.dita#rgslib27507"></xref>.</p>
 </conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap (original)
+++ incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap Thu Jun 30 15:52:25 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,12 +19,12 @@
 <map title="Getting Started with Derby">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2004"/>
+<copyryear year="1997, 2005"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>
 <prodname>Getting Started with Derby</prodname>
-<vrmlist><vrm version="10"/></vrmlist>
+<vrmlist><vrm version="10.1"/></vrmlist>
 <brand>Apache Derby</brand></prodinfo>
 </topicmeta>
 <topicref href="rgscopyright.dita" navtitle="Copyright"></topicref>
@@ -42,9 +42,9 @@
 <topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
 </topicref>
 <topicref collection-type="family" href="cgsmanuallysetting.dita" navtitle="Manually setting environment variables and paths">
-<topicref collection-type="family" href="tgs36360.dita" navtitle="Set the DERBY_INSTALL environment variable">
-<topicref href="tgs26250.dita" navtitle="Set the classpath"></topicref>
+<topicref href="tgs36360.dita" navtitle="Set the DERBY_INSTALL environment variable">
 </topicref>
+<topicref href="tgs26250.dita" navtitle="Set the classpath"></topicref>
 </topicref>
 </topicref>
 <topicref collection-type="family" href="cgsquck19524.dita" navtitle="Quick start for experienced JDBC users">

Modified: incubator/derby/docs/trunk/src/getstart/gsconrefs.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/gsconrefs.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/gsconrefs.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/gsconrefs.dita Thu Jun 30 15:52:25 2005
@@ -3,7 +3,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.  
@@ -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/getstart/rgscopyright.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgscopyright.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgscopyright.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgscopyright.dita Thu Jun 30 15:52:25 2005
@@ -4,9 +4,9 @@
 
 <reference id="rgscopyright" 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

Modified: incubator/derby/docs/trunk/src/getstart/rgsdocs10012.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs10012.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs10012.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs10012.dita Thu Jun 30 15:52:25 2005
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-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.  
@@ -56,7 +56,7 @@
 </tgroup>
 </table></p></section>
 <section><p>An example of how SQL syntax is presented:   <codeblock><b>CREATE [ UNIQUE ] INDEX <b><i>IndexName</i></b>
-    ON <b><i>TableName</i></b> ( <b><i>SimpleColumnName</i></b> [ , <b><i>SimpleColumnName</i></b> ] * ) </b></codeblock></p></section>
+  ON <b><i>TableName</i></b> ( <b><i>SimpleColumnName</i></b> [ , <b><i>SimpleColumnName</i></b> ] * ) </b></codeblock></p></section>
 <section><p>Command-line syntax for running Java programs and utilities (as
 well as examples) always begins with the word <i>java</i>: <codeblock>java org.apache.derby.tools.ij</codeblock></p></section>
 <section><p>In addition, this documentation uses the IBM Software Development

Modified: incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita Thu Jun 30 15:52:25 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/getstart/rgsdocs18277.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita Thu Jun 30 15:52:25 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,58 +22,61 @@
 <section><p>This documentation uses some typographical conventions to highlight
 elements of the SQL language, operating system commands, and the Java programming
 language. <table expanse="page" frame="all">
-<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="26*"/>
-<colspec colname="2" colnum="2" colwidth="36*"/><colspec colname="3" colnum="3"
-colwidth="38*"/>
+<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="2" colnum="1" colwidth="35*"/>
+<colspec colname="COLSPEC0" colnum="2" colwidth="23*"/><colspec colname="3"
+colnum="3" colwidth="50*"/>
 <thead>
 <row>
-<entry colname="1">Typeface</entry>
 <entry colname="2">Usage</entry>
+<entry colname="COLSPEC0">Typeface</entry>
 <entry colname="3">Examples</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry colname="1" morerows="3">Italic</entry>
 <entry colname="2">New terms</entry>
+<entry colname="COLSPEC0">Italic</entry>
 <entry colname="3">defined by <i>keys</i></entry>
 </row>
 <row>
 <entry colname="2">File and directory names</entry>
+<entry colname="COLSPEC0">Italic</entry>
 <entry colname="3"><i>C:\<ph conref="gsconrefs.dita#prod/productlowercase"></ph></i></entry>
 </row>
 <row>
 <entry colname="2">Dictionary objects</entry>
+<entry colname="COLSPEC0">Italic</entry>
 <entry colname="3">The<i> Employees</i> table</entry>
 </row>
 <row>
 <entry colname="2">In syntax, items that you do not type exactly as they appear,
 but replace with the appropriate name </entry>
+<entry colname="COLSPEC0">Italic</entry>
 <entry colname="3"> <codeph>CREATE TABLE <i>tableName</i></codeph></entry>
 </row>
 <row>
-<entry colname="1" morerows="1">Bold, fixed-width</entry>
 <entry colname="2">SQL examples</entry>
-<entry colname="3"><codeph>SELECT city.getName() FROM Cities</codeph></entry>
+<entry colname="COLSPEC0">Bold and/or fixed-width</entry>
+<entry colname="3"><codeph><b>SELECT city_name FROM Cities</b></codeph></entry>
 </row>
 <row>
 <entry colname="2">Java application examples</entry>
-<entry colname="3"><codeph>Connection conn = DriverManager.getConnection
-("jdbc:derby:Sample")</codeph></entry>
+<entry colname="COLSPEC0">Bold and/or fixed-width</entry>
+<entry colname="3"><codeph>Connection conn = DriverManager.getConnection ("jdbc:derby:Sample")</codeph></entry>
 </row>
 <row>
-<entry colname="1">Bold, fixed-width</entry>
 <entry colname="2">Things you type in a command prompt</entry>
-<entry colname="3"><codeph>java org.apache.derby.tools.ij</codeph></entry>
+<entry colname="COLSPEC0">Bold and/or fixed-width</entry>
+<entry colname="3"><b><codeph>java org.apache.derby.tools.ij</codeph></b></entry>
 </row>
 <row>
-<entry colname="1">Roman, fixed-width</entry>
 <entry colname="2">Comments within examples</entry>
+<entry colname="COLSPEC0">Bold and/or fixed-width</entry>
 <entry colname="3"><codeph>--This line ignored</codeph></entry>
 </row>
 <row>
-<entry colname="1">All caps</entry>
 <entry colname="2">SQL keywords (commands)</entry>
+<entry colname="COLSPEC0">All caps</entry>
 <entry colname="3">You can use a CREATE TABLE statement</entry>
 </row>
 </tbody>
@@ -81,4 +84,3 @@
 </table></p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/getstart/rgsdocs37966.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs37966.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs37966.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs37966.dita Thu Jun 30 15:52:25 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/getstart/rgsdocs99397.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita Thu Jun 30 15:52:25 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/getstart/rgslib27507.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgslib27507.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgslib27507.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgslib27507.dita Thu Jun 30 15:52:25 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.  
@@ -23,11 +23,11 @@
 scripts in the <i>/bin</i> directory. Each script comes in two flavors, one
 ending in .<i>bat</i> and one ending in .<i>ksh</i>. Here is a complete listing:
   <ul>
+<li><i>frameworks/embedded/bin/dblook</i>  <p>Runs dblook.</p></li>
 <li><i>frameworks/embedded/bin/ij</i>   <p>Starts ij.</p></li>
 <li><i>frameworks/embedded/bin/setEmbeddedCP</i>   <p>Puts all the <ph conref="gsconrefs.dita#prod/productshortname"></ph> libraries
 for an embedded environment in the classpath.</p></li>
 <li><i>frameworks/embedded/bin/sysinfo</i>   <p>Runs sysinfo.</p></li>
-<li><i>frameworks/embedded/bin/dblook</i>  <p>Runs dblook.</p></li>
 <li><i>frameworks/NetworkServer/bin/dblook</i> <p>Runs dblook in a Network
 Server client context.</p></li>
 <li><i>frameworks/NetworkServer/bin/ij</i> <p>Runs ij in a Network Server
@@ -49,4 +49,3 @@
 </ul></p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/getstart/rgslib46043.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgslib46043.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgslib46043.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgslib46043.dita Thu Jun 30 15:52:25 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.  
@@ -29,7 +29,7 @@
 <colspec colname="2" colnum="2" colwidth="50*"/>
 <thead>
 <row>
-<entry colname="1">Library name and path</entry>
+<entry colname="1">Library name</entry>
 <entry colname="2">Use</entry>
 </row>
 </thead>
@@ -62,16 +62,33 @@
 Server.</entry>
 </row>
 <row>
-<entry nameend="2" namest="1"><b>The Network Client libraries</b></entry>
+<entry nameend="2" namest="1"><b>The network client libraries</b></entry>
 </row>
 <row>
 <entry colname="1">derbyclient.jar</entry>
-<entry colname="2">Required to use the <ph conref="gsconrefs.dita#prod/productshortname"></ph> Network
-Client driver.</entry>
+<entry colname="2">Required to use the <ph conref="gsconrefs.dita#prod/productshortname"></ph> network
+client driver.</entry>
+</row>
+<row>
+<entry nameend="2" namest="1"><b>The locale libraries</b></entry>
+</row>
+<row>
+<entry colname="1"><ul>
+<li>derbyLocale_es.jar</li>
+<li>derbyLocale_de_DE.jar</li>
+<li>derbyLocale_fr.jar</li>
+<li>derbyLocale_it.jar</li>
+<li>derbyLocale_ja_JP.jar</li>
+<li>derbyLocale_ko_KR.jar</li>
+<li>derbyLocale_pt_BR.jar</li>
+<li>derbyLocale_zh_CN.jar</li>
+<li>derbyLocale_zh_TW.jar</li>
+</ul></entry>
+<entry colname="2">Required to provide translated messages for the indicated
+locales.</entry>
 </row>
 </tbody>
 </tgroup>
 </table>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/getstart/rgslib56653.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgslib56653.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgslib56653.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgslib56653.dita Thu Jun 30 15:52:25 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/getstart/rgsquck30197.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsquck30197.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsquck30197.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsquck30197.dita Thu Jun 30 15:52:25 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.  
@@ -24,15 +24,22 @@
 </metadata></prolog>
 <refbody>
 <section><p>For the <ph conref="gsconrefs.dita#prod/productshortname"></ph>-provided
-driver listed in the previous section, the format for the database connection
-URL for connecting to an existing database is this:   <codeblock>jdbc:derby:<i>databaseName</i>;<i>URLAttributes</i></codeblock></p></section>
-<section><p>where:<ul>
+embedded driver, the format for the database connection URL for connecting
+to a database is this:   <codeblock>jdbc:derby:<i>databaseName</i>;<i>URLAttributes</i></codeblock>where:<ul>
 <li><i>databaseName</i>   <p>The name of the database that you want to connect
 to</p></li>
 <li><i>URLAttributes</i>   <p>One or more of the supported attributes of the
 database connection URL, such as ;<i>locale=ll_CC</i> or ;<i>create=true</i>. </p><p>For
 more information, see the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite>.</p></li>
 </ul></p></section>
+<section><p>For the <ph conref="gsconrefs.dita#prod/productshortname"></ph>-provided
+network client driver, the format for the database connection URL for connecting
+to a database is this:   <codeblock>jdbc:derby://&lt;server>[:&lt;port>]/
+<i>databaseName</i>[;<i>URLAttributes</i>=&lt;value> [;...]]</codeblock>where
+the &lt;server> and &lt;port> specify the host name (or IP address) and port
+number where the server is listening for requests. The <i>URLAttributes</i> can
+be either <ph conref="gsconrefs.dita#prod/productshortname"></ph> embedded
+or network client attributes. See the <ph conref="gsconrefs.dita#pub/citadmin"></ph> for
+more information on accessing the Network Server by using the network client.</p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/getstart/rgsquck35368.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsquck35368.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsquck35368.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsquck35368.dita Thu Jun 30 15:52:25 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/getstart/rgsquck67441.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita Thu Jun 30 15:52:25 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/getstart/rgstrademderby.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/rgstrademderby.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/rgstrademderby.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/rgstrademderby.dita Thu Jun 30 15:52:25 2005
@@ -2,7 +2,7 @@
 <!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.  
@@ -16,31 +16,15 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
 <topic id="rgstrademderby" 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="gsconrefs.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,
@@ -51,4 +35,3 @@
 of others.</p>
 </body>
 </topic>
-

Modified: incubator/derby/docs/trunk/src/getstart/tgs26250.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/tgs26250.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/tgs26250.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/tgs26250.dita Thu Jun 30 15:52:25 2005
@@ -2,7 +2,7 @@
 <!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.  

Modified: incubator/derby/docs/trunk/src/getstart/tgs36360.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/tgs36360.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/tgs36360.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/tgs36360.dita Thu Jun 30 15:52:25 2005
@@ -2,7 +2,7 @@
 <!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.  
@@ -19,8 +19,7 @@
 <task id="tgs36360" xml:lang="en-us">
 <title> Set the DERBY_INSTALL environment variable</title>
 <taskbody>
-<context> <p>During installation, you chose a base directory where the software
-was installed and should have named it <ph conref="gsconrefs.dita#prod/productinstallname"></ph>.
+<context> <p>During installation, a base directory was created where the software was installed. This document assumes that directory is named <ph conref="gsconrefs.dita#prod/productinstallname"></ph>.
 This document refers to that directory as the <ph conref="gsconrefs.dita#prod/productshortname"></ph> base
 directory.</p><p>If you plan to use the scripts in the <codeph>/frameworks/embedded/bin</codeph> directory
 and if your operating system supports it, create an environment variable called <ph

Modified: incubator/derby/docs/trunk/src/getstart/tgsrunningij.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/tgsrunningij.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/tgsrunningij.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/tgsrunningij.dita Thu Jun 30 15:52:25 2005
@@ -2,7 +2,7 @@
 <!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.  
@@ -28,8 +28,7 @@
 variables like CLASSPATH.</stepresult></step>
 <step><cmd>To create a database with ij, type the following command:</cmd>
 <stepxmp><codeblock>ij&gt; connect 'jdbc:derby:testdb;create=true';</codeblock></stepxmp>
-<stepresult>This command creates a database called testdb in the current directory
-and populates the system tables. You can then execute any SQL statements from
+<stepresult>This command creates a database called testdb in the current directory, populates the system tables, and connects to the database. You can then execute any SQL statements from
 the ij command line.</stepresult></step>
 <step><cmd>When you are ready to leave ij, type: </cmd><stepxmp><codeblock>ij&gt; exit;</codeblock></stepxmp>
 </step>

Modified: incubator/derby/docs/trunk/src/getstart/tgssetupjavaenvir.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/tgssetupjavaenvir.dita?rev=208692&r1=208691&r2=208692&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/tgssetupjavaenvir.dita (original)
+++ incubator/derby/docs/trunk/src/getstart/tgssetupjavaenvir.dita Thu Jun 30 15:52:25 2005
@@ -2,7 +2,7 @@
 <!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.



Mime
View raw message