db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r202296 [1/16] - in /incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Tue, 28 Jun 2005 22:46:37 GMT
Author: fuzzylogic
Date: Tue Jun 28 15:46:15 2005
New Revision: 202296

URL: http://svn.apache.org/viewcvs?rev=202296&view=rev
Log:
Derby-394: Improve formatting and presentation of the documentation.

1. Added more related links. DITA can dynamically create related links separated
   by conceptual info, task info, and reference material to the bottom of each
   page of each book. This means that not only does it place a link to the
   parent topic of each file, but it also adds sibling links and children links.
   When I originally created the DITA files for these books, I didn't account
   for this.

2. Implemented use of the <shortdesc> tag. If we separate the first few
   sentences of each topic from the rest of the content by placing them in a
   <shortdesc>, the result is that if the parent topic or any siblings have a
   link to that topic generated by DITA, then the content in the shortdesc tag
   is also pulled and used as a summary of the topic.

3. Improved badly-formed tables.

4. For the Server and Admin guide, editorial changes such as fixing grammar,
   spelling, and punctuation, removal of italics and bold type where it wasn't
   needed, and removal of empty topics.

Committed for Jeff Levitt <derby@mylevita.com>

Modified:
    incubator/derby/docs/trunk/src/adminguide/cadminapps.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps811478.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps811631.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps811656.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
    incubator/derby/docs/trunk/src/adminguide/cadminconfig813340.dita
    incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita
    incubator/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita
    incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita
    incubator/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup12677.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup21105.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup63476.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup67525.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita
    incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita
    incubator/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita
    incubator/derby/docs/trunk/src/adminguide/cadminlog98.dita
    incubator/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita
    incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov16172.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov17524.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov28261.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov33597.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov825125.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov825149.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov83312.dita
    incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
    incubator/derby/docs/trunk/src/adminguide/cadminovnsdemo.dita
    incubator/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita
    incubator/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita
    incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita
    incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita
    incubator/derby/docs/trunk/src/adminguide/cadminpreface11181.dita
    incubator/derby/docs/trunk/src/adminguide/cadminpreface22460.dita
    incubator/derby/docs/trunk/src/adminguide/cadminpreface23947.dita
    incubator/derby/docs/trunk/src/adminguide/cadminpreface30074.dita
    incubator/derby/docs/trunk/src/adminguide/cadminrollforward.dita
    incubator/derby/docs/trunk/src/adminguide/cadminservlet98430.dita
    incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita
    incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
    incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita
    incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfig.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita
    incubator/derby/docs/trunk/src/adminguide/radminconsist24642.dita
    incubator/derby/docs/trunk/src/adminguide/radminconsist30301.dita
    incubator/derby/docs/trunk/src/adminguide/radminconsist38781.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita
    incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita
    incubator/derby/docs/trunk/src/adminguide/radminlog800279.dita
    incubator/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita
    incubator/derby/docs/trunk/src/adminguide/radminovnssample.dita
    incubator/derby/docs/trunk/src/adminguide/radminservlet810694.dita
    incubator/derby/docs/trunk/src/adminguide/radminservlet810717.dita
    incubator/derby/docs/trunk/src/adminguide/radminservlet810910.dita
    incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita
    incubator/derby/docs/trunk/src/adminguide/tadminadv804451.dita
    incubator/derby/docs/trunk/src/adminguide/tadminapps811302.dita
    incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita
    incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita
    incubator/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita
    incubator/derby/docs/trunk/src/adminguide/tadminappsruntimeinfo.dita
    incubator/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig813498.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig813694.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig814934.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig814963.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig815768.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig815822.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig815853.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigalteringthestartnetworkserverscr.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigsysteminformation.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfiguringthenetworkserver.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita
    incubator/derby/docs/trunk/src/adminguide/tadmincrtdbbkup.dita
    incubator/derby/docs/trunk/src/adminguide/tadminhubbkup44.dita
    incubator/derby/docs/trunk/src/adminguide/tadminlog800206.dita
    incubator/derby/docs/trunk/src/adminguide/tadminlogfile.dita
    incubator/derby/docs/trunk/src/adminguide/tadminnetservrun.dita
    incubator/derby/docs/trunk/src/adminguide/tadminovclirun.dita
    incubator/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita
    incubator/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita
    incubator/derby/docs/trunk/src/adminguide/tadminspace43.dita
    incubator/derby/docs/trunk/src/adminguide/tadmintracefacility.dita
    incubator/derby/docs/trunk/src/devguide/cdevadvjdbc32436.dita
    incubator/derby/docs/trunk/src/devguide/cdevadvjdbc35053.dita
    incubator/derby/docs/trunk/src/devguide/cdevbabejgjd.dita
    incubator/derby/docs/trunk/src/devguide/cdevcbabejdfj.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts15366.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts19524.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts23499.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts28351.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts28436.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts30291.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts32861.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts34828.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts38375.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts41275.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure12392.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure24366.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure30032.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure31493.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure33663.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure38522.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure42374.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure51876.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure79358.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure862382.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure871035.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure871172.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure871230.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure871353.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure97760.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure99212.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecuree.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy12748.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy15325.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy15818.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy17604.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy21645.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy30736.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy32171.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy37603.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy38918.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy855368.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy856333.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy856753.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy857648.dita
    incubator/derby/docs/trunk/src/devguide/cdevdgpref11181.dita
    incubator/derby/docs/trunk/src/devguide/cdevdgpref23947.dita
    incubator/derby/docs/trunk/src/devguide/cdevdgpref29520.dita
    incubator/derby/docs/trunk/src/devguide/cdevdvlp19700.dita
    incubator/derby/docs/trunk/src/devguide/cdevdvlp24155.dita
    incubator/derby/docs/trunk/src/devguide/cdevdvlp27610.dita
    incubator/derby/docs/trunk/src/devguide/cdevdvlp40350.dita
    incubator/derby/docs/trunk/src/devguide/cdevdvlp40724.dita
    incubator/derby/docs/trunk/src/devguide/cdevdvlp845973.dita
    incubator/derby/docs/trunk/src/devguide/cdevdvlp91854.dita
    incubator/derby/docs/trunk/src/devguide/cdevin10613.dita
    incubator/derby/docs/trunk/src/devguide/cdevin38113.dita
    incubator/derby/docs/trunk/src/devguide/cdevin55108.dita
    incubator/derby/docs/trunk/src/devguide/cdevresman19524.dita
    incubator/derby/docs/trunk/src/devguide/cdevresman78715.dita
    incubator/derby/docs/trunk/src/devguide/cdevspecial.dita
    incubator/derby/docs/trunk/src/devguide/cdevspecial27163.dita
    incubator/derby/docs/trunk/src/devguide/cdevspecial27988.dita
    incubator/derby/docs/trunk/src/devguide/cdevspecial42117.dita
    incubator/derby/docs/trunk/src/devguide/cdevspecial49460.dita
    incubator/derby/docs/trunk/src/devguide/cdevspecial67198.dita
    incubator/derby/docs/trunk/src/devguide/cdevstandards806055.dita
    incubator/derby/docs/trunk/src/devguide/cdevstart19524.dita
    incubator/derby/docs/trunk/src/devguide/cdevstart98282.dita
    incubator/derby/docs/trunk/src/devguide/cdevtricks32436.dita
    incubator/derby/docs/trunk/src/devguide/derbydev.ditamap
    incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita
    incubator/derby/docs/trunk/src/devguide/rdevcsecure608.dita
    incubator/derby/docs/trunk/src/devguide/rdevcsecure871065.dita
    incubator/derby/docs/trunk/src/devguide/rdevcsecure871126.dita
    incubator/derby/docs/trunk/src/devguide/rdevcsecure871193.dita
    incubator/derby/docs/trunk/src/devguide/rdevcsecure871260.dita
    incubator/derby/docs/trunk/src/devguide/rdevcsecure871279.dita
    incubator/derby/docs/trunk/src/devguide/rdevcsecure871300.dita
    incubator/derby/docs/trunk/src/devguide/rdevcsecure871315.dita
    incubator/derby/docs/trunk/src/devguide/rdevcsecure871330.dita
    incubator/derby/docs/trunk/src/devguide/rdevcsecure871372.dita
    incubator/derby/docs/trunk/src/devguide/rdevdvlp22102.dita
    incubator/derby/docs/trunk/src/devguide/rdevdvlp38881.dita
    incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita
    incubator/derby/docs/trunk/src/devguide/rdevresman79556.dita
    incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita
    incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
    incubator/derby/docs/trunk/src/getstart/cgslib19524.dita
    incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita
    incubator/derby/docs/trunk/src/getstart/cgsquck70629.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/rgsdocs17307.dita
    incubator/derby/docs/trunk/src/getstart/rgsdocs18277.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/rgsquck67441.dita
    incubator/derby/docs/trunk/src/getstart/tgs26250.dita
    incubator/derby/docs/trunk/src/ref/crefjavstateautogen.dita
    incubator/derby/docs/trunk/src/ref/crefjdbc12657.dita
    incubator/derby/docs/trunk/src/ref/crefmpref1002477.dita
    incubator/derby/docs/trunk/src/ref/crefmpref23947.dita
    incubator/derby/docs/trunk/src/ref/crefsqlj18919.dita
    incubator/derby/docs/trunk/src/ref/crefsqlj21305.dita
    incubator/derby/docs/trunk/src/ref/crefsqlj28138.dita
    incubator/derby/docs/trunk/src/ref/crefsqlj31068.dita
    incubator/derby/docs/trunk/src/ref/crefsqlj39374.dita
    incubator/derby/docs/trunk/src/ref/crefsqlj41507.dita
    incubator/derby/docs/trunk/src/ref/refderby.ditamap
    incubator/derby/docs/trunk/src/ref/rrefaltercolumndef.dita
    incubator/derby/docs/trunk/src/ref/rrefaltertablecompress.dita
    incubator/derby/docs/trunk/src/ref/rrefapi1003363.dita
    incubator/derby/docs/trunk/src/ref/rrefapi1005026.dita
    incubator/derby/docs/trunk/src/ref/rrefapi10613.dita
    incubator/derby/docs/trunk/src/ref/rrefapi33761.dita
    incubator/derby/docs/trunk/src/ref/rrefattrib24612.dita
    incubator/derby/docs/trunk/src/ref/rrefattrib26867.dita
    incubator/derby/docs/trunk/src/ref/rrefblob.dita
    incubator/derby/docs/trunk/src/ref/rrefcallprocedure.dita
    incubator/derby/docs/trunk/src/ref/rrefcolumnname.dita
    incubator/derby/docs/trunk/src/ref/rrefconstraintname.dita
    incubator/derby/docs/trunk/src/ref/rrefcorrelationname.dita
    incubator/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita
    incubator/derby/docs/trunk/src/ref/rrefcreateprocedurestatement.dita
    incubator/derby/docs/trunk/src/ref/rrefcrprofunctionelement.dita
    incubator/derby/docs/trunk/src/ref/rrefcrprofunctionname.dita
    incubator/derby/docs/trunk/src/ref/rrefcrproprocedureelement.dita
    incubator/derby/docs/trunk/src/ref/rrefcrproprocedurename.dita
    incubator/derby/docs/trunk/src/ref/rrefcursorname.dita
    incubator/derby/docs/trunk/src/ref/rrefexcept13113.dita
    incubator/derby/docs/trunk/src/ref/rrefexcept16677.dita
    incubator/derby/docs/trunk/src/ref/rrefexcept71493.dita
    incubator/derby/docs/trunk/src/ref/rrefexcept75154.dita
    incubator/derby/docs/trunk/src/ref/rrefgpc1.dita
    incubator/derby/docs/trunk/src/ref/rrefindexname.dita
    incubator/derby/docs/trunk/src/ref/rrefjavcsti.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc15905.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc29973.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc32052.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc34565.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc34954.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc37244.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc37352.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc38274.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc40794.dita
    incubator/derby/docs/trunk/src/ref/rrefjssfns2.dita
    incubator/derby/docs/trunk/src/ref/rrefjta16677.dita
    incubator/derby/docs/trunk/src/ref/rrefjta18596.dita
    incubator/derby/docs/trunk/src/ref/rrefjta37588.dita
    incubator/derby/docs/trunk/src/ref/rreflimits.dita
    incubator/derby/docs/trunk/src/ref/rrefnewtablename.dita
    incubator/derby/docs/trunk/src/ref/rrefproceduresinplacecompress.dita
    incubator/derby/docs/trunk/src/ref/rrefrauthid.dita
    incubator/derby/docs/trunk/src/ref/rrefsauadt3.dita
    incubator/derby/docs/trunk/src/ref/rrefscalarsubquery.dita
    incubator/derby/docs/trunk/src/ref/rrefschemaname.dita
    incubator/derby/docs/trunk/src/ref/rrefselectexpression.dita
    incubator/derby/docs/trunk/src/ref/rrefsetstatstimingproc.dita
    incubator/derby/docs/trunk/src/ref/rrefsimplecolumnname.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs12813.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs38369.dita
    incubator/derby/docs/trunk/src/ref/rrefsql9241891.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj11277.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj12362.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj13083.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj13590.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj15309.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj15446.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj16095.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj16357.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj18922.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj19433.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj20937.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj21571.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj21583.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj23075.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj24513.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj25228.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj26498.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj27781.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj28468.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj29026.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj29840.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj30118.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj30540.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj31580.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj31648.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj31783.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj32268.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj32654.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj32693.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj33215.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj33520.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj33562.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj33602.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj33923.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj34148.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj35034.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj35981.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj38716.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj40506.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj40774.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj41360.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj42082.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj42154.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj42324.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj42476.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj43125.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj57522.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj59893.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj61102.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj66113.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj73147.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj81859.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj91438.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj93082.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj98067.dita
    incubator/derby/docs/trunk/src/ref/rrefsqljcreatesynonym.dita
    incubator/derby/docs/trunk/src/ref/rrefsqljcurrenttimestamp.dita
    incubator/derby/docs/trunk/src/ref/rrefsqljdropsynonym.dita
    incubator/derby/docs/trunk/src/ref/rrefsqljrenametablestatement.dita
    incubator/derby/docs/trunk/src/ref/rrefsynonymname.dita
    incubator/derby/docs/trunk/src/ref/rreftableexpression.dita
    incubator/derby/docs/trunk/src/ref/rreftablename.dita
    incubator/derby/docs/trunk/src/ref/rreftablesubquery.dita
    incubator/derby/docs/trunk/src/ref/rreftriggername.dita
    incubator/derby/docs/trunk/src/ref/rrefviewname.dita
    incubator/derby/docs/trunk/src/tools/ctoolsij32837.dita
    incubator/derby/docs/trunk/src/tools/ctoolsij34525.dita
    incubator/derby/docs/trunk/src/tools/ctoolsijcomref15645.dita
    incubator/derby/docs/trunk/src/tools/ctoolsijcomref18998.dita
    incubator/derby/docs/trunk/src/tools/ctoolsijtools11318.dita
    incubator/derby/docs/trunk/src/tools/ctoolsijtools20118.dita
    incubator/derby/docs/trunk/src/tools/ctoolsijtools26429.dita
    incubator/derby/docs/trunk/src/tools/ctoolsijtools30948.dita
    incubator/derby/docs/trunk/src/tools/ctoolsijtools37363.dita
    incubator/derby/docs/trunk/src/tools/ctoolsijtools70959.dita
    incubator/derby/docs/trunk/src/tools/ctoolsijtools90477.dita
    incubator/derby/docs/trunk/src/tools/ctoolsimport12925.dita
    incubator/derby/docs/trunk/src/tools/ctoolsimport13648.dita
    incubator/derby/docs/trunk/src/tools/ctoolsimport16245.dita
    incubator/derby/docs/trunk/src/tools/ctoolspre23947.dita
    incubator/derby/docs/trunk/src/tools/ctoolspre29520.dita
    incubator/derby/docs/trunk/src/tools/ctoolssysinfo1002931.dita
    incubator/derby/docs/trunk/src/tools/derbytools.ditamap
    incubator/derby/docs/trunk/src/tools/rtools1003161.dita
    incubator/derby/docs/trunk/src/tools/rtoolsdblookexamples.dita
    incubator/derby/docs/trunk/src/tools/rtoolsdrvrnmeurl.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref11128.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref11943.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref12333.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref17631.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref20382.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref22318.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref24423.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref25570.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref25753.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref27997.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref28886.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref30679.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref33373.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref36618.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref37862.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref39042.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref39198.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref40155.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref44032.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref53869.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref61708.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref62772.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref79286.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref94092.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref97975.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijprop11002670.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijpropref10135.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijpropref12236.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijpropref28788.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijpropref29864.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijpropref35032.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijpropref41073.dita
    incubator/derby/docs/trunk/src/tools/rtoolssysinfo41288.dita
    incubator/derby/docs/trunk/src/tools/ttoolsij11815.dita
    incubator/derby/docs/trunk/src/tools/ttoolsij30600.dita
    incubator/derby/docs/trunk/src/tools/ttoolsij97656.dita
    incubator/derby/docs/trunk/src/tools/ttoolsij98878.dita
    incubator/derby/docs/trunk/src/tuning/ctundepth10525.dita
    incubator/derby/docs/trunk/src/tuning/ctundepth13055.dita
    incubator/derby/docs/trunk/src/tuning/ctundepth14326.dita
    incubator/derby/docs/trunk/src/tuning/ctundepth21935.dita
    incubator/derby/docs/trunk/src/tuning/ctundepth853133.dita
    incubator/derby/docs/trunk/src/tuning/ctunoptimz23977.dita
    incubator/derby/docs/trunk/src/tuning/ctunoptimz27975.dita
    incubator/derby/docs/trunk/src/tuning/ctunoptimz30217.dita
    incubator/derby/docs/trunk/src/tuning/ctunoptimz860097.dita
    incubator/derby/docs/trunk/src/tuning/ctunperf25864.dita
    incubator/derby/docs/trunk/src/tuning/ctunperf54492.dita
    incubator/derby/docs/trunk/src/tuning/ctunperf816059.dita
    incubator/derby/docs/trunk/src/tuning/ctunperf816635.dita
    incubator/derby/docs/trunk/src/tuning/ctunproper22250.dita
    incubator/derby/docs/trunk/src/tuning/ctunpropref1002477.dita
    incubator/derby/docs/trunk/src/tuning/ctunpropref11181.dita
    incubator/derby/docs/trunk/src/tuning/ctunpropref23947.dita
    incubator/derby/docs/trunk/src/tuning/ctunsetprop11108.dita
    incubator/derby/docs/trunk/src/tuning/ctunsetprop12821.dita
    incubator/derby/docs/trunk/src/tuning/ctunsetprop13074.dita
    incubator/derby/docs/trunk/src/tuning/ctunsetprop24222.dita
    incubator/derby/docs/trunk/src/tuning/ctunsetprop824533.dita
    incubator/derby/docs/trunk/src/tuning/ctunstats849203.dita
    incubator/derby/docs/trunk/src/tuning/ctuntransform11313.dita
    incubator/derby/docs/trunk/src/tuning/ctuntransform13699.dita
    incubator/derby/docs/trunk/src/tuning/ctuntransform16033.dita
    incubator/derby/docs/trunk/src/tuning/ctuntransform35783.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper10607.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper13766.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper18151.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper23835.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper24846.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper25025.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper25581.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper27355.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper27467.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper33027.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper34037.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper35028.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper37341.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper39325.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper46141.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper81359.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper98166.dita
    incubator/derby/docs/trunk/src/tuning/rtunpropercachedn.dita
    incubator/derby/docs/trunk/src/tuning/rtunsearchauthdn.dita
    incubator/derby/docs/trunk/src/tuning/rtunsearchauthpw.dita
    incubator/derby/docs/trunk/src/tuning/rtunstorminrecsize.dita
    incubator/derby/docs/trunk/src/tuning/rtuntransform208.dita
    incubator/derby/docs/trunk/src/tuning/tuningderby.ditamap

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps.dita Tue Jun 28 15:46:15 2005
@@ -20,11 +20,10 @@
 <title>Differences between running Derby in embedded mode and using the Network
 Server</title>
 <prolog><metadata>
