httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From taka...@apache.org
Subject svn commit: r692460 - in /httpd/httpd/branches/2.0.x/docs: ./ manual/content-negotiation.xml.tr manual/filter.xml.tr manual/handler.xml.tr manual/mod/mod_alias.xml.tr manual/mod/mod_dir.xml.tr manual/mod/mpm_common.xml
Date Fri, 05 Sep 2008 15:29:47 GMT
Author: takashi
Date: Fri Sep  5 08:29:46 2008
New Revision: 692460

URL: http://svn.apache.org/viewvc?rev=692460&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.0.x/docs/   (props changed)
    httpd/httpd/branches/2.0.x/docs/manual/content-negotiation.xml.tr   (props changed)
    httpd/httpd/branches/2.0.x/docs/manual/filter.xml.tr   (props changed)
    httpd/httpd/branches/2.0.x/docs/manual/handler.xml.tr   (props changed)
    httpd/httpd/branches/2.0.x/docs/manual/mod/mod_alias.xml.tr   (props changed)
    httpd/httpd/branches/2.0.x/docs/manual/mod/mod_dir.xml.tr   (props changed)
    httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml

Propchange: httpd/httpd/branches/2.0.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  5 08:29:46 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/docs:675610
+/httpd/httpd/trunk/docs:675610,692325

Propchange: httpd/httpd/branches/2.0.x/docs/manual/content-negotiation.xml.tr
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  5 08:29:46 2008
@@ -0,0 +1 @@
+/httpd/httpd/trunk/docs/manual/content-negotiation.xml.tr:692325

Propchange: httpd/httpd/branches/2.0.x/docs/manual/filter.xml.tr
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  5 08:29:46 2008
@@ -0,0 +1 @@
+/httpd/httpd/trunk/docs/manual/filter.xml.tr:692325

Propchange: httpd/httpd/branches/2.0.x/docs/manual/handler.xml.tr
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  5 08:29:46 2008
@@ -0,0 +1 @@
+/httpd/httpd/trunk/docs/manual/handler.xml.tr:692325

Propchange: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_alias.xml.tr
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  5 08:29:46 2008
@@ -0,0 +1 @@
+/httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.tr:692325

Propchange: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_dir.xml.tr
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  5 08:29:46 2008
@@ -0,0 +1 @@
+/httpd/httpd/trunk/docs/manual/mod/mod_dir.xml.tr:692325

Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml?rev=692460&r1=692459&r2=692460&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml Fri Sep  5 08:29:46 2008
@@ -390,8 +390,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>



Mime
View raw message