Update Japanese translations.

Submitted by:	Hiroaki KAWAI <hawk@bcl.t.u-tokyo.ac.jp>
Reviewed by:	Yoshiki Hayashi


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

13 files changed, 207 insertions, 122 deletions

diff --git a/docs/manual/bind.xml.ja b/docs/manual/bind.xml.ja
index c23f89fbb6..a16ce90abb 100644
--- a/docs/manual/bind.xml.ja
+++ b/docs/manual/bind.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English revision: 1.2 -->
+<!-- English revision: 1.4 -->
 
 <manualpage>
   <relativepath href="."/>
@@ -78,47 +78,69 @@
   <section id="ipv6">
     <title>IPv6 $B$NFC5-;v9`(B</title>
 
-    <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
+    <directive module="mpm_common">Listen</directive> 
+    $B%G%#%l%/%F%#%V$G<!$N$h$&$K@_Dj$7$^$9!#(B</p>
 
     <example>
       Listen 80
     </example>
 
-    <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
+    <directive module="mpm_common">Listen</directive>
+    $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>
 
-    <example>
-      Listen [::]:80
-    </example>
-
-    <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
+    <directive module="mpm_common">Listen</directive> $B%G%#%l%/%F%#%V$G(B
+    IPv4 $B%"%I%l%9$r;XDj$7$F$/$@$5$$!#(B</p>
 
     <example>
-      Listen 80
+      Listen 0.0.0.0:80<br />
+      Listen 192.170.2.1:80
     </example>
 
-    <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
+    <directive module="mpm_common">Listen</directive>
+    $B%G%#%l%/%F%#%V$r;HMQ$7$F$/$@$5$$!#(B
 
     <example>
-      Listen 0.0.0.0:80
+       Listen [::]:80<br />
+       Listen 0.0.0.0:80
     </example>
 
-    <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>
-
-    <example>
-      Listen 0.0.0.0:80<br />
-      Listen [::]:0
-    </example>
+    <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
+    <directive module="mpm_common">Listen</directive>
+    $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>
   </section>
 
   <section id="virtualhost">
diff --git a/docs/manual/content-negotiation.xml.ja b/docs/manual/content-negotiation.xml.ja
index 570b7bccc8..5565c7afaa 100644
--- a/docs/manual/content-negotiation.xml.ja
+++ b/docs/manual/content-negotiation.xml.ja
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage>
 <relativepath href="."/>
-<!-- English revision: 1.1 -->
+<!-- English revision: 1.3 -->
 
 <title>$B%3%s%F%s%H%M%4%7%(!<%7%g%s(B</title>
 
@@ -179,10 +179,11 @@
 <section id="multiviews"><title>Multiviews</title>
 
     <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
     <directive module="core" type="section">Directory</directive>, 
     <directive module="core" type="section">Location</directive>, 
     <directive module="core" type="section">Files</directive>
-    $B$d!"(B(<directive module="core">AllowOverride</directive>
+    $B%;%/%7%g%sCf$d!"(B(<directive module="core">AllowOverride</directive>
     $B$,E,@Z$JCM$K(B $B@_Dj$5$l$F$$$k$H(B) <code>.htaccess</code>
     $B%U%!%$%k$G(B <directive module="core">Options</directive>
     $B%G%#%l%/%F%#%V$K$h$C$F@_Dj$9$k$3$H$,$G$-$^$9!#(B
@@ -500,6 +501,20 @@
     $B$3$N$h$&$J=hM}$O!"(BHTTP 1.1 $B5,3J$H$N@09g@-$r0];}$7$F!"(B
     $BE,@Z$K@_Dj$5$l$?%/%i%$%"%s%H$H$b$-$A$s$HF0:n$9$k$?$a$K(B
     $BI,MW$G$9!#(B</p>
+
+    <p>$B$h$j9bEY$J%F%/%K%C%/(B (Cookie $B$dFC<l$J(B URL $B%Q%9Ey(B)
+    $B$K$*$$$F$b%f!<%6$N8@8lA*Br$r%5%]!<%H$9$k$?$a!"(B
+    Apache 2.1 $B$+$i$O!"(B<module>mod_negotiation</module>
+    $B$,(B<a href="env.html">$B4D6-JQ?t(B</a> <code>prefer-language</code>
+    $B$rG'<1$9$k$h$&$K$J$j$^$7$?!#(B
+    $B$3$NJQ?t$,B8:_$7$F!"E,@Z$J8@8l%?%0$,BeF~$5$l$F$$$k$N$G$"$l$P!"(B
+    <module>mod_negotiation</module> $B$O9gCW$9$k(B variant
+    $B$rA*Br$7$h$&$H$7$^$9!#9gCW$9$k$b$N$,L5$1$l$P!"(B
+    $BDL>o$N%M%4%7%(!<%7%g%s<j=g$,E,MQ$5$l$^$9!#(B</p>
+
+    <example><title>Example</title>
+      SetEnvIf Cookie "language=(.+)" prefer-language=$1
+    </example>
 </section>
 </section>
 
diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja
index cdca99c3fe..710c54b593 100644
--- a/docs/manual/env.xml.ja
+++ b/docs/manual/env.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English revision: 1.5 -->
+<!-- English revision: 1.11 -->
 
 <manualpage>
   <relativepath href="."/>
@@ -245,18 +245,18 @@
     
         <p>$B1~Ez%X%C%@$,%/%i%$%"%s%H$KAw$i$l$kA0$K(B <code>Vary</code>
         $B%U%#!<%k%I$r<h$j=|$-$^$9!#(B
-        $B%/%i%$%"%s%H$NCf$K$O$3$N%U%#!<%k%I$r@5$7$/2r<a$7$J$$$b$N$,$"$j$^$9(B
-        (<a href="misc/known_client_problems.html">$B%/%i%$%"%s%H$N4{CN$NLdBj(B</a>
-        $B$N%Z!<%8$r;2>H$7$F$/$@$5$$(B)$B!#$3$NJQ?t$r@_Dj$9$k$3$H$G$=$NLdBj$r2sHr(B
-        $B$9$k$3$H$,$G$-$^$9!#$3$NJQ?t$r@_Dj$9$k$H!"(B<strong>force-response-1.0</strong>
+        $B%/%i%$%"%s%H$NCf$K$O$3$N%U%#!<%k%I$r@5$7$/2r<a$7$J$$$b$N$,$"$j$^$9!#(B
+        $B$3$NJQ?t$r@_Dj$9$k$3$H$G$=$NLdBj$r2sHr$9$k$3$H$,$G$-$^$9!#(B
+        $B$3$NJQ?t$r@_Dj$9$k$H!"(B<strong>force-response-1.0</strong>
         $B$,@_Dj$5$l$?$3$H$K$J$j$^$9!#(B</p>
-    
+
     </section>
     <section id="force-response">
         <title>force-response-1.0</title>
     
-        <p>$B$3$l$,@_Dj$5$l$F$$$k$H!">o$K(B HTTP/1.0 $B$G$N1~Ez$K$J$j$^$9!#$3$N5!G=$O!"(B
-        $B85!9$O(B AOL $B$N%W%m%-%7$NLdBj$N$?$a$K<BAu$5$l$^$7$?!#%/%i%$%"%s%H$NCf$K$O!"(B
+        <p>$B$3$l$,@_Dj$5$l$F$$$k$H!"(BHTTP/1.0 $B%j%/%(%9%H$rH/9T$9$k%/%i%$%"%s%H$KBP$7$F$O(B
+	$B>o$K(B HTTP/1.0 $B$G1~Ez$9$k$h$&$K$J$j$^$9!#$3$N5!G=$O!"(B
+        $B85!9$O(B AOL $B$N%W%m%-%7$NLdBj$N$?$a$K<BAu$5$l$^$7$?!#(BHTTP/1.0 $B%/%i%$%"%s%H$NCf$K$O!"(B
         HTTP/1.1 $B$N1~Ez$rJV$5$l$k$H@5$7$/F0:n$7$J$$$b$N$,$"$k$+$b$7$l$^$;$s!#(B
         $B$3$N5!G=$r;HMQ$9$k$3$H$G!"$=$N$h$&$J%/%i%$%"%s%H$H$N4V$N8_49@-LdBj$r2r7h$G$-$^$9!#(B</p>
     </section>
@@ -266,7 +266,17 @@
 
 	<p>$B$3$l$,(B 1 $B$K@_Dj$5$l$k$H!"$3$NJQ?t$O(B <code>text/html</code>
 	$B0J30$N%3%s%F%s%H%?%$%W$KBP$9$k!"(B<module>mod_deflate</module>
-	$BDs6!$N(B <code>DEFLATE</code> $B=PNO%U%#%k%?$rL58z$K$7$^$9!#(B</p>
+	$BDs6!$N(B <code>DEFLATE</code> $B=PNO%U%#%k%?$rL58z$K$7$^$9!#(B
+        $B$^$?!"@EE*$K!"4{$K05=L$5$l$?%U%!%$%k$r;HMQ$7$?$$>l9g!"(B
+        (gzip $B$@$1$G$J$/!"(B"identity" $B$H0[$J$kA4$F$N%(%s%3!<%I$KBP$7$F(B)
+        <module>mod_negotiation</module> $B$bJQ?t$rI>2A$7$^$9!#(B</p>
+    </section>
+
+    <section id="no-gzip"><title>no-gzip</title>
+        <p>$B%;%C%H$5$l$k$H!"(B<module>mod_deflate</module> $B$N(B
+	<code>DEFLATE</code> $B%U%#%k%?$,%*%U$K$J$j$^$9!#(B
+        $B$=$7$F(B <module>mod_negotiation</module>
+        $B$O%(%s%3!<%I$5$l$?%j%=!<%9$rAw$i$J$$$h$&$K$7$^$9!#(B</p>
     </section>
 
     <section id="nokeepalive">
@@ -274,8 +284,19 @@
     
         <p>$B$3$l$,@_Dj$5$l$F$$$k>l9g$O!"(B<directive module="core"
         >KeepAlive</directive> $B$r;HMQ$7$J$$$h$&$K$7$^$9!#(B</p>
+
+    <section id="prefer-language"><title>prefer-language</title>
+    
+        <p><module>mod_negotiation</module> $B$N5sF0$K1F6A$rM?$($^$9!#(B
+        (<code>en</code>, <code>ja</code>, <code>x-klingon</code>$B$H$$$C$?(B)
+        $B8@8l%?%0$,3JG<$5$l$F$$$l$P!"$=$N8@8l$N(B variant $B$rAw?.$7$h$&$H$7$^$9!#(B
+        $B$=$N$h$&$J(B variant $B$,$J$$>l9g$O!"(B
+        $BDL>o$N(B<a href="content-negotiation.html">$B%M%4%7%(!<%7%g%s(B</a>$B=hM}$,(B
+        $BE,MQ$5$l$^$9!#(B</p>
     
     </section>
+
+    </section>
     <section id="redirect-carefully">
         <title>redirect-carefully</title>
     
@@ -381,7 +402,3 @@ SetEnvIf Referer "^$" local_referal
     </section>
   </section>
 </manualpage>
-
-
-
-
diff --git a/docs/manual/index.html.ja.jis b/docs/manual/index.html.ja.jis
index 3f0aec0ca4..7e811d61ac 100644
--- a/docs/manual/index.html.ja.jis
+++ b/docs/manual/index.html.ja.jis
@@ -1,7 +1,7 @@
 <?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.45 -->
+<!-- English revision: 1.46 -->
 
 <title>Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.1 $B%I%-%e%a%s%H(B</title><link
 href="./style/css/manual.css" rel="stylesheet" media="all"
@@ -41,7 +41,7 @@ href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> &gt;
 href="./">$B%P!<%8%g%s(B 2.1</a></div>
 
 <div id="page-content">
-	<h1>Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.1 $B%I%-%e%a%s%H(B</h1>
+<h1>Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.1 $B%I%-%e%a%s%H(B</h1>
 
 
 
@@ -203,9 +203,6 @@ href="./">$B%P!<%8%g%s(B 2.1</a></div>
                 <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>
               
diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja
index 28122b16e5..94809a457a 100644
--- a/docs/manual/install.xml.ja
+++ b/docs/manual/install.xml.ja
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage>
 <relativepath href="."/>
-<!-- English revision: 1.11 -->
+<!-- English revision: 1.15 -->
 
   <title>$B%3%s%Q%$%k$H%$%s%9%H!<%k(B</title>
 
@@ -26,8 +26,8 @@
 
 </summary>
 
-<seealso><a href="invoking.html">$B5/F0(B</a></seealso>
-<seealso><a href="stopping.html">$BDd;_$H:F5/F0(B</a></seealso>
+<seealso><a href="invoking.html">Apache$B$N5/F0(B</a></seealso>
+<seealso><a href="stopping.html">Apache$B$NDd;_$H:F5/F0(B</a></seealso>
 
 <section id="overview"><title>$B35MW(B ($B$;$C$+$A$J?M8~$1(B)</title>
 
@@ -142,19 +142,9 @@
 
     <p>Apache $B$O(B <a
     href="http://www.apache.org/dist/httpd/">Apache Software
-    Foundation $B%@%&%s%m!<%I%5%$%H(B</a>$B$d(B<a
-    href="http://www.apache.org/dyn/closer.cgi/httpd/">$B6a$/$N(B
-    $B%_%i!<%5%$%H(B</a>$B$+$i%@%&%s%m!<%I$G$-$^$9!#(B</p>
-
-    <p><code>alpha</code> $B$G=*$o$k%P!<%8%g%sHV9f$O!"(B
-    $BF0$/$+F0$+$J$$$+$h$/J,$+$i$J$$!"(B
-    $BAa4|$N%W%j%F%9%H%P!<%8%g%s$G$"$k$3$H$r<($7$F$$$^$9!#(B
-    <code>beta</code> $B$G=*$o$k%P!<%8%g%s$O$=$l$h$j$O?.Mj@-$N$"$k(B
-    $B%j%j!<%9$G$9$,!"%F%9%H$H%P%0%U%#%C%/%9$r=E$M$kCJ3,$N$b$N$G$9!#(B
-    Apache HTTP $B%5!<%P$NF~<j2DG=$JCf$G:G9b$N@=IJ%j%j!<%9$r(B
-    $B%@%&%s%m!<%I$7$?$$$N$G$"$l$P!"%U%!%$%kL>$K(B <code>alpha</code>
-    $B$b(B <code>beta</code>
-    $B$bIU$+$J$$:G?7$N%P!<%8%g%s$rA*$s$G$/$@$5$$!#(B</p>
+    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 
@@ -162,8 +152,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 <code>KEYS</code> $B%U%!%$%k$r(B <a
-    href="http://www.apache.org/dist/httpd/">Apache $BG[I[%5%$%H(B</a>
+    $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
@@ -179,8 +169,11 @@
 
     <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://www.apache.org/dist/httpd/">$B%a%$%s$N(B Apache
+    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%/$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$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
@@ -502,6 +495,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>
+
+<example>
+     ./configure --with-mpm=<var>mpm_name</var>
+</example>
+
 </section>
 
 <section id="dbm"><title>DBM</title>
diff --git a/docs/manual/invoking.xml.ja b/docs/manual/invoking.xml.ja
index bdeac54e99..08fb53bf04 100644
--- a/docs/manual/invoking.xml.ja
+++ b/docs/manual/invoking.xml.ja
@@ -3,16 +3,18 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage>
 <relativepath href="."/>
-<!-- English revision: 1.2 -->
+<!-- English revision: 1.4 -->
 
   <title>Apache $B$N5/F0(B</title>
 
 <summary>
     <p>Windows $B>e$G$O!"(BApache $B$ODL>o$O(B
-    Windows NT $B$G$O%5!<%S%9$H$7$F!"(BWindows 95 
+    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#run">
-    Windows $B$G(B Apache $B$r<B9T$9$k(B</a>$B!W$r$4Mw2<$5$$!#(B</p>
+    $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">
+    $B%3%s%=!<%k%"%W%j%1!<%7%g%s$H$7$F<B9T$9$k(B</a>$B!W$r$4Mw2<$5$$!#(B</p>
 
     <p>Unix$B$G$O!"(B<a href="programs/httpd.html">httpd</a> 
     $B%W%m%0%i%`$,!"%P%C%/%0%i%&%s%I$G>o$K%j%/%(%9%H=hM}$r9T$&(B
