From: Takashi Sato Date: Mon, 20 Oct 2008 15:04:34 +0000 (+0000) Subject: Merge r703441 from trunk: X-Git-Tag: 2.2.11~125 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1de9dc3197313d56c4ea46f425897d409d2c726;p=thirdparty%2Fapache%2Fhttpd.git Merge r703441 from trunk: fix MaxClients description (r692325, r692459) suggested by wrowe git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@706316 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml index cfc7168114a..7288fcbe231 100644 --- a/docs/manual/mod/mpm_common.xml +++ b/docs/manual/mod/mpm_common.xml @@ -418,8 +418,8 @@ The protocol argument was added in 2.1.5 MaxClients -Maximum number of simultaneous requests that will -be served +Maximum number of connections that will be processed +simultaneously MaxClients number See usage for details server config