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/10/20 17:04:34 UTC
svn commit: r706316 - in /httpd/httpd/branches/2.2.x/docs: ./
manual/mod/mpm_common.xml
Author: takashi
Date: Mon Oct 20 08:04:34 2008
New Revision: 706316
URL: http://svn.apache.org/viewvc?rev=706316&view=rev
Log:
Merge r703441 from trunk:
fix MaxClients description (r692325, r692459) suggested by wrowe
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 Mon Oct 20 08:04:34 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/docs:611483,639005,639010,647395,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693392,693727-693728,696006,697093,703997
+/httpd/httpd/trunk/docs:611483,639005,639010,647395,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693392,693727-693728,696006,697093,703441,703997
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=706316&r1=706315&r2=706316&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 Mon Oct 20 08:04:34 2008
@@ -418,8 +418,8 @@
<directivesynopsis>
<name>MaxClients</name>
-<description>Maximum number of simultaneous requests that will
-be served</description>
+<description>Maximum number of connections that will be processed
+simultaneously</description>
<syntax>MaxClients <var>number</var></syntax>
<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>