Update Japanese translation.

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

6 files changed, 34 insertions, 27 deletions

diff --git a/docs/manual/handler.xml.ja b/docs/manual/handler.xml.ja
index 49e81e0fd0..9bc5a2410e 100644
--- a/docs/manual/handler.xml.ja
+++ b/docs/manual/handler.xml.ja
@@ -1,11 +1,11 @@
 <?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: 151408:160365 (outdated) -->
+<!-- English Revision: 160365 -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
         <module>mod_actions</module>
         <module>mod_asis</module>
         <module>mod_cgi</module>
-        <module>mod_imap</module>
+        <module>mod_imagemap</module>
         <module>mod_info</module>
         <module>mod_mime</module>
         <module>mod_negotiation</module>
@@ -87,7 +87,7 @@
 
       <li><strong>imap-file</strong>:
       $B%$%a!<%8%^%C%W$N%k!<%k%U%!%$%k$H$7$F2r@O$7$^$9!#(B
-      (<module>mod_imap</module>)</li>
+      (<module>mod_imagemap</module>)</li>
 
       <li><strong>server-info</strong>: $B%5!<%P$N@_Dj>pJs$r<hF@$7$^$9!#(B
       (<module>mod_info</module>)</li>
diff --git a/docs/manual/index.xml.ja b/docs/manual/index.xml.ja
index 118101cdb5..0f592fc735 100644
--- a/docs/manual/index.xml.ja
+++ b/docs/manual/index.xml.ja
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-2022-jp" ?>
 <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 151408:160701 (outdated) -->
