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 2002/12/16 09:23:26 UTC

cvs commit: httpd-2.0/docs/manual configuring.xml.ja env.xml.ja invoking.xml.ja logs.xml.ja mpm.xml.ja stopping.xml.ja upgrading.xml.ja

yoshiki     2002/12/16 00:23:26

  Modified:    docs/manual Tag: APACHE_2_0_BRANCH configuring.xml.ja
                        env.xml.ja invoking.xml.ja logs.xml.ja mpm.xml.ja
                        stopping.xml.ja upgrading.xml.ja
  Log:
  Update Japanese translations.
  
  Sumitted by:	Hiroaki KAWAI <ha...@bcl.t.u-tokyo.ac.jp>
  Reviewed by:	Yoshiki Hayashi
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +6 -16     httpd-2.0/docs/manual/configuring.xml.ja
  
  Index: configuring.xml.ja
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/configuring.xml.ja,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- configuring.xml.ja	7 Nov 2002 07:28:38 -0000	1.3
  +++ configuring.xml.ja	16 Dec 2002 08:23:25 -0000	1.3.2.1
  @@ -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>$B@_Dj%U%!%$%k(B</title>
   
  @@ -30,20 +30,12 @@
       $B%a%$%s$N@_Dj%U%!%$%k$OIaDL$O(B <code>httpd.conf</code> $B$H$$$&L>A0$G$9!#(B
       $B$3$N%U%!%$%k$N0LCV$O%3%s%Q%$%k;~$K@_Dj$5$l$^$9$,!"%3%^%s%I%i%$%s$N(B
       <code>-f</code> $B%U%i%0$K$h$j>e=q$-$G$-$^$9!#(B
  -    $B$=$N>e!"B>$N@_Dj%U%!%$%k$,(B <directive module="core">Include</directive>
  -    $B%G%#%l%/%F%#%V$K$h$C$FDI2C$5$l$F$$$k$+$b$7$l$^$;$s!#(B
  -    $B$I$N%G%#%l%/%F%#%V$b$3$l$i$N@_Dj%U%!%$%k$N$I$l$K$G$bF~$l$i$l$^$9!#(B
  +    $B$^$?!"B>$N@_Dj%U%!%$%k$r(B <directive module="core">Include</directive>
  +    $B%G%#%l%/%F%#%V$K$h$C$FDI2C$G$-!"%o%$%k%I%+!<%I$r;HMQ$7$FB??t$N(B
  +    $B@_Dj%U%!%$%k$rDI2C$9$k$3$H$,$G$-$^$9!#(B
  +    $B$I$s$J%G%#%l%/%F%#%V$b!"$3$l$i$N@_Dj%U%!%$%k$I$l$K$G$bF~$l$k$3$H$,$G$-$^$9!#(B
       Apache $B$O5/F0;~$+:F5/F0;~$N$_%a%$%s@_Dj%U%!%$%k$NJQ99$rG'<1$7$^$9!#(B</p>
   
  -    <p>Apache 1.3.13 $B$N?7$7$$5!G=$H$7$F!"@_Dj%U%!%$%k$,<B:]$O%G%#%l%/%H%j$G(B
  -    $B$"$k$H$-$K$O$=$N%G%#%l%/%H%j$G8+$D$+$C$?$9$Y$F$N%U%!%$%k(B
  -    ($B$H%5%V%G%#%l%/%H%j(B) $B$r2r@O$9$k$H$$$&$b$N$,$"$j$^$9!#MxMQK!$H$7$F$O!"(B
  -    $B%P!<%A%c%k%[%9%H$rDI2C$9$k$H$-$K!"$=$l$>$l$N%[%9%H$KBP$7$F>.$5$J@_Dj(B
  -    $B%U%!%$%k$r:n$j!"@_Dj%G%#%l%/%H%j$KCV$/$H$$$&$b$N$,5s$2$i$l$^$9!#(B
  -    $B$3$&$9$k$H!"C1$K%U%!%$%k$NDI2C!":o=|$r$9$k$3$H$K$h$jA4$/%U%!%$%k$r(B
  -    $BJT=8$9$k$3$H$J$/%P!<%A%c%k%[%9%H$NDI2C!":o=|$,$G$-$^$9!#(B
  -    $B$3$l$O<+F02=$r$:$C$H4JC1$K$7$^$9!#(B</p>
  -
       <p>$B%5!<%P$O(B MIME
       $B%I%-%e%a%s%H%?%$%W$r4^$s$G$$$k%U%!%$%k$bFI$_9~$_$^$9!#%U%!%$%kL>$O(B
       <directive module="mod_mime">TypesConfig</directive>
  @@ -185,9 +177,7 @@
       $B%U%!%$%k$K=q$1$k$h$&$K$9$k$+$r@)8f$9$k$3$H$,$G$-$^$9!#(B</p>
   
       <p><code>.htaccess</code> $B%U%!%$%k$K4X$9$k>\$7$$>pJs$O(B
  -    Ken Coar $B$5$s$N%A%e!<%H%j%"%k(B
  -    <a href="http://apache-server.com/tutorials/ATusing-htaccess.html"
  -    >Using .htaccess Files with Apache</a> 
  +    <a href="howto/htaccess.html">.htaccess $B%A%e!<%H%j%"%k(B</a>
       $B$r;2>H$7$F$/$@$5$$!#(B</p>
     </section>
   </manualpage>
  
  
  
  1.2.2.1   +12 -10    httpd-2.0/docs/manual/env.xml.ja
  
  Index: env.xml.ja
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/env.xml.ja,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- env.xml.ja	10 Oct 2002 12:50:58 -0000	1.2
  +++ env.xml.ja	16 Dec 2002 08:23:25 -0000	1.2.2.1
  @@ -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.6.2.2 -->
   
   <manualpage>
     <relativepath href="."/>
  @@ -116,7 +116,7 @@
       
       <related>
         <modulelist>
  -        <module>mod_authz_host</module>
  +        <module>mod_access</module>
           <module>mod_cgi</module>
           <module>mod_ext_filter</module>
           <module>mod_headers</module>
  @@ -125,9 +125,9 @@
           <module>mod_rewrite</module>
         </modulelist>
         <directivelist>
  -        <directive module="mod_authz_host">Allow</directive>
  +        <directive module="mod_access">Allow</directive>
           <directive module="mod_log_config">CustomLog</directive>
  -        <directive module="mod_authz_host">Deny</directive>
  +        <directive module="mod_access">Deny</directive>
           <directive module="mod_ext_filter">ExtFilterDefine</directive>
           <directive module="mod_headers">Header</directive>
           <directive module="mod_log_config">LogFormat</directive>
  @@ -255,8 +255,9 @@
       <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>
  @@ -269,6 +270,11 @@
   	$BDs6!$N(B <code>DEFLATE</code> $B=PNO%U%#%k%?$rL58z$K$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</p>
  +    </section>
  +
       <section id="nokeepalive">
           <title>nokeepalive</title>
       
  @@ -381,7 +387,3 @@
       </section>
     </section>
   </manualpage>
  -
  -
  -
  -
  
  
  
  1.1.2.1   +29 -13    httpd-2.0/docs/manual/invoking.xml.ja
  
  Index: invoking.xml.ja
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/invoking.xml.ja,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- invoking.xml.ja	29 Aug 2002 06:43:42 -0000	1.1
  +++ invoking.xml.ja	16 Dec 2002 08:23:25 -0000	1.1.2.1
  @@ -3,7 +3,7 @@
   <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
   <manualpage>
   <relativepath href="."/>
  -<!-- English revision: 1.1 -->
  +<!-- English revision: 1.2 -->
   
     <title>Apache $B$N5/F0(B</title>
   
  @@ -20,6 +20,10 @@
       <code>httpd</code> $B$r5/F0$9$k$+$K$D$$$F5-=R$7$F$$$^$9!#(B</p>
   </summary>
   
  +<seealso><a href="stopping.html">$BDd;_$H:F5/F0(B</a></seealso>
  +<seealso><a href="programs/httpd.html">httpd</a></seealso>
  +<seealso><a href="programs/apachectl.html">apachectl</a></seealso>
  +
   <section id="startup"><title>Apache $B$N5/F0J}K!(B</title>
   
       <p>$B$b$7!"@_Dj%U%!%$%kCf$G;XDj$5$l$F$$$k(B
  @@ -36,6 +40,19 @@
       $B$3$l$OA*Br$7$?(B<a 
       href="mpm.html">$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B</a>$B$G@)8f$5$l$^$9!#(B</p>
   
  +    <p>$B?d>)$N(B <code>httpd</code> $B<B9T%W%m%0%i%`$N5/F0J}K!$O!"(B
  +    <a href="programs/apachectl.html">apachectl</a>
  +    $B@)8f%9%/%j%W%H$r;HMQ$9$kJ}K!$G$9!#$3$N%9%/%j%W%H$O!"(B<code>httpd</code> 
  +    $B$,%*%Z%l!<%F...@5>o$KF0:n$9$k$h$&$KI,MW$J4D6-JQ?t$r(B
  +    $BE,@Z$K@_Dj$7$F!"(B<code>httpd</code> $B%P%$%J%j$r5/F0$7$^$9!#(B
  +    <code>apachectl</code> $B$O$I$s$J%3%^%s%I%i%$%s0z?t$bDL2a$5$;$^$9$N$G!"(B
  +    <code>httpd</code> $B$N$I$N%3%^%s%I%i%$%s%*%W%7%g%s$b(B
  +    <code>apchectl</code> $B$N%*%W%7%g%s$H$7$F;HMQ$G$-$^$9!#(B
  +    $B$^$?!"(B<code>apchectl</code> $B%9%/%j%W%H$rD>@\JT=8$7!"(B
  +    $B%9%/%j%W%H@hF,IU6a$N(B <code>HTTPD</code> $BJQ?t$rJQ99$9$k$3$H$G!"(B
  +    <code>httpd</code> $B%P%$%J%j$N@5$7$$0LCV$r;XDj$7$?$j!"(B<em>$B>o$K(B</em>
  +    $BIU2C$5$;$k%3%^%s%I%i%$%s0z?t$r;XDj$7$?$j$9$k$3$H$,$G$-$^$9!#(B</p>
  +
       <p><code>httpd</code> $B$,5/F0$5$l$F$^$::G=i$K$9$k$3$H$O!"(B
       <a href="configuring.html">$B@_Dj%U%!%$%k(B</a>
       <code>httpd.conf</code> $B$N0LCV$rFCDj$7$FFI$_9~$`$3$H$G$9!#(B
  @@ -43,16 +60,9 @@
       <code>-f</code> $B%3%^%s%I%i%$%s%*%W%7%g%s$r;H$C$F(B
       $B0LCV$r;XDj$9$k$3$H$b$G$-$^$9!#Nc$($P<!$N$h$&$K$G$9!#(B</p>
   
  -<example>/usr/local/apache/bin/httpd -f
  +<example>/usr/local/apache2/bin/apachectl -f
         /usr/local/apache/conf/httpd.conf</example>
   
  -    <p><code>httpd</code> $B$N%P%$%J%j$rD>@\5/F0$9$kBe$o$j$K!"(B
  -    <a href="programs/apachectl.html">apachectl</a>
  -    $B$H$$$&%7%'%k%9%/%j%W%H$,Ds6!$5$l$F$$$^$9!#(B
  -    <code>apachectl start</code> $B$d(B <code>apachectl stop</code>
  -    $B$H$$$C$?4JC1$J%3%^%s%I$G!"(B
  -    $B%G!<%b%s%W%m%;%9$r@)8f$9$k$N$K;H$($^$9!#(B</p>
  -
       <p>$B%9%?!<%H%"%C%W$,K|;v>e<j$/$$$C$?$i!"%5!<%P$O%?!<%_%J%k$+$i(B
       $B@Z$jN%$5$l$F!"%3%^%s%I%W%m%s%W%H$,B(:B$KLa$C$F$/$k$G$7$g$&!#(B
       $B$3$l$O%5!<%P$,5/F0$7$F$$$k>uBV$r<($7$F$$$^$9!#(B
  @@ -89,15 +99,21 @@
   
       <p>$B%7%9%F%`$,%j%V!<%H$7$?8e$G$b(B
       $B%5!<%P$,<B9T$5$lB3$1$k$h$&$K$7$?$$>l9g$O!"(B
  -    <code>httpd</code> $B$+(B <code>apachectl</code>
  +    <code>apachectl</code>
       $B$r8F$S=P$9$b$N$r%7%9%F%`%9%?!<%H%"%C%W%U%!%$%k(B
       ($BDL>o(B <code>rc.local</code> $B$d(B <code>rc.N</code>
       $BFb$N%U%!%$%k(B) $B$KDI2C$7$J$1$l$P$J$j$^$;$s!#(B
       $B$3$NJ}K!$G$O(B Apache $B$r(B root $B8"8B$G5/F0$7$^$9!#(B
       $B$3$l$r$9$kA0$K!"%;%-%e%j%F%#$d%"%/%;%9@)8B$,(B
  -    $BE,@Z$K@_Dj$5$l$F$$$F$$$k$3$H$r3NG'$7$F$/$@$5$$!#(B
  -    <code>apachectl</code> $B%9%/%j%W%H$ODL>o$O!"(B init 
  -    $B%9%/%j%W%H$H$7$FD>@\%j%s%/$G$-$k$h$&$K@_7W$5$l$F$$$^$9$,!"(B
  +    $BE,@Z$K@_Dj$5$l$F$$$F$$$k$3$H$r3NG'$7$F$/$@$5$$!#(B</p>
  +
  +    <p><code>apachectl</code> $B%9%/%j%W%H$ODL>o$O!"I8=`E*$J(B SysV init 
  +    $B%9%/%j%W%H$H$7$FF0:n$9$k$h$&$K@_7W$5$l$F$$$^$9!#(B
  +    <code>start</code>, <code>restart</code>, <code>stop</code>
  +    $B$H$$$C$?0z?t$r$H$C$F!"(B<code>httpd</code> 
  +    $B$X$NE,@Z$J%7%0%J%k$KJQ49$7$^$9!#(B
  +    $B$G$9$+$i!"DL>o$OC1$KE,@Z$J(B init $B%G%#%l%/%H%jFb$+$i(B
  +    <code>apachectl</code> $B$X%j%s%/$9$k$3$H$,$G$-$^$9!#$7$+$7!"(B
       $BG0$N$?$a%7%9%F%`$NMW5a$K9gCW$7$F$$$k$3$H$r3NG'$7$F$/$@$5$$!#(B</p>
   </section>
   
  
  
  
  1.1.2.1   +7 -18     httpd-2.0/docs/manual/logs.xml.ja
  
  Index: logs.xml.ja
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/logs.xml.ja,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- logs.xml.ja	30 Sep 2002 08:12:22 -0000	1.1
  +++ logs.xml.ja	16 Dec 2002 08:23:25 -0000	1.1.2.1
  @@ -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.6 -->
   
   <manualpage>
     <relativepath href="."/>
  @@ -440,23 +440,8 @@
       $B%W%m%0%i%`$OIaDL(B root $B$H$7$F<B9T$5$l$k$3$H$r0UL#$7$^$9!#(B
       $B$G$9$+$i!"%W%m%0%i%`$r4JC1$G0BA4$KJ]$D$3$H$,Hs>o$K=EMW$G$9!#(B</p>
   
  -    <p>$B%Q%$%W7PM3$N%m%0$r;H$&4JC1$JNc$O(B:</p>
  -
  -    <example>
  -      # compressed logs<br />
  -      CustomLog "|/usr/bin/gzip -c &gt;&gt;
  -      /var/log/access_log.gz" common<br />
  -      # almost-real-time name resolution<br />
  -      CustomLog "|/usr/local/apache/bin/logresolve &gt;&gt;
  -      /var/log/access_log" common
  -    </example>
  -
  -    <p>$B%Q%$%W$N@h$G8F$P$l$k%3%^%s%IA4BN$,0zMQId$G0O$^$l$F$$$k$3$H$KCmL\$7$F(B
  -    $B$/$@$5$$!#$3$NNc$O%"%/%;%9%m%0$r;H$C$F$$$^$9$,!"%(%i!<%m%0$K$bF1$85;=Q$r(B
  -    $B;H$&$3$H$,$G$-$^$9!#(B</p>
  -
  -    <p>$B%Q%$%W7PM3$N%m%0$N=EMW$JMxMQK!$O!"%m%0$N8rBX$r%5!<%P$N:F5/F0$J$7$G(B
  -    $B$9$k$b$N$G$9!#(BApache HTTP $B%5!<%P$K$O$3$N$?$a$N(B  <a
  +    <p>$B%Q%$%W7PM3$N%m%0$N=EMW$JMxMQK!$O!"%5!<%P$N:F5/F0$J$7$G%m%0$N8rBX$r(B
  +    $B$9$k$3$H$G$9!#(BApache HTTP $B%5!<%P$K$O$3$N$?$a$N(B  <a
       href="programs/rotatelogs.html">rotatelogs</a> $B$H8F$P$l$k4JC1$J(B
       $B%W%m%0%i%`$,IUB0$7$F$$$^$9!#$?$H$($P!"(B24 $B;~4VKh$K%m%0$r8rBX$5$;$k$K$O!"(B
       $B0J2<$N$b$N$r;H$&$3$H$,$G$-$^$9(B:</p>
  @@ -465,6 +450,10 @@
         CustomLog "|/usr/local/apache/bin/rotatelogs
         /var/log/access_log 86400" common
       </example>
  +
  +    <p>$B%Q%$%W$N@h$G8F$P$l$k%3%^%s%IA4BN$,0zMQId$G0O$^$l$F$$$k$3$H$KCmL\$7$F(B
  +    $B$/$@$5$$!#$3$NNc$O%"%/%;%9%m%0$r;H$C$F$$$^$9$,!"%(%i!<%m%0$K$bF1$85;=Q$r(B
  +    $B;H$&$3$H$,$G$-$^$9!#(B</p>
   
       <p>$B;w$F$$$k$1$l$I!"$h$j$:$C$H=@Fp$J(B
       <a href="http://www.cronolog.org/">cronolog</a> $B$H$$$&%m%08rBXMQ$N(B
  
  
  
  1.1.2.1   +2 -1      httpd-2.0/docs/manual/mpm.xml.ja
  
  Index: mpm.xml.ja
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mpm.xml.ja,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- mpm.xml.ja	29 Aug 2002 06:43:42 -0000	1.1
  +++ mpm.xml.ja	16 Dec 2002 08:23:25 -0000	1.1.2.1
  @@ -3,7 +3,7 @@
   <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
   <manualpage>
   <relativepath href="."/>
  -<!-- English revision: 1.1 -->
  +<!-- English revision: 1.2 -->
   
     <title>$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM)</title>
   
  @@ -96,6 +96,7 @@
   
   <table>
   <tr><td>BeOS</td><td><module>beos</module></td></tr>
  +<tr><td>Netware</td><td><module>mpm_netware</module></td></tr>
   <tr><td>OS/2</td><td><module>mpmt_os2</module></td></tr>
   <tr><td>Unix</td><td><module>prefork</module></td></tr>
   <tr><td>Windows</td><td><module>mpm_winnt</module></td></tr>
  
  
  
  1.1.2.1   +38 -23    httpd-2.0/docs/manual/stopping.xml.ja
  
  Index: stopping.xml.ja
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/stopping.xml.ja,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- stopping.xml.ja	30 Sep 2002 08:12:22 -0000	1.1
  +++ stopping.xml.ja	16 Dec 2002 08:23:25 -0000	1.1.2.1
  @@ -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.2.2.2 -->
   <manualpage>
   <relativepath href="."/>
   
  @@ -15,8 +15,17 @@
       $B$K%7%0%J%k$rAw$k(B</a>$B$b$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
  @@ -30,31 +39,37 @@
       <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>$B$3$l$N<B9T>u67$O<!$N%3%^%s%I$GFI$`$3$H$,$G$-$^$9(B:</p>
  +    <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>
   
  -<example>tail -f /usr/local/apache/logs/error_log</example>
  +    <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/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,27 +79,27 @@
   <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
  +    <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 WINCH) $B$,;HMQ$G$-$k$G$7$g$&!#(B
  +    ($BNc$($P(B <code>WINCH</code>) $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>
   
       <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
       <directive module="mpm_common">StartServers</directive>
       $B$r<i$j$^$9(B:
       $B>/$J$/$H$b(B 1 $BIC8e$K(B <directive
  @@ -131,10 +146,10 @@
       (<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(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 +159,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
  
  
  
  1.4.2.1   +10 -2     httpd-2.0/docs/manual/upgrading.xml.ja
  
  Index: upgrading.xml.ja
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/upgrading.xml.ja,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- upgrading.xml.ja	30 Oct 2002 12:54:38 -0000	1.4
  +++ upgrading.xml.ja	16 Dec 2002 08:23:25 -0000	1.4.2.1
  @@ -3,7 +3,7 @@
   <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
   <manualpage>
   <relativepath href="."/>
  -<!-- English revision: 1.5 -->
  +<!-- English revision: 1.6.2.1 -->
   
   <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$N?75!G=$N35MW(B</a></seealso>
   
     <section id="compile-time">
       <title>$B%3%s%Q%$%k;~$N@_Dj$NJQ99(B</title>
  @@ -137,6 +137,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>