Move the maxConnections description to the correct part of the HTTP doc. Add it to...

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

diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 212ac9b..5fc092c 100644 (file)
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -379,10 +379,18 @@
 
   <subsection name="BIO specific configuration">
     
-    <p>The BIO implementation supports the following Java TCP socket attributes
-    in addition to the common Connector and AJP attributes listed above.</p>
+    <p>The BIO implementation supports the following attributes in addition to
+    the common Connector and AJP attributes listed above.</p>
   
     <attributes>
+      <attribute name="maxConnections" required="false">
+        <p>The maximum number of connections that the server will accept and
+        process at any given time. When this number has been reached, the server
+        will not accept any more connections until the number of connections
+        falls below this value. The operating system may still accept
+        connections based on the <code>acceptCount</code> setting. Default value
+        is <code>10000</code>.</p>
+      </attribute>
       <attribute name="socket.rxBufSize" required="false">
         <p>(int)The socket receive buffer (SO_RCVBUF) size in bytes. JVM default
         used if not set.</p>

diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 28198f2..842a224 100644 (file)
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -373,15 +373,6 @@
       execute tasks using the executor rather than an internal thread pool.</p>
     </attribute>
 
-    <attribute name="maxConnections" required="false">
-      <p>The maximum number of connections that the server will accept and process
-      at any given time. When this number has been reached, the server will not accept any more
-      connections until the number of connections reach below this value. The operating system may still accept connections based 
-      on the <code>acceptCount</code> setting.
-      This setting is currently only applicable to the blocking Java connectors (AJP/HTTP).
-      Default value is <code>10000</code>.</p>
-    </attribute>
-
     <attribute name="maxTrailerSize" required="false">
       <p>Limits the total length of trailing headers in the last chunk of
       a chunked HTTP request. If the value is <code>-1</code>, no limit will be
@@ -554,8 +545,21 @@
   
   <subsection name="BIO specific configuration">
     
-    <p>There are no BIO specific configuration settings.</p>
+    <p>The following attributes are specific to the BIO connector.</p>
     
+    <attributes>
+
+      <attribute name="maxConnections" required="false">
+        <p>The maximum number of connections that the server will accept and
+        process at any given time. When this number has been reached, the server
+        will not accept any more connections until the number of connections
+        falls below this value. The operating system may still accept
+        connections based on the <code>acceptCount</code> setting. Default value
+        is <code>10000</code>.</p>
+      </attribute>
+
+    </attributes>
+
   </subsection>
   
   <subsection name="NIO specific configuration">