English Revision: 478131

Submitted by: Takashi Sato
Reviewed by: Hiroaki Kawai

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

diff --git a/docs/manual/mod/mpm_common.xml.ja b/docs/manual/mod/mpm_common.xml.ja
index f8d2b29de30b55665f7e78c1cc34d052efb8c826..61be72cfe2c617da11ae0adba6e29a077d754155 100644 (file)
--- a/docs/manual/mod/mpm_common.xml.ja
+++ b/docs/manual/mod/mpm_common.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 190982:478131 (outdated) -->
+<!-- English Revision: 478131 -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,8 +32,8 @@
 <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>
+<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>
@@ -42,7 +42,7 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <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 \e$B$,D>Ns2=$9$k$?$a$K;H$&J}K!\e(B(\e$B$HI,MW$J$i%m%C%/%U%!%$%k$N>l=j\e(B)\e$B$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 
@@ -59,25 +59,44 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
     \e$B%(%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>flock&lt;<var>:/path/to/lockfile</var>&gt;</code></dt>
+      <dd>\e$B%*%W%7%g%s$N\e(B <var>/path/to/lockfile</var>
+      \e$B%Q%i%a!<%?$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
+      \e$B%m%C%/%U%!%$%k$N;XDj$K$O\e(B <directive module="mpm_common">LockFile</directive> 
+      \e$B%G%#%l%/%F%#%V$r;H$&$3$H$b=PMh$^$9\e(B(\e$BHs?d>)$G$9\e(B)\e$B!#\e(B</dd>
+
+      <dt><code>fcntl&lt;<var>:/path/to/lockfile</var>&gt;</code></dt>
+      <dd>\e$B%*%W%7%g%s$N\e(B <var>/path/to/lockfile</var>
+      \e$B%Q%i%a!<%?$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
+      \e$B%m%C%/%U%!%$%k$N;XDj$K$O\e(B <directive module="mpm_common">LockFile</directive> 
+      \e$B%G%#%l%/%F%#%V$r;H$&$3$H$b=PMh$^$9\e(B(\e$BHs?d>)$G$9\e(B)\e$B!#\e(B</dd>
+
+      <dt><code>file&lt;<var>:/path/to/lockfile</var>&gt;</code></dt>
+      <dd>\e$B;HMQ$G$-$k%U%!%$%k%m%C%/%k!<%A%s$NCf$G:GE,$J$b$N$r;H$$$^$9!#\e(B
+      \e$B6qBNE*$K$O!"\e(B<code>fcntl</code> \e$B$,;HMQ2DG=$J>l9g$O$=$l$r;H$$!"$=$&$G$J$$>l9g$O\e(B
+      <code>flock</code> \e$B$r;n$7$^$9!#\e(B
+      \e$B$3$N@_Dj$O%W%i%C%H%[!<%`$H\e(B <glossary>APR</glossary> \e$B$,Fs$D$N$&$A>/$J$/$H$b\e(B
+      \e$B0l$D$r%5%]!<%H$7$F$$$k>l9g$N$_;HMQ2DG=$G$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>sysvsem</code></dt>
+      <dd>\e$BGSB>=hM}$N<BAu$K\e(B SySV \e$B7A<0$N%;%^%U%)$r;H$$$^$9!#\e(B</dd>
+
+      <dt><code>sem</code></dt>
+      <dd>\e$B;HMQ$G$-$k%;%^%U%)%k!<%A%s$NCf$G:GE,$J$b$N$r;H$$$^$9!#\e(B
+      \e$B6qBNE*$K$O!"\e(BPosix \e$B8_49%;%^%U%)$,;HMQ2DG=$J>l9g$O$=$l$r;H$$!"$=$&$G$J$$>l9g$O\e(B
+      SystemV IPC \e$B7A<0$N%;%^%U%)$r;n$7$^$9!#\e(B
+      \e$B$3$N@_Dj$O%W%i%C%H%[!<%`$H\e(B <glossary>APR</glossary> \e$B$,Fs$D$N$&$A>/$J$/$H$b\e(B
+      \e$B0l$D$r%5%]!<%H$7$F$$$k>l9g$N$_;HMQ2DG=$G$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
@@ -156,6 +175,26 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 </usage>
 </directivesynopsis>
 
+<directivesynopsis>
+<name>GracefulShutdownTimeout</name>
+<description>\e$B2:$d$+$JDd;_$r$+$1$?8e!"=*N;$9$k$^$GBT$D;~4V\e(B</description>
+<syntax>GracefulShutDownTimeout <var>seconds</var></syntax>
+<default>GracefulShutDownTimeout 0</default>
+<contextlist><context>server config</context></contextlist>
+<modulelist><module>prefork</module><module>worker</module>
+<module>event</module></modulelist>
+<compatibility>2.2 \e$B0J9_\e(B</compatibility>
+
+<usage>
+    <p><directive>GracefulShutdownTimeout</directive> \e$B$K$O\e(B
+    \e$B%5!<%P!<$,\e(B "graceful-stop" \e$B%7%0%J%k$r<u$1<h$C$F$+$i8=:_$N\e(B
+    \e$B%j%/%(%9%H$N=hM}$r:GBg$G2?IC4VB3$1$k$+$r;XDj$7$^$9!#\e(B</p>
+
+    <p>\e$B$3$NCM$r%<%m$K@_Dj$9$k$H!"=hM}Cf$H$7$F;D$C$F$$$k%j%/%(%9%H$,\e(B
+    \e$BA4$F40N;$9$k$^$G%5!<%P!<$O=*N;$7$^$;$s!#\e(B</p>
+</usage>
+</directivesynopsis>
+
 <directivesynopsis>
 <name>Group</name>
 <description>\e$B%j%/%(%9%H$K1~Ez$9$k:]$K=jB0$9$k%0%k!<%W\e(B</description>
@@ -181,7 +220,7 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
       <dd>\e$B%0%k!<%W$rL>A0$G;2>H$7$^$9\e(B</dd>
 
       <dt><code>#</code> \e$B$KB3$$$F%0%k!<%WHV9f\e(B</dt>
-      <dd>\e$B%0%k!<%W$r$rHV9f$G;2>H$7$^$9!#\e(B</dd>
+      <dd>\e$B%0%k!<%W$rHV9f$G;2>H$7$^$9!#\e(B</dd>
     </dl>
 
     <example><title>\e$BNc\e(B</title>
@@ -374,7 +413,7 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 
 <directivesynopsis>
 <name>LockFile</name>
-<description>\e$B<uIU$rD>Ns2=$9$k$?$a$N%m%C%/%U%!%$%k$N0LCV\e(B</description>
+<description>\e$B<uIU$rD>Ns2=$9$k$?$a$N%m%C%/%U%!%$%k$N0LCV\e(B<em>(\e$BHs?d>)\e(B)</em></description>
 <syntax>LockFile <var>filename</var></syntax>
 <default>LockFile logs/accept.lock</default>
 <contextlist><context>server config</context></contextlist>
@@ -401,6 +440,12 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
       \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>
+    <note type="warning"><title>\e$BHs?d>)\e(B</title>
+      <p>\e$B$3$N%G%#%l%/%F%#%V$OHs?d>)$G$9!#\e(B <directive 
+      module="mpm_common">AcceptMutex</directive>
+      \e$B%G%#%l%/%F%#%V$GGSB>=hM}$NJ}K!$N;XDj$H$H$b$K%m%C%/%U%!%$%k$N>l=j$b;XDj$7$F$/$@$5$$!#\e(B</p>
+    </note>
+
 </usage>
 <seealso><directive module="mpm_common">AcceptMutex</directive></seealso>
 </directivesynopsis>
@@ -661,6 +706,24 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <seealso><a href="../stopping.html">Apache \e$B$NDd;_$H:F5/F0\e(B</a></seealso>
 </directivesynopsis>
 
+<directivesynopsis>
+<name>ReceiveBufferSize</name>
+<description>TCP \e$B<u?.%P%C%U%!%5%$%:\e(B</description>
+<syntax>ReceiveBufferSize <var>bytes</var></syntax>
+<default>ReceiveBufferSize 0</default>
+<contextlist><context>server config</context></contextlist>
+<modulelist><module>beos</module>
+<module>mpm_netware</module><module>mpm_winnt</module>
+<module>mpmt_os2</module><module>prefork</module>
+<module>worker</module></modulelist>
+
+<usage>
+    <p>\e$B%5!<%P$O\e(B TCP \e$B<u?.%P%C%U%!%5%$%:$r;XDj$5$l$?%P%$%H?t$K@_Dj$7$^$9!#\e(B</p>
+
+    <p><code>0</code>\e$B$K$7$?>l9g!"\e(BOS \e$B$N%G%U%)%k%HCM$,;HMQ$5$l$^$9!#\e(B</p>
+</usage>
+</directivesynopsis>
+
 <directivesynopsis>
 <name>SendBufferSize</name>
 <description>TCP \e$B%P%C%U%!%5%$%:\e(B</description>
@@ -673,7 +736,7 @@ accept \e$B$7$h$&$H$7$F$$$k$H$-$K!"\e(BApache \e$B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
 <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
+    <p>\e$B%5!<%P$O\e(B TCP \e$BAw?.%P%C%U%!%5%$%:$r;XDj$5$l$?%P%$%H?t$K@_Dj$7$^$9!#\e(B
     \e$B9bB.$G9b%l%$%F%s%7$J4D6-$G\e(B
     (<em>\e$BNc\e(B</em> 100ms \e$BDxEY!"BgN&2#CG9bB.DL?.O)$J$I\e(B)
     \e$B8E$$0lHLE*$J\e(B OS \e$B$N%G%U%)%k%HCM$rA}$d$9$N$KHs>o$KJXMx$G$9!#\e(B</p>