-<keywords><indexterm>Network Server<indexterm>Derby features not supported
-in</indexterm></indexterm></keywords>
+<keywords><indexterm>Network Server<indexterm>Differences with embedded driver</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>This section contains information on the differences between running <ph
+<p>This section describes the differences between running <ph
 conref="adminconrefs.dita#prod/productshortname"></ph> in embedded mode and
 using the Network Server. Note that there may be undocumented differences
 that have not yet been identified.</p>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita Tue Jun 28 15:46:15 2005
@@ -17,40 +17,39 @@
 limitations under the License.
 -->
 <concept id="cadminapps49914" xml:lang="en-us">
-<title>User authentication</title>
+<title>User authentication differences</title>
 <prolog><metadata>
-<keywords><indexterm>User authentication<indexterm>and Network Server</indexterm></indexterm>
-<indexterm>Network Server<indexterm>user authentication and</indexterm></indexterm>
-<indexterm>org.apache.derby.jdbc.ClientDataSource. CLEAR_TEXT_ PASSWORD_SECURITY</indexterm>
-<indexterm>Security properties<indexterm>supported by Network Server</indexterm></indexterm>
-<indexterm>Network Server<indexterm>supported security properties</indexterm></indexterm>
-<indexterm>org.apache.derby.jdbc.ClientDataSource. USER_ONLY_SECURITY</indexterm>
-<indexterm>org.apache.derby.jdbc.ClientDataSource. ENCRYPTED_USER_AND_
-PASSWORD_SECURITY</indexterm></keywords>
+<keywords><indexterm>User authentication differences<indexterm>and Network
+Server</indexterm></indexterm><indexterm>Network Server<indexterm>user authentication
+and</indexterm></indexterm><indexterm>org.apache.derby.jdbc.ClientDataSource.
+CLEAR_TEXT_ PASSWORD_SECURITY</indexterm><indexterm>Security properties<indexterm>supported
+by Network Server</indexterm></indexterm><indexterm>Network Server<indexterm>supported
+security properties</indexterm></indexterm><indexterm>org.apache.derby.jdbc.ClientDataSource.
+USER_ONLY_SECURITY</indexterm><indexterm>org.apache.derby.jdbc.ClientDataSource.
+ENCRYPTED_USER_AND_ PASSWORD_SECURITY</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>As when running <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
-embedded mode, you can enable or disable server-side user authentication when
-using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server. However, the default security mechanism (<codeph>CLEAR_TEXT_PASSWORD</codeph>)
+<p>When running <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
+embedded mode or when using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server, you can enable or disable server-side user authentication. However,
+when using the Network Server, the default security mechanism (<codeph>CLEAR_TEXT_PASSWORD</codeph>)
 requires that you supply both the user name and password.</p>
 <p>In addition to the default user name and password security mechanism, <i>org.apache.derby.jdbc.ClientDataSource.CLEAR_TEXT_PASSWORD_SECURITY, </i
 > <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server
 supports the following security properties:</p>
 <ul>
 <li><i>UserID  (</i><codeph><i>org.apache.derby.jdbc.ClientDataSource.USER_ONLY_SECURITY)</i></codeph> 
