Author: kkolinko
Date: Fri May 11 23:54:25 2012
New Revision: 1337420
URL: http://svn.apache.org/viewvc?rev=1337420&view=rev
Log:
Merged revision 1337419 from tomcat/trunk:
Correct typo in a link (followup to r1336889)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1337419
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml?rev=1337420&r1=1337419&r2=1337420&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml Fri May 11 23:54:25 2012
@@ -345,7 +345,7 @@
falls below this value. The operating system may still accept
connections based on the <code>acceptCount</code> setting. Default value
varies by connector type. For BIO the default is the value of
- <strong>maxThreads</strong> unless an <a
href="executir.html">Executor</a>
+ <strong>maxThreads</strong> unless an <a
href="executor.html">Executor</a>
is used in which case the default will be the value of maxThreads from
the
executor. For NIO the default is <code>10000</code>.
For APR/native, the default is <code>8192</code>.</p>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1337420&r1=1337419&r2=1337420&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Fri May 11 23:54:25 2012
@@ -380,7 +380,7 @@
falls below this value. The operating system may still accept
connections based on the <code>acceptCount</code> setting. Default value
varies by connector type. For BIO the default is the value of
- <strong>maxThreads</strong> unless an <a
href="executir.html">Executor</a>
+ <strong>maxThreads</strong> unless an <a
href="executor.html">Executor</a>
is used in which case the default will be the value of maxThreads from
the
executor. For NIO the default is <code>10000</code>.
For APR/native, the default is <code>8192</code>.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
