You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yo...@apache.org on 2003/07/14 09:07:34 UTC

cvs commit: httpd-2.0/docs/manual/mod mod_dav.xml.ja mpm_common.xml.ja

yoshiki     2003/07/14 00:07:34

  Modified:    docs/manual/mod mod_dav.xml.ja mpm_common.xml.ja
  Log:
  Update Japanese translation.
  
  Submitted by:	Hiroaki KAWAI <ha...@bcl.t.u-tokyo.ac.jp>, Yoshiki Hayashi
  
  Revision  Changes    Path
  1.5       +79 -14    httpd-2.0/docs/manual/mod/mod_dav.xml.ja
  
  Index: mod_dav.xml.ja
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_dav.xml.ja,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_dav.xml.ja	11 Apr 2003 01:25:52 -0000	1.4
  +++ mod_dav.xml.ja	14 Jul 2003 07:07:34 -0000	1.5
  @@ -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>
       $B$r;HMQ$7$F<B9T;~$K%m!<%I$5$l$F$$$kI,MW$,$"$j$^$9!#(B</p>
       
  -    <p>$BF0:n$5$;$k$K$O!"(B<code>httd.conf</code> $B%U%!%$%k$N(B
  -    $B%0%m!<%P%k%;%/%7%g%s$K<!$r2C$($F!"%&%'%V%5!<%P$,=q$-9~$_$G$-$k(B
  -    DAV $B%m%C%/%G!<%?%Y!<%9%U%!%$%kL>$r;XDj$7$^$9!#(B</p>
  +    <p>$B$5$i$K!"(BDAV $B%m%C%/%G!<%?%Y!<%9$N>l=j$,(B
  +    <directive module="mod_dav_fs">DavLockDB</directive> $B%G%#%l%/%F%#%V$r;H$C$F(B
  +    <code>httd.conf</code> $B%U%!%$%k$N%0%m!<%P%k%;%/%7%g%s$K;XDj$5$l$F$$$k(B
  +    $BI,MW$,$"$j$^$9!#(B</p>
   
       <example>
  -      DavLockDB /tmp/DavLock
  +      DavLockDB /usr/local/apache2/var/DavLock
       </example>
   
  +    <p>$B%m%C%/%G!<%?%Y!<%9%U%!%$%k$N$"$k%G%#%l%/%H%j$O(B Apache $B$,<B9T$5$l$F$$$k(B
  +    <directive module="mpm_common">User</directive> $B$H(B <directive
  +    module="mpm_common" >Group</directive> $B$K=q$-9~$_8"8B$,$"$kI,MW$,$"$j$^$9!#(B</p>
  +
       <p><directive module="core" type="section">Limit</directive>
       $B@a$r(B <directive module="core" type="section">Location</directive>
       $B%G%#%l%/%F%#%VFbIt$KDI2C$7$F!"(BDAV $B$,M-8z$J>l=j$X$N(B
  @@ -56,7 +61,7 @@
       $B%G%#%l%/%F%#%V$O(B DAV $B%j%/%(%9%H$KBP$7$F$O8zNO$r;}$A$^$;$s!#(B</p>
   
       <example><title>$B40A4$JNc(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>$B%;%-%e%j%F%#(B</title>
  -      <p>HTTP $B4pK\G'>Z$N;HMQ$O?d>)$G$-$^$;$s!#>/$J$/$H$b(B 
  -      <module>mod_auth_digest</module> $B%b%8%e!<%k$GDs6!$5$l$k(B HTTP 
  -      $B%@%$%8%'%9%HG'>Z$rMQ$$$k$Y$-$G$9!#(BWebDAV $B%/%i%$%"%s%H$N$[$H$s$I$O(B
  -      $B$3$NG'>ZJ}K!$KBP1~$7$F$$$^$9!#$b$A$m$s!"(B<a href="../ssl/">SSL</a>
  -      $BM-8z$J%3%M%/%7%g%s$rDL$7$?4pK\G'>Z$G$b%;%-%e%j%F%#$,3NJ]$G$-$^$9!#(B</p>
  -    </note>
  +    <p><module>mod_dav</module> $B$O(B Greg Stein $B$5$s$N(B <a
  +    href="http://www.webdav.org/mod_dav/">Apache 1.3 $BMQ$N(B mod_dav</a> $B$K(B
  +    $BM3Mh$9$k$b$N$G$9!#$=$N%5%$%H$+$i$h$jB?$/$N>pJs$r<j$KF~$l$k$3$H$,$G$-$^$9!#(B</p>
  +</section>
  +
  +<section id="security"><title>$B%;%-%e%j%F%#$NLdBj(B</title>
  +
  +    <p>DAV $B$N%"%/%;%9%a%=%C%I$O1s3V%/%i%$%"%s%H$,%5!<%P$N%U%!%$%k$r(B
  +    $BA`:n$9$k$3$H$r2DG=$K$7$^$9$N$G!"(B <module>mod_dav</module> $B$r;HMQ$9$k(B
  +    $BA0$K!"%5!<%P$,0BA4$G$"$k$3$H$rFC$KCm0U$7$F3NG'$7$J$1$l$P$J$j$^$;$s!#(B</p>
  +
  +    <p>$B%5!<%P>e$N(B DAV $B$,;HMQ2DG=$K$J$C$F$$$k>l=j$O$9$Y$FG'>Z$GJ]8n$7$F$/$@$5$$!#(B
  +    HTTP $B4pK\G'>Z$N;HMQ$O?d>)$G$-$^$;$s!#>/$J$/$H$b(B 
  +    <module>mod_auth_digest</module> $B%b%8%e!<%k$GDs6!$5$l$k(B HTTP 
  +    $B%@%$%8%'%9%HG'>Z$rMQ$$$k$Y$-$G$9!#(BWebDAV $B%/%i%$%"%s%H$N$[$H$s$I$O(B
  +    $B$3$NG'>ZJ}K!$KBP1~$7$F$$$^$9!#Be$o$j$K!"(B<a href="../ssl/">SSL</a> $B$,(B
  +    $BM-8z$J%3%M%/%7%g%s$rDL$7$?4pK\G'>Z$r;H$&$3$H$b$G$-$^$9!#(B</p>
  +
  +    <p><module>mod_dav</module> $B$,%U%!%$%k$rA`:n$G$-$k$h$&$K$9$k$?$a$K$O!"(B
  +    $B4IM}2<$N%G%#%l%/%H%j$H%U%!%$%k$H$K(B Apache $B$,<B9T$5$l$F$$$k(B <directive
  +    module="mpm_common">User</directive> $B$H(B <directive
  +    module="mpm_common">Group</directive> $B$G=q$-9~$_2DG=$G$"$kI,MW$,$"$j$^$9!#(B
  +    $B?7$7$/:n@.$5$l$k%U%!%$%k$b$3$N(B <directive module="mpm_common">User</directive>
  +    $B$H(B <directive module="mpm_common">Group</directive> $B$K=jM-$5$l$k(B
  +    $B$3$H$K$J$j$^$9!#$3$NM}M3$+$i!"$=$N%"%+%&%s%H$X$N%"%/%;%9$r@)8f$9$k$3$H$O(B
  +    $B=EMW$G$9!#(BDAV $B%j%]%8%H%j$O(B Apache $B@lMQ$N$b$N$@$H$_$J$5$l$F$$$^$9!#(B
  +    Apache $B0J30$NJ}K!$G%U%!%$%k$r=$@5$9$k$3$H(B ($BNc$($P(B FTP $B$d%U%!%$%k%7%9%F%`(B
  +    $BMQ$N%D!<%k$J$I$r;H$C$F(B) $B$O5v2D$5$l$F$$$^$;$s!#(B</p>
  +
  +    <p><module>mod_dav</module> $B$O$$$m$$$m$J<oN`$N%5!<%S%95qH]967b$K$5$i$5$l$k(B
  +    $B$+$b$7$l$^$;$s!#(B<directive
  +    module="core">LimitXMLRequestBody</directive> $B%G%#%l%/%F%#%V$r;H$&$H(B
  +    $BBg$-$J(B DAV $B%j%/%(%9%H$r2r@O$9$k$H$-$K>CHq$5$l$k%a%b%j$NNL$r@)8B$9$k$3$H$,(B
  +    $B$G$-$^$9!#(B<directive
  +    module="mod_dav">DavDepthInfinity</directive> $B%G%#%l%/%F%#%V$O(B
  +    <code>PROPFIND</code> $B%j%/%(%9%H$,5pBg%j%]%8%H%j$GBgNL$N%a%b%j$r>CHq$9$k$N$r(B
  +    $BKI$0$3$H$,$G$-$^$9!#B>$N%5!<%S%95qH]967b$K$OC1=c$K;HMQ2DG=$J%G%#%9%/NN0h$r(B
  +    $BB?$/$NBg$-$J%U%!%$%k$GKd$a$F$7$^$&$s$b$N$,$"$j$^$9!#$3$l$rD>@\KI$0J}K!$O(B
  +    Apache $B$K$O$"$j$^$;$s$N$G!"?.MQ$G$-$J$$%f!<%6$K(B DAV $B%"%/%;%9$rDs6!$9$k$N$O(B
  +    $BHr$1$?J}$,NI$$$G$7$g$&!#(B</p>
  +</section>
  +
  +<section id="complex"><title>$BJ#;($J@_Dj(B</title>
  +
  +    <p>$B$h$/$"$kMW5a$K!"(B<module>mod_dav</module> $B$r;H$C$FF0E*$J%U%!%$%k(B
  +    (PHP $B%9%/%j%W%H!"(BCGI $B%9%/%j%W%H$J$I(B) $B$rA`:n$7$?$$$H$$$&$b$N$,$"$j$^$9!#(B
  +    $B$3$l$N<B8=$O!"(B<code>GET</code> $B%j%/%(%9%H$O%9%/%j%W%H$NFbMF$r%@%&%s%m!<%I$5$;$k(B
  +    $BBe$o$j$K!"%9%/%j%W%H$r>o$K<B9T$5$;$F$7$^$&$N$GFq$7$/$J$C$F$$$^$9!#(B
  +    $B$3$l$r2sHr$9$kJ}K!$K$O!"Fs$D$N0c$&(B URL $B$rF1$8%3%s%F%s%D$K%^%C%W$7!"(B
  +    $B0l$D$O%9%/%j%W%H$r<B9T$5$;!"$b$&0l$D$O%@%&%s%m!<%I$5$;$?$j!"(BDAV $B$+$i(B
  +    $BA`:n$5$l$?$j$9$k$h$&$K@_Dj$9$k$H$$$&$b$N$,$"$j$^$9!#(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>$B$3$N@_Dj$K$h$j!"(B<code>http://example.com/phparea</code> $B$r(B PHP $B%9%/%j%W%H$N(B
  +    $B=PNO$r%"%/%;%9$9$k$?$a$K;H$&$3$H$,$G$-!"(B
  +    <code>http://example.com/php-source</code> $B$r(B DAV $B%/%i%$%"%s%H$K$h$k(B
  +    $B$,A`:n$N$?$a$K;H$&$3$H$,$G$-$^$9!#(B</p>
   </section>
   
   <directivesynopsis>
  
  
  
  1.9       +362 -179  httpd-2.0/docs/manual/mod/mpm_common.xml.ja
  
  Index: mpm_common.xml.ja
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mpm_common.xml.ja,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mpm_common.xml.ja	11 Apr 2003 01:25:53 -0000	1.8
  +++ mpm_common.xml.ja	14 Jul 2003 07:07:34 -0000	1.9
  @@ -2,7 +2,7 @@
   <!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>$BFs$D0J>e$N%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM)
  @@ -10,24 +10,106 @@
   <status>MPM</status>
   
   <directivesynopsis>
  +<name>AcceptMutex</name>
  +<description>$BJ#?t$N;R%W%m%;%9$,%M%C%H%o!<%/%=%1%C%H$G%j%/%(%9%H$r(B
  +accept $B$7$h$&$H$7$F$$$k$H$-$K!"(BApache $B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$?$a$K(B
  +$B;H$&J}K!(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> $B%G%#%l%/%F%#%V$O!"(B
  +    $B%M%C%H%o!<%/%=%1%C%H$N%j%/%(%9%H$r(B accept $B$7$h$&$H$7$F$$$kJ#?t$N;R%W%m%;%9$r(B
  +    Apache $B$,D>Ns2=$9$k$?$a$K;H$&J}K!$r@_Dj$7$^$9!#(B
  +    Apache 2.0 $B0JA0$O!"$3$N%a%=%C%I$O%3%s%Q%$%k;~$K$N$_A*Br$G$-$^$7$?!#(B
  +    $B:GE,$JJ}K!$O!"%"!<%-%F%/%A%c$d%W%i%C%H%[!<%`$KBg$-$/0MB8$7$^$9!#(B
  +    $B>\:Y$K4X$7$F$O!"(B<a 
  +    href="../misc/perf-tuning.html">$B@-G=$N%A%e!<%K%s%0(B</a>
  +    $B%I%-%e%a%s%H$r$4Mw2<$5$$!#(B</p>
  +
  +    <p>$B$3$N%G%#%l%/%F%#%V$,(B <code>Default</code>
  +    $B$K@_Dj$5$l$F$$$l$P!"%3%s%Q%$%k;~$KA*Br$5$l$?%G%U%)%k%HCM$,;H$o$l$^$9!#(B
  +    $BB>$N;HMQ2DG=$J%a%=%C%I$N0lMw$O2<$K$"$j$^$9!#(B
  +    $BA4$F$N%a%=%C%I$,A4$F$N%W%i%C%H%[!<%`$G;HMQ2DG=$G$"$k$o$1$G$O$J$$!"(B
  +    $B$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#(B
  +    $B;HMQ2DG=$G$J$$%a%=%C%I$,;XDj$5$l$?>l9g$O!"(B
  +    $B;HMQ2DG=$J%a%=%C%I$N0lMw$r4^$s$@%a%C%;!<%8$,(B
  +    $B%(%i!<%m%0$K=PNO$5$l$^$9!#(B</p>
  +
  +    <dl>
  +      <dt><code>flock</code></dt>
  +      <dd><directive module="mpm_common">LockFile</directive>
  +      $B%G%#%l%/%F%#%V$GDj5A$7$?%U%!%$%k$N%m%C%/$K!"(B
  +      <code>flock(2)</code> $B%7%9%F%`%3!<%k$r;H$$$^$9!#(B</dd>
  +
  +      <dt><code>fcntl</code></dt>
  +      <dd><directive module="mpm_common">LockFile</directive>
  +      $B%G%#%l%/%F%#%V$GDj5A$7$?%U%!%$%k$N%m%C%/$K!"(B
  +      <code>fcntl(2)</code> $B%7%9%F%`%3!<%k$r;H$$$^$9!#(B</dd>
  +
  +      <dt><code>posixsem</code></dt>
  +      <dd>$BGSB>=hM}$N<BAu$K(B POSIX $B8_49%;%^%U%)$r;HMQ$7$^$9(B</dd>
  +
  +      <dt><code>pthread</code></dt>
  +      <dd>POSIX Threads (PThreads) $B5,3J$G<BAu$5$l$F$$$k(B
  +      POSIX $BGSB>=hM}$r;H$$$^$9!#(B</dd>
  +
  +      <dt><code>sysvsem</code></dt>
  +      <dd>$BGSB>=hM}$N<BAu$K(B SySV $B7A<0$N%;%^%U%)$r;H$$$^$9!#(B</dd>
  +    </dl>
  +
  +    <p>$B%3%s%Q%$%k;~$K%7%9%F%`$N%G%U%)%k%H$KA*$P$l$?$b$N$,2?$+$r8+$?$$>l9g$O!"(B
  +    <directive module="core">LogLevel</directive> $B$r(B <code>debug</code>
  +    $B$K@_Dj$9$k$H$h$$$G$7$g$&!#%G%U%)%k%H$N(B <directive>AcceptMutex</directive>
  +    $B$,(B <directive module="core">ErrorLog</directive> $B$K=q$-9~$^$l$^$9!#(B</p>
  +
  +  <note type="warning"><title>$B7Y9p(B</title>
  +     <p>$B$[$H$s$I$N%7%9%F%`$K$*$$$F$O!"(B<code>pthread</code> $B%*%W%7%g%s$,(B
  +     $BA*$P$l$F$$$k$H!";R%W%m%;%9$,(B <code>ApacheCntl</code> mutex $B$r(B
  +     $BJ];}$7$F$$$k$H$-$K0[>o=*N;$7$?>l9g!"%5!<%P$O%j%/%(%9%H$X$N1~Ez$r(B
  +     $BDd;_$7$F$7$^$$$^$9!#$3$l$,H/@8$7$?>l9g$O!"%5!<%P$rI|5l$5$;$k$?$a$K$O(B
  +     $B<jF0$G:F5/F0$5$;$kI,MW$,$"$j$^$9!#(B</p>
  +
  +     <p>Solaris $B$ONc30$G!"(BApache $B$b;HMQ$7$F$$$k!";R%W%m%;%9$,(B mutex $B$r(B
  +     $BJ];}$7$F0[>o=*N;$7$?8e$K(B mutex $B$rI|5l$5$;$k$?$a$N5!9=$rDs6!$r$7$F$$$^$9!#(B</p>
  +     <p>$B8f;HMQ$N%7%9%F%`$,(B <code>pthread_mutexattr_setrobust_np()</code> $B4X?t$r(B
  +     $B<BAu$7$F$$$k>l9g$O!"(B<code>pthread</code> $B%*%W%7%g%s$r0BA4$K;HMQ$G$-$k(B
  +     $B2DG=@-$,$"$j$^$9!#(B</p>
  +  </note>
  +</usage>
  +</directivesynopsis>
  +
  +<directivesynopsis>
   <name>CoreDumpDirectory</name>
   <description>Apache $B$,%3%"%@%s%W$9$kA0$K0\F0$r;n$_$k%G%#%l%/%H%j(B
   </description>
   <syntax>CoreDumpDirectory <var>directory</var></syntax>
   <default>$B%G%U%)%k%H$N@_Dj$O@bL@J8$rFI$s$G$/$@$5$$(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 $B$,%3%"%@%s%W$9$kA0$K0\F0$r;n$_$k%G%#%l%/%H%j$r@)8f$7$^$9!#(B
       $B%G%U%)%k%HCM$O(B <directive module="core">ServerRoot</directive>
       $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(B
       $B=q$-9~$_2DG=$G$"$k$Y$-$G$O$J$$$N$G!"DL>o$O%3%"%@%s%W$O=q$-9~$^$l$^$;$s!#(B
       $B%G%P%C%0$N$?$a$K%3%"%@%s%W$,I,MW$G$"$l$P!"(B
       $B$3$N%G%#%l%/%F%#%V$r;H$C$FB>$N0LCV$K%3%"%@%s%W$r=q$-=P$9$h$&$K$G$-$^$9!#(B</p>
  +
  +    <note><title>Linux $B$G$N%3%"%@%s%W(B</title>
  +      <p>Apache $B$,(B root $B$H$7$F5/F0$5$l$F!"JL$N%f!<%6$N8"8B$K0J9_$7$?>l9g$O(B
  +      Linux $B$N%+!<%M%k$O%G%#%l%/%H%j$,%W%m%;%9$N8"8B$G=q$-9~$_2DG=$J>l9g$G$5$($b(B
  +      $B%3%"%@%s%W$r(B<em>$BL58z(B</em>$B$K$7$^$9!#(BApache (2.0.46 $B0J9_(B) $B$O(B
  +      Linux 2.4 $B0J9_$G$O%3%"%@%s%W$r9T$J$&$h$&$K:F;XDj$7$^$9$,!"$=$l$O(B
  +      <directive>CoreDumpDirectory</directive> $B$rL@<(E*$K@_Dj$7$?$H$-$K(B
  +      $B8B$j$^$9!#(B</p>
  +    </note>
   </usage>
   </directivesynopsis>
   
  @@ -36,46 +118,56 @@
   <description>$B%j%/%(%9%H$K1~Ez$9$k:]$K=jB0$9$k%0%k!<%W(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 $B0J9_$G!"%0%m!<%P%k@_Dj$G$N$_M-8z$G$9!#(B</compatibility>
   
   <usage>
       <p><directive>Group</directive> $B%G%#%l%/%F%#%V$G!"(B
       $B%j%/%(%9%H$K1~Ez$9$k:]$K=jB0$7$F$*$/%0%k!<%W$r@_Dj$7$^$9!#(B
  -    $B$3$N%G%#%l%/%F%#%V$r;HMQ$9$k$?$a$K$O!"%9%?%s%I%"%m%s7?$N(B
  -    $B%5!<%P$O:G=i$K(B root $B8"8B$G5/F0$5$l$F$$$kI,MW$,$"$j$^$9!#(B
  +    $B$3$N%G%#%l%/%F%#%V$r;HMQ$9$k$?$a$K$O!"(B
  +    $B%5!<%P$O:G=i$K(B <code>root</code> $B8"8B$G5/F0$5$l$F$$$kI,MW$,$"$j$^$9!#(B
  +    $BHs(B root $B%f!<%6$G%5!<%P$r5/F0$7$?>l9g$O!";XDj$7$?%0%k!<%W$KJQ2=$G$-$:$K!"(B
  +    $B7k2LE*$K5/F0$7$?%f!<%6$NB0$9$k%0%k!<%W$G<B9T$5$l$k$3$H$K$J$j$^$9!#(B
       <var>unix-group</var> $B$O<!$N$&$A$N$$$:$l$+$G$9(B:</p>
   
       <dl>
         <dt>$B%0%k!<%WL>(B</dt>
  +      <dd>$B%0%k!<%W$rL>A0$G;2>H$7$^$9(B</dd>
   
  -      <dd>$B%0%k!<%W$rL>A0$G;2>H$7$^$9!#(B</dd>
  +      <dt><code>#</code> $B$KB3$$$F%0%k!<%WHV9f(B</dt>
  +      <dd>$B%0%k!<%W$r$rHV9f$G;2>H$7$^$9!#(B</dd>
  +    </dl>
   
  -      <dt># $B$KB3$$$F%0%k!<%WHV9f(B</dt>
  +    <example><title>$BNc(B</title>
  +      Group www-group
  +    </example>
   
  -      <dd>$B%0%k!<%W$rHV9f$G;2>H$7$^$9!#(B</dd>
  -    </dl>
       <p>$B%5!<%P$r<B9T$9$k$?$a$KFCDj$N?7$7$$%0%k!<%W$r@_Dj$9$k$3$H$r(B
       $B$*A&$a$7$^$9!#(B<code>nobody</code> $B$r;HMQ$9$k4IM}<T$b$$$^$9$,!"(B
  -    $B$3$l$O>o$K2DG=$G$"$C$?$jK>$^$7$$Lu$G$O$"$j$^$;$s!#(B</p>
  +    $B2DG=$G$"$C$?$jK>$^$7$$Lu$G$OI,$:$7$b$"$j$^$;$s!#(B</p>
   
  -    <example>Group www-group</example>
  -
  -    <p>$BCm0U(B: $B%5!<%P3+;O$rHs(B root $B%f!<%6$G9T$C$?>l9g$O!"(B
  -    $B;XDj$5$l$?%0%k!<%W$KJQ$o$k$3$H$,$G$-$J$/$F!"Be$o$j$K(B
  -    $B5/F0$r9T$C$?%f!<%6$N=jB0$9$k%0%k!<%W$H$7$F<B9T$5$lB3$1$^$9!#(B</p>
  +    <note type="warning"><title>$B%;%-%e%j%F%#(B</title>
  +      <p>$B@53N$K$I$s$J$3$H$r$d$C$F$$$k$N$+!"$=$N4m81@-$rCN$i$J$$$G!"(B
  +      <directive>Group</directive> ($B$d(B <directive
  +      module="mpm_common">User</directive>) $B$r(B
  +      <code>root</code> $B$K(B $B@_Dj$7$J$$$G$/$@$5$$!#(B</p>
  +    </note>
   
  -    <p>$BFC5-;v9`(B: $B$3$N%G%#%l%/%F%#%V$r(B &lt;VirtualHost&gt;
  +    <p>$BFC5-;v9`(B: $B$3$N%G%#%l%/%F%#%V$r(B
  +    <directive module="core" type="section">VirtualHost</directive>
       $B$G;HMQ$9$k$3$H$O%5%]!<%H$5$l$J$/$J$j$^$7$?!#(BApache 2.0 $B$G(B
  -    <a href="../suexec.html">suEXEC $B%i%C%Q!<(B</a>$B$r<B8=$7$?$$>l9g$O!"(B
  +    <a href="../suexec.html">suexec</a> $B$r@_Dj$7$?$$>l9g$O!"(B
       <directive module="mod_suexec">SuexecUserGroup</directive>
  -    $B$r;HMQ$7$F$/$@$5$$!#(B
  -    $B%;%-%e%j%F%#(B: $B%;%-%e%j%F%#>e$NCm0UE@$K4X$7$F$O!"(B
  -    <directive module="mpm_common">User</directive>
  -    $B$r$4Mw2<$5$$!#(B</p>
  +    $B$r;HMQ$7$F$/$@$5$$!#(B</p>
  +
  +    <note><title>$BCm0U(B</title>
  +      <p><directive>Group</directive> $B%G%#%l%/%F%#%V$O(B
  +      <module>beos</module> $B$H(B <module>mpmt_os2</module> MPM
  +      $B$K$bB8:_$7$^$9$,!"<B<AE*$KL58z$G!"8_49@-$N$?$a$@$1$KB8:_$7$^$9!#(B</p>
  +    </note>
   </usage>
   </directivesynopsis>
   
  @@ -85,15 +177,15 @@
   $B$r%5!<%P$,5-O?$9$k$?$a$N%U%!%$%k(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> $B%G%#%l%/%F%#%V$G!"(B
       $B%G!<%b%s$N%W%m%;%9(B ID $B$r%5!<%P$,5-O?$9$k%U%!%$%k$r@_Dj$7$^$9!#(B
  -    $B$b$7%U%!%$%kL>$,%9%i%C%7%e(B (/) $B$G;O$^$i$J$$>l9g$O!"(B
  +    $B%U%!%$%kL>$,@dBP%Q%9$G$J$$>l9g$O!"(B
       <directive module="core">ServerRoot</directive>
       $B$+$i$NAjBPE*$J$b$N$H$7$F07$o$l$^$9!#(B</p>
   
  @@ -102,15 +194,23 @@
       </example>
   
       <p>$B%5!<%P$,(B <directive module="core">ErrorLog</directive>
  -    $B$d(B TransferLog $B$rJD$8$F3+$-D>$7$?$j!"@_Dj%U%!%$%k$r(B
  +    $B$d(B <directive module="mod_log_config">TransferLog</directive>
  +    $B$rJD$8$F3+$-D>$7$?$j!"@_Dj%U%!%$%k$r(B
       $B:FFI9~$7$?$j$5$;$k$?$a$K!"%5!<%P$K%7%0%J%k$rAw$k$3$H$,$G$-$k$H(B
       $BJXMx$J$3$H$,$"$j$^$9!#(B
  -    $B$3$l$O(B SIGHUP (kill -1) $B%7%0%J%k$r(B PidFile
  +    $B$3$l$O(B SIGHUP (kill -1) $B%7%0%J%k$r(B <directive>PidFile</directive>
       $B$K=q$+$l$F$$$k%W%m%;%9(B ID $B$KAw$k$3$H$G$G$-$^$9!#(B</p>
   
  -    <p>PidFile $B$K$O!"%m%0%U%!%$%k$N@_CV0LCV$d(B
  +    <p><directive>PidFile</directive> $B$K$O!"%m%0%U%!%$%k$N@_CV0LCV$d(B
       <a href="../misc/security_tips.html#serverroot">$B%;%-%e%j%F%#(B</a>
       $B$HA4$/F1$8Cm0UE@$,$"$j$^$9!#(B</p>
  +
  +    <note><title>$BCm0U(B</title>
  +      <p>Apache 2 $B$G$O!"(B
  +      <a href="../programs/apachectl.html">apachectl</a>
  +      $B%9%/%j%W%H$N$_$r;HMQ$7$F%5!<%P$N(B ($B:F(B) $B5/F0$dDd;_$r(B
  +      $B9T$J$&$3$H$r?d>)$7$F$$$^$9!#(B</p>
  +    </note>
   </usage>
   </directivesynopsis>
   
  @@ -119,19 +219,23 @@
   <description>$B%5!<%P$,(B listen $B$9$k(BIP $B%"%I%l%9$H%]!<%HHV9f(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 $B$+$iI,MW$J%G%#%l%/%F%#%V(B</compatibility>
   
   <usage>
       <p><directive>Listen</directive> $B%G%#%l%/%F%#%V$O(B Apache
       $B$,FCDj$N(B IP $B%"%I%l%9$d%]!<%HHV9f$@$1$r(B listen $B$9$k$h$&$K;XDj$7$^$9!#(B
       $B%G%U%)%k%H$G$OA4$F$N(B IP $B%$%s%?!<%U%'!<%9$N%j%/%(%9%H$K1~Ez$7$^$9!#(B
  -    Listen $B%G%#%l%/%F%#%V$O8=:_$G$OI,?\$N%G%#%l%/%F%#%V$H$J$j$^$7$?!#(B
  +    <directive>Listen</directive> $B%G%#%l%/%F%#%V$O(B
  +    $B8=:_$OI,?\$N%G%#%l%/%F%#%V$H$J$j$^$7$?!#(B
       $B$b$7@_Dj%U%!%$%k$K$J$1$l$P!"%5!<%P$O5/F0$K<:GT$7$^$9!#(B
       $B$3$l$O0JA0$N%P!<%8%g%s$N(B Apache $B$+$iJQ99$N$"$C$?ItJ,$G$9!#(B</p>
   
  -    <p>Listen $B%G%#%l%/%F%#%V$G$O!"FCDj$N%]!<%H$"$k$$$O(B
  +    <p><directive>Listen</directive> $B%G%#%l%/%F%#%V$G$O!"FCDj$N%]!<%H$"$k$$$O(B
       $B%"%I%l%9$H%]!<%H$NAH$_9g$o$;$+$iF~$C$F$/$k%j%/%(%9%H$KBP$7$F(B
       $B1~Ez$9$k$h$&$K;XDj$7$^$9!#(B
       $B$b$7%]!<%HHV9f$@$1$,;XDj$5$l$?>l9g$O!"%5!<%P$OA4%$%s%?!<%U%'!<%9$N(B
  @@ -141,7 +245,7 @@
       $B$7$^$9!#(B</p>
   
       <p>$BJ#?t$N%"%I%l%9$H%]!<%H$KBP$7$F(B listen $B$9$k$h$&$K!"(B
  -    $BJ#?t$N(B Listen $B%G%#%l%/%F%#%V$r;H$&$3$H$b$G$-$^$9!#(B
  +    $BJ#?t$N(B <directive>Listen</directive> $B%G%#%l%/%F%#%V$r;H$&$3$H$b$G$-$^$9!#(B
       $B%5!<%P$ONs5s$5$l$?%"%I%l%9$H%]!<%HA4$F$+$i$N%j%/%(%9%H$KBP$7$F(B
       $B1~Ez$7$^$9!#(B</p>
   
  @@ -171,7 +275,7 @@
   
   <seealso><a href="../dns-caveats.html">DNS $B$NLdBj(B</a></seealso>
   <seealso><a href="../bind.html">Apache
  -    $B$,;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj(B</a></seealso>
  +$B$,;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj(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>$BJ]N1>uBV$N%3%M%/%7%g%s$N%-%e!<$N:GBgD9$G$9!#(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 $B$^$?$O(B USE_FLOCK_SERIALIZED_ACCEPT
  -    $B$N$$$:$l$+$r;H$C$F(B Apache $B$r%3%s%Q%$%k$7$?:]$K;HMQ$9$k$3$H$K$J$k!"(B
  -    $B%m%C%/%U%!%$%k$N%Q%9$r(B <directive>LockFile</directive>
  -    $B$O@_Dj$7$^$9!#(B
  -    $B$3$N%G%#%l%/%F%#%V$ODL>o$O%G%U%)%k%HCM$N$^$^$K$7$F$*$/$Y$-$G$9!#(B
  -    $B$3$l$rJQ99$9$k:]$N<g$JM}M3$O!"(B<code>logs</code>
  -    $B%G%#%l%/%H%j$,(B NFS $B%^%&%s%H$5$l$?$b$N$G$"$k$H$$$&M}M3$G$9!#(B
  -    <strong>$B%m%C%/%U%!%$%k$O%m!<%+%k%G%#%9%/$KJ]B8$7$J$1$l$P$J$i$J$$(B
  -    $B$+$i$G$9!#(B</strong>
  -    $B%a%$%s%5!<%P%W%m%;%9$N(B PID $B$,<+F0E*$K%U%!%$%kL>$KIU2C$5$l$^$9!#(B</p>
  -
  -    <note type="warning"><title>$B%;%-%e%j%F%#(B:</title>
  -    <p><code>/var/tmp</code>
  -    $B$H$$$C$?!"C/$G$b=q$-9~$a$k%G%#%l%/%H%j$K%U%!%$%k$r(B
  -    $BCV$+$J$$J}$,$h$$$G$9!#$J$<$J$i!"%5!<%P$,5/F0;~$K:n@.$9$k(B
  -    $B%m%C%/%U%!%$%k$N:n@.<+BN$rK832$9$k$3$H$K$h$C$F!"(B
  -    $BC/$G$b%5!<%S%95qH]%"%?%C%/$r0z$-5/$3$9$3$H$,$G$-$k$+$i$G$9!#(B</p>
  +    <p><directive module="mpm_common">AcceptMutex</directive>
  +    $B$,(B <code>fcntl</code> $B$d(B <code>flock</code>
  +    $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(B
  +    <directive>LockFile</directive> $B%G%#%l%/%F%#%V$G@_Dj$7$^$9!#(B
  +    $B$3$N%G%#%l%/%F%#%V$ODL>o$O$=$N$^$^$K$7$F$*$-$^$9!#(B
  +    $B<g$K(B <code>logs</code> $B%G%#%l%/%H%j$,(B NFS
  +    $B$G%^%&%s%H$5$l$F$$$k>l9g$J$I$KCM$rJQ$($^$9!#(B
  +    $B$J$<$J$i(B<strong>$B%m%C%/%U%!%$%k$O%m!<%+%k%G%#%9%/$K(B
  +    $BJ]B8$5$l$J$1$l$P$J$i$J$$(B</strong>$B$+$i$G$9!#(B
  +    $B%a%$%s%5!<%P%W%m%;%9$N(B PID $B$,%U%!%$%kL>$K<+F0E*$KIU2C$5$l$^$9!#(B</p>
  +
  +    <note type="warning"><title>$B%;%-%e%j%F%#(B</title>
  +      <p><code>/var/tmp</code>
  +      $B$H$$$C$?!"C/$G$b=q$-9~$a$k%G%#%l%/%H%j$K%U%!%$%k$r(B
  +      <em>$BCV$+$J$$(B</em>$BJ}$,$h$$$G$9!#$J$<$J$i!"%5!<%P$,5/F0;~$K:n@.$9$k(B
  +      $B%m%C%/%U%!%$%k$N:n@.<+BN$rK832$9$k$3$H$K$h$C$F!"(B
  +      $BC/$G$b%5!<%S%95qH]%"%?%C%/$r0z$-5/$3$9$3$H$,$G$-$k$+$i$G$9!#(B</p>
       </note>
   </usage>
  +<seealso><directive module="mpm_common">AcceptMutex</directive></seealso>
   </directivesynopsis>
   
   <directivesynopsis>
  @@ -236,8 +343,10 @@
   <description>$B%j%/%(%9%H$K1~Ez$9$k$?$a$K:n@.$5$l$k(B
   $B;R%W%m%;%9$N:GBg8D?t(B</description>
   <syntax>MaxClients <var>number</var></syntax>
  +<default>$B>\:Y$O;HMQK!$r$4Mw2<$5$$!#(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 @@
       $BB>$N%j%/%(%9%H$N:G8e$^$GC#$7$F;R%W%m%;%9$,6u$/$H!"(B
       $B<!$N%3%M%/%7%g%s$K1~Ez$7$^$9!#(B</p>
   
  -    <p>$B%9%l%C%I$rMQ$$$J$$%5!<%P(B ($B$9$J$o$A(B <module>prefork</module>)
  +    <p>$B%9%l%C%I$rMQ$$$J$$%5!<%P(B (<em>$B$9$J$o$A(B</em> <module>prefork</module>)
       $B$G$O!"(B<directive>MaxClients</directive>
       $B$O!"%j%/%(%9%H$K1~Ez$9$k$?$a$K5/F0$5$l$k(B
       $B;R%W%m%;%9$N:GBg?t$H$J$j$^$9!#(B
  -    $B%G%U%)%k%HCM$O(B 256 $B$G!"$3$l$rA}2C$5$;$?$$>l9g$O!"(B
  +    $B%G%U%)%k%HCM$O(B <code>256</code> $B$G!"$3$l$rA}2C$5$;$?$$>l9g$O!"(B
       <directive module="mpm_common">ServerLimit</directive>
       $B$NCM$bA}2C$5$;$kI,MW$,$"$j$^$9!#(B</p>
   
  -    <p>$B%9%l%C%I$rMQ$$$k%5!<%P(B ($B$9$J$o$A(B <module>worker</module>)
  +    <p>$B%9%l%C%I$rMQ$$$k%5!<%P$d!"%O%$%V%j%C%I%5!<%P(B (<em>$B$9$J$o$A(B</em>
  +    <module>beos</module> <module>worker</module>)
       $B$G$O!"(B<directive>MaxClients</directive> 
       $B$O!"%/%i%$%"%s%H$K1~Ez$G$-$k%9%l%C%I$NAm?t$r@)8B$7$^$9!#(B
  -    $B%G%U%)%k%HCM$O(B
  -    <directive module="mpm_common">ThreadsPerChild</directive>
  -    $B$r(B 16 $BG\$7$?CM$K$J$j$^$9!#(B<directive>MaxClients</directive>
  +    <module>beos</module> $B$G$N%G%U%)%k%HCM$O(B <code>50</code> $B$G$9!#(B
  +    $B%O%$%V%j%C%I(B MPM $B$G$N%G%U%)%k%HCM$O(B 16
  +    <directive module="mpm_common">ServerLimit</directive>
  +    $B$N(B <code>25</code> $BG\(B (<directive
  +    module="mpm_common">ThreadsPerChild</directive>) $B$G$9!#(B
  +    <directive>MaxClients</directive>
       $B$r(B 16 $B%W%m%;%90J>eI,MW$JCM$^$GA}2C$5$;$?$$>l9g$O!"(B
       <directive module="mpm_common">ServerLimit</directive>
       $B$bA}2C$5$;$kI,MW$,$"$j$^$9!#(B</p>
  @@ -271,16 +384,18 @@
   
   <directivesynopsis>
   <name>MaxMemFree</name>
  -<description>$B<g%a%b%j%"%m%1!<%?$,(B free() $B$r8F$P$:$KJ];}$7B3$1$i$l$k%a%b%j$N(B
  -$B:GBgNL(B</description>
  -<syntax>MaxMemFree <var>number</var></syntax>
  -<contextlist><context>server config</context></contextlist>
  -<modulelist><module>worker</module><module>prefork</module>
  -<module>mpm_netware</module>
  -</modulelist>
  +<description><code>free()</code> $B$,8F$P$l$J$$8B$j!"(B
  +$B<g%a%b%j%"%m%1!<%?$,J];}$7B3$1$i$l$k%a%b%j$N:GBgNL(B</description>
  +<syntax>MaxMemFree <var>KBytes</var></syntax>
  +<default>MaxMemFree 0</default>
  +<contextlist><context>server config</context></contextlist>
  +<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> $B%G%#%l%/%F%#%V$O(B free() $B$r8F$P$:$K(B
  +    <p><directive>MaxMemFree</directive> $B%G%#%l%/%F%#%V$O(B
  +    <code>free()</code> $B$,8F$P$l$J$$8B$j!"(B
       $B<g%"%m%1!<%?$,J];}$G$-$k6u$N%a%b%j$N:GBgCM$r%-%m%P%$%HC10L$G@_Dj$7$^$9!#(B
       $B@_Dj$5$l$F$$$J$$$+!"Nm$K@_Dj$5$l$F$$$k$H$-$O!"L5@)8B$K$J$j$^$9!#(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> $B%G%#%l%/%F%#%V$O!"(B
       $B8D!9$N;R%5!<%P%W%m%;%9$,07$&$3$H$N$G$-$k%j%/%(%9%H$N@)8B?t$r(B
       $B@_Dj$7$^$9!#(B<directive>MaxRequestsPerChild</directive>
       $B8D$N%j%/%(%9%H$N8e$K!";R%W%m%;%9$O=*N;$7$^$9!#(B
  -    <directive>MaxRequestsPerChild</directive> $B$,(B 0
  +    <directive>MaxRequestsPerChild</directive> $B$,(B <code>0</code>
       $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!#(B</p>
   
  +    <note><title>$B$=$NB>$N%G%U%)%k%HCM(B</title>
  +      <p><module>mpm_netware</module> $B$H(B <module>mpm_winnt</module>
  +      $B$G$N%G%U%)%k%HCM$O(B <code>0</code> $B$G$9!#(B</p>
  +    </note>
  +
       <p><directive>MaxRequestsPerChild</directive>
       $B$rHs%<%m$K@)8B$9$k$3$H$K$O!"Fs$D$NMxE@$,$"$j$^$9(B:</p>
   
  @@ -315,11 +436,11 @@
         $B%5!<%PIi2Y$,2<$,$C$?;~$K%W%m%;%9?t$r>/$J$/$9$k$3$H$,$G$-$k(B</li>
       </ul>
   
  -    <note><title>$BCm0U(B:</title>
  -    <p><em>KeepAlive</em> $B%j%/%(%9%H$N>l9g$O!"(B
  -    $B0l$DL\$N%j%/%(%9%H$@$1$,$3$N@)8B$K3:Ev$7$^$9!#(B
  -    $B<B8zE*$K$O!"0l$D$N;R%W%m%;%9$"$?$j$N(B<em>$B%3%M%/%7%g%s(B</em>$B?t$r(B
  -    $B@)8B$9$k$h$&$K5sF0$,JQ2=$7$^$9!#(B</p>
  +    <note><title>$BCm(B</title>
  +      <p><directive module="core">KeepAlive</directive> $B%j%/%(%9%H$N>l9g$O!"(B
  +      $B0l$DL\$N%j%/%(%9%H$@$1$,$3$N@)8B$K3:Ev$7$^$9!#(B
  +      $B<B8zE*$K$O!"0l$D$N;R%W%m%;%9$"$?$j$N(B<em>$B%3%M%/%7%g%s(B</em>$B?t$r(B
  +      $B@)8B$9$k$h$&$K5sF0$,JQ2=$7$^$9!#(B</p>
       </note>
   </usage>
   </directivesynopsis>
  @@ -328,9 +449,11 @@
   <name>MaxSpareThreads</name>
   <description>$B%"%$%I%k%9%l%C%I$N:GBg?t(B</description>
   <syntax>MaxSpareThreads <var>number</var></syntax>
  +<default>$B>\:Y$O;HMQK!$r$4Mw2<$5$$!#(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 @@
       $B;R%W%m%;%9$K%"%$%I%k%9%l%C%I$,B?$9$.$k>l9g$O!"(B
       $B%5!<%P$O$=$N;R%W%m%;%9$K4^$^$l$k%9%l%C%I$r=*N;$7;O$a$^$9!#(B</p>
   
  -    <p><module>worker</module> $B$G$O!"(B
  -    $B%G%U%)%k%H$O(B <code>MaxSpareThreads 500</code> $B$G$9!#(B
  +    <p><module>worker</module>, <module>leader</module>,
  +    <module>threadpool</module> $B$G$O!"(B
  +    $B%G%U%)%k%H$O(B <code>MaxSpareThreads 250</code> $B$G$9!#(B
       $B$3$N(B MPM $B$O%"%$%I%k%9%l%C%I?t$r%5!<%PA4BN$G4F;k$7$^$9!#(B
       $B%5!<%P$G%"%$%I%k%9%l%C%I?t$,B?$9$.$k>l9g$O!"(B
       $B$3$N?t;z$h$j$b>/$J$$?t$K$J$k$^$G;R%W%m%;%9$r=*N;$7$^$9!#(B</p>
  @@ -354,38 +478,47 @@
       $B$3$N(B MPM $B$O%7%s%0%k%W%m%;%9$G<B9T$5$l$^$9$N$G!"(B
       $B%9%Z%"%9%l%C%I?t$b%5!<%PA4BN$G4*Dj$7$^$9!#(B</p>
   
  +    <p><module>beos</module> $B$H(B <module>mpmt_os2</module> $B$O(B
  +    <module>mpm_netware</module> $B$H;w$?5sF0$r$7$^$9!#(B
  +    <module>beos</module> $B$G$N%G%U%)%k%HCM$O(B <code>MaxSpareThreads 50</code>
  +    $B$G$9!#(B<module>mpmt_os2</module> $B$G$N%G%U%)%k%HCM$O(B <code>10</code>
  +    $B$G$9!#(B</p>
  +
  +    <note><title>$B@)8B;v9`(B</title>
  +      <p><directive>MaxSpareThreads</directive> $B$N<h$kCM$K$O@)8B$,$"$j$^$9!#(B
  +      Apache $B$O<!$N5,B'$K=>$C$F<+F0E*$KJd@5$7$^$9!#(B</p>
  +      <ul>
  +        <li><module>perchild</module> $B$G$O!"(B
  +        <directive>MaxSpareThreads</directive> $B$,(B
  +        <directive module="mpm_common">ThreadLimit</directive>
  +        $B$HEy$7$$$+$=$l0J2<$G$"$kI,MW$,$"$j$^$9!#(B</li>
  +
  +        <li><module>mpm_netware</module> $B$O(B
  +        <directive module="mpm_common">MinSpareThreads</directive>
  +        $B$h$j$bBg$-$$I,MW$,$"$j$^$9!#(B</li>
  +
  +        <li><module>leader</module>, <module>threadpool</module>, 
  +        <module>worker</module> $B$G$O!"(B
  +        <directive module="mpm_common">MinSpareThreads</directive> $B$H(B
  +        <directive module="mpm_common">ThreadsPerChild</directive>
  +        $B$G7h$^$kAmOB$HEy$7$$$+Bg$-$$I,MW$,$"$j$^$9!#(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>$B;R%W%m%;%9Kh$N%9%l%C%I?t$N:GBg?t(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>$B;R%W%m%;%9Kh$K4^$^$l$k%9%l%C%I?t$N:GBgCM$G$9!#(B
  -    $B;R%W%m%;%9Kh$K%9%l%C%I?tJQ2=$9$k(B MPM $B$G$O!"(B
  -    $B$3$N%G%#%l%/%F%#%V$O!";R%W%m%;%9Fb$K@8@.$5$l$k%9%l%C%I?t$N(B
  -    $B:GBgCM$r@_Dj$7$^$9!#%G%U%)%k%HCM$h$j$bBg$-$$CM$K$9$k$N$G$"$l$P!"(B
  -    $B%3%s%Q%$%k;~$KDj5A$5$l$?(B <code>HARD_THREAD_LIMIT</code>
  -    $B$rJQ99$7$F!"%5!<%P$r:F%3%s%Q%$%k$9$kI,MW$,$"$j$^$9!#(B</p>
  -</usage>
  -</directivesynopsis>
  -
  -<directivesynopsis>
   <name>MinSpareThreads</name>
   <description>$B%j%/%(%9%H$K1~Ez$9$k$3$H$N$G$-$k(B
   $B%"%$%I%k%9%l%C%I?t$N:G>.?t(B</description>
   <syntax>MinSpareServers <var>number</var></syntax>
  +<default>$B>\:Y$O;HMQJ}K!$r$4Mw2<$5$$!#(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 @@
       $B%G%U%)%k%H$O(B <code>MinSpareThreads 5</code> $B$G!"(B
       $B%"%$%I%k%9%l%C%I?t$r;R%W%m%;%9Kh$K4F;k$7$^$9!#(B
       $B$b$7;R%W%m%;%9$K==J,$J?t$N%9%l%C%I$,$J$1$l$P!"(B
  -    $B%5!<%P$O$=$N;R%W%m%;%9$K?7$7$$%9%l%C%I$r:n$j;O$a$^$9!#(B</p>
  -
  -    <p><module>worker</module> $B$G$O!"(B
  -    $B%G%U%)%k%H$O(B <code>MinSpareThreads 250</code> $B$G!"(B
  +    $B%5!<%P$O$=$N;R%W%m%;%9$K?7$7$$%9%l%C%I$r:n$j;O$a$^$9!#(B
  +    $B$G$9$+$i!"(B<directive module="perchild">NumServers</directive>
  +    $B$r(B 10 $B$K!"(B<directive>MinSpareThreads</directive> $B$r(B
  +    5 $B$K$7$?>l9g$O!":G>.$G$b(B 50 $B$N%"%$%I%k%9%l%C%I$,(B
  +    $B%7%9%F%`>e$K$"$k$3$H$K$J$j$^$9!#(B</p>
  +
  +    <p><module>worker</module>, <module>leader</module>,
  +    <module>threadpool</module> $B$G$O!"(B
  +    $B%G%U%)%k%H$O(B <code>MinSpareThreads 75</code> $B$G!"(B
       $B%"%$%I%k%9%l%C%I?t$r%5!<%PA4BN$G4F;k$7$^$9!#(B
       $B$b$7%5!<%P$K==J,$J?t$N%"%$%I%k%9%l%C%I$,$J$1$l$P!"(B
       $B%"%$%I%k%9%l%C%I?t$,$3$N?t$h$j$bBg$-$/$J$k$^$G(B
  @@ -410,36 +548,26 @@
       $B%G%U%)%k%H$O(B <code>MinSpareThreads 10</code> $B$G!"(B
       $B%7%s%0%k%W%m%;%9(B MPM $B$G$9$N$G!"%5!<%PA4BN$G4IM}$5$l$^$9!#(B</p>
   
  +    <p><module>beos</module> $B$H(B <module>mpmt_os2</module> $B$O!"(B
  +    <module>mpm_netware</module>$B$K$h$/;w$F$$$^$9!#(B
  +    <module>beos</module> $B$G$N%G%U%)%k%H$O(B <code>MinSpareThreads 1</code>
  +    $B$G$9!#(B<module>mpmt_os2</module> $B$G$N%G%U%)%k%H$O(B
  +    <code>5</code> $B$G$9!#(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>$BF1;~$K5/F0$7$F$$$k;R%W%m%;%9$NAm?t(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>$BF1;~$K5/F0$7$F$$$k;R%W%m%;%9$N?t$G$9!#(B
  -    $B$3$N%G%#%l%/%F%#%V$r;HMQ$9$k(B MPM $B$OF0E*$K?7$7$$;R%W%m%;%9$r(B
  -    $B@8@.$9$k$3$H$O9T$o$J$$$N$G!"%5%$%HA4BN$KMh$k%j%/%(%9%HA4$F$r(B
  -    $B==J,07$($kDxEY$KBg$-$J?t$K@_Dj$7$F$*$/I,MW$,$"$j$^$9!#(B</p>
  -</usage>
  -</directivesynopsis>
  -
  -<directivesynopsis>
   <name>ScoreBoardFile</name>
   <description>$B;R%W%m%;%9$HO"7H$9$k$?$a$N%G!<%?$rJ]B8$9$k(B
   $B%U%!%$%k$N0LCV(B</description>
   <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 $B$O?F%W%m%;%9$H;R%W%m%;%94V$NDL?.$K%9%3%"%\!<%I$rMQ$$$^$9!#(B
  @@ -463,24 +591,27 @@
       <a href="../misc/security_tips.html">$B%;%-%e%j%F%#(B</a>
       $B$HF1MM$NCm0UE@$,$"$k$N$G!"Cm0U$7$F$/$@$5$$!#(B</p>
   </usage>
  -<seealso><a
  -    href="../stopping.html">Apache $B$NDd;_$H:F5/F0(B</a></seealso>
  +<seealso><a href="../stopping.html">Apache $B$NDd;_$H:F5/F0(B</a></seealso>
   </directivesynopsis>
   
   <directivesynopsis>
   <name>SendBufferSize</name>
   <description>TCP $B%P%C%U%!%5%$%:(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>$B%5!<%P$O(B TCP $B%P%C%U%!%5%$%:$r;XDj$5$l$?%P%$%H?t$K@_Dj$7$^$9!#(B
       $B9bB.$G9b%l%$%F%s%7$J4D6-$G(B
       (<em>$BNc(B</em> 100ms $BDxEY!"BgN&2#CG9bB.DL?.O)$J$I(B)
       $B8E$$0lHLE*$J(B OS $B$N%G%U%)%k%HCM$rA}$d$9$N$KHs>o$KJXMx$G$9!#(B</p>
  +
  +    <p><code>0</code>$B$K$7$?>l9g!"(BOS $B$N%G%U%)%k%HCM$,;HMQ$5$l$^$9!#(B</p>
   </usage>
   </directivesynopsis>
   
  @@ -488,9 +619,10 @@
   <name>ServerLimit</name>
   <description>$B@_Dj2DG=$J%5!<%P%W%m%;%9?t$N>e8B(B</description>
   <syntax>ServerLimit <var>number</var></syntax>
  -<default>ServerLimit 256 (prefork), ServerLimit 16 (worker)</default>
  +<default>$B>\:Y$O;HMQK!$r;2>H(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 $B$G$O!"(B
       <directive module="mpm_common">MaxClients</directive>
  -    $B$r(B 256 $B$h$j$bBg$-$JCM$K@_Dj$9$kI,MW$,$"$k;~$K$@$1;HMQ$7$F$/$@$5$$!#(B
  +    $B$r(B 256 ($B%G%U%)%k%H(B) $B$h$j$bBg$-$JCM$K@_Dj$9$kI,MW$,$"$k;~$K$@$1;HMQ$7$F$/$@$5$$!#(B
       $B4uK>$N(B <directive module="mpm_common">MaxClients</directive>
       $B?t$H$/$i$Y$F!"I,MW0J>e$KBg$-$JCM$r;XDj$9$k$3$H$OHr$1$F$/$@$5$$!#(B</p>
   
  -    <p><module>worker</module> MPM $B$G$O!"(B
  +    <p><module>worker</module>, <module>leader</module>, 
  +    <module>threadpool</module> MPM $B$G$O!"(B
       <directive module="mpm_common">MaxClients</directive> $B$H(B
       <directive module="mpm_common">ThreadsPerChild</directive>
  -    $B$N@_Dj$G(B 16 $B%5!<%P%W%m%;%90J>eI,MW$K$J$k>l9g$K$N$_;HMQ$7$F$/$@$5$$!#(B
  -    $B4uK>$N(B
  +    $B$N@_Dj$G(B 16 $B%5!<%P%W%m%;%9(B ($B%G%U%)%k%H(B) 
  +    $B0J>eI,MW$K$J$k>l9g$K$N$_;HMQ$7$F$/$@$5$$!#4uK>$N(B
       <directive module="mpm_common">MaxClients </directive> $B$H(B
       <directive module="mpm_common">ThreadsPerChild</directive>
       $B$H$/$i$Y$F!"I,MW$H$J$k%5!<%P%W%m%;%9?t0J>e$KBg$-$JCM$r(B
       $B@_Dj$9$k$3$H$OHr$1$F$/$@$5$$!#(B</p>
  +
  +    <p><module>perchild</module> MPM $B$G$O!"(B
  +    <directive module="perchild">NumServers</directive> $B$r(B 8 ($B%G%U%)%k%H(B)
  +    $B$h$m$$$bBg$-$JCM$K@_Dj$9$kI,MW$,$"$k$H$-$K$N$_;HMQ$7$F$/$@$5$$!#(B</p>
  +
  +    <note><title>$BCm0U(B</title>
  +      <p><code>ServerLimit 20000</code> $B$H$$$&@)8BIU$-$G%3%s%Q%$%k$5$l$F$$$^$9!#(B
  +      $B$3$l$O%9%Z%k%_%9$K$h$C$F8m$C$F9s$$>u67$K$J$k$N$r!"(B
  +      $B2sHr$9$k$?$a$N=hCV$G$9!#(B</p>
  +    </note>
   </usage>
  +<seealso><a href="../stopping.html">Apache $B$NDd;_$H:F5/F0(B</a></seealso>
   </directivesynopsis>
   
   <directivesynopsis>
   <name>StartServers</name>
   <description>$B5/F0;~$K@8@.$5$l$k;R%5!<%P%W%m%;%9$N?t(B</description>
   <syntax>StartServers <var>number</var></syntax>
  -<default>StartServers 5</default>
  +<default>$B>\:Y$O;HMQJ}K!$r;2>H(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> $B%G%#%l%/%F%#%V$O!"(B
       $B5/F0;~$K@8@.$5$l$k;R%5!<%P%W%m%;%9$N?t$r@_Dj$7$^$9!#(B
       $B%W%m%;%9?t$OIi2Y$K1~$8$FF0E*$K@)8f$5$l$^$9$N$G!"(B
       $BDL>o$O$3$NCM$rD4@0$9$kM}M3$O$"$^$j$J$$$G$7$g$&!#(B</p>
  +
  +    <p>$B%G%U%)%k%HCM$O(B MPM $B$4$H$K0[$J$j$^$9!#(B
  +    <module>leader</module>, <module>threadpool</module>, 
  +    <module>worker</module> $B$O(B <code>StartServers 3</code> $B$G$9!#(B
  +    <module>prefork</module> $B$O(B <code>5</code> $B$G!"(B
  +    <module>mpmt_os2</module> $B$O(B <code>2</code> $B$G$9!#(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>$B5/F0;~$K@8@.$5$l$k%9%l%C%I$N?t(B</description>
   <syntax>StartThreads <var>number</var></syntax>
  +<default>$B>\:Y$O;HMQJ}K!$r;2>H(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>$B5/F0;~$K@8@.$5$l$k%9%l%C%I$N?t$G$9!#(B
  @@ -574,6 +726,9 @@
       $B$3$N>l9g%W%m%;%9$O0l$D$7$+$J$$$N$G!"(B
       $B5/F0;~$K%j%/%(%9%H$K1~Ez$9$k%9%l%C%I$NAm?t$H$J$j$^$9!#(B</p>
   
  +    <p><module>beos</module> $B$G$N%G%U%)%k%H$O(B <code>StartThreads
  +    10</code> $B$G$9!#(B
  +    $B$^$?!"5/F0;~$K@8@.$5$l$k%9%l%C%I$NAm?t$K$bH?1G$5$l$^$9!#(B</p>
   </usage>
   </directivesynopsis>
   
  @@ -582,8 +737,13 @@
   <description>$B@_Dj2DG=$J;R%W%m%;%9Kh$N%9%l%C%I?t$N>e8B$r(B
   $B@_Dj$7$^$9(B</description>
   <syntax>ThreadLimit <var>number</var></syntax>
  +<default>$B>\:Y$O;HMQJ}K!$r;2>H(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 $B$H$=$l0J9_$N(B <module>mpm_winnt</module> 
  +$B$GMxMQ2DG=(B</compatibility>
   
   <usage>
       <p>$B$3$N%G%#%l%/%F%#%V$O(B
  @@ -610,9 +770,16 @@
       </p>
   
       <p><directive>ThreadLimit</directive> $B$N%G%U%)%k%HCM$O(B
  -    <module>worker</module> $B$N$H$-$O(B 64 $B$G!"(B<module>mpm_winnt</module> $B$N$H$-$O(B
  -    1920 $B$G$9!#(B</p>
  +    <module>mpm_winnt</module> $B$N$H$-$O(B 1920 $B$G!"(B
  +    $BB>$N>l9g$O(B 64 $B$G$9!#(B</p>
   
  +    <note><title>$BCm0U(B</title>
  +      <p><code>ThreadLimit 20000</code> (<module>mpm_winnt</module>
  +      $B$N>l9g$O(B <code>ThreadLimit 15000</code> )
  +      $B$H$$$&@)8BIU$-$G%3%s%Q%$%k$5$l$F$$$^$9!#(B
  +      $B$3$l$O%9%Z%k%_%9$K$h$C$F8m$C$F9s$$>u67$K$J$k$N$r!"(B
  +      $B2sHr$9$k$?$a$N=hCV$G$9!#(B</p>
  +    </note>
   </usage>
   </directivesynopsis>
   
  @@ -620,10 +787,10 @@
   <name>ThreadsPerChild</name>
   <description>$B;R%W%m%;%9$=$l$>$l$K@8@.$5$l$k%9%l%C%I?t(B</description>
   <syntax>ThreadsPerChild <var>number</var></syntax>
  -<default>ThreadsPerChild 50</default>
  +<default>$B>\:Y$O;HMQJ}K!$r;2>H(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>$B$3$N%G%#%l%/%F%#%V$O!"$=$l$>$l$N;R%W%m%;%9$G@8@.$5$l$k(B
  @@ -635,7 +802,11 @@
       $BBg$-$/$J$1$l$P$J$j$^$;$s!#(B<module>worker</module> $B$N$h$&$J!"(B
       $B;R%W%m%;%9$,J#?t$"$k$h$&$J(B MPM $B$rMxMQ$7$F$$$k$N$G$"$l$P!"(B
       $B%5!<%P$NDL>oIi2Y$r==J,07$($kDxEY$K!"(B
  -    $B%9%l%C%IAm?t$,B?$/$J$1$l$P$J$j$^$;$s!#(B</p>
  +    <em>$B%9%l%C%IAm?t(B</em>$B$,B?$/$J$1$l$P$J$j$^$;$s!#(B</p>
  +
  +    <p><module>mpm_winnt</module>$B$G$N(B <directive>ThreadsPerChild</directive>
  +    $B$N%G%U%)%k%HCM$O(B <code>64</code> $B$G!"B>$N>l9g$O(B
  +    <code>25</code> $B$G$9!#(B</p>
   </usage>
   </directivesynopsis>
   
  @@ -644,32 +815,36 @@
   <description>$B%j%/%(%9%H$K1~Ez$9$k:]$KMQ$$$k%f!<%6(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 $B0J9_$G!"%0%m!<%P%k@_Dj$G$N$_M-8z$G$9!#(B
  +</compatibility>
   
   <usage>
       <p><directive>User</directive> $B%G%#%l%/%F%#%V$O(B
       $B%5!<%P$,%j%/%(%9%H$K1~Ez$9$k:]$KMQ$$$k%f!<%6(B ID $B$r@_Dj$7$^$9!#(B
       $B$3$N%G%#%l%/%F%#%V$r;HMQ$9$k$?$a$K$O!"%9%?%s%I%"%m%s7?$N(B
       $B%5!<%P$O:G=i$K(B root $B8"8B$G5/F0$5$l$F$$$kI,MW$,$"$j$^$9!#(B
  -    <var>unix-userid</var> $B$O<!$N$I$A$i$+$G$9(B:</p>
  +    $BHs(B root $B%f!<%6$G%5!<%P$r5/F0$7$?>l9g$O!"(B
  +    $B8"8B$NDc$$%f!<%6$X$HJQ$o$k$3$H$,$G$-$:!"(B
  +    $B7k6I85$N%f!<%6$N%W%m%;%9$H$7$F<B9T$5$lB3$1$^$9!#(B
  +    <code>root</code> $B$G5/F0$7$?>l9g$K?F%W%m%;%9$,(B root
  +    $B$H$7$F<B9...@5>o$JF0:n$G$9!#(B
  +    <var>Unix-userid</var> $B$O<!$N$I$l$+$G$9!#(B</p>
   
       <dl>
         <dt>$B%f!<%6L>(B</dt>
  -
         <dd>$B%f!<%6$rL>A0$G;2>H$7$^$9!#(B</dd>
   
         <dt># $B$KB3$$$F%f!<%6HV9f(B</dt>
  -
         <dd>$B%f!<%6$rHV9f$G;2>H$7$^$9!#(B</dd>
       </dl>
   
       <p>$B$3$N%f!<%6$O!"30It$K8+$;$k$h$&$K0U?^$7$F$$$J$$%U%!%$%k$K!"(B
       $B%"%/%;%92DG=$K$J$C$F$7$^$&$h$&$J8"8B$r;}$D$Y$-$G$O$J$$$G$9$7!"(B
  -    $BF1MM$K(B httpd $B%j%/%(%9%H$KBP$7$F1~Ez$9$k$h$&$K0U?^$7$F$$$J$$(B
  +    $BF1MM$K(B HTTP $B%j%/%(%9%H$KBP$7$F1~Ez$9$k$h$&$K0U?^$7$F$$$J$$(B
       $B<B9T%3!<%I$r!"<B9T$G$-$k$h$&$J8"8B$r;}$D$Y$-$G$O$J$$$G$9!#(B
       $B%5!<%P$r<B9T$9$k$?$a$KFCDj$N?7$7$$%f!<%6$H%0%k!<%W$r(B
       $B@_Dj$9$k$3$H$r$*A&$a$$$?$7$^$9!#(B
  @@ -678,25 +853,33 @@
       $B$J$<$J$i(B <code>nobody</code> $B%f!<%6$O!"%7%9%F%`$G(B
       $BB>$NLr3d$rC4$C$F$$$k$+$bCN$l$J$$$+$i$G$9!#(B</p>
   
  -    <p>$BCm0U(B: $BHs(B root $B%f!<%6$G%5!<%P$r5/F0$7$?>l9g$O!"(B
  -    $B$h$jDc$$8"8B$N%f!<%6$KJQ$o$k$3$H$K<:GT$7$F!"(B
  -    $BBe$o$j$K5/F0$r9T$C$?%f!<%68"8B$N$^$^<B9T$5$lB3$1$k$G$7$g$&!#(B
  -    root $B8"8B$G3+;O$7$?>l9g?F%W%m%;%9$,(B root
  -    $B8"8B$G<B9...@5>o$G$9!#(B</p>
  +    <note type="warning"><title>$B%;%-%e%j%F%#(B</title>
  +      <p>$B@53N$K$I$s$J$3$H$r$d$C$F$$$k$N$+!"$=$N4m81@-$rCN$i$J$$$G!"(B
  +      <directive>User</directive> ($B$d(B <directive
  +      module="mpm_common">Group</directive>) $B$r(B <code>root</code> $B$K(B
  +      $B@_Dj$7$J$$$G$/$@$5$$!#(B</p>
  +    </note>
  +
  +    <p><module>perchild</module> MPM $B$G$O!"0[$J$k%f!<%6(B ID
  +    $B$GJ#?t$N%P!<%A%c%k%[%9%H$rF0$+$9$3$H$rL\E*$H$7$F$$$^$9$,!"(B
  +    <directive>User</directive> $B$O!"<g%5!<%P$N%f!<%6(B ID 
  +    $B$H!"(B<directive module="perchild">AssignUserID</directive>
  +    $B%G%#%l%/%F%#%V$r;}$?$J$$(B <directive type="section"
  +    module="core">VirtualHost</directive> $B%;%/%7%g%s$X$N(B
  +    $B%U%)!<%k%P%C%/$H$rDj5A$9$k$3$H$K$J$j$^$9!#(B</p>
   
       <p>$BFC5-;v9`(B: $B$3$N%G%#%l%/%F%#%V$r(B
       <directive module="core" type="section">VirtualHost</directive>
       $B$G;HMQ$9$k$3$H$O%5%]!<%H$5$l$J$/$J$j$^$7$?!#(B
  -    <a href="mod_suexec.html">suexec</a> $B8~$1$K%5!<%P$r@_Dj$9$k$N$G$"$l$P!"(B
  +    <a href="../suexec.html">suexec</a> $B8~$1$K%5!<%P$r@_Dj$9$k$N$G$"$l$P!"(B
       <directive module="mod_suexec">SuexecUserGroup</directive>
       $B$r;HMQ$7$F$/$@$5$$!#(B</p>
   
  -<note><title>$B%;%-%e%j%F%#(B</title>
  -<p>$B<+J,$,2?$r$d$C$F$$$k$N$+@53N$KGD0.$7$F$$$J$$!"(B
  -$B$=$7$F$=$N4m81@-$rGD0.$7$F$$$J$$$N$G$"$l$P!"(B
  -<directive>User</directive>
  -($B$d(B <directive module="mpm_common">Group</directive>)
  -$B$r(B <code>root</code> $B$K@_Dj$7$J$$$G$/$@$5$$!#(B</p></note>
  +    <note><title>$BCm0U(B</title>
  +      <p><directive>User</directive> $B%G%#%l%/%F%#%V$O(B
  +      <module>beos</module> $B$H(B <module>mpmt_os2</module> MPM
  +      $B$K$bB8:_$7$^$9$,!"<B<AE*$KL58z$G!"8_49@-$N$?$a$@$1$KB8:_$7$^$9!#(B</p>
  +    </note>
   </usage>
   </directivesynopsis>