From: André Malo
Date: Tue, 20 May 2003 14:14:15 +0000 (+0000)
Subject: formal backport of Japanese updates to 2.0
X-Git-Tag: 2.0.46~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d3de68bb0de61476e57b804d79a7c092a2a8501;p=thirdparty%2Fapache%2Fhttpd.git
formal backport of Japanese updates to 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@99936 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/bind.xml.ja b/docs/manual/bind.xml.ja
index 75eeb2b2faa..3431a895fe1 100644
--- a/docs/manual/bind.xml.ja
+++ b/docs/manual/bind.xml.ja
@@ -1,7 +1,7 @@
-
+
@@ -23,7 +23,7 @@
mpm_common
- VirtualHost
+ VirtualHost
Listen
@@ -77,47 +77,69 @@
IPv6 $B$NFC5-;v9`(B
- APR $B$,(B IPv6 $B$r%5%]!<%H$9$k>l9g$O!"(BApache $B$O%G%U%)%k%H$G(B IPv6
- $B$r(B listen $B$9$k%=%1%C%H$r:n$j$^$9(B ($BNc$($P(B Listen $B%G%#%l%/%F%#%V$G(B
- IP $B%"%I%l%9$,L5;XDj$N>l9g(B)$B!#(B
- $B$D$^$j!"(BAPR $B$,(B IPv6 $B$r%5%]!<%H$7$F$$$k>l9g!"(B
+ $BB?$/$N%W%i%C%H%[!<%`$G(B IPv6 $B$,%5%]!<%H$5$l$F$-$F$$$F!"(B
+ APR $B$O$3$l$i$N$[$H$s$I$G(B IPv6 $B$r%5%]!<%H$7$F$$$k$N$G!"(B
+ Apache $B$O(B IPv6 $B%=%1%C%H$r3d$jEv$F$F(B IPv6
+ $B7PM3$GAw$i$l$F$-$?%j%/%(%9%H$r07$&$3$H$,$G$-$^$9!#(B
+
+ IPv6 $B%=%1%C%H$,(B IPv4 $B$H(B IPv6 $B%3%M%/%7%g%s$NN>J}$r07$&$3$H$,$G$-$k$+(B
+ $B$I$&$+$O!"(BApache $B4IM}l9g$O!"(B
+ IPv4 $B%^%C%W$5$l$?(B IPv6 $B%"%I%l%9$r;HMQ$7$F$$$F!"(B
+ $B$[$H$s$I$N%W%i%C%H%[!<%`$G$O%G%U%)%k%H$G;HMQ2DG=$G$9$,!"(B
+ FreeBSD, NetBSD, OpenBSD $B$G$O!"%7%9%F%`A4BN$H$7$F$N%]%j%7!<$H$N@09g@-$+$i!"(B
+ $B%G%U%)%k%H$G$O;HMQIT2D$K@_Dj$5$l$F$$$^$9!#(B
+ $B$3$l$i$N%G%U%)%k%H$G;HMQIT2D$N%W%i%C%H%[!<%`$G$"$C$F$b!"(B
+ $BFCJL$J@_Dj%Q%i%a!<%?$G(B Apache $B$N5sF0$rJQ2=$5$;$k$3$H$,$G$-$^$9!#(B
+
+ IPv4 $B$H(B IPv6 $B$N%3%M%/%7%g%s$r:G>.8B$N%=%1%C%H$G07$$$?$$$N$G$"$l$P!"(B
+ IPv4 $B%^%C%W$N(B IPv6 $B%"%I%l%9$r;HMQ$9$kI,MW$,$"$j!"(B
+ --enable-v4-mapped configure $B%*%W%7%g%s$r;XDj$7$F!"C1=c$K(B
+ Listen
+ $B%G%#%l%/%F%#%V$G
Listen 80
-
$B$O!"
+
--enable-v4-mapped $B$G$O!"(BApache
+ $B$N@8@.$9$k%G%U%)%k%H$N@_Dj%U%!%$%kCf$N(B
+ Listen
+ $B%G%#%l%/%F%#%V$O$3$N7A<0$r;HMQ$7$F$$$^$9!#(B
+ --enable-v4-mapped $B$O!"(B
+ FreeBSD, NetBSD, OpenBSD $B0J30$NA4$F$N%W%i%C%H%[!<%`$G$N%G%U%)%k%H$G$9!#(B
+ $B$G$9$+$i!"$*$=$i$/$*
-
- Listen [::]:80
-
-
- APR $B$,(B IPv6 $B$r%5%]!<%H$7$F$$$J$$>l9g$O!"(B
+ $B%W%i%C%H%U%)!<%`$d(B APR $B$,2?$r%5%]!<%H$9$k$+$K4X$o$i$:!"(B
+ IPv4 $B%3%M%/%7%g%s$N$_$r07$&$h$&$K$7$?$$>l9g$O!"(B
+ $BListen $B%G%#%l%/%F%#%V$G(B
+ IPv4 $B%"%I%l%9$r;XDj$7$F$/$@$5$$!#(B
- Listen 80
+ Listen 0.0.0.0:80
+ Listen 192.170.2.1:80
- $B$O!"
+
IPv4 $B$H(B IPv6 $B$N%3%M%/%7%g%s$r8DJL$N%=%1%C%H$G07$&$h$&$K$7$?$$>l9g(B
+ ($B$D$^$j(B IPv4 $B%^%C%W$N%"%I%l%9$rL58z$K$7$?$$>l9g(B)
+ $B$O!"(B--disable-v4-mapped configure
+ $B%*%W%7%g%s$r;XDj$7$F!"Listen
+ $B%G%#%l%/%F%#%V$r;HMQ$7$F$/$@$5$$!#(B
- Listen 0.0.0.0:80
+ Listen [::]:80
+ Listen 0.0.0.0:80
- NetBSD $BEy$N$$$/$D$+$N%W%i%C%H%[!<%`$G$O!"(BIPv6
- $B$N%o%$%k%I%+!<%I%"%I%l%9(B ($B!V(B::$B!W(B) $B$N%P%$%s%I$G$O(B IPv4
- $B%$%s%?!<%U%'!<%9$K%3%M%/%7%g%s$rD%$l$^$;$s!#(B
- $B$3$N$h$&$J>u67$G$O!"
-
-
- Listen 0.0.0.0:80
- Listen [::]:0
-
+
--disable-v4-mapped $B$G$O!"(BApache
+ $B$N@8@.$9$k%G%U%)%k%H$N@_Dj%U%!%$%kCf$N(B
+ Listen
+ $B%G%#%l%/%F%#%V$O$3$N7A<0$r;HMQ$7$F$$$^$9!#(B
+ --disable-v4-mapped $B$O!"(B
+ FreeBSD, NetBSD, OpenBSD $B%W%i%C%H%[!<%`$G$N%G%U%)%k%H$G$9!#(B
- Apache $B$O8=:_$3$l$r<+F08!=P$9$k$3$H$,$G$-$J$$$N$G!"(B
- $B$=$N$h$&$J>l9g$O(B
- Listen $BL?NaJ8$O4IM}
diff --git a/docs/manual/cgi_path.xml.ja b/docs/manual/cgi_path.xml.ja
index a793b149a8a..cea183e1b04 100644
--- a/docs/manual/cgi_path.xml.ja
+++ b/docs/manual/cgi_path.xml.ja
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/configuring.xml.ja b/docs/manual/configuring.xml.ja
index 494a88982c6..21c6cdc3ce8 100644
--- a/docs/manual/configuring.xml.ja
+++ b/docs/manual/configuring.xml.ja
@@ -2,7 +2,7 @@
-
+
$B@_Dj%U%!%$%k(B
diff --git a/docs/manual/content-negotiation.xml.ja b/docs/manual/content-negotiation.xml.ja
index a2ec6f6e86e..3fec243598f 100644
--- a/docs/manual/content-negotiation.xml.ja
+++ b/docs/manual/content-negotiation.xml.ja
@@ -2,7 +2,7 @@
-
+
$B%3%s%F%s%H%M%4%7%(!<%7%g%s(B
@@ -178,10 +178,11 @@
Multiviews
MultiViews $B$O%G%#%l%/%H%jKh$N%*%W%7%g%s$G!"(B
+ httpd.conf$B%U%!%$%k$N(B
Directory,
Location,
Files
- $B$d!"(B(AllowOverride
+ $B%;%/%7%g%sCf$d!"(B(AllowOverride
$B$,E,@Z$JCM$K(B $B@_Dj$5$l$F$$$k$H(B) .htaccess
$B%U%!%$%k$G(B Options
$B%G%#%l%/%F%#%V$K$h$C$F@_Dj$9$k$3$H$,$G$-$^$9!#(B
diff --git a/docs/manual/custom-error.xml.ja b/docs/manual/custom-error.xml.ja
index 23b4f896b7e..89bd3dfc657 100644
--- a/docs/manual/custom-error.xml.ja
+++ b/docs/manual/custom-error.xml.ja
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/dns-caveats.xml.ja b/docs/manual/dns-caveats.xml.ja
index e6ec81434ed..5c62f2cdae9 100644
--- a/docs/manual/dns-caveats.xml.ja
+++ b/docs/manual/dns-caveats.xml.ja
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/dso.xml.ja b/docs/manual/dso.xml.ja
index 7c5d2f6f263..d3614d716a1 100644
--- a/docs/manual/dso.xml.ja
+++ b/docs/manual/dso.xml.ja
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja
index af4e51e7789..f0624655706 100644
--- a/docs/manual/env.xml.ja
+++ b/docs/manual/env.xml.ja
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/filter.xml.ja b/docs/manual/filter.xml.ja
index 340966e3f7c..e97bae74fdd 100644
--- a/docs/manual/filter.xml.ja
+++ b/docs/manual/filter.xml.ja
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/handler.xml.ja b/docs/manual/handler.xml.ja
index 38237617715..dff11d1f5a6 100644
--- a/docs/manual/handler.xml.ja
+++ b/docs/manual/handler.xml.ja
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/index.xml.ja b/docs/manual/index.xml.ja
index ebab0b512d4..aca5827886c 100644
--- a/docs/manual/index.xml.ja
+++ b/docs/manual/index.xml.ja
@@ -1,12 +1,12 @@
-
+
-Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.1 $B%I%-%e%a%s%H(B
+Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0 $B%I%-%e%a%s%H(B
$B%j%j!<%9%N!<%H(B
Apache 2.0 $B$N?75!G=(B
diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja
index 3f66a209b63..c1b4d079c1a 100644
--- a/docs/manual/install.xml.ja
+++ b/docs/manual/install.xml.ja
@@ -2,7 +2,7 @@
-
+
$B%3%s%Q%$%k$H%$%s%9%H!<%k(B
@@ -25,8 +25,8 @@
-Apache $B$N5/F0(B
-$BDd;_$H:F5/F0(B
+Apache$B$N5/F0(B
+Apache$B$NDd;_$H:F5/F0(B
$B35MW(B ($B$;$C$+$A$J?M8~$1(B)
@@ -139,10 +139,11 @@
$B%@%&%s%m!<%I(B
- Apache $B$O$$$/$D$+$N%_%i!<$N%j%9%H$,$"$k(B Apache HTTP
- $B%5!<%P%@%&%s%m!<%I%5%$%H(B$B$G%@%&%s%m!<%I$G$-$^$9!#(B
- $B$=$3$K$O!"%j%j!<%9$5$l$?:G?7$N0BDjHG$,$"$j$^$9!#(B
+ Apache $B$O(B Apache Software
+ Foundation $B%@%&%s%m!<%I%5%$%H(B$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
+ $B$3$3$+$i:G?7$N0BDjHG$,
$B%@%&%s%m!<%I8e!"FC$K%_%i!<%5%$%H$r;H$C$?>l9g$O!"(B
$B%@%&%s%m!<%I$7$?$b$N$,(B Apache HTTP
@@ -150,8 +151,8 @@
$B8!>Z$9$k$3$H$,=EMW$G$9!#$3$l$O%@%&%s%m!<%I$7$?(B tarball $B$N(B PGP $B=pL>$r(B
$B%F%9%H$9$k$3$H$K$h$C$F8!>Z$7$^$9!#(B
$B$3$l$OFs$D$NCJ3,$,$"$j$^$9!#(B
- $B$^$:(B KEYS
- $B%U%!%$%k$b(B Apache $BG[I[%5%$%H(B
+ $B$^$:(B KEYS
+ $B%U%!%$%k$r(B Apache $BG[I[%5%$%H(B
$B$+$i%@%&%s%m!<%I$7$F$/$@$5$$!#(B(KEYS $B%U%!%$%k<+BN$,(B
$B2~cb$5$l$F$$$J$$$3$H$r3N$OI,$:(B $B%a%$%s$N(B Apache
$B%&%'%V%5%$%H(B$B$+$i%U%!%$%k$X$N%j%s%/$OBP1~$9$k%@%&%s%m!<%I%j%s%/$N%U%!%$%k$X$N%j%s%/$OBP1~$9$k%@%&%s%m!<%I%j%s%/$NNY$K$"$j!"$^$?(B
Apache
- $BG[I[%5%$%H(B$B$NFCDj$N%G%#%l%/%H%j$K$b$"$k$+$b$7$l$^$;$s!#(B
+ $BG[I[%5%$%H(B$B$NFCDj$N%G%#%l%/%H%j$G8+$D$1$k$3$H$b$G$-$k$G$7$g$&!#(B
$B=pL>%U%!%$%k$NL>A0$O!"%=!<%9%U%!%$%k$N(B tarball $B$HF1$8L>A0$K(B
.asc $B$rIU2C$7$?$b$N$K$J$C$F$$$^$9!#(B
$B0J2<$N%3%^%s%I(B ($B$d$C$Q$j(B pgp $B$N%P!<%8%g%s$K0MB8(B) $B$N$I$l$+0l$D$G!"(B
@@ -493,6 +494,13 @@
MPM $B%b%8%e!<%k(B NAME $B$rA*Br$7$^$9!#(B
+
+ mpm_name $B$H$$$&(B MPM $B$rM-8z$K$9$k$K$O
+
+
+ ./configure --with-mpm=mpm_name
+
+
diff --git a/docs/manual/invoking.xml.ja b/docs/manual/invoking.xml.ja
index 3ef636c0b82..5279178f867 100644
--- a/docs/manual/invoking.xml.ja
+++ b/docs/manual/invoking.xml.ja
@@ -2,13 +2,13 @@
-
+
Apache $B$N5/F0(B
Windows $B>e$G$O!"(BApache $B$ODL>o$O(B
- Windows NT, 2000, XP $B$G$O%5!<%S%9$H$7$F!"(BWindows 95, ME
+ Windows NT, 2000, XP $B$G$O%5!<%S%9$H$7$F!"(BWindows 9x, ME
$B$G$O%3%s%=!<%k%"%W%j%1!<%7%g%s$H$7$F\:Y$K4X$7$F$O!"!V(B
$B%5!<%S%9$H$7$F$B!W$H!V(B
-
+
@@ -287,7 +287,7 @@
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\"
\"%{User-agent}i\"" combined
- CustomLog log/acces_log combined
+ CustomLog log/access_log combined
$B$3$N=q<0$N:G=i$NJ}$O(B Common Log Format $B$H$^$C$?$/F1$8$G!":G8e$K(B
diff --git a/docs/manual/mpm.xml.ja b/docs/manual/mpm.xml.ja
index 8e1c764310d..3a290d85e62 100644
--- a/docs/manual/mpm.xml.ja
+++ b/docs/manual/mpm.xml.ja
@@ -2,7 +2,7 @@
-
+
$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM)
diff --git a/docs/manual/new_features_2_0.xml.ja b/docs/manual/new_features_2_0.xml.ja
index 0ef08a5f3da..8c3089925bb 100644
--- a/docs/manual/new_features_2_0.xml.ja
+++ b/docs/manual/new_features_2_0.xml.ja
@@ -2,7 +2,7 @@
-
+
Apache 2.0 $B$N?75!G=$N35MW(B
diff --git a/docs/manual/server-wide.xml.ja b/docs/manual/server-wide.xml.ja
index 469617f1e0a..142dd6d49f0 100644
--- a/docs/manual/server-wide.xml.ja
+++ b/docs/manual/server-wide.xml.ja
@@ -2,7 +2,7 @@
-
+
$B%5!<%PA4BN$N@_Dj(B
diff --git a/docs/manual/sitemap.xml.ja b/docs/manual/sitemap.xml.ja
index 747e834d3c9..183e6727b39 100644
--- a/docs/manual/sitemap.xml.ja
+++ b/docs/manual/sitemap.xml.ja
@@ -3,7 +3,7 @@
[ ]
>
-
+
@@ -12,15 +12,14 @@
$B$3$N%Z!<%8$O8=;~E@$GMxMQ2DG=$J(B
Apache HTTP $B%5!<%P%P!<%8%g%s(B 2.0 $B$N%I%-%e%a%s%F!<%7%g%s(B
-$B$N0lMw$G$9!#(B
-
+$B$N0lMw$G$9!#(B
$B%j%j!<%9$N%a%b(B
1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B
Apache 2.0 $B$N?75!G=(B
-Apache $B$N%i%$%;%s%9(B
+Apache License
@@ -61,7 +60,8 @@
Apache $B%5!<%P$N$h$/$"$k
-$B35N,(B
+$B35N,(B
+1 $B%Z!<%8HG(B
$B%5%]!<%H(B
diff --git a/docs/manual/stopping.xml.ja b/docs/manual/stopping.xml.ja
index 28de3fde38c..03248d78091 100644
--- a/docs/manual/stopping.xml.ja
+++ b/docs/manual/stopping.xml.ja
@@ -1,20 +1,20 @@
-
+
$BDd;_$H:F5/F0(B
$B$3$NJ8=q$G$O(B Unix $B$KN`;w$7$?%7%9%F%`$G$N(B
- Apache $B$NDd;_$H:F5/F0$K$D$$$F07$C$F$$$^$9!#(BWindows $B$G(B Apache $B$r@)8f$9$k$?$a$N(B
- $B>pJs$H$7$F!"(BWindows NT, 2000, XP $B$N(B
- $B%f!<%6$O(B Apache $B$r%5!<%S%9$H$7$F$B$r!"(B
- Windows 9x $B$H(B ME $B$N%f!<%6$O(B Apache $B$r%3%s%=!<%k%"%W%j$H$7$F(B
- $B$B$r;2>H$7$F$/$@$5$$!#(B
+ Apache $B$NDd;_$H:F5/F0$K$D$$$F07$C$F$$$^$9!#(B
+ Windows NT, 2000, XP $B%f!<%6$O(B$B%5!<%S%9$H$7$F(B
+ Apache $B$r$B$G!"(BWindows 9x, ME$B%f!<%6$O(B$B%3%s%=!<%k%"%W%j%1!<%7%g%s$H$7$F(B
+ Apache $B$r$B$G!"(B
+ $B$3$l$i$N%W%i%C%H%[!<%`$G$N;HMQJ}K!$r$4Mw2<$5$$!#(B
httpd
@@ -35,7 +35,9 @@
$B$K=q$+$l$F$$$^$9!#$3$l$O$D$^$j!"?F0J30$N%W%m%;%9$K(B
$B%7%0%J%k$rAw$kI,MW$9$i$J$$!"$H$$$&$3$H$G$9!#(B
$B?F%W%m%;%9$KAw$k$3$H$,$G$-$k(B 3 $BTERM, HUP, USR1
+ TERM,
+ HUP,
+ USR1
$B$G$9!#$3$l$i$N@bL@$K$D$$$F$OB3$-$r$4Mw2<$5$$!#(B
$B?F%W%m%;%9$K%7%0%J%k$rAw$k$K$O!"(B
@@ -45,7 +47,7 @@
httpd $B%W%m%;%9$K%7%0%J%k$rAw$k(B 2 $BHVL\$NJ}K!$O(B
-k $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!"(Bstop, restart,
+ $B2<$G@bL@$5$l$F$$$k$h$&$K!"(Bstop, restart,
graceful $B$r;XDj$G$-$^$9!#(B
$B$3$l$i$O(B httpd $B$N0z?t$G$9$,!"(B
$B@)8fMQ$N%9%/%j%W%H(B apachectl $B$r(B
@@ -92,16 +94,17 @@
$B;R%W%m%;%9$,=y!9$K$J$/$J$k$K=>$C$F!"(B
$B?7$7$$(B$B@$Be(B$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
- $BFCDj$N%W%i%C%H%[!<%`$G$O(B USR1 $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
+
+ $BFCDj$N%W%i%C%H%[!<%`$G$O(B USR1
+ $B$r4K$d$+$J:F5/F0$N$?$a$K;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
apachectl graceful
$B$H$$$&%3%^%s%I$O%W%i%C%H%[!<%`$K9g$C$?%7%0%J%k$rAw$j$^$9!#(B
$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!#$^$?!"StartServers
$B$r/$J$/$H$b(B 1 $BIC8e$K(B httpd $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$/$Ohttpd
+ $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
diff --git a/docs/manual/suexec.xml.ja b/docs/manual/suexec.xml.ja
index 773207f382e..e9007a23bd5 100644
--- a/docs/manual/suexec.xml.ja
+++ b/docs/manual/suexec.xml.ja
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/upgrading.xml.ja b/docs/manual/upgrading.xml.ja
index 6eba6835b74..4a6ea6b19ed 100644
--- a/docs/manual/upgrading.xml.ja
+++ b/docs/manual/upgrading.xml.ja
@@ -2,7 +2,7 @@
-
+
1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B
@@ -13,7 +13,7 @@
$B?75!G=(B$B$NJ8=q$d(B
src/CHANGES $B%U%!%$%k$G8+$D$1$i$l$k$H;W$$$^$9!#(B
-Apache 2.0 $B$N?75!G=$N35MW(B
+Apache 2.0 $B?75!G=$N35MW(B
$B%3%s%Q%$%k;~$N@_Dj$NJQ99(B
@@ -51,12 +51,13 @@
$B%Q%9>pJs(B) $B$N07$$$,JQ$o$C$?$b$N$,$"$j$^$9!#0JA0$O%O%s%I%i$H$7$F(B
$BPATH_INFO $B$N$"$k%j%/%(%9%H$rINCLUDES $B$J$I$N%U%#%k%?$O(B
+ href="mod/mod_include.html">INCLUDES $B$d(B
+ PHP $B$J$I$N%U%#%k%?$O(B
$B%3%"%O%s%I%i$N>e$KPATH_INFO
$BIU$-$N%j%/%(%9%H$r5qH]$7$^$9!#(B
AcceptPathInfo
$B%G%#%l%/%F%#%V$r;H$C$F%3%"%O%s%I%i$,(B PATH_INFO
- $BIU$-$N%j%/%(%9%H$rPATH_INFO $B$r;H$&5!G=$rI|3h$5$;$k$3$H$,$G$-$^$9!#(B
CacheNegotiatedDocs
@@ -151,10 +152,6 @@
$B$=$NB>$NJQ99(B
- - $B%P!<%A%c%k%[%9%H$N@_Dj$r=PNO$9$k$?$a$K;H$o$l$F$$$?(B
-
httpd $B$N%3%^%s%I%i%$%s%*%W%7%g%s(B -S $B$O(B
- -t -D DUMP_VHOSTS $B$KCV$-49$($i$l$^$7$?!#(B
-
- Apache 1.3 $B$Gmod_auth_digest $B$O(B
$BI8=`%b%8%e!<%k$K$J$j$^$7$?!#(B
@@ -178,4 +175,5 @@
$BF0$-(B$B$^$;$s(B$B!#>\:Y$O(B $B3+H/ $B$K$"$j$^$9!#(B
+
diff --git a/docs/manual/urlmapping.xml.ja b/docs/manual/urlmapping.xml.ja
index eff6e7ee347..53f2ffc9b8c 100644
--- a/docs/manual/urlmapping.xml.ja
+++ b/docs/manual/urlmapping.xml.ja
@@ -1,7 +1,7 @@
-
+
@@ -177,11 +177,11 @@
RedirectMatch permanent ^/$
http://www.example.com/startpage.html
- $B$"$k$$$O!"0l;~E*$K%5%$%H$N$9$Y$F$N%Z!<%8$r0l$D$N%Z!<%8$X%j%@%$%l%/%H$9$k(B
- $B$H$-$O!"0J2<$r;H$$$^$9(B:
+ $B$"$k$$$O!"0l;~E*$K%5%$%H$N$9$Y$F$N%Z!<%8$rB>$N%5%$%H$NFCDj$N(B
+ $B%Z!<%8$X%j%@%$%l%/%H$9$k$H$-$O!"0J2<$r;H$$$^$9(B:
RedirectMatch temp .*
- http://www.example.com/startpage.html
+ http://othersite.example.com/startpage.html