- <p>When using this mechanism, only the user property needs to be specified.</p></li>
+ <p>When using this mechanism, you must specify only the user property.</p></li>
 <li><i>Encrypted UserID and encrypted password  (org.apache.derby.jdbc.ClientDataSource.ENCRYPTED_USER
 AND_PASSWORD_SECURITY)</i>   <p>When using this mechanism, both password and
-user are encrypted.</p></li>
+user id are encrypted.</p></li>
 </ul>
-<p>The user's name specified upon connection is the default schema for the
-connection, if a schema with that name exists. See the "User Names and Schemas"
-section in the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite>.</p>
+<p>The user's name that is specified upon connection is the default schema
+for the connection, if a schema with that name exists. See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
+more information on schema and user names.</p>
 <p>If you specify any other security mechanism, you will receive an exception.</p>
-<p>To change the default, you can specify another security mechanism as a
-property or on the URL (using the securityMechanism attribute) when making
+<p>To change the default, you can specify another security mechanism either
+as a property or on the URL (using the securityMechanism attribute) when making
 the connection.</p>
 </conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita Tue Jun 28 15:46:15 2005
@@ -20,6 +20,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p>You must make certain changes to Java applications that currently run against <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
+<p>You must modify Java applications that currently run against <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
 embedded mode so that they work with the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server. The topics in this section discuss these changes.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita Tue Jun 28 15:46:15 2005
