sync.

English Revision: 350286

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

1 files changed, 36 insertions, 42 deletions

diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja
index e93fd9493e..14e31a2e0e 100644
--- a/docs/manual/install.xml.ja
+++ b/docs/manual/install.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: 178520:350286 (outdated) -->
+<!-- English Revision: 350286 -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors, as
@@ -34,15 +34,12 @@
     $B$=$NB>$N%W%i%C%H%[!<%`$K4X$7$F$O!V(B<a 
     href="platform/">$B%W%i%C%H%[!<%`(B</a>$B!W$r$4Mw2<$5$$!#(B</p>
 
-    <p> Apache 2.0 $B$N@_Dj$H%$%s%9%H!<%k$N4D6-$O!"(BApache 1.3 $B$H$O(B
-    $B40A4$K0[$J$k$b$N$K$J$j$^$7$?!#4JC1$K%$%s%9%H!<%k$G$-$k$h$&$K!"(B
-    Apache 1.3 $B$G$OFC@=%9%/%j%W%H$r;H$C$F$$$^$7$?!#(B
-    Apache 2.0 $B$G$OB>$N(B Open Source $B%W%m%8%'%/%H$HF1MM$N4D6-$K(B
-    $B$9$k$?$a$K(B <code>libtool</code> $B$H(B <code>autoconf</code>
+    <p>Apache 2.0 $B$G$OB>$N(B Open Source $B%W%m%8%'%/%H$HF1MM!"(B
+    $B%S%k%I4D6-9=C[$K(B <code>libtool</code> $B$H(B <code>autoconf</code>
     $B$r;H$&$h$&$K$J$C$F$$$^$9!#(B</p>
 
     <p>$B%^%$%J!<%P!<%8%g%s$+$i$=$N<!$N%P!<%8%g%s$K%"%C%W%0%l!<%I$9$k(B
-    (2.0.50 $B$+$i(B 2.0.51 $B$XEy(B) $B>l9g$O!"$^$:(B <a href="#upgrading">
+    (2.2.50 $B$+$i(B 2.2.51 $B$XEy(B) $B>l9g$O!"$^$:(B <a href="#upgrading">
     $B%"%C%W%0%l!<%I(B</a>$B$r$4Mw2<$5$$!#(B</p>
 
 </summary>
@@ -65,8 +62,9 @@
       <tr>
         <td><a href="#extract">$BE83+(B</a></td>
 
-        <td><code>$ gzip -d httpd-2_1_<em>NN</em>.tar.gz<br />
-         $ tar xvf httpd-2_1_<em>NN</em>.tar</code> </td>
+        <td><code>$ gzip -d httpd-<em>NN</em>.tar.gz<br />
+         $ tar xvf httpd-<em>NN</em>.tar<br />
+         $ cd httpd-<em>NN</em></code></td>
       </tr>
 
       <tr>
@@ -97,19 +95,18 @@
       <tr>
         <td><a href="#test">$B%F%9%H(B</a></td>
 
-        <td><code>$ <em>PREFIX</em>/bin/apachectl start</code>
+        <td><code>$ <em>PREFIX</em>/bin/apachectl -k start</code>
         </td>
       </tr>
     </table>
 
-    <p><em>NN</em> $B$O:G?7$N%^%$%J!<%P!<%8%g%s%J%s%P!<$K!"(B
+    <p><em>NN</em> $B$O:G?7$N%P!<%8%g%s%J%s%P!<$K!"(B
     <em>PREFIX</em> $B$O%$%s%9%H!<%k$9$k%5!<%P$G$N%U%!%$%k%7%9%F%`$N%Q%9$K!"(B
     $BCV$-49$($F$/$@$5$$!#(B<em>PREFIX</em> $B$r;XDj$7$J$+$C$?>l9g$O!"(B
     $B%G%U%)%k%H$N(B <code>/usr/local/apache2</code> $B$K$J$j$^$9!#(B</p>
 
-    <p>Apache HTTPD $B$N%3%s%Q%$%k$H%$%s%9%H!<%k$KI,MW$J$b$N$r$O$8$a$H$7$F!"(B
-    $BJT=8$H%$%s%9%H!<%k%W%m%;%9$G$N$=$l$>$l$N9`$O(B
-    $B<!$K>\$7$/5-=R$5$l$F$$$^$9!#(B</p>
+    <p>Apache httpd $B$N%3%s%Q%$%k$H%$%s%9%H!<%k$KI,MW$J$b$N$r$O$8$a$H$7$F!"(B
+    $B%3%s%Q%$%k$H%$%s%9%H!<%k$K$D$$$F$O!"<!$K>\$7$/5-=R$5$l$F$$$^$9!#(B</p>
 </section>
 
 <section id="requirements"><title>$BI,MW$J$b$N(B</title>
@@ -128,7 +125,7 @@
       <dd>ANSI-C $B%3%s%Q%$%i$r%$%s%9%H!<%k$7$F$*$$$F2<$5$$!#$*A&$a$O(B <a
       href="http://www.gnu.org/">Free Software Foundation (FSF)</a>
       $B$K$h$k(B <a href="http://www.gnu.org/software/gcc/gcc.html">GNU C
-      compiler (GCC)</a> $B$G$9(B ($B%P!<%8%g%s(B 2.7.2 $B$GBg>fIW$G$9(B)$B!#(BGCC $B$,$J$$>l9g$O!"(B
+      compiler (GCC)</a> $B$G$9!#(BGCC $B$,$J$$>l9g$O!"(B
       $B>/$J$/$H$bDs6!$5$l$F$$$k%3%s%Q%$%i$,(B ANSI $B=`5r$G$"$k$3$H$r3NG'$7$F$*$$$F2<$5$$!#(B
       $B$=$l$+$i!"JQ?t(B <code>PATH</code> $B$K$O(B <code>make</code>
       $B$H$$$C$?4pK\E*$J%S%k%I%D!<%k$,4^$^$l$F$$$kI,MW$,$"$j$^$9!#(B</dd>
@@ -138,8 +135,7 @@
       $B@53N$J;~9o$K%7%s%/%m$5$;$k5!G=$r%7%9%F%`$K@_Dj$9$k$3$H$r6cL#$7$F$_$F2<$5$$!#(B
       Network Time Protocol (NTP) $B$r%Y!<%9$H$7$?(B ntpdate $B$d(B xntpd $B%W%m%0%i%`$,(B
       $B$3$NL\E*$K$h$/MQ$$$i$l$^$9!#(BNTP $B%=%U%H%&%'%"$d8x3+(B NTP 
-      $B%5!<%P$K4X$9$k>\:Y$O!"(BUsenet $B%K%e!<%9%0%k!<%W(B <a
-      href="news:comp.protocols.time.ntp">comp.protocols.time.ntp</a> $B$d(B <a
+      $B%5!<%P$K4X$9$k>\:Y$O!"(B<a
       href="http://www.ntp.org">NTP $B%[!<%`%Z!<%8(B</a> $B$r$4Mw2<$5$$!#(B</dd>
 
       <dt><a href="http://www.perl.org/">Perl 5</a>
@@ -148,20 +144,20 @@
       <program>dbmmanage</program> $B$O(B
       Perl $B$G=q$+$l$F$$$k$N$G!"(BPerl 
       5 $B%$%s%?%W%j%?$,I,MW$K$J$j$^$9(B (5.003 $B0J9_(B)$B!#(B
-      <program>configure</program> $B%9%/%j%W%H$G$3$N$h$&$J%$%s%?%W%j%?$,8+$D$+$i$J$/$F$b!"(B
-      $BJL$KIT6q9g$O$"$j$^$;$s!#$b$A$m$s!"(BApache 
-      2.0 $B$N%3%s%Q%$%k$H%$%s%9%H!<%k$O$G$-$^$9!#(B
-      $B$3$l$i$N%5%]!<%H%9%/%j%W%H$,;H$($J$/$J$k$@$1$G$9!#(B
-      Perl $B%$%s%?%W%j%?$rJ#?t%$%s%9%H!<%k$7$F$$$k>l9g(B ($B%Y%s%@!<$N(B Perl
-      4 $B$H<+J,$GF~$l$?(B Perl 5 $B$,$"$k>l9g$J$I(B) $B$O!"(B
-      --with-perl $B%*%W%7%g%s(B ($B2<5-;2>H(B) $B$r;H$C$F(B <program>configure</program>
-      $B$,E,@Z$J$b$N$r3N<B$KA*$V$h$&$K$9$k$HNI$$$G$7$g$&!#(B</dd>
+      Perl $B%$%s%?%W%j%?$rJ#?t%$%s%9%H!<%k$7$F$$$k(B ($B$?$H$($PA4BN$N%7%9%F%`$N0lIt(B
+      $B$H$7$F%$%s%9%H!<%k$5$l$F$$$k(B Perl 4 $B$H!"<+J,$GDI2C$G%$%s%9%H!<%k$7$?(B
+      Perl 5 $B$,$"$k$J$I$N(B) $B>l9g!"(B<code>--with-perl</code> $B%*%W%7%g%s(B ($B2<5-;2>H(B)
+      $B$r;H$C$F(B <program>configure</program> $B$,0U?^$7$?$b$N$r;H$&$h$&$K(B
+      $BL@<(E*$K;XDj$9$k$HNI$$$G$7$g$&!#(B
+      <program>configure</program> $B%9%/%j%W%H$G(B Perl 5 $B%$%s%?%W%j%?$,(B
+      $B8+$D$+$i$J$$>l9g$O!"$3$N1F6A$r<u$1$k%5%]!<%H%9%/%j%W%H$,;H$($J$/$J$j$^$9!#(B
+      $B$b$A$m$s!"(BApache httpd $B$N%3%s%Q%$%k$H%$%s%9%H!<%k$OLdBj$J$/9T$($^$9!#(B</dd>
     </dl>
 </section>
 
 <section id="download"><title>$B%@%&%s%m!<%I(B</title>
 
-    <p>Apache $B$O(B <a
+    <p>Apache HTTP $B%5!<%P$O(B <a
     href="http://httpd.apache.org/download.cgi">Apache HTTP
     $B%5!<%P%@%&%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
@@ -194,8 +190,8 @@
     $BC1$J$k05=L$N2r=|$H(B tar $B$NE83+$G$9(B:</p>
 
 <example>
-$ gzip -d httpd-2_1_<em>NN</em>.tar.gz<br />
-$ tar xvf httpd-2_1_<em>NN</em>.tar
+$ gzip -d httpd-<em>NN</em>.tar.gz<br />
+$ tar xvf httpd-<em>NN</em>.tar
 </example>
 
     <p>$BG[I[MQ$N%=!<%9%3!<%I$,$"$k8=:_$$$k%G%#%l%/%H%j$N2<$K!"(B
@@ -212,11 +208,11 @@ $ tar xvf httpd-2_1_<em>NN</em>.tar
     $B$3$l$OG[I[%G%#%l%/%H%j$N%k!<%H%G%#%l%/%H%j$K$"$k!"(B
     <program>configure</program>
     $B%9%/%j%W%H$G9T$J$$$^$9!#(B
-     (Apache $B%=!<%9%D%j!<$N(B CVS
+     (Apache $B%=!<%9%D%j!<$NL$%j%j!<%9(B
     $BHG$r%@%&%s%m!<%I$7$?3+H/<T$O!"<!$N%9%F%C%W$K?J$`A0$K(B
     <code>autoconf</code> $B$H(B<code>libtool</code>
     $B$r%$%s%9%H!<%k$7$F(B <code>buildconf</code>
-    $B$r<B9T$9$kI,MW$,$"$k$G$7$g$&!#(B
+    $B$r<B9T$9$kI,MW$,$"$j$^$9!#(B
     $B8x<0%j%j!<%9$G$O$3$N:n6H$OI,MW$"$j$^$;$s!#(B) </p>
 
     <p>$B%G%U%)%k%H%*%W%7%g%s$r;H$C$F%=!<%9%D%j!<$rA4$F@_Dj$9$k(B
@@ -288,9 +284,8 @@ $ tar xvf httpd-2_1_<em>NN</em>.tar
 
 <example>$ make</example>
 
-    <p>$B4pK\E*$J@_Dj$r$9$k$N$K!"(BPentium III/Linux 2.2 
-    $B$N%7%9%F%`$G$*$*$h$=(B 3 $BJ,DxEY$+$+$j$^$9$,!"(B
-    $B$"$i$+$8$a$4N;>52<$5$$!#(B
+    <p>$B4pK\E*$J@_Dj$r$9$k$N$K?tJ,$+$+$j$^$9$,!"(B
+    $B$"$i$+$8$a$4N;>5$/$@$5$$!#(B
     $B$^$?!";~4V$O%O!<%I%&%'%"$dM-8z$K$7$?%b%8%e!<%k$N?t$K(B
     $BBg$-$/0MB8$9$k$G$7$g$&!#(B</p>
 </section>
@@ -318,7 +313,8 @@ $ tar xvf httpd-2_1_<em>NN</em>.tar
 
     <p><a href="./">docs/manual/</a> $B$N(B Apache $B%^%K%e%"%k$r$6$C$H8+$F$/$@$5$$!#(B
     $B$^$?$O!"(B<a
-    href="http://httpd.apache.org/docs/&httpd.docs;/">http://httpd.apache.org/docs/&httpd.docs;/</a>
+    href="http://httpd.apache.org/docs/&httpd.docs;/"
+    >http://httpd.apache.org/docs/&httpd.docs;/</a>
     $B$K$"$k%^%K%e%"%k:G?7HG!"(B<a
     href="mod/directives.html">$B@_Dj%G%#%l%/%F%#%V(B</a>$B$KEv$?$C$F$_$F$/$@$5$$!#(B</p>
 </section>
@@ -328,7 +324,7 @@ $ tar xvf httpd-2_1_<em>NN</em>.tar
     <p>$B<!$N%3%^%s%I$r<B9T$7$F(B Apache HTTP $B%5!<%P$r(B<a
     href="invoking.html">$B3+;O(B</a>$B$G$-$^$9(B:</p>
 
-<example>$ <em>PREFIX</em>/bin/apachectl start</example>
+<example>$ <em>PREFIX</em>/bin/apachectl -k start</example>
 
     <p>URL <code>http://localhost/</code> $B$rDL$7$F:G=i$N%I%-%e%a%s%H$KBP$9$k(B
     $B%j%/%(%9%H$rH/9T$9$k;v$,$G$-$k$O$:$G$9!#$3$l$G8+$($k(B
@@ -338,7 +334,7 @@ $ tar xvf httpd-2_1_<em>NN</em>.tar
     $B%5!<%P$r:F$S(B<a href="stopping.html">$BDd;_(B</a>$B$9$k$K$O!"(B
     $B<!$N%3%^%s%I$r<B9T$7$^$9(B:</p>
 
-<example>$ <em>PREFIX</em>/bin/apachectl stop</example>
+<example>$ <em>PREFIX</em>/bin/apachectl -k stop</example>
 </section>
 <section id="upgrading"><title>$B%"%C%W%0%l!<%I(B</title>
 
@@ -351,16 +347,14 @@ $ tar xvf httpd-2_1_<em>NN</em>.tar
     $B$NJQ99$K9g$o$;$k$?$a$K%"%C%W%0%l!<%I$,I,MW$K$J$k$G$7$g$&!#(B</p>
 
     <p>$B%^%$%J!<%P!<%8%g%s$+$i<!$N%P!<%8%g%s$K%"%C%W%0%l!<%I$9$k>l9g(B
-    ($BNc$($P(B 2.0.55 $B$+$i(B 2.0.57 $B$X(B) $B$O!"$b$C$H4JC1$G$9!#(B
+    ($BNc$($P(B 2.2.55 $B$+$i(B 2.2.57 $B$X(B) $B$O!"$b$C$H4JC1$G$9!#(B
     <code>make install</code> $B$r<B9T$7$F$b:#$"$k%I%-%e%a%s%H!"(B
     $B%m%0%U%!%$%k!"@_Dj%U%!%$%k$O>e=q$-$5$l$^$;$s!#(B
     $B$5$i$K!"%^%$%J!<%P!<%8%g%s4V$G$O(B <program>configure</program> $B%*%W%7%g%s!"(B
     $B<B9T;~$N@_Dj!"%b%8%e!<%k(B API $B$KIT@09g$,5/$3$i$J$$$h$&$K!"(B
     $B3+H/<T$O:GBg8B$NEXNO$r$7$F$$$^$9!#(B
     $BBgDq$N>l9g!"F10l$N(B <program>configure</program> $B%3%^%s%I%i%$%s!"(B
-    $BF10l$N@_Dj%U%!%$%k!"%b%8%e!<%kA4$F$,@5>o$KF0:n$9$k$O$:$G$9!#(B
-    (2.0.41 $B0J9_$G$O$=$N$h$&$K$J$C$F$$$^$9!#$=$l0JA0$N%P!<%8%g%s$K$O(B
-    $BIT@09g$,B8:_$7$^$9!#(B)</p>
+    $BF10l$N@_Dj%U%!%$%k!"%b%8%e!<%kA4$F$,@5>o$KF0:n$9$k$O$:$G$9!#(B</p>
 
     <p>$B%^%$%J!<%P!<%8%g%s$G%"%C%W%0%l!<%I$9$k>l9g$O!"(B
     $B4{$K%$%s%9%H!<%k$5$l$F$$$k%5!<%P$N(B <code>build</code> $B%G%#%l%/%H%jFb$+!"(B
@@ -376,8 +370,8 @@ $ tar xvf httpd-2_1_<em>NN</em>.tar
     $ ./config.nice<br />
     $ make<br />
     $ make install<br />
-    $ <em>PREFIX</em>/bin/apachectl stop<br />
-    $ <em>PREFIX</em>/bin/apachectl start<br />
+    $ <em>PREFIX</em>/bin/apachectl -k graceful-stop<br />
+    $ <em>PREFIX</em>/bin/apachectl -k start<br />
     </example>
 
     <note type="warning">$B?7$7$$%P!<%8%g%s$r;HMQ$9$k>l9g$O!"(B