- Update for the timeout configuration.

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

diff --git a/webapps/docs/apr.xml b/webapps/docs/apr.xml
index 0a570e8..468161a 100644 (file)
--- a/webapps/docs/apr.xml
+++ b/webapps/docs/apr.xml
@@ -145,6 +145,14 @@
 
     <attributes>
  
+    <attribute name="keepAliveTimeout" required="false">
+      <p>The number of milliseconds this <strong>Connector</strong> will wait for
+       another HTTP request before closing the connection.
+       The default value is to use the value that has been set for the
+       connectionTimeout attribute. This value also controls the timeout interval which
+       is used for Comet connections.</p>
+    </attribute>
+
     <attribute name="pollTime" required="false">
       <p>Duration of a poll call. Lowering this value will slightly decrease latency of connections 
       being kept alive in some cases, but will use more CPU as more poll calls are being made. The

diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index cf4dfd1..583dc94 100644 (file)
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -229,10 +229,10 @@
     </attribute>
 
     <attribute name="keepAliveTimeout" required="false">
-      <p>The number of milliseconds this <strong>Connector</strong> will wait,
-       subsequent request before closing the connection.
+      <p>The number of milliseconds this <strong>Connector</strong> will wait for
+       another AJP request before closing the connection.
        The default value is to use the value that has been set for the
-       connectionTimeout.</p>
+       connectionTimeout attribute.</p>
     </attribute>
 
     <attribute name="maxThreads" required="false">

diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 8821a2f..cd677f0 100644 (file)
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -281,10 +281,10 @@
     </attribute>
 
     <attribute name="keepAliveTimeout" required="false">
-      <p>The number of milliseconds this <strong>Connector</strong> will wait,
-       subsequent request before closing the connection.
+      <p>The number of milliseconds this <strong>Connector</strong> will wait for
+       another HTTP request before closing the connection.
        The default value is to use the value that has been set for the
-       connectionTimeout.</p>
+       connectionTimeout attribute.</p>
     </attribute>
 
     <attribute name="disableUploadTimeout" required="false">