From: André Malo <nd@apache.org>
Date: Tue, 20 May 2003 14:29:00 +0000 (+0000)
Subject: - fix forgotten online links and download link in install.xml.ja
X-Git-Tag: 2.0.46~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2482620f78669d9c5851cc084f0230df828d9c44;p=thirdparty%2Fapache%2Fhttpd.git

- fix forgotten online links and download link in install.xml.ja
- update transformation


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

diff --git a/docs/manual/bind.html.ja.jis b/docs/manual/bind.html.ja.jis
index fa90e929cfd..5ce82cbddd0 100644
--- a/docs/manual/bind.html.ja.jis
+++ b/docs/manual/bind.html.ja.jis
@@ -28,7 +28,7 @@
 <h2><a name="overview" id="overview">$B35MW(B</a></h2>
     
     
-    <table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td><ul><li><code class="module"><a href="./mod/core.html">core</a></code></li><li><code class="module"><a href="./mod/mpm_common.html">mpm_common</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td><ul><li><code class="module"><a href="./mod/core.html">core</a></code></li><li><code class="module"><a href="./mod/mpm_common.html">mpm_common</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code></li></ul></td></tr></table>
     
     
     <p>Apache $B$O5/F0;~$K!"%m!<%+%k%^%7%s$N$"$k%]!<%H$"$h$S%"%I%l%9(B
@@ -79,47 +79,69 @@
 <h2><a name="ipv6" id="ipv6">IPv6 $B$NFC5-;v9`(B</a></h2>
     
 
-    <p>APR $B$,(B IPv6 $B$r%5%]!<%H$9$k>l9g$O!"(BApache $B$O%G%U%)%k%H$G(B IPv6
-    $B$r(B listen $B$9$k%=%1%C%H$r:n$j$^$9(B ($BNc$($P(B Listen $B%G%#%l%/%F%#%V$G(B
-    IP $B%"%I%l%9$,L5;XDj$N>l9g(B)$B!#(B
-    $B$D$^$j!"(BAPR $B$,(B IPv6 $B$r%5%]!<%H$7$F$$$k>l9g!"(B</p>
+    <p>$BB?$/$N%W%i%C%H%[!<%`$G(B IPv6 $B$,%5%]!<%H$5$l$F$-$F$$$F!"(B
+    APR $B$O$3$l$i$N$[$H$s$I$G(B IPv6 $B$r%5%]!<%H$7$F$$$k$N$G!"(B
+    Apache $B$O(B IPv6 $B%=%1%C%H$r3d$jEv$F$F(B IPv6
+    $B7PM3$GAw$i$l$F$-$?%j%/%(%9%H$r07$&$3$H$,$G$-$^$9!#(B</p>
+
+    <p>IPv6 $B%=%1%C%H$,(B IPv4 $B$H(B IPv6 $B%3%M%/%7%g%s$NN>J}$r07$&$3$H$,$G$-$k$+(B
+    $B$I$&$+$O!"(BApache $B4IM}<T$K$H$C$FLq2p$JLdBj$G$9!#(B
+    IPv4 $B%3%M%/%7%g%s$r(B IPv6 $B%=%1%C%H$G07$&>l9g$O!"(B
+    IPv4 $B%^%C%W$5$l$?(B IPv6 $B%"%I%l%9$r;HMQ$7$F$$$F!"(B
+    $B$[$H$s$I$N%W%i%C%H%[!<%`$G$O%G%U%)%k%H$G;HMQ2DG=$G$9$,!"(B
+    FreeBSD, NetBSD, OpenBSD $B$G$O!"%7%9%F%`A4BN$H$7$F$N%]%j%7!<$H$N@09g@-$+$i!"(B
+    $B%G%U%)%k%H$G$O;HMQIT2D$K@_Dj$5$l$F$$$^$9!#(B
+    $B$3$l$i$N%G%U%)%k%H$G;HMQIT2D$N%W%i%C%H%[!<%`$G$"$C$F$b!"(B
+    $BFCJL$J@_Dj%Q%i%a!<%?$G(B Apache $B$N5sF0$rJQ2=$5$;$k$3$H$,$G$-$^$9!#(B</p>
+
+    <p>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$F!"C1=c$K(B
+    <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> 
+    $B%G%#%l%/%F%#%V$G<!$N$h$&$K@_Dj$7$^$9!#(B</p>
 
     <div class="example"><p><code>
       Listen 80
     </code></p></div>
 
-    <p>$B$O!"<!$HF1$80UL#$K$J$j$^$9!#(B</p>
+    <p><code>--enable-v4-mapped</code> $B$G$O!"(BApache
+    $B$N@8@.$9$k%G%U%)%k%H$N@_Dj%U%!%$%kCf$N(B
+    <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
+    $B%G%#%l%/%F%#%V$O$3$N7A<0$r;HMQ$7$F$$$^$9!#(B
+    <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
+    $B$G$9$+$i!"$*$=$i$/$*<j85$N(B Apache $B$O$3$N@_Dj$G%S%k%I$5$l$F$$$k$G$7$g$&!#(B</p>
 
-    <div class="example"><p><code>
-      Listen [::]:80
-    </code></p></div>
-
-    <p>APR $B$,(B IPv6 $B$r%5%]!<%H$7$F$$$J$$>l9g$O!"(B</p>
+    <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
+    IPv4 $B%"%I%l%9$r;XDj$7$F$/$@$5$$!#(B</p>
 
     <div class="example"><p><code>
-      Listen 80
+      Listen 0.0.0.0:80<br />
+      Listen 192.170.2.1:80
     </code></p></div>
 
-    <p>$B$O!"<!$HF1$80UL#$K$J$j$^$9!#(B</p>
+    <p>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%*%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</p>
 
     <div class="example"><p><code>
-      Listen 0.0.0.0:80
+       Listen [::]:80<br />
+       Listen 0.0.0.0:80
     </code></p></div>
 
-    <p>NetBSD $BEy$N$$$/$D$+$N%W%i%C%H%[!<%`$G$O!"(BIPv6
-    $B$N%o%$%k%I%+!<%I%"%I%l%9(B ($B!V(B::$B!W(B) $B$N%P%$%s%I$G$O(B IPv4
-    $B%$%s%?!<%U%'!<%9$K%3%M%/%7%g%s$rD%$l$^$;$s!#(B
-    $B$3$N$h$&$J>u67$G$O!"<!$N$h$&$KJ#?t$N(B Listen $B%G%#%l%/%F%#%V$,I,MW$K$J$j$^$9!#(B
-    </p>
-
-    <div class="example"><p><code>
-      Listen 0.0.0.0:80<br />
-      Listen [::]:0
-    </code></p></div>
+    <p><code>--disable-v4-mapped</code> $B$G$O!"(BApache
+    $B$N@8@.$9$k%G%U%)%k%H$N@_Dj%U%!%$%kCf$N(B
+    <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
+    $B%G%#%l%/%F%#%V$O$3$N7A<0$r;HMQ$7$F$$$^$9!#(B
+    <code>--disable-v4-mapped</code> $B$O!"(B
+    FreeBSD, NetBSD, OpenBSD $B%W%i%C%H%[!<%`$G$N%G%U%)%k%H$G$9!#(B</p>
 
-    <p>Apache $B$O8=:_$3$l$r<+F08!=P$9$k$3$H$,$G$-$J$$$N$G!"(B
-    $B$=$N$h$&$J>l9g$O(B
-    Listen $BL?NaJ8$O4IM}<T$,<jF0$GJT=8$7$J$$$H$$$1$^$;$s!#(B</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="virtualhost" id="virtualhost">$B%P!<%A%c%k%[%9%H$KBP$7$F$I$&F/$/$N$+(B</a></h2>
diff --git a/docs/manual/content-negotiation.html.ja.jis b/docs/manual/content-negotiation.html.ja.jis
index 5f7bede7ea6..78a55b19cec 100644
--- a/docs/manual/content-negotiation.html.ja.jis
+++ b/docs/manual/content-negotiation.html.ja.jis
@@ -199,16 +199,17 @@
 <h3><a name="multiviews" id="multiviews">Multiviews</a></h3>
 
     <p><code>MultiViews</code> $B$O%G%#%l%/%H%jKh$N%*%W%7%g%s$G!"(B
+    <code>httpd.conf</code>$B%U%!%$%k$N(B
     <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>, 
     <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>, 
     <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>
-    $B$d!"(B(<code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code>
+    $B%;%/%7%g%sCf$d!"(B(<code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code>
     $B$,E,@Z$JCM$K(B $B@_Dj$5$l$F$$$k$H(B) <code>.htaccess</code>
     $B%U%!%$%k$G(B <code class="directive"><a href="./mod/core.html#options">Options</a></code>
     $B%G%#%l%/%F%#%V$K$h$C$F@_Dj$9$k$3$H$,$G$-$^$9!#(B
     <code>Options All</code> $B$O(B
     <code>MultiViews</code>
-    $B$r%;%C%H$7$J$$$3$H$KCm0U$7$F$/$@$5$$!#L@<(E*$K(B
+    $B$r%;%C%H$7$J$$$3$H$KCm0U$7$F$/$@$5$$!#L@(B$B<(E*$K(B
     $B$=$NL>A0$r=q$/I,MW$,$"$j$^$9!#(B</p>
 
     <p><code>MultiViews</code> $B$N8z2L$O0J2<$N$h$&$K$J$j$^$9(B:
@@ -253,7 +254,7 @@
     $B!V:GE,$J!W(B variant $B$r7hDj$9$k$?$a$KFs$D$NJ}K!$N(B
     $B$I$A$i$+$r5/F0$7$^$9!#(B
     Apache $B$N%3%s%F%s%H%M%4%7%(!<%7%g%s$N5!G=$r;H$&$?$a$K!"(B
-    $B$I$N$h$&$K$7$F$3$ND4Dd$,9T$o$l$k$+>\:Y$rCN$kI,MW$O$"$j$^$;$s!#(B
+    $B$I$N$h$&$K$7(B$B$F$3$ND4Dd$,9T$o$l$k$+>\:Y$rCN$kI,MW$O$"$j$^$;$s!#(B
     $B$7$+$7$J$,$i!"$3$NJ8=q$N;D$j$G$O4X?4$N$"$k?M$N$?$a$K!"(B
     $B;HMQ$5$l$F$$$kJ}K!$K$D$$$F@bL@$7$F$$$^$9!#(B</p>
 
@@ -305,7 +306,7 @@
 	$B%X%C%@%U%#!<%k%I$GM%@h798~$r;XDj$7$^$9!#(B
 	$BMWAG$=$l$>$l$KIJ<A?tCM$r;}$?$;$k$3$H$,$G$-$^$9!#(B
 	variants $B$O(B 0 $B$+(B 1 $B$D$+$=$l0J>e$N8@8l$H(B
-	$B4XO"$E$1$k$3$H$,$G$-$^$9!#(B</td>
+	$B4XO"$E$1$k$3$H$,$G$-(B$B$^$9!#(B</td>
       </tr>
 
       <tr valign="top">
@@ -363,7 +364,7 @@
 	  <code class="directive"><a href="./mod/mod_negotiation.html#languagepriority">LanguagePriority</a></code> 
 	  $B%G%#%l%/%F%#%V$N8@8l=g$G:GE,$J8@8l$N(B variant $B$rA*$S$^$9!#(B</li>
 
-	  <li>$B:G9b!V%l%Y%k!W$N%a%G%#%"%Q%i%a!<%?(B
+	  <li>$B:G(B$B9b!V%l%Y%k!W$N%a%G%#%"%Q%i%a!<%?(B
 	  (text/html $B%a%G%#%"%?%$%W$N%P!<%8%g%s$rM?$($k$?$a$K;H$o$l$^$9(B)
 	  $B$r;}$D(B variant $B$rA*$S$^$9!#(B</li>
 
@@ -406,7 +407,7 @@
       $B%V%i%&%6$d%-%c%C%7%e$O$3$N>pJs$r;H$&$3$H$,$G$-$^$9(B)$B!#(B
       $B0J>e$G=*$o$j!#(B</li>
 
-      <li>$B$3$3$KMh$?$H$$$&$3$H$O!"(Bvariant $B$,0l(B$B$D$bA*Br$5$l$J$+$C$?(B
+      <li>$B$3$3$KMh$?$H$$$&$3$H$O!"(Bvariant $B$,0l$D$bA*Br$5$l$J$+$C$?(B
       ($B%V%i%&%6$,5vMF$9$k$b$N$,$J$+$C$?$?$a(B) $B$H$$$&$3$H$G$9!#(B
       406 $B%9%F!<%?%9(B ("No Acceptable representation" $B$r0UL#$9$k(B)
       $B$,!"MxMQ2DG=$J(B variant $B$N%j%9%H$N$D$$$?(B HTML 
@@ -450,8 +451,8 @@
 </code></p></div>
     <p>$B$3$&$9$k$3$H$NA@$$$O!"L@<(E*$K%j%9%H$7$F$$$k%?%$%W$,M%@h$5$l$k$1$l$I$b!"(B
     $B0[$J$kI=8=$,MxMQ2DG=$G$"$l$P$=$l$G$bNI$$!"$H$$$&$3$H$G$9!#(B
-    $B$7$+$7$J$,$i!">e$N4pK\E*$J%"%k%4%j%:%`$G$O!"(B
-    */* $B%o%$%k%I%+(B$B!<%I$OB>$NA4$F$N%?%$%W$HA4$/F1Ey$J$N$GM%@h$5$l$^$;$s!#(B
+    $B$7$+$7$J$,$i!">e$N4p(B$BK\E*$J%"%k%4%j%:%`$G$O!"(B
+    */* $B%o%$%k%I%+!<%I$OB>$NA4$F$N%?%$%W$HA4$/F1Ey$J$N$GM%@h$5$l$^$;$s!#(B
     $B%V%i%&%6$O(B */* $B$K$b$C$HDc$$IJ<A(B ($BM%@h(B) 
     $BCM$rIU$1$F%j%/%(%9%H$rAw$k$Y$-$J$N$G$9!#Nc$($P(B:</p>
 <div class="example"><p><code>
@@ -486,7 +487,7 @@
     $B$+(B "Multiple Choices" $B%l%9%]%s%9$r%/%i%$%"%s%H$KJV$7$^$9!#(B
     $B$3$l$i$N%(%i!<%a%C%;!<%8$rJV$5$J$$$h$&$K!"(B
     $B$3$N$h$&$J>l9g$K$O(B Apache $B$,(B Accept-Language $B$rL5;k$7$F!"(B
-    $B%/%i%$%"%s%H$N%j%/%(%9%H$KL@<(E*$K$O9gCW$7$J$$%I%-%e%a%s%H$r(B
+    $B%/%i%$%"%s%H$N%j%/%(%9%H$KL@<(E*$K$O9gCW$7$J$$%I(B$B%-%e%a%s%H$r(B
     $BDs6!$9$k$h$&$K@_Dj$G$-$^$9!#(B
     <code class="directive"><a href="./mod/mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority</a></code>
     $B%G%#%l%/%F%#%V$O!"$3$l$i$N%(%i!<$N0l$D$+N>J}$r%*!<%P!<%i%$%I$9$k$?$a$K(B
@@ -661,8 +662,8 @@ RVSA/1.0 $B$N<BAu$G$O!":GE,$J(B variant $B$,8+$D$+$k$^$G!"(B
     $B4V0c$C$?1~Ez$rJV$7$F$7$^$&$H$$$&$3$H$K$J$j$+$M$^$;$s!#(B
     $B$3$l$rKI$0$?$a$K!"(BApache $B$O%3%s%F%s%H%M%4%7%(!<%7%g%s$N(B
     $B8e$KJV$5$l$?1~EzA4$F$K!"(BHTTP/1.0 $B%/%i%$%"%s%H$G$O(B
-    $B%-%c%C%7%eIT2DG=$N0u$r$D$1$^$9!#(B
-    $B$^$?!"%M%4%7%(!<%7%g%s$5$l$?1~Ez$N(B$B%-%c%C%7%e$r2DG=$K$9$k(B
+    $B%-%c%C%7%eIT2DG=$N0u$r$D(B$B$1$^$9!#(B
+    $B$^$?!"%M%4%7%(!<%7%g%s$5$l$?1~Ez$N%-%c%C%7%e$r2DG=$K$9$k(B
     HTTP/1.1 $B%W%m%H%3%k$N5!G=$b(B Apache $B$O%5%]!<%H$7$^$9!#(B</p>
 
     <p>HTTP/1.0 $B=`5r$N%/%i%$%"%s%H$+$i$N%j%/%(%9%H$KBP$7$F$O!"(B
diff --git a/docs/manual/index.html.ja.jis b/docs/manual/index.html.ja.jis
index 605f9a6000f..2a430bb6969 100644
--- a/docs/manual/index.html.ja.jis
+++ b/docs/manual/index.html.ja.jis
@@ -1,224 +1,82 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head>
-<!-- English revision: 1.44 -->
-
-<title>Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0 $B%I%-%e%a%s%H(B</title><link
-href="./style/css/manual.css" rel="stylesheet" media="all"
-type="text/css" title="Main stylesheet" />
-<style type="text/css" media="all">
-<!--
-/* undo move content left */
-div#page-content {
-    margin-right: 2em;
-    padding-right: 0px;
-    margin-left: 2em;
-}
-
-th {
-    background-color: #e5ecf3;
-}
-
-td {
-    padding-top: .4em;
-}
--->
-</style>
-
-<link
-href="./images/favicon.ico" rel="shortcut icon" /></head><body
-id="manual-page"><div id="page-header"><p class="menu"><a
-href="./mod/">$B%b%8%e!<%k(B</a> | <a
-href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a>
-| <a href="./glossary.html">$BMQ8l(B</a> | <a
-href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP
-Server Version 2.0</p><img alt="" src="./images/feather.gif"
-/></div><div class="up"><a href="./"><img title="&lt;-" alt="&lt;-"
-src="./images/left.gif" /></a></div><div id="path"><a
-href="http://www.apache.org/">Apache</a> &gt; <a
-href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> &gt; <a
-href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> &gt; <a
-href="./">$B%P!<%8%g%s(B 2.0</a></div>
-
-<div id="page-content">
-<h1>Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0 $B%I%-%e%a%s%H(B</h1>
-
-
-
-<div align="center"><form method="post" action="http://search.apache.org/">
-              <input type="hidden" name="what"
-              value="httpd.apache.org" /> <input type="hidden"
-              name="results" value="20" /> <input type="hidden"
-              name="version" value="2" /> <input type="text"
-              name="keyword" size="20" /> <input type="submit"
-              value="Search" />
-            </form></div>
-
-
-<table style="border: 0">
-<tr><td style="width: 33%">
-
-<table style="width: 100%">
-<tr>
-<th>$B%j%j!<%9%N!<%H(B</th>
-</tr>
-<tr><td>
-<a href="new_features_2_0.html">Apache 2.0 $B$N?75!G=(B</a></td></tr>
-              
-<tr><td><a href="upgrading.html">Apache 2.0
-                 $B$X$N%"%C%W%0%l!<%I(B</a> </td></tr>
-              
-<tr><td><a href="license.html">Apache $B$N%i%$%;%s%9(B</a> </td>
-
-</tr>
-<tr><td>&nbsp;</td></tr>
-<tr>
-<th>$B%j%U%!%l%s%9%^%K%e%"%k(B</th>
-</tr>
-
-                <tr><td><a href="install.html">$B%3%s%Q%$%k$H%$%s%9%H!<%k(B
-                </a> </td></tr>
-              
-                <tr><td><a href="invoking.html">$B5/F0(B</a> </td></tr>
-              
-                <tr><td><a href="stopping.html">$B=*N;$H:F5/F0(B
-                </a> </td></tr>
-              
-                <tr><td><a href="mod/directives.html">$B<B9T$N@_DjMQ%G%#%l%/%F%#%V(B
-                </a> </td></tr>
-              
-                <tr><td><a href="mod/quickreference.html">$B%G%#%l%/%F%#%V(B
-                $B%/%$%C%/%j%U%!%l%s%9(B</a></td></tr>
-
-                <tr><td><a href="mod/">$B%b%8%e!<%k(B</a> </td></tr>
-              
-                <tr><td><a href="mpm.html">$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B
-                (MPM)</a> </td></tr>
-              
-                <tr><td><a href="filter.html">$B%U%#%k%?(B</a> </td></tr>
-              
-                <tr><td><a href="handler.html">$B%O%s%I%i(B</a> </td></tr>
-              
-                <tr><td><a href="programs/">$B%5!<%P$H%5%]!<%H%W%m%0%i%`(B
-                </a> </td></tr>
-              
-                <tr><td><a href="glossary.html">$BMQ8l=8(B</a> </td></tr>
-</table>
-</td>
-
-<td style="width: 33%">
-<table style="width: 100%">
-<tr>
-<th>$B%f!<%6$N<j0z(B</th>
-</tr>
-
-                <tr><td><a href="bind.html">$B%"%I%l%9$H%]!<%H$N%P%$%s%I(B</a></td></tr>
-              
-                <tr><td><a href="configuring.html">$B@_Dj%U%!%$%k(B
-                </a> </td></tr>
-
-                <tr><td><a href="sections.html">$B%;%/%7%g%s$N@_Dj(B
-                </a></td></tr>
-              
-                <tr><td><a href="content-negotiation.html">
-		$B%3%s%F%s%H%M%4%7%(!<%7%g%s(B</a> </td></tr>
-              
-                <tr><td><a href="dso.html">$BF0E*6&M-%*%V%8%'%/%H(B
-                (DSO)</a> </td></tr>
-              
-                <tr><td><a href="env.html">$B4D6-JQ?t(B</a>
-                </td></tr>
-              
-              
-                <tr><td><a href="logs.html">$B%m%0%U%!%$%k(B</a> </td></tr>
-              
-                <tr><td><a href="urlmapping.html">URL
-                $B$r%U%!%$%k%7%9%F%`$K%^%C%W$9$k(B</a> </td></tr>
-              
-                <tr><td><a href="misc/perf-tuning.html">$B@-G=$K4X$9$k%R%s%H(B
-                </a> </td></tr>
-              
-                <tr><td><a href="misc/security_tips.html">$B%;%-%e%j%F%#>pJs(B
-                </a> </td></tr>
-              
-                <tr><td><a href="server-wide.html">$B%5!<%PA4BN$N@_Dj(B
-                </a> </td></tr>
-              
-                <tr><td><a href="ssl/">SSL/TLS $B$K$h$k0E9f2=(B</a></td></tr>
-              
-                <tr><td><a href="suexec.html">CGI $B$N(B Suexec
-                $B<B9T(B</a> </td></tr>
-              
-                <tr><td><a href="misc/rewriteguide.html">URL Rewriting
-                $B$N%,%$%I(B</a> </td></tr>
-              
-                <tr><td><a href="vhosts/">$B%P!<%A%c%k%[%9%H(B</a> </td></tr>
-
-</table>
-</td>
-<td style="width: 33%">
-<table style="width: 100$">
-<tr>
-<th>How-To / $B%A%e!<%H%j%"%k(B</th>
-</tr>
-
-                <tr><td><a href="howto/auth.html">
-                $BG'>Z!">5G'!"%"%/%;%9@)8f(B</a></td></tr>
-              
-                <tr><td><a href="howto/cgi.html">CGI
-		$B$K$h$kF0E*%3%s%F%s%D(B</a> </td></tr>
-
-                <tr><td><a
-                href="howto/htaccess.html"><code>.htaccess</code> $B%U%!%$%k(B</a>
-                </td></tr>
-
-                <tr><td><a href="howto/ssi.html">Server Side
-                Includes (SSI)</a> </td></tr>
-              
-                <tr><td><a href="howto/public_html.html">$B%f!<%6@lMQ%G%#%l%/%H%j(B
-		(<code>public_html</code>)</a> </td></tr>
-              
-
-<tr><td>&nbsp;</td></tr>
-<tr>
-<th>$B%W%i%C%H%U%)!<%`8GM-$N>pJs(B</th>
-</tr>
-                <tr><td><a href="platform/windows.html">Microsoft
-                Windows</a> </td></tr>
-
-                <tr><td><a href="platform/netware.html">Novell NetWare
-                </a> </td></tr>
-
-                <tr><td><a href="platform/ebcdic.html">EBCDIC $BHG(B
-                </a> </td></tr>
-
-<tr><td>&nbsp;</td></tr>
-<tr>
-<th>$B$=$NB>(B</th>
-</tr>
-
-                <tr><td><a href="faq/">$B$h$/$"$k<ALd(B (FAQ)</a>
-                </td></tr>
-              
-                <tr><td><a href="sitemap.html">$B%5%$%H%^%C%W(B</a>
-                </td></tr>
-              
-                <tr><td><a href="misc/tutorials.html">$B%A%e!<%H%j%"%k(B</a>
-                </td></tr>
-              
-                <tr><td><a href="developer/">$B3+H/<T$N$?$a$N%I%-%e%a%s%H(B
-                </a> </td></tr>
-              
-                <tr><td><a href="misc/">$B$=$NB>(B</a> </td></tr>
-</table>
-
-</td></tr></table>
-
-</div>    
-<div id="footer"><p class="apache">Maintained by the <a
-href="http://httpd.apache.org/docs-project/">Apache HTTP Server
-Documentation Project</a></p><p class="menu"><a
-href="./mod/">$B%b%8%e!<%k(B</a> | <a
-href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a>
-| <a href="./glossary.html">$BMQ8l(B</a> | <a
-href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0 $B%I%-%e%a%s%H(B - Apache HTTP $B%5!<%P(B</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="index-page">
+<div id="page-header">
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="http://httpd.apache.org/docs-project/"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> &gt; <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a></div>
+<div id="page-content"><h1>Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0 $B%I%-%e%a%s%H(B</h1>
+<form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Google Search" type="submit" /><input value="10" name="num" type="hidden" /><input value="ja" name="hl" type="hidden" /><input value="iso-2022-jp" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="Apache 2.0" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
+<table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">$B%j%j!<%9%N!<%H(B</a></h2>
+<ul><li><a href="new_features_2_0.html">Apache 2.0 $B$N?75!G=(B</a></li>
+<li><a href="upgrading.html">1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B</a></li>
+<li><a href="license.html">Apache $B%i%$%;%s%9(B</a></li>
+</ul>
+</div><div class="category"><h2><a name="manual" id="manual">$B%j%U%!%l%s%9%^%K%e%"%k(B</a></h2>
+<ul><li><a href="install.html">$B%3%s%Q%$%k$H%$%s%9%H!<%k(B</a></li>
+<li><a href="invoking.html">$B5/F0(B</a></li>
+<li><a href="stopping.html">$B=*N;$H:F5/F0(B</a></li>
+<li><a href="mod/directives.html">$B<B9T$N@_DjMQ%G%#%l%/%F%#%V(B</a></li>
+<li><a href="mod/quickreference.html">$B%G%#%l%/%F%#%V(B $B%/%$%C%/%j%U%!%l%s%9(B</a></li>
+<li><a href="mod/">$B%b%8%e!<%k(B</a></li>
+<li><a href="mpm.html">$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM)</a></li>
+<li><a href="filter.html">$B%U%#%k%?(B</a></li>
+<li><a href="handler.html">$B%O%s%I%i(B</a></li>
+<li><a href="programs/">$B%5!<%P$H%5%]!<%H%W%m%0%i%`(B</a></li>
+<li><a href="glossary.html">$BMQ8l=8(B</a></li>
+</ul>
+</div></td><td><div class="category"><h2><a name="usersguide" id="usersguide">$B%f!<%6$N<j0z(B</a></h2>
+<ul><li><a href="bind.html">$B%"%I%l%9$H%]!<%H$N%P%$%s%I(B</a></li>
+<li><a href="configuring.html">$B@_Dj%U%!%$%k(B</a></li>
+<li><a href="sections.html">$B%;%/%7%g%s$N@_Dj(B</a></li>
+<li><a href="content-negotiation.html">$B%3%s%F%s%H%M%4%7%(!<%7%g%s(B</a></li>
+<li><a href="dso.html">$BF0E*6&M-%*%V%8%'%/%H(B (DSO)</a></li>
+<li><a href="env.html">$B4D6-JQ?t(B</a></li>
+<li><a href="logs.html">$B%m%0%U%!%$%k(B</a></li>
+<li><a href="urlmapping.html">URL $B$r%U%!%$%k%7%9%F%`$K%^%C%W$9$k(B</a></li>
+<li><a href="misc/perf-tuning.html">$B@-G=$K4X$9$kD4@0(B</a></li>
+<li><a href="misc/security_tips.html">$B%;%-%e%j%F%#>pJs(B</a></li>
+<li><a href="server-wide.html">$B%5!<%PA4BN$N@_Dj(B</a></li>
+<li><a href="ssl/">SSL/TLS $B$K$h$k0E9f2=(B</a></li>
+<li><a href="suexec.html">CGI $B$N(B Suexec $B<B9T(B</a></li>
+<li><a href="misc/rewriteguide.html">URL Rewriting $B$N<j0z$-(B</a></li>
+<li><a href="vhosts/">$B%P!<%A%c%k%[%9%H(B</a></li>
+</ul>
+</div></td><td class="col3"><div class="category"><h2><a name="howto" id="howto">How-To / $B%A%e!<%H%j%"%k(B</a></h2>
+<ul><li><a href="howto/auth.html">$BG'>Z!">5G'!"%"%/%;%9@)8f(B
+    </a></li>
+<li><a href="howto/cgi.html">CGI: $BF0E*%3%s%F%s%D(B</a></li>
+<li><a href="howto/htaccess.html">.htaccess $B%U%!%$%k(B</a></li>
+<li><a href="howto/ssi.html">Server Side Includes (SSI)</a></li>
+<li><a href="howto/public_html.html">$B%f!<%6@lMQ%G%#%l%/%H%j(B
+    (public_html)</a></li>
+</ul>
+</div><div class="category"><h2><a name="platform" id="platform">$B%W%i%C%H%U%)!<%`8GM-$N>pJs(B</a></h2>
+<ul><li><a href="platform/windows.html">Microsoft Windows</a></li>
+<li><a href="platform/netware.html">Novell NetWare</a></li>
+<li><a href="platform/ebcdic.html">EBCDIC $BHG(B</a></li>
+</ul>
+</div><div class="category"><h2><a name="other" id="other">$B$=$NB>(B</a></h2>
+<ul><li><a href="faq/">$B$h$/$"$k<ALd(B (FAQ)</a></li>
+<li><a href="sitemap.html">$B%5%$%H%^%C%W(B</a></li>
+<li><a href="developer/">$B3+H/<T$N$?$a$N%I%-%e%a%s%H(B</a></li>
+<li><a href="misc/">$B$=$NB>(B</a></li>
+</ul>
+</div></td></tr></table></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/index.xml.meta b/docs/manual/index.xml.meta
index 70310a18cc7..7f80a3e7b92 100644
--- a/docs/manual/index.xml.meta
+++ b/docs/manual/index.xml.meta
@@ -9,7 +9,7 @@
     <variant>de</variant>
     <variant>en</variant>
     <variant htmlonly="yes">fr</variant>
-    <variant htmlonly="yes">ja</variant>
+    <variant>ja</variant>
     <variant>ko</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/install.html.ja.jis b/docs/manual/install.html.ja.jis
index f51f96fb2a6..18cb7077ee7 100644
--- a/docs/manual/install.html.ja.jis
+++ b/docs/manual/install.html.ja.jis
@@ -41,7 +41,7 @@
 <li><img alt="" src="./images/down.gif" /> <a href="#install">$B%$%s%9%H!<%k(B</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#customize">$B%+%9%?%^%$%:(B</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#test">$B%F%9%H(B</a></li>
-</ul><h3>$B;2>H(B</h3><ul class="seealso"><li><a href="invoking.html">Apache $B$N5/F0(B</a></li><li><a href="stopping.html">$BDd;_$H:F5/F0(B</a></li></ul></div>
+</ul><h3>$B;2>H(B</h3><ul class="seealso"><li><a href="invoking.html">Apache$B$N5/F0(B</a></li><li><a href="stopping.html">Apache$B$NDd;_$H:F5/F0(B</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="overview" id="overview">$B35MW(B ($B$;$C$+$A$J?M8~$1(B)</a></h2>
@@ -95,7 +95,7 @@
       </tr>
     </table>
 
-    <p><em>NN</em> $B$O:G?7$N%^%$%J!<%P!<%8%g%s%J%s%P!<$K!"(B
+    <p><em>NN</em> $B$O:G?7$N%^%$%J!<%P!<%8%g%s%J%s%P!<(B$B$K!"(B
     <em>PREFIX</em> $B$O%$%s%9%H!<%k$9$k%5!<%P$G$N%U%!%$%k%7%9%F%`$N%Q%9$K!"(B
     $BCV$-49$($F$/$@$5$$!#(B<em>PREFIX</em> $B$r;XDj$7$J$+$C$?>l9g$O!"(B
     $B%G%U%)%k%H$N(B <code>/usr/local/apache2</code> $B$K$J$j$^$9!#(B</p>
@@ -150,9 +150,10 @@
 <div class="section">
 <h2><a name="download" id="download">$B%@%&%s%m!<%I(B</a></h2>
 
-    <p>Apache $B$O$$$/$D$+$N%_%i!<$N%j%9%H$,$"$k(B <a href="http://httpd.apache.org/download.cgi">Apache HTTP
-    $B%5!<%P%@%&%s%m!<%I%5%$%H(B</a>$B$G%@%&%s%m!<%I$G$-$^$9!#(B
-    $B$=$3$K$O!"%j%j!<%9$5$l$?:G?7$N0BDjHG$,$"$j$^$9!#(B</p>
+    <p>Apache $B$O(B <a href="http://httpd.apache.org/download.cgi">Apache Software
+    Foundation $B%@%&%s%m!<%I%5%$%H(B</a>$B$+$i%@%&%s%m!<%I$G$-$^$9$7!"(B
+    $BF1$8>l=j$K4v$D$+$N%_%i!<%5%$%H$b%j%9%H$7$F$$$^$9!#(B
+    $B$3$3$+$i:G?7$N0BDjHG$,<j$KF~$j$^$9!#(B</p>
 
     <p>$B%@%&%s%m!<%I8e!"FC$K%_%i!<%5%$%H$r;H$C$?>l9g$O!"(B
     $B%@%&%s%m!<%I$7$?$b$N$,(B Apache HTTP 
@@ -160,8 +161,8 @@
     $B8!>Z$9$k$3$H$,=EMW$G$9!#$3$l$O%@%&%s%m!<%I$7$?(B tarball $B$N(B PGP $B=pL>$r(B
     $B%F%9%H$9$k$3$H$K$h$C$F8!>Z$7$^$9!#(B
     $B$3$l$OFs$D$NCJ3,$,$"$j$^$9!#(B
-    $B$^$:(B <a href="http://www.apache.org/dist/httpd/"><code>KEYS</code></a>
-    $B%U%!%$%k$b(B Apache $BG[I[%5%$%H(B
+    $B$^$:(B <a href="http://www.apache.org/dist/httpd/KEYS"><code>KEYS</code></a>
+    $B%U%!%$%k$r(B <a href="http://www.apache.org/dist/httpd/">Apache $BG[I[%5%$%H(B</a>
     $B$+$i%@%&%s%m!<%I$7$F$/$@$5$$!#(B(<code>KEYS</code> $B%U%!%$%k<+BN$,(B
     $B2~cb$5$l$F$$$J$$$3$H$r3N<B$K$9$k$?$a$K!"0JA0$N(B Apache 
     $BG[I[$+$i<h$j=P$7$?%U%!%$%k$r;H$C$?$j!"(B
@@ -178,9 +179,9 @@
     <p>$B<!$N%9%F%C%W$G$O!"(Btarball $B$r(B PGP $B=pL>$G%F%9%H$7$^$9!#(B
     PGP $B=pL>$OI,$:(B <a href="http://httpd.apache.org/download.cgi">$B%a%$%s$N(B Apache
     $B%&%'%V%5%$%H(B</a>$B$+$i<hF@$7$F$/$@$5$$!#(B
-    $B=pL>%U%!%$%k$X$N%j%s%/$OBP1~$9$k%@%&%s%m!<%I%j%s%/$N<!$K$"$j!"(B
+    $B=pL>%U%!%$%k$X$N%j%s%/$OBP1~$9$k%@%&%s%m!<%I%j%s%/$NNY$K$"$j!"$^$?(B
     <a href="http://www.apache.org/dist/httpd/">Apache
-    $BG[I[%5%$%H(B</a>$B$NFCDj$N%G%#%l%/%H%j$K$b$"$k$+$b$7$l$^$;$s!#(B
+    $BG[I[%5%$%H(B</a>$B$NFCDj$N%G%#%l%/%H%j$G8+$D$1$k$3$H$b$G$-$k$G$7$g$&!#(B
     $B=pL>%U%!%$%k$NL>A0$O!"%=!<%9%U%!%$%k$N(B tarball $B$HF1$8L>A0$K(B
     <code>.asc</code> $B$rIU2C$7$?$b$N$K$J$C$F$$$^$9!#(B
     $B0J2<$N%3%^%s%I(B ($B$d$C$Q$j(B pgp $B$N%P!<%8%g%s$K0MB8(B) $B$N$I$l$+0l$D$G!"(B
@@ -444,7 +445,7 @@
       <dt><code>--disable-<em>MODULE</em></code></dt>
 
       <dd>$BDL>o$O%3%s%Q%$%k$5$l$F%$%s%/%k!<%I$5$l$k(B
-      <em>MODULE</em> $B%b(B$B%8%e!<%k$r=|5n$7$^$9!#(B</dd>
+      <em>MODULE</em> $B%b%8%e!<%k$r=|5n$7$^$9!#(B</dd>
 
       <dt><code>--enable-modules=<em>MODULE-LIST</em></code></dt>
 
@@ -492,7 +493,7 @@
     $B$r%3%s%Q%$%k$N%W%m%;%9$G4^$a$kI,MW$,$"$j$^$9!#(B
     $B8D!9$N%W%i%C%H%[!<%`8~$1$N%G%U%)%k%H$N(B MPM $B$O(B <a href="mpm.html">MPM $BJ8=q(B</a>$B$K0lMw$,$"$j$^$9$,!"(B
     <code>configure</code> 
-    $B%3%^%s%I$GCV$-49$($k$3$H$,$G$-$^$9!#(B</p>
+    $B%3%^%s%I$GCV$-49$($k(B$B$3$H$,$G$-$^$9!#(B</p>
 
     <dl>
       <dt><code>--with-mpm=<em>NAME</em></code></dt>
@@ -500,6 +501,13 @@
       <dd>MPM $B%b%8%e!<%k(B <em>NAME</em> $B$rA*Br$7$^$9!#(B</dd>
     </dl>
 
+    <p><var>mpm_name</var> $B$H$$$&(B MPM $B$rM-8z$K$9$k$K$O<!$N$h$&$K$7$^$9!#(B</p>
+
+<div class="example"><p><code>
+     ./configure --with-mpm=<var>mpm_name</var>
+</code></p></div>
+
+
 
 <h3><a name="dbm" id="dbm">DBM</a></h3>
 
@@ -550,7 +558,7 @@
     <p>$B4pK\E*$J@_Dj$r$9$k$N$K!"(BPentium III/Linux 2.2 
     $B$N%7%9%F%`$G$*$*$h$=(B 3 $BJ,DxEY$+$+$j$^$9$,!"(B
     $B$"$i$+$8$a$4N;>52<$5$$!#(B
-    $B$^$?!";~4V$O%O!<%I%&%'%"$dM-8z$K$7$?%b%8%e!<%k$N?t$K(B
+    $B$^$?!";~(B$B4V$O%O!<%I%&%'%"$dM-8z$K$7$?%b%8%e!<%k$N?t$K(B
     $BBg$-$/0MB8$9$k$G$7$g$&!#(B</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -558,7 +566,7 @@
 
     <p>$B$5$F!"@_Dj$7$?%$%s%9%H!<%k(B <em>PREFIX</em> 
      ($BA0=R$N(B <code>--prefix</code> $B%*%W%7%g%s$r;2>H(B) 
-    $B0J2<$K%Q%C%1(B$B!<%8$r%$%s%9%H!<%k$9$kCJ3,$K$J$j$^$7$?!#(B
+    $B0J2<$K%Q%C%1!<%8$r%$%s%9%H!<%k$9$kCJ3,$K$J$j$^$7$?!#(B
     $B<!$N%3%^%s%I$r<B9T$7$F$/$@$5$$(B:</p>
 
 <div class="example"><p><code>$ make install</code></p></div>
diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja
index c1b4d079c1a..03eb8274c44 100644
--- a/docs/manual/install.xml.ja
+++ b/docs/manual/install.xml.ja
@@ -140,7 +140,7 @@
 <section id="download"><title>$B%@%&%s%m!<%I(B</title>
 
     <p>Apache $B$O(B <a
-    href="http://www.apache.org/dist/httpd/">Apache Software
+    href="http://httpd.apache.org/download.cgi">Apache Software
     Foundation $B%@%&%s%m!<%I%5%$%H(B</a>$B$+$i%@%&%s%m!<%I$G$-$^$9$7!"(B
     $BF1$8>l=j$K4v$D$+$N%_%i!<%5%$%H$b%j%9%H$7$F$$$^$9!#(B
     $B$3$3$+$i:G?7$N0BDjHG$,<j$KF~$j$^$9!#(B</p>
@@ -579,7 +579,7 @@
 
     <p><a href="./">docs/manual/</a> $B$N(B Apache $B%^%K%e%"%k$r$6$C$H8+$F$/$@$5$$!#(B
     $B$^$?$O!"(B<a
-    href="http://httpd.apache.org/docs-2.1/">http://httpd.apache.org/docs-2.1/</a>
+    href="http://httpd.apache.org/docs-2.0/">http://httpd.apache.org/docs-2.0/</a>
     $B$K$"$k%^%K%e%"%k:G?7HG!"(B<a
     href="mod/directives.html">$B@_Dj%G%#%l%/%F%#%V(B</a>$B$KEv$?$C$F$_$F$/$@$5$$!#(B</p>
 </section>
diff --git a/docs/manual/invoking.html.ja.jis b/docs/manual/invoking.html.ja.jis
index 73339f13a2f..dbe763d7b43 100644
--- a/docs/manual/invoking.html.ja.jis
+++ b/docs/manual/invoking.html.ja.jis
@@ -18,7 +18,7 @@
 <div id="path">
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> &gt; <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> &gt; <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache $B$N5/F0(B</h1>
     <p>Windows $B>e$G$O!"(BApache $B$ODL>o$O(B
-    Windows NT, 2000, XP $B$G$O%5!<%S%9$H$7$F!"(BWindows 95, ME 
+    Windows NT, 2000, XP $B$G$O%5!<%S%9$H$7$F!"(BWindows 9x, ME 
     $B$G$O%3%s%=!<%k%"%W%j%1!<%7%g%s$H$7$F<B9T$5$l$^$9!#(B
     $B>\:Y$K4X$7$F$O!"!V(B<a href="platform/windows.html#winsvc">
     $B%5!<%S%9$H$7$F<B9T$9$k(B</a>$B!W$H!V(B<a href="platform/windows.html#wincons">
diff --git a/docs/manual/logs.html.ja.jis b/docs/manual/logs.html.ja.jis
index 3d72913f87e..670c0a3a543 100644
--- a/docs/manual/logs.html.ja.jis
+++ b/docs/manual/logs.html.ja.jis
@@ -283,7 +283,7 @@
       <div class="example"><p><code>
         LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\"
         \"%{User-agent}i\"" combined<br />
-         CustomLog log/acces_log combined
+         CustomLog log/access_log combined
       </code></p></div>
 
       <p>$B$3$N=q<0$N:G=i$NJ}$O(B Common Log Format $B$H$^$C$?$/F1$8$G!":G8e$K(B
@@ -327,7 +327,7 @@
     $BFs$DL\$H;0$DL\$O(B referer $B$H%V%i%&%6$N>pJs$G$9!#:G8eFs$D$N(B
     <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> $B$O(B
     <code>ReferLog</code> $B%G%#%l%/%F%#%V$H(B
-    <code>AgentLog</code> $B%G%#%l%/%F%#%V$N8z2L$r$^$M$kJ}K!$r(B$B<($7$F$$$^$9!#(B</p>
+    <code>AgentLog</code> $B%G%#%l%/%F%#%V$N8z2L$r$^$M$kJ}K!(B$B$r<($7$F$$$^$9!#(B</p>
 
       <div class="example"><p><code>
         LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common<br />
@@ -487,7 +487,7 @@
     </code></p></div>
 
     <p><code>%v</code> $B$,%j%/%(%9%H$r07$C$F$$$k%P!<%A%c%k%[%9%H$NL>A0$r(B
-    $B%m%0<}=8$9$k$?$a$K;H$o$l$F$$$^$9!#$=$7$F!"(B<a href="programs/other.html">split-logfile</a> $B$N$h$&$J%W(B$B%m%0%i%`$r(B
+    $B%m%0<}=8$9$k$?$a$K;H$o$l$F$$$^$9!#$=$7$F!"(B<a href="programs/other.html">split-logfile</a> $B$N$h$&$J(B$B%W%m%0%i%`$r(B
     $B;H$C$F%"%/%;%9%m%0$r8e=hM}$9$k$3$H$G!"(B
     $B%P!<%A%c%k%[%9%HKh$N%U%!%$%k$K%m%0$rJ,3d$9$k$3$H$,$G$-$^$9!#(B</p>
 
@@ -531,7 +531,7 @@
       $B;H$C$F$$$k$H$-$O!"$[$\$$$D$b%G%P%C%0$r4JC1$K$9$k$?$a$K(B
       <code class="directive"><a href="./mod/mod_rewrite.html#rewritelog">RewriteLog</a></code> $B$N;HMQ$,(B
       $BI,MW$G$7$g$&!#$3$N%m%0%U%!%$%k$K$O%j%i%$%H%(%s%8%s$,%j%/%(%9%H$r(B
-      $B=q$-49$($k(B$BJ}K!$N>\:Y$J2r@O$,=PNO$5$l$^$9!#>\$7$5$NEY9g$O(B <code class="directive"><a href="./mod/mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></code>
+      $B=q$-49$((B$B$kJ}K!$N>\:Y$J2r@O$,=PNO$5$l$^$9!#>\$7$5$NEY9g$O(B <code class="directive"><a href="./mod/mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></code>
       $B$G@)8f$G$-$^$9!#(B</p>
     
   </div></div>
diff --git a/docs/manual/sitemap.html.ja.jis b/docs/manual/sitemap.html.ja.jis
index bb4dae6a3c2..ded13df576e 100644
--- a/docs/manual/sitemap.html.ja.jis
+++ b/docs/manual/sitemap.html.ja.jis
@@ -22,8 +22,7 @@
 
 <p>$B$3$N%Z!<%8$O8=;~E@$GMxMQ2DG=$J(B
 <a href="./">Apache HTTP $B%5!<%P%P!<%8%g%s(B 2.0 $B$N%I%-%e%a%s%F!<%7%g%s(B</a>
-$B$N0lMw$G$9!#(B
-</p>
+$B$N0lMw$G$9!#(B</p>
 </div>
 <div id="quickview"><ul id="toc">
 <li><img alt="" src="./images/down.gif" /> <a href="#release">$B%j%j!<%9$N%a%b(B</a></li>
@@ -44,7 +43,7 @@
 <div class="section"><h2><a name="release" id="release">$B%j%j!<%9$N%a%b(B</a></h2>
 <ul><li><a href="upgrading.html">1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B</a></li>
 <li><a href="new_features_2_0.html">Apache 2.0 $B$N?75!G=(B</a></li>
-<li><a href="license.html">Apache $B$N%i%$%;%s%9(B</a></li>
+<li><a href="license.html">Apache License</a></li>
 </ul>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section"><h2><a name="using" id="using">Apache HTTP $B%5!<%P$N;HMQ(B</a></h2>
@@ -82,7 +81,8 @@
 </ul>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section"><h2><a name="faq" id="faq">Apache $B%5!<%P$N$h$/$"$k<ALd(B</a></h2>
-<ul><li class="separate"><a href="faq/">$B35N,(B</a></li>
+<ul><li><a href="faq/">$B35N,(B</a></li>
+<li class="separate"><a href="faq/all_in_one.html">1 $B%Z!<%8HG(B</a></li>
 <li><a href="faq/support.html">$B%5%]!<%H(B</a></li>
 </ul>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
diff --git a/docs/manual/stopping.html.ja.jis b/docs/manual/stopping.html.ja.jis
index 8778a19ecfe..af35d93cfd7 100644
--- a/docs/manual/stopping.html.ja.jis
+++ b/docs/manual/stopping.html.ja.jis
@@ -18,11 +18,11 @@
 <div id="path">
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> &gt; <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> &gt; <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>$BDd;_$H:F5/F0(B</h1>
     <p>$B$3$NJ8=q$G$O(B Unix $B$KN`;w$7$?%7%9%F%`$G$N(B
-    Apache $B$NDd;_$H:F5/F0$K$D$$$F07$C$F$$$^$9!#(BWindows $B$G(B Apache $B$r@)8f$9$k$?$a$N(B
-    $B>pJs$H$7$F!"(BWindows NT, 2000, XP $B$N(B
-    $B%f!<%6$O(B <a href="platform/windows.html#winsvc">Apache $B$r%5!<%S%9$H$7$F<B9T$9$k(B</a>$B$r!"(B
-    Windows 9x $B$H(B ME $B$N%f!<%6$O(B <a href="platform/windows.html#wincons">Apache $B$r%3%s%=!<%k%"%W%j$H$7$F(B
-    $B<B9T$9$k(B</a>$B$r;2>H$7$F$/$@$5$$!#(B</p>
+    Apache $B$NDd;_$H:F5/F0$K$D$$$F07$C$F$$$^$9!#(B
+    Windows NT, 2000, XP $B%f!<%6$O(B<a href="platform/windows.html#winsvc">$B%5!<%S%9$H$7$F(B
+    Apache $B$r<B9T$9$k(B</a>$B$G!"(BWindows 9x, ME$B%f!<%6$O(B<a href="platform/windows.html#wincons">$B%3%s%=!<%k%"%W%j%1!<%7%g%s$H$7$F(B
+    Apache $B$r<B9T$9$k(B</a>$B$G!"(B
+    $B$3$l$i$N%W%i%C%H%[!<%`$G$N;HMQJ}K!$r$4Mw2<$5$$!#(B</p>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">$B%$%s%H%m%@%/%7%g%s(B</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#term">$B5^$JDd;_(B</a></li>
@@ -47,7 +47,9 @@
     $B$K=q$+$l$F$$$^$9!#$3$l$O$D$^$j!"?F0J30$N%W%m%;%9$K(B
     $B%7%0%J%k$rAw$kI,MW$9$i$J$$!"$H$$$&$3$H$G$9!#(B
     $B?F%W%m%;%9$KAw$k$3$H$,$G$-$k(B 3 $B<oN`$N%7%0%J%k$,$"$j$^$9(B:
-    <code>TERM</code>, <code>HUP</code>, <code>USR1</code>
+    <code><a href="#term">TERM</a></code>,
+    <code><a href="#hup">HUP</a></code>, 
+    <code><a href="#graceful">USR1</a></code>
     $B$G$9!#$3$l$i$N@bL@$K$D$$$F$OB3$-$r$4Mw2<$5$$!#(B</p>
 
     <p>$B?F%W%m%;%9$K%7%0%J%k$rAw$k$K$O!"(B
@@ -57,7 +59,7 @@
 
     <p><code>httpd</code> $B%W%m%;%9$K%7%0%J%k$rAw$k(B 2 $BHVL\$NJ}K!$O(B
     <code>-k</code> $B$H$$$&%3%^%s%I%i%$%s0z?t$r;HMQ$9$k$3$H$G$9!#(B
-    $B2<$G@bL@$5$l$F$$$k$h$&$K!"(B<code>stop</code>, <code>restart</code>,
+    $B2<$G@bL@$5$l$F$$$k$h$&$K!"(B<code>stop</code>, <code>restart</code>, 
     <code>graceful</code> $B$r;XDj$G$-$^$9!#(B
     $B$3$l$i$O(B <a href="programs/httpd.html">httpd</a> $B$N0z?t$G$9$,!"(B
     $B@)8fMQ$N%9%/%j%W%H(B <a href="programs/apachectl.html">apachectl</a> $B$r(B
@@ -65,7 +67,7 @@
     <code>httpd</code> $B$KEO$7$^$9!#(B</p>
 
     <p><code>httpd</code> $B$K%7%0%J%k$rAw$C$?8e!"(B
-    $B<B9T>u(B$B67$r<!$N%3%^%s%I$GFI$`$3$H$,$G$-$^$9(B:</p>
+    $B<B9T>u67$r<!$N%3%^(B$B%s%I$GFI$`$3$H$,$G$-$^$9(B:</p>
 
 <div class="example"><p><code>tail -f /usr/local/apache2/logs/error_log</code></p></div>
     <p>$B$3$3$K5s$2$?Nc$O!"3F<+$N(B
@@ -103,21 +105,22 @@
     $B;R%W%m%;%9$,=y!9$K$J$/$J$k$K=>$C$F!"(B
     $B?7$7$$(B<em>$B@$Be(B</em>$B$N@_Dj$K$h$k;R%W%m%;%9$KCV$-49$($F$$$-$^$9!#(B
     $B$=$7$F!"$3$l$i$,?7$?$J%j%/%(%9%H$KB(:B$K1~Ez$7;O$a$^$9!#(B</p>
-    <div class="note">$BFCDj$N%W%i%C%H%[!<%`$G$O(B <code>USR1</code> $B$r4K$d$+$J:F5/F0$N$?$a$K(B
-    $B;H$&$3$H$,$G$-$^$;$s$,!"Be$o$j$N%7%0%J%k(B
-    ($BNc$($P(B <code>WINCH</code>) $B$,;HMQ$G$-$k$G$7$g$&!#(B
+
+    <div class="note">$BFCDj$N%W%i%C%H%[!<%`$G$O(B <code>USR1</code>
+    $B$r4K$d$+$J:F5/F0$N$?$a$K;H$&$3$H$,$G$-$^$;$s$,!"Be$o$j$N%7%0%J%k(B
+    ($BNc$($P(B WINCH) $B$,;HMQ$G$-$k$G$7$g$&!#(B
     <code>apachectl graceful</code>
     $B$H$$$&%3%^%s%I$O%W%i%C%H%[!<%`$K9g$C$?%7%0%J%k$rAw$j$^$9!#(B</div>
 
     <p>$B$3$N%3!<%I$O>o$K(B
     MPM $B$N%W%m%;%9@)8f%G%#%l%/%F%#%V$N@_Dj$r=E;k$7$^$9$N$G!"(B
     $B%/%i%$%"%s%H$N%j%/%(%9%H$r07$&%W%m%;%9$H%9%l%C%I$N?t$r:F5/F0$N=hM}Cf$b(B
-    $BE,@Z$JCM$K0];}$5$l$^$9!#$^$?!"<!$N$h$&$K$7$F(B
+    $BE,@Z$JCM$K0];}$5$l$^$9!#!#$^$?!"<!$N$h$&$K$7$F(B
     <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code>
     $B$r<i$j$^$9(B:
     $B>/$J$/$H$b(B 1 $BIC8e$K(B <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code> $B8D$N?7$7$$;R%W%m%;%9$,(B
     $B@8@.$5$l$F$$$J$1$l$P!"$=$N?t$K$J$k$h$&$KE,59%W%m%;%9$r@8@.$7$^$9!#(B
-    $B$3$N5sF0$O8=:_$NIi2Y$KBP$7$FE,(B$B@Z$J;R%W%m%;%9$N?t$H(B
+    $B$3$N5sF0$O8=:_$NIi2Y$KBP$7$FE,@Z$J;R%W%m(B$B%;%9$N?t$H(B
     <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code> $B%Q%i%a!<%?$G$N(B
     $B4uK>$N?t$NN>J}$r0];}$7$h$&$H$7$F$$$^$9!#(B</p>
 
@@ -157,10 +160,11 @@
     (<a href="programs/httpd.html">httpd</a> $B$r$4Mw2<$5$$(B)
     $B$r;H$C$F8!>Z$9$k$3$H$,$G$-$^$9!#(B
     $B@_Dj%U%!%$%k$N0UL#E*$JFbMF$r9=J8$HF1MM$K8!>Z$7$?$$>l9g$O!"(B
-    $BHs(B root $B%f!<%6$G(B <code>httpd</code> $B$r5/F0$7$h(B$B$&$H$9$l$P$o$+$j$^$9!#(B
+    $BHs(B root $B%f!<%6$G(B <code>httpd</code> $B$r5/F0$7$h$&$H$9$l$P(B$B$o$+$j$^$9!#(B
     $B$b$7%(%i!<$,$J$1$l$P!"%=%1%C%H$d%m%0$r3+$3$&$H$7$F(B
     root $B$G$J$$$?$a(B
-    ($B$b$7$/$O(B <code>httpd</code> $B$,4{$KI,MW$J%]!<%H$K%P%$%s%I$7$F$$$k$?$a(B)
+    ($B$b$7$/$O<B9TCf$N(B <code>httpd</code>
+    $B$,4{$KI,MW$J%]!<%H$K%P%$%s%I$7$F$$$k$?$a(B)
     $B$K<:GT$9$k$G$7$g$&!#(B
     $B$3$l0J30$NM}M3$G5/F0$K<:GT$7$?$N$G$"$l$P!"(B
     $B$=$l$O@_Dj%U%!%$%k$N%(%i!<$G!"(B
@@ -207,7 +211,7 @@
     "bind: Address already in use" (<code>HUP</code> $B8e(B) $B$d(B
     "long lost child came home!" (<code>USR1</code> $B8e(B)
     $B$H$$$C$?7k2L$K$J$j$^$9!#(B
-    $BA0<T$OCWL?E*$J%(%i!<$G$9$,!"(B
+    $BA0<T$OCWL?E*$J%(%i!<$G$9(B$B$,!"(B
     $B8e<T$O%9%3%"%\!<%I%9%m%C%H$r<:$&$@$1$G$9!#(B
     $B$G$9$+$i4K$d$+$J:F5/F0$O!"$?$^$K3N<B$J:F5/F0(B (HUP)
     $B$bJ;MQ$7$F;H$C$?J}$,NI$$$G$7$g$&!#(B
diff --git a/docs/manual/upgrading.html.ja.jis b/docs/manual/upgrading.html.ja.jis
index 1a630a735e7..5e46e9ee483 100644
--- a/docs/manual/upgrading.html.ja.jis
+++ b/docs/manual/upgrading.html.ja.jis
@@ -27,7 +27,7 @@
 <li><img alt="" src="./images/down.gif" /> <a href="#run-time">$B<B9T;~$N@_Dj$NJQ99(B</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#misc">$B$=$NB>$NJQ99(B</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#third-party">$B%5!<%I%Q!<%F%#%b%8%e!<%k(B</a></li>
-</ul><h3>$B;2>H(B</h3><ul class="seealso"><li><a href="new_features_2_0.html">Apache 2.0 $B$N?75!G=$N35MW(B</a></li></ul></div>
+</ul><h3>$B;2>H(B</h3><ul class="seealso"><li><a href="new_features_2_0.html">Apache 2.0 $B?75!G=$N35MW(B</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="compile-time" id="compile-time">$B%3%s%Q%$%k;~$N@_Dj$NJQ99(B</a></h2>
@@ -65,12 +65,13 @@
       <li>$B%b%8%e!<%k$NCf$K$O!"(B<code>PATH_INFO</code> ($BK\Ev$N%U%!%$%kL>$N8e$KB3$/(B
       $B%Q%9>pJs(B) $B$N07$$$,JQ$o$C$?$b$N$,$"$j$^$9!#0JA0$O%O%s%I%i$H$7$F(B
       $B<BAu$5$l$F$$$?$b$N$,%U%#%k%?$H$7$F<BAu$5$l$k$h$&$K$J$C$?$b$N$O(B
-      <code>PATH_INFO</code> $B$N$"$k%j%/%(%9%H$r<u$1IU$1$^$;$s!#(B<a href="mod/mod_include.html">INCLUDES</a> $B$J$I$N%U%#%k%?$O(B
-      $B%3%"%O%s%I%i$N>e$K<BAu$5$l$F(B$B$$$^$9$N$G!"(B<code>PATH_INFO</code>
+      <code>PATH_INFO</code> $B$N$"$k%j%/%(%9%H$r<u$1IU$1$^$;$s!#(B<a href="mod/mod_include.html">INCLUDES</a> $B$d(B
+      <a href="http://www.php.net/">PHP</a> $B$J$I$N%U%#%k%?$O(B
+      $B%3%"%O(B$B%s%I%i$N>e$K<BAu$5$l$F$$$^$9$N$G!"(B<code>PATH_INFO</code>
       $BIU$-$N%j%/%(%9%H$r5qH]$7$^$9!#(B
       <code class="directive"><a href="./mod/core.html#acceptpathinfo">AcceptPathInfo</a></code>
       $B%G%#%l%/%F%#%V$r;H$C$F%3%"%O%s%I%i$,(B <code>PATH_INFO</code>
-      $BIU$-$N%j%/%(%9%H$r<u$1IU$1$k$h$&$K$G$-!"$=$l$K$h$C$F(B SSI $B$G(B
+      $BIU$-$N%j%/%(%9%H$r<u$1IU$1$k$h$&$K$G$-!"$=$l$K$h$C$F(B SSI $BEy$G(B
       <code>PATH_INFO</code> $B$r;H$&5!G=$rI|3h$5$;$k$3$H$,$G$-$^$9!#(B</li>
 
       <li><code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code>
@@ -109,8 +110,8 @@
       $B>e$N%G%#%l%/%F%#%V$N%G%U%)%k%HCM$r;H$C$F$$$?>l9g$O!"(B
       <code>httpd.conf</code> $B$K(B <code>Include conf/access.conf</code> $B$H(B
       <code>Include conf/srm.conf</code> $B$rDI2C$9$kI,MW$,$"$k$G$7$g$&!#(B
-      $B0JA0$N%G%#%l%/%F%#%V$K$h$k=gHV$N$h$&$K(B Apache $B$,@_Dj%U%!%$%k$r(B
-      $BFI$_9~$`(B$B$h$&$K$9$k$?$a$K$O!"(B<code>httpd.conf</code> $B$N:G8e$K(B
+      $B0JA0$N%G%#%l%/%F%#%V$K$h$k=gHV$N$h$&$K(B Apache $B$,@_Dj%U%!%$%k(B$B$r(B
+      $BFI$_9~$`$h$&$K$9$k$?$a$K$O!"(B<code>httpd.conf</code> $B$N:G8e$K(B
       <code>srm.conf</code>$B!"(B<code>access.conf</code> $B$N=g$K$=$l$>$l(B
       <code class="directive"><a href="./mod/core.html#include">Include</a></code>
       $B%G%#%l%/%F%#%V$r=q$$$F$/$@$5$$!#(B</li>
@@ -165,10 +166,6 @@
     
 
     <ul>
-      <li>$B%P!<%A%c%k%[%9%H$N@_Dj$r=PNO$9$k$?$a$K;H$o$l$F$$$?(B
-      <code>httpd</code> $B$N%3%^%s%I%i%$%s%*%W%7%g%s(B <code>-S</code> $B$O(B
-      <code>-t -D DUMP_VHOSTS</code> $B$KCV$-49$($i$l$^$7$?!#(B</li>
-
       <li>Apache 1.3 $B$G<B83E*$J%b%8%e!<%k$@$C$?(B
       <code class="directive">mod_auth_digest</code> $B$O(B
       $BI8=`%b%8%e!<%k$K$J$j$^$7$?!#(B</li>
diff --git a/docs/manual/urlmapping.html.ja.jis b/docs/manual/urlmapping.html.ja.jis
index a9642095403..b508623d5c5 100755
--- a/docs/manual/urlmapping.html.ja.jis
+++ b/docs/manual/urlmapping.html.ja.jis
@@ -170,11 +170,11 @@
 <div class="example"><p><code>RedirectMatch permanent ^/$
       http://www.example.com/startpage.html</code></p></div>
 
-    <p>$B$"$k$$$O!"0l;~E*$K%5%$%H$N$9$Y$F$N%Z!<%8$r0l$D$N%Z!<%8$X%j%@%$%l%/%H$9$k(B
-    $B$H$-$O!"0J2<$r;H$$$^$9(B:</p>
+    <p>$B$"$k$$$O!"0l;~E*$K%5%$%H$N$9$Y$F$N%Z!<%8$rB>$N%5%$%H$NFCDj$N(B
+    $B%Z!<%8$X%j%@%$%l%/%H$9$k$H$-$O!"0J2<$r;H$$$^$9(B:</p>
 
 <div class="example"><p><code>RedirectMatch temp .*
-      http://www.example.com/startpage.html</code></p></div>
+      http://othersite.example.com/startpage.html</code></p></div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="proxy" id="proxy">$B%j%P!<%9%W%m%-%7(B</a></h2>
@@ -186,8 +186,8 @@
 $B%j%P!<%9%W%m%-%7%5!<%P$+$iAw$i$l$F$-$F$$$k$h$&$K8+$($kE@$,DL>o$N(B
 $B%W%m%-%7$H$O0[$J$j$^$9!#(B</p>
 
-<p>$B<!$NNc$G$O!"%/%i%$%"%s%H$,(B <code>/foo/</code> $B%G%#%l%/%H%j$N2<$K$"$k(B
-$B%I%-%e%a%s%H$r%j(B$B%/%(%9%H$9$k$H!"%5!<%P$,(B <code>internal.example.com</code> $B$N(B
+<p>$B<!$NNc$G$O!"%/%i%$%"%s%H$,(B <code>/foo/</code> $B%G%#%l%/%H%j$N2<(B$B$K$"$k(B
+$B%I%-%e%a%s%H$r%j%/%(%9%H$9$k$H!"%5!<%P$,(B <code>internal.example.com</code> $B$N(B
 <code>/bar/</code> $B%G%#%l%/%H%j$+$i<hF@$7$F!"$5$b%m!<%+%k%5!<%P$+$i$N(B
 $B%I%-%e%a%s%H$N$h$&$K$7$F%/%i%$%"%s%H$KJV$7$^$9!#(B</p>
 
@@ -227,7 +227,7 @@ ProxyPassReverse /foo/ http://internal.example.com/bar/
     <p>$BI,$:!"%j%/%(%9%H$5$l$?(B URL $B$KBP1~$9$k%U%!%$%k$,%U%!%$%k%7%9%F%`$K(B
     $BL5$$$H$$$&>l9g$,H/@8$7$^$9!#$3$l$,5/$3$k$N$K$O$$$/$D$+$NM}M3$,$"$j$^$9!#(B
     $B>l9g$K$h$C$F$O!"%I%-%e%a%s%H$rJL$N>l=j$K0\F0$7$?7k2L$G$"$k$3$H$,$"$j$^$9!#(B
-    $B$3$N>l9g$O!"%/%i%$%"%s(B$B%H$K%j%=!<%9$N?7$7$$0LCV$rCN$i$;$k$?$a$K(B
+    $B$3$N>l9g$O!"%/%i%$%"%s%H$K%j%=!<%9$N?7$7$$0LCV$rCN$i$;$k$?$a$K(B
     <a href="#redirect">URL $B%j%@%$%l%/%7%g%s(B</a>$B$r;H$&$N$,:GA1$NJ}K!$G$9!#(B
     $B$=$&$9$k$3$H$K$h$C$F!"%j%=!<%9$O?7$7$$0LCV$K0\F0$7$F$$$k$1$l$I$b!"(B
     $B8E$$%V%C%/%^!<%/$d%j%s%/$,F0:n$7B3$1$k$h$&$K$9$k$3$H$,$G$-$^$9!#(B</p>
@@ -259,7 +259,7 @@ ProxyPassReverse /foo/ http://internal.example.com/bar/
     $B%G%#%l%/%F%#%V$G@)8f$5$l!"(B
     <a href="custom-error.html">$B%+%9%?%`%(%i!<%l%9%]%s%9(B</a> $B$H(B
     <a href="misc/custom_errordocs.html">$B9q:]2=%5!<%P%(%i!<%l%9%]%s%9(B</a> $B$G(B
-    $B@bL@$5$l$F$$$k$h$&$K!"=@Fp$J@_Dj$r9T$J$&$3$H$,$G$-$^$9!#(B</p>
+    $B@bL@$5$l$F$$$k$h$&$K!"=@Fp$J@_Dj$r(B$B9T$J$&$3$H$,$G$-$^$9!#(B</p>
 </div></div>
 <div id="footer">
 <p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>