Return-Path: 
 <dev-return-164097-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 2080B18FD7
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Tue, 21 Jul 2015 06:48:53 +0000 (UTC)
Received: (qmail 47489 invoked by uid 500); 21 Jul 2015 06:48:52 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 47399 invoked by uid 500); 21 Jul 2015 06:48:52 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 47389 invoked by uid 99); 21 Jul 2015 06:48:52 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jul 2015 06:48:52 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 90D2FAC0233
	for <dev@tomcat.apache.org>; Tue, 21 Jul 2015 06:48:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1692054 - in /tomcat/tc7.0.x/trunk:
 modules/jdbc-pool/doc/jdbc-pool.xml webapps/docs/changelog.xml
Date: Tue, 21 Jul 2015 06:48:52 -0000
To: dev@tomcat.apache.org
From: kfujino@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150721064852.90D2FAC0233@hades.apache.org>

Author: kfujino
Date: Tue Jul 21 06:48:52 2015
New Revision: 1692054

URL: http://svn.apache.org/r1692054
Log:
Correct the incorrect document of QueryTimeoutInterceptor.
The setting value is not in milliseconds but in seconds.

Modified:
    tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1692054&r1=1692053&r2=1692054&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Jul 21 06:48:52 2015
@@ -649,8 +649,9 @@
     </p>
     <attributes>
       <attribute name="queryTimeout" required="true">
-        <p>(int as String) The number of seconds to set for the query timeout
-           The default value is <code>1000</code> milliseconds.
+        <p>(int as String) The number of seconds to set for the query timeout.
+           A value less than or equal to zero will disable this feature.
+           The default value is <code>1</code> seconds.
         </p>
       </attribute>
     </attributes>

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1692054&r1=1692053&r2=1692054&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 21 06:48:52 2015
@@ -110,6 +110,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Web applications">
+    <changelog>
+      <fix>
+        Correct the incorrect document of <code>QueryTimeoutInterceptor</code>.
+        The setting value is not in milliseconds but in seconds. (kfujino)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
       <fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org