From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 2 Sep 2011 09:38:16 +0000 (+0000)
Subject: Correct connectionLinger documentation
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a5e4a11f46187701c1d5d5376497ebeabc08bb5c;p=tomcat7.0

Correct connectionLinger documentation

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1164438 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 443ca3a58..149b07858 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -292,9 +292,9 @@
     </attribute>
 
     <attribute name="connectionLinger" required="false">
-      <p>The number of milliseconds during which the sockets used by this
+      <p>The number of seconds during which the sockets used by this
       <strong>Connector</strong> will linger when they are closed.
-      The default value <code>-1</code> which disables this option.</p>
+      If not specified, the JVM default will be used.</p>
     </attribute>
 
     <attribute name="connectionTimeout" required="false">
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 7219c4f02..b64a99ab9 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -309,9 +309,9 @@
     </attribute>
 
     <attribute name="connectionLinger" required="false">
-      <p>The number of milliseconds during which the sockets used by this
+      <p>The number of seconds during which the sockets used by this
       <strong>Connector</strong> will linger when they are closed.
-      The default value <code>-1</code> which disables this option.</p>
+      If not specified, the JVM default will be used.</p>
     </attribute>
 
     <attribute name="connectionTimeout" required="false">