+<!-- English Revision: 160701 -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 <category id="release"><title>$B%j%j!<%9%N!<%H(B</title>
     <page href="new_features_2_2.html">Apache 2.1/2.2 $B$N?75!G=(B</page>
     <page href="new_features_2_0.html">Apache 2.0 $B$N?75!G=(B</page>
-    <page href="upgrading.html">1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B</page>
+    <page href="upgrading.html">2.0 $B$+$i(B 2.2 $B$X$N%"%C%W%0%l!<%I(B</page>
     <page href="license.html">Apache $B%i%$%;%s%9(B</page>
 </category>
 
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 70d0d456fb..3cdcd94d55 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 154184:160696 (outdated) -->
+<!-- English Revision: 161140 -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
@@ -1457,7 +1457,7 @@ module="core">Directory</directive></seealso>
 <name>KeepAliveTimeout</name>
 <description>$B;}B3E*$J@\B3$G<!$N%j%/%(%9%H$,Mh$k$^$G%5!<%P$,BT$D;~4V(B</description>
 <syntax>KeepAliveTimeout <var>seconds</var></syntax>
-<default>KeepAliveTimeout 15</default>
+<default>KeepAliveTimeout 5</default>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
 
@@ -2937,7 +2937,7 @@ module="core">Directory</directive></seealso>
 <name>UseCanonicalName</name>
 <description>$B%5!<%P$,<+J,<+?H$NL>A0$H%]!<%H$r7hDj$9$kJ}K!$r@_Dj$9$k(B</description>
 <syntax>UseCanonicalName On|Off|Dns</syntax>
-<default>UseCanonicalName On</default>
+<default>UseCanonicalName Off</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context></contextlist>
 
diff --git a/docs/manual/mod/mod_authz_host.xml.ja b/docs/manual/mod/mod_authz_host.xml.ja
index c6393e8119..e2bc1ba7fd 100644
--- a/docs/manual/mod/mod_authz_host.xml.ja
+++ b/docs/manual/mod/mod_authz_host.xml.ja
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408:160356 (outdated) -->
+<!-- English Revision: 160356 -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -99,7 +99,8 @@
 
       <dd>
       <example><title>$BNc(B</title>
-        Allow from apache.org
+        Allow from apache.org<br />
+        Allow from .net example.edu
       </example>
       <p>$B$3$NJ8;zNs$K9g$&$+!"$3$l$G=*$o$kL>A0$N%[%9%H$N%"%/%;%9$,5v2D$5$l$^$9!#(B
       $B3FItJ,$,40A4$K9g$&$b$N$@$1$KE,MQ$5$l$^$9$N$G!">e$NNc$O(B
@@ -117,7 +118,8 @@
 
       <dd>
       <example><title>$BNc(B</title>
-        Allow from 10.1.2.3
+        Allow from 10.1.2.3<br />
+        Allow from 192.168.1.104 192.168.1.205
       </example>
       <p>$B%"%/%;%9$r5v2D$9$k(B IP $B%"%I%l%9$G$9!#(B</p></dd>
 
@@ -125,7 +127,8 @@
 
       <dd>
       <example><title>$BNc(B</title>
-        Allow from 10.1
+        Allow from 10.1<br />
+        Allow from 10 172.20 192.168.2
       </example>
       <p>$B%5%V%M%C%H$N@)8BMQ$N!"(BIP
       $B%"%I%l%9$N:G=i$N0l$D$+$i;0$D$^$G$N%P%$%H$G$9!#(B</p></dd>
diff --git a/docs/manual/mod/mod_mime.xml.ja b/docs/manual/mod/mod_mime.xml.ja
index 1652cde9bd..ed3551b315 100644
--- a/docs/manual/mod/mod_mime.xml.ja
+++ b/docs/manual/mod/mod_mime.xml.ja
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408:160365 (outdated) -->
+<!-- English Revision: 160365 -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -123,12 +123,12 @@ module="mod_mime_magic">MimeMagicFile</directive></seealso>
     $B%?%$%W$H%O%s%I%i$NN>J}$K4XO"IU$1$i$l$F$$$k$H$-$OCm0U$9$kI,MW$,$"$j$^$9!#(B
     $B$=$N>l9g!"IaDL$O%j%/%(%9%H$,%O%s%I%i$K4XO"IU$1$i$l$?(B
     $B%b%8%e!<%k$K$h$C$F07$o$l$k$3$H$K$J$j$^$9!#$?$H$($P!"3HD%;R(B
-    <code>.imap</code> $B$,(B (mod_imap $B$N(B) <code>imap-file</code>
+    <code>.imap</code> $B$,(B (<module>mod_imagemap</module> $B$N(B) <code>imap-file</code>
     $B$K%^%C%W$5$l$F$$$F!"(B<code>.html</code> $B$,(B MIME $B%?%$%W(B <code>text/html</code>
     $B$K%^%C%W$5$l$F$$$k$H$-$O!"%U%!%$%k(B <code>world.imap.html</code> $B$O(B
     <code>imap-file</code> $B%O%s%I%i$H(B <code>text/html</code> MIME
     $B%?%$%W$K4XO"IU$1$i$l$^$9!#%U%!%$%k$,=hM}$5$l$k$H$-$O(B <code>imap-file</code>
-    $B%O%s%I%i$,;HMQ$5$l$^$9$N$G!"$=$N%U%!%$%k$O(B <module>mod_imap</module>
+    $B%O%s%I%i$,;HMQ$5$l$^$9$N$G!"$=$N%U%!%$%k$O(B <module>mod_imagemap</module>
     $B$N%$%a!<%8%^%C%W%U%!%$%k$H$7$F07$o$l$k$3$H$K$J$j$^$9!#(B</p>
 </section>
 
diff --git a/docs/manual/mod/mod_userdir.xml.ja b/docs/manual/mod/mod_userdir.xml.ja
index 0f7d6f8444..f0cb23549e 100644
--- a/docs/manual/mod/mod_userdir.xml.ja
+++ b/docs/manual/mod/mod_userdir.xml.ja
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408:160696 (outdated) -->
+<!-- English Revision: 160696 -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -45,7 +45,6 @@
 <name>UserDir</name>
 <description>$B%f!<%6@lMQ%G%#%l%/%H%j$N0LCV(B</description>
 <syntax>UserDir <em>directory-filename</em></syntax>
-<default>UserDir public_html</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
 
@@ -155,6 +154,11 @@ Apache $B$O%j%@%$%l%/%H$,@.8y$9$k$+$I$&$+$r7h$a$k$3$H$O$G$-$^$;$s$N$G!"(B
 $B%j%9%H$NA0$NJ}$K%j%@%$%l%/%H$r=q$/$H!"$=$l$,I,$:;HMQ$5$l$kA*Br;h$K(B
 $B$J$C$F$7$^$$$^$9!#(B</p>
 
+<p>2.1.4 $B0J9_$G$O!"%f!<%6%G%#%l%/%H%jCV495!G=$O%G%U%)%k%H$G$O5/F0$7$^$;$s!#(B
+$B$=$l0JA0$N%P!<%8%g%s$G$O!"(B<directive module="mod_userdir">UserDir</directive>
+$B%G%#%l%/%F%#%V$,B8:_$7$J$1$l$P!"(B<code>UserDir public_html</code> 
+$B$G$"$k$H2>Dj$5$l$F$$$^$7$?!#(B</p>
+
 </usage>
 
 <seealso><a href="../howto/public_html.html">public_html