diff --git a/docs/manual/logs.xml.ja b/docs/manual/logs.xml.ja
index 3d9c3cb3bb..b3c4fa443c 100644
--- a/docs/manual/logs.xml.ja
+++ b/docs/manual/logs.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English revision: 1.6 -->
+<!-- English revision: 1.7 -->
 
 <manualpage>
   <relativepath href="."/>
diff --git a/docs/manual/new_features_2_0.xml.ja b/docs/manual/new_features_2_0.xml.ja
index 86f8a22170..fdb769dd97 100644
--- a/docs/manual/new_features_2_0.xml.ja
+++ b/docs/manual/new_features_2_0.xml.ja
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage>
 <relativepath href="."/>
-<!-- English revision: 1.4 -->
+<!-- English revision: 1.5 -->
 
 <title>Apache 2.0 $B$N?75!G=$N35MW(B</title>
 
@@ -12,7 +12,7 @@
      $B$N<g$J0c$$$K$D$$$F5-=R$7$F$$$^$9!#(B</p>
 </summary>
 
-<seealso><a href="upgrading.html">Apache 2.0 $B$X$N%"%C%W%0%l!<%I(B</a></seealso>
+<seealso><a href="upgrading.html">1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B</a></seealso>
 
   <section id="core">
     <title>$B%3%"5!G=$N3HD%(B</title>
diff --git a/docs/manual/sitemap.xml.ja b/docs/manual/sitemap.xml.ja
index bfae76fcd8..6721c6b18c 100644
--- a/docs/manual/sitemap.xml.ja
+++ b/docs/manual/sitemap.xml.ja
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English revision: 1.17 -->
+<!-- English revision: 1.23 -->
 
 <sitemap>
   <relativepath href="."/>
@@ -79,7 +79,6 @@
 <page href="howto/ssi.html">Server Side Includes $BF~Lg(B</page>
 <page href="howto/htaccess.html">.htaccess $B%U%!%$%k(B</page>
 <page href="howto/public_html.html">$B%f!<%6Kh$N%&%'%V%G%#%l%/%H%j(B</page>
-<page href="misc/tutorials.html">$B$$$m$$$m$J(B Apache $B$N%A%e!<%H%j%"%k(B</page>
 </category>
 
 <category id="platform">
@@ -112,11 +111,6 @@
 <category id="misc">
 <title>Apache $B$=$NB>(B</title>
 <page separate="yes" href="misc/">$B35N,(B</page>
-<page href="misc/custom_errordocs.html">$B%+%9%?%^%$%:$5$l$?(B
-$B9q:]2=%5!<%P%(%i!<%a%C%;!<%8(B</page>
-<page href="misc/fin_wait_2.html">FIN_WAIT_2 $B$N%3%M%/%7%g%s$H(B Apache</page>
-<page href="misc/known_client_problems.html">$B%/%i%$%"%s%H$N4{CN$NLdBj(B</page>
-<page href="misc/descriptors.html">$B5-=R;R$H(B Apache</page>
 <page href="cgi_path.html">CGI $B4D6-$N(B PATH_INFO $B$NJQ99(B</page>
 </category>
 
@@ -140,6 +134,7 @@
   <modulefile>mod_authz_default.xml</modulefile>
   <modulefile>mod_authz_groupfile.xml</modulefile>
   <modulefile>mod_authz_host.xml.ja</modulefile>
+  <modulefile>mod_authz_owner.xml</modulefile>
   <modulefile>mod_authz_user.xml</modulefile>
   <modulefile>mod_auth_ldap.xml</modulefile>
   <modulefile>mod_autoindex.xml.ja</modulefile>
@@ -160,6 +155,7 @@
   <modulefile>mod_ext_filter.xml</modulefile>
   <modulefile>mod_file_cache.xml</modulefile>
   <modulefile>mod_headers.xml</modulefile>
+  <modulefile>mod_ident.xml</modulefile>
   <modulefile>mod_imap.xml</modulefile>
   <modulefile>mod_include.xml</modulefile>
   <modulefile>mod_info.xml.ja</modulefile>
@@ -171,7 +167,11 @@
   <modulefile>mod_mime.xml</modulefile>
   <modulefile>mod_mime_magic.xml</modulefile>
   <modulefile>mod_negotiation.xml.ja</modulefile>
+  <modulefile>mod_nw_ssl.xml</modulefile>
   <modulefile>mod_proxy.xml</modulefile>
+  <modulefile>mod_proxy_connect.xml</modulefile>
+  <modulefile>mod_proxy_ftp.xml</modulefile>
+  <modulefile>mod_proxy_http.xml</modulefile>
   <modulefile>mod_rewrite.xml</modulefile>
   <modulefile>mod_setenvif.xml.ja</modulefile>
   <modulefile>mod_so.xml.ja</modulefile>
@@ -183,12 +183,17 @@
   <modulefile>mod_userdir.xml.ja</modulefile>
   <modulefile>mod_usertrack.xml</modulefile>
   <modulefile>mod_vhost_alias.xml</modulefile>
+
   <modulefile>mpm_common.xml.ja</modulefile>
+  <modulefile>beos.xml</modulefile>
   <modulefile>mpm_netware.xml</modulefile>
   <modulefile>mpm_winnt.xml.ja</modulefile>
+  <modulefile>mpmt_os2.xml</modulefile>
   <modulefile>perchild.xml</modulefile>
   <modulefile>prefork.xml.ja</modulefile>
   <modulefile>worker.xml.ja</modulefile>
+  <modulefile>leader.xml</modulefile>
+  <modulefile>threadpool.xml</modulefile>
 </modulefilelist>
 </category>
 
diff --git a/docs/manual/stopping.xml.ja b/docs/manual/stopping.xml.ja
index 6cb5c79c5f..7ff612abe5 100644
--- a/docs/manual/stopping.xml.ja
+++ b/docs/manual/stopping.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English revision: 1.1 -->
+<!-- English revision: 1.6 -->
 <manualpage>
 <relativepath href="."/>
 
@@ -9,14 +9,26 @@
 
 <summary>
     <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%f!<%6(B (Windows $B$G(B Apache $B$r;H$&>l9g(B) $B$O!"(B<a
-    href="platform/windows.html#signal">$B<B9TCf$N(B Apache
-    $B$K%7%0%J%k$rAw$k(B</a>$B$b$4Mw2<$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$r!"(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>
 </summary>
 
+<seealso><a href="programs/httpd.html">httpd</a></seealso>
+<seealso><a href="programs/apachectl.html">apachectl</a></seealso>
+
 <section id="introduction"><title>$B%$%s%H%m%@%/%7%g%s(B</title>
-    <p>$B$?$/$5$s$N<B9T7A<0(B <code>httpd</code> $B$,%7%9%F%`>e$G(B
+
+    <p>Apache $B$rDd;_$7$?$j:F5/F0$7$?$j$9$k$?$a$K$O!"<B9T$5$l$F$$$k(B
+    <code>httpd</code> $B%W%m%;%9$K%7%0%J%k$rAw$kI,MW$,$"$j$^$9!#(B
+    $B%7%0%J%k$rAw$k$K$OFs$D$NJ}K!$,$"$j$^$9!#(B
+    $B0l$DL\$O%W%m%;%9$KD>@\%7%0%J%k$rAw$k(B unix $B$N(B <code>kill</code>
+    $B%3%^%s%I$r;HMQ$9$kJ}K!$G$9!#(B
+    $B%7%9%F%`$r8+$l$P$?$/$5$s$N(B <code>httpd</code> $B$,(B
     $B<B9T$5$l$F$$$k$N$K5$$,IU$/$G$7$g$&$,!"%7%0%J%k$rAw$k$N$O(B
     $B?F%W%m%;%9$@$1$G!"$=$l0J30$N8D!9$N%W%m%;%9$K$O(B
     $B%7%0%J%k$rAw$i$J$$$G2<$5$$!#$=$N?F%W%m%;%9$N(B pid $B$O(B
@@ -24,37 +36,45 @@
     $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>
+    <a href="#term"><code>TERM</code></a>,
+    <a href="#hup"><code>HUP</code></a>, 
+    <a href="#usr1"><code>USR1</code></a>
     $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
     $B<!$N$h$&$J%3%^%s%I$rH/9T$7$F2<$5$$(B:</p>
 
-<example>kill -TERM `cat /usr/local/apache/logs/httpd.pid`</example>
+<example>kill -TERM `cat /usr/local/apache2/logs/httpd.pid`</example>
+
+    <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>, 
+    <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
+    $B;H$&$3$H$r$*A&$a$7$^$9!#(B<a
+    href="programs/apachectl.html">apachectl</a> $B$O$=$l$i$N0z?t$r$=$N$^$^(B
+    <code>httpd</code> $B$KEO$7$^$9!#(B</p>
 
-    <p>$B$3$l$N<B9T>u67$O<!$N%3%^%s%I$GFI$`$3$H$,$G$-$^$9(B:</p>
+    <p><code>httpd</code> $B$K%7%0%J%k$rAw$C$?8e!"(B
+    $B<B9T>u67$r<!$N%3%^%s%I$GFI$`$3$H$,$G$-$^$9(B:</p>
 
-<example>tail -f /usr/local/apache/logs/error_log</example>
+<example>tail -f /usr/local/apache2/logs/error_log</example>
     <p>$B$3$3$K5s$2$?Nc$O!"3F<+$N(B
     <directive module="core">ServerRoot</directive>
     $B$H(B
     <directive module="mpm_common">PidFile</directive>
     $B$N@_Dj$KE,9g$9$k$h$&$KE,59=$@5$7$F2<$5$$!#(B</p>
-
-    <p><a href="programs/apachectl.html">apachectl</a>
-    $B$H8F$P$l$k%7%'%k%9%/%j%W%H$G!"(BApache $B$K%7%0%J%k$rAw$k<j=g$r(B
-    $B<+F02=$9$k$3$H$,$G$-$^$9!#$3$N%9%/%j%W%H$N>\:Y$K4X$7$F$O!"(B
-    <a href="invoking.html">Apache $B$N5/F0(B</a>$B$NJ8=q$r$4Mw2<$5$$!#(B</p>
 </section>
 
 <section id="term"><title>$B5^$JDd;_(B</title>
 
 <dl><dt>$B%7%0%J%k(B: TERM</dt>
-<dd><code>apachectl stop</code></dd>
+<dd><code>apachectl -k stop</code></dd>
 </dl>
 
-    <p><code>TERM</code> $B%7%0%J%k$r?F%W%m%;%9$KAw$k$H!"(B
-    $BB(:B$K;R%W%m%;%9A4$F$r(B kill $B$7$h$&$H$7$^$9!#(B
+    <p><code>TERM</code> $B$"$k$$$O(B <code>stop</code> 
+    $B%7%0%J%k$r?F%W%m%;%9$KAw$k$H!"B(:B$K;R%W%m%;%9A4$F$r(B kill $B$7$h$&$H$7$^$9!#(B
     $B;R%W%m%;%9$r40A4$K(B kill $B$7=*$o$k$^$G$K?tIC$+$+$k$+$b$7$l$^$;$s!#(B
     $B$=$N8e!"?F%W%m%;%9<+?H$,=*N;$7$^$9!#(B
     $B=hM}Cf$N%j%/%(%9%H$OA4$FDd;_$5$l!"$b$O$d%j%/%(%9%H$KBP$9$k(B
@@ -64,19 +84,20 @@
 <section id="graceful"><title>$B4K$d$+$J:F5/F0(B</title>
 
 <dl><dt>$B%7%0%J%k(B: USR1</dt>
-<dd><code>apachectl graceful</code></dd>
+<dd><code>apachectl -k graceful</code></dd>
 </dl>
 
-    <p>$B?F%W%m%;%9$O(B <code>USR1</code> $B%7%0%J%k$r<u$1<h$k$H!"(B
-    $B;R%W%m%;%9$K8=:_$N%j%/%(%9%H$N=hM}$N8e$K=*N;$9$k(B
+    <p>$B?F%W%m%;%9$O(B <code>USR1</code> $B$"$k$$$O(B <code>graceful</code>
+    $B%7%0%J%k$r<u$1<h$k$H!";R%W%m%;%9$K8=:_$N%j%/%(%9%H$N=hM}$N8e$K=*N;$9$k(B
     ($B$"$k$$$O2?$b$7$F$$$J$1$l$P$9$0$K=*N;$9$k(B)
     $B$h$&$K(B<em>$B=u8@(B</em>$B$7$^$9!#(B
     $B?F%W%m%;%9$O@_Dj%U%!%$%k$r:FFI9~$7$F!"%m%0%U%!%$%k$r3+$-D>$7$^$9!#(B
     $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>
-    <note>$BFCDj$N%W%i%C%H%[!<%`$G$O(B USR1 $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
+
+    <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</note>
@@ -131,10 +152,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 httpd $B$r5/F0$7$h$&$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$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 httpd $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
@@ -144,10 +166,10 @@
 <section id="hup"><title>$B5^$J:F5/F0(B</title>
 
 <dl><dt>$B%7%0%J%k(B: HUP</dt>
-<dd><code>apachectl restart</code></dd>
+<dd><code>apachectl -k restart</code></dd>
 </dl>
 
-    <p><code>HUP</code> $B%7%0%J%k$r?F%W%m%;%9$KAw$k$H!"(B
+    <p><code>HUP</code> $B$"$k$$$O(B <code>restart</code> $B%7%0%J%k$r?F%W%m%;%9$KAw$k$H!"(B
     <code>TERM</code> $B$HF1MM$K;R%W%m%;%9$r(B kill $B$7$^$9$,!"(B
     $B?F%W%m%;%9$O=*N;$7$^$;$s!#(B
     $B@_Dj%U%!%$%k$r:FFI9~$7$F!"%m%0%U%!%$%kA4$F$r3+$-D>$7$^$9!#(B
diff --git a/docs/manual/suexec.xml.ja b/docs/manual/suexec.xml.ja
index bd0ab3b2e5..856395d61b 100644
--- a/docs/manual/suexec.xml.ja
+++ b/docs/manual/suexec.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English revision: 1.3 -->
+<!-- English revision: 1.4 -->
 
 <manualpage>
   <relativepath href="."/>
diff --git a/docs/manual/upgrading.xml.ja b/docs/manual/upgrading.xml.ja
index 5f2422314c..3d8cb8b3c9 100644
--- a/docs/manual/upgrading.xml.ja
+++ b/docs/manual/upgrading.xml.ja
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage>
 <relativepath href="."/>
-<!-- English revision: 1.5 -->
+<!-- English revision: 1.9 -->
 
 <title>1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B</title>
 
@@ -14,7 +14,7 @@
   <a href="new_features_2_0.html">$B?75!G=(B</a>$B$NJ8=q$d(B
   <code>src/CHANGES</code> $B%U%!%$%k$G8+$D$1$i$l$k$H;W$$$^$9!#(B</p>
 </summary>
-<seealso><a href="new_features_2_0.html">Apache 2.0 $B$N?75!G=(B</a></seealso>
+<seealso><a href="new_features_2_0.html">Apache 2.0 $B?75!G=$N35MW(B</a></seealso>
 
   <section id="compile-time">
     <title>$B%3%s%Q%$%k;~$N@_Dj$NJQ99(B</title>
@@ -52,12 +52,13 @@
       $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
+      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%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
       <directive module="core">AcceptPathInfo</directive>
       $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><directive module="mod_negotiation">CacheNegotiatedDocs</directive>
@@ -137,6 +138,14 @@
       $BF1$85!G=$O(B <directive module="mod_autoindex">IndexOptions</directive>
       $B%G%#%l%/%F%#%V$N(B <code>FancyIndexing</code> $B%*%W%7%g%s$G(B
       $B<B8=$G$-$^$9!#(B</li>
+
+      <li><module>mod_negotiation</module> $B$K$h$k(B MultiViews 
+      $B%3%s%F%s%H%M%4%7%(!<%7%g%s5;=Q$O!"(B
+      $B%G%U%)%k%H$N%U%!%$%k%^%C%A%s%0$,$h$j87L)$J$b$N$KJQ99$5$l$^$7$?!#(B
+      <em>$B%M%4%7%(!<%H2DG=$J(B</em>$B%U%!%$%k$N>l9g$K$N$_A*Br$5$l$^$9!#(B
+      $B0JA0$N5sF0$O!"(B<directive module="mod_mime">MultiviewsMatch</directive>
+      $B%G%#%l%/%F%#%V$r;HMQ$9$k$3$H$GI|3h$G$-$^$9!#(B</li>
+
     </ul>
   </section>
 
@@ -144,10 +153,6 @@
     <title>$B$=$NB>$NJQ99(B</title>
 
     <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
       <directive>mod_auth_digest</directive> $B$O(B
       $BI8=`%b%8%e!<%k$K$J$j$^$7$?!#(B</li>
@@ -171,4 +176,5 @@
     $BF0$-(B<strong>$B$^$;$s(B</strong>$B!#>\:Y$O(B <a
     href="developer/">$B3+H/<T8~$1J8=q(B</a> $B$K$"$j$^$9!#(B</p>
   </section>
+
 </manualpage>
diff --git a/docs/manual/urlmapping.xml.ja b/docs/manual/urlmapping.xml.ja
index 931b0d6461..a1480c16f5 100644
--- a/docs/manual/urlmapping.xml.ja
+++ b/docs/manual/urlmapping.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English revision: 1.3 -->
+<!-- English revision: 1.5 -->
 
 <manualpage>
   <relativepath href="."/>
@@ -178,11 +178,11 @@
 <example>RedirectMatch permanent ^/$
       http://www.example.com/startpage.html</example>
 
-    <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>
 
 <example>RedirectMatch temp .*
-      http://www.example.com/startpage.html</example>
+      http://othersite.example.com/startpage.html</example>
 </section>
 
 <section id="proxy"><title>$B%j%P!<%9%W%m%-%7(B</title>
@@ -265,8 +265,7 @@ ProxyPassReverse /foo/ http://internal.example.com/bar/
     $B%(%i!<%Z!<%8$rJV$7$^$9!#$3$N%(%i!<%Z!<%8$N304Q$O(B
     <directive module="core">ErrorDocument</directive> 
     $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
+    <a href="custom-error.html">$B%+%9%?%`%(%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>
 </section>