@@ -20,66 +20,89 @@
 <title>Accessing the Network Server by using the DB2 Universal Driver</title>
 <prolog></prolog>
 <conbody>
-<p>You can use the DB2 Universal Driver instead of the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Client driver when connecting to the Network Server. Your application needs
-to load the driver and connection URL specific to the Network Server. In addition,
-you specify a user name and password. If you have not set up authentication,
-you can use any value for the user name and password. The driver you use 
-to access the Network Server is: <codeblock>com.ibm.db2.jcc.DB2Driver</codeblock>You
+<p>You can use the DB2 Universal Driver instead of the <ph conref="adminconrefs.dita#prod/productshortname"></ph> network
+client driver to connect to the Network Server. Your application needs to
+load the driver and connection URL that is specific to the Network Server.
+In addition, you specify a user name and password. If you have not set up
+authentication, you can use any value for the user name and password. The
+driver that you use  to access the Network Server is: <codeblock>com.ibm.db2.jcc.DB2Driver</codeblock>You
 must have the following two jar files present in your classpath in order to
 use the DB2 Universal Driver:<ul>
 <li><codeph>db2jcc.jar</codeph></li>
 <li><codeph>db2jcc_license_c.jar</codeph></li>
 </ul></p>
-<p>The URL that is needed to access the Network Server is:</p>
+<p>The syntax of the URL that is required to access the Network Server is:</p>
 <codeblock>jdbc:derby:net://&lt;<i>server</i>&gt;[:&lt;<i>port</i>&gt;]/
 &lt;<i>databaseName</i>&gt;[;&lt;<ph conref="adminconrefs.dita#prod/productshortname"></ph> URL attribute&gt;=&lt;value&gt; [;...]]
 [:&lt;Universal Driver attribute&gt;=&lt;value&gt;; [...;]]</codeblock>
