Backport Japanese translation from 2.1.

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

diff --git a/docs/manual/vhosts/fd-limits.xml.ja b/docs/manual/vhosts/fd-limits.xml.ja
index 70de579bd6baab940472dac6d25d689ec221a77e..df0aeb36a6ea74a88970da1ed31b96a41c899ce6 100644 (file)
--- a/docs/manual/vhosts/fd-limits.xml.ja
+++ b/docs/manual/vhosts/fd-limits.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 (outdated: 1.4.2.6) -->
+<!-- English Revision: 1.4.2.6 -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation
@@ -20,6 +20,7 @@
 -->
 
 <manualpage metafile="fd-limits.xml.meta">
+<parentdocument href="./">\e$B%P!<%A%c%k%[%9%H\e(B</parentdocument>
 
   <title>\e$B%U%!%$%k5-=R;R$N8B3&\e(B</title>
 

diff --git a/docs/manual/vhosts/index.xml.ja b/docs/manual/vhosts/index.xml.ja
index 8bfb24c6c84cc680cf2603db4038a00123570520..e00e6906c4845b04f9a62d94c9ef71aed4fb089b 100644 (file)
--- a/docs/manual/vhosts/index.xml.ja
+++ b/docs/manual/vhosts/index.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 (outdated: 1.3.2.10) -->
+<!-- English Revision: 1.3.2.10 -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation
@@ -20,6 +20,7 @@
 -->
 
 <manualpage metafile="index.xml.meta">
+<parentdocument href="../"/>
 
    <title>Apache \e$B%P!<%A%c%k%[%9%H@bL@=q\e(B</title>
 
@@ -29,9 +30,9 @@
     (<code>www.company1.com</code> and <code>www.company2.com</code> \e$B$N$h$&$J\e(B)
     \e$BFs$D0J>e$N%&%'%V%5%$%H$r07$&1?MQJ}K!$N$3$H$r;X$7$^$9!#\e(B
     \e$B%P!<%A%c%k%[%9%H$K$O!"3F%&%'%V%5%$%H$K0c$&\e(B IP \e$B%"%I%l%9$,$"$k\e(B
-    \e$B!V\e(B<a href="ip-based.html">IP \e$B%Y!<%9\e(B</a>\e$B!W$H!"C10l$N\e(B IP \e$B%"%I%l%9$K\e(B
+    \e$B!V\e(B<a href="ip-based.html">IP \e$B%Y!<%9\e(B</a>\e$B!W$H!"$=$l$>$l$N\e(B IP \e$B%"%I%l%9$K\e(B
     \e$BJ#?t$NL>A0$,$"$k!V\e(B<a href="name-based.html">\e$BL>A0%Y!<%9\e(B</a>\e$B!W$H$,$"$j$^$9!#\e(B
-    \e$BJ#?t$N%5%$%H$,F1$8%5!<%P$G07$o$l$F$$$k!"$H$$$&$3$H$O%(%s%I%f!<%6$K$O\e(B
+    \e$BJ#?t$N%5%$%H$,J*M}E*$KF1$8%5!<%P$G07$o$l$F$$$k!"$H$$$&$3$H$O%(%s%I%f!<%6$K$O\e(B
     \e$BL@$i$+$G$O$"$j$^$;$s!#\e(B</p>
 
     <p>Apache \e$B$O!"FC$K<j$rF~$l$J$$>uBV$G\e(B IP \e$B%Y!<%9$N%P!<%A%c%k%[%9%H\e(B
@@ -45,9 +46,13 @@
 
 </summary>
 
-<seealso>
-    <module>mod_vhost_alias</module>
-</seealso>
+<seealso><module>mod_vhost_alias</module></seealso>
+<seealso><a href="name-based.html">\e$B%M!<%`%Y!<%9$N%P!<%A%c%k%[%9%H\e(B</a></seealso>
+<seealso><a href="ip-based.html">IP \e$B%Y!<%9$N%P!<%A%c%k%[%9%H\e(B</a></seealso>
+<seealso><a href="examples.html">\e$B%P!<%A%c%k%[%9%H$N0lHLE*$J@_DjNc\e(B</a></seealso>
+<seealso><a href="fd-limits.html">\e$B%U%!%$%k5-=R;R$N8B3&\e(B</a></seealso>
+<seealso><a href="mass.html">\e$BBgNL$N%P!<%A%c%k%[%9%H$N@_Dj\e(B</a></seealso>
+<seealso><a href="details.html">\e$B%P!<%A%c%k%[%9%H$N%^%C%A%s%0$K$D$$$F$N>\:Y\e(B</a></seealso>
 
 <section id="support"><title>\e$B%P!<%A%c%k%[%9%H$N%5%]!<%H\e(B</title>
 
@@ -59,7 +64,7 @@
       <li><a href="examples.html">\e$B%P!<%A%c%k%[%9%H$N0lHLE*$J@_DjNc\e(B</a></li>
       <li><a href="fd-limits.html">\e$B%U%!%$%k5-=R;R$N8B3&\e(B</a>
       (\e$B$^$?$O!"\e(B<em>\e$BB?2a$.$k%m%0%U%!%$%k\e(B</em>)</li>
-      <li><a href="mass.html">\e$BBgNL$N%P!<%A%c%k%[%9%H$NF0E*$J@_Dj\e(B</a></li>
+      <li><a href="mass.html">\e$BBgNL$N%P!<%A%c%k%[%9%H$N@_Dj\e(B</a></li>
       <li><a href="details.html">\e$B%P!<%A%c%k%[%9%H$N%^%C%A%s%0$K$D$$$F$N>\:Y\e(B</a></li>
     </ul>
 
@@ -77,11 +82,11 @@
     </ul>
 
     <p>\e$B%P!<%A%c%k%[%9%H$N@_Dj$N%G%P%C%0$r$9$k$K$O\e(B
-    Apache \e$B$N%3%^%s%I%i%$%s%9%$%C%A\e(B <code>-t -D DUMP_VHOSTS</code> \e$B$,JXMx$G$9!#\e(B
+    Apache \e$B$N%3%^%s%I%i%$%s%9%$%C%A\e(B <code>-S</code> \e$B$,JXMx$G$9!#\e(B
     \e$B$D$^$j!"0J2<$N%3%^%s%I$rF~NO$7$^$9\e(B:</p>
 
     <example>
-    /usr/local/apache/bin/httpd -t -D DUMP_VHOSTS
+    /usr/local/apache2/bin/httpd -S
     </example>
 
     <p>\e$B$3$N%3%^%s%I$O\e(B Apache \e$B$,@_Dj%U%!%$%k$r$I$&2r@O$7$?$+$K$D$$$F=PNO$7$^$9!#\e(B

diff --git a/docs/manual/vhosts/name-based.xml.ja b/docs/manual/vhosts/name-based.xml.ja
index fb125a807969fbb795abe5ff5bf8f3276d53e64f..60b258ed0886c9b6a1476511a8cdc5d8afaf8962 100644 (file)
--- a/docs/manual/vhosts/name-based.xml.ja
+++ b/docs/manual/vhosts/name-based.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.2.5 (outdated: 1.5.2.9) -->
+<!-- English Revision: 1.5.2.9 -->
 
 <!--
  Copyright 2003-2004 The Apache Software Foundation
@@ -24,10 +24,8 @@
 <title>\e$BL>A0%Y!<%9$N%P!<%A%c%k%[%9%H\e(B</title>
 
 <summary>
-
     <p>\e$B$3$NJ8=q$G$OL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$r$I$s$J$H$-!"\e(B
     \e$B$I$&$d$C$F;H$&$+$r@bL@$7$^$9!#\e(B</p>
-
 </summary>
 
 <seealso><a href="ip-based.html">\e$B%M!<%`%Y!<%9$N%P!<%A%c%k%[%9%H\e(B</a></seealso>
@@ -99,6 +97,8 @@
     \e$B%G%#%l%/%F%#%V$G@_Dj$7$^$9!#DL>o!"\e(B<directive 
     module="core">NameVirtualHost</directive> \e$B$G\e(B
     <code>*</code> \e$B$NB0@-$r;H$C$F%5!<%P$NA4$F$N\e(B IP \e$B%"%I%l%9$r;H$$$^$9!#\e(B
+    (\e$BNc$($P\e(B SSL \e$B$N;HMQ$J$I$G\e(B) \e$BJ#?t$N%]!<%H$r;H$&$3$H$r7W2h$7$F$$$k$N$G$"$l$P!"\e(B
+    \e$B0z?t$K\e(B <code>*:80</code> \e$B$N$h$&$K%]!<%H$b4^$a$k$h$&$K$7$F$/$@$5$$!#\e(B
     <directive module="core">NameVirtualHost</directive> \e$B%G%#%l%/%F%#%V$G\e(B
     IP \e$B%"%I%l%9$r=q$$$F$b!"\e(B
     \e$B<+F0E*$K%5!<%P$,$=$N\e(B IP \e$B%"%I%l%9$r%j%C%9%s$9$k$H$$$&$3$H$O$J$$$3$H$K\e(B
@@ -120,16 +120,16 @@
     \e$B=q$/I,MW$,$"$j$^$9!#\e(B</p>
 
     <note><title>\e$B%a%$%s%[%9%H$O$J$/$J$j$^$9\e(B</title>
-    <p>\e$B4{$K$"$k%&%'%V%5!<%P$K%P!<%A%c%k%[%9%H$rDI2C$9$k>l9g!"\e(B
-    \e$B4{B8$N%&%'%V%5!<%P$KBP$7$F$b\e(B <directive module="core"
-    type="section">VirtualHost</directive>
-    \e$B%V%m%C%/$r:n$i$J$1$l$P$J$j$^$;$s!#$3$N%P!<%A%c%k%[%9%H$N\e(B
-    <directive module="core">ServerName</directive> \e$B$H\e(B
-    <directive module="core">DocumentRoot</directive>
-    \e$B$O!"%0%m!<%P%k$J\e(B <directive module="core">ServerName</directive> \e$B$H\e(B
-    <directive module="core">DocumentRoot</directive>
-    \e$B$HF1$8$b$N$K$7$^$9!#$^$?!"$3$N%P!<%A%c%k%[%9%H$r@_Dj%U%!%$%k$NCf$G\e(B
-    \e$B@hF,$KCV$$$F!"%G%U%)%k%H%[%9%H$H$7$FF0:n$9$k$h$&$K$7$^$9!#\e(B</p>
+        <p>\e$B4{$K$"$k%&%'%V%5!<%P$K%P!<%A%c%k%[%9%H$rDI2C$9$k>l9g!"\e(B
+        \e$B4{B8$N%&%'%V%5!<%P$KBP$7$F$b\e(B <directive module="core"
+        type="section">VirtualHost</directive>
+        \e$B%V%m%C%/$r:n$i$J$1$l$P$J$j$^$;$s!#$3$N%P!<%A%c%k%[%9%H$N\e(B
+        <directive module="core">ServerName</directive> \e$B$H\e(B
+        <directive module="core">DocumentRoot</directive>
+        \e$B$O!"%0%m!<%P%k$J\e(B <directive module="core">ServerName</directive> \e$B$H\e(B
+        <directive module="core">DocumentRoot</directive>
+        \e$B$HF1$8$b$N$K$7$^$9!#$^$?!"$3$N%P!<%A%c%k%[%9%H$r@_Dj%U%!%$%k$NCf$G\e(B
+        \e$B@hF,$KCV$$$F!"%G%U%)%k%H%[%9%H$H$7$FF0:n$9$k$h$&$K$7$^$9!#\e(B</p>
     </note>
 
     <p>\e$B$?$H$($P!"\e(B<code>www.domain.tld</code> \e$B$rF0$+$7$F$$$F!"\e(B
@@ -139,26 +139,30 @@
     \e$B$K0J2<$N$h$&$J%3!<%I$rDI2C$9$k$@$1$G$9\e(B</p>
 
     <example>
-    NameVirtualHost *<br />
-    <br />
-    &lt;VirtualHost *&gt;<br />
-    <indent>
-    ServerName www.domain.tld<br />
-    DocumentRoot /www/domain<br />
-    </indent>
-    &lt;/VirtualHost&gt;<br />
-    <br />
-    &lt;VirtualHost *&gt;<br />
-    <indent>
-    ServerName www.otherdomain.tld<br />
-    DocumentRoot /www/otherdomain<br />
-    </indent>
-    &lt;/VirtualHost&gt;<br />
+        NameVirtualHost *:80<br />
+        <br />
+        &lt;VirtualHost *:80&gt;<br />
+        <indent>
+            ServerName www.domain.tld<br />
+            ServerAlias domain.tld *.domain.tld<br />
+            DocumentRoot /www/domain<br />
+        </indent>
+        &lt;/VirtualHost&gt;<br />
+        <br />
+        &lt;VirtualHost *:80&gt;<br />
+        <indent>ServerName www.otherdomain.tld<br />
+            DocumentRoot /www/otherdomain<br />
+        </indent>
+        &lt;/VirtualHost&gt;<br />
     </example>
 
     <p><directive module="core">NameVirtualHost</directive> \e$B5Z$S\e(B
     <directive module="core">VirtualHost</directive> \e$B$N$I$A$i$N>l9g$b!"\e(B
-    * \e$B$NItJ,$K$OL@<(E*$K\e(B IP \e$B%"%I%l%9$r;XDj$9$k$3$H$,$G$-$^$9!#\e(B</p>
+    * \e$B$NItJ,$K$OL@<(E*$K\e(B IP \e$B%"%I%l%9$r;XDj$9$k$3$H$,$G$-$^$9!#\e(B
+    \e$BNc$($P!"$"$k\e(B IP \e$B%"%I%l%9$G$OL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$r;H$$$?$$0lJ}$G!"\e(B
+    \e$BJL$N\e(B IP \e$B%"%I%l%9$G$O!"B>$N\e(B IP \e$B%Y!<%9$N%P!<%A%c%k%[%9%H$d\e(B
+    \e$BJLAH$NL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$r;H$$$?$$>l9g!"\e(B
+    \e$B$=$&@_Dj$9$k$3$H$K$J$k$G$7$g$&!#\e(B</p>
 
     <p>\e$BJ#?t$NL>A0$G%5!<%P%"%/%;%9$,$G$-$k$h$&$K$7$?$$$3$H$bB?$$$G$7$g$&!#\e(B
     \e$B$3$N$h$&$J$3$H$O!"\e(B<directive module="core"
@@ -173,7 +177,7 @@
     \e$B%G%#%l%/%F%#%V$G;XDj$G$-$^$9!#\e(B</p> 
 
     <example>
-    ServerAlias domain.tld *.domain.tld
+        ServerAlias domain.tld *.domain.tld
     </example>
 
     <p><code>domain.tld</code> \e$B%I%a%$%s$X$NA4$F$N%[%9%H$X$N%j%/%(%9%H$O\e(B
@@ -246,15 +250,15 @@
     <p>\e$B@_DjNc\e(B</p>
 
     <example>
-    NameVirtualHost 111.22.33.44<br />
-    <br />
-    &lt;VirtualHost 111.22.33.44&gt;<br />
-    <indent>
-    ServerName www.domain.tld<br />
-    ServerPath /domain<br />
-    DocumentRoot /web/domain<br />
-    </indent>
-    &lt;/VirtualHost&gt;<br />
+        NameVirtualHost 111.22.33.44<br />
+        <br />
+        &lt;VirtualHost 111.22.33.44&gt;<br />
+        <indent>
+            ServerName www.domain.tld<br />
+            ServerPath /domain<br />
+            DocumentRoot /web/domain<br />
+        </indent>
+        &lt;/VirtualHost&gt;<br />
     </example>
 
     <p>\e$B$3$NNc$K$O$I$&$$$&0UL#$,$"$k$G$7$g$&$+\e(B? \e$B$3$l$O\e(B
@@ -282,5 +286,3 @@
 
 </section>
 </manualpage>
-
-