Return-Path: 
 <derby-commits-return-14734-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
X-Original-To: apmail-db-derby-commits-archive@www.apache.org
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 257898ED0
	for <apmail-db-derby-commits-archive@www.apache.org>;
 Tue, 16 Aug 2011 17:40:40 +0000 (UTC)
Received: (qmail 85356 invoked by uid 500); 16 Aug 2011 17:40:39 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 85288 invoked by uid 500); 16 Aug 2011 17:40:39 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 85281 invoked by uid 99); 16 Aug 2011 17:40:39 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Aug 2011 17:40:39 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Aug 2011 17:40:37 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id E1ACA2388900;
	Tue, 16 Aug 2011 17:40:18 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1158391 - in /db/derby/docs/branches/10.8/src:
 devguide/cdevdvlp40653.dita ref/rrefjdbc32052.dita
Date: Tue, 16 Aug 2011 17:40:18 -0000
To: derby-commits@db.apache.org
From: chaase3@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110816174018.E1ACA2388900@eris.apache.org>

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();