summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Malo <nd@apache.org>2004-07-03 12:07:31 +0200
committerAndré Malo <nd@apache.org>2004-07-03 12:07:31 +0200
commit9f99daadf6248ff41ee12228adccba49b699f56f (patch)
treec497a2a70bdca186496a4908af13f7507bc7b3b6
parentupdate translation (diff)
downloadapache2-9f99daadf6248ff41ee12228adccba49b699f56f.tar.xz
apache2-9f99daadf6248ff41ee12228adccba49b699f56f.zip
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104147 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/bind.html.ja.jis15
-rw-r--r--docs/manual/bind.xml.meta2
-rw-r--r--docs/manual/howto/cgi.html.ja.jis148
-rw-r--r--docs/manual/howto/cgi.xml.meta2
-rw-r--r--docs/manual/suexec.html.ja.jis27
-rw-r--r--docs/manual/suexec.xml.meta2
-rw-r--r--docs/manual/vhosts/name-based.html.ja.jis88
-rw-r--r--docs/manual/vhosts/name-based.xml.meta2
8 files changed, 155 insertions, 131 deletions
diff --git a/docs/manual/bind.html.ja.jis b/docs/manual/bind.html.ja.jis
index 6dc46e3089..c4ea8ba1a2 100644
--- a/docs/manual/bind.html.ja.jis
+++ b/docs/manual/bind.html.ja.jis
@@ -24,8 +24,6 @@
<a href="./ja/bind.html" title="Japanese">&nbsp;ja&nbsp;</a> |
<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
</div>
-<div class="outofdate">This translation may be out of date. Check the
- English version for recent changes.</div>
<p>Apache $B$,;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj$r$7$^$9!#(B</p>
</div>
@@ -57,7 +55,7 @@
$B$9$Y$F$N%$%s%?!<%U%'!<%9$NM?$($i$l$?%]!<%HHV9f$r(B
listen $B$7$^$9!#(B IP $B%"%I%l%9$,%]!<%HHV9f$HF1;~$KM?$($i$l$?>l9g$O!"(B
$B%5!<%P$OM?$($i$l$?%]!<%H$H%$%s%?!<%U%'!<%9$r(B listen $B$7$^$9!#(B
- $BJ#?t$N(B Listen $B%G%#%l%/%F%#%V$rMQ$$$F(B
+ $BJ#?t$N(B <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> $B%G%#%l%/%F%#%V$rMQ$$$F(B
$B$$$/$D$+$N(B listen $B$9$k%"%I%l%9$H%]!<%H$r;XDj$G$-$^$9!#(B
$B%5!<%P$O%j%9%H$5$l$?%"%I%l%9$d%]!<%H$+$i$N$9$Y$F$N%j%/%(%9%H$K(B
$BBP$7$F1~Ez$7$^$9!#(B</p>
@@ -108,7 +106,8 @@
$B$NN>J}$r07$&$K$O!"%^%C%W%H%"%I%l%9$r;HMQ$9$k(B<strong>$B0J30$NJ}K!$O$"$j$^$;$s(B</strong>$B!#(B
IPv4 $B$H(B IPv6 $B$N%3%M%/%7%g%s$r:G>.8B$N%=%1%C%H$G07$$$?$$$N$G$"$l$P!"(B
IPv4 $B%^%C%W$N(B IPv6 $B%"%I%l%9$r;HMQ$9$kI,MW$,$"$j!"(B
- <code>--enable-v4-mapped</code> configure $B%*%W%7%g%s$r;XDj$7$^$9!#(B</p>
+ <code>--enable-v4-mapped</code> <a href="programs/configure.html">configure</a>
+ $B%*%W%7%g%s$r;XDj$7$^$9!#(B</p>
<p><code>--enable-v4-mapped</code> $B$O!"(B
FreeBSD, NetBSD, OpenBSD $B0J30$NA4$F$N%W%i%C%H%[!<%`$G$N%G%U%)%k%H$G$9!#(B
@@ -117,7 +116,7 @@
<p>$B%W%i%C%H%U%)!<%`$d(B APR $B$,2?$r%5%]!<%H$9$k$+$K4X$o$i$:!"(B
IPv4 $B%3%M%/%7%g%s$N$_$r07$&$h$&$K$7$?$$>l9g$O!"(B
$B<!$NNc$N$h$&$KA4$F$N(B
- <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> $B%G%#%l%/%F%#%V$G(B
+ <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> $B%G%#%l%/%F(B$B%#%V$G(B
IPv4 $B%"%I%l%9$r;XDj$7$F$/$@$5$$!#(B</p>
<div class="example"><p><code>
@@ -128,7 +127,8 @@
<p>$B>r7o$rK~$?$9%W%i%C%H%[!<%`$G!"(BApache $B$,(B
IPv4 $B$H(B IPv6 $B$N%3%M%/%7%g%s$r8DJL$N%=%1%C%H$G07$&$h$&$K$7$?$$>l9g(B
($B$D$^$j(B IPv4 $B%^%C%W$N%"%I%l%9$rL58z$K$7$?$$>l9g(B)
- $B$O!"(B<code>--disable-v4-mapped</code> configure
+ $B$O!"(B<code>--disable-v4-mapped</code>
+ <a href="programs/configure.html">configure</a>
$B%*%W%7%g%s$r;XDj$7$F!"<!$N$h$&$K8DJL;XDj$N(B
<code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
$B%G%#%l%/%F%#%V$r;HMQ$7$F$/$@$5$$!#(B
@@ -139,7 +139,8 @@
<h2><a name="virtualhost" id="virtualhost">$B%P!<%A%c%k%[%9%H$KBP$7$F$I$&F/$/$N$+(B</a></h2>
- <p>Listen $B$G%P!<%A%c%k%[%9%H$,<BAu$5$l$k$o$1$G$O$"$j$^$;$s!#(B
+ <p><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
+ $B$G%P!<%A%c%k%[%9%H$,<BAu$5$l$k$o$1$G$O$"$j$^$;$s!#(B
Listen $B$OC1$K%a%$%s%5!<%P$K$I$N%"%I%l%9$H%]!<%H$r(B listen $B$9$Y$-$+$r(B
$B65$($k$@$1$G$9!#(B
<code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
diff --git a/docs/manual/bind.xml.meta b/docs/manual/bind.xml.meta
index ce6d33b256..f08c64c7ba 100644
--- a/docs/manual/bind.xml.meta
+++ b/docs/manual/bind.xml.meta
@@ -9,7 +9,7 @@
<variant>de</variant>
<variant>en</variant>
<variant outdated="yes">fr</variant>
- <variant outdated="yes">ja</variant>
+ <variant>ja</variant>
<variant outdated="yes">ko</variant>
</variants>
</metafile>
diff --git a/docs/manual/howto/cgi.html.ja.jis b/docs/manual/howto/cgi.html.ja.jis
index b27d7c6ca9..79252063df 100644
--- a/docs/manual/howto/cgi.html.ja.jis
+++ b/docs/manual/howto/cgi.html.ja.jis
@@ -21,8 +21,6 @@
<p><span>Available Languages: </span><a href="../en/howto/cgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
<a href="../ja/howto/cgi.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
</div>
-<div class="outofdate">This translation may be out of date. Check the
- English version for recent changes.</div>
</div>
<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#intro">$B$O$8$a$K(B</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#configuring">CGI $B$r5v2D$9$k$h$&$K(B Apache $B$r@_Dj$9$k(B</a></li>
@@ -70,7 +68,7 @@
$B%G%#%l%/%F%#%V$O0J2<$N$h$&$K;HMQ$7$^$9(B:</p>
<div class="example"><p><code>
- ScriptAlias /cgi-bin/ /usr/local/apache/cgi-bin/
+ ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
</code></p></div>
<p>$B%G%U%)%k%H0LCV$K(B Apache $B$r%$%s%9%H!<%k$7$?$J$i$P!"(B
@@ -88,12 +86,12 @@
URL $B$O(B CGI $B%W%m%0%i%`$H$_$J$5$l$k$H$$$&DI2C$N0UL#$r4^$s$G$$$k$3$H$G$9!#(B
$B=>$C$F!">e5-$NNc$G$O!"(B<code>/cgi-bin/</code>
$B$G;O$^$k%j%=!<%9$X$N$"$i$f$k%j%/%(%9%H$KBP$7$F!"%G%#%l%/%H%j(B
- <code>/usr/local/apache/cgi-bin/</code> $B$+$iDs6!$7!"$=$l$i$r(B
+ <code>/usr/local/apache2/cgi-bin/</code> $B$+$iDs6!$7!"$=$l$i$r(B
CGI $B%W%m%0%i%`$H$7$F07$&$h$&(B Apache $B$K<($7$^$9!#(B</p>
<p>$BNc$($P!"(BURL <code>http://dev.rcbowen.com/cgi-bin/test.pl</code>
$B$,MW5a$5$l$?>l9g!"(BApache $B$O(B $B%U%!%$%k(B
- <code>/usr/local/apache/cgi-bin/test.pl</code>
+ <code>/usr/local/apache2/cgi-bin/test.pl</code>
$B$r<B9T$7!"$=$N=PNO$rJV$9$3$H$r;n$_$^$9!#(B
$B$b$A$m$s!"%U%!%$%k$,B8:_$7!"<B9T2DG=$G$"$j!"7h$a$i$l$?J}K!$G=PNO$rJV$7$^$9!#(B
$B$=$&$G$J$1$l$P!"(BApache $B$O%(%i!<%a%C%;!<%8$rJV$7$^$9!#(B</p>
@@ -110,9 +108,15 @@
$B%W%m%0%i%`$rG$0U$N%G%#%l%/%H%j$G<B9T$G$-$J$$$h$&$K$9$kM}M3$O$"$j$^$;$s!#(B
$BNc$($P!"%f!<%6$K(B <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>
$B%G%#%l%/%F%#%V$GH`$i$N%[!<%`%G%#%l%/%H%jG[2<$K%&%'%V%3%s%F%s%D$r;}$?$;$?$$$H$7$^$9!#(B
- $B$b$7!"H`$i$,(B CGI $B%W%m%0%i%`$r;}$D$3$H$rK>$s$G$$$F$b!"%a%$%s$N(B
+ $B$b$7!"H`$i$,(B CGI $B%W%m%0%i%`$r;}$D$3$H$rK>$s$G$$$F$b!"%a(B$B%$%s$N(B
<code>cgi-bin</code> $B%G%#%l%/%H%j$X$N%"%/%;%9$,$G$-$J$$>l9g!"(B
CGI $B%W%m%0%i%`$r<B9T$9$k$3$H$,$G$-$kB>$N>l=j$,I,MW$K$J$j$^$9!#(B</p>
+
+ <p>$BG$0U$N%G%#%l%/%H%j$G(B CGI $B$N<B9T$r5v2D$9$k$K$OFsCJ3,$N@_Dj$,I,MW$G$9!#(B
+ $B$^$:!"(B<code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> $B$d(B <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code> $B%G%#%l%/%F%#%V$K$h$C$F(B
+ <code>cgi-script</code> $B%O%s%I%i$,2DG=$K$J$C$F$$$kI,MW$,$"$j$^$9!#(B
+ $B<!$K!"(B<code class="directive"><a href="../mod/core.html#options">Options</a></code> $B%G%#%l%/%F%#%V$G(B
+ <code>ExecCGI</code> $B$,;XDj$5$l$F$$$J$1$l$P$J$j$^$;$s!#(B</p>
<h3><a name="options" id="options">CGI $B$N<B9T$r2DG=$K$9$k$?$a$K(B Options $B$rL@<(E*$K;HMQ$9$k(B</a></h3>
@@ -123,7 +127,7 @@
CGI $B$N<B9T$r5v2D$9$k$h$&$K;XDj$9$k$3$H$,$G$-$^$9(B:</p>
<div class="example"><p><code>
- &lt;Directory /usr/local/apache/htdocs/somedir&gt;<br />
+ &lt;Directory /usr/local/apache2/htdocs/somedir&gt;<br />
<span class="indent">
Options +ExecCGI<br />
</span>
@@ -139,43 +143,46 @@
$B%W%m%0%i%`$H$7$F$_$J$9$3$H$r%5!<%P$KEA$($^$9(B:</p>
<div class="example"><p><code>
- AddHandler cgi-script cgi pl
+ AddHandler cgi-script .cgi .pl
</code></p></div>
<h3><a name="htaccess" id="htaccess">.htaccess files</a></h3>
- <p><a href="htaccess.html"><code>.htaccess</code>
- $B%U%!%$%k(B</a>$B$O!"%G%#%l%/%H%jKh$K%G%#%l%/%F%#%V$r;XDj$9$kJ}K!$G$9!#(B
- Apache $B$O!"%j%=!<%9$rDs6!$9$k$H$-$K!"(B
- $BDs6!$9$k%U%!%$%k$,CV$+$l$F$$$k%G%#%l%/%H%jCf$N(B <code>.htaccess</code>
- $B$H$$$&%U%!%$%k$r;2>H$7$^$9!#$=$N%U%!%$%k$rH/8+$7$?$i!"(B
- $B$=$NCf$GH/8+$5$l$?%G%#%l%/%F%#%V$,E,MQ$5$l$^$9!#(B
+ <p><a href="htaccess.html"><code>.htaccess</code> $B%A%e!<%H%j%"%k(B</a>
+ $B$O(B <code>httpd.conf</code> $B$rJQ99$G$-$J$$>l9g$K$I$&$d$C$F(B CGI $B%W%m%0%i%`$r(B
+ $B;H$($k$h$&$K$9$k$+$r@bL@$7$F$$$^$9!#(B</p>
+
+
+ <h3><a name="userdir" id="userdir">User $B%G%#%l%/%H%j(B</a></h3>
- <code>.htaccess</code> $B%U%!%$%k$O!"(B
- <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
- $B%G%#%l%/%F%#%V$N;XDj$K$h$j;H$($k$h$&$K$J$j$^$9!#(B
- <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
- $B%G%#%l%/%F%#%V$O!"(B<code>.htaccess</code>
- $B%U%!%$%k$G!"$I$N%?%$%W$N%G%#%l%/%F%#%V$,@_Dj$G$-$k$+!"(B
- $B$"$k$$$OA4$/;XDj$G$-(B$B$J$$$+$r;XDj$7$^$9!#(B
- $B$3$NL\E*$KI,MW$K$J$k%G%#%l%/%F%#%V$r;HMQ$G$-$k$h$&$K$9$k$K$O!"(B
- $B%5!<%P$N%a%$%s$N@_Dj$G!"0J2<$N@_Dj$,I,MW$K$J$j$^$9(B:</p>
+
+ <p><code>.cgi</code> $B$G=*$o$k$9$Y$F$N%U%!%$%k$KBP$7$F(B CGI $B%W%m%0%i%`$N(B
+ $B<B9T(B$B$r5v2D$9$k$K$O!"0J2<$N@_Dj$r;HMQ$G$-$^$9!#(B</p>
<div class="example"><p><code>
- AllowOverride Options
+ &lt;Directory /home/*/public_html&gt;<br />
+ <span class="indent">
+ Options +ExecCGI<br />
+ AddHandler cgi-script .cgi<br />
+ </span>
+ &lt;/Directory&gt;
</code></p></div>
- <p><code>.htaccess</code>
- $B%U%!%$%k$G$O!"<!$N%G%#%l%/%F%#%V$,I,MW$H$J$j$^$9(B:</p>
+ <p>$B%f!<%6%G%#%l%/%H%j$N(B <code>cgi-bin</code> $B%5%V%G%#%l%/%H%j$N(B
+ $B$9$Y$F$N%U%!%$%k$r(B CGI $B%W%m%0%i%`$H$7$F;XDj$7$?$$>l9g$K$O(B
+ $B0J2<$N$h$&$J$b$N$r;H$$$^$9!#(B</p>
<div class="example"><p><code>
- Options +ExecCGI
+ &lt;Directory /home/*/public_html/cgi-bin&gt;<br />
+ <span class="indent">
+ Options ExecCGI<br />
+ SetHandler cgi-script<br />
+ </span>
+ &lt;/Directory&gt;
</code></p></div>
- <p>$B$3$N@_Dj$G$O!"$3$N%G%#%l%/%H%j$K$*$1$k(B CGI
- $B%W%m%0%i%`$N<B9T$r5v2D$9$k$h$&(B Apache $B$KEA$($^$9!#(B</p>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
@@ -250,7 +257,10 @@
<dl>
<dt>CGI $B%W%m%0%i%`$N=PNO(B</dt>
- <dd>$BAG@2$i$7$$(B ! $B$=$l$O$9$Y$F$,$&$^$/F0$$$?$3$H$r0UL#$7$^$9!#(B</dd>
+ <dd>$BAG@2$i$7$$(B ! $B$=$l$O$9$Y$F$,$&$^$/F0$$$?$3$H$r0UL#$7$^$9!#(B
+ $B=PNO$,@5>o$@$1$l$I$b!"%V%i%&%6$,@5>o$K=hM}$7$F$/$l$J$$>l9g$O!"(B
+ $B@5$7$$(B <code>Content-Type</code> $B$r(B CGI $B%W%m%0%i%`Fb$G(B
+ $B%;%C%H$7$?$+$r3NG'$7$F$/$@$5$$!#(B</dd>
<dt>CGI $B%W%m%0%i%`$N%=!<%9%3!<%I!"$^$?$O(B "POST Method Not Allowed"
$B$H$$$&%a%C%;!<%8(B</dt>
@@ -261,7 +271,7 @@
</dd>
<dt>$B%a%C%;!<%8$,(B "Forbidden" $B$G;O$^$C$F$$$k(B</dt>
- <dd>$B$3$l$O%Q!<%_%C%7%g%s$NLdBj$H$$$&$3(B$B$H$r0UL#$7$^$9!#(B
+ <dd>$B$3$l$O%Q!<%_%C%7%g%s$NLdBj$H$$$&$3$H$r0UL#$7$^$9!#(B
<a href="#errorlogs">Apache $B$N%(%i!<%m%0(B</a>$B$H!"8e=R$N(B<a href="#filepermissions">$B!V%U%!%$%k$N%Q!<%_%C%7%g%s!W(B</a>
$B$N>O$r%A%'%C%/$7$F$/$@$5$$!#(B
</dd>
@@ -294,28 +304,20 @@
$B$=$l$i$N%U%!%$%k$O!"$3$l$,2DG=$H$J$k@5$7$$%Q!<%_%C%7%g%s(B
$B$r;}$C$F$$$kI,MW$,$"$j$^$9!#(B</p>
- <p>$B$3$l$KBP$9$kNc30$O!"%5!<%P$,(B <a href="../suexec.html">suexec</a>
- $B$r;HMQ$9$k$h$&@_Dj$5$l$F$$$k>l9g$G$9!#(Bsuexec $B$O!"(BCGI
- $B%W%m%0%i%`$,CV$+$l$F$$$k%P!<%A%c%k%[%9%H$^$?$O%f!<%6$N(B
- $B%[!<%`%G%#%l%/%H%j$K$h$C$F!"0[$J$k%f!<%68"8B$G<B9T$5$l$k$h$&$K$7$^$9!#(B
- suexec $B$O$H$F$b87$7$$%Q!<%_%C%7%g%s$N%A%'%C%/$,$"$j!"(B
- $B$=$N%A%'%C%/$rDL2a$G$-$J$$$H(B "Internal Server Error" $B$H$J$j!"$=$N(B
- CGI $B%W%m%0%i%`$N<B9T$O<:GT$7$^$9!#(B
- $B$3$N>l9g!"$I$N%;%-%e%j(B$B%F%#%A%'%C%/$,<:GT$7$F$$$k$N$+$rCN$k$?$a$K(B
- suexec $B%m%0%U%!%$%k$r%A%'%C%/$9$kI,MW$,$"$j$^$9!#(B</p>
- <h3><a name="pathinformation" id="pathinformation">$B%Q%9>pJs(B</a></h3>
+ <h3><a name="pathinformation" id="pathinformation">$B%Q%9>pJs$H4D6-(B</a></h3>
- <p>$B%3%^%s%I%i%$%s$+$i%W%m%0%i%`$r<B9T$9$k$H$-!"(B
+ <p>$B%3%^%s%I%i%$%s$+$i%W%m%0%i%`$r(B$B<B9T$9$k$H$-!"(B
$B0U<1$7$J$/$F$b%7%'%k$KEO$5$l$k>pJs$,$"$j$^$9!#(B
$BNc$($P!";2>H$9$k%U%!%$%k$N$?$a$K$I$3$r8!:w$7$?$i$h$$$+$r(B
- $B%7%'%k$KEA$($k%Q%9$,$"$j$^$9!#(B</p>
+ $B%7%'%k$KEA$($k(B <code>PATH</code> $B$,$"$j$^$9!#(B</p>
<p>$B%W%m%0%i%`$,(B CGI $B%W%m%0%i%`$H$7$F%&%'%V%5!<%P$K$h$C$F<B9T$5$l$k$H$-!"(B
- $B$=$l$O%Q%9$r;}$A$^$;$s!#(BCGI $B%W%m%0%i%`Fb$G8F$S=P$9$"$i$f$k%W%m%0%i%`(B
- ($BNc$($P!"(B'sendmail' $B$N$h$&$J$b$N(B) $B$O!"(B
+ $B$=$l$OF1$8(B <code>PATH</code> $B$G$O$J$$$+$b$7$l$^$;$s!#(B
+ CGI $B%W%m%0%i%`Fb$G8F$S=P$9$"$i$f$k%W%m%0%i%`(B
+ ($BNc$($P!"(B<code>sendmail</code> $B$N$h$&$J$b$N(B) $B$O!"(B
$B%U%k%Q%9$G;XDj$9$kI,MW$,$"$k$G$7$g$&!#$=$l$K$h$j!"(BCGI
$B%W%m%0%i%`$r<B9T$7$h$&$H$7$?$H$-!"(B
$B%7%'%k$O$=$N$h$&$J%W%m%0%i%`$r8+$D$1$k$3$H$,$G$-$^$9!#(B</p>
@@ -330,15 +332,29 @@
<p>$B$3$l$,%$%s%?!<%W%j%?$X$N<B:]$N%Q%9$G$"$k$3$H$r3N<B$K$7$F$*$-$^$9!#(B</p>
- <h3><a name="syntaxerrors" id="syntaxerrors">$B9=J8%(%i!<(B</a></h3>
+ <h3><a name="syntaxerrors" id="syntaxerrors">$B%W%m%0%i%`%(%i!<(B</a></h3>
<p>CGI
$B%W%m%0%i%`$,<:GT$9$k$N$OBgDq!"%W%m%0%i%`<+?H$KLdBj$,$"$k>l9g$G$9!#(B
$B0lEY(B CGI $B$N;H$$J}$rM}2r$7!"A0=R$NFs$D$N8m$j$rHH$7$F$$$J$$$J$i$P!"(B
- $B$^$:4V0c$$$J$/$=$&$G$7$g$&!#%V%i%&%6$rDL$7$F%F%9%H$r9T$&A0$KI,$:!"(B
- $B%3%^%s%I%i%$%s$+$i%W%m%0%i%`$N<B9T$r;n$7$J$5$$!#(B
- $B$3$l$K$h$j!"BgDq$NLdBj$,5/$3$i$J$/$J$j$^$9!#(B</p>
+ $B$^$:4V0c$$$J$/$=$&$G$7$g$&!#%V%i%&%6$r;H$C$F%F%9%H$9$kA0$K(B
+ $B$^$:3NG'$9$k$3$H$O!"%3%^%s%I%i%$%s$+$i%W%m%0%i%`$,<B9T$G$-$k$3$H$G$9!#(B
+ $BNc$($P!"0J2<$r<B9T$7$F$_$F$/$@$5$$(B:</p>
+
+ <div class="example"><p><code>
+ cd /usr/local/apache2/cgi-bin<br />
+ ./first.pl
+ </code></p></div>
+
+ <p>(<code>perl</code> $B%$%s%?%W%j%?$O8F$P$J$$$G$/$@$5$$!#(B
+ $B%7%'%k$H(B Apache $B$,%9%/%j%W%H$N:G=i$N9T$N(B <a href="#pathinformation">$B%Q%9>pJs(B</a> $B$r;H$C$F8+$D$1$^$9!#(B)</p>
+
+ <p>$B:G=i$K%W%m%0%i%`$+$i=PNO$5$l$k$N$O(B <code>Content-Type</code> $B$r4^$_!"(B
+ $B8e$K6u9T$NB3$/(B HTTP $B%X%C%@$G$J$1$l$P$J$j$^$;$s!#B>$N$b$N$,=PNO$5$l$F$$$k(B
+ $B>l9g$O!"(BApache $B$O$3$N%W%m%0%i%`$r%5!<%P7PM3$G<B9T$7$h$&$H$7$?$H$-$K$O(B
+ <code>Premature end of script headers</code> $B%(%i!<$r=PNO$7$^$9!#>\:Y$O(B
+ $B>e5-$N(B <a href="#writing">CGI $B%W%m%0%i%`$r=q$/(B</a> $B$rFI$s$G$/$@$5$$!#(B</p>
<h3><a name="errorlogs" id="errorlogs">$B%(%i!<%m%0(B</a></h3>
@@ -350,7 +366,31 @@
$B$b$7!"$"$J$?$,%&%'%V%5%$%H$r<g:E$7$F$$$k>l=j$,(B
$B%(%i!<%m%0$N;2>H$r5v$7$F$$$J$$$J$i$P!"$-$C$HB>$N%5%$%H$G<g:E$9$k$Y$-$G$9!#(B
$B%(%i!<%m%0$NFI$_J}$r3X$V$3$H$G!"$[$H$s$IA4$F$NLdBj$,?WB.$K3NG'$5$l!"(B
- $B?WB.$K2r7h$5$l$k$H$$$&$3$H$,J,(B$B$+$k$G$7$g$&!#(B</p>
+ $B?WB.$K2r7h$5$l$k$H$$$&$3$H$,J,$+$k$G$7$g$&!#(B</p>
+
+
+ <h3><a name="suexec" id="suexec">Suexec</a></h3>
+
+
+ <p><a href="../suexec.html">suexec</a> $B%5%]!<%H%W%m%0%i%`$O(B
+ $B%P!<%A%c%k%[%9%H$d%f!<%6$N%[!<%`%G%#%l%/%H%j$N>l=j$K0M$C$F(B
+ CGI $B%W%m%0%i%`$r0c$&%f!<%68"8B$N2<$GAv$i$;$k$3$H$r2DG=$K$7$^$9!#(B
+ Suexec $B$N8"8B$N%A%'%C%/$OHs>o$K87$7$/!"$=$l$rK~$?$5$J$$>l9g$O(B
+ CGI $B%W%m%0%i%`$,(B <code>Premature end of script headers</code> $B%(%i!<$G(B
+ $B<B9T$5$l$^$;$s!#(B</p>
+
+ <p>suexec $B$r;H$C$F$$$k$+$I$&$+$rD4$Y$?$a$K$O(B <code>apachectl
+ -V</code> $B$r<B9T$7$F!"(B<code>SUEXEC_BIN</code> $B$N>l=j$rD4$Y$F$/$@$5$$!#(B
+ Apache $B$,$=$3$K(B suexec $B$N%P%$%J%j$rH/8+$7$?>l9g$O!"(Bsuexec $B$,(B
+ $B;HMQ$5$l$^$9!#(B</p>
+
+ <p>suexec $B$r40A4$KM}2r$7$F$$$J$$8B$j!";H$&$Y$-$G$O$"$j$^$;$s!#(B
+ suexec $B$rL58z$K$9$k$K$O!"(B<code>SUEXEC_BIN</code> $B$+$i;X$5$l$F$$$k(B
+ <code>suexec</code> $B%P%$%J%j$r:o=|(B ($B$+L>A0$rJQ99(B) $B$9$k$@$1$G$9!#(B
+ <a href="../suexec.html">suexec</a> $B$rFI$s$@8e$G!"$^$@$=$l$r(B
+ $B;H$$$?$$$N$G$"$l$P!"(B<code>suexec -V</code> $B$r<B9T$7$F(B suexec $B$N(B
+ $B%m%0%U%!%$%k$N0LCV$rD4$Y!"$=$N%m%0%U%!%$%k$r;H$C$F%]%j%7!<0cH?$r(B
+ $B8+$D$1$F$/$@$5$$!#(B</p>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
@@ -359,7 +399,7 @@
<p>CGI $B%W%m%0%i%_%s%0$K=,=O$9$k$H!"(B
$BN"$G5/$3$C$F$$$k$3$H$K$D$$$F99$KM}2r$9$k$3$HLr$KN)$A$^$9!#(B
- $B%V%i%&%6$H%5!<%P$,$I$N$h$&$KAj8_DL?.$9$k$+$K$D$$$F$OFC$K$=$&$G$9!#(B
+ $B%V%i%&%6$H%5!<%P$,$I$N(B$B$h$&$KAj8_DL?.$9$k$+$K$D$$$F$OFC$K$=$&$G$9!#(B
$B$J$<$J$i!"(B"Hello, World."
$B$r0u;z$9$k%W%m%0%i%`$r=q$/$3$H$O$*$*$$$K7k9=$G$9$,!"(B
$B$=$l$OFC$KM-1W$G$O$"$j$^$;$s!#(B</p>
@@ -393,7 +433,7 @@
$B$=$7$F!"8x<0$N%j%9%H$K$O$J$$$$$/$D$+$NJQ?t$,I=<($5$l$F$$$k$+$b$7$l$^$;$s!#(B
$B$5$i$K!"(BApache $B$O%G%U%)%k%H$GMQ0U$5$l$F$$$k4pK\E*$J$b$N$K(B
<a href="../env.html">$B$"$J$?<+?H$N4D6-JQ?t$r2C$($k(B</a>$B$?$a$N!"(B
- $BB?$/(B$B$N0[$J$kJ}K!$rMQ0U$7$F$7$^$9!#(B</p>
+ $BB?$/$N0[$J$kJ}K!$rMQ0U$7$F$7$^$9!#(B</p>
<div class="example"><p><code>
#!/usr/bin/perl<br />
@@ -441,7 +481,7 @@
<code>METHOD</code> $BB0@-$N@_Dj$G;XDj$7$^$9!#(B</p>
<p>CGI $B%W%m%0%i%`$O!"$=$NJ8;zNs$rLr$KN)$D>pJs$KJ,3d$9$k@UG$$,$"$j$^$9!#(B
- $B9,$$$K$b!"$=$N%G!<%?=hM}$r=u$1$k%i%$%V%i%j$d%b%8%e!<%k$,B8:_$7$^$9!#(B
+ $B9,$$$K$b!"$=$N%G!<%?(B$B=hM}$r=u$1$k%i%$%V%i%j$d%b%8%e!<%k$,B8:_$7$^$9!#(B
$B$3$l$i$O!"(BCGI $B%W%m%0%i%`$NB>$NLL$G$bF1MM$KLr$KN)$A$^$9!#(B</p>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -484,7 +524,7 @@
<p>CGI $B$NLdBj$K$D$$$F!"2C$o$C$F$$$k%a!<%j%s%0%j%9%H$^$?$O%K%e!<%9(B
$B%0%k!<%W$K<ALd$rAw$k$H$-!"5/$3$C$?$b$N!"5/$3$C$F$[$7$$$3$H!"(B
$B<B:]$K5/$3$C$?$3$H$,$I$&0c$&$+!";HMQ$7$F$$$k%5!<%P!"(B
- CGI $B%W%m%0%i%`$r5-=R$7$F$$$k8@8l$K4X$9$k==J,$J>pJs$H!"(B
+ CGI $B%W%m%0%i(B$B%`$r5-=R$7$F$$$k8@8l$K4X$9$k==J,$J>pJs$H!"(B
$B2DG=$G$"$l$PLdBj$N%3!<%I$rDs6!$9$k$h$&$K$7$F$/$@$5$$!#(B
$B$=$&$9$k$3$H$G!"LdBj$,$h$j4VC1$K8+$D$+$k$h$&$K$J$j$^$9!#(B</p>
diff --git a/docs/manual/howto/cgi.xml.meta b/docs/manual/howto/cgi.xml.meta
index 5b9018576f..ee3c3b54a4 100644
--- a/docs/manual/howto/cgi.xml.meta
+++ b/docs/manual/howto/cgi.xml.meta
@@ -7,6 +7,6 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">ja</variant>
+ <variant>ja</variant>
</variants>
</metafile>
diff --git a/docs/manual/suexec.html.ja.jis b/docs/manual/suexec.html.ja.jis
index efef23daf1..21e668aeca 100644
--- a/docs/manual/suexec.html.ja.jis
+++ b/docs/manual/suexec.html.ja.jis
@@ -22,8 +22,6 @@
<a href="./ja/suexec.html" title="Japanese">&nbsp;ja&nbsp;</a> |
<a href="./ko/suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
</div>
-<div class="outofdate">This translation may be out of date. Check the
- English version for recent changes.</div>
<p><strong>suEXEC</strong>
$B5!G=$K$h$j!"(BApache $B%f!<%6$O(B Web $B%5!<%P$r<B9T$7$F$$$k%f!<%6(B ID $B$H$O(B
@@ -437,28 +435,11 @@
</dd>
</dl>
- <p><strong>suEXEC $B@_Dj$N3NG'(B</strong>
- <br />
- suEXEC wrapper $B$r%3%s%Q%$%k$7$F%$%s%9%H!<%k$9$kA0$K!"@_DjFbMF$r(B
- <code>--layout</code> $B%*%W%7%g%s$G3NG'$G$-$^$9!#(B<br />
- $B=PNONc(B:</p>
-<div class="example"><p><code>
- suEXEC setup:<br />
- suexec binary: /usr/local/apache2/sbin/suexec<br />
- document root: /usr/local/apache2/share/htdocs<br />
- userdir suffix: public_html<br />
- logfile: /usr/local/apache2/var/log/suexec_log<br />
- safe path: /usr/local/bin:/usr/bin:/bin<br />
- caller ID: www<br />
- minimum user ID: 100<br />
- minimum group ID: 100<br />
-</code></p></div>
-
<p><strong>suEXEC wrapper
$B$N%3%s%Q%$%k$H%$%s%9%H!<%k(B</strong><br />
<code>--enable-suexec</code> $B%*%W%7%g%s$G(B suEXEC $B5!G=$rM-8z$K$9$k$H!"(B
"make" $B%3%^%s%I$r<B9T$7$?;~$K(B <code>suexec</code> $B$N%P%$%J%j(B (Apache $B<+BN$b(B)
- $B$,<+F0E*$K:n@.$5$l$^$9!#(B
+ $B$,<+F0E*$K:n@.$5(B$B$l$^$9!#(B
<br />
$B$9$Y$F$N9=@.MWAG$,:n@.$5$l$k$H!"$=$l$i$N%$%s%9%H!<%k$K$O(B
<code>make install</code> $B%3%^%s%I$,<B9T$G$-$^$9!#%P%$%J%j%$%a!<%8$N(B <code>suexec</code>
@@ -477,7 +458,7 @@
$B%7%9%F%`>e$G$3$N%A%'%C%/$,9T$J$o$l$kA0$K!"(B
suEXEC $B$,8F$V%7%9%F%`$d%i%$%V%i%j$,@H<e$G$"$k2DG=@-$O;D$j$^$9!#BP93:v$H$7$F!"(B
$B0lHL$KNI$$=,47$H$b$5$l$$$^$9$,!"(B
- $B%U%!%$%k%7%9%F(B$B%`%Q!<%_%C%7%g%s$r;H$C$F(B
+ $B%U%!%$%k%7%9%F%`%Q!<%_%C%7%g%s$r;H$C$F(B
Apache $B$N<B9T;~$N%0%k!<%W$N$_$,(B suEXEC $B$r<B9T$G$-$k$h$&$K(B
$B$9$k$N$,NI$$$G$7$g$&!#(B</p>
@@ -507,7 +488,7 @@
<p>$B5/F0;~$K!"(BApache $B$O(B <code>--sbindir</code>
$B%*%W%7%g%s$G@_Dj$5$l$?%G%#%l%/%H%j$G(B
<code>suexec</code> $B$rC5$7$^$9(B
- ($B%G%U%)%k%H$O(B "/usr/local/apache/sbin/suexec") $B!#(B
+ ($B%G%U%)%k(B$B%H$O(B "/usr/local/apache/sbin/suexec") $B!#(B
$BE,@Z$K@_Dj$5$l$?(B suEXEC $B$,$_$D$+$k$H!"(B
$B%(%i!<%m%0$K0J2<$N%a%C%;!<%8$,=PNO$5$l$^$9!#(B</p>
@@ -601,7 +582,7 @@
<p class="indent">
$B$3$l$rJQ99$9$k$N$O4m81$G$9!#$3$N;XDj$K4^$^$l$k3F%Q%9$,(B
<strong>$B?.Mj$G$-$k(B</strong>
- $B%G%#%l%/%H%j$G$"$k$3$H$r3NG'$7$F$/$@$5$$!#(B
+ $B%G%#%l%/%H%j$G$"$k$3$H$r3NG'(B$B$7$F$/$@$5$$!#(B
$B@$3&$+$i$N%"%/%;%9$K$h$j!"C/$+$,%[%9%H>e$G%H%m%$$NLZGO(B
$B$r<B9T$G$-$k$h$&$K$O$7$?$/$J$$$G$7$g$&!#(B
</p>
diff --git a/docs/manual/suexec.xml.meta b/docs/manual/suexec.xml.meta
index e0cc057f5b..eb64d9e261 100644
--- a/docs/manual/suexec.xml.meta
+++ b/docs/manual/suexec.xml.meta
@@ -7,7 +7,7 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">ja</variant>
+ <variant>ja</variant>
<variant outdated="yes">ko</variant>
</variants>
</metafile>
diff --git a/docs/manual/vhosts/name-based.html.ja.jis b/docs/manual/vhosts/name-based.html.ja.jis
index 79587fe5c5..2d6aa24468 100644
--- a/docs/manual/vhosts/name-based.html.ja.jis
+++ b/docs/manual/vhosts/name-based.html.ja.jis
@@ -23,13 +23,9 @@
<a href="../ja/vhosts/name-based.html" title="Japanese">&nbsp;ja&nbsp;</a> |
<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
</div>
-<div class="outofdate">This translation may be out of date. Check the
- English version for recent changes.</div>
-
<p>$B$3$NJ8=q$G$OL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$r$I$s$J$H$-!"(B
$B$I$&$d$C$F;H$&$+$r@bL@$7$^$9!#(B</p>
-
</div>
<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#namevip">$BL>A0%Y!<%9$H(B IP $B%Y!<%9$N%P!<%A%c%k%[%9%H$NHf3S(B</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#using">$BL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$rMxMQ$9$k(B</a></li>
@@ -65,7 +61,7 @@
$B%P!<%A%c%k%[%9%H$r9T$$$?$$>l9g$O!"$3$NJ8=q$N:G8e$NJ}$K(B
$B=q$+$l$F$$$k2r7h:v$K$J$k$+$b$7$l$J$$J}K!$r8+$F$/$@$5$$!#(B</li>
- <li>$BL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$O(B SSL $B%W%m%H%3%k$NFC(B$BD'$K$h$j!"(B
+ <li>$BL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$O(B SSL $B%W%m%H%3%k$NFCD'$K(B$B$h$j!"(B
SSL $B%;%-%e%"%5!<%P$K$O;H$($^$;$s!#(B</li>
<li>$B%*%Z%l!<%F%#%s%0%7%9%F%`$d%M%C%H%o!<%/AuCV$N$J$+$K$O!"(B
@@ -85,6 +81,8 @@
$B$3$l$O(B <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>
$B%G%#%l%/%F%#%V$G@_Dj$7$^$9!#DL>o!"(B<code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> $B$G(B
<code>*</code> $B$NB0@-$r;H$C$F%5!<%P$NA4$F$N(B IP $B%"%I%l%9$r;H$$$^$9!#(B
+ ($BNc$($P(B SSL $B$N;HMQ$J$I$G(B) $BJ#?t$N%]!<%H$r;H$&$3$H$r7W2h$7$F$$$k$N$G$"$l$P!"(B
+ $B0z?t$K(B <code>*:80</code> $B$N$h$&$K%]!<%H$b4^$a$k$h$&$K$7$F$/$@$5$$!#(B
<code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> $B%G%#%l%/%F%#%V$G(B
IP $B%"%I%l%9$r=q$$$F$b!"(B
$B<+F0E*$K%5!<%P$,$=$N(B IP $B%"%I%l%9$r%j%C%9%s$9$k$H$$$&$3$H$O$J$$$3$H$K(B
@@ -98,21 +96,21 @@
$B%G%#%l%/%F%#%V$N0z?t$O(B <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>
$B%G%#%l%/%F%#%V$N0z?t$HF1$8$K$7$F$/$@$5$$(B ($B$9$J$o$A!"(BIP $B%"%I%l%9$+!"A4$F$N%"%I%l%9$r0UL#$9$k(B
<code>*</code>)$B!#$=$l$>$l$N(B <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
- $B%G%#%l%/%F%#%V$NCf$K$O!":GDc8B!"$I$N%[%9%H$,07$o$l$k$+$r<($9(B <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> $B%G%#%l%/%F%#%V$H!"(B
+ $B%G%#%l%/%F%#%V$NCf$K$O!":GDc8B!"$I$N%[%9%H$,07$o$l$k$+$r<($9(B <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> $B%G%#%l%/%F%#%V$H(B$B!"(B
$B$=$N%[%9%HMQ$N%3%s%F%s%D$,%U%!%$%k%7%9%F%`>e$N$I$3$K$"$k$+$r<($9(B
<code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> $B%G%#%l%/%F%#%V$r(B
$B=q$/I,MW$,$"$j$^$9!#(B</p>
<div class="note"><h3>$B%a%$%s%[%9%H$O$J$/$J$j$^$9(B</h3>
- <p>$B4{$K$"$k%&%'%V%5!<%P$K%P!<%A%c%k%[%9%H$rDI2C$9$k>l9g!"(B
- $B4{B8$N%&%'%V%5!<%P$KBP$7$F$b(B <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
- $B%V%m%C%/$r:n$i$J$1$l$P$J$j$^$;$s!#$3$N%P!<%A%c%k%[%9%H$N(B
- <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> $B$H(B
- <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
- $B$O!"%0%m!<%P%k$J(B <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> $B$H(B
- <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
- $B$HF1$8$b$N$K$7$^$9!#$^$?!"$3$N%P!<%A%c%k%[%9%H$r@_Dj%U%!%$%k$NCf$G(B
- $B@hF,$KCV$$$F!"%G%U%)%k%H%[%9%H$H$7$FF0:n$9$k$h$&$K$7$^$9!#(B</p>
+ <p>$B4{$K$"$k%&%'%V%5!<%P$K%P!<%A%c%k%[%9%H$rDI2C$9$k>l9g!"(B
+ $B4{B8$N%&%'%V%5!<%P$KBP$7$F$b(B <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+ $B%V%m%C%/$r:n$i$J$1$l$P$J$j$^$;$s!#$3$N%P!<%A%c%k%[%9%H$N(B
+ <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> $B$H(B
+ <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+ $B$O!"%0%m!<%P%k$J(B <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> $B$H(B
+ <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+ $B$HF1$8$b$N$K$7$^$9!#$^$?!"$3$N%P!<%A%c%k%[%9%H$r@_Dj%U%!%$%k$NCf$G(B
+ $B@hF,$KCV$$$F!"%G%U%)%k%H%[%9%H$H$7$FF0:n$9$k$h$&$K$7$^$9!#(B</p>
</div>
<p>$B$?$H$($P!"(B<code>www.domain.tld</code> $B$rF0$+$7$F$$$F!"(B
@@ -122,26 +120,30 @@
$B$K0J2<$N$h$&$J%3!<%I$rDI2C$9$k$@$1$G$9(B</p>
<div class="example"><p><code>
- NameVirtualHost *<br />
- <br />
- &lt;VirtualHost *&gt;<br />
- <span class="indent">
- ServerName www.domain.tld<br />
- DocumentRoot /www/domain<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost *&gt;<br />
- <span class="indent">
- ServerName www.otherdomain.tld<br />
- DocumentRoot /www/otherdomain<br />
- </span>
- &lt;/VirtualHost&gt;<br />
+ NameVirtualHost *:80<br />
+ <br />
+ &lt;VirtualHost *:80&gt;<br />
+ <span class="indent">
+ ServerName www.domain.tld<br />
+ ServerAlias domain.tld *.domain.tld<br />
+ DocumentRoot /www/domain<br />
+ </span>
+ &lt;/VirtualHost&gt;<br />
+ <br />
+ &lt;VirtualHost *:80&gt;<br />
+ <span class="indent">ServerName www.otherdomain.tld<br />
+ DocumentRoot /www/otherdomain<br />
+ </span>
+ &lt;/VirtualHost&gt;<br />
</code></p></div>
<p><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> $B5Z$S(B
<code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code> $B$N$I$A$i$N>l9g$b!"(B
- * $B$NItJ,$K$OL@<(E*$K(B IP $B%"%I%l%9$r;XDj$9$k$3$H$,$G$-$^$9!#(B</p>
+ * $B$NItJ,$K$OL@<(E*$K(B IP $B%"%I%l%9$r;XDj$9$k$3$H$,$G$-$^$9!#(B
+ $BNc$($P!"$"$k(B IP $B%"%I%l%9$G$OL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$r;H$$$?$$0lJ}$G!"(B
+ $BJL$N(B IP $B%"%I%l%9$G$O!"B>$N(B IP $B%Y!<%9$N%P!<%A%c%k%[%9%H$d(B
+ $BJLAH$NL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$r;H$$$?$$>l9g!"(B
+ $B$=$&@_Dj$9$k$3$H$K$J$k$G$7$g$&!#(B</p>
<p>$BJ#?t$NL>A0$G%5!<%P%"%/%;%9$,$G$-$k$h$&$K$7$?$$$3$H$bB?$$$G$7$g$&!#(B
$B$3$N$h$&$J$3$H$O!"(B<code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code> $B%G%#%l%/%F%#%V$r(B <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
@@ -150,10 +152,10 @@
$B<!$N$h$&$K0lMw$K5s$2$i$l$?L>A0$,!"(B
$B%f!<%6$,F10l$N%&%'%V%5%$%H$H$7$FL\$K$7$F;HMQ$G$-$k%5!<%PL>$G$"$k!"(B
$B$H(B <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code>
- $B%G%#%l%/%F%#%V$G;XDj$G$-(B$B$^$9!#(B</p>
+ $B%G%#%l%/%F%#%V$G;XDj$G$-$^$9!#(B</p>
<div class="example"><p><code>
- ServerAlias domain.tld *.domain.tld
+ ServerAlias domain.tld *.domain.tld
</code></p></div>
<p><code>domain.tld</code> $B%I%a%$%s$X$NA4$F$N%[%9%H$X$N%j%/%(%9%H$O(B
@@ -221,15 +223,15 @@
<p>$B@_DjNc(B</p>
<div class="example"><p><code>
- NameVirtualHost 111.22.33.44<br />
- <br />
- &lt;VirtualHost 111.22.33.44&gt;<br />
- <span class="indent">
- ServerName www.domain.tld<br />
- ServerPath /domain<br />
- DocumentRoot /web/domain<br />
- </span>
- &lt;/VirtualHost&gt;<br />
+ NameVirtualHost 111.22.33.44<br />
+ <br />
+ &lt;VirtualHost 111.22.33.44&gt;<br />
+ <span class="indent">
+ ServerName www.domain.tld<br />
+ ServerPath /domain<br />
+ DocumentRoot /web/domain<br />
+ </span>
+ &lt;/VirtualHost&gt;<br />
</code></p></div>
<p>$B$3$NNc$K$O$I$&$$$&0UL#$,$"$k$G$7$g$&$+(B? $B$3$l$O(B
@@ -242,7 +244,7 @@
$B$H$$$&0UL#$G$9!#(B</p>
<p>$B$3$l$,F0:n$9$k$h$&$K$9$k$K$O!"(B
- $B%W(B$B%i%$%^%j$N%P!<%A%c%k%[%9%H$N%Z!<%8$K(B
+ $B%W%i%$%^%j$N%P!<%A%c%k%[%9%H$N%Z!<%8$K(B
<code>http://www.domain.tld/domain/</code> $B$X$N%j%s%/$r@_CV$7$^$9!#(B
$B$=$7$F!"%P!<%A%c%k%[%9%H$N%Z!<%8$G$O!"=c?h$JAjBP%j%s%/(B (<em>$BNc(B:</em>
"<code>file.html</code>" $B$d(B "<code>../icons/image.gif</code>")$B!"(B
diff --git a/docs/manual/vhosts/name-based.xml.meta b/docs/manual/vhosts/name-based.xml.meta
index 3630d30c9e..5c011302e2 100644
--- a/docs/manual/vhosts/name-based.xml.meta
+++ b/docs/manual/vhosts/name-based.xml.meta
@@ -8,7 +8,7 @@
<variants>
<variant>de</variant>
<variant>en</variant>
- <variant outdated="yes">ja</variant>
+ <variant>ja</variant>
<variant>ko</variant>
</variants>
</metafile>