svn commit: r1569884 - in /db/derby/docs/trunk/src: devguide/cdevdvlp40653.dita ref/rrefattribderegister.dita ref/rrefjdbc32052.dita

[ch...@apache.org]

Author: chaase3
Date: Wed Feb 19 19:38:11 2014
New Revision: 1569884

URL: http://svn.apache.org/r1569884
Log:
DERBY-6236  Remove references to old JVMs (pre-Java 6) from the user guides

Modified 2 Reference Manual topics and 1 Developer's Guide topic.

Patch: DERBY-6236-3.diff

Modified:
    db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita
    db/derby/docs/trunk/src/ref/rrefattribderegister.dita
    db/derby/docs/trunk/src/ref/rrefjdbc32052.dita

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita?rev=1569884&r1=1569883&r2=1569884&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita Wed Feb 19 19:38:11 2014
@@ -28,9 +28,10 @@ JDBC to interact with a database.</short
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>In an embedded environment, the JDBC embedded driver is loaded automatically
-when you obtain a connection to the database by calling the
-<i>DriverManager.getConnection</i> method, as described in
+<p>In an embedded environment, the embedded driver is initially loaded and
+registered when the <i>java.sql.DriverManager</i> class is initialized. That
+typically happens on the first call to a <i>DriverManager</i> method such as
+<i>DriverManager.getConnection</i>, as described in
 <xref href="cdevdvlp17453.dita#cdevdvlp17453"></xref>. Loading the driver also
 starts <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
 <p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> driver

Modified: db/derby/docs/trunk/src/ref/rrefattribderegister.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattribderegister.dita?rev=1569884&r1=1569883&r2=1569884&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattribderegister.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattribderegister.dita Wed Feb 19 19:38:11 2014
@@ -48,7 +48,8 @@ will remain registered.</p>
 need to set this permission.</p> 
 <p>You initially register the embedded driver by doing one of the following:</p>
 <ul>
-<li>Call the method <i>DriverManager.getConnection()</i>.</li>
+<li>Call a <i>DriverManager</i> method such as
+<i>DriverManager.getDrivers()</i> or <i>DriverManager.getConnection()</i>.</li>
 <li>Set <i>-Djdbc.drivers=org.apache.derby.jdbc.EmbeddedDriver</i> when you
 boot the <ph conref="../conrefs.dita#prod/productshortname"></ph> engine's VM,
 then call

Modified: db/derby/docs/trunk/src/ref/rrefjdbc32052.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc32052.dita?rev=1569884&r1=1569883&r2=1569884&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc32052.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc32052.dita Wed Feb 19 19:38:11 2014
@@ -29,10 +29,12 @@ limitations under the License.
 local JDBC driver is the class <i>org.apache.derby.jdbc.EmbeddedDriver</i>.
 The class that loads <ph conref="../conrefs.dita#prod/productshortname"></ph>'s
 network client driver is the class <i>org.apache.derby.jdbc.ClientDriver</i>.
-Usually, you will not need to create instances of these classes, because the
-appropriate class is loaded automatically when your application requests a
-connection using the <i>DriverManager</i> class. This section describes a few
-exceptions to this rule.</p>
+Usually, you will not need to create an instance of one of these classes,
+because the driver class is loaded and registered automatically when the
+<i>java.sql.DriverManager</i> class is initialized. That typically happens on
+the first call to a <i>DriverManager</i> method such as
+<i>DriverManager.getConnection</i>. This section describes a few exceptions to
+this rule.</p>
 <p>With the embedded driver, if your application shuts down
 <ph conref="../conrefs.dita#prod/productshortname"></ph> or calls the
 <i>DriverManager.deregisterDriver</i> method, and you then want to reload the