summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/manual/mod/mpm_winnt.xml.ja4
-rw-r--r--docs/manual/mod/prefork.xml.ja123
-rw-r--r--docs/manual/mod/quickreference.xml.ja2
-rw-r--r--docs/manual/mod/worker.xml.ja7
4 files changed, 32 insertions, 104 deletions
diff --git a/docs/manual/mod/mpm_winnt.xml.ja b/docs/manual/mod/mpm_winnt.xml.ja
index b752a59d32..ecaf6f74a7 100644
--- a/docs/manual/mod/mpm_winnt.xml.ja
+++ b/docs/manual/mod/mpm_winnt.xml.ja
@@ -2,7 +2,7 @@
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
<modulesynopsis metafile="mpm_winnt.xml.meta">
-<!-- English revision: 1.4 -->
+<!-- English revision: 1.6 -->
<name>mpm_winnt</name>
<description>Windows NT
$B8~$1$K:GE,2=$5$l$?%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B</description>
@@ -28,6 +28,8 @@
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ThreadLimit</name>
diff --git a/docs/manual/mod/prefork.xml.ja b/docs/manual/mod/prefork.xml.ja
index 5dc4d18aa3..1b6b100c92 100644
--- a/docs/manual/mod/prefork.xml.ja
+++ b/docs/manual/mod/prefork.xml.ja
@@ -2,7 +2,7 @@
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
<modulesynopsis metafile="prefork.xml.meta">
-<!-- English revision: 1.8 -->
+<!-- English revision: 1.11 -->
<name>prefork</name>
<description>$B%9%l%C%I$r;H$o$:!"@h9T$7$F(B fork $B$r9T$J$&%&%'%V%5!<%P$r<BAu(B
@@ -63,7 +63,7 @@
$B$K$"$j$^$9!#(B</p>
<p>$BDL>o(B Unix $B$G$O?F%W%m%;%9$O(B 80 $BHV%]!<%H$K%P%$%s%I$9$k$?$a$K(B
- root $B$G5/F0$5$l$^$9$,!";R%W%m%;%9$d%9%l%C%I$O(B
+ <code>root</code> $B$G5/F0$5$l$^$9$,!";R%W%m%;%9$d%9%l%C%I$O(B
$B$b$C$HDc$$8"8B$N%f!<%6$G(B Apache $B$K$h$C$F5/F0$5$l$^$9!#(B
<directive module="mpm_common">User</directive> $B$H(B
<directive module="mpm_common">Group</directive>
@@ -77,113 +77,35 @@
$B$I$NDxEY$NIQEY$G%5!<%P$,%W%m%;%9$r%j%5%$%/%k$9$k$+$r@)8f$7$^$9!#(B</p>
</section>
-<directivesynopsis location="mpm_common">
-<name>CoreDumpDirectory</name>
+<directivesynopsis location="mpm_common"><name>CoreDumpDirectory</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>PidFile</name>
+<directivesynopsis location="mpm_common"><name>PidFile</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>Listen</name>
+<directivesynopsis location="mpm_common"><name>Listen</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>ListenBacklog</name>
+<directivesynopsis location="mpm_common"><name>ListenBacklog</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>LockFile</name>
+<directivesynopsis location="mpm_common"><name>LockFile</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>MaxClients</name>
+<directivesynopsis location="mpm_common"><name>MaxClients</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>MaxMemFree</name>
+<directivesynopsis location="mpm_common"><name>MaxMemFree</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>MaxRequestsPerChild</name>
+<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>ScoreBoardFile</name>
+<directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>SendBufferSize</name>
+<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>ServerLimit</name>
+<directivesynopsis location="mpm_common"><name>ServerLimit</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>StartServers</name>
+<directivesynopsis location="mpm_common"><name>StartServers</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>User</name>
+<directivesynopsis location="mpm_common"><name>User</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>Group</name>
+<directivesynopsis location="mpm_common"><name>Group</name>
</directivesynopsis>
-
-<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>
-
-<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 $B$h$jA0$G$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>fnctl(2)</code> $B%7%9%F%`%3!<%k$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>
-
- <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>
- </dl>
-</usage>
+<directivesynopsis location="mpm_common"><name>AcceptMutex</name>
</directivesynopsis>
<directivesynopsis>
@@ -197,11 +119,14 @@ accept $B$7$h$&$H$7$F$$$k$H$-$K!"(BApache $B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
<p><directive>MaxSpareServers</directive> $B%G%#%l%/%F%#%V$O!"(B
<em>$B%"%$%I%k$J(B</em>$B;R%5!<%P%W%m%;%9$N4uK>:GBg8D?t$r@_Dj$7$^$9!#(B
$B%"%$%I%k%W%m%;%9$H$O!"%j%/%(%9%H$r07$C$F$$$J$$%W%m%;%9$G$9!#(B
- MaxSpareServers $B$h$j$bB?$$?t$,%"%$%I%k$G$"$l$P!"(B
+ <directive>MaxSpareServers</directive> $B$h$j$bB?$$?t$,%"%$%I%k$G$"$l$P!"(B
$B?F%W%m%;%9$OD62a%W%m%;%9$r(B kill $B$7$^$9!#(B</p>
<p>$BHs>o$K:.$s$G$$$k%5%$%H$G$N$_!"$3$N%Q%i%a!<%?$r%A%e!<%K%s%0$9$k$Y$-$G$9!#(B
- $B$3$N%Q%i%a!<%?$rBg$-$/$9$k$H$$$&$3$H$O!"BgDq$N>l9g$O0-$$H/A[$G$9!#(B</p>
+ $B$3$N%Q%i%a!<%?$rBg$-$/$9$k$H$$$&$3$H$O!"BgDq$N>l9g$O0-$$H/A[$G$9!#(B
+ <directive module="prefork">MinSpareServers</directive>
+ $B$h$j$b>.$5$$CM$K@_Dj$7$?>l9g!"(B<directive>MinSpareServers</directive>
+ <code>+1</code> $B$K<+F0D4@0$5$l$^$9!#(B</p>
</usage>
<seealso><directive module="prefork">MinSpareServers</directive></seealso>
<seealso><directive module="mpm_common">StartServers</directive></seealso>
@@ -211,14 +136,14 @@ accept $B$7$h$&$H$7$F$$$k$H$-$K!"(BApache $B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$
<name>MinSpareServers</name>
<description>$B%"%$%I%k$J;R%5!<%P%W%m%;%9$N:G>.8D?t(B</description>
<syntax>MinSpareServers <var>number</var></syntax>
-<default>MinSpareServers 5</default>
+<default>MinSpareServers 5</default>
<contextlist><context>server config</context></contextlist>
<usage>
<p><directive>MaxSpareServers</directive> $B%G%#%l%/%F%#%V$O!"(B
<em>$B%"%$%I%k$J(B</em>$B;R%5!<%P%W%m%;%9$N4uK>:G>.8D?t$r@_Dj$7$^$9!#(B
$B%"%$%I%k%W%m%;%9$H$O!"%j%/%(%9%H$r07$C$F$$$J$$%W%m%;%9$G$9!#(B
- MinSpareServers $B$h$j$b>/$J$$?t$,%"%$%I%k$G$"$l$P!"(B
+ <directive>MinSpareServers</directive> $B$h$j$b>/$J$$?t$,%"%$%I%k$G$"$l$P!"(B
$B?F%W%m%;%9$O:G9b$G(B 1 $BIC$K$D$-(B 1 $B8D$N3d9g$G?7$7$$;R%W%m%;%9$r@8@.$7$^$9!#(B</p>
<p>$BHs>o$K:.$s$G$$$k%5%$%H$G$N$_!"$3$N%Q%i%a!<%?$r%A%e!<%K%s%0$9$k$Y$-$G$9!#(B
diff --git a/docs/manual/mod/quickreference.xml.ja b/docs/manual/mod/quickreference.xml.ja
index f0170c0b06..1e1522f3be 100644
--- a/docs/manual/mod/quickreference.xml.ja
+++ b/docs/manual/mod/quickreference.xml.ja
@@ -3,7 +3,7 @@
[ <!ENTITY allmodules SYSTEM "allmodules.xml.ja"> ]
>
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English revision: 1.4 -->
+<!-- English revision: 1.6 -->
<quickreference metafile="quickreference.xml.meta">
<title>$B%G%#%l%/%F%#%V(B $B%/%$%C%/%j%U%!%l%s%9(B</title>
diff --git a/docs/manual/mod/worker.xml.ja b/docs/manual/mod/worker.xml.ja
index 29da424566..d3eb71921e 100644
--- a/docs/manual/mod/worker.xml.ja
+++ b/docs/manual/mod/worker.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.8 -->
+<!-- English revision: 1.11 -->
<modulesynopsis metafile="worker.xml.meta">
<name>worker</name>
<description>$B%^%k%A%9%l%C%I$H%^%k%A%W%m%;%9$N%O%$%V%j%C%I7?(B
@@ -26,7 +26,6 @@
$B3F;R%W%m%;%9$GMQ0U$5$l$k%9%l%C%I?t$r@)8f$7$F!"(B
<directive module="mpm_common">MaxClients</directive> $B$O(B
$B5/F0$5$l$k%9%l%C%I$NAm?t$N:GBgCM$r@)8B$7$^$9!#(B</p>
-
</summary>
<seealso><a href="../bind.html">Apache
$B$N;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj(B</a></seealso>
@@ -83,7 +82,7 @@
</example>
<p>$BDL>o(B Unix $B$G$O?F%W%m%;%9$O(B 80 $BHV%]!<%H$K%P%$%s%I$9$k$?$a$K(B
- root $B$G5/F0$5$l$^$9$,!";R%W%m%;%9$d%9%l%C%I$O(B
+ <code>root</code> $B$G5/F0$5$l$^$9$,!";R%W%m%;%9$d%9%l%C%I$O(B
$B$b$C$HDc$$8"8B$N%f!<%6$G(B Apache $B$K$h$C$F5/F0$5$l$^$9!#(B
<directive module="mpm_common">User</directive> $B$H(B
<directive module="mpm_common">Group</directive> $B%G%#%l%/%F%#%V$O(B
@@ -99,6 +98,8 @@
$B$I$NDxEY$NIQEY$G%5!<%P$,%W%m%;%9$r%j%5%$%/%k$9$k$+$r@)8f$7$^$9!#(B</p>
</section>
+<directivesynopsis location="mpm_common"><name>AcceptMutex</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>CoreDumpDirectory</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>Group</name>
View Lorry Controller Status