You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yo...@apache.org on 2004/09/04 23:01:08 UTC

cvs commit: httpd-2.0/docs/manual/vhosts fd-limits.xml.ja index.xml.ja name-based.xml.ja

yoshiki     2004/09/04 14:01:08

  Modified:    docs/manual/vhosts Tag: APACHE_2_0_BRANCH fd-limits.xml.ja
                        index.xml.ja name-based.xml.ja
  Log:
  Backport Japanese translation from 2.1.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.2.7   +2 -1      httpd-2.0/docs/manual/vhosts/fd-limits.xml.ja
  
  Index: fd-limits.xml.ja
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/fd-limits.xml.ja,v
  retrieving revision 1.2.2.6
  retrieving revision 1.2.2.7
  diff -u -r1.2.2.6 -r1.2.2.7
  --- fd-limits.xml.ja	17 Apr 2004 19:32:02 -0000	1.2.2.6
  +++ fd-limits.xml.ja	4 Sep 2004 21:01:08 -0000	1.2.2.7
  @@ -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="./">$B%P!<%A%c%k%[%9%H(B</parentdocument>
   
     <title>$B%U%!%$%k5-=R;R$N8B3&(B</title>
   
  
  
  
  1.1.2.7   +14 -9     httpd-2.0/docs/manual/vhosts/index.xml.ja
  
  Index: index.xml.ja
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/index.xml.ja,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- index.xml.ja	17 Apr 2004 19:32:02 -0000	1.1.2.6
  +++ index.xml.ja	4 Sep 2004 21:01:08 -0000	1.1.2.7
  @@ -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 $B%P!<%A%c%k%[%9%H@bL@=q(B</title>
   
  @@ -29,9 +30,9 @@
       (<code>www.company1.com</code> and <code>www.company2.com</code> $B$N$h$&$J(B)
       $BFs$D0J>e$N%&%'%V%5%$%H$r07$&1?MQJ}K!$N$3$H$r;X$7$^$9!#(B
       $B%P!<%A%c%k%[%9%H$K$O!"3F%&%'%V%5%$%H$K0c$&(B IP $B%"%I%l%9$,$"$k(B
  -    $B!V(B<a href="ip-based.html">IP $B%Y!<%9(B</a>$B!W$H!"C10l$N(B IP $B%"%I%l%9$K(B
  +    $B!V(B<a href="ip-based.html">IP $B%Y!<%9(B</a>$B!W$H!"$=$l$>$l$N(B IP $B%"%I%l%9$K(B
       $BJ#?t$NL>A0$,$"$k!V(B<a href="name-based.html">$BL>A0%Y!<%9(B</a>$B!W$H$,$"$j$^$9!#(B
  -    $BJ#?t$N%5%$%H$,F1$8%5!<%P$G07$o$l$F$$$k!"$H$$$&$3$H$O%(%s%I%f!<%6$K$O(B
  +    $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(B
       $BL@$i$+$G$O$"$j$^$;$s!#(B</p>
   
       <p>Apache $B$O!"FC$K<j$rF~$l$J$$>uBV$G(B IP $B%Y!<%9$N%P!<%A%c%k%[%9%H(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">$B%M!<%`%Y!<%9$N%P!<%A%c%k%[%9%H(B</a></seealso>
  +<seealso><a href="ip-based.html">IP $B%Y!<%9$N%P!<%A%c%k%[%9%H(B</a></seealso>
  +<seealso><a href="examples.html">$B%P!<%A%c%k%[%9%H$N0lHLE*$J@_DjNc(B</a></seealso>
  +<seealso><a href="fd-limits.html">$B%U%!%$%k5-=R;R$N8B3&(B</a></seealso>
  +<seealso><a href="mass.html">$BBgNL$N%P!<%A%c%k%[%9%H$N@_Dj(B</a></seealso>
  +<seealso><a href="details.html">$B%P!<%A%c%k%[%9%H$N%^%C%A%s%0$K$D$$$F$N>\:Y(B</a></seealso>
   
   <section id="support"><title>$B%P!<%A%c%k%[%9%H$N%5%]!<%H(B</title>
   
  @@ -59,7 +64,7 @@
         <li><a href="examples.html">$B%P!<%A%c%k%[%9%H$N0lHLE*$J@_DjNc(B</a></li>
         <li><a href="fd-limits.html">$B%U%!%$%k5-=R;R$N8B3&(B</a>
         ($B$^$?$O!"(B<em>$BB?2a$.$k%m%0%U%!%$%k(B</em>)</li>
  -      <li><a href="mass.html">$BBgNL$N%P!<%A%c%k%[%9%H$NF0E*$J@_Dj(B</a></li>
  +      <li><a href="mass.html">$BBgNL$N%P!<%A%c%k%[%9%H$N@_Dj(B</a></li>
         <li><a href="details.html">$B%P!<%A%c%k%[%9%H$N%^%C%A%s%0$K$D$$$F$N>\:Y(B</a></li>
       </ul>
   
  @@ -77,11 +82,11 @@
       </ul>
   
       <p>$B%P!<%A%c%k%[%9%H$N@_Dj$N%G%P%C%0$r$9$k$K$O(B
  -    Apache $B$N%3%^%s%I%i%$%s%9%$%C%A(B <code>-t -D DUMP_VHOSTS</code> $B$,JXMx$G$9!#(B
  +    Apache $B$N%3%^%s%I%i%$%s%9%$%C%A(B <code>-S</code> $B$,JXMx$G$9!#(B
       $B$D$^$j!"0J2<$N%3%^%s%I$rF~NO$7$^$9(B:</p>
   
       <example>
  -    /usr/local/apache/bin/httpd -t -D DUMP_VHOSTS
  +    /usr/local/apache2/bin/httpd -S
       </example>
   
       <p>$B$3$N%3%^%s%I$O(B Apache $B$,@_Dj%U%!%$%k$r$I$&2r@O$7$?$+$K$D$$$F=PNO$7$^$9!#(B
  
  
  
  1.2.2.6   +43 -41    httpd-2.0/docs/manual/vhosts/name-based.xml.ja
  
  Index: name-based.xml.ja
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/name-based.xml.ja,v
  retrieving revision 1.2.2.5
  retrieving revision 1.2.2.6
  diff -u -r1.2.2.5 -r1.2.2.6
  --- name-based.xml.ja	17 Apr 2004 19:32:02 -0000	1.2.2.5
  +++ name-based.xml.ja	4 Sep 2004 21:01:08 -0000	1.2.2.6
  @@ -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>$BL>A0%Y!<%9$N%P!<%A%c%k%[%9%H(B</title>
   
   <summary>
  -
       <p>$B$3$NJ8=q$G$OL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$r$I$s$J$H$-!"(B
       $B$I$&$d$C$F;H$&$+$r@bL@$7$^$9!#(B</p>
  -
   </summary>
   
   <seealso><a href="ip-based.html">$B%M!<%`%Y!<%9$N%P!<%A%c%k%[%9%H(B</a></seealso>
  @@ -99,6 +97,8 @@
       $B%G%#%l%/%F%#%V$G@_Dj$7$^$9!#DL>o!"(B<directive 
       module="core">NameVirtualHost</directive> $B$G(B
       <code>*</code> $B$NB0@-$r;H$C$F%5!<%P$NA4$F$N(B IP $B%"%I%l%9$r;H$$$^$9!#(B
  +    ($BNc$($P(B SSL $B$N;HMQ$J$I$G(B) $BJ#?t$N%]!<%H$r;H$&$3$H$r7W2h$7$F$$$k$N$G$"$l$P!"(B
  +    $B0z?t$K(B <code>*:80</code> $B$N$h$&$K%]!<%H$b4^$a$k$h$&$K$7$F$/$@$5$$!#(B
       <directive module="core">NameVirtualHost</directive> $B%G%#%l%/%F%#%V$G(B
       IP $B%"%I%l%9$r=q$$$F$b!"(B
       $B<+F0E*$K%5!<%P$,$=$N(B IP $B%"%I%l%9$r%j%C%9%s$9$k$H$$$&$3$H$O$J$$$3$H$K(B
  @@ -120,16 +120,16 @@
       $B=q$/I,MW$,$"$j$^$9!#(B</p>
   
       <note><title>$B%a%$%s%[%9%H$O$J$/$J$j$^$9(B</title>
  -    <p>$B4{$K$"$k%&%'%V%5!<%P$K%P!<%A%c%k%[%9%H$rDI2C$9$k>l9g!"(B
  -    $B4{B8$N%&%'%V%5!<%P$KBP$7$F$b(B <directive module="core"
  -    type="section">VirtualHost</directive>
  -    $B%V%m%C%/$r:n$i$J$1$l$P$J$j$^$;$s!#$3$N%P!<%A%c%k%[%9%H$N(B
  -    <directive module="core">ServerName</directive> $B$H(B
  -    <directive module="core">DocumentRoot</directive>
  -    $B$O!"%0%m!<%P%k$J(B <directive module="core">ServerName</directive> $B$H(B
  -    <directive module="core">DocumentRoot</directive>
  -    $B$HF1$8$b$N$K$7$^$9!#$^$?!"$3$N%P!<%A%c%k%[%9%H$r@_Dj%U%!%$%k$NCf$G(B
  -    $B@hF,$KCV$$$F!"%G%U%)%k%H%[%9%H$H$7$FF0:n$9$k$h$&$K$7$^$9!#(B</p>
  +        <p>$B4{$K$"$k%&%'%V%5!<%P$K%P!<%A%c%k%[%9%H$rDI2C$9$k>l9g!"(B
  +        $B4{B8$N%&%'%V%5!<%P$KBP$7$F$b(B <directive module="core"
  +        type="section">VirtualHost</directive>
  +        $B%V%m%C%/$r:n$i$J$1$l$P$J$j$^$;$s!#$3$N%P!<%A%c%k%[%9%H$N(B
  +        <directive module="core">ServerName</directive> $B$H(B
  +        <directive module="core">DocumentRoot</directive>
  +        $B$O!"%0%m!<%P%k$J(B <directive module="core">ServerName</directive> $B$H(B
  +        <directive module="core">DocumentRoot</directive>
  +        $B$HF1$8$b$N$K$7$^$9!#$^$?!"$3$N%P!<%A%c%k%[%9%H$r@_Dj%U%!%$%k$NCf$G(B
  +        $B@hF,$KCV$$$F!"%G%U%)%k%H%[%9%H$H$7$FF0:n$9$k$h$&$K$7$^$9!#(B</p>
       </note>
   
       <p>$B$?$H$($P!"(B<code>www.domain.tld</code> $B$rF0$+$7$F$$$F!"(B
  @@ -139,26 +139,30 @@
       $B$K0J2<$N$h$&$J%3!<%I$rDI2C$9$k$@$1$G$9(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> $B5Z$S(B
       <directive module="core">VirtualHost</directive> $B$N$I$A$i$N>l9g$b!"(B
  -    * $B$NItJ,$K$OL@<(E*$K(B IP $B%"%I%l%9$r;XDj$9$k$3$H$,$G$-$^$9!#(B</p>
  +    * $B$NItJ,$K$OL@<(E*$K(B IP $B%"%I%l%9$r;XDj$9$k$3$H$,$G$-$^$9!#(B
  +    $BNc$($P!"$"$k(B IP $B%"%I%l%9$G$OL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$r;H$$$?$$0lJ}$G!"(B
  +    $BJL$N(B IP $B%"%I%l%9$G$O!"B>$N(B IP $B%Y!<%9$N%P!<%A%c%k%[%9%H$d(B
  +    $BJLAH$NL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$r;H$$$?$$>l9g!"(B
  +    $B$=$&@_Dj$9$k$3$H$K$J$k$G$7$g$&!#(B</p>
   
       <p>$BJ#?t$NL>A0$G%5!<%P%"%/%;%9$,$G$-$k$h$&$K$7$?$$$3$H$bB?$$$G$7$g$&!#(B
       $B$3$N$h$&$J$3$H$O!"(B<directive module="core"
  @@ -173,7 +177,7 @@
       $B%G%#%l%/%F%#%V$G;XDj$G$-$^$9!#(B</p> 
   
       <example>
  -    ServerAlias domain.tld *.domain.tld
  +        ServerAlias domain.tld *.domain.tld
       </example>
   
       <p><code>domain.tld</code> $B%I%a%$%s$X$NA4$F$N%[%9%H$X$N%j%/%(%9%H$O(B
  @@ -246,15 +250,15 @@
       <p>$B@_DjNc(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>$B$3$NNc$K$O$I$&$$$&0UL#$,$"$k$G$7$g$&$+(B? $B$3$l$O(B
  @@ -282,5 +286,3 @@
   
   </section>
   </manualpage>
  -
  -