You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2006/06/12 22:37:50 UTC
svn commit: r413739 - in /db/derby/docs/trunk/src: adminguide/ devguide/
getstart/ ref/ workingwithderby/
Author: rhillegas
Date: Mon Jun 12 13:37:49 2006
New Revision: 413739
URL: http://svn.apache.org/viewvc?rev=413739&view=rev
Log:
DERBY-1398: Commit bug1398_miscDoc_01.diff. These are miscellaneous copy-editting fixes to the user guides.
Modified:
db/derby/docs/trunk/src/adminguide/cadminapps811478.dita
db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita
db/derby/docs/trunk/src/adminguide/cadminov38650.dita
db/derby/docs/trunk/src/adminguide/tadminapps811302.dita
db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita
db/derby/docs/trunk/src/devguide/cdevspecial13670.dita
db/derby/docs/trunk/src/devguide/cdevspecial49460.dita
db/derby/docs/trunk/src/devguide/tdevupgradesoft.dita
db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
db/derby/docs/trunk/src/ref/crefjavbclobnot.dita
db/derby/docs/trunk/src/ref/crefmpref23947.dita
db/derby/docs/trunk/src/ref/rrefjdbc96386.dita
db/derby/docs/trunk/src/workingwithderby/cwwdsummary.dita
Modified: db/derby/docs/trunk/src/adminguide/cadminapps811478.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps811478.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminapps811478.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminapps811478.dita Mon Jun 12 13:37:49 2006
@@ -26,7 +26,8 @@
<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 that support XAMGR can send XA requests to
+DRDA level 7 support. DRDA clients that support XAMGR, such as the
+Derby network client, can send XA requests to
the Network Server. </p>
</conbody>
</concept>
Modified: db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita Mon Jun 12 13:37:49 2006
@@ -34,8 +34,6 @@
the first exception when using the network client. The text of the additional
exceptions will be appended to the text of the first exception. See <xref
href="radminapps811974.dita#radminapps811974"></xref>.</li>
-<li>There are no localized error messages for the network client.</li>
-<li>The network client driver fully materializes LOBS when retrieving a row.</li>
<li>Scrollable cursors (<codeph>ResultSet.TYPE_SCROLL_SENSITIVE</codeph> or <codeph>ResultSet.TYPE_SCROLL_INSENSITIVE</codeph>)
are not supported using the network client if the result set contains LOB
data. <codeph>TYPE_FORWARD_ONLY</codeph> must be specified for result sets
Modified: db/derby/docs/trunk/src/adminguide/cadminov38650.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov38650.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminov38650.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminov38650.dita Mon Jun 12 13:37:49 2006
@@ -20,7 +20,7 @@
<prolog>
</prolog>
<conbody>
-<p>This guide assumes that you are familiar with <ph conref="adminconrefs.dita#prod/productshortname"></ph> features and and tuning. Before reading this guide, you should first learn about basic <ph conref="adminconrefs.dita#prod/productshortname"></ph> functionality
+<p>This guide assumes that you are familiar with <ph conref="adminconrefs.dita#prod/productshortname"></ph> features and tuning. Before reading this guide, you should first learn about basic <ph conref="adminconrefs.dita#prod/productshortname"></ph> functionality
by reading the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite>. Also, because multi-user environments typically
have performance and tuning issues, you should read <cite><ph conref="adminconrefs.dita#pub/cittuning"></ph></cite>.</p>
</conbody></concept>
Modified: db/derby/docs/trunk/src/adminguide/tadminapps811302.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminapps811302.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminapps811302.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminapps811302.dita Mon Jun 12 13:37:49 2006
@@ -25,18 +25,15 @@
<taskbody>
<context> To use the ij tool with the network client driver:</context>
<steps>
-<step><cmd>Specify the <codeph>org.apache.derby.jdbc.ClientDriver</codeph> driver in
-any of the following ways:</cmd>
+<step><cmd>Startup ij in
+one of the following ways:</cmd>
<substeps>
<substep><cmd>Use a script.</cmd><stepxmp>Run the ij.bat script on Windows
systems and the ij.ksh script on UNIX systems. These scripts are located in
the $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph> directory.</stepxmp>
</substep>
-<substep><cmd>Run the ij tool from the command line.</cmd><stepxmp><codeblock>java -Dij.driver='org.apache.derby.jdbc.ClientDriver'
- org.apache.derby.tools.ij </codeblock
+<substep><cmd>Run the ij tool from the command line.</cmd><stepxmp><codeblock>java org.apache.derby.tools.ij </codeblock
></stepxmp></substep>
-<substep><cmd>Use the DRIVER command.</cmd><stepxmp><codeblock>ij> DRIVER 'org.apache.derby.jdbc.ClientDriver'; </codeblock></stepxmp>
-</substep>
</substeps>
</step>
<step><cmd>Connect by specifying the URL:</cmd><stepxmp><codeblock>ij> CONNECT 'jdbc:derby://localhost:1527/sample'
Modified: db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita Mon Jun 12 13:37:49 2006
@@ -58,6 +58,6 @@
implementation of SQL in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
<p><ph conref="devconrefs.dita#prod/productshortname"></ph> implements JDBC
that allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to serve
-a resource manager in a J2EE compliant system.</p>
+as a resource manager in a J2EE compliant system.</p>
</conbody>
</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevspecial13670.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevspecial13670.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial13670.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial13670.dita Mon Jun 12 13:37:49 2006
@@ -26,7 +26,8 @@
<refbody>
<section><p>The following trigger action copies a row from the <i>flights</i> table
into the <i>flight_history</i> table whenever any row gets inserted into <i>flights</i> and
-adds the comment "inserted from trig1" in the <i>status</i> column of the<i>flight_history</i> table.</p></section>
+adds the comment "inserted from trig1" in the <i>status</i> column of
+the <i>flight_history</i> table.</p></section>
<example> <codeblock><b>CREATE TRIGGER trig1
AFTER UPDATE ON flights
REFERENCING OLD AS UPDATEDROW
Modified: db/derby/docs/trunk/src/devguide/cdevspecial49460.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevspecial49460.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial49460.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial49460.dita Mon Jun 12 13:37:49 2006
@@ -31,7 +31,7 @@
the transaction on the current connection is rolled back to the point before
the triggering event. For example, suppose Trigger A causes Trigger B to fire.
If Trigger B throws an exception, the current connection is rolled back to
-the point before to the statement in Trigger A that caused Trigger B to fire.
+the point before the statement in Trigger A that caused Trigger B to fire.
Trigger A is then free to catch the exception thrown by Trigger B and continue
with its work. If Trigger A does not throw an exception, the statement that
caused Trigger A, as well as any work done in Trigger A, continues until the
Modified: db/derby/docs/trunk/src/devguide/tdevupgradesoft.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevupgradesoft.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevupgradesoft.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevupgradesoft.dita Mon Jun 12 13:37:49 2006
@@ -18,7 +18,7 @@
-->
<task id="tdevupgradesoft" xml:lang="en-us">
<title>Soft upgrade</title>
-<shortdesc>Soft upgrade allows you run a newer version of <ph conref="devconrefs.dita#prod/productshortname"></ph> against
+<shortdesc>Soft upgrade allows you to run a newer version of <ph conref="devconrefs.dita#prod/productshortname"></ph> against
an existing database without having to fully upgrade the database. This means
that you can continue to run an older version of <ph conref="devconrefs.dita#prod/productshortname"></ph> against
the database.</shortdesc>
Modified: db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita Mon Jun 12 13:37:49 2006
@@ -25,7 +25,7 @@
<conbody>
<p> Navigate your Web browser to <xref format="html" href="http://db.apache.org/derby/derby_downloads.html"><ph
conref="gsconrefs.dita#paths/pathdownload"></ph></xref>. This downloads page
-includes provides several distributions of <ph conref="gsconrefs.dita#prod/productshortname"></ph>,
+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
Modified: db/derby/docs/trunk/src/ref/crefjavbclobnot.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefjavbclobnot.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefjavbclobnot.dita (original)
+++ db/derby/docs/trunk/src/ref/crefjavbclobnot.dita Mon Jun 12 13:37:49 2006
@@ -41,8 +41,8 @@
<li><i>getBinaryStream</i></li>
<li><i>getUnicodeStream</i></li>
</ul></p>
-<p>These methods share the same underlying stream; calling one more than one
-of these methods on the same column so could result in undefined behavior.
+<p>These methods share the same underlying stream; calling more than one
+of these methods on the same column could result in undefined behavior.
For example: <codeblock expanse="column"><b>ResultSet rs = s.executeQuery("SELECT text FROM CLOBS WHERE i = 1");
while (rs.next()) {
aclob=rs.getClob(1);
Modified: db/derby/docs/trunk/src/ref/crefmpref23947.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefmpref23947.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefmpref23947.dita (original)
+++ db/derby/docs/trunk/src/ref/crefmpref23947.dita Mon Jun 12 13:37:49 2006
@@ -36,7 +36,7 @@
about <ph conref="refconrefs.dita#prod/productshortname"></ph> exception messages.</p></li>
<li><i><xref href="crefjdbc12657.dita#crefjdbc12657"></xref></i> <p>Information
about <ph conref="refconrefs.dita#prod/productshortname"></ph>'s implementation
-of the JDBC interface include support for JDBC 2.0 features.</p></li>
+of the JDBC interface including support for JDBC 2.0 features.</p></li>
<li><i><xref href="rrefattrib24612.dita#rrefattrib24612"></xref></i> <p>Information
about the supported attributes to <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
JDBC database connection URL.</p></li>
Modified: db/derby/docs/trunk/src/ref/rrefjdbc96386.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc96386.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc96386.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc96386.dita Mon Jun 12 13:37:49 2006
@@ -51,7 +51,7 @@
also work.</li>
<li>Use the <i>getBlob</i> or <i>getClob</i> methods on the <i>java.sql.ResultSet</i> interface
to retrieve a <i>BLOB</i> or <i>CLOB</i> handle to the underlying data.</li>
-<li>You cannot call static methods (SQL extension over SQL) on any LOB-columns.</li>
+<li>You cannot call static methods on any LOB-columns.</li>
</ul></p></section>
<section><p>In addition, casting between strings and BLOBs is not recommended
because casting is platform and database dependent. </p></section>
Modified: db/derby/docs/trunk/src/workingwithderby/cwwdsummary.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/workingwithderby/cwwdsummary.dita?rev=413739&r1=413738&r2=413739&view=diff
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/cwwdsummary.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/cwwdsummary.dita Mon Jun 12 13:37:49 2006
@@ -23,7 +23,7 @@
You now have experience with using Derby in both the embedded and client /
server architectures. With this basic knowledge you are ready to begin using
Derby to address your own specific needs. We recommend visiting the Apache
-Derby website as your next step in leaning about this lightweight and powerful
+Derby website as your next step in learning about this lightweight and powerful
tool.</shortdesc>
<conbody>
<lines frame="topbot" importance="high" scale="120"> <b>Use this link:</b> <xref