You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ta...@apache.org on 2008/09/05 17:29:35 UTC
svn commit: r692459 - in /httpd/httpd/branches/2.2.x/docs: ./
manual/mod/mpm_common.xml
Author: takashi
Date: Fri Sep 5 08:29:35 2008
New Revision: 692459
URL: http://svn.apache.org/viewvc?rev=692459&view=rev
Log:
Merge r692325 from trunk:
Fix MaxClients description to adapt threading MPM.
(This is still inaccurate for trunk Event MPM.)
Submitted by Dan Poirier <poirier pobox.com>
PR: 45747
Modified:
httpd/httpd/branches/2.2.x/docs/ (props changed)
httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml
Propchange: httpd/httpd/branches/2.2.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 5 08:29:35 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/docs:647395,660461,660566,664330,675610,678761,682369,683626,684351,685112,686549,686805,686809,687099,687754
+/httpd/httpd/trunk/docs:647395,660461,660566,664330,675610,678761,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml?rev=692459&r1=692458&r2=692459&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml Fri Sep 5 08:29:35 2008
@@ -418,8 +418,8 @@
<directivesynopsis>
<name>MaxClients</name>
-<description>Maximum number of child processes that will be created
-to serve requests</description>
+<description>Maximum number of simultaneous requests that will
+be served</description>
<syntax>MaxClients <var>number</var></syntax>
<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>