English Revision: 421100

Submitted by: Takashi Sato
Reviewed by: Hiroaki Kawai

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@535159 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mpm_common.xml.ja b/docs/manual/mod/mpm_common.xml.ja
index 9b7b2108596657e0963936a835fd3820c8053752..fa0fbfcd57547f1b99308bfe50907620bc455c1b 100644 (file)
--- a/docs/manual/mod/mpm_common.xml.ja
+++ b/docs/manual/mod/mpm_common.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 190982:421100 (outdated) -->
+<!-- English Revision: 421100 -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,8 +35,8 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>AcceptMutex default|<var>method</var></syntax>
 <default>AcceptMutex default</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>perchild</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<modulelist>
+<module>prefork</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -108,9 +108,9 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>CoreDumpDirectory <var>directory</var></syntax>
 <default>\e$B%G%U%)%k%H$N@_Dj$O@bL@J8$rFI$s$G$/$@$5$$\e(B</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
-<module>mpm_winnt</module><module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<modulelist><module>beos</module>
+<module>mpm_winnt</module><module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p>Apache \e$B$,%3%"%@%s%W$9$kA0$K0\F0$r;n$_$k%G%#%l%/%H%j$r@)8f$7$^$9!#\e(B
@@ -137,8 +137,8 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>EnableExceptionHook On|Off</syntax>
 <default>EnableExceptionHook Off</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>perchild</module>
-<module>prefork</module><module>threadpool</module>
+<modulelist>
+<module>prefork</module>
 <module>worker</module></modulelist>
 <compatibility>2.0.49 \e$B0J9_\e(B</compatibility>
 
@@ -156,15 +156,35 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 </usage>
 </directivesynopsis>
 
+<directivesynopsis>
+<name>GracefulShutdownTimeout</name>
+<description>\e$B2:$d$+$JDd;_$r$+$1$?8e!"=*N;$9$k$^$GBT$D;~4V\e(B</description>
+<syntax>GracefulShutDownTimeout <var>seconds</var></syntax>
+<default>GracefulShutDownTimeout 0</default>
+<contextlist><context>server config</context></contextlist>
+<modulelist><module>prefork</module><module>worker</module>
+<module>event</module></modulelist>
+<compatibility>2.2 \e$B0J9_\e(B</compatibility>
+
+<usage>
+    <p><directive>GracefulShutdownTimeout</directive> \e$B$K$O\e(B
+    \e$B%5!<%P!<$,\e(B "graceful-stop" \e$B%7%0%J%k$r<u$1<h$C$F$+$i8=:_$N\e(B
+    \e$B%j%/%(%9%H$N=hM}$r:GBg$G2?IC4VB3$1$k$+$r;XDj$7$^$9!#\e(B</p>
+
+    <p>\e$B$3$NCM$r%<%m$K@_Dj$9$k$H!"=hM}Cf$H$7$F;D$C$F$$$k%j%/%(%9%H$,\e(B
+    \e$BA4$F40N;$9$k$^$G%5!<%P!<$O=*N;$7$^$;$s!#\e(B</p>
+</usage>
+</directivesynopsis>
+
 <directivesynopsis>
 <name>Group</name>
 <description>\e$B%j%/%(%9%H$K1~Ez$9$k:]$K=jB0$9$k%0%k!<%W\e(B</description>
 <syntax>Group <var>unix-group</var></syntax>
 <default>Group #-1</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
-<module>mpmt_os2</module><module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<modulelist><module>beos</module>
+<module>mpmt_os2</module><module>prefork</module>
+<module>worker</module></modulelist>
 <compatibility>Apache 2.0 \e$B0J9_$G!"%0%m!<%P%k@_Dj$G$N$_M-8z$G$9!#\e(B</compatibility>
 
 <usage>
@@ -181,7 +201,7 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
       <dd>\e$B%0%k!<%W$rL>A0$G;2>H$7$^$9\e(B</dd>
 
       <dt><code>#</code> \e$B$KB3$$$F%0%k!<%WHV9f\e(B</dt>
-      <dd>\e$B%0%k!<%W$r$rHV9f$G;2>H$7$^$9!#\e(B</dd>
+      <dd>\e$B%0%k!<%W$rHV9f$G;2>H$7$^$9!#\e(B</dd>
     </dl>
 
     <example><title>\e$BNc\e(B</title>
@@ -221,10 +241,10 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>PidFile <var>filename</var></syntax>
 <default>PidFile logs/httpd.pid</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_winnt</module><module>mpmt_os2</module>
-<module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p><directive>PidFile</directive> \e$B%G%#%l%/%F%#%V$G!"\e(B
@@ -263,10 +283,10 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <description>\e$B%5!<%P$,\e(B listen \e$B$9$k\e(BIP \e$B%"%I%l%9$H%]!<%HHV9f\e(B</description>
 <syntax>Listen [<var>IP-address</var>:]<var>portnumber</var> [<var>protocol</var>]</syntax>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>mpm_winnt</module>
-<module>mpmt_os2</module><module>perchild</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<module>mpmt_os2</module>
+<module>prefork</module><module>worker</module>
 <module>event</module>
 </modulelist>
 <compatibility>Apache 2.0 \e$B$+$iI,?\%G%#%l%/%F%#%V!#\e(B<var>protocol</var>
@@ -315,7 +335,7 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
     \e$BNc$($P<!$NNc$N$h$&$K$G$9!#\e(B</p>
 
     <example>
-       Listen [2001:db8::a00:20ff:fea7:ccea]:80
+      Listen [2001:db8::a00:20ff:fea7:ccea]:80
     </example>
 
     <p><var>protocol</var> \e$B%*%W%7%g%s0z?t$ODL>o$N@_Dj$G$OI,MW$"$j$^$;$s!#\e(B
@@ -351,10 +371,10 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>ListenBacklog <var>backlog</var></syntax>
 <default>ListenBacklog 511</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>mpm_winnt</module>
-<module>mpmt_os2</module><module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<module>mpmt_os2</module><module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p>\e$BJ]N1>uBV$N%3%M%/%7%g%s$N%-%e!<$N:GBgD9$G$9!#\e(B
@@ -378,8 +398,8 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>LockFile <var>filename</var></syntax>
 <default>LockFile logs/accept.lock</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>perchild</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<modulelist>
+<module>prefork</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -412,8 +432,8 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>MaxClients <var>number</var></syntax>
 <default>\e$B>\:Y$O;HMQK!$r$4Mw2<$5$$!#\e(B</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<modulelist><module>beos</module>
+<module>prefork</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -456,9 +476,9 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>MaxMemFree <var>KBytes</var></syntax>
 <default>MaxMemFree 0</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>prefork</module>
-<module>threadpool</module><module>worker</module><module>mpm_winnt</module></modulelist>
+<module>worker</module><module>mpm_winnt</module></modulelist>
 
 <usage>
     <p><directive>MaxMemFree</directive> \e$B%G%#%l%/%F%#%V$O\e(B
@@ -474,10 +494,10 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>MaxRequestsPerChild <var>number</var></syntax>
 <default>MaxRequestsPerChild 10000</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>mpm_netware</module>
+<modulelist><module>mpm_netware</module>
 <module>mpm_winnt</module><module>mpmt_os2</module>
-<module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p><directive>MaxRequestsPerChild</directive> \e$B%G%#%l%/%F%#%V$O!"\e(B
@@ -518,23 +538,16 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>MaxSpareThreads <var>number</var></syntax>
 <default>\e$B>\:Y$O;HMQK!$r$4Mw2<$5$$!#\e(B</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>mpmt_os2</module>
-<module>perchild</module><module>threadpool</module><module>worker</module>
+<module>worker</module>
 </modulelist>
 
 <usage>
     <p>\e$B%"%$%I%k$J%9%l%C%I$N:GBg?t$G$9!#0[$J$k\e(B MPM \e$B$G$O$=$l$>$l!"\e(B
     \e$B$3$N%G%#%l%/%F%#%V$O0[$J$k<h$j07$o$lJ}$r$5$l$^$9!#\e(B</p>
 
-    <p><module>perchild</module> \e$B$G$O!"\e(B
-    \e$B%G%U%)%k%H$O\e(B <code>MaxSpareThreads 10</code> \e$B$G$9!#\e(B
-    \e$B$3$N\e(B MPM \e$B$O%"%$%I%k%9%l%C%I?t$r!"$=$l$>$l$N;R%W%m%;%9$4$H$K4F;k$7$^$9!#\e(B
-    \e$B;R%W%m%;%9$K%"%$%I%k%9%l%C%I$,B?$9$.$k>l9g$O!"\e(B
-    \e$B%5!<%P$O$=$N;R%W%m%;%9$K4^$^$l$k%9%l%C%I$r=*N;$7;O$a$^$9!#\e(B</p>
-
-    <p><module>worker</module>, <module>leader</module>,
-    <module>threadpool</module> \e$B$G$O!"\e(B
+    <p><module>worker</module> \e$B$G$O!"\e(B
     \e$B%G%U%)%k%H$O\e(B <code>MaxSpareThreads 250</code> \e$B$G$9!#\e(B
     \e$B$3$N\e(B MPM \e$B$O%"%$%I%k%9%l%C%I?t$r%5!<%PA4BN$G4F;k$7$^$9!#\e(B
     \e$B%5!<%P$G%"%$%I%k%9%l%C%I?t$,B?$9$.$k>l9g$O!"\e(B
@@ -555,16 +568,12 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
       <p><directive>MaxSpareThreads</directive> \e$B$N<h$kCM$K$O@)8B$,$"$j$^$9!#\e(B
       Apache \e$B$O<!$N5,B'$K=>$C$F<+F0E*$KJd@5$7$^$9!#\e(B</p>
       <ul>
-        <li><module>perchild</module> \e$B$G$O!"\e(B
-        <directive>MaxSpareThreads</directive> \e$B$,\e(B
-        <directive module="mpm_common">ThreadLimit</directive>
-        \e$B$HEy$7$$$+$=$l0J2<$G$"$kI,MW$,$"$j$^$9!#\e(B</li>
 
         <li><module>mpm_netware</module> \e$B$O\e(B
         <directive module="mpm_common">MinSpareThreads</directive>
         \e$B$h$j$bBg$-$$I,MW$,$"$j$^$9!#\e(B</li>
 
-        <li><module>leader</module>, <module>threadpool</module>, 
+        <li>
         <module>worker</module> \e$B$G$O!"\e(B
         <directive module="mpm_common">MinSpareThreads</directive> \e$B$H\e(B
         <directive module="mpm_common">ThreadsPerChild</directive>
@@ -583,9 +592,9 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>MinSpareThreads <var>number</var></syntax>
 <default>\e$B>\:Y$O;HMQJ}K!$r$4Mw2<$5$$!#\e(B</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>mpmt_os2</module>
-<module>perchild</module><module>threadpool</module><module>worker</module>
+<module>worker</module>
 </modulelist>
 
 <usage>
@@ -593,18 +602,7 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
     \e$B0[$J$k\e(B MPM \e$B$G$O$=$l$>$l!"\e(B
     \e$B$3$N%G%#%l%/%F%#%V$O0[$J$k<h$j07$o$lJ}$r$7$^$9!#\e(B</p>
 
-    <p><module>perchild</module> \e$B$G$O!"\e(B
-    \e$B%G%U%)%k%H$O\e(B <code>MinSpareThreads 5</code> \e$B$G!"\e(B
-    \e$B%"%$%I%k%9%l%C%I?t$r;R%W%m%;%9Kh$K4F;k$7$^$9!#\e(B
-    \e$B$b$7;R%W%m%;%9$K==J,$J?t$N%9%l%C%I$,$J$1$l$P!"\e(B
-    \e$B%5!<%P$O$=$N;R%W%m%;%9$K?7$7$$%9%l%C%I$r:n$j;O$a$^$9!#\e(B
-    \e$B$G$9$+$i!"\e(B<directive module="perchild">NumServers</directive>
-    \e$B$r\e(B <code>10</code> \e$B$K!"\e(B<directive>MinSpareThreads</directive> \e$B$r\e(B
-    <code>5</code> \e$B$K$7$?>l9g$O!":G>.$G$b\e(B 50 \e$B$N%"%$%I%k%9%l%C%I$,\e(B
-    \e$B%7%9%F%`>e$K$"$k$3$H$K$J$j$^$9!#\e(B</p>
-
-    <p><module>worker</module>, <module>leader</module>,
-    <module>threadpool</module> \e$B$G$O!"\e(B
+    <p><module>worker</module> \e$B$G$O!"\e(B
     \e$B%G%U%)%k%H$O\e(B <code>MinSpareThreads 75</code> \e$B$G!"\e(B
     \e$B%"%$%I%k%9%l%C%I?t$r%5!<%PA4BN$G4F;k$7$^$9!#\e(B
     \e$B$b$7%5!<%P$K==J,$J?t$N%"%$%I%k%9%l%C%I$,$J$1$l$P!"\e(B
@@ -632,9 +630,9 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>ScoreBoardFile <var>file-path</var></syntax>
 <default>ScoreBoardFile logs/apache_status</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
-<module>mpm_winnt</module><module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<modulelist><module>beos</module>
+<module>mpm_winnt</module><module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p>Apache \e$B$O?F%W%m%;%9$H;R%W%m%;%94V$NDL?.$K%9%3%"%\!<%I$rMQ$$$^$9!#\e(B
@@ -661,19 +659,37 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <seealso><a href="../stopping.html">Apache \e$B$NDd;_$H:F5/F0\e(B</a></seealso>
 </directivesynopsis>
 
+<directivesynopsis>
+<name>ReceiveBufferSize</name>
+<description>TCP \e$B<u?.%P%C%U%!%5%$%:\e(B</description>
+<syntax>ReceiveBufferSize <var>bytes</var></syntax>
+<default>ReceiveBufferSize 0</default>
+<contextlist><context>server config</context></contextlist>
+<modulelist><module>beos</module>
+<module>mpm_netware</module><module>mpm_winnt</module>
+<module>mpmt_os2</module><module>prefork</module>
+<module>worker</module></modulelist>
+
+<usage>
+    <p>\e$B%5!<%P$O\e(B TCP \e$B<u?.%P%C%U%!%5%$%:$r;XDj$5$l$?%P%$%H?t$K@_Dj$7$^$9!#\e(B</p>
+
+    <p><code>0</code>\e$B$K$7$?>l9g!"\e(BOS \e$B$N%G%U%)%k%HCM$,;HMQ$5$l$^$9!#\e(B</p>
+</usage>
+</directivesynopsis>
+
 <directivesynopsis>
 <name>SendBufferSize</name>
 <description>TCP \e$B%P%C%U%!%5%$%:\e(B</description>
 <syntax>SendBufferSize <var>bytes</var></syntax>
 <default>SendBufferSize 0</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>mpm_winnt</module>
-<module>mpmt_os2</module><module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<module>mpmt_os2</module><module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
-    <p>\e$B%5!<%P$O\e(B TCP \e$B%P%C%U%!%5%$%:$r;XDj$5$l$?%P%$%H?t$K@_Dj$7$^$9!#\e(B
+    <p>\e$B%5!<%P$O\e(B TCP \e$BAw?.%P%C%U%!%5%$%:$r;XDj$5$l$?%P%$%H?t$K@_Dj$7$^$9!#\e(B
     \e$B9bB.$G9b%l%$%F%s%7$J4D6-$G\e(B
     (<em>\e$BNc\e(B</em> 100ms \e$BDxEY!"BgN&2#CG9bB.DL?.O)$J$I\e(B)
     \e$B8E$$0lHLE*$J\e(B OS \e$B$N%G%U%)%k%HCM$rA}$d$9$N$KHs>o$KJXMx$G$9!#\e(B</p>
@@ -688,8 +704,8 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>ServerLimit <var>number</var></syntax>
 <default>\e$B>\:Y$O;HMQK!$r;2>H\e(B</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>perchild</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<modulelist>
+<module>prefork</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -722,8 +738,7 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
     \e$B4uK>$N\e(B <directive module="mpm_common">MaxClients</directive>
     \e$B?t$H$/$i$Y$F!"I,MW0J>e$KBg$-$JCM$r;XDj$9$k$3$H$OHr$1$F$/$@$5$$!#\e(B</p>
 
-    <p><module>worker</module>, <module>leader</module>, 
-    <module>threadpool</module> MPM \e$B$G$O!"\e(B
+    <p><module>worker</module> MPM \e$B$G$O!"\e(B
     <directive module="mpm_common">MaxClients</directive> \e$B$H\e(B
     <directive module="mpm_common">ThreadsPerChild</directive>
     \e$B$N@_Dj$G\e(B 16 \e$B%5!<%P%W%m%;%9\e(B (\e$B%G%U%)%k%H\e(B) 
@@ -733,10 +748,6 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
     \e$B$H$/$i$Y$F!"I,MW$H$J$k%5!<%P%W%m%;%9?t0J>e$KBg$-$JCM$r\e(B
     \e$B@_Dj$9$k$3$H$OHr$1$F$/$@$5$$!#\e(B</p>
 
-    <p><module>perchild</module> MPM \e$B$G$O!"\e(B
-    <directive module="perchild">NumServers</directive> \e$B$r\e(B 8 (\e$B%G%U%)%k%H\e(B)
-    \e$B$h$m$$$bBg$-$JCM$K@_Dj$9$kI,MW$,$"$k$H$-$K$N$_;HMQ$7$F$/$@$5$$!#\e(B</p>
-
     <note><title>\e$BCm0U\e(B</title>
       <p><code>ServerLimit 20000</code> \e$B$H$$$&@)8BIU$-$G%3%s%Q%$%k$5$l$F$$$^$9\e(B
       (<module>prefork</module> MPM \e$B$G$O\e(B <code>200000</code>) \e$B!#\e(B
@@ -753,8 +764,8 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>StartServers <var>number</var></syntax>
 <default>\e$B>\:Y$O;HMQJ}K!$r;2>H\e(B</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>mpmt_os2</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<modulelist><module>mpmt_os2</module>
+<module>prefork</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -764,7 +775,6 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
     \e$BDL>o$O$3$NCM$rD4@0$9$kM}M3$O$"$^$j$J$$$G$7$g$&!#\e(B</p>
 
     <p>\e$B%G%U%)%k%HCM$O\e(B MPM \e$B$4$H$K0[$J$j$^$9!#\e(B
-    <module>leader</module>, <module>threadpool</module>, 
     <module>worker</module> \e$B$O\e(B <code>StartServers 3</code> \e$B$G$9!#\e(B
     <module>prefork</module> \e$B$O\e(B <code>5</code> \e$B$G!"\e(B
     <module>mpmt_os2</module> \e$B$O\e(B <code>2</code> \e$B$G$9!#\e(B</p>
@@ -778,17 +788,13 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <default>\e$B>\:Y$O;HMQJ}K!$r;2>H\e(B</default>
 <contextlist><context>server config</context></contextlist>
 <modulelist><module>beos</module><module>mpm_netware</module>
-<module>perchild</module></modulelist>
+</modulelist>
 
 <usage>
     <p>\e$B5/F0;~$K@8@.$5$l$k%9%l%C%I$N?t$G$9!#\e(B
     \e$B%9%l%C%I?t$OIi2Y$K1~$8$FF0E*$K@)8f$5$l$^$9$N$G!"\e(B
     \e$BDL>o$O$3$NCM$rD4@0$9$kM}M3$O$"$^$j$J$$$G$7$g$&!#\e(B</p>
 
-    <p><module>perchild</module> \e$B$G$N%G%U%)%k%H$O\e(B
-    <code>StartThreads 5</code> \e$B$G!"$3$N%G%#%l%/%F%#%V$O5/F0;~$K\e(B
-    \e$B%W%m%;%9Kh$N%9%l%C%I?t$rDI@W$7$^$9!#\e(B</p>
-
     <p><module>mpm_netware</module> \e$B$G$N%G%U%)%k%H$O\e(B
     <code>StartThreads 50</code> \e$B$G!"\e(B
     \e$B$3$N>l9g%W%m%;%9$O0l$D$7$+$J$$$N$G!"\e(B
@@ -807,8 +813,8 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>ThreadLimit <var>number</var></syntax>
 <default>\e$B>\:Y$O;HMQJ}K!$r;2>H\e(B</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>mpm_winnt</module>
-<module>perchild</module><module>threadpool</module><module>worker</module>
+<modulelist><module>mpm_winnt</module>
+<module>worker</module>
 </modulelist>
 <compatibility>Apache 2.0.41 \e$B$H$=$l0J9_$N\e(B <module>mpm_winnt</module> 
 \e$B$GMxMQ2DG=\e(B</compatibility>
@@ -857,8 +863,8 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>ThreadsPerChild <var>number</var></syntax>
 <default>\e$B>\:Y$O;HMQJ}K!$r;2>H\e(B</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>mpm_winnt</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<modulelist><module>mpm_winnt</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p>\e$B$3$N%G%#%l%/%F%#%V$O!"$=$l$>$l$N;R%W%m%;%9$G@8@.$5$l$k\e(B
@@ -885,9 +891,9 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>ThreadStackSize <var>size</var></syntax>
 <default>NetWare \e$B$G$O\e(B 65536\e$B!#B>$N\e(B OS \e$B$G$O0c$C$?CM\e(B</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>mpm_netware</module>
-<module>mpm_winnt</module><module>perchild</module>
-<module>threadpool</module><module>worker</module>
+<modulelist><module>mpm_netware</module>
+<module>mpm_winnt</module>
+<module>worker</module>
 </modulelist>
 <compatibility>2.1 \e$B0J9_\e(B</compatibility>
 
@@ -930,8 +936,8 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <syntax>User <var>unix-userid</var></syntax>
 <default>User #-1</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>perchild</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<modulelist>
+<module>prefork</module><module>worker</module>
 </modulelist>
 <compatibility>Apache 2.0 \e$B0J9_$G!"%0%m!<%P%k@_Dj$G$N$_M-8z$G$9!#\e(B
 </compatibility>
@@ -974,14 +980,6 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
       \e$B@_Dj$7$J$$$G$/$@$5$$!#\e(B</p>
     </note>
 
-    <p><module>perchild</module> MPM \e$B$G$O!"0[$J$k%f!<%6\e(B ID
-    \e$B$GJ#?t$N%P!<%A%c%k%[%9%H$rF0$+$9$3$H$rL\E*$H$7$F$$$^$9$,!"\e(B
-    <directive>User</directive> \e$B$O!"<g%5!<%P$N%f!<%6\e(B ID 
-    \e$B$H!"\e(B<directive module="perchild">AssignUserID</directive>
-    \e$B%G%#%l%/%F%#%V$r;}$?$J$$\e(B <directive type="section"
-    module="core">VirtualHost</directive> \e$B%;%/%7%g%s$X$N\e(B
-    \e$B%U%)!<%k%P%C%/$H$rDj5A$9$k$3$H$K$J$j$^$9!#\e(B</p>
-
     <p>\e$BFC5-;v9`\e(B: \e$B$3$N%G%#%l%/%F%#%V$r\e(B
     <directive module="core" type="section">VirtualHost</directive>
     \e$B$G;HMQ$9$k$3$H$O%5%]!<%H$5$l$J$/$J$j$^$7$?!#\e(B