-<p>After the database name and attributes you can include attributes for the
-DB2 JDBC Driver. You must include a semicolon after the last Universal Driver
-attribute.</p>
-<ul>
-<li><i>server</i>   <p>The name of the machine where the server is running.
-It can be the name of the machine (for example, <i>buffy</i>) or the address,
-for example, <i>158.58.62.225</i>.</p><note>Unless the Network Server was
-started with the <codeph>-h</codeph> option or the <i>derby.drda.host</i> property
-set, this value should be <codeph>localhost</codeph>.</note></li>
-<li><i>port</i>   <p>The port the server is listening to. The default is 1527.</p></li>
-<li><i>database name</i>   <p>The name of the database you are connecting
-to. The database name can be at most 18 characters long. You must use double
-quotes (") to include path information in the database name. Alternately,
-you can specify path information by setting the property <i>derby.system.home</i> in
-either the <codeph><i>derby.properties</i></codeph> file or in the Java environment
-when starting the Network Server. See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
-more information about defining the system home.</p></li>
-<li><i><ph conref="adminconrefs.dita#prod/productlowercase"></ph> URL attribute=value</i> 
- <p>Optional database connection URL attributes supported by <ph conref="adminconrefs.dita#prod/productshortname"></ph>.
-See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
-more information.</p></li>
-<li><i>Universal Driver Attribute=value</i>   <p>Optional database connection
-URL attributes supported by the DB2 Universal JDBC Driver.</p><p>The DB2 JDBC
-Universal Driver requires that you set the Universal Driver user and password
-attributes to non-null values.</p><p>Here is a list of the DB2 Universal JDBC
-Driver attributes available to you when running the Network Server:</p><ul>
-<li><i>user </i>   <p>User name (required by the Universal JDBC Driver).</p></li>
-<li><i>password</i>   <p>User password (required by the Universal JDBC Driver).</p></li>
-<li><i>portNumber</i>   <p>The TCP/IP port number where the Network Server
-listens for connection requests to this data source. The default is 1527.</p></li>
-<li><i>retrieveMessagesFromServerOnGetMessage</i>   <p>Displays error messages
-from the server.</p></li>
-<li><i>readOnly</i>   <p>Creates a read-only connection. The default is false.</p></li>
-<li><i>logWriter</i> <p>A character output stream. All logging and tracing
-messages print to the <codeph>logWriter</codeph> property.</p></li>
-<li><i>traceLevel</i> <p>Specifies the granularity of logging messages to
-the <codeph>logWriter</codeph> property.</p></li>
-<li><i>traceFile</i> <p>Provides an explicit file location for the trace output.</p></li>
-<li><i>securityMechanism</i> <p>Indicates what type of security mechanism
-is used.</p></li>
-<li><i>deferPrepares</i> <p>Controls when prepared statements are physically
-prepared in the database server. The default value is <codeph>true</codeph>.</p></li>
-</ul></li>
-</ul>
-<section><title>Universal Driver System information</title> <p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+<p>After you specify the database name and attributes, you can include attributes
+for the DB2 JDBC Driver. You must include a semicolon after the last Universal
+Driver attribute.</p>
+<dl><dlentry>
+<dt>server</dt>
+<dd>The name of the machine where the server is running. It can be the name
+of the machine (for example, <i>buffy</i>) or the IP address, for example, <i>158.58.62.225</i>.<note>Unless
+the Network Server was started with the <codeph>-h</codeph> option or the <i>derby.drda.host</i> property
+set, this value must be <codeph>localhost</codeph>.</note></dd>
+</dlentry><dlentry>
+<dt>port</dt>
+<dd>The port that the server is listening to. The default is 1527.</dd>
+</dlentry><dlentry>
+<dt>database name</dt>
+<dd>The name of the database that you are connecting to. The database name
+can be a maximum of 18 characters. You must use quotation marks (") to include
+path information in the database name. Alternately, you can specify path information
+by setting the property <i>derby.system.home</i> in either the <codeph><i>derby.properties</i></codeph> file
+or in the Java environment when you start the Network Server. See the <cite><ph
+conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for more information
+about defining the system home.</dd>
+</dlentry><dlentry>
+<dt><i><ph conref="adminconrefs.dita#prod/productlowercase"></ph> URL attribute=value</i></dt>
+<dd>Optional database connection URL attributes that are supported by <ph
+conref="adminconrefs.dita#prod/productshortname"></ph>. See the <cite><ph
+conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for more information.</dd>
+</dlentry><dlentry>
+<dt><i>Universal Driver Attribute=value</i></dt>
+<dd><p>Optional database connection URL attributes that are supported by the
+DB2 Universal JDBC Driver.</p><p>The DB2 JDBC Universal Driver requires that
+you set the Universal Driver user and password attributes to non-null values.</p><p>The
+following DB2 Universal JDBC Driver attributes are available to you when running
+the Network Server:</p><dl><dlentry>
+<dt>user</dt>
+<dd><p>User name (required by the Universal JDBC Driver).</p></dd>
+</dlentry><dlentry>
+<dt>password</dt>
+<dd><p>User password (required by the Universal JDBC Driver).</p></dd>
+</dlentry><dlentry>
+<dt>portNumber</dt>
+<dd><p>The TCP/IP port number where the Network Server listens for connection
+requests to this data source. The default is 1527.</p></dd>
+</dlentry><dlentry>
+<dt>retrieveMessagesFromServerOnGetMessage</dt>
+<dd><p>Displays error messages from the server.</p></dd>
+</dlentry><dlentry>
+<dt>readOnly</dt>
+<dd><p>Creates a read-only connection. The default is false.</p></dd>
+</dlentry><dlentry>
+<dt>logWriter</dt>
+<dd><p>A character output stream. All logging and tracing messages print to
+the <codeph>logWriter</codeph> property.</p></dd>
+</dlentry><dlentry>
+<dt>traceLevel</dt>
+<dd><p>Specifies the granularity of logging messages to the <codeph>logWriter</codeph> property.</p></dd>
+</dlentry><dlentry>
+<dt>traceFile</dt>
+<dd><p>Provides an explicit file location for the trace output.</p></dd>
+</dlentry><dlentry>
+<dt>securityMechanism</dt>
+<dd><p>Indicates what type of security mechanism is used.</p></dd>
+</dlentry><dlentry>
+<dt>deferPrepares</dt>
+<dd><p>Controls when prepared statements are physically prepared in the database
+server. The default value is true.</p></dd>
+</dlentry></dl></dd>
+</dlentry></dl>
+<section><title>Universal Driver System information</title><p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
 Server is compatible with the DB2 JDBC Universal Driver release 1.2 and higher.</p></section>
 </conbody>
 </concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps811478.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps811478.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps811478.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps811478.dita Tue Jun 28 15:46:15 2005
@@ -26,7 +26,7 @@
 <conbody>
 <p>Both the <ph conref="adminconrefs.dita#prod/productshortname"></ph> embedded
 driver and the Network Server provide XA support. The Network Server provides
-DRDA level 7 support. DRDA clients supporting XAMGR can send XA requests to
+DRDA level 7 support. DRDA clients that support XAMGR can send XA requests to
 the Network Server. </p>
 </conbody>
 </concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps811631.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps811631.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps811631.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps811631.dita Tue Jun 28 15:46:15 2005
@@ -20,7 +20,5 @@
 <prolog>
 </prolog>
 <conbody>
-<p>When user authentication is enabled in <ph conref="adminconrefs.dita#prod/productshortname"></ph>, you have the option
-of using the default security mechanism, user name and password, or of specifying
-that the security mechanism be encrypted user and password. </p>
+<p>When user authentication is enabled in <ph conref="adminconrefs.dita#prod/productshortname"></ph>, you can either use the default security mechanism (user name and password) or you can specify that the security mechanism be encrypted user and password.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps811656.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps811656.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps811656.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps811656.dita Tue Jun 28 15:46:15 2005
@@ -23,7 +23,6 @@
 <conbody>
 <p>When user authentication is turned off in <ph conref="adminconrefs.dita#prod/productshortname"></ph>, you can use any
 of the security mechanism options.</p>
-<p>A user and password need to be provided for all security mechanisms except <i>USER_ONLY_SECURITY</i>. However, because user authentication
-is disabled in the <ph conref="adminconrefs.dita#prod/productshortname"></ph> server, the user name and password you supply
-does not have to be one recognized as valid by <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</p>
+<p>You must provide a user and password for all security mechanisms except <i>USER_ONLY_SECURITY</i>. However, because user authentication
+is disabled in the <ph conref="adminconrefs.dita#prod/productshortname"></ph> server, the user name and password that you supply does not have to be one recognized as valid by <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita Tue Jun 28 15:46:15 2005
@@ -18,20 +18,23 @@
 -->
 <concept id="cadminappsclient" xml:lang="en-us">
 <title>Accessing the Network Server by using the network client driver</title>
-<prolog></prolog>
+<shortdesc>When connecting to the Network Server, your application needs to
+load a driver and connection URL that is specific to the Network Server. In
+addition, you must specify a user name and password if you are using authentication.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>Network client driver</indexterm></keywords>
+</metadata></prolog>
 <conbody>
-<p>When connecting to the Network Server, your application needs to load a
-driver and connection URL specific to the Network Server. In addition, you
-specify a user name and password if you are using authentication. The driver
-you need to access the Network Server is: <codeblock>org.apache.derby.jdbc.ClientDriver</codeblock></p>
-<p>The URL that is needed to access the Network Server is:<codeblock>jdbc:derby://&lt;<i>server</i>&gt;[:&lt;<i>port</i>&gt;]/
+<p>The driver that you need to access the Network Server is: <codeblock>org.apache.derby.jdbc.ClientDriver</codeblock></p>
+<p>The syntax of the URL that is required to access the Network Server is:<codeblock>jdbc:derby://&lt;<i>server</i>&gt;[:&lt;<i>port</i>&gt;]/
 &lt;<i>databaseName</i>&gt;[;&lt;URL attribute&gt;=&lt;value&gt; [;...]]
 </codeblock>where the <codeph>&lt;URL attribute&gt;</codeph> is either a <ph
 conref="adminconrefs.dita#prod/productshortname"></ph> embedded or network
 client attribute.</p>
 <table><title>Standard JDBC DataSource properties</title>
-<tgroup cols="5"><colspec colname="col1"/><colspec colname="col2"/><colspec
-colname="col3"/><colspec colname="COLSPEC0" colwidth="1*"/><colspec colname="col4"/>
+<tgroup cols="5"><colspec colname="col1" colwidth="110*"/><colspec colname="col2"
+colwidth="49*"/><colspec colname="col3" colwidth="106*"/><colspec colname="COLSPEC0"
+colwidth="73*"/><colspec colname="col4" colwidth="144*"/>
 <thead>
 <row valign="bottom">
 <entry colname="col1">Property</entry>
@@ -43,43 +46,43 @@
 </thead>
 <tbody>
 <row>
-<entry colname="col1"><i>databaseName</i></entry>
+<entry colname="col1">databaseName</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">The name of the database. This property is required.</entry>
 <entry colname="COLSPEC0"></entry>
-<entry colname="col4">The property is also available using EmbeddedDataSource.</entry>
+<entry colname="col4">This property is also available using EmbeddedDataSource.</entry>
 </row>
 <row>
-<entry colname="col1"><i>dataSourceName</i></entry>
+<entry colname="col1">dataSourceName</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">The data source name.</entry>
 <entry colname="COLSPEC0"></entry>
-<entry colname="col4">The property is also available using EmbeddedDataSource.</entry>
+<entry colname="col4">This property is also available using EmbeddedDataSource.</entry>
 </row>
 <row>
-<entry colname="col1"><i>description</i></entry>
+<entry colname="col1">description</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">A description of the data source.</entry>
 <entry colname="COLSPEC0"></entry>
-<entry colname="col4">The property is also available using EmbeddedDataSource.</entry>
+<entry colname="col4">This property is also available using EmbeddedDataSource.</entry>
 </row>
 <row>
-<entry colname="col1"><i>user</i></entry>
+<entry colname="col1">user</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">The user's account name.</entry>
 <entry colname="COLSPEC0">user</entry>
-<entry colname="col4">Default is APP. The property is also available using
+<entry colname="col4">Default is APP. This property is also available using
 EmbeddedDataSource.</entry>
 </row>
 <row>
-<entry colname="col1"><i>password</i></entry>
+<entry colname="col1">password</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">The user's database password.</entry>
 <entry colname="COLSPEC0">password</entry>
-<entry colname="col4">The property is also available using EmbeddedDataSource.</entry>
+<entry colname="col4">This property is also available using EmbeddedDataSource.</entry>
 </row>
 <row>
-<entry colname="col1"><i>serverName</i></entry>
+<entry colname="col1">serverName</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">The host name or TCP/IP address where the server is
 listening for requests.</entry>
@@ -87,7 +90,7 @@
 <entry colname="col4">Default is "localhost".</entry>
 </row>
 <row>
-<entry colname="col1"><i>portNumber</i></entry>
+<entry colname="col1">portNumber</entry>
 <entry colname="col2">Integer</entry>
 <entry colname="col3">The port number where the server is listening for requests.</entry>
 <entry colname="COLSPEC0"></entry>
@@ -97,8 +100,9 @@
 </tgroup>
 </table>
 <table><title>Client-specific DataSource properties</title>
-<tgroup cols="5"><colspec colname="col1"/><colspec colname="col2"/><colspec
-colname="col3"/><colspec colname="COLSPEC1" colwidth="1*"/><colspec colname="col4"/>
+<tgroup cols="5"><colspec colname="col1" colwidth="114*"/><colspec colname="col2"
+colwidth="61*"/><colspec colname="col3" colwidth="101*"/><colspec colname="COLSPEC1"
+colwidth="121*"/><colspec colname="col4" colwidth="85*"/>
 <thead>
 <row valign="bottom">
 <entry colname="col1">Property</entry>
@@ -110,7 +114,7 @@
 </thead>
 <tbody>
 <row>
-<entry colname="col1"><i>traceFile</i></entry>
+<entry colname="col1">traceFile</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">The filename for tracing output. Setting this property
 turns on tracing. See <xref href="cadminappsclienttracing.dita#cadminappsclienttracing"></xref>.</entry>
@@ -118,16 +122,16 @@
 <entry colname="col4"></entry>
 </row>
 <row>
-<entry colname="col1"><i>traceDirectory</i></entry>
+<entry colname="col1">traceDirectory</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">The directory for the tracing output. Each connection
-will output to a separate file. Setting this property turns on tracing. See <xref
-href="cadminappsclienttracing.dita#cadminappsclienttracing"></xref>.</entry>
+will send output to a separate file. Setting this property turns on tracing.
+See <xref href="cadminappsclienttracing.dita#cadminappsclienttracing"></xref>.</entry>
 <entry colname="COLSPEC1"><i>traceDirectory</i></entry>
 <entry colname="col4"></entry>
 </row>
 <row>
-<entry colname="col1"><i>traceLevel</i></entry>
+<entry colname="col1">traceLevel</entry>
 <entry colname="col2">Integer</entry>
 <entry colname="col3">The level of client tracing if <i>traceFile</i> or <i>traceDirectory</i> are
 set.</entry>
@@ -135,7 +139,7 @@
 <entry colname="col4">The default is TRACE_ALL.</entry>
 </row>
 <row>
-<entry colname="col1"><i>traceFileAppend</i></entry>
+<entry colname="col1">traceFileAppend</entry>
 <entry colname="col2">Boolean</entry>
 <entry colname="col3">Value is true if tracing output should append to the
 existing trace file.</entry>
@@ -143,19 +147,19 @@
 <entry colname="col4">The default is false.</entry>
 </row>
 <row>
-<entry colname="col1"><i>securityMechanism</i></entry>
+<entry colname="col1">securityMechanism</entry>
 <entry colname="col2">Integer</entry>
 <entry colname="col3">The security mechanism. See <xref href="cadminappsclientsecurity.dita#cadminappsclientsecurity"></xref>.</entry>
 <entry colname="COLSPEC1"><i>securityMechanism</i></entry>
-<entry colname="col4">The default is USER_ONLY_SECURITY.</entry>
+<entry colname="col4">The default is USER_ONLY _SECURITY.</entry>
 </row>
 <row>
-<entry colname="col1"><i>retrieveMessageText</i></entry>
+<entry colname="col1">retrieveMessageText</entry>
 <entry colname="col2">Boolean</entry>
 <entry colname="col3">Retrieve message text from the server. A stored procedure
-is called to retrieve the message text with each <i>SQLException</i> and may
-start a new unit of work. Set to false if you do not want the performance
-impact or when starting new units of work.</entry>
+is called to retrieve the message text with each <i>SQLException</i> and might
+start a new unit of work. Set this property to false if you do not want the
+performance impact or when starting new units of work.</entry>
 <entry colname="COLSPEC1"><i>retrieveMessageText</i></entry>
 <entry colname="col4">The default is true.</entry>
 </row>
@@ -163,9 +167,9 @@
 </tgroup>
 </table>
 <table><title>Server-Specific DataSource properties</title>
-<tgroup cols="5"><colspec colname="col1"/><colspec colname="col2"/><colspec
-colname="COLSPEC2" colwidth="1*"/><colspec colname="col3"/><colspec colname="COLSPEC3"
-colwidth="1*"/>
+<tgroup cols="5"><colspec colname="col1" colwidth="122*"/><colspec colname="col2"
+colwidth="37*"/><colspec colname="COLSPEC2" colwidth="108*"/><colspec colname="col3"
+colwidth="77*"/><colspec colname="COLSPEC3" colwidth="141*"/>
 <thead>
 <row valign="bottom">
 <entry colname="col1">Property</entry>
@@ -177,14 +181,14 @@
 </thead>
 <tbody>
 <row>
-<entry colname="col1"><i>connectionAttributes</i></entry>
+<entry colname="col1">connectionAttributes</entry>
 <entry colname="col2">String</entry>
 <entry colname="COLSPEC2">Set to the list of <ph conref="adminconrefs.dita#prod/productshortname"></ph> embedded
-connection attributes separated by semicolons. See the <ph conref="adminconrefs.dita#pub/citref"></ph>.</entry>
-<entry colname="col3">Various. See the <ph conref="adminconrefs.dita#pub/citref"></ph>.</entry>
-<entry colname="COLSPEC3">The property is also available using EmbeddedDataSource.
+connection attributes separated by semicolons.</entry>
+<entry colname="col3">Various</entry>
+<entry colname="COLSPEC3">This property is also available using EmbeddedDataSource.
 See the <ph conref="adminconrefs.dita#pub/citref"></ph> for more information
-on the various connection attributes.</entry>
+about the various connection attributes.</entry>
 </row>
 </tbody>
 </tgroup>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita Tue Jun 28 15:46:15 2005
@@ -1,7 +1,6 @@
 <?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.  
 
@@ -18,7 +17,7 @@
 limitations under the License.
 -->
 <reference id="cadminappsclientsecurity" xml:lang="en-us">
-<title>Network Client security</title>
+<title>Network client security</title>
 <shortdesc>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
 Client allows you to select a security mechanism by specifying a value for
 the <codeph>securityMechanism</codeph> property.</shortdesc>
@@ -26,24 +25,24 @@
 <keywords><indexterm>Network Client security</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p>You can set the <codeph>securityMechanism</codeph> property
-in one of the following ways:<ul>
-<li>When using the <codeph>DriverManager</codeph> interface, set <codeph>securityMechanism</codeph> in
+<section><p>You can set the <codeph>securityMechanism</codeph> property in
+one of the following ways:<ul>
+<li>When you are using the <codeph>DriverManager</codeph> interface, set <codeph>securityMechanism</codeph> in
 a <codeph>java.util.Properties</codeph> object before you invoke the form
-of the <codeph>getConnection</codeph> method which includes the <codeph>java.util.Properties</codeph> parameter.</li>
-<li>When using the <codeph>DataSource</codeph> interface and creating and
-deploying your own DataSource objects, invoke the <codeph>DataSource.setSecurityMechanism</codeph> method
+of the <codeph>getConnection</codeph> method, which includes the <codeph>java.util.Properties</codeph> parameter.</li>
+<li>When you are using the <codeph>DataSource</codeph> interface to create
+and deploy your own DataSource objects, invoke the <codeph>DataSource.setSecurityMechanism</codeph> method
 after you create a DataSource object.</li>
 </ul><xref href="cadminappsclientsecurity.dita#cadminappsclientsecurity/radminappsclientsecuritytable"></xref> lists
 the security mechanisms that the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
 Client supports, and the corresponding property value to specify to obtain
-this <codeph>securityMechanism</codeph>. The default security mechanism is
-the userid only if no password is set. If the password is set, the default
-security mechanism is both the userid and password. The default user is APP
-if no other is specified.<table id="radminappsclientsecuritytable"><title>Security
-mechanisms supported by the Derby Network Client</title>
-<tgroup cols="3"><colspec colname="col1"/><colspec colname="col2"/><colspec
-colname="col3"/>
+this securityMechanism. The default security mechanism is the user id only
+if no password is set. If the password is set, the default security mechanism
+is both the user id and password. The default user is APP if no other user
+is specified.<table id="radminappsclientsecuritytable"><title>Security mechanisms
+supported by the Derby Network Client</title>
+<tgroup cols="3"><colspec colname="col1" colwidth="68*"/><colspec colname="col2"
+colwidth="134*"/><colspec colname="col3" colwidth="89*"/>
 <thead>
 <row valign="bottom">
 <entry colname="col1">Security and mechanism</entry>
@@ -53,17 +52,17 @@
 </thead>
 <tbody>
 <row>
-<entry colname="col1">Userid and password</entry>
+<entry colname="col1">User id and password</entry>
 <entry colname="col2">ClientDataSource. CLEAR_TEXT_PASSWORD_SECURITY (0x03)</entry>
 <entry colname="col3">Default if password is set</entry>
 </row>
 <row>
-<entry colname="col1">Userid only</entry>
+<entry colname="col1">User id only</entry>
 <entry colname="col2">ClientDataSource. USER_ONLY_SECURITY (0x04)</entry>
 <entry colname="col3">Default if password is not set</entry>
 </row>
 <row>
-<entry colname="col1">Encrypted userid and encrypted password</entry>
+<entry colname="col1">Encrypted user id and encrypted password</entry>
 <entry colname="col2">ClientDataSource. ENCRYPTED_USER_AND_ PASSWORD_SECURITY
 (0x09)</entry>
 <entry colname="col3">Encryption requires a JCE implementation that supports
@@ -74,4 +73,3 @@
 </table></p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita Tue Jun 28 15:46:15 2005
@@ -26,12 +26,13 @@
 </metadata></prolog>
 <refbody>
 <section><p>There are various ways to obtain trace output. However, the easiest
-way to turn on tracing is to use the <codeph>traceFile</codeph> attribute
-on the URL in <codeph>ij</codeph>. The example below shows all tracing going
-to the file <codeph>trace.out</codeph> from an <codeph>ij</codeph> session.<codeblock>ij>connect 'jdbc:derby://localhost:1527/mydb;
+way to obtain trace output is to use the <codeph>traceFile</codeph> attribute
+on the URL in <codeph>ij</codeph>. The following example shows all tracing
+going to the file <codeph>trace.out</codeph> from an <codeph>ij</codeph> session.<codeblock>ij>connect 'jdbc:derby://localhost:1527/mydb;
 create=true;traceFile=trace.out;user=user1;password=secret4me';</codeblock></p></section>
-<section><title>ClientDataSource tracing</title><p>You can use one of three
-methods to collect tracing data while obtaining connections from the ClientDataSource:<ul>
+<section><title>Implementing ClientDataSource tracing</title><p>You can use
+one of three methods to collect tracing data while obtaining connections from
+the ClientDataSource:<ul>
 <li>Use the <codeph>setLogWriter(java.io.PrintWriter)</codeph> method of ClientDataSource
 and set the <codeph>PrintWriter</codeph> to a non-null value.</li>
 <li>Use the <codeph>setTraceFile(String filename)</codeph> method of ClientDataSource.</li>
@@ -39,24 +40,25 @@
 to trace each connection flow in its own file for programs that have multiple
 connections.</li>
 </ul></p></section>
-<section><title>DriverManager tracing</title><p>Use one of the following two
-options to enable and collect tracing information while obtaining connections
-using the DriverManager:<ul>
+<section><title>Implementing DriverManager tracing</title><p>Use one of the
+following two options to enable and collect tracing information while obtaining
+connections using the DriverManager:<ul>
 <li>Use the <codeph>setLogWriter(java.io.PrintWriter)</codeph> method of DriverManager
 and set the <codeph>PrintWriter</codeph> to a non null-value.</li>
 <li>Use the <codeph>traceFile</codeph> or <codeph>traceDirectory</codeph> URL
 attributes to set these properties prior to creating the connection with the <codeph>DriverManager.getConnection()</codeph> method.</li>
 </ul></p></section>
-<section><title>Changing the default trace level</title><p>The trace level
-defaults to <codeph>ClientDataSource.TRACE_ALL</codeph>. The tracing can be
-changed by calling the <codeph>setTraceLevel(int level)</codeph> method or
+<section><title>Changing the default trace level</title><p>The default trace
+level is <codeph>ClientDataSource.TRACE_ALL</codeph>. You can choose the tracing
+level by calling the <codeph>setTraceLevel(int level)</codeph> method or by
 setting the <codeph>traceLevel</codeph> URL attribute:<codeblock>String url = "jdbc:derby://samplehost.sampledomain.com:1528/mydb" +
  ";traceFile=/u/user1/trace.out" +
  ";traceLevel=" +
  org.apache.derby.jdbc.ClientDataSource.TRACE_PROTOCOL_FLOWS;
 DriverManager.getConnection(url,"user1","secret4me");</codeblock><table><title>Available
 tracing levels and values</title>
-<tgroup cols="2"><colspec colname="col1"/><colspec colname="col2"/>
+<tgroup cols="2"><colspec colname="col1" colwidth="166*"/><colspec colname="col2"
+colwidth="30*"/>
 <thead>
 <row valign="bottom">
 <entry colname="col1">Trace level</entry>
@@ -81,7 +83,7 @@
 <entry colname="col2">0x3</entry>
 </row>
 <row>
-<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_DRIVER_CONFIGURATION</entry>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE _DRIVER_CONFIGURATION</entry>
 <entry colname="col2">0x10</entry>
 </row>
 <row>
@@ -93,11 +95,11 @@
 <entry colname="col2">0x40</entry>
 </row>
 <row>
-<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_RESULT_SET_META_DATA</entry>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE _RESULT_SET_META_DATA</entry>
 <entry colname="col2">0x80</entry>
 </row>
 <row>
-<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_PARAMETER_META_DATA</entry>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE _PARAMETER_META_DATA</entry>
 <entry colname="col2">0x100</entry>
 </row>
 <row>
@@ -114,11 +116,11 @@
 </row>
 </tbody>
 </tgroup>
-</table>To specify more than one trace, use one of the following techniques:<ul>
-<li>Use bitwise OR ( | ) operators with two or more trace values. For example,
+</table>To specify more than one trace level, use one of the following techniques:<ul>
+<li>Use bitwise OR operators ( | ) with two or more trace values. For example,
 to trace PROTOCOL flows and connection calls, specify this value for traceLevel:<codeblock>TRACE_PROTOCOL_FLOWS | TRACE_CONNECTION_CALLS</codeblock
 ></li>
-<li>Use a bitwise complement ( ~ ) operator with a trace value to specify
+<li>Use a bitwise complement operator ( ~ ) with a trace value to specify
 all except a certain trace. For example, to trace everything except PROTOCOL
 flows, specify this value for traceLevel:<codeblock>~TRACE_PROTOCOL_FLOWS</codeblock></li>
 </ul></p></section>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminconfig813340.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminconfig813340.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminconfig813340.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminconfig813340.dita Tue Jun 28 15:46:15 2005
@@ -1,34 +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 id="cadminconfig813340" xml:lang="en-us">
-<title>The Network Server and JVMs</title>
-<prolog><metadata>
-<keywords><indexterm>JVMs<indexterm>compatibility with Network Server</indexterm></indexterm>
-<indexterm>Network Server<indexterm>and JVM compatibility</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server is compatible with <b><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 2 Platform, Standard Edition, v 1.3.1
-(J2SE)</b> and above. </p>
-</conbody>
-</concept>
-

Modified: incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?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.  
 
@@ -14,11 +16,17 @@
 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="cadminconfig86869">
+<concept id="cadminconfig86869" xml:lang="en-us">
 <title>Managing the Derby Network Server</title>
-<prolog>
-</prolog>
+<shortdesc>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server can run as a stand-alone server, with <ph conref="adminconrefs.dita#prod/productshortname"></ph> as
+an embedded part of the application. </shortdesc>
+<prolog></prolog>
 <conbody>
-<p>This section explains how to manage the Network Server.</p>
-</conbody></concept>
+<p>It can also be managed remotely from a web server by using a servlet interface.
+You can manage the Network Server by using shell scripts, the command line,
+or the Network Server API. See <xref href="cadminservlet98430.dita#cadminservlet98430"></xref> for
+information about starting and shutting down the Network Server using the
+servlet interface.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?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.  
 
@@ -14,20 +16,15 @@
 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="cadminconfigoverview">
+<concept id="cadminconfigoverview" xml:lang="en-us">
 <title>Overview</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <conbody>
-<p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server can run as a stand-alone server, with <ph conref="adminconrefs.dita#prod/productshortname"></ph> as
-an embedded part of the application. It can also be managed remotely from
-a Web server through a servlet interface. This chapter explains how to manage
-the Network Server using shell scripts, the command line, or the Network Server
-API. See <xref href="cadminservlet98430.dita#cadminservlet98430"/> for information about
-starting and shutting down the Network Server using the servlet interface.</p>
-<p>You start the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server using the command line or using
-the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Server API. (<ph conref="adminconrefs.dita#prod/productshortname"></ph> provides scripts for you to use to
-start the server from the command line.) Before starting the server, you will
-probably set certain <ph conref="adminconrefs.dita#prod/productshortname"></ph> and Network Server properties.</p>
-</conbody></concept>
+<p>You start the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server using the command line or using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Server
+API. (<ph conref="adminconrefs.dita#prod/productshortname"></ph> provides
+scripts for you to use to start the server from the command line.) Before
+starting the server, you will probably set certain <ph conref="adminconrefs.dita#prod/productshortname"></ph> and
+Network Server properties.</p>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita Tue Jun 28 15:46:15 2005
@@ -18,18 +18,14 @@
 -->
 <concept id="cadminconsist01" xml:lang="en-us">
 <title>Checking database consistency</title>
-<shortdesc><ph conref="adminconrefs.dita#prod/productshortname"></ph> is a
-robust product that contains many safeguards to ensure that the database remains
-consistent.</shortdesc>
+<shortdesc>If you experience hardware or operating system failure, you can use the SYSCS_UTIL.SYSCS_CHECK_TABLE function to verify that the database is still consistent.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Consistency<indexterm>checking database</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>If, however, you have experienced hardware or operating system failure
-and you want to verify that the database is still consistent, <ph conref="adminconrefs.dita#prod/productshortname"></ph> provides
-a way to do this. Check consistency only if there are indications that such
-a check is needed, because a consistency check can take a long time on a large
+<p>Check consistency only if there are indications that such
+a check is needed because a consistency check can take a long time on a large
 database.</p>
 </conbody>
 </concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita Tue Jun 28 15:46:15 2005
@@ -20,7 +20,7 @@
 <prolog>
 </prolog>
 <conbody>
-<p>In one thread, the embedding application boots the local JDBC driver for
+<p>In one thread, the embedding application starts the local JDBC driver for
 its own access.</p>
 <codeblock>/* loading the client driver boots the client driver only*/
 Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
@@ -28,7 +28,7 @@
     "jdbc:derby:sample");
 
 </codeblock>
-<p>In another thread, the same application boots the server framework to allow
-remote access. Booting the server framework from within the application allows
+<p>In another thread, the same application starts the server framework to allow
+remote access. Starting the server framework from within the application allows
 both the server and the application to run in the same JVM.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita Tue Jun 28 15:46:15 2005
@@ -17,28 +17,26 @@
 limitations under the License.
 -->
 <concept id="cadminhubbkup01" xml:lang="en-us">
-<title>Using the backup procedure</title>
+<title>Using the backup procedure to perform an online backup</title>
+<shortdesc>The SYSCS_UTIL.SYSCS_BACKUP_DATABASE procedure locks the database
+and performs the copy operation.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Backup procedure</indexterm><indexterm>SYSCS_UTIL.SYSCS_BACKUP_DATABASE()
+<keywords><indexterm>Backup procedure</indexterm><indexterm>SYSCS_BACKUP_DATABASE()
 system procedure</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>The <i>SYSCS_UTIL.SYSCS_BACKUP_DATABASE()</i> procedure locks the database
-and performs the copy operation.</p>
-<p> The <codeph><i>SYSCS_UTIL.SYSCS_BACKUP_DATABASE()</i></codeph> procedure
-takes a string argument representing the location in which to back up the
-database. Typically you provide the full path to the backup directory. (Relative
-paths are interpreted as relative to the current directory, not to the <codeph><i>derby.system.home</i></codeph> directory.)</p>
-<p>For example, to specify a backup location of <filepath>c:/mybackups/2004-06-01</filepath> for
-the currently-open database, you would use the following statement:</p>
+<p>The SYSCS_UTIL.SYSCS_BACKUP_DATABASE procedure
+takes a string argument that represents the location in which to back up the
+database. Typically, you provide the full path to the backup directory. (Relative
+paths are interpreted as relative to the current directory, not to the derby.system.home directory.)</p>
+<p>For example, to specify a backup location of <filepath>c:/mybackups/2004-06-01</filepath> for a database that is currently open, use the following statement (forward slashes are used as path separators in SQL commands):</p>
 <codeblock><b>CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE('c:/mybackups/2004-06-01')</b></codeblock>
-<note>Use forward slashes as the path separator in SQL commands.</note>
 <p>The <i>SYSCS_UTIL.SYSCS_BACKUP_DATABASE()</i> procedure puts the database
 into a state in which it can be safely copied, then copies the entire original
-database directory (including data files, on-line transaction log files, and
-jar files) to the specified backup directory. Files not within the original
+database directory (including data files, online transaction log files, and
+jar files) to the specified backup directory. Files that are not within the original
 database directory (for example, <i>derby.properties</i>) are <i>not</i> copied.</p>
-<p>Here is an example that backs up a database to a directory with a name
+<p>The following example shows how to back up a database to a directory with a name
 that reflects the current date:</p>
 <codeblock>public static void backUpDatabase(Connection conn)throws SQLException
 {
@@ -54,7 +52,7 @@
 cs.close();
 System.out.println("backed up database to "+backupdirectory);
 }</codeblock>
-<p>For a database backed up on 2004-06-01, the above commands copy the current
+<p>For a database that was backed up on 2004-06-01, the previous commands copy the current
 database to a directory of the same name in <i>c:/mybackups/2004-06-01</i>.</p>
 <p>Uncommitted transactions do not appear in the backed-up database.</p>
 <note>Do not back up different databases with the same name to the same backup

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup12677.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup12677.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup12677.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup12677.dita Tue Jun 28 15:46:15 2005
@@ -21,22 +21,21 @@
 <title>Offline backups</title>
 <prolog></prolog>
 <conbody>
-<p>To perform an offline backup of a database, simply use operating system
-commands to copy the database directory. The database must be shut down prior
+<p>To perform an offline backup of a database, use operating system
+commands to copy the database directory. You must shut down the database prior
 to performing an offline backup. </p>
-<p>For example, on Windows NT, the following operating system command would
-back up a (closed) database named <i>sample</i> located in <filepath>d:\mydatabases</filepath> by
+<p>For example, on Windows systems, the following operating system command 
+backs up a (closed) database that is named <i>sample</i> and that is located in <filepath>d:\mydatabases</filepath> by
 copying it to the directory <filepath>c:\mybackups\2004-06-01</filepath>:</p>
-<codeblock><b>xcopy d:\mydatabases\sample c:\mybackups\2004-06-01\sample /s /i</b></codeblock>
-<p>(If you are not using Windows NT, substitute the appropriate operating
-system command for copying a directory and all contents to a new location.)</p>
-<note>On Windows NT, do not attempt to update a database while it is being
-backed up in this way. Attempting to update a database during an off-line
-backup will generate a <i>java.io.IOException</i>. Using on-line backups prevent
+<codeblock>xcopy d:\mydatabases\sample c:\mybackups\2004-06-01\sample /s /i</codeblock>
+<p>If you are not using Windows, substitute the appropriate operating
+system command for copying a directory and all contents to a new location.</p>
+<note>On Windows systems, do not attempt to update a database while it is being
+backed up in this way. Attempting to update a database during an offline
+backup will generate a java.io.IOException. Using online backups prevents
 this from occurring.</note>
 <p>For large systems, shutting down the database might not be convenient.
-To back up a database without having to take it off line, system administrators
-should use on-line backups, described next.</p>
+To back up a database without having to shut it down, you can use an online backup.</p>
 </conbody>
 </concept>
 

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup21105.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup21105.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup21105.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup21105.dita Tue Jun 28 15:46:15 2005
@@ -17,6 +17,8 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminhubbkup21105">
 <title>Backing up encrypted databases</title>
+<shortdesc>When you back up an encrypted database, both the backup and the log files
+remain encrypted.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>Encrypted databases<indexterm>backing up</indexterm></indexterm>
@@ -25,7 +27,5 @@
 </metadata>
 </prolog>
 <conbody>
-<p>When you back up an encrypted database, both the backup and the log files
-remain encrypted. To restore an encrypted database, you must know the boot
-password.</p>
+<p>To restore an encrypted database, you must know the boot password.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup63476.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup63476.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup63476.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup63476.dita Tue Jun 28 15:46:15 2005
@@ -20,12 +20,8 @@
 <prolog>
 </prolog>
 <conbody>
-<p>Use online backups to back up a database while it is booted. During the
-interval the backup is running, the database can be read, but writes to the
+<p>Use online backups to back up a database while it is running. During the
+interval that the backup is running, the database can be read, but writes to the
 database are blocked. </p>
-<p>There are two ways to perform on-line backups:</p>
-<ul>
-<li><xref href="cadminhubbkup01.dita#cadminhubbkup01"/></li>
-<li><xref href="cadminhubbkup75469.dita#cadminhubbkup75469"/></li>
-</ul>
+<p>You can perform online backups by using the backup procedure or by using operating systems commands with the freeze and unfreeze system procedures.</p>
 </conbody></concept>



Mime
View raw message