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 75eeb2b2faa15fa68c80357dbfecbb1e6adab4b0..3431a895fe1b2d1dd64f72b5fd6b4ac4f9c59ded 100644 (file)
--- a/docs/manual/bind.xml.ja
+++ b/docs/manual/bind.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.2 -->
+<!-- English revision: 1.2.2.4 -->
 
 <manualpage metafile="bind.xml.meta">
 
@@ -23,7 +23,7 @@
         <module>mpm_common</module>
       </modulelist>
       <directivelist>
-        <directive module="core">VirtualHost</directive>
+        <directive module="core" type="section">VirtualHost</directive>
         <directive module="mpm_common">Listen</directive>
       </directivelist>
     </related>
@@ -77,47 +77,69 @@
   <section id="ipv6">
     <title>IPv6 \e$B$NFC5-;v9`\e(B</title>
 
-    <p>APR \e$B$,\e(B IPv6 \e$B$r%5%]!<%H$9$k>l9g$O!"\e(BApache \e$B$O%G%U%)%k%H$G\e(B IPv6
-    \e$B$r\e(B listen \e$B$9$k%=%1%C%H$r:n$j$^$9\e(B (\e$BNc$($P\e(B Listen \e$B%G%#%l%/%F%#%V$G\e(B
-    IP \e$B%"%I%l%9$,L5;XDj$N>l9g\e(B)\e$B!#\e(B
-    \e$B$D$^$j!"\e(BAPR \e$B$,\e(B IPv6 \e$B$r%5%]!<%H$7$F$$$k>l9g!"\e(B</p>
+    <p>\e$BB?$/$N%W%i%C%H%[!<%`$G\e(B IPv6 \e$B$,%5%]!<%H$5$l$F$-$F$$$F!"\e(B
+    APR \e$B$O$3$l$i$N$[$H$s$I$G\e(B IPv6 \e$B$r%5%]!<%H$7$F$$$k$N$G!"\e(B
+    Apache \e$B$O\e(B IPv6 \e$B%=%1%C%H$r3d$jEv$F$F\e(B IPv6
+    \e$B7PM3$GAw$i$l$F$-$?%j%/%(%9%H$r07$&$3$H$,$G$-$^$9!#\e(B</p>
+
+    <p>IPv6 \e$B%=%1%C%H$,\e(B IPv4 \e$B$H\e(B IPv6 \e$B%3%M%/%7%g%s$NN>J}$r07$&$3$H$,$G$-$k$+\e(B
+    \e$B$I$&$+$O!"\e(BApache \e$B4IM}<T$K$H$C$FLq2p$JLdBj$G$9!#\e(B
+    IPv4 \e$B%3%M%/%7%g%s$r\e(B IPv6 \e$B%=%1%C%H$G07$&>l9g$O!"\e(B
+    IPv4 \e$B%^%C%W$5$l$?\e(B IPv6 \e$B%"%I%l%9$r;HMQ$7$F$$$F!"\e(B
+    \e$B$[$H$s$I$N%W%i%C%H%[!<%`$G$O%G%U%)%k%H$G;HMQ2DG=$G$9$,!"\e(B
+    FreeBSD, NetBSD, OpenBSD \e$B$G$O!"%7%9%F%`A4BN$H$7$F$N%]%j%7!<$H$N@09g@-$+$i!"\e(B
+    \e$B%G%U%)%k%H$G$O;HMQIT2D$K@_Dj$5$l$F$$$^$9!#\e(B
+    \e$B$3$l$i$N%G%U%)%k%H$G;HMQIT2D$N%W%i%C%H%[!<%`$G$"$C$F$b!"\e(B
+    \e$BFCJL$J@_Dj%Q%i%a!<%?$G\e(B Apache \e$B$N5sF0$rJQ2=$5$;$k$3$H$,$G$-$^$9!#\e(B</p>
+
+    <p>IPv4 \e$B$H\e(B IPv6 \e$B$N%3%M%/%7%g%s$r:G>.8B$N%=%1%C%H$G07$$$?$$$N$G$"$l$P!"\e(B
+    IPv4 \e$B%^%C%W$N\e(B IPv6 \e$B%"%I%l%9$r;HMQ$9$kI,MW$,$"$j!"\e(B
+    <code>--enable-v4-mapped</code> configure \e$B%*%W%7%g%s$r;XDj$7$F!"C1=c$K\e(B
+    <directive module="mpm_common">Listen</directive> 
+    \e$B%G%#%l%/%F%#%V$G<!$N$h$&$K@_Dj$7$^$9!#\e(B</p>
 
     <example>
       Listen 80
     </example>
 
-    <p>\e$B$O!"<!$HF1$80UL#$K$J$j$^$9!#\e(B</p>
+    <p><code>--enable-v4-mapped</code> \e$B$G$O!"\e(BApache
+    \e$B$N@8@.$9$k%G%U%)%k%H$N@_Dj%U%!%$%kCf$N\e(B
+    <directive module="mpm_common">Listen</directive>
+    \e$B%G%#%l%/%F%#%V$O$3$N7A<0$r;HMQ$7$F$$$^$9!#\e(B
+    <code>--enable-v4-mapped</code> \e$B$O!"\e(B
+    FreeBSD, NetBSD, OpenBSD \e$B0J30$NA4$F$N%W%i%C%H%[!<%`$G$N%G%U%)%k%H$G$9!#\e(B
+    \e$B$G$9$+$i!"$*$=$i$/$*<j85$N\e(B Apache \e$B$O$3$N@_Dj$G%S%k%I$5$l$F$$$k$G$7$g$&!#\e(B</p>
 
-    <example>
-      Listen [::]:80
-    </example>
-
-    <p>APR \e$B$,\e(B IPv6 \e$B$r%5%]!<%H$7$F$$$J$$>l9g$O!"\e(B</p>
+    <p>\e$B%W%i%C%H%U%)!<%`$d\e(B APR \e$B$,2?$r%5%]!<%H$9$k$+$K4X$o$i$:!"\e(B
+    IPv4 \e$B%3%M%/%7%g%s$N$_$r07$&$h$&$K$7$?$$>l9g$O!"\e(B
+    \e$B<!$NNc$N$h$&$KA4$F$N\e(B
+    <directive module="mpm_common">Listen</directive> \e$B%G%#%l%/%F%#%V$G\e(B
+    IPv4 \e$B%"%I%l%9$r;XDj$7$F$/$@$5$$!#\e(B</p>
 
     <example>
-      Listen 80
+      Listen 0.0.0.0:80<br />
+      Listen 192.170.2.1:80
     </example>
 
-    <p>\e$B$O!"<!$HF1$80UL#$K$J$j$^$9!#\e(B</p>
+    <p>IPv4 \e$B$H\e(B IPv6 \e$B$N%3%M%/%7%g%s$r8DJL$N%=%1%C%H$G07$&$h$&$K$7$?$$>l9g\e(B
+    (\e$B$D$^$j\e(B IPv4 \e$B%^%C%W$N%"%I%l%9$rL58z$K$7$?$$>l9g\e(B)
+    \e$B$O!"\e(B<code>--disable-v4-mapped</code> configure
+    \e$B%*%W%7%g%s$r;XDj$7$F!"<!$N$h$&$K8DJL;XDj$N\e(B
+    <directive module="mpm_common">Listen</directive>
+    \e$B%G%#%l%/%F%#%V$r;HMQ$7$F$/$@$5$$!#\e(B</p>
 
     <example>
-      Listen 0.0.0.0:80
+       Listen [::]:80<br />
+       Listen 0.0.0.0:80
     </example>
 
-    <p>NetBSD \e$BEy$N$$$/$D$+$N%W%i%C%H%[!<%`$G$O!"\e(BIPv6
-    \e$B$N%o%$%k%I%+!<%I%"%I%l%9\e(B (\e$B!V\e(B::\e$B!W\e(B) \e$B$N%P%$%s%I$G$O\e(B IPv4
-    \e$B%$%s%?!<%U%'!<%9$K%3%M%/%7%g%s$rD%$l$^$;$s!#\e(B
-    \e$B$3$N$h$&$J>u67$G$O!"<!$N$h$&$KJ#?t$N\e(B Listen \e$B%G%#%l%/%F%#%V$,I,MW$K$J$j$^$9!#\e(B
-    </p>
-
-    <example>
-      Listen 0.0.0.0:80<br />
-      Listen [::]:0
-    </example>
+    <p><code>--disable-v4-mapped</code> \e$B$G$O!"\e(BApache
+    \e$B$N@8@.$9$k%G%U%)%k%H$N@_Dj%U%!%$%kCf$N\e(B
+    <directive module="mpm_common">Listen</directive>
+    \e$B%G%#%l%/%F%#%V$O$3$N7A<0$r;HMQ$7$F$$$^$9!#\e(B
+    <code>--disable-v4-mapped</code> \e$B$O!"\e(B
+    FreeBSD, NetBSD, OpenBSD \e$B%W%i%C%H%[!<%`$G$N%G%U%)%k%H$G$9!#\e(B</p>
 
-    <p>Apache \e$B$O8=:_$3$l$r<+F08!=P$9$k$3$H$,$G$-$J$$$N$G!"\e(B
-    \e$B$=$N$h$&$J>l9g$O\e(B
-    Listen \e$BL?NaJ8$O4IM}<T$,<jF0$GJT=8$7$J$$$H$$$1$^$;$s!#\e(B</p>
   </section>
 
   <section id="virtualhost">

diff --git a/docs/manual/cgi_path.xml.ja b/docs/manual/cgi_path.xml.ja
index a793b149a8af6b8911caa57b1cb2225c34fb5af6..cea183e1b042f5f07a4a2d34bb2604383714896c 100644 (file)
--- a/docs/manual/cgi_path.xml.ja
+++ b/docs/manual/cgi_path.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 -->
+<!-- English revision: 1.1.2.2 -->
 
 <manualpage metafile="cgi_path.xml.meta">
 

diff --git a/docs/manual/configuring.xml.ja b/docs/manual/configuring.xml.ja
index 494a88982c6b5e781fda960a76e82aaca52ed1ba..21c6cdc3ce81dca40b45e83994ffba8486510124 100644 (file)
--- a/docs/manual/configuring.xml.ja
+++ b/docs/manual/configuring.xml.ja
@@ -2,7 +2,7 @@
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage metafile="configuring.xml.meta">
-<!-- English revision: 1.5 -->
+<!-- English revision: 1.5.2.2 -->
 
   <title>\e$B@_Dj%U%!%$%k\e(B</title>
 

diff --git a/docs/manual/content-negotiation.xml.ja b/docs/manual/content-negotiation.xml.ja
index a2ec6f6e86ee34198e333864dfacf47e183dd44a..3fec243598f763bec552d494c0889a0f35bbd183 100644 (file)
--- a/docs/manual/content-negotiation.xml.ja
+++ b/docs/manual/content-negotiation.xml.ja
@@ -2,7 +2,7 @@
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage metafile="content-negotiation.xml.meta">
-<!-- English revision: 1.1 -->
+<!-- English revision: 1.1.2.5 -->
 
 <title>\e$B%3%s%F%s%H%M%4%7%(!<%7%g%s\e(B</title>
 
@@ -178,10 +178,11 @@
 <section id="multiviews"><title>Multiviews</title>
 
     <p><code>MultiViews</code> \e$B$O%G%#%l%/%H%jKh$N%*%W%7%g%s$G!"\e(B
+    <code>httpd.conf</code>\e$B%U%!%$%k$N\e(B
     <directive module="core" type="section">Directory</directive>, 
     <directive module="core" type="section">Location</directive>, 
     <directive module="core" type="section">Files</directive>
-    \e$B$d!"\e(B(<directive module="core">AllowOverride</directive>
+    \e$B%;%/%7%g%sCf$d!"\e(B(<directive module="core">AllowOverride</directive>
     \e$B$,E,@Z$JCM$K\e(B \e$B@_Dj$5$l$F$$$k$H\e(B) <code>.htaccess</code>
     \e$B%U%!%$%k$G\e(B <directive module="core">Options</directive>
     \e$B%G%#%l%/%F%#%V$K$h$C$F@_Dj$9$k$3$H$,$G$-$^$9!#\e(B

diff --git a/docs/manual/custom-error.xml.ja b/docs/manual/custom-error.xml.ja
index 23b4f896b7ebec064846e06361ba93c703134e55..89bd3dfc657dd1a042d236e2b40fd8a55a1a0046 100644 (file)
--- a/docs/manual/custom-error.xml.ja
+++ b/docs/manual/custom-error.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 -->
+<!-- English revision: 1.1.2.3 -->
 
 <manualpage metafile="custom-error.xml.meta">
   

diff --git a/docs/manual/dns-caveats.xml.ja b/docs/manual/dns-caveats.xml.ja
index e6ec81434eda8df5e6d8708ff7dacce14ce7bf22..5c62f2cdae98c48a19e44b14d5fe1a5a19de5318 100644 (file)
--- a/docs/manual/dns-caveats.xml.ja
+++ b/docs/manual/dns-caveats.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.2 -->
+<!-- English revision: 1.2.2.2 -->
 
 <manualpage metafile="dns-caveats.xml.meta">
   

diff --git a/docs/manual/dso.xml.ja b/docs/manual/dso.xml.ja
index 7c5d2f6f26363232356af43925927fd56783b522..d3614d716a13935f18e664692586296ad4e35eeb 100644 (file)
--- a/docs/manual/dso.xml.ja
+++ b/docs/manual/dso.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 -->
+<!-- English revision: 1.3.2.2 -->
 
 <manualpage metafile="dso.xml.meta">
 

diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja
index af4e51e7789afef40e1c11e5e6c124b4f7d0c7f5..f06246557061a8b8e24875be40f545b34dc6c293 100644 (file)
--- a/docs/manual/env.xml.ja
+++ b/docs/manual/env.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.6.2.2 -->
+<!-- English revision: 1.6.2.4 -->
 
 <manualpage metafile="env.xml.meta">
 

diff --git a/docs/manual/filter.xml.ja b/docs/manual/filter.xml.ja
index 340966e3f7cfb92b55064e741f9aa75440d94940..e97bae74fdde85ec5f70e610d948ffc44bd7aa3a 100644 (file)
--- a/docs/manual/filter.xml.ja
+++ b/docs/manual/filter.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.4 -->
+<!-- English revision: 1.4.2.2 -->
 
 <manualpage metafile="filter.xml.meta">
 

diff --git a/docs/manual/handler.xml.ja b/docs/manual/handler.xml.ja
index 38237617715cab995df23669e6db178804e137c0..dff11d1f5a6bdb6e997c8b7b876bbf9c5db0957f 100644 (file)
--- a/docs/manual/handler.xml.ja
+++ b/docs/manual/handler.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 -->
+<!-- English revision: 1.3.2.2 -->
 
 <manualpage metafile="handler.xml.meta">
 

diff --git a/docs/manual/index.xml.ja b/docs/manual/index.xml.ja
index ebab0b512d4543157f4e3dd52a377e11c25adf72..aca5827886c2e2d7601101a24268ebcde79b632b 100644 (file)
--- a/docs/manual/index.xml.ja
+++ b/docs/manual/index.xml.ja
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="iso-2022-jp" ?>
 <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English revision: 1.4 -->
+<!-- English revision: 1.1.2.4 -->
 
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Apache HTTP \e$B%5!<%P\e(B \e$B%P!<%8%g%s\e(B 2.1 \e$B%I%-%e%a%s%H\e(B</title>
+<title>Apache HTTP \e$B%5!<%P\e(B \e$B%P!<%8%g%s\e(B 2.0 \e$B%I%-%e%a%s%H\e(B</title>
 
 <category id="release"><title>\e$B%j%j!<%9%N!<%H\e(B</title>
     <page href="new_features_2_0.html">Apache 2.0 \e$B$N?75!G=\e(B</page>

diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja
index 3f66a209b63ff4c70b88ca9233f35e0050ba356b..c1b4d079c1a086a38038c7f2c46a1488b5dfe486 100644 (file)
--- a/docs/manual/install.xml.ja
+++ b/docs/manual/install.xml.ja
@@ -2,7 +2,7 @@
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage metafile="install.xml.meta">
-<!-- English revision: 1.11.2.3 -->
+<!-- English revision: 1.11.2.7 -->
 
   <title>\e$B%3%s%Q%$%k$H%$%s%9%H!<%k\e(B</title>
 
@@ -25,8 +25,8 @@
 
 </summary>
 
-<seealso><a href="invoking.html">Apache \e$B$N5/F0\e(B</a></seealso>
-<seealso><a href="stopping.html">\e$BDd;_$H:F5/F0\e(B</a></seealso>
+<seealso><a href="invoking.html">Apache\e$B$N5/F0\e(B</a></seealso>
+<seealso><a href="stopping.html">Apache\e$B$NDd;_$H:F5/F0\e(B</a></seealso>
 
 <section id="overview"><title>\e$B35MW\e(B (\e$B$;$C$+$A$J?M8~$1\e(B)</title>
 
@@ -139,10 +139,11 @@
 
 <section id="download"><title>\e$B%@%&%s%m!<%I\e(B</title>
 
-    <p>Apache \e$B$O$$$/$D$+$N%_%i!<$N%j%9%H$,$"$k\e(B <a
-    href="http://httpd.apache.org/download.cgi">Apache HTTP
-    \e$B%5!<%P%@%&%s%m!<%I%5%$%H\e(B</a>\e$B$G%@%&%s%m!<%I$G$-$^$9!#\e(B
-    \e$B$=$3$K$O!"%j%j!<%9$5$l$?:G?7$N0BDjHG$,$"$j$^$9!#\e(B</p>
+    <p>Apache \e$B$O\e(B <a
+    href="http://www.apache.org/dist/httpd/">Apache Software
+    Foundation \e$B%@%&%s%m!<%I%5%$%H\e(B</a>\e$B$+$i%@%&%s%m!<%I$G$-$^$9$7!"\e(B
+    \e$BF1$8>l=j$K4v$D$+$N%_%i!<%5%$%H$b%j%9%H$7$F$$$^$9!#\e(B
+    \e$B$3$3$+$i:G?7$N0BDjHG$,<j$KF~$j$^$9!#\e(B</p>
 
     <p>\e$B%@%&%s%m!<%I8e!"FC$K%_%i!<%5%$%H$r;H$C$?>l9g$O!"\e(B
     \e$B%@%&%s%m!<%I$7$?$b$N$,\e(B Apache HTTP 
@@ -150,8 +151,8 @@
     \e$B8!>Z$9$k$3$H$,=EMW$G$9!#$3$l$O%@%&%s%m!<%I$7$?\e(B tarball \e$B$N\e(B PGP \e$B=pL>$r\e(B
     \e$B%F%9%H$9$k$3$H$K$h$C$F8!>Z$7$^$9!#\e(B
     \e$B$3$l$OFs$D$NCJ3,$,$"$j$^$9!#\e(B
-    \e$B$^$:\e(B <a href="http://www.apache.org/dist/httpd/"><code>KEYS</code></a>
-    \e$B%U%!%$%k$b\e(B Apache \e$BG[I[%5%$%H\e(B
+    \e$B$^$:\e(B <a href="http://www.apache.org/dist/httpd/KEYS"><code>KEYS</code></a>
+    \e$B%U%!%$%k$r\e(B <a href="http://www.apache.org/dist/httpd/">Apache \e$BG[I[%5%$%H\e(B</a>
     \e$B$+$i%@%&%s%m!<%I$7$F$/$@$5$$!#\e(B(<code>KEYS</code> \e$B%U%!%$%k<+BN$,\e(B
     \e$B2~cb$5$l$F$$$J$$$3$H$r3N<B$K$9$k$?$a$K!"0JA0$N\e(B Apache 
     \e$BG[I[$+$i<h$j=P$7$?%U%!%$%k$r;H$C$?$j!"\e(B
@@ -169,9 +170,9 @@
     PGP \e$B=pL>$OI,$:\e(B <a
     href="http://httpd.apache.org/download.cgi">\e$B%a%$%s$N\e(B Apache
     \e$B%&%'%V%5%$%H\e(B</a>\e$B$+$i<hF@$7$F$/$@$5$$!#\e(B
-    \e$B=pL>%U%!%$%k$X$N%j%s%/$OBP1~$9$k%@%&%s%m!<%I%j%s%/$N<!$K$"$j!"\e(B
+    \e$B=pL>%U%!%$%k$X$N%j%s%/$OBP1~$9$k%@%&%s%m!<%I%j%s%/$NNY$K$"$j!"$^$?\e(B
     <a href="http://www.apache.org/dist/httpd/">Apache
-    \e$BG[I[%5%$%H\e(B</a>\e$B$NFCDj$N%G%#%l%/%H%j$K$b$"$k$+$b$7$l$^$;$s!#\e(B
+    \e$BG[I[%5%$%H\e(B</a>\e$B$NFCDj$N%G%#%l%/%H%j$G8+$D$1$k$3$H$b$G$-$k$G$7$g$&!#\e(B
     \e$B=pL>%U%!%$%k$NL>A0$O!"%=!<%9%U%!%$%k$N\e(B tarball \e$B$HF1$8L>A0$K\e(B
     <code>.asc</code> \e$B$rIU2C$7$?$b$N$K$J$C$F$$$^$9!#\e(B
     \e$B0J2<$N%3%^%s%I\e(B (\e$B$d$C$Q$j\e(B pgp \e$B$N%P!<%8%g%s$K0MB8\e(B) \e$B$N$I$l$+0l$D$G!"\e(B
@@ -493,6 +494,13 @@
 
       <dd>MPM \e$B%b%8%e!<%k\e(B <em>NAME</em> \e$B$rA*Br$7$^$9!#\e(B</dd>
     </dl>
+
+    <p><var>mpm_name</var> \e$B$H$$$&\e(B MPM \e$B$rM-8z$K$9$k$K$O<!$N$h$&$K$7$^$9!#\e(B</p>
+
+<example>
+     ./configure --with-mpm=<var>mpm_name</var>
+</example>
+
 </section>
 
 <section id="dbm"><title>DBM</title>
@@ -571,7 +579,7 @@
 
     <p><a href="./">docs/manual/</a> \e$B$N\e(B Apache \e$B%^%K%e%"%k$r$6$C$H8+$F$/$@$5$$!#\e(B
     \e$B$^$?$O!"\e(B<a
-    href="http://httpd.apache.org/docs-2.0/">http://httpd.apache.org/docs-2.0/</a>
+    href="http://httpd.apache.org/docs-2.1/">http://httpd.apache.org/docs-2.1/</a>
     \e$B$K$"$k%^%K%e%"%k:G?7HG!"\e(B<a
     href="mod/directives.html">\e$B@_Dj%G%#%l%/%F%#%V\e(B</a>\e$B$KEv$?$C$F$_$F$/$@$5$$!#\e(B</p>
 </section>

diff --git a/docs/manual/invoking.xml.ja b/docs/manual/invoking.xml.ja
index 3ef636c0b823d552ef7630a4173a200a02402585..5279178f867a5674d32a7f4a397746df51bfff10 100644 (file)
--- a/docs/manual/invoking.xml.ja
+++ b/docs/manual/invoking.xml.ja
@@ -2,13 +2,13 @@
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage metafile="invoking.xml.meta">
-<!-- English revision: 1.2.2.2 -->
+<!-- English revision: 1.2.2.5 -->
 
   <title>Apache \e$B$N5/F0\e(B</title>
 
 <summary>
     <p>Windows \e$B>e$G$O!"\e(BApache \e$B$ODL>o$O\e(B
-    Windows NT, 2000, XP \e$B$G$O%5!<%S%9$H$7$F!"\e(BWindows 95, ME 
+    Windows NT, 2000, XP \e$B$G$O%5!<%S%9$H$7$F!"\e(BWindows 9x, ME 
     \e$B$G$O%3%s%=!<%k%"%W%j%1!<%7%g%s$H$7$F<B9T$5$l$^$9!#\e(B
     \e$B>\:Y$K4X$7$F$O!"!V\e(B<a href="platform/windows.html#winsvc">
     \e$B%5!<%S%9$H$7$F<B9T$9$k\e(B</a>\e$B!W$H!V\e(B<a 

diff --git a/docs/manual/logs.xml.ja b/docs/manual/logs.xml.ja
index 61b7cb691a3c7582dbe78ee7b453afe1fa220189..3d079778495494b9658e7a38596cb4f69a292f5e 100644 (file)
--- a/docs/manual/logs.xml.ja
+++ b/docs/manual/logs.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.6 -->
+<!-- English revision: 1.6.2.4 -->
 
 <manualpage metafile="logs.xml.meta">
 
@@ -287,7 +287,7 @@
       <example>
         LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\"
         \"%{User-agent}i\"" combined<br />
-         CustomLog log/acces_log combined
+         CustomLog log/access_log combined
       </example>
 
       <p>\e$B$3$N=q<0$N:G=i$NJ}$O\e(B Common Log Format \e$B$H$^$C$?$/F1$8$G!":G8e$K\e(B

diff --git a/docs/manual/mpm.xml.ja b/docs/manual/mpm.xml.ja
index 8e1c764310d617201582198dafa399e71b2321b7..3a290d85e6295c1bcd3b9491fc0c9f8e74329b30 100644 (file)
--- a/docs/manual/mpm.xml.ja
+++ b/docs/manual/mpm.xml.ja
@@ -2,7 +2,7 @@
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage metafile="mpm.xml.meta">
-<!-- English revision: 1.2 -->
+<!-- English revision: 1.2.2.2 -->
 
   <title>\e$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k\e(B (MPM)</title>
 

diff --git a/docs/manual/new_features_2_0.xml.ja b/docs/manual/new_features_2_0.xml.ja
index 0ef08a5f3dac978091c42e500a26bbfab5ac3d99..8c3089925bb3e5c0942ec50fabf413afd554c438 100644 (file)
--- a/docs/manual/new_features_2_0.xml.ja
+++ b/docs/manual/new_features_2_0.xml.ja
@@ -2,7 +2,7 @@
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage metafile="new_features_2_0.xml.meta">
-<!-- English revision: 1.4.2.1 -->
+<!-- English revision: 1.4.2.3 -->
 
 <title>Apache 2.0 \e$B$N?75!G=$N35MW\e(B</title>
 

diff --git a/docs/manual/server-wide.xml.ja b/docs/manual/server-wide.xml.ja
index 469617f1e0ae74505b453d3d7561526835215e76..142dd6d49f085337d722e3faedd6166c0378ee7a 100644 (file)
--- a/docs/manual/server-wide.xml.ja
+++ b/docs/manual/server-wide.xml.ja
@@ -2,7 +2,7 @@
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage metafile="server-wide.xml.meta">
-<!-- English revision: 1.1 -->
+<!-- English revision: 1.1.2.2 -->
 
   <title>\e$B%5!<%PA4BN$N@_Dj\e(B</title>
 

diff --git a/docs/manual/sitemap.xml.ja b/docs/manual/sitemap.xml.ja
index 747e834d3c9fbcc2ed372119b56c076b8fd57da7..183e6727b39805893a9d13aa54ed6e02b7e1a9b0 100644 (file)
--- a/docs/manual/sitemap.xml.ja
+++ b/docs/manual/sitemap.xml.ja
@@ -3,7 +3,7 @@
   [ <!ENTITY allmodules SYSTEM "./mod/allmodules.xml.ja"> ]
 >
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English revision: 1.12.2.5 -->
+<!-- English revision: 1.12.2.12 -->
 
 <sitemap metafile="sitemap.xml.meta">
 
@@ -12,15 +12,14 @@
 <summary>
 <p>\e$B$3$N%Z!<%8$O8=;~E@$GMxMQ2DG=$J\e(B
 <a href="./">Apache HTTP \e$B%5!<%P%P!<%8%g%s\e(B 2.0 \e$B$N%I%-%e%a%s%F!<%7%g%s\e(B</a>
-\e$B$N0lMw$G$9!#\e(B
-</p>
+\e$B$N0lMw$G$9!#\e(B</p>
 </summary>
 
 <category id="release">
 <title>\e$B%j%j!<%9$N%a%b\e(B</title>
 <page href="upgrading.html">1.3 \e$B$+$i\e(B 2.0 \e$B$X$N%"%C%W%0%l!<%I\e(B</page>
 <page href="new_features_2_0.html">Apache 2.0 \e$B$N?75!G=\e(B</page>
-<page href="license.html">Apache \e$B$N%i%$%;%s%9\e(B</page>
+<page href="license.html">Apache License</page>
 </category>
 
 <category id="using">
@@ -61,7 +60,8 @@
 
 <category id="faq">
 <title>Apache \e$B%5!<%P$N$h$/$"$k<ALd\e(B</title>
-<page separate="yes" href="faq/">\e$B35N,\e(B</page>
+<page href="faq/">\e$B35N,\e(B</page>
+<page separate="yes" href="faq/all_in_one.html">1 \e$B%Z!<%8HG\e(B</page>
 <page href="faq/support.html">\e$B%5%]!<%H\e(B</page>
 </category>
 

diff --git a/docs/manual/stopping.xml.ja b/docs/manual/stopping.xml.ja
index 28de3fde38c11e75bdaabb81a14a331d0a7be598..03248d7809189f343bf33c98867aeb9bde6c0f59 100644 (file)
--- a/docs/manual/stopping.xml.ja
+++ b/docs/manual/stopping.xml.ja
@@ -1,20 +1,20 @@
 <?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.2.2.3 -->
+<!-- English revision: 1.2.2.6 -->
 <manualpage metafile="stopping.xml.meta">
 
   <title>\e$BDd;_$H:F5/F0\e(B</title>
 
 <summary>
     <p>\e$B$3$NJ8=q$G$O\e(B Unix \e$B$KN`;w$7$?%7%9%F%`$G$N\e(B
-    Apache \e$B$NDd;_$H:F5/F0$K$D$$$F07$C$F$$$^$9!#\e(BWindows \e$B$G\e(B Apache \e$B$r@)8f$9$k$?$a$N\e(B
-    \e$B>pJs$H$7$F!"\e(BWindows NT, 2000, XP \e$B$N\e(B
-    \e$B%f!<%6$O\e(B <a
-    href="platform/windows.html#winsvc">Apache \e$B$r%5!<%S%9$H$7$F<B9T$9$k\e(B</a>\e$B$r!"\e(B
-    Windows 9x \e$B$H\e(B ME \e$B$N%f!<%6$O\e(B <a
-    href="platform/windows.html#wincons">Apache \e$B$r%3%s%=!<%k%"%W%j$H$7$F\e(B
-    \e$B<B9T$9$k\e(B</a>\e$B$r;2>H$7$F$/$@$5$$!#\e(B</p>
+    Apache \e$B$NDd;_$H:F5/F0$K$D$$$F07$C$F$$$^$9!#\e(B
+    Windows NT, 2000, XP \e$B%f!<%6$O\e(B<a
+    href="platform/windows.html#winsvc">\e$B%5!<%S%9$H$7$F\e(B
+    Apache \e$B$r<B9T$9$k\e(B</a>\e$B$G!"\e(BWindows 9x, ME\e$B%f!<%6$O\e(B<a
+    href="platform/windows.html#wincons">\e$B%3%s%=!<%k%"%W%j%1!<%7%g%s$H$7$F\e(B
+    Apache \e$B$r<B9T$9$k\e(B</a>\e$B$G!"\e(B
+    \e$B$3$l$i$N%W%i%C%H%[!<%`$G$N;HMQJ}K!$r$4Mw2<$5$$!#\e(B</p>
 </summary>
 
 <seealso><a href="programs/httpd.html">httpd</a></seealso>
@@ -35,7 +35,9 @@
     \e$B$K=q$+$l$F$$$^$9!#$3$l$O$D$^$j!"?F0J30$N%W%m%;%9$K\e(B
     \e$B%7%0%J%k$rAw$kI,MW$9$i$J$$!"$H$$$&$3$H$G$9!#\e(B
     \e$B?F%W%m%;%9$KAw$k$3$H$,$G$-$k\e(B 3 \e$B<oN`$N%7%0%J%k$,$"$j$^$9\e(B:
-    <code>TERM</code>, <code>HUP</code>, <code>USR1</code>
+    <code><a href="#term">TERM</a></code>,
+    <code><a href="#hup">HUP</a></code>, 
+    <code><a href="#graceful">USR1</a></code>
     \e$B$G$9!#$3$l$i$N@bL@$K$D$$$F$OB3$-$r$4Mw2<$5$$!#\e(B</p>
 
     <p>\e$B?F%W%m%;%9$K%7%0%J%k$rAw$k$K$O!"\e(B
@@ -45,7 +47,7 @@
 
     <p><code>httpd</code> \e$B%W%m%;%9$K%7%0%J%k$rAw$k\e(B 2 \e$BHVL\$NJ}K!$O\e(B
     <code>-k</code> \e$B$H$$$&%3%^%s%I%i%$%s0z?t$r;HMQ$9$k$3$H$G$9!#\e(B
-    \e$B2<$G@bL@$5$l$F$$$k$h$&$K!"\e(B<code>stop</code>, <code>restart</code>,
+    \e$B2<$G@bL@$5$l$F$$$k$h$&$K!"\e(B<code>stop</code>, <code>restart</code>, 
     <code>graceful</code> \e$B$r;XDj$G$-$^$9!#\e(B
     \e$B$3$l$i$O\e(B <a href="programs/httpd.html">httpd</a> \e$B$N0z?t$G$9$,!"\e(B
     \e$B@)8fMQ$N%9%/%j%W%H\e(B <a href="programs/apachectl.html">apachectl</a> \e$B$r\e(B
@@ -92,16 +94,17 @@
     \e$B;R%W%m%;%9$,=y!9$K$J$/$J$k$K=>$C$F!"\e(B
     \e$B?7$7$$\e(B<em>\e$B@$Be\e(B</em>\e$B$N@_Dj$K$h$k;R%W%m%;%9$KCV$-49$($F$$$-$^$9!#\e(B
     \e$B$=$7$F!"$3$l$i$,?7$?$J%j%/%(%9%H$KB(:B$K1~Ez$7;O$a$^$9!#\e(B</p>
-    <note>\e$BFCDj$N%W%i%C%H%[!<%`$G$O\e(B <code>USR1</code> \e$B$r4K$d$+$J:F5/F0$N$?$a$K\e(B
-    \e$B;H$&$3$H$,$G$-$^$;$s$,!"Be$o$j$N%7%0%J%k\e(B
-    (\e$BNc$($P\e(B <code>WINCH</code>) \e$B$,;HMQ$G$-$k$G$7$g$&!#\e(B
+
+    <note>\e$BFCDj$N%W%i%C%H%[!<%`$G$O\e(B <code>USR1</code>
+    \e$B$r4K$d$+$J:F5/F0$N$?$a$K;H$&$3$H$,$G$-$^$;$s$,!"Be$o$j$N%7%0%J%k\e(B
+    (\e$BNc$($P\e(B WINCH) \e$B$,;HMQ$G$-$k$G$7$g$&!#\e(B
     <code>apachectl graceful</code>
     \e$B$H$$$&%3%^%s%I$O%W%i%C%H%[!<%`$K9g$C$?%7%0%J%k$rAw$j$^$9!#\e(B</note>
 
     <p>\e$B$3$N%3!<%I$O>o$K\e(B
     MPM \e$B$N%W%m%;%9@)8f%G%#%l%/%F%#%V$N@_Dj$r=E;k$7$^$9$N$G!"\e(B
     \e$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\e(B
-    \e$BE,@Z$JCM$K0];}$5$l$^$9!#$^$?!"<!$N$h$&$K$7$F\e(B
+    \e$BE,@Z$JCM$K0];}$5$l$^$9!#!#$^$?!"<!$N$h$&$K$7$F\e(B
     <directive module="mpm_common">StartServers</directive>
     \e$B$r<i$j$^$9\e(B:
     \e$B>/$J$/$H$b\e(B 1 \e$BIC8e$K\e(B <directive
@@ -151,7 +154,8 @@
     \e$BHs\e(B root \e$B%f!<%6$G\e(B <code>httpd</code> \e$B$r5/F0$7$h$&$H$9$l$P$o$+$j$^$9!#\e(B
     \e$B$b$7%(%i!<$,$J$1$l$P!"%=%1%C%H$d%m%0$r3+$3$&$H$7$F\e(B
     root \e$B$G$J$$$?$a\e(B
-    (\e$B$b$7$/$O\e(B <code>httpd</code> \e$B$,4{$KI,MW$J%]!<%H$K%P%$%s%I$7$F$$$k$?$a\e(B)
+    (\e$B$b$7$/$O<B9TCf$N\e(B <code>httpd</code>
+    \e$B$,4{$KI,MW$J%]!<%H$K%P%$%s%I$7$F$$$k$?$a\e(B)
     \e$B$K<:GT$9$k$G$7$g$&!#\e(B
     \e$B$3$l0J30$NM}M3$G5/F0$K<:GT$7$?$N$G$"$l$P!"\e(B
     \e$B$=$l$O@_Dj%U%!%$%k$N%(%i!<$G!"\e(B

diff --git a/docs/manual/suexec.xml.ja b/docs/manual/suexec.xml.ja
index 773207f382e82889576127555344e36509e16676..e9007a23bd51a524c28fbccd7eefb7a272bccedf 100644 (file)
--- a/docs/manual/suexec.xml.ja
+++ b/docs/manual/suexec.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 -->
+<!-- English revision: 1.3.2.3 -->
 
 <manualpage metafile="suexec.xml.meta">
 

diff --git a/docs/manual/upgrading.xml.ja b/docs/manual/upgrading.xml.ja
index 6eba6835b74a774b1bc3c618d9acb182c2f51bd4..4a6ea6b19ed9be6fd6697bb00e28b80fd4c2db53 100644 (file)
--- a/docs/manual/upgrading.xml.ja
+++ b/docs/manual/upgrading.xml.ja
@@ -2,7 +2,7 @@
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
 <manualpage metafile="upgrading.xml.meta">
-<!-- English revision: 1.6.2.1 -->
+<!-- English revision: 1.6.2.5 -->
 
 <title>1.3 \e$B$+$i\e(B 2.0 \e$B$X$N%"%C%W%0%l!<%I\e(B</title>
 
@@ -13,7 +13,7 @@
   <a href="new_features_2_0.html">\e$B?75!G=\e(B</a>\e$B$NJ8=q$d\e(B
   <code>src/CHANGES</code> \e$B%U%!%$%k$G8+$D$1$i$l$k$H;W$$$^$9!#\e(B</p>
 </summary>
-<seealso><a href="new_features_2_0.html">Apache 2.0 \e$B$N?75!G=$N35MW\e(B</a></seealso>
+<seealso><a href="new_features_2_0.html">Apache 2.0 \e$B?75!G=$N35MW\e(B</a></seealso>
 
   <section id="compile-time">
     <title>\e$B%3%s%Q%$%k;~$N@_Dj$NJQ99\e(B</title>
@@ -51,12 +51,13 @@
       \e$B%Q%9>pJs\e(B) \e$B$N07$$$,JQ$o$C$?$b$N$,$"$j$^$9!#0JA0$O%O%s%I%i$H$7$F\e(B
       \e$B<BAu$5$l$F$$$?$b$N$,%U%#%k%?$H$7$F<BAu$5$l$k$h$&$K$J$C$?$b$N$O\e(B
       <code>PATH_INFO</code> \e$B$N$"$k%j%/%(%9%H$r<u$1IU$1$^$;$s!#\e(B<a
-      href="mod/mod_include.html">INCLUDES</a> \e$B$J$I$N%U%#%k%?$O\e(B
+      href="mod/mod_include.html">INCLUDES</a> \e$B$d\e(B
+      <a href="http://www.php.net/">PHP</a> \e$B$J$I$N%U%#%k%?$O\e(B
       \e$B%3%"%O%s%I%i$N>e$K<BAu$5$l$F$$$^$9$N$G!"\e(B<code>PATH_INFO</code>
       \e$BIU$-$N%j%/%(%9%H$r5qH]$7$^$9!#\e(B
       <directive module="core">AcceptPathInfo</directive>
       \e$B%G%#%l%/%F%#%V$r;H$C$F%3%"%O%s%I%i$,\e(B <code>PATH_INFO</code>
-      \e$BIU$-$N%j%/%(%9%H$r<u$1IU$1$k$h$&$K$G$-!"$=$l$K$h$C$F\e(B SSI \e$B$G\e(B
+      \e$BIU$-$N%j%/%(%9%H$r<u$1IU$1$k$h$&$K$G$-!"$=$l$K$h$C$F\e(B SSI \e$BEy$G\e(B
       <code>PATH_INFO</code> \e$B$r;H$&5!G=$rI|3h$5$;$k$3$H$,$G$-$^$9!#\e(B</li>
 
       <li><directive module="mod_negotiation">CacheNegotiatedDocs</directive>
@@ -151,10 +152,6 @@
     <title>\e$B$=$NB>$NJQ99\e(B</title>
 
     <ul>
-      <li>\e$B%P!<%A%c%k%[%9%H$N@_Dj$r=PNO$9$k$?$a$K;H$o$l$F$$$?\e(B
-      <code>httpd</code> \e$B$N%3%^%s%I%i%$%s%*%W%7%g%s\e(B <code>-S</code> \e$B$O\e(B
-      <code>-t -D DUMP_VHOSTS</code> \e$B$KCV$-49$($i$l$^$7$?!#\e(B</li>
-
       <li>Apache 1.3 \e$B$G<B83E*$J%b%8%e!<%k$@$C$?\e(B
       <directive>mod_auth_digest</directive> \e$B$O\e(B
       \e$BI8=`%b%8%e!<%k$K$J$j$^$7$?!#\e(B</li>
@@ -178,4 +175,5 @@
     \e$BF0$-\e(B<strong>\e$B$^$;$s\e(B</strong>\e$B!#>\:Y$O\e(B <a
     href="developer/">\e$B3+H/<T8~$1J8=q\e(B</a> \e$B$K$"$j$^$9!#\e(B</p>
   </section>
+
 </manualpage>

diff --git a/docs/manual/urlmapping.xml.ja b/docs/manual/urlmapping.xml.ja
index eff6e7ee3479b4a2532debda0de8efc8a458959d..53f2ffc9b8c2a20cbbeafa6c803680d90ef37afa 100644 (file)
--- a/docs/manual/urlmapping.xml.ja
+++ b/docs/manual/urlmapping.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 -->
+<!-- English revision: 1.3.2.4 -->
 
 <manualpage metafile="urlmapping.xml.meta">
 
@@ -177,11 +177,11 @@
 <example>RedirectMatch permanent ^/$
       http://www.example.com/startpage.html</example>
 
-    <p>\e$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\e(B
-    \e$B$H$-$O!"0J2<$r;H$$$^$9\e(B:</p>
+    <p>\e$B$"$k$$$O!"0l;~E*$K%5%$%H$N$9$Y$F$N%Z!<%8$rB>$N%5%$%H$NFCDj$N\e(B
+    \e$B%Z!<%8$X%j%@%$%l%/%H$9$k$H$-$O!"0J2<$r;H$$$^$9\e(B:</p>
 
 <example>RedirectMatch temp .*
-      http://www.example.com/startpage.html</example>
+      http://othersite.example.com/startpage.html</example>
 </section>
 
 <section id="proxy"><title>\e$B%j%P!<%9%W%m%-%7\e(B</title>