Author: chaase3
Date: Tue Aug 16 17:40:18 2011
New Revision: 1158391

URL: http://svn.apache.org/viewvc?rev=1158391&view=rev
Log:
DERBY-5384  Reference Guide talks about a DriverManager method which does not exist.

Merged DERBY-5384.diff to 10.8 docs branch from trunk revision 1158368.

Modified:
    db/derby/docs/branches/10.8/src/devguide/cdevdvlp40653.dita
    db/derby/docs/branches/10.8/src/ref/rrefjdbc32052.dita

Modified: db/derby/docs/branches/10.8/src/devguide/cdevdvlp40653.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/devguide/cdevdvlp40653.dita?rev=1158391&r1=1158390&r2=1158391&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/devguide/cdevdvlp40653.dita (original)
+++ db/derby/docs/branches/10.8/src/devguide/cdevdvlp40653.dita Tue Aug 16 17:40:18 2011
@@ -44,7 +44,8 @@ driver, see "java.sql.Driver interface" 
 <p>If your application runs on JDK 6 or higher, you do not need to
 explicitly load the <codeph>EmbeddedDriver</codeph>. In that environment, the
 driver loads automatically.</p>
-<p>If your application shuts down Derby or calls the <i>DriverManager.unload</i>
+<p>If your application shuts down Derby or calls the
+<i>DriverManager.deregisterDriver</i>
 method, and you then want to reload the driver, call the
 <i>Class.forName().newInstance()</i> method.</p>
 </conbody>

Modified: db/derby/docs/branches/10.8/src/ref/rrefjdbc32052.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/ref/rrefjdbc32052.dita?rev=1158391&r1=1158390&r2=1158391&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/ref/rrefjdbc32052.dita (original)
+++ db/derby/docs/branches/10.8/src/ref/rrefjdbc32052.dita Tue Aug 16 17:40:18 2011
@@ -40,8 +40,8 @@ when your application asks for its first
 Class.forName("org.apache.derby.jdbc.ClientDriver");</pre>
 <p>The recommended way to load the driver class.</p>
 <p>With the embedded driver, if your application shuts down Derby or calls the
-<i>DriverManager.unload</i> method, and you then want to reload the driver, call
-the <i>Class.forName().newInstance()</i> method to do so:</p>
+<i>DriverManager.deregisterDriver</i> method, and you then want to reload the
+driver, call the <i>Class.forName().newInstance()</i> method to do so:</p>
 <pre>Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();</pre>
 </li>
 <li><pre>new org.apache.derby.jdbc.EmbeddedDriver();