Update Japanese translation.

Submitted by:	Hiroaki KAWAI <hawk@bcl.t.u-tokyo.ac.jp>, Yoshiki Hayashi

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100586 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_dav.xml.ja b/docs/manual/mod/mod_dav.xml.ja
index c2046d5cf0cd3326ddf4455f00fc72a4b6497599..98a6577140f119e45e9692707146f24ae31fcd78 100644 (file)
--- a/docs/manual/mod/mod_dav.xml.ja
+++ b/docs/manual/mod/mod_dav.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: 1.5 -->
+<!-- English revision: 1.8 -->
 <modulesynopsis metafile="mod_dav.xml.meta">
 
 <name>mod_dav</name> 
@@ -37,14 +37,19 @@
     <directive module="mod_so">LoadModule</directive>
     \e$B$r;HMQ$7$F<B9T;~$K%m!<%I$5$l$F$$$kI,MW$,$"$j$^$9!#\e(B</p>
     
-    <p>\e$BF0:n$5$;$k$K$O!"\e(B<code>httd.conf</code> \e$B%U%!%$%k$N\e(B
-    \e$B%0%m!<%P%k%;%/%7%g%s$K<!$r2C$($F!"%&%'%V%5!<%P$,=q$-9~$_$G$-$k\e(B
-    DAV \e$B%m%C%/%G!<%?%Y!<%9%U%!%$%kL>$r;XDj$7$^$9!#\e(B</p>
+    <p>\e$B$5$i$K!"\e(BDAV \e$B%m%C%/%G!<%?%Y!<%9$N>l=j$,\e(B
+    <directive module="mod_dav_fs">DavLockDB</directive> \e$B%G%#%l%/%F%#%V$r;H$C$F\e(B
+    <code>httd.conf</code> \e$B%U%!%$%k$N%0%m!<%P%k%;%/%7%g%s$K;XDj$5$l$F$$$k\e(B
+    \e$BI,MW$,$"$j$^$9!#\e(B</p>
 
     <example>
-      DavLockDB /tmp/DavLock
+      DavLockDB /usr/local/apache2/var/DavLock
     </example>
 
+    <p>\e$B%m%C%/%G!<%?%Y!<%9%U%!%$%k$N$"$k%G%#%l%/%H%j$O\e(B Apache \e$B$,<B9T$5$l$F$$$k\e(B
+    <directive module="mpm_common">User</directive> \e$B$H\e(B <directive
+    module="mpm_common" >Group</directive> \e$B$K=q$-9~$_8"8B$,$"$kI,MW$,$"$j$^$9!#\e(B</p>
+
     <p><directive module="core" type="section">Limit</directive>
     \e$B@a$r\e(B <directive module="core" type="section">Location</directive>
     \e$B%G%#%l%/%F%#%VFbIt$KDI2C$7$F!"\e(BDAV \e$B$,M-8z$J>l=j$X$N\e(B
@@ -56,7 +61,7 @@
     \e$B%G%#%l%/%F%#%V$O\e(B DAV \e$B%j%/%(%9%H$KBP$7$F$O8zNO$r;}$A$^$;$s!#\e(B</p>
 
     <example><title>\e$B40A4$JNc\e(B</title>
-      DavLockDB /tmp/DavLock<br />
+      DavLockDB /usr/local/apache2/var/DavLock<br />
       <br />
        &lt;Location /foo&gt;<br />
        <indent>
@@ -66,7 +71,7 @@
          AuthName DAV<br />
          AuthUserFile user.passwd<br />
          <br />
-         &lt;LimitExcept GET HEAD OPTIONS&gt;<br />
+         &lt;LimitExcept GET OPTIONS&gt;<br />
          <indent>
            require user admin<br />
          </indent>
@@ -75,13 +80,73 @@
        &lt;/Location&gt;<br />
     </example>
 
-    <note type="warning"><title>\e$B%;%-%e%j%F%#\e(B</title>
-      <p>HTTP \e$B4pK\G'>Z$N;HMQ$O?d>)$G$-$^$;$s!#>/$J$/$H$b\e(B 
-      <module>mod_auth_digest</module> \e$B%b%8%e!<%k$GDs6!$5$l$k\e(B HTTP 
-      \e$B%@%$%8%'%9%HG'>Z$rMQ$$$k$Y$-$G$9!#\e(BWebDAV \e$B%/%i%$%"%s%H$N$[$H$s$I$O\e(B
-      \e$B$3$NG'>ZJ}K!$KBP1~$7$F$$$^$9!#$b$A$m$s!"\e(B<a href="../ssl/">SSL</a>
-      \e$BM-8z$J%3%M%/%7%g%s$rDL$7$?4pK\G'>Z$G$b%;%-%e%j%F%#$,3NJ]$G$-$^$9!#\e(B</p>
-    </note>
+    <p><module>mod_dav</module> \e$B$O\e(B Greg Stein \e$B$5$s$N\e(B <a
+    href="http://www.webdav.org/mod_dav/">Apache 1.3 \e$BMQ$N\e(B mod_dav</a> \e$B$K\e(B
+    \e$BM3Mh$9$k$b$N$G$9!#$=$N%5%$%H$+$i$h$jB?$/$N>pJs$r<j$KF~$l$k$3$H$,$G$-$^$9!#\e(B</p>
+</section>
+
+<section id="security"><title>\e$B%;%-%e%j%F%#$NLdBj\e(B</title>
+
+    <p>DAV \e$B$N%"%/%;%9%a%=%C%I$O1s3V%/%i%$%"%s%H$,%5!<%P$N%U%!%$%k$r\e(B
+    \e$BA`:n$9$k$3$H$r2DG=$K$7$^$9$N$G!"\e(B <module>mod_dav</module> \e$B$r;HMQ$9$k\e(B
+    \e$BA0$K!"%5!<%P$,0BA4$G$"$k$3$H$rFC$KCm0U$7$F3NG'$7$J$1$l$P$J$j$^$;$s!#\e(B</p>
+
+    <p>\e$B%5!<%P>e$N\e(B DAV \e$B$,;HMQ2DG=$K$J$C$F$$$k>l=j$O$9$Y$FG'>Z$GJ]8n$7$F$/$@$5$$!#\e(B
+    HTTP \e$B4pK\G'>Z$N;HMQ$O?d>)$G$-$^$;$s!#>/$J$/$H$b\e(B 
+    <module>mod_auth_digest</module> \e$B%b%8%e!<%k$GDs6!$5$l$k\e(B HTTP 
+    \e$B%@%$%8%'%9%HG'>Z$rMQ$$$k$Y$-$G$9!#\e(BWebDAV \e$B%/%i%$%"%s%H$N$[$H$s$I$O\e(B
+    \e$B$3$NG'>ZJ}K!$KBP1~$7$F$$$^$9!#Be$o$j$K!"\e(B<a href="../ssl/">SSL</a> \e$B$,\e(B
+    \e$BM-8z$J%3%M%/%7%g%s$rDL$7$?4pK\G'>Z$r;H$&$3$H$b$G$-$^$9!#\e(B</p>
+
+    <p><module>mod_dav</module> \e$B$,%U%!%$%k$rA`:n$G$-$k$h$&$K$9$k$?$a$K$O!"\e(B
+    \e$B4IM}2<$N%G%#%l%/%H%j$H%U%!%$%k$H$K\e(B Apache \e$B$,<B9T$5$l$F$$$k\e(B <directive
+    module="mpm_common">User</directive> \e$B$H\e(B <directive
+    module="mpm_common">Group</directive> \e$B$G=q$-9~$_2DG=$G$"$kI,MW$,$"$j$^$9!#\e(B
+    \e$B?7$7$/:n@.$5$l$k%U%!%$%k$b$3$N\e(B <directive module="mpm_common">User</directive>
+    \e$B$H\e(B <directive module="mpm_common">Group</directive> \e$B$K=jM-$5$l$k\e(B
+    \e$B$3$H$K$J$j$^$9!#$3$NM}M3$+$i!"$=$N%"%+%&%s%H$X$N%"%/%;%9$r@)8f$9$k$3$H$O\e(B
+    \e$B=EMW$G$9!#\e(BDAV \e$B%j%]%8%H%j$O\e(B Apache \e$B@lMQ$N$b$N$@$H$_$J$5$l$F$$$^$9!#\e(B
+    Apache \e$B0J30$NJ}K!$G%U%!%$%k$r=$@5$9$k$3$H\e(B (\e$BNc$($P\e(B FTP \e$B$d%U%!%$%k%7%9%F%`\e(B
+    \e$BMQ$N%D!<%k$J$I$r;H$C$F\e(B) \e$B$O5v2D$5$l$F$$$^$;$s!#\e(B</p>
+
+    <p><module>mod_dav</module> \e$B$O$$$m$$$m$J<oN`$N%5!<%S%95qH]967b$K$5$i$5$l$k\e(B
+    \e$B$+$b$7$l$^$;$s!#\e(B<directive
+    module="core">LimitXMLRequestBody</directive> \e$B%G%#%l%/%F%#%V$r;H$&$H\e(B
+    \e$BBg$-$J\e(B DAV \e$B%j%/%(%9%H$r2r@O$9$k$H$-$K>CHq$5$l$k%a%b%j$NNL$r@)8B$9$k$3$H$,\e(B
+    \e$B$G$-$^$9!#\e(B<directive
+    module="mod_dav">DavDepthInfinity</directive> \e$B%G%#%l%/%F%#%V$O\e(B
+    <code>PROPFIND</code> \e$B%j%/%(%9%H$,5pBg%j%]%8%H%j$GBgNL$N%a%b%j$r>CHq$9$k$N$r\e(B
+    \e$BKI$0$3$H$,$G$-$^$9!#B>$N%5!<%S%95qH]967b$K$OC1=c$K;HMQ2DG=$J%G%#%9%/NN0h$r\e(B
+    \e$BB?$/$NBg$-$J%U%!%$%k$GKd$a$F$7$^$&$s$b$N$,$"$j$^$9!#$3$l$rD>@\KI$0J}K!$O\e(B
+    Apache \e$B$K$O$"$j$^$;$s$N$G!"?.MQ$G$-$J$$%f!<%6$K\e(B DAV \e$B%"%/%;%9$rDs6!$9$k$N$O\e(B
+    \e$BHr$1$?J}$,NI$$$G$7$g$&!#\e(B</p>
+</section>
+
+<section id="complex"><title>\e$BJ#;($J@_Dj\e(B</title>
+
+    <p>\e$B$h$/$"$kMW5a$K!"\e(B<module>mod_dav</module> \e$B$r;H$C$FF0E*$J%U%!%$%k\e(B
+    (PHP \e$B%9%/%j%W%H!"\e(BCGI \e$B%9%/%j%W%H$J$I\e(B) \e$B$rA`:n$7$?$$$H$$$&$b$N$,$"$j$^$9!#\e(B
+    \e$B$3$l$N<B8=$O!"\e(B<code>GET</code> \e$B%j%/%(%9%H$O%9%/%j%W%H$NFbMF$r%@%&%s%m!<%I$5$;$k\e(B
+    \e$BBe$o$j$K!"%9%/%j%W%H$r>o$K<B9T$5$;$F$7$^$&$N$GFq$7$/$J$C$F$$$^$9!#\e(B
+    \e$B$3$l$r2sHr$9$kJ}K!$K$O!"Fs$D$N0c$&\e(B URL \e$B$rF1$8%3%s%F%s%D$K%^%C%W$7!"\e(B
+    \e$B0l$D$O%9%/%j%W%H$r<B9T$5$;!"$b$&0l$D$O%@%&%s%m!<%I$5$;$?$j!"\e(BDAV \e$B$+$i\e(B
+    \e$BA`:n$5$l$?$j$9$k$h$&$K@_Dj$9$k$H$$$&$b$N$,$"$j$^$9!#\e(B</p>
+
+<example>
+Alias /phparea /home/gstein/php_files<br />
+Alias /php-source /home/gstein/php_files<br />
+&lt;Location /php-source&gt;
+<indent>
+    DAV On<br />
+    ForceType text/plain<br />
+</indent>
+&lt;/Location&gt;
+</example>
+
+    <p>\e$B$3$N@_Dj$K$h$j!"\e(B<code>http://example.com/phparea</code> \e$B$r\e(B PHP \e$B%9%/%j%W%H$N\e(B
+    \e$B=PNO$r%"%/%;%9$9$k$?$a$K;H$&$3$H$,$G$-!"\e(B
+    <code>http://example.com/php-source</code> \e$B$r\e(B DAV \e$B%/%i%$%"%s%H$K$h$k\e(B
+    \e$B$,A`:n$N$?$a$K;H$&$3$H$,$G$-$^$9!#\e(B</p>
 </section>
 
 <directivesynopsis>

diff --git a/docs/manual/mod/mpm_common.xml.ja b/docs/manual/mod/mpm_common.xml.ja
index 7d92b14a13201b60e390cfa99364de675ceae826..b21edf41d81a960bb2459af685fb68fce155594e 100644 (file)
--- a/docs/manual/mod/mpm_common.xml.ja
+++ b/docs/manual/mod/mpm_common.xml.ja
@@ -2,13 +2,87 @@
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
 <modulesynopsis metafile="mpm_common.xml.meta">
-<!-- English revision: 1.21 -->
+<!-- English revision: 1.31 -->
 
 <name>mpm_common</name>
 <description>\e$BFs$D0J>e$N%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k\e(B (MPM)
 \e$B$G<BAu$5$l$F$$$k%G%#%l%/%F%#%V$N%3%l%/%7%g%s\e(B</description>
 <status>MPM</status>
 
+<directivesynopsis>
+<name>AcceptMutex</name>
+<description>\e$BJ#?t$N;R%W%m%;%9$,%M%C%H%o!<%/%=%1%C%H$G%j%/%(%9%H$r\e(B
+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$?$a$K\e(B
+\e$B;H$&J}K!\e(B</description>
+<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>
+
+<usage>
+    <p><directive>AcceptMutex</directive> \e$B%G%#%l%/%F%#%V$O!"\e(B
+    \e$B%M%C%H%o!<%/%=%1%C%H$N%j%/%(%9%H$r\e(B accept \e$B$7$h$&$H$7$F$$$kJ#?t$N;R%W%m%;%9$r\e(B
+    Apache \e$B$,D>Ns2=$9$k$?$a$K;H$&J}K!$r@_Dj$7$^$9!#\e(B
+    Apache 2.0 \e$B0JA0$O!"$3$N%a%=%C%I$O%3%s%Q%$%k;~$K$N$_A*Br$G$-$^$7$?!#\e(B
+    \e$B:GE,$JJ}K!$O!"%"!<%-%F%/%A%c$d%W%i%C%H%[!<%`$KBg$-$/0MB8$7$^$9!#\e(B
+    \e$B>\:Y$K4X$7$F$O!"\e(B<a 
+    href="../misc/perf-tuning.html">\e$B@-G=$N%A%e!<%K%s%0\e(B</a>
+    \e$B%I%-%e%a%s%H$r$4Mw2<$5$$!#\e(B</p>
+
+    <p>\e$B$3$N%G%#%l%/%F%#%V$,\e(B <code>Default</code>
+    \e$B$K@_Dj$5$l$F$$$l$P!"%3%s%Q%$%k;~$KA*Br$5$l$?%G%U%)%k%HCM$,;H$o$l$^$9!#\e(B
+    \e$BB>$N;HMQ2DG=$J%a%=%C%I$N0lMw$O2<$K$"$j$^$9!#\e(B
+    \e$BA4$F$N%a%=%C%I$,A4$F$N%W%i%C%H%[!<%`$G;HMQ2DG=$G$"$k$o$1$G$O$J$$!"\e(B
+    \e$B$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#\e(B
+    \e$B;HMQ2DG=$G$J$$%a%=%C%I$,;XDj$5$l$?>l9g$O!"\e(B
+    \e$B;HMQ2DG=$J%a%=%C%I$N0lMw$r4^$s$@%a%C%;!<%8$,\e(B
+    \e$B%(%i!<%m%0$K=PNO$5$l$^$9!#\e(B</p>
+
+    <dl>
+      <dt><code>flock</code></dt>
+      <dd><directive module="mpm_common">LockFile</directive>
+      \e$B%G%#%l%/%F%#%V$GDj5A$7$?%U%!%$%k$N%m%C%/$K!"\e(B
+      <code>flock(2)</code> \e$B%7%9%F%`%3!<%k$r;H$$$^$9!#\e(B</dd>
+
+      <dt><code>fcntl</code></dt>
+      <dd><directive module="mpm_common">LockFile</directive>
+      \e$B%G%#%l%/%F%#%V$GDj5A$7$?%U%!%$%k$N%m%C%/$K!"\e(B
+      <code>fcntl(2)</code> \e$B%7%9%F%`%3!<%k$r;H$$$^$9!#\e(B</dd>
+
+      <dt><code>posixsem</code></dt>
+      <dd>\e$BGSB>=hM}$N<BAu$K\e(B POSIX \e$B8_49%;%^%U%)$r;HMQ$7$^$9\e(B</dd>
+
+      <dt><code>pthread</code></dt>
+      <dd>POSIX Threads (PThreads) \e$B5,3J$G<BAu$5$l$F$$$k\e(B
+      POSIX \e$BGSB>=hM}$r;H$$$^$9!#\e(B</dd>
+
+      <dt><code>sysvsem</code></dt>
+      <dd>\e$BGSB>=hM}$N<BAu$K\e(B SySV \e$B7A<0$N%;%^%U%)$r;H$$$^$9!#\e(B</dd>
+    </dl>
+
+    <p>\e$B%3%s%Q%$%k;~$K%7%9%F%`$N%G%U%)%k%H$KA*$P$l$?$b$N$,2?$+$r8+$?$$>l9g$O!"\e(B
+    <directive module="core">LogLevel</directive> \e$B$r\e(B <code>debug</code>
+    \e$B$K@_Dj$9$k$H$h$$$G$7$g$&!#%G%U%)%k%H$N\e(B <directive>AcceptMutex</directive>
+    \e$B$,\e(B <directive module="core">ErrorLog</directive> \e$B$K=q$-9~$^$l$^$9!#\e(B</p>
+
+  <note type="warning"><title>\e$B7Y9p\e(B</title>
+     <p>\e$B$[$H$s$I$N%7%9%F%`$K$*$$$F$O!"\e(B<code>pthread</code> \e$B%*%W%7%g%s$,\e(B
+     \e$BA*$P$l$F$$$k$H!";R%W%m%;%9$,\e(B <code>ApacheCntl</code> mutex \e$B$r\e(B
+     \e$BJ];}$7$F$$$k$H$-$K0[>o=*N;$7$?>l9g!"%5!<%P$O%j%/%(%9%H$X$N1~Ez$r\e(B
+     \e$BDd;_$7$F$7$^$$$^$9!#$3$l$,H/@8$7$?>l9g$O!"%5!<%P$rI|5l$5$;$k$?$a$K$O\e(B
+     \e$B<jF0$G:F5/F0$5$;$kI,MW$,$"$j$^$9!#\e(B</p>
+
+     <p>Solaris \e$B$ONc30$G!"\e(BApache \e$B$b;HMQ$7$F$$$k!";R%W%m%;%9$,\e(B mutex \e$B$r\e(B
+     \e$BJ];}$7$F0[>o=*N;$7$?8e$K\e(B mutex \e$B$rI|5l$5$;$k$?$a$N5!9=$rDs6!$r$7$F$$$^$9!#\e(B</p>
+     <p>\e$B8f;HMQ$N%7%9%F%`$,\e(B <code>pthread_mutexattr_setrobust_np()</code> \e$B4X?t$r\e(B
+     \e$B<BAu$7$F$$$k>l9g$O!"\e(B<code>pthread</code> \e$B%*%W%7%g%s$r0BA4$K;HMQ$G$-$k\e(B
+     \e$B2DG=@-$,$"$j$^$9!#\e(B</p>
+  </note>
+</usage>
+</directivesynopsis>
+
 <directivesynopsis>
 <name>CoreDumpDirectory</name>
 <description>Apache \e$B$,%3%"%@%s%W$9$kA0$K0\F0$r;n$_$k%G%#%l%/%H%j\e(B
@@ -16,18 +90,26 @@
 <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>worker</module><module>perchild</module>
-<module>prefork</module><module>mpm_winnt</module>
-</modulelist>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_winnt</module><module>perchild</module><module>prefork</module>
+<module>threadpool</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
     \e$B%G%U%)%k%HCM$O\e(B <directive module="core">ServerRoot</directive>
     \e$B%G%#%l%/%H%j$G$9$,!"$3$N%G%#%l%/%H%j$O%5!<%P$N<B9T$5$l$F$$$k%f!<%68"8B$G\e(B
     \e$B=q$-9~$_2DG=$G$"$k$Y$-$G$O$J$$$N$G!"DL>o$O%3%"%@%s%W$O=q$-9~$^$l$^$;$s!#\e(B
     \e$B%G%P%C%0$N$?$a$K%3%"%@%s%W$,I,MW$G$"$l$P!"\e(B
     \e$B$3$N%G%#%l%/%F%#%V$r;H$C$FB>$N0LCV$K%3%"%@%s%W$r=q$-=P$9$h$&$K$G$-$^$9!#\e(B</p>
+
+    <note><title>Linux \e$B$G$N%3%"%@%s%W\e(B</title>
+      <p>Apache \e$B$,\e(B root \e$B$H$7$F5/F0$5$l$F!"JL$N%f!<%6$N8"8B$K0J9_$7$?>l9g$O\e(B
+      Linux \e$B$N%+!<%M%k$O%G%#%l%/%H%j$,%W%m%;%9$N8"8B$G=q$-9~$_2DG=$J>l9g$G$5$($b\e(B
+      \e$B%3%"%@%s%W$r\e(B<em>\e$BL58z\e(B</em>\e$B$K$7$^$9!#\e(BApache (2.0.46 \e$B0J9_\e(B) \e$B$O\e(B
+      Linux 2.4 \e$B0J9_$G$O%3%"%@%s%W$r9T$J$&$h$&$K:F;XDj$7$^$9$,!"$=$l$O\e(B
+      <directive>CoreDumpDirectory</directive> \e$B$rL@<(E*$K@_Dj$7$?$H$-$K\e(B
+      \e$B8B$j$^$9!#\e(B</p>
+    </note>
 </usage>
 </directivesynopsis>
 
@@ -36,46 +118,56 @@
 <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>
-<context>virtual host</context>
-</contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module></modulelist>
+<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>
+<compatibility>Apache 2.0 \e$B0J9_$G!"%0%m!<%P%k@_Dj$G$N$_M-8z$G$9!#\e(B</compatibility>
 
 <usage>
     <p><directive>Group</directive> \e$B%G%#%l%/%F%#%V$G!"\e(B
     \e$B%j%/%(%9%H$K1~Ez$9$k:]$K=jB0$7$F$*$/%0%k!<%W$r@_Dj$7$^$9!#\e(B
-    \e$B$3$N%G%#%l%/%F%#%V$r;HMQ$9$k$?$a$K$O!"%9%?%s%I%"%m%s7?$N\e(B
-    \e$B%5!<%P$O:G=i$K\e(B root \e$B8"8B$G5/F0$5$l$F$$$kI,MW$,$"$j$^$9!#\e(B
+    \e$B$3$N%G%#%l%/%F%#%V$r;HMQ$9$k$?$a$K$O!"\e(B
+    \e$B%5!<%P$O:G=i$K\e(B <code>root</code> \e$B8"8B$G5/F0$5$l$F$$$kI,MW$,$"$j$^$9!#\e(B
+    \e$BHs\e(B root \e$B%f!<%6$G%5!<%P$r5/F0$7$?>l9g$O!";XDj$7$?%0%k!<%W$KJQ2=$G$-$:$K!"\e(B
+    \e$B7k2LE*$K5/F0$7$?%f!<%6$NB0$9$k%0%k!<%W$G<B9T$5$l$k$3$H$K$J$j$^$9!#\e(B
     <var>unix-group</var> \e$B$O<!$N$&$A$N$$$:$l$+$G$9\e(B:</p>
 
     <dl>
       <dt>\e$B%0%k!<%WL>\e(B</dt>
+      <dd>\e$B%0%k!<%W$rL>A0$G;2>H$7$^$9\e(B</dd>
 
-      <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>
+    </dl>
 
-      <dt># \e$B$KB3$$$F%0%k!<%WHV9f\e(B</dt>
+    <example><title>\e$BNc\e(B</title>
+      Group www-group
+    </example>
 
-      <dd>\e$B%0%k!<%W$rHV9f$G;2>H$7$^$9!#\e(B</dd>
-    </dl>
     <p>\e$B%5!<%P$r<B9T$9$k$?$a$KFCDj$N?7$7$$%0%k!<%W$r@_Dj$9$k$3$H$r\e(B
     \e$B$*A&$a$7$^$9!#\e(B<code>nobody</code> \e$B$r;HMQ$9$k4IM}<T$b$$$^$9$,!"\e(B
-    \e$B$3$l$O>o$K2DG=$G$"$C$?$jK>$^$7$$Lu$G$O$"$j$^$;$s!#\e(B</p>
+    \e$B2DG=$G$"$C$?$jK>$^$7$$Lu$G$OI,$:$7$b$"$j$^$;$s!#\e(B</p>
 
-    <example>Group www-group</example>
-
-    <p>\e$BCm0U\e(B: \e$B%5!<%P3+;O$rHs\e(B root \e$B%f!<%6$G9T$C$?>l9g$O!"\e(B
-    \e$B;XDj$5$l$?%0%k!<%W$KJQ$o$k$3$H$,$G$-$J$/$F!"Be$o$j$K\e(B
-    \e$B5/F0$r9T$C$?%f!<%6$N=jB0$9$k%0%k!<%W$H$7$F<B9T$5$lB3$1$^$9!#\e(B</p>
+    <note type="warning"><title>\e$B%;%-%e%j%F%#\e(B</title>
+      <p>\e$B@53N$K$I$s$J$3$H$r$d$C$F$$$k$N$+!"$=$N4m81@-$rCN$i$J$$$G!"\e(B
+      <directive>Group</directive> (\e$B$d\e(B <directive
+      module="mpm_common">User</directive>) \e$B$r\e(B
+      <code>root</code> \e$B$K\e(B \e$B@_Dj$7$J$$$G$/$@$5$$!#\e(B</p>
+    </note>
 
-    <p>\e$BFC5-;v9`\e(B: \e$B$3$N%G%#%l%/%F%#%V$r\e(B &lt;VirtualHost&gt;
+    <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(BApache 2.0 \e$B$G\e(B
-    <a href="../suexec.html">suEXEC \e$B%i%C%Q!<\e(B</a>\e$B$r<B8=$7$?$$>l9g$O!"\e(B
+    <a href="../suexec.html">suexec</a> \e$B$r@_Dj$7$?$$>l9g$O!"\e(B
     <directive module="mod_suexec">SuexecUserGroup</directive>
-    \e$B$r;HMQ$7$F$/$@$5$$!#\e(B
-    \e$B%;%-%e%j%F%#\e(B: \e$B%;%-%e%j%F%#>e$NCm0UE@$K4X$7$F$O!"\e(B
-    <directive module="mpm_common">User</directive>
-    \e$B$r$4Mw2<$5$$!#\e(B</p>
+    \e$B$r;HMQ$7$F$/$@$5$$!#\e(B</p>
+
+    <note><title>\e$BCm0U\e(B</title>
+      <p><directive>Group</directive> \e$B%G%#%l%/%F%#%V$O\e(B
+      <module>beos</module> \e$B$H\e(B <module>mpmt_os2</module> MPM
+      \e$B$K$bB8:_$7$^$9$,!"<B<AE*$KL58z$G!"8_49@-$N$?$a$@$1$KB8:_$7$^$9!#\e(B</p>
+    </note>
 </usage>
 </directivesynopsis>
 
@@ -85,15 +177,15 @@
 \e$B$r%5!<%P$,5-O?$9$k$?$a$N%U%!%$%k\e(B</description>
 <syntax>PidFile <var>filename</var></syntax>
 <default>PidFile logs/httpd.pid</default>
-<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module><module>mpm_winnt</module>
-</modulelist>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_winnt</module><module>mpmt_os2</module>
+<module>perchild</module><module>prefork</module>
+<module>threadpool</module><module>worker</module></modulelist>
 
 <usage>
     <p><directive>PidFile</directive> \e$B%G%#%l%/%F%#%V$G!"\e(B
     \e$B%G!<%b%s$N%W%m%;%9\e(B ID \e$B$r%5!<%P$,5-O?$9$k%U%!%$%k$r@_Dj$7$^$9!#\e(B
-    \e$B$b$7%U%!%$%kL>$,%9%i%C%7%e\e(B (/) \e$B$G;O$^$i$J$$>l9g$O!"\e(B
+    \e$B%U%!%$%kL>$,@dBP%Q%9$G$J$$>l9g$O!"\e(B
     <directive module="core">ServerRoot</directive>
     \e$B$+$i$NAjBPE*$J$b$N$H$7$F07$o$l$^$9!#\e(B</p>
 
@@ -102,15 +194,23 @@
     </example>
 
     <p>\e$B%5!<%P$,\e(B <directive module="core">ErrorLog</directive>
-    \e$B$d\e(B TransferLog \e$B$rJD$8$F3+$-D>$7$?$j!"@_Dj%U%!%$%k$r\e(B
+    \e$B$d\e(B <directive module="mod_log_config">TransferLog</directive>
+    \e$B$rJD$8$F3+$-D>$7$?$j!"@_Dj%U%!%$%k$r\e(B
     \e$B:FFI9~$7$?$j$5$;$k$?$a$K!"%5!<%P$K%7%0%J%k$rAw$k$3$H$,$G$-$k$H\e(B
     \e$BJXMx$J$3$H$,$"$j$^$9!#\e(B
-    \e$B$3$l$O\e(B SIGHUP (kill -1) \e$B%7%0%J%k$r\e(B PidFile
+    \e$B$3$l$O\e(B SIGHUP (kill -1) \e$B%7%0%J%k$r\e(B <directive>PidFile</directive>
     \e$B$K=q$+$l$F$$$k%W%m%;%9\e(B ID \e$B$KAw$k$3$H$G$G$-$^$9!#\e(B</p>
 
-    <p>PidFile \e$B$K$O!"%m%0%U%!%$%k$N@_CV0LCV$d\e(B
+    <p><directive>PidFile</directive> \e$B$K$O!"%m%0%U%!%$%k$N@_CV0LCV$d\e(B
     <a href="../misc/security_tips.html#serverroot">\e$B%;%-%e%j%F%#\e(B</a>
     \e$B$HA4$/F1$8Cm0UE@$,$"$j$^$9!#\e(B</p>
+
+    <note><title>\e$BCm0U\e(B</title>
+      <p>Apache 2 \e$B$G$O!"\e(B
+      <a href="../programs/apachectl.html">apachectl</a>
+      \e$B%9%/%j%W%H$N$_$r;HMQ$7$F%5!<%P$N\e(B (\e$B:F\e(B) \e$B5/F0$dDd;_$r\e(B
+      \e$B9T$J$&$3$H$r?d>)$7$F$$$^$9!#\e(B</p>
+    </note>
 </usage>
 </directivesynopsis>
 
@@ -119,19 +219,23 @@
 <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></syntax>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module><module>mpm_winnt</module>
+<modulelist><module>beos</module><module>leader</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>
+<compatibility>Apache 2.0 \e$B$+$iI,MW$J%G%#%l%/%F%#%V\e(B</compatibility>
 
 <usage>
     <p><directive>Listen</directive> \e$B%G%#%l%/%F%#%V$O\e(B Apache
     \e$B$,FCDj$N\e(B IP \e$B%"%I%l%9$d%]!<%HHV9f$@$1$r\e(B listen \e$B$9$k$h$&$K;XDj$7$^$9!#\e(B
     \e$B%G%U%)%k%H$G$OA4$F$N\e(B IP \e$B%$%s%?!<%U%'!<%9$N%j%/%(%9%H$K1~Ez$7$^$9!#\e(B
-    Listen \e$B%G%#%l%/%F%#%V$O8=:_$G$OI,?\$N%G%#%l%/%F%#%V$H$J$j$^$7$?!#\e(B
+    <directive>Listen</directive> \e$B%G%#%l%/%F%#%V$O\e(B
+    \e$B8=:_$OI,?\$N%G%#%l%/%F%#%V$H$J$j$^$7$?!#\e(B
     \e$B$b$7@_Dj%U%!%$%k$K$J$1$l$P!"%5!<%P$O5/F0$K<:GT$7$^$9!#\e(B
     \e$B$3$l$O0JA0$N%P!<%8%g%s$N\e(B Apache \e$B$+$iJQ99$N$"$C$?ItJ,$G$9!#\e(B</p>
 
-    <p>Listen \e$B%G%#%l%/%F%#%V$G$O!"FCDj$N%]!<%H$"$k$$$O\e(B
+    <p><directive>Listen</directive> \e$B%G%#%l%/%F%#%V$G$O!"FCDj$N%]!<%H$"$k$$$O\e(B
     \e$B%"%I%l%9$H%]!<%H$NAH$_9g$o$;$+$iF~$C$F$/$k%j%/%(%9%H$KBP$7$F\e(B
     \e$B1~Ez$9$k$h$&$K;XDj$7$^$9!#\e(B
     \e$B$b$7%]!<%HHV9f$@$1$,;XDj$5$l$?>l9g$O!"%5!<%P$OA4%$%s%?!<%U%'!<%9$N\e(B
@@ -141,7 +245,7 @@
     \e$B$7$^$9!#\e(B</p>
 
     <p>\e$BJ#?t$N%"%I%l%9$H%]!<%H$KBP$7$F\e(B listen \e$B$9$k$h$&$K!"\e(B
-    \e$BJ#?t$N\e(B Listen \e$B%G%#%l%/%F%#%V$r;H$&$3$H$b$G$-$^$9!#\e(B
+    \e$BJ#?t$N\e(B <directive>Listen</directive> \e$B%G%#%l%/%F%#%V$r;H$&$3$H$b$G$-$^$9!#\e(B
     \e$B%5!<%P$ONs5s$5$l$?%"%I%l%9$H%]!<%HA4$F$+$i$N%j%/%(%9%H$KBP$7$F\e(B
     \e$B1~Ez$7$^$9!#\e(B</p>
 
@@ -171,7 +275,7 @@
 
 <seealso><a href="../dns-caveats.html">DNS \e$B$NLdBj\e(B</a></seealso>
 <seealso><a href="../bind.html">Apache
-    \e$B$,;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj\e(B</a></seealso>
+\e$B$,;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj\e(B</a></seealso>
 </directivesynopsis>
 
 <directivesynopsis>
@@ -180,9 +284,10 @@
 <syntax>ListenBacklog <var>backlog</var></syntax>
 <default>ListenBacklog 511</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module><module>mpm_winnt</module>
-</modulelist>
+<modulelist><module>beos</module><module>leader</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>
 
 <usage>
     <p>\e$BJ]N1>uBV$N%3%M%/%7%g%s$N%-%e!<$N:GBgD9$G$9!#\e(B
@@ -206,29 +311,31 @@
 <syntax>LockFile <var>filename</var></syntax>
 <default>LockFile logs/accept.lock</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module></modulelist>
+<modulelist><module>leader</module><module>perchild</module>
+<module>prefork</module><module>threadpool</module><module>worker</module>
+</modulelist>
 
 <usage>
-    <p>USE_FCNTL_SERIALIZED_ACCEPT \e$B$^$?$O\e(B USE_FLOCK_SERIALIZED_ACCEPT
-    \e$B$N$$$:$l$+$r;H$C$F\e(B Apache \e$B$r%3%s%Q%$%k$7$?:]$K;HMQ$9$k$3$H$K$J$k!"\e(B
-    \e$B%m%C%/%U%!%$%k$N%Q%9$r\e(B <directive>LockFile</directive>
-    \e$B$O@_Dj$7$^$9!#\e(B
-    \e$B$3$N%G%#%l%/%F%#%V$ODL>o$O%G%U%)%k%HCM$N$^$^$K$7$F$*$/$Y$-$G$9!#\e(B
-    \e$B$3$l$rJQ99$9$k:]$N<g$JM}M3$O!"\e(B<code>logs</code>
-    \e$B%G%#%l%/%H%j$,\e(B NFS \e$B%^%&%s%H$5$l$?$b$N$G$"$k$H$$$&M}M3$G$9!#\e(B
-    <strong>\e$B%m%C%/%U%!%$%k$O%m!<%+%k%G%#%9%/$KJ]B8$7$J$1$l$P$J$i$J$$\e(B
-    \e$B$+$i$G$9!#\e(B</strong>
-    \e$B%a%$%s%5!<%P%W%m%;%9$N\e(B PID \e$B$,<+F0E*$K%U%!%$%kL>$KIU2C$5$l$^$9!#\e(B</p>
-
-    <note type="warning"><title>\e$B%;%-%e%j%F%#\e(B:</title>
-    <p><code>/var/tmp</code>
-    \e$B$H$$$C$?!"C/$G$b=q$-9~$a$k%G%#%l%/%H%j$K%U%!%$%k$r\e(B
-    \e$BCV$+$J$$J}$,$h$$$G$9!#$J$<$J$i!"%5!<%P$,5/F0;~$K:n@.$9$k\e(B
-    \e$B%m%C%/%U%!%$%k$N:n@.<+BN$rK832$9$k$3$H$K$h$C$F!"\e(B
-    \e$BC/$G$b%5!<%S%95qH]%"%?%C%/$r0z$-5/$3$9$3$H$,$G$-$k$+$i$G$9!#\e(B</p>
+    <p><directive module="mpm_common">AcceptMutex</directive>
+    \e$B$,\e(B <code>fcntl</code> \e$B$d\e(B <code>flock</code>
+    \e$B$K@_Dj$5$l$F;HMQ$5$l$F$$$k>l9g$K!";HMQ$5$l$k%m%C%/%U%!%$%k$X$N%Q%9$r\e(B
+    <directive>LockFile</directive> \e$B%G%#%l%/%F%#%V$G@_Dj$7$^$9!#\e(B
+    \e$B$3$N%G%#%l%/%F%#%V$ODL>o$O$=$N$^$^$K$7$F$*$-$^$9!#\e(B
+    \e$B<g$K\e(B <code>logs</code> \e$B%G%#%l%/%H%j$,\e(B NFS
+    \e$B$G%^%&%s%H$5$l$F$$$k>l9g$J$I$KCM$rJQ$($^$9!#\e(B
+    \e$B$J$<$J$i\e(B<strong>\e$B%m%C%/%U%!%$%k$O%m!<%+%k%G%#%9%/$K\e(B
+    \e$BJ]B8$5$l$J$1$l$P$J$i$J$$\e(B</strong>\e$B$+$i$G$9!#\e(B
+    \e$B%a%$%s%5!<%P%W%m%;%9$N\e(B PID \e$B$,%U%!%$%kL>$K<+F0E*$KIU2C$5$l$^$9!#\e(B</p>
+
+    <note type="warning"><title>\e$B%;%-%e%j%F%#\e(B</title>
+      <p><code>/var/tmp</code>
+      \e$B$H$$$C$?!"C/$G$b=q$-9~$a$k%G%#%l%/%H%j$K%U%!%$%k$r\e(B
+      <em>\e$BCV$+$J$$\e(B</em>\e$BJ}$,$h$$$G$9!#$J$<$J$i!"%5!<%P$,5/F0;~$K:n@.$9$k\e(B
+      \e$B%m%C%/%U%!%$%k$N:n@.<+BN$rK832$9$k$3$H$K$h$C$F!"\e(B
+      \e$BC/$G$b%5!<%S%95qH]%"%?%C%/$r0z$-5/$3$9$3$H$,$G$-$k$+$i$G$9!#\e(B</p>
     </note>
 </usage>
+<seealso><directive module="mpm_common">AcceptMutex</directive></seealso>
 </directivesynopsis>
 
 <directivesynopsis>
@@ -236,8 +343,10 @@
 <description>\e$B%j%/%(%9%H$K1~Ez$9$k$?$a$K:n@.$5$l$k\e(B
 \e$B;R%W%m%;%9$N:GBg8D?t\e(B</description>
 <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>worker</module><module>prefork</module>
+<modulelist><module>beos</module><module>leader</module>
+<module>prefork</module><module>threadpool</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -249,20 +358,24 @@
     \e$BB>$N%j%/%(%9%H$N:G8e$^$GC#$7$F;R%W%m%;%9$,6u$/$H!"\e(B
     \e$B<!$N%3%M%/%7%g%s$K1~Ez$7$^$9!#\e(B</p>
 
-    <p>\e$B%9%l%C%I$rMQ$$$J$$%5!<%P\e(B (\e$B$9$J$o$A\e(B <module>prefork</module>)
+    <p>\e$B%9%l%C%I$rMQ$$$J$$%5!<%P\e(B (<em>\e$B$9$J$o$A\e(B</em> <module>prefork</module>)
     \e$B$G$O!"\e(B<directive>MaxClients</directive>
     \e$B$O!"%j%/%(%9%H$K1~Ez$9$k$?$a$K5/F0$5$l$k\e(B
     \e$B;R%W%m%;%9$N:GBg?t$H$J$j$^$9!#\e(B
-    \e$B%G%U%)%k%HCM$O\e(B 256 \e$B$G!"$3$l$rA}2C$5$;$?$$>l9g$O!"\e(B
+    \e$B%G%U%)%k%HCM$O\e(B <code>256</code> \e$B$G!"$3$l$rA}2C$5$;$?$$>l9g$O!"\e(B
     <directive module="mpm_common">ServerLimit</directive>
     \e$B$NCM$bA}2C$5$;$kI,MW$,$"$j$^$9!#\e(B</p>
 
-    <p>\e$B%9%l%C%I$rMQ$$$k%5!<%P\e(B (\e$B$9$J$o$A\e(B <module>worker</module>)
+    <p>\e$B%9%l%C%I$rMQ$$$k%5!<%P$d!"%O%$%V%j%C%I%5!<%P\e(B (<em>\e$B$9$J$o$A\e(B</em>
+    <module>beos</module> <module>worker</module>)
     \e$B$G$O!"\e(B<directive>MaxClients</directive> 
     \e$B$O!"%/%i%$%"%s%H$K1~Ez$G$-$k%9%l%C%I$NAm?t$r@)8B$7$^$9!#\e(B
-    \e$B%G%U%)%k%HCM$O\e(B
-    <directive module="mpm_common">ThreadsPerChild</directive>
-    \e$B$r\e(B 16 \e$BG\$7$?CM$K$J$j$^$9!#\e(B<directive>MaxClients</directive>
+    <module>beos</module> \e$B$G$N%G%U%)%k%HCM$O\e(B <code>50</code> \e$B$G$9!#\e(B
+    \e$B%O%$%V%j%C%I\e(B MPM \e$B$G$N%G%U%)%k%HCM$O\e(B 16
+    <directive module="mpm_common">ServerLimit</directive>
+    \e$B$N\e(B <code>25</code> \e$BG\\e(B (<directive
+    module="mpm_common">ThreadsPerChild</directive>) \e$B$G$9!#\e(B
+    <directive>MaxClients</directive>
     \e$B$r\e(B 16 \e$B%W%m%;%90J>eI,MW$JCM$^$GA}2C$5$;$?$$>l9g$O!"\e(B
     <directive module="mpm_common">ServerLimit</directive>
     \e$B$bA}2C$5$;$kI,MW$,$"$j$^$9!#\e(B</p>
@@ -271,16 +384,18 @@
 
 <directivesynopsis>
 <name>MaxMemFree</name>
-<description>\e$B<g%a%b%j%"%m%1!<%?$,\e(B free() \e$B$r8F$P$:$KJ];}$7B3$1$i$l$k%a%b%j$N\e(B
-\e$B:GBgNL\e(B</description>
-<syntax>MaxMemFree <var>number</var></syntax>
+<description><code>free()</code> \e$B$,8F$P$l$J$$8B$j!"\e(B
+\e$B<g%a%b%j%"%m%1!<%?$,J];}$7B3$1$i$l$k%a%b%j$N:GBgNL\e(B</description>
+<syntax>MaxMemFree <var>KBytes</var></syntax>
+<default>MaxMemFree 0</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>prefork</module>
-<module>mpm_netware</module>
-</modulelist>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_netware</module><module>prefork</module>
+<module>threadpool</module><module>worker</module></modulelist>
 
 <usage>
-    <p><directive>MaxMemFree</directive> \e$B%G%#%l%/%F%#%V$O\e(B free() \e$B$r8F$P$:$K\e(B
+    <p><directive>MaxMemFree</directive> \e$B%G%#%l%/%F%#%V$O\e(B
+    <code>free()</code> \e$B$,8F$P$l$J$$8B$j!"\e(B
     \e$B<g%"%m%1!<%?$,J];}$G$-$k6u$N%a%b%j$N:GBgCM$r%-%m%P%$%HC10L$G@_Dj$7$^$9!#\e(B
     \e$B@_Dj$5$l$F$$$J$$$+!"Nm$K@_Dj$5$l$F$$$k$H$-$O!"L5@)8B$K$J$j$^$9!#\e(B</p>
 </usage>
@@ -292,18 +407,24 @@
 <syntax>MaxRequestsPerChild <var>number</var></syntax>
 <default>MaxRequestsPerChild 10000</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module><module>mpm_winnt</module>
-</modulelist>
+<modulelist><module>leader</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>
 
 <usage>
     <p><directive>MaxRequestsPerChild</directive> \e$B%G%#%l%/%F%#%V$O!"\e(B
     \e$B8D!9$N;R%5!<%P%W%m%;%9$,07$&$3$H$N$G$-$k%j%/%(%9%H$N@)8B?t$r\e(B
     \e$B@_Dj$7$^$9!#\e(B<directive>MaxRequestsPerChild</directive>
     \e$B8D$N%j%/%(%9%H$N8e$K!";R%W%m%;%9$O=*N;$7$^$9!#\e(B
-    <directive>MaxRequestsPerChild</directive> \e$B$,\e(B 0
+    <directive>MaxRequestsPerChild</directive> \e$B$,\e(B <code>0</code>
     \e$B$K@_Dj$5$l$F$$$k>l9g$O!"%W%m%;%9$O4|8B@Z$l$K$h$j=*N;$9$k$3$H$O$"$j$^$;$s!#\e(B</p>
 
+    <note><title>\e$B$=$NB>$N%G%U%)%k%HCM\e(B</title>
+      <p><module>mpm_netware</module> \e$B$H\e(B <module>mpm_winnt</module>
+      \e$B$G$N%G%U%)%k%HCM$O\e(B <code>0</code> \e$B$G$9!#\e(B</p>
+    </note>
+
     <p><directive>MaxRequestsPerChild</directive>
     \e$B$rHs%<%m$K@)8B$9$k$3$H$K$O!"Fs$D$NMxE@$,$"$j$^$9\e(B:</p>
 
@@ -315,11 +436,11 @@
       \e$B%5!<%PIi2Y$,2<$,$C$?;~$K%W%m%;%9?t$r>/$J$/$9$k$3$H$,$G$-$k\e(B</li>
     </ul>
 
-    <note><title>\e$BCm0U\e(B:</title>
-    <p><em>KeepAlive</em> \e$B%j%/%(%9%H$N>l9g$O!"\e(B
-    \e$B0l$DL\$N%j%/%(%9%H$@$1$,$3$N@)8B$K3:Ev$7$^$9!#\e(B
-    \e$B<B8zE*$K$O!"0l$D$N;R%W%m%;%9$"$?$j$N\e(B<em>\e$B%3%M%/%7%g%s\e(B</em>\e$B?t$r\e(B
-    \e$B@)8B$9$k$h$&$K5sF0$,JQ2=$7$^$9!#\e(B</p>
+    <note><title>\e$BCm\e(B</title>
+      <p><directive module="core">KeepAlive</directive> \e$B%j%/%(%9%H$N>l9g$O!"\e(B
+      \e$B0l$DL\$N%j%/%(%9%H$@$1$,$3$N@)8B$K3:Ev$7$^$9!#\e(B
+      \e$B<B8zE*$K$O!"0l$D$N;R%W%m%;%9$"$?$j$N\e(B<em>\e$B%3%M%/%7%g%s\e(B</em>\e$B?t$r\e(B
+      \e$B@)8B$9$k$h$&$K5sF0$,JQ2=$7$^$9!#\e(B</p>
     </note>
 </usage>
 </directivesynopsis>
@@ -328,9 +449,11 @@
 <name>MaxSpareThreads</name>
 <description>\e$B%"%$%I%k%9%l%C%I$N:GBg?t\e(B</description>
 <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>mpm_netware</module>
-<module>perchild</module><module>worker</module>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_netware</module><module>mpmt_os2</module>
+<module>perchild</module><module>threadpool</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -343,8 +466,9 @@
     \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> \e$B$G$O!"\e(B
-    \e$B%G%U%)%k%H$O\e(B <code>MaxSpareThreads 500</code> \e$B$G$9!#\e(B
+    <p><module>worker</module>, <module>leader</module>,
+    <module>threadpool</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
     \e$B$3$N?t;z$h$j$b>/$J$$?t$K$J$k$^$G;R%W%m%;%9$r=*N;$7$^$9!#\e(B</p>
@@ -354,38 +478,47 @@
     \e$B$3$N\e(B MPM \e$B$O%7%s%0%k%W%m%;%9$G<B9T$5$l$^$9$N$G!"\e(B
     \e$B%9%Z%"%9%l%C%I?t$b%5!<%PA4BN$G4*Dj$7$^$9!#\e(B</p>
 
+    <p><module>beos</module> \e$B$H\e(B <module>mpmt_os2</module> \e$B$O\e(B
+    <module>mpm_netware</module> \e$B$H;w$?5sF0$r$7$^$9!#\e(B
+    <module>beos</module> \e$B$G$N%G%U%)%k%HCM$O\e(B <code>MaxSpareThreads 50</code>
+    \e$B$G$9!#\e(B<module>mpmt_os2</module> \e$B$G$N%G%U%)%k%HCM$O\e(B <code>10</code>
+    \e$B$G$9!#\e(B</p>
+
+    <note><title>\e$B@)8B;v9`\e(B</title>
+      <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>, 
+        <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>
+        \e$B$G7h$^$kAmOB$HEy$7$$$+Bg$-$$I,MW$,$"$j$^$9!#\e(B</li>
+      </ul>
+    </note>
 </usage>
 <seealso><directive module="mpm_common">MinSpareThreads</directive></seealso>
 <seealso><directive module="mpm_common">StartServers</directive></seealso>
 </directivesynopsis>
 
-<directivesynopsis>
-<name>MaxThreadsPerChild</name>
-<description>\e$B;R%W%m%;%9Kh$N%9%l%C%I?t$N:GBg?t\e(B</description>
-<syntax>MaxThreadsPerChild <var>number</var></syntax>
-<default>MaxThreadsPerChild 64</default>
-<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-</modulelist>
-
-<usage>
-    <p>\e$B;R%W%m%;%9Kh$K4^$^$l$k%9%l%C%I?t$N:GBgCM$G$9!#\e(B
-    \e$B;R%W%m%;%9Kh$K%9%l%C%I?tJQ2=$9$k\e(B MPM \e$B$G$O!"\e(B
-    \e$B$3$N%G%#%l%/%F%#%V$O!";R%W%m%;%9Fb$K@8@.$5$l$k%9%l%C%I?t$N\e(B
-    \e$B:GBgCM$r@_Dj$7$^$9!#%G%U%)%k%HCM$h$j$bBg$-$$CM$K$9$k$N$G$"$l$P!"\e(B
-    \e$B%3%s%Q%$%k;~$KDj5A$5$l$?\e(B <code>HARD_THREAD_LIMIT</code>
-    \e$B$rJQ99$7$F!"%5!<%P$r:F%3%s%Q%$%k$9$kI,MW$,$"$j$^$9!#\e(B</p>
-</usage>
-</directivesynopsis>
-
 <directivesynopsis>
 <name>MinSpareThreads</name>
 <description>\e$B%j%/%(%9%H$K1~Ez$9$k$3$H$N$G$-$k\e(B
 \e$B%"%$%I%k%9%l%C%I?t$N:G>.?t\e(B</description>
 <syntax>MinSpareServers <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>mpm_netware</module>
-<module>perchild</module><module>worker</module>      
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_netware</module><module>mpmt_os2</module>
+<module>perchild</module><module>threadpool</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -397,10 +530,15 @@
     \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</p>
-
-    <p><module>worker</module> \e$B$G$O!"\e(B
-    \e$B%G%U%)%k%H$O\e(B <code>MinSpareThreads 250</code> \e$B$G!"\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 10 \e$B$K!"\e(B<directive>MinSpareThreads</directive> \e$B$r\e(B
+    5 \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
+    \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
     \e$B%"%$%I%k%9%l%C%I?t$,$3$N?t$h$j$bBg$-$/$J$k$^$G\e(B
@@ -410,27 +548,16 @@
     \e$B%G%U%)%k%H$O\e(B <code>MinSpareThreads 10</code> \e$B$G!"\e(B
     \e$B%7%s%0%k%W%m%;%9\e(B MPM \e$B$G$9$N$G!"%5!<%PA4BN$G4IM}$5$l$^$9!#\e(B</p>
 
+    <p><module>beos</module> \e$B$H\e(B <module>mpmt_os2</module> \e$B$O!"\e(B
+    <module>mpm_netware</module>\e$B$K$h$/;w$F$$$^$9!#\e(B
+    <module>beos</module> \e$B$G$N%G%U%)%k%H$O\e(B <code>MinSpareThreads 1</code>
+    \e$B$G$9!#\e(B<module>mpmt_os2</module> \e$B$G$N%G%U%)%k%H$O\e(B
+    <code>5</code> \e$B$G$9!#\e(B</p>
 </usage>
 <seealso><directive module="mpm_common">MaxSpareThreads</directive></seealso>
 <seealso><directive module="mpm_common">StartServers</directive></seealso>
 </directivesynopsis>
 
-<directivesynopsis>
-<name>NumServers</name>
-<description>\e$BF1;~$K5/F0$7$F$$$k;R%W%m%;%9$NAm?t\e(B</description>
-<syntax>NumServers <var>number</var></syntax>
-<default>NumServers 2</default>
-<contextlist><context>server config</context></contextlist>
-<modulelist><module>perchild</module></modulelist>
-
-<usage>
-    <p>\e$BF1;~$K5/F0$7$F$$$k;R%W%m%;%9$N?t$G$9!#\e(B
-    \e$B$3$N%G%#%l%/%F%#%V$r;HMQ$9$k\e(B MPM \e$B$OF0E*$K?7$7$$;R%W%m%;%9$r\e(B
-    \e$B@8@.$9$k$3$H$O9T$o$J$$$N$G!"%5%$%HA4BN$KMh$k%j%/%(%9%HA4$F$r\e(B
-    \e$B==J,07$($kDxEY$KBg$-$J?t$K@_Dj$7$F$*$/I,MW$,$"$j$^$9!#\e(B</p>
-</usage>
-</directivesynopsis>
-
 <directivesynopsis>
 <name>ScoreBoardFile</name>
 <description>\e$B;R%W%m%;%9$HO"7H$9$k$?$a$N%G!<%?$rJ]B8$9$k\e(B
@@ -438,8 +565,9 @@
 <syntax>ScoreBoardFile <var>file-path</var></syntax>
 <default>ScoreBoardFile logs/apache_status</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module></modulelist>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_winnt</module><module>perchild</module><module>prefork</module>
+<module>threadpool</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
@@ -463,24 +591,27 @@
     <a href="../misc/security_tips.html">\e$B%;%-%e%j%F%#\e(B</a>
     \e$B$HF1MM$NCm0UE@$,$"$k$N$G!"Cm0U$7$F$/$@$5$$!#\e(B</p>
 </usage>
-<seealso><a
-    href="../stopping.html">Apache \e$B$NDd;_$H:F5/F0\e(B</a></seealso>
+<seealso><a href="../stopping.html">Apache \e$B$NDd;_$H:F5/F0\e(B</a></seealso>
 </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>worker</module><module>perchild</module>
-<module>prefork</module><module>mpm_winnt</module>
-</modulelist>
+<modulelist><module>beos</module><module>leader</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>
 
 <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
     \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>
+
+    <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>
 
@@ -488,9 +619,10 @@
 <name>ServerLimit</name>
 <description>\e$B@_Dj2DG=$J%5!<%P%W%m%;%9?t$N>e8B\e(B</description>
 <syntax>ServerLimit <var>number</var></syntax>
-<default>ServerLimit 256 (prefork), ServerLimit 16 (worker)</default>
+<default>\e$B>\:Y$O;HMQK!$r;2>H\e(B</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>prefork</module>
+<modulelist><module>leader</module><module>perchild</module>
+<module>prefork</module><module>threadpool</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -519,46 +651,66 @@
 
     <p><module>prefork</module> MPM \e$B$G$O!"\e(B
     <directive module="mpm_common">MaxClients</directive>
-    \e$B$r\e(B 256 \e$B$h$j$bBg$-$JCM$K@_Dj$9$kI,MW$,$"$k;~$K$@$1;HMQ$7$F$/$@$5$$!#\e(B
+    \e$B$r\e(B 256 (\e$B%G%U%)%k%H\e(B) \e$B$h$j$bBg$-$JCM$K@_Dj$9$kI,MW$,$"$k;~$K$@$1;HMQ$7$F$/$@$5$$!#\e(B
     \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> MPM \e$B$G$O!"\e(B
+    <p><module>worker</module>, <module>leader</module>, 
+    <module>threadpool</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%;%90J>eI,MW$K$J$k>l9g$K$N$_;HMQ$7$F$/$@$5$$!#\e(B
-    \e$B4uK>$N\e(B
+    \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) 
+    \e$B0J>eI,MW$K$J$k>l9g$K$N$_;HMQ$7$F$/$@$5$$!#4uK>$N\e(B
     <directive module="mpm_common">MaxClients </directive> \e$B$H\e(B
     <directive module="mpm_common">ThreadsPerChild</directive>
     \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
+      \e$B$3$l$O%9%Z%k%_%9$K$h$C$F8m$C$F9s$$>u67$K$J$k$N$r!"\e(B
+      \e$B2sHr$9$k$?$a$N=hCV$G$9!#\e(B</p>
+    </note>
 </usage>
+<seealso><a href="../stopping.html">Apache \e$B$NDd;_$H:F5/F0\e(B</a></seealso>
 </directivesynopsis>
 
 <directivesynopsis>
 <name>StartServers</name>
 <description>\e$B5/F0;~$K@8@.$5$l$k;R%5!<%P%W%m%;%9$N?t\e(B</description>
 <syntax>StartServers <var>number</var></syntax>
-<default>StartServers 5</default>
+<default>\e$B>\:Y$O;HMQJ}K!$r;2>H\e(B</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module></modulelist>
+<modulelist><module>leader</module><module>mpmt_os2</module>
+<module>prefork</module><module>threadpool</module><module>worker</module>
+</modulelist>
 
 <usage>
     <p><directive>StartServers</directive> \e$B%G%#%l%/%F%#%V$O!"\e(B
     \e$B5/F0;~$K@8@.$5$l$k;R%5!<%P%W%m%;%9$N?t$r@_Dj$7$^$9!#\e(B
     \e$B%W%m%;%9?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>\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>
 </usage>
-<seealso><directive module="mpm_common">MinSpareThreads</directive></seealso>
-<seealso><directive module="mpm_common">MaxSpareThreads</directive></seealso>
 </directivesynopsis>
 
 <directivesynopsis>
 <name>StartThreads</name>
 <description>\e$B5/F0;~$K@8@.$5$l$k%9%l%C%I$N?t\e(B</description>
 <syntax>StartThreads <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>mpm_netware</module><module>perchild</module></modulelist>
+<modulelist><module>beos</module><module>mpm_netware</module>
+<module>perchild</module></modulelist>
 
 <usage>
     <p>\e$B5/F0;~$K@8@.$5$l$k%9%l%C%I$N?t$G$9!#\e(B
@@ -574,6 +726,9 @@
     \e$B$3$N>l9g%W%m%;%9$O0l$D$7$+$J$$$N$G!"\e(B
     \e$B5/F0;~$K%j%/%(%9%H$K1~Ez$9$k%9%l%C%I$NAm?t$H$J$j$^$9!#\e(B</p>
 
+    <p><module>beos</module> \e$B$G$N%G%U%)%k%H$O\e(B <code>StartThreads
+    10</code> \e$B$G$9!#\e(B
+    \e$B$^$?!"5/F0;~$K@8@.$5$l$k%9%l%C%I$NAm?t$K$bH?1G$5$l$^$9!#\e(B</p>
 </usage>
 </directivesynopsis>
 
@@ -582,8 +737,13 @@
 <description>\e$B@_Dj2DG=$J;R%W%m%;%9Kh$N%9%l%C%I?t$N>e8B$r\e(B
 \e$B@_Dj$7$^$9\e(B</description>
 <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>mpm_winnt</module><module>worker</module></modulelist>
+<modulelist><module>leader</module><module>mpm_winnt</module>
+<module>perchild</module><module>threadpool</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>
 
 <usage>
     <p>\e$B$3$N%G%#%l%/%F%#%V$O\e(B
@@ -610,9 +770,16 @@
     </p>
 
     <p><directive>ThreadLimit</directive> \e$B$N%G%U%)%k%HCM$O\e(B
-    <module>worker</module> \e$B$N$H$-$O\e(B 64 \e$B$G!"\e(B<module>mpm_winnt</module> \e$B$N$H$-$O\e(B
-    1920 \e$B$G$9!#\e(B</p>
-
+    <module>mpm_winnt</module> \e$B$N$H$-$O\e(B 1920 \e$B$G!"\e(B
+    \e$BB>$N>l9g$O\e(B 64 \e$B$G$9!#\e(B</p>
+
+    <note><title>\e$BCm0U\e(B</title>
+      <p><code>ThreadLimit 20000</code> (<module>mpm_winnt</module>
+      \e$B$N>l9g$O\e(B <code>ThreadLimit 15000</code> )
+      \e$B$H$$$&@)8BIU$-$G%3%s%Q%$%k$5$l$F$$$^$9!#\e(B
+      \e$B$3$l$O%9%Z%k%_%9$K$h$C$F8m$C$F9s$$>u67$K$J$k$N$r!"\e(B
+      \e$B2sHr$9$k$?$a$N=hCV$G$9!#\e(B</p>
+    </note>
 </usage>
 </directivesynopsis>
 
@@ -620,10 +787,10 @@
 <name>ThreadsPerChild</name>
 <description>\e$B;R%W%m%;%9$=$l$>$l$K@8@.$5$l$k%9%l%C%I?t\e(B</description>
 <syntax>ThreadsPerChild <var>number</var></syntax>
-<default>ThreadsPerChild 50</default>
+<default>\e$B>\:Y$O;HMQJ}K!$r;2>H\e(B</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>mpm_winnt</module>
-</modulelist>
+<modulelist><module>leader</module><module>mpm_winnt</module>
+<module>threadpool</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
@@ -635,7 +802,11 @@
     \e$BBg$-$/$J$1$l$P$J$j$^$;$s!#\e(B<module>worker</module> \e$B$N$h$&$J!"\e(B
     \e$B;R%W%m%;%9$,J#?t$"$k$h$&$J\e(B MPM \e$B$rMxMQ$7$F$$$k$N$G$"$l$P!"\e(B
     \e$B%5!<%P$NDL>oIi2Y$r==J,07$($kDxEY$K!"\e(B
-    \e$B%9%l%C%IAm?t$,B?$/$J$1$l$P$J$j$^$;$s!#\e(B</p>
+    <em>\e$B%9%l%C%IAm?t\e(B</em>\e$B$,B?$/$J$1$l$P$J$j$^$;$s!#\e(B</p>
+
+    <p><module>mpm_winnt</module>\e$B$G$N\e(B <directive>ThreadsPerChild</directive>
+    \e$B$N%G%U%)%k%HCM$O\e(B <code>64</code> \e$B$G!"B>$N>l9g$O\e(B
+    <code>25</code> \e$B$G$9!#\e(B</p>
 </usage>
 </directivesynopsis>
 
@@ -644,32 +815,36 @@
 <description>\e$B%j%/%(%9%H$K1~Ez$9$k:]$KMQ$$$k%f!<%6\e(B ID</description>
 <syntax>User <var>unix-userid</var></syntax>
 <default>User #-1</default>
-<contextlist><context>server config</context>
-<context>virtual host</context>
-</contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module></modulelist>
+<contextlist><context>server config</context></contextlist>
+<modulelist><module>leader</module><module>perchild</module>
+<module>prefork</module><module>threadpool</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>
     <p><directive>User</directive> \e$B%G%#%l%/%F%#%V$O\e(B
     \e$B%5!<%P$,%j%/%(%9%H$K1~Ez$9$k:]$KMQ$$$k%f!<%6\e(B ID \e$B$r@_Dj$7$^$9!#\e(B
     \e$B$3$N%G%#%l%/%F%#%V$r;HMQ$9$k$?$a$K$O!"%9%?%s%I%"%m%s7?$N\e(B
     \e$B%5!<%P$O:G=i$K\e(B root \e$B8"8B$G5/F0$5$l$F$$$kI,MW$,$"$j$^$9!#\e(B
-    <var>unix-userid</var> \e$B$O<!$N$I$A$i$+$G$9\e(B:</p>
+    \e$BHs\e(B root \e$B%f!<%6$G%5!<%P$r5/F0$7$?>l9g$O!"\e(B
+    \e$B8"8B$NDc$$%f!<%6$X$HJQ$o$k$3$H$,$G$-$:!"\e(B
+    \e$B7k6I85$N%f!<%6$N%W%m%;%9$H$7$F<B9T$5$lB3$1$^$9!#\e(B
+    <code>root</code> \e$B$G5/F0$7$?>l9g$K?F%W%m%;%9$,\e(B root
+    \e$B$H$7$F<B9T$5$l$F$$$k$N$O@5>o$JF0:n$G$9!#\e(B
+    <var>Unix-userid</var> \e$B$O<!$N$I$l$+$G$9!#\e(B</p>
 
     <dl>
       <dt>\e$B%f!<%6L>\e(B</dt>
-
       <dd>\e$B%f!<%6$rL>A0$G;2>H$7$^$9!#\e(B</dd>
 
       <dt># \e$B$KB3$$$F%f!<%6HV9f\e(B</dt>
-
       <dd>\e$B%f!<%6$rHV9f$G;2>H$7$^$9!#\e(B</dd>
     </dl>
 
     <p>\e$B$3$N%f!<%6$O!"30It$K8+$;$k$h$&$K0U?^$7$F$$$J$$%U%!%$%k$K!"\e(B
     \e$B%"%/%;%92DG=$K$J$C$F$7$^$&$h$&$J8"8B$r;}$D$Y$-$G$O$J$$$G$9$7!"\e(B
-    \e$BF1MM$K\e(B httpd \e$B%j%/%(%9%H$KBP$7$F1~Ez$9$k$h$&$K0U?^$7$F$$$J$$\e(B
+    \e$BF1MM$K\e(B HTTP \e$B%j%/%(%9%H$KBP$7$F1~Ez$9$k$h$&$K0U?^$7$F$$$J$$\e(B
     \e$B<B9T%3!<%I$r!"<B9T$G$-$k$h$&$J8"8B$r;}$D$Y$-$G$O$J$$$G$9!#\e(B
     \e$B%5!<%P$r<B9T$9$k$?$a$KFCDj$N?7$7$$%f!<%6$H%0%k!<%W$r\e(B
     \e$B@_Dj$9$k$3$H$r$*A&$a$$$?$7$^$9!#\e(B
@@ -678,25 +853,33 @@
     \e$B$J$<$J$i\e(B <code>nobody</code> \e$B%f!<%6$O!"%7%9%F%`$G\e(B
     \e$BB>$NLr3d$rC4$C$F$$$k$+$bCN$l$J$$$+$i$G$9!#\e(B</p>
 
-    <p>\e$BCm0U\e(B: \e$BHs\e(B root \e$B%f!<%6$G%5!<%P$r5/F0$7$?>l9g$O!"\e(B
-    \e$B$h$jDc$$8"8B$N%f!<%6$KJQ$o$k$3$H$K<:GT$7$F!"\e(B
-    \e$BBe$o$j$K5/F0$r9T$C$?%f!<%68"8B$N$^$^<B9T$5$lB3$1$k$G$7$g$&!#\e(B
-    root \e$B8"8B$G3+;O$7$?>l9g?F%W%m%;%9$,\e(B root
-    \e$B8"8B$G<B9T$5$lB3$1$^$9$,!"$3$l$O@5>o$G$9!#\e(B</p>
+    <note type="warning"><title>\e$B%;%-%e%j%F%#\e(B</title>
+      <p>\e$B@53N$K$I$s$J$3$H$r$d$C$F$$$k$N$+!"$=$N4m81@-$rCN$i$J$$$G!"\e(B
+      <directive>User</directive> (\e$B$d\e(B <directive
+      module="mpm_common">Group</directive>) \e$B$r\e(B <code>root</code> \e$B$K\e(B
+      \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
-    <a href="mod_suexec.html">suexec</a> \e$B8~$1$K%5!<%P$r@_Dj$9$k$N$G$"$l$P!"\e(B
+    <a href="../suexec.html">suexec</a> \e$B8~$1$K%5!<%P$r@_Dj$9$k$N$G$"$l$P!"\e(B
     <directive module="mod_suexec">SuexecUserGroup</directive>
     \e$B$r;HMQ$7$F$/$@$5$$!#\e(B</p>
 
-<note><title>\e$B%;%-%e%j%F%#\e(B</title>
-<p>\e$B<+J,$,2?$r$d$C$F$$$k$N$+@53N$KGD0.$7$F$$$J$$!"\e(B
-\e$B$=$7$F$=$N4m81@-$rGD0.$7$F$$$J$$$N$G$"$l$P!"\e(B
-<directive>User</directive>
-(\e$B$d\e(B <directive module="mpm_common">Group</directive>)
-\e$B$r\e(B <code>root</code> \e$B$K@_Dj$7$J$$$G$/$@$5$$!#\e(B</p></note>
+    <note><title>\e$BCm0U\e(B</title>
+      <p><directive>User</directive> \e$B%G%#%l%/%F%#%V$O\e(B
+      <module>beos</module> \e$B$H\e(B <module>mpmt_os2</module> MPM
+      \e$B$K$bB8:_$7$^$9$,!"<B<AE*$KL58z$G!"8_49@-$N$?$a$@$1$KB8:_$7$^$9!#\e(B</p>
+    </note>
 </usage>
 </directivesynopsis>