This commit was manufactured by cvs2svn to create tag2.0.50

'APACHE_2_0_50'.

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

8 files changed, 28 insertions, 1515 deletions

diff --git a/STATUS b/STATUS
index 0bb2b3e9fb..539c9864fb 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/06/23 14:06:03 $]
+Last modified at [$Date: 2004/06/21 19:36:04 $]
 
 Release:
 
@@ -76,7 +76,7 @@ PATCHES TO BACKPORT FROM 2.1
        so that static modules can push Defines values when registering
        hooks just like DSO modules can ["Philippe M. Chiasson" <gozer cpan.org>]
          server/main.c: r1.158
-       +1: geoff, nd, stas
+       +1: geoff, nd
        nd adds: minor bump.
 
     *) mod_ssl: Remove some unused functions (after CAN-2004-0488 fix is applied)
@@ -158,7 +158,7 @@ PATCHES TO BACKPORT FROM 2.1
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.270&r2=1.271
          plus inheritance fix:
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.272&r2=1.273
-       +1: nd, stas, geoff
+       +1: nd (geoff)
 
     *) Fix memory leak in mod_rewrite. PR 27862. (2.0 + 1.3)
          http://www.apache.org/~nd/mod_rewrite_fixleak.diff
diff --git a/docs/manual/howto/htaccess.xml.ja b/docs/manual/howto/htaccess.xml.ja
deleted file mode 100644
index 620aad19f5..0000000000
--- a/docs/manual/howto/htaccess.xml.ja
+++ /dev/null
@@ -1,364 +0,0 @@
-<?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.13 -->
-
-<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<manualpage metafile="htaccess.xml.meta">
-<parentdocument href="./">How-To / $B%A%e!<%H%j%"%k(B</parentdocument>
-
-<title>Apache $B%A%e!<%H%j%"%k(B: .htaccess $B%U%!%$%k(B</title>
-
-<summary>
-<p><code>.htaccess</code> $B%U%!%$%k$O%G%#%l%/%H%jKh$K@_Dj$rJQ99$9$kJ}K!$r(B
-$BDs6!$7$^$9!#(B</p>
-</summary>
-
-<section id="related"><title>.htaccess $B%U%!%$%k(B</title>
-    <related>
-        <modulelist>
-            <module>core</module>
-            <module>mod_authn_file</module>
-            <module>mod_authz_groupfile</module>
-            <module>mod_cgi</module>
-            <module>mod_include</module>
-            <module>mod_mime</module>
-        </modulelist>
-
-        <directivelist>
-            <directive module="core">AccessFileName</directive>
-            <directive module="core">AllowOverride</directive>
-            <directive module="core">Options</directive>
-            <directive module="mod_mime">AddHandler</directive>
-            <directive module="core">SetHandler</directive>
-            <directive module="core">AuthType</directive>
-            <directive module="core">AuthName</directive>
-            <directive module="mod_authn_file">AuthUserFile</directive>
-            <directive module="mod_authz_groupfile">AuthGroupFile</directive>
-            <directive module="core">Require</directive>
-        </directivelist>
-
-    </related>
-</section>
-
-<section id="what">
-<title>.htaccess $B%U%!%$%k$H$O2?$+(B/$B$=$N;H$$J}(B</title>
-
-    <p><code>.htaccess</code> $B%U%!%$%k(B ($B!VJ,;6@_Dj%U%!%$%k!W(B) $B$O(B
-    $B%G%#%l%/%H%jKh$K@_Dj$rJQ99$9$kJ}K!$rDs6!$7$^$9!#%G%#%l%/%F%#%V$N(B
-    $B=q$+$l$?%U%!%$%k$r%G%#%l%/%H%j$KCV$/$3$H$G!"$=$N%G%#%l%/%H%j$H$=$N(B
-    $B%5%V%G%#%l%/%H%j$9$Y$F$K%G%#%l%/%F%#%V$rE,MQ$5$;$k$3$H$,$G$-$^$9!#(B</p>
-
-    <note><title>$BCm(B:</title>
-      <p><code>.htaccess</code> $B%U%!%$%k$rJL$NL>A0$K$7$?$$>l9g$O!"(B
-      <directive module="core">AccessFileName</directive> $B%G%#%l%/%F%#%V$r(B
-      $B;H$C$FJQ99$9$k$3$H$,$G$-$^$9!#Nc$($P!"$=$N%U%!%$%k$r(B <code>.config</code> 
-      $B$H$$$&L>A0$K$7$?$$>l9g$O!"0J2<$N@_Dj$r%5!<%P@_Dj%U%!%$%k$KF~$l$k$3$H$,(B
-      $B$G$-$^$9(B:</p>
-
-      <example>
-        AccessFileName .config
-      </example>
-    </note>
-
-    <p>$B0lHL$K!"(B<code>.htaccess</code> $B%U%!%$%k$N9=J8$O(B
-    <a href="../configuring.html#syntax">$B<g@_Dj%U%!%$%k(B</a>
-    $B$HF1$8$G$9!#$3$l$i$N%U%!%$%k$K=q$/$3$H$N$G$-$k%G%#%l%/%F%#%V$O(B <directive
-    module="core">AllowOverride</directive> $B%G%#%l%/%F%#%V$K$h$j7h$^$j$^$9!#(B
-    $B$3$N%G%#%l%/%F%#%V$O!"(B<code>.htaccess</code> $B%U%!%$%k$K(B
-    $B=q$+$l$?%G%#%l%/%F%#%V$NCf$G!"!"(B
-    $B$I$N%G%#%l%/%F%#%V$,E,MQ$5$l$k$+$r%+%F%4%j!<C10L$G;XDj$7$^$9!#(B
-    <code>.htaccess</code> $B$K=q$/$3$H$N$G$-$k%G%#%l%/%F%#%V$G$"$l$P!"(B
-    $B@bL@J8=q$K$O!V>e=q$-!W$H$$$&9`L\$,$"$j!"(B.htaccess $B$K=q$/$3$H$,$G$-$k$h$&$K(B
-    $B$J$k$?$a$N(B <directive 
-    module="core">AllowOverride</directive> $B$NCM$,;XDj$5$l$F$$$^$9!#(B</p>
-
-    <p>$BNc$($P!"(B<directive
-    module="core">AddDefaultCharset</directive> $B%G%#%l%/%F%#%V$N@bL@$r(B
-    $B8+$k$H!"(B<code>.htaccess</code> $B%U%!%$%k$G$N;HMQ$,5v2D$5$l$F$$$k$3$H$,(B
-    $B$o$+$j$^$9!#(B ($B%G%#%l%/%F%#%V$N35MW$N=j$K$"$k!V%3%s%F%-%9%H!W$H=q$+$l$F$$$k(B
-    $B9T$r8+$F$/$@$5$$!#(B) <a
-    href="../mod/directive-dict.html#Context">$B>e=q$-(B</a>$B$H=q$+$l$F$$$k9T$K$O(B
-    <code>FileInfo</code> $B$H$"$j$^$9!#$G$9$+$i!"(B<code>.htaccess</code> $BCf$N(B
-    $B$3$N%G%#%l%/%F%#%V$,M-8z$K$J$k$?$a$K$O!">/$J$/$H$b(B
-    <code>AllowOverride FileInfo</code> $B$,@_Dj$5$l$F$$$kI,MW$,$"$j$^$9!#(B</p>
-
-    <example><title>$BNc(B:</title>
-      <table>
-        <tr>
-          <td><a
-          href="../mod/directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></td>
-          <td>$B%5!<%P@_Dj%U%!%$%k(B,$B%P!<%A%c%k%[%9%H(B,$B%G%#%l%/%H%j(B,.htaccess</td>
-        </tr>
-
-        <tr>
-          <td><a
-          href="../mod/directive-dict.html#Override">$B>e=q$-(B:</a></td>
-          <td>FileInfo</td>
-        </tr>
-      </table>
-    </example>
-
-    <p>$B$"$k%G%#%l%/%F%#%V$r(B <code>.htaccess</code> $B%U%!%$%k$K=q$/$3$H$,$G$-$k$+(B
-    $B$I$&$+$o$+$i$J$$$H$-$O!"$=$N%G%#%l%/%F%#%V$N@bL@$rC5$7$F!"(B".htaccess"
-    $B$N$?$a$N!V%3%s%F%-%9%H!W$N9T$rD4$Y$F$/$@$5$$!#(B</p>
-    </section>
-
-    <section id="when"><title>$B$$$D(B .htaccess $B%U%!%$%k$r;H$&(B($B;H$o$J$$(B)$B$+!#(B</title>
-
-    <p>$B0lHLE*$K!"%5!<%P$N<g@_Dj%U%!%$%k$K%"%/%;%9$G$-$J$$>l9g$r=|$$$F!"(B
-    <code>.htaccess</code> $B%U%!%$%k$N;HMQ$O6KNOHr$1$F$/$@$5$$!#(B
-    $B@$$NCf$K$O!"Nc$($P!"%f!<%6G'>Z$O>o$K(B <code>.htaccess</code> $B%U%!%$%k$G(B
-    $B9T$J$o$J$1$l$P$J$i$J$$!"$H$$$&8m2r$,9-$^$C$F$$$^$9$,!"$^$C$?$/$=$s$J$3$H$O(B
-    $B$"$j$^$;$s!#%f!<%6G'>Z$N@_Dj$O%5!<%P<g@_Dj%U%!%$%k$K=q$/$3$H$,$G$-!"(B
-    $B<B:]!"$=$NJ}$,$h$jNI$$@_DjJ}K!$G$9!#(B</p>
-
-    <p><code>.htaccess</code> $B%U%!%$%k$O%3%s%F%s%DDs6!<T$,%G%#%l%/%H%jKh$N(B
-    $B@_Dj$r9T$J$$$?$$$1$l$I!"%5!<%P%7%9%F%`$N(B root $B%"%/%;%98"8B$r;}$C$F$$$J$$(B
-    $B$H$$$&>l9g$K$N$_;H$&$Y$-$b$N$G$9!#%5!<%P4IM}<T$,IQHK$K@_DjJQ99$r9T$J$$$?$/$O(B
-    $B$J$$!"$H$$$&$H$-$K$O8D!9$N%f!<%6$,(B <code>.htaccess</code> $B%U%!%$%k$r;H$C$F(B
-    $B<+J,$G@_Dj$NJQ99$r9T$J$&$3$H$r5v2D$7$?J}$,NI$$$H$-$b$"$k$G$7$g$&!#(B
-    $B$3$l$OFC$K!"(BISP $B$,J#?t$N%f!<%6$N%5%$%H$r0l$D$N%^%7%s$G%[%9%H$7$F$$$F!"(B
-    $B3F%f!<%6$,@_Dj$NJQ99$r$G$-$k$h$&$K$7$?$$$h$&$J$H$-$K$"$F$O$^$j$^$9!#(B</p>
-
-    <p>$B$7$+$7!"IaDL$O2DG=$G$"$l$P(B <code>.htaccess</code> $B%U%!%$%k$N;HMQ$O(B
-    $BHr$1$F$/$@$5$$!#(B<code>.htaccess</code> $B%U%!%$%k$K=q$3$&$H9M$($k$h$&$J(B
-    $B$9$Y$F$N@_Dj$O!"%5!<%P$N<g@_Dj%U%!%$%k$N(B <directive module="core"
-    type="section">Directory</directive> $B%;%/%7%g%s$GF1$8$h$&$K9T$J$&$3$H$,(B
-    $B$G$-$^$9!#(B</p>
-
-    <p><code>.htaccess</code> $B%U%!%$%k$N;HMQ$rHr$1$kM}M3$O<g$KFs$D$"$j$^$9!#(B</p>
-
-    <p>$B0l$DL\$O%5!<%P$N@-G=$NLdBj$G$9!#(B<directive 
-    module="core">AllowOverride</directive> $B%G%#%l%/%F%#%V$,(B
-    <code>.htaccess</code> $B%U%!%$%k$N@_Dj$r5v2D$7$F$$$k>l9g$O!"(BApache $B$O(B
-    $B3F%G%#%l%/%H%j$G(B <code>.htaccess</code> $B%U%!%$%k$rC5$7$^$9!#(B
-    $B$G$9$+$i!"(B<code>.htaccess</code> $B%U%!%$%k$r5v2D$9$k$H!"<B:]$K;HMQ$7$F$$$k$+(B
-    $B$I$&$+$K4X$o$i$:!"@-G=$NDc2<$r>7$/$3$H$K$J$j$^$9(B! $B$^$?!"(B<code>.htaccess</code>
-    $B%U%!%$%k$OJ8=q$,%j%/%(%9%H$5$l$kEY$KFI$_9~$^$l$^$9!#(B</p>
-
-    <p>$B$5$i$K!"(BApache $B$OE,MQ$9$Y$-%G%#%l%/%F%#%V$r=8$a$k$?$a$K!"$9$Y$F$N(B
-    $B>e0L$N%G%#%l%/%H%j$N(B <code>.htaccess</code> $B%U%!%$%k$rC5$9I,MW$,$"$k$3$H$K$b(B
-    $BCm0U$7$F$/$@$5$$!#(B(<a href="#how">$B%G%#%l%/%F%#%V$,E,MQ$5$l$kJ}K!(B</a>$B$r(B
-    $B;2>H$7$F$/$@$5$$!#(B)$B$G$9$+$i!"(B<code>/www/htdocs/example</code> $B$K$"$k(B
-    $B%U%!%$%k$,%j%/%(%9%H$5$l$?$H$-$O!"(BApache $B$O0J2<$N%U%!%$%k$rD4$Y$^$9!#(B</p>
-
-    <example>
-      /.htaccess<br />
-      /www/.htaccess<br />
-      /www/htdocs/.htaccess<br />
-      /www/htdocs/example/.htaccess
-    </example>
-
-    <p>$B$G$9$+$i!"$=$N%G%#%l%/%H%j$N$=$l$>$l$N%U%!%$%k$X$N%"%/%;%9$KBP$7$F!"(B
-    $B>e$NNc$N%U%!%$%k$,$^$C$?$/B8:_$7$J$$$H$-$G$b!"DI2C$N%U%!%$%k%7%9%F%`$N(B
-    $B%"%/%;%9$,9T$J$o$l$k$3$H$K$J$j$^$9!#(B($B$3$l$O!"(B<code>.htaccess</code> $B$,(B
-    <code>/</code> $B$KBP$7$FM-8z$K$J$C$F$$$k$H$-$N>l9g$G!"IaDL$O$=$&$J$C$F(B
-    $B$$$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B)</p>
-
-    <p>$BFs$DL\$O%;%-%e%j%F%#$G$9!#%f!<%6$K%5!<%P$N@_Dj$rJQ99$9$k$3$H$r(B
-    $B5v2D$9$k$3$H$K$J$j$^$9$N$G!"$"$J$?<+?H$,4IM}$G$-$J$$JQ99$r$5$l$k(B
-    $B62$l$,$"$j$^$9!#%f!<%6$K$3$NFC8"$rM?$($k$N$,NI$$$N$+$I$&$+!"==J,(B
-    $B8!F$$7$F$/$@$5$$!#$^$?!"%f!<%6$KM?$($k8"8B$,I,MW$J$b$N$h$j$b>/$J$9$.$k$H!"(B
-    $BM>J,$J5;=Q%5%]!<%HJs9p$r<u$1<h$k$h$&$K$J$k2DG=@-$,9b$$$3$H$K$b(B
-    $BCm0U$7$F$/$@$5$$!#3N<B$K!"%f!<%6$K$I$NDxEY$N8"8B$rM?$($?$+L@3N$K9p$2$k$h$&$K(B
-    $B$7$F$/$@$5$$!#(B<directive module="core">AllowOverride</directive> $B$K(B
-    $B2?$r@_Dj$7$?$+$H$$$&$3$H$H!"4XO"$9$kJ8=q$r<($9$3$H$G!"(B
-    $B8e!9$N:.Mp$r$0$C$H8:$i$9$3$H$,(B
-    $B$G$-$^$9!#(B</p>
-
-    <p>$B$H$3$m$G!"%G%#%l%/%F%#%V$N=q$+$l$?(B <code>.htaccess</code> $B$r(B
-    <code>/www/htdocs/example</code> $B$KCV$/$3$H$H!"F1$8%G%#%l%/%F%#%V$r(B
-    $B<g%5!<%P@_Dj$N(B Directory $B%;%/%7%g%s(B
-    <code>&lt;Directory /www/htdocs/example&gt;</code> $B$K=q$/$3$H$O(B
-    $B40A4$KEy2A$G$9(B:</p>
-
-    <p><code>/www/htdocs/example</code> $B$N(B <code>.htaccess</code> $B%U%!%$%k(B:</p>
-
-    <example><title><code>/www/htdocs/example</code> $B$N(B .htaccess $B%U%!%$%k$N(B
-    $BFbMF(B</title>
-        AddType text/example .exm
-    </example>
-
-    <example><title><code>httpd.conf $B$N%;%/%7%g%s(B</code>
-    file</title>
-      &lt;Directory /www/htdocs/example&gt;<br />
-      <indent>
-        AddType text/example .exm<br />
-      </indent>
-      &lt;/Directory&gt;
-    </example>
-
-    <p>$B$7$+$7!"$3$N@_Dj$O%5!<%P@_Dj%U%!%$%k$K=q$$$?J}$,%Q%U%)!<%^%s%9$N(B
-    $BDc2<$,>/$J$/$J$j$^$9!#%U%!%$%k$,%j%/%(%9%H$5$l$kEY$K(B
-    $BFI$_9~$^$l$kBe$o$j$K!"(BApache $B$N5/F0;~$K(B 1 $B2s$@$1FI$_9~$a$P(B
-    $B$h$/$J$k$+$i$G$9!#(B</p>
-
-    <p><directive module="core">AllowOverride</directive> $B%G%#%l%/%F%#%V$N(B
-    $BCM$r(B <code>none</code> $B$K@_Dj$9$k$3$H$G(B <code>.htaccess</code> $B%U%!%$%k(B
-    $B$N;HMQ$r40A4$KL58z$K$9$k$3$H$,$G$-$^$9!#(B</p>
-
-    <example>
-      AllowOverride None
-    </example>
-</section>
-
-<section id="how"><title>$B%G%#%l%/%F%#%V$NE,MQ$N$5$lJ}(B</title>
-
-    <p><code>.htaccess</code> $B%U%!%$%k$N@_Dj%G%#%l%/%F%#%V$O(B <code>.htaccess</code>
-    $B%U%!%$%k$NB8:_$9$k%G%#%l%/%H%j$H!"$=$N%5%V%G%#%l%/%H%j$9$Y$F$KE,MQ$5$l$^$9!#(B
-    $B$7$+$7!">e$N3,AX$N%G%#%l%/%H%j$K$b(B <code>.htaccess</code> $B%U%!%$%k$,(B
-    $BB8:_$9$k$+$b$7$l$J$$$3$H$r3P$($F$*$/$3$H$OBg@Z$G$9!#%G%#%l%/%F%#%V$O8=$l$k(B
-    $B=gHV$KE,MQ$5$l$^$9!#$G$9$+$i!"$"$k%G%#%l%/%H%j$N(B <code>.htaccess</code> $B$O(B
-    $B%G%#%l%/%H%j%D%j!<$N$h$j>e$N3,AX$N(B <code>.htaccess</code> $B%U%!%$%k$N(B
-    $B@_Dj$r>e=q$-$9$k$+$b$7$l$^$;$s!#$=$7$F!"$=$N(B <code>.htaccess</code> $B$b(B
-    $B$h$j>e$N3,AX$G=q$+$l$?%G%#%l%/%F%#%V$r>e=q$-$7$?$j!"<g%5!<%P@_Dj%U%!%$%k(B
-    $B$=$N$b$N$N@_Dj$r>e=q$-$7$?$j$7$F$$$k$+$b$7$l$^$;$s!#(B</p>
-
-    <p>$BNc(B:</p>
-
-    <p>$B%G%#%l%/%H%j(B <code>/www/htdocs/example1</code> $B$K0J2<$NFbMF$N(B
-    <code>.htaccess</code> $B%U%!%$%k$,$"$j$^$9(B:</p>
-
-    <example>
-       Options +ExecCGI
-    </example>
-
-    <p>($BCm(B: <code>.htaccess</code>
-    $B%U%!%$%k$G(B "<directive
-    module="core">Options</directive>" $B%G%#%l%/%F%#%V$,M-8z$K$J$k$?$a$K$O!"(B
-    "<code>AllowOverride Options</code>" $B$rM-8z$K$9$kI,MW$,$"$j$^$9!#(B)</p>
-
-    <p>$B%G%#%l%/%H%j(B <code>/www/htdocs/example1/example2</code> $B$K$O(B
-    $B0J2<$N$h$&$J(B <code>.htaccess</code> $B%U%!%$%k$,$"$j$^$9(B:</p>
-
-    <example>
-       Options Includes
-    </example>
-
-    <p>$BFs$D$a$N(B <code>.htaccess</code> $B$K$h$j!"%G%#%l%/%H%j(B
-    <code>/www/htdocs/example1/example2</code> $B$G$O(B CGI $B$N<B9T$O(B
-    $B5v2D$5$l$^$;$s!#$3$l$O!"(B<code>Options Includes</code> $B$N$_$,(B
-    $B8zNO$r;}$A!"$=$l$,$9$Y$F$N0JA0$N@_Dj$r>e=q$-$9$k$+$i$G$9!#(B</p>
-</section>
-
-<section id="auth"><title>$BG'>Z$NNc(B</title>
-
-    <p>$B$b$7G'>Z$NJ}K!$rCN$k$?$a$K$3$NItJ,$KD>@\Mh$?$N$G$"$l$P!"<!$N$3$H$r(B
-    $BCN$C$F$*$/$3$H$,=EMW$G$9!#$h$/$"$k8m2r$K!"%Q%9%o!<%IG'>Z$r9T$J$&$?$a$K$O(B
-    <code>.htaccess</code> $B%U%!%$%k$r;H$&I,MW$,$"$k!"$H$$$&$b$N$,$"$j$^$9!#(B
-    $B$3$l$O@5$7$/$"$j$^$;$s!#<g%5!<%P@_Dj%U%!%$%k$N(B <directive
-    module="core" type="section">Directory</directive> $B%;%/%7%g%s$K(B
-    $BG'>ZMQ$N%G%#%l%/%F%#%V$r=q$/J}$,?d>)$5$l$kJ}K!$G!"(B<code>.htaccess</code>
-    $B%U%!%$%k$O<g%5!<%P@_Dj%U%!%$%k$rJQ99$G$-$J$$$H$-$K$N$_;HMQ$9$Y$-$G$9!#(B
-    $B$$$D(B <code>.htaccess</code> $B%U%!%$%k$r;H$&$Y$-$G!"$$$D;H$&$Y$-$G$O$J$$$+$K(B
-    $B$D$$$F$O(B <a 
-    href="#when">$B>e(B</a>$B$r;2>H$7$F$/$@$5$$!#(B</p>
-
-    <p>$B0J>e$N$3$H$r$U$^$($?>e$G!"$b$7(B <code>.htaccess</code> $B$N;HMQ$,(B
-    $B$^$@I,MW$@$H;W$&>l9g$O!"<!$N$h$&$J$b$N$,K>$_$N$3$H$r$7$F$/$l$k$+$b(B
-    $B$7$l$^$;$s!#(B</p>
-
-    <p><code>.htaccess</code> $B%U%!%$%k$NFbMF(B:</p>
-
-    <example>
-      AuthType Basic<br />
-      AuthName "Password Required"<br />
-      AuthUserFile /www/passwords/password.file<br />
-      AuthGroupFile /www/passwords/group.file<br />
-      Require Group admins
-    </example>
-
-    <p>$B$3$l$i$N%G%#%l%/%F%#%V$,M-8z$K$J$k$?$a$K$O!"(B
-    <code>AllowOverride AuthConfig</code> $B$,M-8z$G$J$/$F$O$J$i$J$$$3$H$K(B
-    $BCm0U$7$F$/$@$5$$!#(B</p>
-
-    <p>$BG'>Z$H>5G'$K$D$$$F$O(B <a href="auth.html">$BG'>Z%A%e!<%H%j%"%k(B</a>$B$r(B
-    $B;2>H$7$F$/$@$5$$!#(B</p>
-</section>
-
-<section id="ssi"><title>SSI $B$NNc(B</title>
-
-    <p>$B$b$&0l$D$N(B <code>.htaccess</code> $B%U%!%$%k$N$h$/$"$kMxMQK!$O(B
-    $BFCDj$N%G%#%l%/%H%j$G(B SSI $B$rM-8z$K$9$k$3$H$G$9!#$3$l$O!"K>$_$N%G%#%l%/%H%j$N(B
-    <code>.htaccess</code> $B%U%!%$%k$K0J2<$N@_Dj%G%#%l%/%F%#%V$r=q$/$3$H$G(B
-    $BC#@.$G$-$^$9(B:</p>
-
-    <example>
-       Options +Includes<br />
-       AddType text/html shtml<br />
-       AddHandler server-parsed shtml
-    </example>
-
-    <p>$B$3$l$i$N%G%#%l%/%F%#%V$,M-8z$K$J$k$?$a$K$O!"(B
-    <code>AllowOverride Options</code> $B$H(B <code>AllowOverride
-    FileInfo</code> $B$,M-8z$K$J$C$F$$$kI,MW$,$"$k$3$H$KCm0U$7$F$/$@$5$$!#(B</p>
-
-    <p>$B$h$j$^$H$^$C$?(B SSI $B$N@bL@$O(B <a href="ssi.html">SSI $B%A%e!<%H%j%"%k(B</a>$B$r(B
-    $B;2>H$7$F$/$@$5$$!#(B</p>
-</section>
-
-<section id="cgi"><title>CGI $B$NNc(B</title>
-
-    <p>$B:G8e$K!"FCDj$N%G%#%l%/%H%j$G(B CGI $B%W%m%0%i%`$N<B9T$r5v2D$7$?$$$3$H$,(B
-    $B$"$k$G$7$g$&!#$3$l$O0J2<$N@_Dj$G9T$J$&$3$H$,$G$-$^$9(B:</p>
-
-    <example>
-       Options +ExecCGI<br />
-       AddHandler cgi-script cgi pl
-    </example>
-
-    <p>$B$b$7$/$O!"$"$k%G%#%l%/%H%j$N$9$Y$F$N%U%!%$%k$,(B CGI $B%W%m%0%i%`$H(B
-    $B$_$J$5$l$k$h$&$K$7$?$$$J$i!"0J2<$N@_Dj$G<B8=$9$k$3$H$,$G$-$^$9(B:</p>
-
-    <example>
-       Options +ExecCGI<br />
-       SetHandler cgi-script
-    </example>
-
-    <p>$B$3$l$i$N%G%#%l%/%F%#%V$,M-8z$K$J$k$?$a$K$O!"(B
-    <code>AllowOverride Options</code> $B$H(B <code>AllowOverride
-    FileInfo</code> $B$,M-8z$G$"$kI,MW$,$"$k$3$H$KCm0U$7$F$/$@$5$$!#(B</p>
-
-    <p>CGI $B%W%m%0%i%`$H@_Dj$N$h$j$^$H$^$C$?@bL@$O(B <a
-    href="cgi.html">CGI $B%A%e!<%H%j%"%k(B</a>$B$r;2>H$7$F$/$@$5$$!#(B</p>
-
-</section>
-
-<section id="troubleshoot"><title>$BLdBj2r7h(B</title>
-
-    <p>$B@_Dj%G%#%l%/%F%#%V$r(B <code>.htaccess</code> $B%U%!%$%k$K=q$$$?$1$l$I$b!"(B
-    $B4|BT$7$?8z2L$,F@$i$l$J$$$H$-$K$O!"$$$/$D$+$N860x$,9M$($i$l$^$9!#(B</p>
-
-    <p>$B0lHV$h$/$"$k$3$H$O!"@_Dj%G%#%l%/%F%#%V$,9MN8$5$l$k$h$&$K$O(B
-    <directive module="core">AllowOverride</directive> $B$,@_Dj$5$l$F$$$J$$(B
-    $B$H$$$&$b$N$G$9!#3:Ev$N%U%!%$%k$N%9%3!<%W$K(B <code>AllowOverride None</code>
-    $B$,@_Dj$5$l$F$$$J$$$3$H$r3NG'$7$F$/$@$5$$!#$3$l$rD4$Y$k$?$a$NNI$$J}K!$O!"(B
-    <code>.htaccess</code> $B%U%!%$%k$K$4$_$r=q$$$F!"%j%m!<%I$9$k$3$H$G$9!#(B
-    $B%5!<%P$N%(%i!<$,@8@.$5$l$J$$$H$-$O!"$[$\3N<B$K(B <code>AllowOverride
-    None</code> $B$,@_Dj$5$l$F$$$k>uBV$K$J$C$F$$$^$9!#(B</p>
-
-    <p>$B$=$&$G$O$J$/!"J8=q$r%"%/%;%9$7$h$&$H$7$?$H$-$K%(%i!<$,H/@8$7$F$$$k(B
-    $B$H$-$O!"(BApache $B$N%(%i!<%m%0$rD4$Y$F$/$@$5$$!#(B<code>.htaccess</code> $B%U%!%$%k$G(B
-    $B;HMQ$5$l$?%G%#%l%/%F%#%V$,5v2D$5$l$F$$$J$$!"$H$$$&$3$H$rCN$i$;$F$$$k(B
-    $B2DG=@-$,9b$$$G$9!#$^$?$O!"9=J8$N4V0c$$$,$"$k$3$H$r=R$Y$F$$$k$+$b$7$l$^$;$s!#(B
-    $B$=$N>l9g$K$O$^$:$=$l$r=$@5$9$kI,MW$,$"$j$^$9!#(B</p>
-
-</section>
-
-</manualpage>
diff --git a/docs/manual/howto/index.xml.ja b/docs/manual/howto/index.xml.ja
deleted file mode 100644
index 279d5d17c3..0000000000
--- a/docs/manual/howto/index.xml.ja
+++ /dev/null
@@ -1,100 +0,0 @@
-<?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.7 -->
-
-<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<manualpage metafile="index.xml.meta">
-  <parentdocument href="../"/>
-
-  <title>How-To / $B%A%e!<%H%j%"%k(B</title>
-
-  <section id="howto">
-
-    <title>How-To / $B%A%e!<%H%j%"%k(B</title>
-
-    <dl>
-      <dt>$BG'>Z(B</dt>
-      <dd>
-        <p>$BG'>Z$H$O!"C/$+$,<+J,$OC/$G$"$k$+$rL>>h$C$F$$$k$b$N$r8!>Z$9$k(B
-        $B=hM}$N$3$H$G$9!#>5G'$H$O!"C/$+$,K>$_$N>l=j$KC)$jCe$1$?$j!"(B
-        $BK>$_$N>pJs$r<j$KF~$l$?$j$9$k$3$H$r5v2D$9$k=hM}$N$3$H$G$9!#(B</p>
-
-        <p>$B;2>H(B: <a href="auth.html">$BG'>Z!">5G'!"%"%/%;%9@)8f(B</a></p>
-      </dd>
-    </dl>
-
-    <dl>
-      <dt>CGI $B$K$h$kF0E*%3%s%F%s%D(B</dt>
-      <dd>
-        <p>CGI (Common Gateway Interface) $B$O%&%'%V%5!<%P$,30It$N%3%s%F%s%D(B
-        $B@8@.%W%m%0%i%`$H$I$N$h$&$KAj8_F0:n$r$9$k$+$rDj5A$7$^$9!#(B
-        $B$=$N30It%W%m%0%i%`$ODL>o(B CGI $B%W%m%0%i%`$d(B CGI $B%9%/%j%W%H$H8F$P$l$^$9!#(B
-        CGI $B$O%&%'%V%5%$%H$KF0E*$J%3%s%F%s%D$rDI2C$9$k$?$a$N!"(B
-        $B0lHVC1=c$G$h$/;H$o$l$F$$$kJ}K!$G$9!#$3$NJ8=q$O(B Apache $B%&%'%V%5!<%P$K(B
-        CGI $B$r@_Dj$7!"(BCGI $B%W%m%0%i%`$r=q$-;O$a$k$?$a$N%$%s%H%m%@%/%7%g%s$G$9!#(B</p>
-
-        <p>$B;2>H(B: <a href="cgi.html">CGI: $BF0E*%3%s%F%s%D(B</a></p>
-      </dd>
-    </dl>
-
-    <dl>
-      <dt><code>.htaccess</code> $B%U%!%$%k(B</dt>
-      <dd>
-        <p><code>.htaccess</code> $B%U%!%$%k$O%G%#%l%/%H%jKh$K@_Dj$rJQ99$9$k$?$a$N(B
-        $BJ}K!$rDs6!$7$^$9!#@_Dj%G%#%l%/%F%#%V$,=q$+$l$?%U%!%$%k$,!"$"$k%I%-%e%a%s%H(B
-        $B%G%#%l%/%H%j$KCV$+$l$k$H!"%G%#%l%/%F%#%V$O$=$N%G%#%l%/%H%j$H(B
-        $B$9$Y$F$N%5%V%G%#%l%/%H%j$KE,MQ$5$l$^$9!#(B</p>
-
-        <p>$B;2>H(B: <a href="htaccess.html"><code>.htaccess</code> $B%U%!%$%k(B</a></p>
-      </dd>
-    </dl>
-
-    <dl>
-      <dt>Server Side Includes $B%$%s%H%m%@%/%7%g%s(B</dt>
-      <dd>
-        <p>SSI (Server Side Includes) $B$O(B HTML $B%Z!<%8Cf$K=q$+$l$k%G%#%l%/%F%#%V$G!"(B
-        $B%Z!<%8$,Aw$i$l$k;~$K%5!<%P$K$h$jI>2A$5$l$^$9!#$3$l$K$h$j!"%Z!<%8A4BN$r(B
-        CGI $B%W%m%0%i%`$G@8@.$7$?$j!"B>$NF0E*$J5;=Q$r;H$&$3$H$J$/!"4{B8$N(B HTML
-        $B%Z!<%8$KF0E*$K@8@.$5$l$?FbMF$rIU2C$9$k$3$H$,$G$-$^$9!#(B</p>
-
-        <p>$B;2>H(B: <a href="ssi.html">Server Side Includes (SSI)</a></p>
-      </dd>
-    </dl>
-
-    <dl>
-      <dt>$B%f!<%6Kh$N%&%'%V%G%#%l%/%H%j(B</dt>
-      <dd>
-        <p>$BJ#?t%f!<%6$NB8:_$9$k%7%9%F%`$G$O!"$=$l$>$l$N%f!<%6$O(B <directive
-        module="mod_userdir">UserDir</directive> $B%G%#%l%/%F%#%V$r;H$&$3$H$K$h$C$F(B
-        $B%[!<%`%G%#%l%/%H%j>e$K%&%'%V%5%$%H$r:n@.$9$k$3$H$,$G$-$^$9!#(B
-        URL <code>http://example.com/~username/</code> $B$rK,$l$??M$O(B
-        $B%f!<%6(B "<code>username</code>" $B$N%[!<%`%G%#%l%/%H%j$N!"(B<directive
-        module="mod_userdir">UserDir</directive> $B%G%#%l%/%F%#%V$G;XDj$5$l$?(B
-       $B%5%V%G%#%l%/%H%j$+$i%3%s%F%s%D$rF@$k$3$H$K$J$j$^$9!#(B</p>
-
-        <p>$B;2>H(B: <a href="public_html.html"
-        >$B%f!<%6%&%'%V%G%#%l%/%H%j(B (<code>public_html</code>)</a></p>
-      </dd>
-    </dl>
-
-  </section>
-
-</manualpage>
-
-
diff --git a/docs/manual/howto/public_html.xml.ja b/docs/manual/howto/public_html.xml.ja
deleted file mode 100644
index 0cfb2e8d5a..0000000000
--- a/docs/manual/howto/public_html.xml.ja
+++ /dev/null
@@ -1,157 +0,0 @@
-<?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.12 -->
-
-<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<manualpage metafile="public_html.xml.meta">
-<parentdocument href="./">How-To / $B%A%e!<%H%j%"%k(B</parentdocument>
-
-  <title>$B%f!<%6Kh$N%&%'%V%G%#%l%/%H%j(B</title>
-
-<summary>
-<p>$BJ#?t$N%f!<%6$N$$$k%7%9%F%`$G$O!"(B<directive 
-    module="mod_userdir">UserDir</directive> $B%G%#%l%/%F%#%V$r;H$C$F(B
-    $B3F%f!<%6$,%[!<%`%G%#%l%/%H%j$K%&%'%V%5%$%H$r9=C[$G$-$k$h$&$K@_Dj$9$k$3$H$,(B
-    $B2DG=$G$9!#(BURL <code>http://example.com/~username/</code> $B$rK,$l$??M$O(B
-    "<code>username</code>" $B$H$$$&%f!<%6$N(B <directive
-    module="mod_userdir">UserDir</directive> $B%G%#%l%/%F%#%V$G;XDj$5$l$?(B
-    $B%5%V%G%#%l%/%H%j$+$i%3%s%F%s%D$rF@$k$3$H$K$J$j$^$9!#(B</p>
-</summary>
-
-<seealso><a href="../urlmapping.html">URL $B$+$i%U%!%$%k%7%9%F%`$X$N%^%C%T%s%0(B</a></seealso>
-
-  <section id="related">
-    <title>$B%f!<%6Kh$N%&%'%V%G%#%l%/%H%j(B</title>
-    <related>
-      <modulelist>
-        <module>mod_userdir</module>
-      </modulelist>
-      <directivelist>
-        <directive module="mod_userdir">UserDir</directive>
-        <directive module="core">DirectoryMatch</directive>
-        <directive module="core">AllowOverride</directive>
-      </directivelist>
-    </related>
-    </section>
-
-    <section id="userdir">
-    <title>UserDir $B$r;H$C$F%U%!%$%k$N%Q%9$r@_Dj$9$k(B</title>
-
-    <p><directive module="mod_userdir">UserDir</directive> $B%G%#%l%/%F%#%V$O(B
-    $B%f!<%6Kh$N%3%s%F%s%D$,FI$_9~$^$l$k%G%#%l%/%H%j$r;XDj$7$^$9!#(B
-    $B$3$N%G%#%l%/%F%#%V$O$$$m$$$m0c$C$?7A<0$r<h$k$3$H$,$G$-$^$9!#(B</p>
-
-    <p>$B%9%i%C%7%e$G;O$^$i$J$$%Q%9$,M?$($i$l$?$H$-$O!"%f!<%6$N%[!<%`%G%#%l%/%H%j(B
-    $B$+$i$NAjBP%Q%9$H$_$J$5$l$^$9!#<!$N@_Dj$,$"$C$?$H$-$K(B:</p>
-
-    <example>
-      UserDir public_html
-    </example>
-
-    <p>URL <code>http://example.com/~rbowen/file.html</code> $B$O(B
-    $B%Q%9(B <code>/home/rbowen/public_html/file.html</code> $B$X(B
-    $BJQ49$5$l$^$9!#(B</p>
-
-    <p>$B%Q%9$,%9%i%C%7%e$G;O$^$k$H$-$O!"%G%#%l%/%H%j%Q%9$O$=$N%Q%9$K(B
-    $B%f!<%6L>$r2C$($?$b$N$+$i$J$j$^$9!#<!$N@_Dj$N$H$-(B:</p>
-
-    <example>
-      UserDir /var/html
-    </example>
-
-    <p>URL <code>http://example.com/~rbowen/file.html</code> $B$O(B
-    $B%Q%9(B <code>/var/html/rbowen/file.html</code> $B$XJQ49$5$l$^$9!#(B</p>
-
-    <p>$B%"%9%?%j%9%/(B (*) $B$r4^$`%Q%9$,;XDj$5$l$?$H$-$O!"%"%9%?%j%9%/$r(B
-    $B%f!<%6L>$GCV49$7$?$b$N$,;HMQ$5$l$^$9!#$3$N$h$&$J@_Dj$@$H(B:</p>
-
-    <example>
-      UserDir /var/www/*/docs
-    </example>
-
-    <p>URL <code>http://example.com/~rbowen/file.html</code> $B$O(B
-    $B%Q%9(B <code>/var/www/rbowen/docs/file.html</code> $B$XJQ49$5$l$^$9!#(B</p>
-
-  </section>
-
-  <section id="enable">
-    <title>$B$3$N5!G=$r;HMQ$G$-$k%f!<%6$r@)8B$9$k(B</title>
-
-    <p>UserDir $B$N%I%-%e%a%s%H$K<($5$l$F$$$k9=J8$r;H$&$3$H$G!"(B
-    $B$I$N%f!<%6$,$3$N5!G=$r;H$&$3$H$,$G$-$k$+$r@)8B$9$k$3$H$,$G$-$^$9(B:</p>
-
-    <example>
-      UserDir enabled<br />
-      UserDir disabled root jro fish
-    </example>
-
-    <p>$B>e$N@_Dj$O(B <code>dissabled</code> $BJ8$N%f!<%60J30$N$9$Y$F$N%f!<%6$K(B
-    $BBP$7$F(B UserDir $B$N5!G=$rM-8z$K$7$^$9!#F1MM$K$7$F!"0J2<$N$h$&$K(B
-    $B?tL>$N%f!<%60J30$KBP$7$F$3$N5!G=$rL58z$K$9$k$3$H$b$G$-$^$9(B:</p>
-
-    <example>
-      UserDir disabled<br />
-      UserDir enabled rbowen krietz
-    </example>
-
-    <p>$BB>$NNc$O(B <directive module="mod_userdir">UserDir</directive>
-    $B$N@bL@$r;2>H$7$F$/$@$5$$!#(B</p>
-
-  </section>
-
-  <section id="cgi">
-  <title>$B%f!<%6Kh$N(B CGI $B%G%#%l%/%H%j(B</title>
-
-   <p>$B$=$l$>$l$N%f!<%6$K@lMQ$N(B cgi-bin $B%G%#%l%/%H%j$rM?$($k$?$a$K!"(B
-    <directive module="core" type="section">Directory</directive>
-    $B$r;H$C$F%f!<%6$N%[!<%`%G%#%l%/%H%j$N;XDj$5$l$?NN0h$KBP$7$F(B CGI $B$rM-8z$K(B
-    $B$9$k$3$H$,$G$-$^$9!#(B</p>
-
-    <example>
-      &lt;Directory /home/*/public_html/cgi-bin/&gt;<br />
-       Options ExecCGI<br />
-       SetHandler cgi-script<br />
-       &lt;/Directory&gt;
-    </example>
-
-    <p>$B$=$7$F!"(B<code>UserDir</code> $B$,(B
-    <code>public_html</code> $B$K@_Dj$5$l$F$$$k$H2>Dj$9$k$H!"(B
-    $B$=$N%G%#%l%/%H%j$N(B CGI $B%W%m%0%i%`(B <code>example.cgi</code>
-    $B$O0J2<$NMM$K8F$S=P$5$l$k$3$H$,$G$-$^$9(B:</p>
-
-    <example>
-    http://example.com/~rbowen/cgi-bin/example.cgi
-    </example>
-
-    </section>
-
-    <section id="htaccess">
-    <title>$B%f!<%6$K$h$k@_DjJQ99$r5v2D(B</title>
-
-    <p>$B%f!<%6$KH`$i$N%&%'%V6u4V$G$N%5!<%P$N@_Dj$NJQ99$r5v2D$9$k>l9g!"(B
-    $B%f!<%6$O(B <code>.htaccess</code> $B%U%!%$%k$r;H$C$F@_Dj$rJQ99$9$kI,MW$,$"$j$^$9!#(B
-    <directive module="core">AllowOverride</directive> $B$NCM$r(B
-    $B%f!<%6$,JQ99$9$k$3$H$r5v2D$7$?$$%G%#%l%/%F%#%V$KBP$7$F==J,$J$b$N$K(B
-    $B@_Dj$7$F$$$k$3$H$r3NG'$7$F$/$@$5$$!#$3$N5!G=$,$I$N$h$&$K$7$FF0:n$7$F$$$k$+(B
-    $B$N>\:Y$O(B <a href="htaccess.html">.htaccess $B%A%e!<%H%j%"%k(B</a> $B$rFI$s$G(B
-    $B$/$@$5$$!#(B</p>
-
-  </section>
-
-</manualpage>
diff --git a/docs/manual/mod/mod_cgid.xml.ja b/docs/manual/mod/mod_cgid.xml.ja
deleted file mode 100644
index 2379b0a05f..0000000000
--- a/docs/manual/mod/mod_cgid.xml.ja
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="iso-2022-jp"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 1.11 -->
-
-<!--
- Copyright 2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<modulesynopsis metafile="mod_cgid.xml.meta">
-
-<name>mod_cgid</name>
-<description>$B30It(B CGI $B%G!<%b%s$r;H$C$?(B CGI $B%9%/%j%W%H$N<B9T(B</description>
-<status>Base</status>
-<sourcefile>mod_cgid.c</sourcefile>
-<identifier>cgid_module</identifier>
-<compatibility>Unix $B$N%9%l%C%I(B MPM $B$N$_(B</compatibility>
-
-<summary>
-    <p>$B:GE,2=$,;\$5$l$F$$$k$3$H$H!"0J2<$G@bL@$5$l$F$$$kDI2C$N(B <directive
-    module="mod_cgid">ScriptSock</directive> $B%G%#%l%/%F%#%V$r=|$$$F$O!"(B
-    <module>mod_cgid</module> $B$O(B <module>mod_cgi</module> $B$HF1MM$N(B
-    $BF0:n$r$7$^$9!#(B<strong>Apache $B$H(B CGI $B$K4X$9$k>\:Y$O(B
-    <module>mod_cgi</module> $B$N35MW$rFI$s$G$/$@$5$$!#(B</strong></p>
-
-    <p>Unix $B%*%Z%l!<%F%#%s%0%7%9%F%`$NCf$K$O!"%^%k%A%9%l%C%I$N%5!<%P$+$i(B
-    $B%W%m%;%9$r(B fork $B$9$k$N$,Hs>o$K%3%9%H$N9b$$F0:n$K$J$C$F$$$k$b$N$,$"$j$^$9!#(B
-    $BM}M3$O!"?7$7$$%W%m%;%9$,?F%W%m%;%9$N%9%l%C%I$9$Y$F$rJ#@=$9$k$+$i$G$9!#(B
-    $B3F(B CGI $B5/F0;~$K$3$N%3%9%H$,$+$+$k$N$rKI$0$?$a$K!"(B<module>mod_cgid</module>
-    $B$O;R%W%m%;%9$r(B fork $B$7$F(B CGI $B%9%/%j%W%H$r<B9T$9$k$?$a$N(B
-    $B30It%G!<%b%s$r<B9T$7$^$9!#(B
-    $B<g%5!<%P$O(B unix $B%I%a%$%s%=%1%C%H$r;H$C$F$3$N%G!<%b%s$HDL?.$7$^$9!#(B</p>
-
-    <p>$B%3%s%Q%$%k;~$K%^%k%A%9%l%C%I(B MPM $B$,A*$P$l$?$H$-$O(B
-    <module>mod_cgi</module> $B$NBe$o$j$KI,$:$3$N%b%8%e!<%k$,;HMQ$5$l$^$9!#(B
-    $B%f!<%6$N%l%Y%k$G$O$3$N%b%8%e!<%k$N@_Dj$HF0:n$O(B <module>mod_cgi</module>
-    $B$H$^$C$?$/F1$8$G$9!#M#0l$NNc30$O(B <code>ScriptSock</code> $B%G%#%l%/%F%#%V$N(B
-    $BDI2C$G!"$3$N%G%#%l%/%F%#%V$O(B CGI $B%G!<%b%s$H$NDL?.MQ$N%=%1%C%H$NL>A0$r(B
-    $B;XDj$7$^$9!#(B</p>
-</summary>
-
-<seealso><module>mod_cgi</module></seealso>
-<seealso><a href="../suexec.html">CGI $B%W%m%0%i%`$r0c$&%f!<%6(B ID $B$G<B9T$9$k(B</a></seealso>
-
-<directivesynopsis location="mod_cgi">
-<name>ScriptLog</name>
-</directivesynopsis>
-
-<directivesynopsis location="mod_cgi">
-<name>ScriptLogLength</name>
-</directivesynopsis>
-
-<directivesynopsis location="mod_cgi">
-<name>ScriptLogBuffer</name>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>ScriptSock</name>
-<description>CGI $B%G!<%b%s$H$NDL?.$K;H$o$l$k%=%1%C%H$NL>A0(B</description>
-<syntax>ScriptSock <var>file-path</var></syntax>
-<default>ScriptSock logs/cgisock</default>
-<contextlist><context>server config</context>
-<context>virtual host</context></contextlist>
-
-<usage>
-    <p>$B$3$N%G%#%l%/%F%#%V$O(B CGI $B%G!<%b%s$H$NDL?.$K;H$o$l$k%=%1%C%H$N(B
-    $BL>A0$r@_Dj$7$^$9!#%=%1%C%H$O(B Apache $B$,5/F0$5$l$?%f!<%6(B ($BDL>o(B root) $B$N(B
-    $B%Q!<%_%C%7%g%s$rMQ$$$F%*!<%W%s$5$l$^$9!#(BCGI $B%9%/%j%W%H$H$NDL?.$N(B
-    $B%;%-%e%j%F%#$rJ]$D$?$a$K!"%=%1%C%H$NB8:_$9$k%G%#%l%/%H%j$K(B
-    $BB>$N%f!<%6$,=q$-9~$_8"8B$r;}$C$F$$$J$$$h$&$K$9$k$3$H$,=EMW$G$9!#(B</p>
-
-    <example><title>$BNc(B</title>
-      ScriptSock /var/run/cgid.sock
-    </example>
-
-</usage>
-</directivesynopsis>
-
-</modulesynopsis>
-
diff --git a/docs/manual/mod/mod_logio.xml.ja b/docs/manual/mod/mod_logio.xml.ja
deleted file mode 100644
index d7c2101128..0000000000
--- a/docs/manual/mod/mod_logio.xml.ja
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="iso-2022-jp"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 1.7 -->
-
-<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<modulesynopsis metafile="mod_logio.xml.meta">
-
-<name>mod_logio</name>
-<description>$B%j%/%(%9%HKh$KF~NO%P%$%H?t$H=PNO%P%$%H?t$H$r%m%.%s%0(B</description>
-<status>Extension</status>
-<sourcefile>mod_logio.c</sourcefile>
-<identifier>logio_module</identifier>
-
-<summary>
-
-    <p>$B$3$N%b%8%e!<%k$O%j%/%(%9%H$4$H$K<u$1<h$C$?%P%$%H?t$H(B
-    $BAw?.$7$?%P%$%H?t$N%m%.%s%0$r9T$J$&5!G=$rDs6!$7$^$9!#(B
-    $B5-O?$5$l$k?t;z$O%j%/%(%9%H$N%X%C%@$H%l%9%]%s%9$NK\BN$r(B
-    $BH?1G$7$?!"<B:]$K%M%C%H%o!<%/$G<u$1<h$C$?%P%$%HCM$G$9!#(B
-    $BF~NO$G$O(B SSL/TLS $B$NA0$K!"=PNO$G$O(B SSL/TLS $B$N8e$K?t$($k$N$G!"(B
-    $B?t;z$O0E9f$K$h$kJQ2=$b@5$7$/H?1G$7$?$b$N$K$J$j$^$9!#(B</p>
-
-    <p>$B$3$N%b%8%e!<%k$N;HMQ$K$O(B <module>mod_log_config</module> $B%b%8%e!<%k$,(B
-    $BI,MW$G$9!#(B</p>
-
-</summary>
-
-<seealso><module>mod_log_config</module></seealso>
-<seealso><a href="../logs.html">Apache $B%m%0%U%!%$%k(B</a></seealso>
-
-<section id="formats">
-<title>$B%+%9%?%`%m%0=q<0(B</title>
-
-    <p>$B$3$N%b%8%e!<%k$O?7$7$$%m%.%s%0MQ%G%#%l%/%F%#%V$r2C$($^$9!#(B
-    $B%j%/%(%9%H<+?H$NFCD'$O%U%)!<%^%C%HJ8;zNs$K!"0J2<$NMM$KCV49$5$l$k(B
-     "<code>%</code>" $B%G%#%l%/%F%#%V$r(B
-    $BF~$l$k$3$H$G%m%0<}=8$5$l$^$9(B:</p>
-
-    <table border="1" style="zebra">
-    <tr><th>$B%U%)!<%^%C%HJ8;zNs(B</th>
-        <th>$B@bL@(B</th></tr>
-
-    <tr><td><code>%...I</code></td>
-        <td>$B%j%/%(%9%H$H%X%C%@$r4^$`!"<u$1<h$C$?%P%$%H?t!#(B
-        0 $B$K$O$J$i$J$$!#(B</td></tr>
-
-    <tr><td><code>%...O</code></td>
-        <td>$B%X%C%@$r4^$`!"Aw?.$7$?%P%$%H?t!#(B0 $B$K$O$J$i$J$$!#(B</td></tr>
-    </table>
-
-    <p>$BDL>o!"$3$N5!G=$O0J2<$NMM$K;HMQ$5$l$^$9(B:</p>
-
-    <dl>
-      <dt>$B7k9g(B I/O $B%m%0=q<0(B:</dt>
-      <dd><code>"%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\"
-      \"%{User-agent}i\" %I %O"</code></dd>
-    </dl>
-</section>
-
-</modulesynopsis>
diff --git a/docs/manual/ssl/ssl_intro.xml.ja b/docs/manual/ssl/ssl_intro.xml.ja
deleted file mode 100644
index d39bb73d55..0000000000
--- a/docs/manual/ssl/ssl_intro.xml.ja
+++ /dev/null
@@ -1,722 +0,0 @@
-<?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.10 -->
-
-<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<manualpage metafile="ssl_intro.xml.meta">
-<parentdocument href="./">SSL/TLS</parentdocument>
-
-  <title>SSL/TLS $B0E9f2=(B: $B$O$8$a$K(B</title>
-
-<summary>
-<blockquote>
-<p>$BI8=`5,3J$NNI$$=j$O!"$?$/$5$s$N5,3J$+$iA*$Y$k$H$$$&$3$H$@!#(B
-$B$=$7$F!"$b$7K\Ev$K$I$N5,3J$b5$$KF~$i$J$1$l$P!"(B
-$B0lG/BT$D$@$1$GC5$7$F$$$?5,3J$,8=$l$k!#(B</p>
-
-<p class="cite">-- <cite>A. Tanenbaum</cite>, "Introduction to
-Computer Networks"</p>
-</blockquote>
-
-<p>
-$BF~Lg$H$$$&$3$H$G!"$3$N>O$O(B Web$B!"(BHTTP$B!"(BApache $B$KDL$8$F$$$k(B
-$BFI<T8~$1$G$9$,!"%;%-%e%j%F%#@lLg2H8~$1$G$O$"$j$^$;$s!#(B
-SSL $B%W%m%H%3%k$N7hDjE*$J<j0z$-$G$"$k$D$b$j$O$"$j$^$;$s!#(B
-$B$^$?!"AH?%Fb$NG'>Z4IM}$N$?$a$NFCDj$N%F%/%K%C%/$d!"(B
-$BFC5v$dM"=P5,@)$J$I$N=EMW$JK!E*$JLdBj$K$D$$$F$b07$$$^$;$s!#(B
-$B$`$7$m!"99$J$k8&5f$X$N=PH/E@$H$7$F?'!9$J35G0!"Dj5A!"Nc$rJB$Y$k$3$H$G(B
- mod_ssl $B$N%f!<%6$K4pACCN<1$rDs6!$9$k;v$rL\E*$H$7$F$$$^$9!#(B</p>
-
-<p>$B$3$3$K<($5$l$?FbMF$O<g$K!"86Cx<T$N5v2D$N2<(B
-The Open Group Research Institute $B$N(B <a
-href="http://home.earthlink.net/~fjhirsch/">Frederick J. Hirsch</a>
- $B;a$N5-;v(B <a
-href="http://home.earthlink.net/~fjhirsch/Papers/wwwj/article.html">
-Introducing SSL and Certificates using SSLeay</a> $B$r4p$K$7$F$$$^$9!#(B
-$B;a$N5-;v$O(B <a
-href="http://www.ora.com/catalog/wjsum97/">Web Security: A Matter of
-Trust</a>, World Wide Web Journal, Volume 2, Issue 3, Summer 1997
-$B$K7G:\$5$l$^$7$?!#(B
-$B9NDjE*$J0U8+$O(B <a
-href="mailto:hirsch@fjhirsch.com">Frederick Hirsch</a> $B;a(B
- ($B855-;v$NCx<T(B) $B$XA4$F$N6l>p$O(B <a
-href="mailto:rse@engelschall.com">Ralf S. Engelschall</a> (
-<module>mod_ssl</module> $B$N:n<T(B) $B$X$*4j$$$7$^$9!#(B
-[$BLuCm(B: $BLu$K$D$$$F$O(B <a
-href="mailto:apache-docs@ml.apache.or.jp">
-Apache $B%I%-%e%a%s%HK]Lu%W%m%8%'%/%H(B</a>
-$B$X$*4j$$$7$^$9!#(B]</p>
-</summary>
-
-<section id="cryptographictech">
-<title>$B0E9f2=5;=Q(B</title>
-<p>SSL $B$rM}2r$9$k$K$O!"0E9f%"%k%4%j%:%`!"(B
-$B%a%C%;!<%8%@%$%8%'%9%H4X?t(B($BJLL>(B: $B0lJ}8~4X?t!"%O%C%7%e4X?t(B)$B!"(B
-$BEE;R=pL>$J$I$X$NM}2r$,I,MW$G$9!#(B
-$B$3$l$i$N5;=Q$OK\$,4]$4$HI,MW$JBjL\$G(B
-($BNc$($P(B [<a href="#AC96">AC96</a>] $B$r;2>H(B)$B!"(B
-$B%W%i%$%P%7!<!"?.MQ!"G'>Z$J$I$N5;=Q$N4pAC$H$J$C$F$$$^$9!#(B</p>
-
-<section id="cryptographicalgo">
-<title>$B0E9f%"%k%4%j%:%`(B</title>
-    <p>$BNc$($P!"%"%j%9$,Aw6b$N$?$a$K6d9T$K%a%C%;!<%8$rAw$j$?$$$H$7$^$9!#(B
-    $B8}:BHV9f$dAw6b$N6b3[$,4^$^$l$k$?$a!"(B
-    $B%"%j%9$O$=$N%a%C%;!<%8$rHkL)$K$7$?$$$H;W$$$^$9!#(B
-    $B2r7hJ}K!$N0l$D$O0E9f%"%k%4%j%:%`$r;H$C$F!"%a%C%;!<%8$r(B
-    $BFI$^$;$?$$?M0J30$OFI$`$3$H$,$G$-$J$$0E9f2=$5$l$?(B
-    $B7ABV$KJQ$($F$7$^$&$3$H$G$9!#(B
-    $B$=$N7ABV$K$J$k$H!"(B
-    $B%a%C%;!<%8$OHkL)$N80$K$h$C$F$N$_2r<a$9$k$3$H$,$G$-$^$9!#(B
-    $B80$J$7$G$O!"%a%C%;!<%8$OLr$KN)$A$^$;$s!#(B
-    $BNI$$0E9f%"%k%4%j%:%`$O!"?/F~<T$,85$N%F%-%9%H$r2rFI$9$k$3$H$r(B
-    $BHs>o$KFq$7$/$9$k$?$a!"EXNO$,3d$K9g$o$J$/$5$;$^$9!#(B</p>
-
-    <p>$B0E9f%"%k%4%j%:%`$K$O(B
-    $B=>Mh7?$H8x3+80$NFs$D$N<oN`$,$"$j$^$9!#(B</p>
-
-    <dl>
-    <dt>$B=>Mh7?0E9f(B</dt>
-    <dd>$BBP>N0E9f$H$7$F$bCN$i$l!"(B
-    $BAw?.<T$H<u?.<T$,80$r6&M-$9$k$3$H$,I,MW$G$9!#(B
-    $B80$H$O!"%a%C%;!<%8$r0E9f2=$7$?$jI|9f$9$k$N$K;H$o$l$kHkL)(B
-    $B$N>pJs$N$3$H$G$9!#(B
-    $B$b$7!"$3$N80$,HkL)$J$i!"Aw?.<T$H<u?.<T0J30$OC/$b%a%C%;!<%8$rFI(B
-    $B$`$3$H$,$G$-$^$;$s!#(B
-    $B$b$7$b!"%"%j%9$H6d9T$,HkL)$N80$rCN$C$F$$$k$J$i!"(B
-    $BH`$i$O$*8_$$$KHkL)$N%a%C%;!<%8$rAw$k$3$H$,$G$-$k$G$7$g$&!#(B
-    $B$?$@$7!";vA0$KFbL)$K80$rA*$V$H$$$&;E;v$OLdBj$r4^$s$G$$$^$9!#(B</dd>
-
-    <dt>$B8x3+800E9f(B</dt>
-    <dd>$BHsBP>N0E9f$H$7$F$bCN$i$l!"(B
-    $B%a%C%;!<%8$r0E9f2=$9$k$3$H$N$G$-$kFs$D$N80(B
-    $B$r;HMQ$9$k%"%k%4%j%:%`$rDj5A$9$k$3$H$G80$N$d$j<h$j$NLdBj$r2r7h(B
-    $B$7$^$9!#(B
-    $B$b$7!"$"$k80$,0E9f2=$K;H$o$l$?$J$i!"(B
-    $B$b$&JRJ}$N80$GI|9f$7$J$1$l$P$$$1$^$;$s!#(B
-    $B$3$NJ}<0$K$h$C$F!"0l$D$N80$r8xI=$7$F(B($B8x3+80(B)$B!"(B
-    $B$b$&JRJ}$rHkL)$K$7$F$*$/(B($BHkL)80(B)$B$@$1$G!"(B
-    $B0BA4$J%a%C%;!<%8$r<u$1<h$k$3$H$,$G$-$^$9!#(B</dd>
-    </dl>
-
-    <p>$BC/$b$,0E9f2=$5$l$?%a%C%;!<%8$r8x3+80$K$h$C$F0E9f2=(B
-    $B$9$k$3$H$,$G$-$^$9$,!"HkL)80$N;}$A<g$@$1$,$=$l$rFI$`$3$H$,(B
-    $B$G$-$^$9!#(B
-    $B$3$NJ}K!$G!"6d9T$N8x3+80$r;H$C$F0E9f2=$9$k$3$H$G!"(B
-    $B%"%j%9$OHkL)$N%a%C%;!<%8$rAw$k$3$H$,$G$-$^$9!#(B
-    $B6d9T$N$_$,I|9f$9$k$3$H$,$G$-$^$9!#(B</p>
-</section>
-
-<section id="messagedigests">
-<title>$B%a%C%;!<%8%@%$%8%'%9%H(B</title>
-    <p>$B%"%j%9$O%a%C%;!<%8$rHkL)$K$9$k$3$H$,$G$-$^$9$,!"(B
-    $BC/$+$,Nc$($P<+J,$KAw6b$9$k$h$&$K%a%C%;!<%8$rJQ99$7$?$j!"(B
-    $BJL$N$b$N$KCV$-49$($F$7$^$&$+$b$7$l$J$$$H$$$&LdBj$,$"$j$^$9!#(B
-    $B%"%j%9$N%a%C%;!<%8$N?.MQ$rJ]>Z$9$kJ}K!$N0l$D$O!"(B
-    $B%a%C%;!<%8$N4J7i$J%@%$%8%'%9%H$r:n$C$F!"$=$l$b6d9T$KAw$k$H$$$&$b$N$G$9!#(B
-    $B%a%C%;!<%8$r<u$1<h$k$H6d9T$b%@%$%8%'%9%H$r:n@.$7!"(B
-    $B%"%j%9$,Aw$C$?$b$N$HHf$Y$^$9!#$b$70lCW$7$?$J$i!"(B
-    $B<u$1<h$C$?%a%C%;!<%8$OL5=}$@$H$$$&$3$H$K$J$j$^$9!#(B</p>
-
-    <p>$B$3$N$h$&$JMWLs$O(B<dfn>$B%a%C%;!<%8%@%$%8%'%9%H(B</dfn>$B!"(B
-    <em>$B0lJ}9T4X?t(B</em>$B!"$^$?$O(B<em>$B%O%C%7%e4X?t(B</em>$B$H8F$P$l$^$9!#(B
-    $B%a%C%;!<%8%@%$%8%'%9%H$OD9$$2DJQD9$N%a%C%;!<%8$+$i(B
-    $BC;$$8GDjD9$NI=8=$r:n$k$N$K;H$o$l$^$9!#(B
-    $B%@%$%8%'%9%H%"%k%4%j%:%`$O%a%C%;!<%8$+$i(B
-    $B0l0U$J%@%$%8%'%9%H$r@8@.$9$k$h$&$K:n$i$l$F$$$^$9!#(B
-    $B%a%C%;!<%8%@%$%8%'%9%H$O%@%$%8%'%9%H$+$i85$N%a%C%;!<%8$r(B
-    $BH=Dj$9$k$N$,$H$F$bFq$7$$$h$&$K$G$-$F$$$^$9!#(B
-    $B$^$?!"F1$8MWLs$r:n@.$9$kFs$D$N%a%C%;!<%8$rC5$9$N$OIT2DG=$G$9!#(B
-    $B$h$C$F!"F1$8MWLs$r;H$C$F%a%C%;!<%8$rCV$-49$($k$H$$$&(B
-    $B2DG=@-$rGS=|$7$F$$$^$9!#(B</p>
-
-<p>$B%"%j%9$X$N$b$&0l$D$NLdBj$O!"$3$N%@%$%8%'%9%H$r0BA4$KAw$kJ}K!$rC5$9$3$H$G$9!#(B
-$B$3$l$,$G$-$l$P!"%a%C%;!<%8$N?.MQ$,J]>Z$5$l$^$9!#(B
-$B0l$D$NJ}K!$O$3$N%@%$%8%'%9%H$KEE;R=pL>$r4^$`$3$H$G$9!#(B</p>
-</section>
-
-<section id="digitalsignatures"><title>$BEE;R=pL>(B</title>
-<p>$B%"%j%9$,6d9T$K%a%C%;!<%8$rAw$C$?$H$-!"6d9T$O!"(B
-$B?/F~<T$,H`=w$K$J$j$9$^$7$FH`=w$N8}:B$X$N<h0z$r?=@A$7$F$$$J$$$+!"(B
-$B%a%C%;!<%8$,K\Ev$KH`=w$+$i$N$b$N$+3N<B$KJ,$+$i$J$1$l$P$$$1$^$;$s!#(B
-$B%"%j%9$K$h$C$F:n@.$5$l!"%a%C%;!<%8$K4^$^$l$?(B
-<em>$BEE;R=pL>(B</em>$B$,$3$3$GLr$KN)$A$^$9!#(B</p>
-
-<p>$BEE;R=pL>$O%a%C%;!<%8$N%@%$%8%'%9%H$d$=$NB>$N>pJs(B($B=hM}HV9f$J$I(B)$B$r(B
-$BAw?.<T$NHkL)80$G0E9f2=$9$k$3$H$G:n$i$l$^$9!#(B
-$BC/$b$,8x3+80$r;H$C$F=pL>$r(B<em>$BI|9f(B</em>$B$9$k$3$H$,$G$-$^$9$,!"(B
-$B=pL><T$N$_$,HkL)80$rCN$C$F$$$^$9!#(B
-$B$3$l$O!"H`$i$N$_$,=pL>$7$($?$3$H$r0UL#$7$^$9!#(B
-$B%@%$%8%'%9%H$rEE;R=pL>$K4^$`$3$H$O!"(B
-$B$=$N=pL>$,$=$N%a%C%;!<%8$N$_$KM-8z$G$"$k$3$H$r0UL#$7$^$9!#(B
-$B$3$l$O!"C/$b%@%$%8%'%9%H$rJQ$($F=pL>$r$9$k$3$H$,$G$-$J$$$?$a!"(B
-$B%a%C%;!<%8$N?.MQ$bJ]>Z$7$^$9!#(B</p>
-
-<p>$B?/F~<T$,=pL>$rK5<u$7$F8eF|$K:FMxMQ$9$k$N$rKI$0$?$a(B
-$BEE;R=pL>$K$O0l0U$J=hM}HV9f$,4^$^$l$^$9!#(B
-$B$3$l$O!"%"%j%9$,$=$s$J%a%C%;!<%8$OAw$C$F$$$J$$$H8@$&:>5=(B
-$B$+$i6d9T$r<i$j$^$9!#(B
-$BH`=w$@$1$,=pL>$7$($?$+$i$G$9!#(B($BH]G'KI;_(B)</p>
-</section>
-</section>
-<!-- /cryptographictech -->
-
-<section id="certificates">
-<title>$B>ZL@=q(B</title>
-<p>$B%"%j%9$OHkL)$N%a%C%;!<%8$r6d9T$KAw$j!"(B
-$B=pL>$r$7$F!"%a%C%;!<%8$N?.MQ$rJ]>Z$9$k$3$H$,$G$-$k$*$&$K$J$j$^$7$?$,!"(B
-$BDL?.$7$F$$$kAj<j$,K\Ev$K6d9T$J$N$+3N$+$a$J$/$F$O$$$1$^$;$s!#(B
-$B$3$l$O!"H`=w$,;H$&8x3+80$,6d9T$NHkL)80$HBP$K$J$C$F$$$k$b$N$+!"(B
-$BH`=w$O3N$+$a$J$/$F$O$$$1$J$$$H$$$&$3$H$r0UL#$7$^$9!#(B
-$BF1MM$K!"6d9T$O%a%C%;!<%8$N=pL>$,K\Ev$K%"%j%9$N=pL>$+3NG'$9$kI,MW$,(B
-$B$"$j$^$9!#(B</p>
-
-<p>$B$b$7N><T$K?H85$r>ZL@$7!"8x3+80$r3NG'$7!"$^$??.Mj$5$l$?5!4X$,=pL>(B
-$B$7$?>ZL@=q$,$"$l$P!"N><T$H$bDL?.Aj<j$K$D$$$F@5$7$$Aj<j$@$H(B
-$B3N?.$9$k$3$H$,$G$-$^$9!#(B
-$B$=$N$h$&$J?.Mj$5$l$?5!4X$O(B<em>$BG'>Z6I(B</em>
- (Certificate Authority $B$^$?$O(B CA) $B$H8F$P$l!"(B
-$B>ZL@=q(B (certificate) $B$,G'>Z(B (authentication) $B$K;H$o$l$^$9!#(B</p>
-
-<section id="certificatecontents">
-<title>$B>ZL@=q$NFbMF(B</title>
-    <p>$B>ZL@=q$O8x3+80$H8D?M!"%5!<%P!"$=$NB>$N<gBN$N<B:_$N?H85$r(B
-    $B4XO"IU$1$^$9!#(B
-    <a href="#table1">$BI=(B1</a>$B$K<($5$l$k$h$&$K>ZL@BP>]$N>pJs$O(B
-    $B?H85>ZL@$N>pJs(B($B<1JLL>(B)$B$H8x3+80$,4^$^$l$^$9!#(B
-    $B>ZL@=q$O$^$?!"G'>Z6I$N?H85>ZL@$H=pL>!"$=$7$F>ZL@=q$NM-8z4|4V$r(B
-    $B4^$_$^$9!#(B
-    $B%7%j%"%k%J%s%P!<$J$I$NG'>Z6I$N4IM}>e$N>pJs$d(B
-    $B$=$NB>$NDI2C$N>pJs$,4^$^$l$F$$$k$+$b$7$l$^$;$s!#(B</p>
-
-    <section id="table1">
-    <title>$BI=(B1: $B>ZL@=q>pJs(B</title>
-    <table>
-    <columnspec><column width=".35"/><column width=".35"/>
-    </columnspec>
-    <tr><th>$B>ZL@BP>](B</th>
-        <td>$B<1JLL>!"8x3+80(B</td></tr>
-    <tr><th>$BH/9T<T(B</th>
-        <td>$B<1JLL>!"8x3+80(B</td></tr>
-    <tr><th>$BM-8z4|4V(B</th>
-        <td>$B3+;OF|!"<:8zF|(B</td></tr>
-    <tr><th>$B4IM}>pJs(B</th>
-        <td>$B%P!<%8%g%s!"%7%j%"%k%J%s%P!<(B</td></tr>
-    <tr><th>$B3HD%>pJs(B</th>
-        <td>$B4pK\E*$J@)Ls!"%M%C%H%9%1!<%W%U%i%C%0!"$=$NB>(B</td></tr>
-    </table>
-    </section>
-
-    <p>$B<1JLL>(B($B%G%#%9%F%#%s%0%$%C%7%e!&%M!<%`(B)$B$OFCDj$N>u67$K$*$1$k(B
-    $B?HJ,>ZL@$rDs6!$9$k$N$K;H$o$l$F$$$^$9!#Nc$($P!"$"$k?M$O(B
-    $B;dMQ$H2q<R$H$GJL!9$N?HJ,>ZL@$r;}$D$+$b$7$l$^$;$s!#(B
-    
-    $B<1JLL>$O(B X.509 $BI8=`5,3J(B [<a
-    href="#X509">X509</a>] $B$GDj5A$5$l$F$$$^$9!#(B
-    X.509 $BI8=`5,3J$O!"9`L\!"9`L\L>!"$=$7$F9`L\$NN,>N$rDj5A$7$F$$$^$9!#(B(<a href="#table2">$BI=(B
-    2</a> $B;2>H(B)</p>
-
-    <section id="table2">
-    <title>$BI=(B 2: $B<1JLL>>pJs(B</title>
-    <table border="1">
-    <columnspec><column width=".25"/><column width=".15"/>
-      <column width=".3"/><column width=".25"/></columnspec>
-    <tr><th>$B<1JLL>9`L\(B</th>
-        <th>$BN,>N(B</th>
-        <th>$B@bL@(B</th>
-        <th>$BNc(B</th></tr>
-    <tr><td>Common Name ($B%3%b%s%M!<%`(B)</td>
-        <td>CN</td>
-        <td>$BG'>Z$5$l$kL>A0(B<br />
-        SSL$B@\B3$9$k(BURL</td>
-        <td>CN=www.example.com</td></tr>
-    <tr><td>Organization or Company ($BAH?%L>(B)</td>
-        <td>O</td>
-        <td>$BCDBN$N@5<01Q8lAH?%L>(B</td>
-        <td>O=Example Japan K.K.</td></tr>
-    <tr><td>Organizational Unit ($BItLgL>(B)</td>
-        <td>OU</td>
-        <td>$BIt=pL>$J$I(B</td>
-        <td>OU=Customer Service</td></tr>
-    <tr><td>City/Locality ($B;T6hD.B<(B)</td>
-        <td>L</td>
-        <td>$B=j:_$7$F$k;T6hD.B<(B</td>
-        <td>L=Sapporo</td></tr>
-    <tr><td>State/Province ($BETF;I\8)(B)</td>
-        <td>ST</td>
-        <td>$B=j:_$7$F$kETF;I\8)(B</td>
-        <td>ST=Hokkaido</td></tr>
-    <tr><td>Country($B9q(B)</td>
-        <td>C</td>
-        <td>$B=j:_$7$F$$$k9qL>$N(B ISO $B%3!<%I(B<br />
-        $BF|K\$N>l9g(B JP
-        </td>
-        <td>C=JP</td></tr>
-    </table>
-    </section>
-
-    <p>$BG'>Z6I$O$I$N9`L\$,>JN,2DG=$G$I$l$,I,?\$+$NJ}?K$rDj5A$9$k(B
-    $B$+$b$7$l$^$;$s!#9`L\$NFbMF$K$D$$$F$bG'>Z6I$d>ZL@=q$N%f!<%6$+$i$N(B
-    $BMW7o$,$"$k$+$b$7$l$^$;$s!#(B
-    $BNc$($P!"%M%C%H%9%1!<%W$N%V%i%&%6$O%5!<%P$N>ZL@=q$N(B
-     Common Name ($B%3%b%s%M!<%`(B)$B$,%5!<%P$N%I%a%$%sL>$N(B
-     <code>*.example.com</code> 
-    $B$H$$$&$h$&$J%o%$%k%I%+!<%I$N%Q%?!<%s$K%^%C%A$9$k$3$H(B
-    $B$rMW5a$7$^$9!#(B</p>
-
-    <p>$B%P%$%J%j7A<0$N>ZL@=q$O(B ASN.1 $BI=5-K!(B
-     [<a href="#X208">X208</a>] [<a href="#PKCS">PKCS</a>] $B$G(B
-    $BDj5A$5$l$F$$$^$9!#(B
-    $B$3$NI=5-K!$OFbMF$r$I$N$h$&$K5-=R$9$k$+$rDj5A$7!"(B
-    $BId9f2=$N5,Dj$,$3$N>pJs$,$I$N$h$&$K%P%$%J%j7A<0$KJQ49$5$l$k$+$r(B
-    $BDj5A$7$^$9!#(B
-    $B>ZL@=q$N%P%$%J%jId9f2=$O(B Distinguished Encoding
-    Rules (DER) $B$GDj5A$5$l!"$=$l$O$h$j0lHLE*$J(B Basic Encoding Rules
-    (BER) $B$K4p$E$$$F$$$^$9!#(B
-    $B%P%$%J%j7A<0$r07$&$3$H$N$G$-$J$$Aw?.$G$O!"(B
-    $B%P%$%J%j7A<0$O(B Base64 $BId9f2=(B [<a href="#MIME">MIME</a>] $B$G(B
-    ASCII $B7A<0$KJQ49$5$l$k$3$H$,$"$j$^$9!#(B
-    $B$3$N$h$&$KId9f2=$5$l!"0J2<$NNc$K<($5$l$k$h$&$K6h@Z$j9T$K(B
-    $B64$^$l$?$b$N$O(B PEM $BId9f2=$5$l$?$H8@$$$^$9!#(B
-    (PEM $B$NL>A0$O(B "Privacy Enhanced Mail" $B$KM3Mh$7$^$9(B)</p>
-
-    <example>
-    <title>PEM $BId9f2=$5$l$?>ZL@=q$NNc(B (example.crt)</title>
-    <pre>-----BEGIN CERTIFICATE-----
-MIIC7jCCAlegAwIBAgIBATANBgkqhkiG9w0BAQQFADCBqTELMAkGA1UEBhMCWFkx
-FTATBgNVBAgTDFNuYWtlIERlc2VydDETMBEGA1UEBxMKU25ha2UgVG93bjEXMBUG
-A1UEChMOU25ha2UgT2lsLCBMdGQxHjAcBgNVBAsTFUNlcnRpZmljYXRlIEF1dGhv
-cml0eTEVMBMGA1UEAxMMU25ha2UgT2lsIENBMR4wHAYJKoZIhvcNAQkBFg9jYUBz
-bmFrZW9pbC5kb20wHhcNOTgxMDIxMDg1ODM2WhcNOTkxMDIxMDg1ODM2WjCBpzEL
-MAkGA1UEBhMCWFkxFTATBgNVBAgTDFNuYWtlIERlc2VydDETMBEGA1UEBxMKU25h
-a2UgVG93bjEXMBUGA1UEChMOU25ha2UgT2lsLCBMdGQxFzAVBgNVBAsTDldlYnNl
-cnZlciBUZWFtMRkwFwYDVQQDExB3d3cuc25ha2VvaWwuZG9tMR8wHQYJKoZIhvcN
-AQkBFhB3d3dAc25ha2VvaWwuZG9tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQDH9Ge/s2zcH+da+rPTx/DPRp3xGjHZ4GG6pCmvADIEtBtKBFAcZ64n+Dy7Np8b
-vKR+yy5DGQiijsH1D/j8HlGE+q4TZ8OFk7BNBFazHxFbYI4OKMiCxdKzdif1yfaa
-lWoANFlAzlSdbxeGVHoT0K+gT5w3UxwZKv2DLbCTzLZyPwIDAQABoyYwJDAPBgNV
-HRMECDAGAQH/AgEAMBEGCWCGSAGG+EIBAQQEAwIAQDANBgkqhkiG9w0BAQQFAAOB
-gQAZUIHAL4D09oE6Lv2k56Gp38OBDuILvwLg1v1KL8mQR+KFjghCrtpqaztZqcDt
-2q2QoyulCgSzHbEGmi0EsdkPfg6mp0penssIFePYNI+/8u9HT4LuKMJX15hxBam7
-dUHzICxBVC1lnHyYGjDuAMhe396lYAn8bCld1/L4NMGBCQ==
------END CERTIFICATE-----</pre>
-    </example>
-</section>
-
-<section id="certificateauthorities">
-<title>$BG'>Z6I(B</title>
-    <p>$B$^$:>ZL@=q$N?=@A$N>pJs$r3NG'$9$k$3$H$G!"(B
-    $BG'>Z6I$OHkL)80$N;}$A<g$N?H85$rJ]>Z$7$^$9!#(B
-    $BNc$($P!"%"%j%9$,8D?M>ZL@=q$r?=@A$7$?$H$9$k$H!"(B
-    $BG'>Z6I$O%"%j%9$,>ZL@=q$N?=@A$,<gD%$9$kDL$j$N(B
-    $B?MJ*$@$H$$$&$3$H$r3NG'$7$J$/$F$O$$$1$^$;$s!#(B</p>
-
-    <section id="certificatechains">
-    <title>$B>ZL@=q3,AX9=B$(B</title>
-        <p>$BG'>Z6I$OB>$NG'>Z6I$X$N>ZL@=q$rH/9T$9$k$3$H$,$G$-$^$9!#(B
-        $BL$CN$N>ZL@=q$rD4$Y$k;~$K!"%"%j%9$O$=$N>ZL@=q$NH/9T<T(B
-        $B$K<+?.$,;}$F$k$^$G!"H/9T<T$N>ZL@=q$r(B
-        $B$=$N>e0L3,AX$NG'>Z6I$r$?$I$C$FD4$Y$kI,MW$,$"$j$^$9!#(B
-        $B!V0-<A$J!W>ZL@=q$N4m81@-$r8:$i$9$?$a!"(B
-        $BH`=w$O8B$i$l$?O":?$NH/9T<T$N$_?.Mj$9$k$h$&$K(B
-        $B7h$a$k$3$H$b$G$-$^$9!#(B</p>
-    </section>
-
-    <section id="rootlevelca">
-    <title>$B:G>e0LG'>Z6I$N:n@.(B</title>
-        <p>$BA0$K=R$Y$?$h$&$K!"A4$F$N>ZL@=q$K$D$$$F!"(B
-        $B:G>e0L$NG'>Z6I(B(CA)$B$^$G$=$l$>$l$NH/9T<T$,(B
-        $BBP>]$N?H85>ZL@$NM-8z@-$rL@$i$+$K$9$kI,MW$,$"$j$^$9!#(B
-        $BLdBj$O!"C/$,$=$N:G>e0L$NG'>Z5!4X$N>ZL@=q$rJ]>Z$9$k$N$+!"(B
-        $B$H$$$&$3$H$G$9!#(B
-        $B$3$N$h$&$J>l9g$K8B$j!">ZL@=q$O!V<+8J=pL>!W$5$l$^$9!#(B
-        $B$D$^$j!">ZL@=q$NH/9T<T$H>ZL@BP>]$,F1$8$H$$$&$3$H$K$J$j$^$9!#(B
-        $B$=$N7k2L!"<+8J=pL>$5$l$?>ZL@=q$r?.MQ$9$k$K$O(B
-        $B:Y?4$NCm0U$,I,MW$G$9!#(B
-        $B:G>e0LG'>Z6I$,8x3+80$r9-$/8xI=$9$k$3$H$G!"(B
-        $B$=$N80$r?.Mj$9$k%j%9%/$rDc$/$9$k$3$H$,$G$-$^$9!#(B
-        $B$b$7!"B>?M$,$=$NG'>Z6I$K$J$j$9$^$7$?;~$K!"$=$l$,O*8+$7$d(B
-        $B$9$$$+$i$G$9!#(B
-        $BB?$/$N%V%i%&%6$OM-L>$JG'>Z6I$r?.Mj$9$k$h$&$K(B
-        $B@_Dj$5$l$F$$$^$9!#(B</p>
-
-        <p><a href="http://www.thawte.com/">Thawte</a> 
-        $B$d(B <a href="http://www.verisign.com/">VeriSign</a> 
-        $B$N$h$&$JB?$/$N2q<R$,G'>Z6I$H$7$F3+@_$7$^$7$?!#(B
-        $B$3$N$h$&$J2q<R$O0J2<$N%5!<%S%9$rDs6!$7$^$9(B:</p>
-
-        <ul>
-        <li>$B>ZL@=q?=@A$N3NG'(B</li>
-        <li>$B>ZL@=q?=@A$N=hM}(B</li>
-        <li>$B>ZL@=q$NH/9T$H4IM}(B</li>
-        </ul>
-
-        <p>$B<+J,$GG'>Z6I$r:n$k$3$H$b2DG=$G$9!#(B
-        $B%$%s%?!<%M%C%H4D6-$G$O4m81$G$9$,!"(B
-        $B8D?M$d%5!<%P$N?H85>ZL@$,4JC1$K9T$($kAH?%$N(B
-        $B%$%s%H%i%M%C%HFb$G$OLr$KN)$D$+$b$7$l$^$;$s!#(B</p>
-    </section>
-
-    <section id="certificatemanagement">
-    <title>$B>ZL@=q4IM}(B</title>
-        <p>$BG'>Z6I$N3+@_$OE0Dl$7$?4IM}!"5;=Q!"1?MQ$NBN@)$rI,MW$H$9$k(B
-        $B@UG$$N$"$k;E;v$G$9!#(B
-        $BG'>Z6I$O>ZL@=q$rH/9T$9$k$@$1$G$J$/!"(B
-        $B4IM}$b$7$J$1$l$P$J$j$^$;$s!#(B
-        $B6qBNE*$K$O!">ZL@=q$,$$$D$^$GM-8z$+$r7hDj$7!"99?7$7!"(B
-        $B$^$?4{$KH/9T$5$l$?$,<:8z$7$?>ZL@=q$N%j%9%H(B
-        (Certificate Revocation Lists $B$^$?$O(B CRL)
-        $B$r4IM}$7$J$1$l$P$$$1$^$;$s!#(B
-        $BNc$($P!"%"%j%9$,2q<R$+$i<R0w$H$7$F>ZL@=q$rM?$($i$l$?$H$7$^$9!#(B
-        $B$=$7$F!"%"%j%9$,2q<R$r<-$a$k$H$-$K$O>ZL@=q$r<h$j>C$5$J$1$l$P(B
-        $B$$$1$J$$$H$7$^$9!#(B
-        $B>ZL@=q$O<!!9$H?M$KEO$5$l$F$$$/$b$N$J$N$G!"(B
-        $B>ZL@=q$=$N$b$N$+$i!"$=$l$,<h$j>C$5$l$?$+H=CG$9$k$3$H$O(B
-        $BIT2DG=$G$9!#(B
-        $B$h$C$F!">ZL@=q$NM-8z@-$rD4$Y$k$H$-$K$O!"(B
-        $BG'>Z6I$KO"Mm$7$F(B CRL $B$r>H9g$9$kI,MW$,$"$j$^$9!#(B
-        $BIaDL$3$N2aDx$O<+F02=$5$l$F$$$k$b$N$G$O$"$j$^$;$s!#(B</p>
-
-        <note><title>$BCm0U(B</title>
-        <p>$B%G%U%)%k%H$G%V%i%&%6$K@_Dj$5$l$F$$$J$$G'>Z6I$r;H$C$?>l9g!"(B
-        $BG'>Z6I$N>ZL@=q$r%V%i%&%6$KFI$_9~$s$G!"(B
-        $B%V%i%&%6$,$=$NG'>Z6I$K$h$C$F=pL>$5$l$?%5!<%P$N>ZL@=q$r(B
-        $BM-8z2=$9$kI,MW$,$"$j$^$9!#(B
-        $B0lEYFI$_9~$^$l$k$H!"$=$NG'>Z6I$K$h$C$F=pL>$5$l$?A4$F$N(B
-        $B>ZL@=q$r<u$1F~$l$k$?$a!"4m81$rH<$$$^$9!#(B</p>
-        </note>
-    </section>
-</section>
-<!-- /certificateauthorities -->
-</section>
-<!-- /certificates -->
-
-<section id="ssl">
-<title>Secure Sockets Layer (SSL)</title>
-<p>Secure Sockets Layer $B%W%m%H%3%k$O?.Mj@-$N$"$k%3%M%/%7%g%s7?$N(B
-$B%M%C%H%o!<%/AX$N%W%m%H%3%k(B($BNc$($P!"(BTCP/IP)$B$H(B
-$B%"%W%j%1!<%7%g%sAX$N%W%m%H%3%k(B($BNc$($P!"(BHTTP)
-$B$N4V$KCV$/$3$H$,$G$-$^$9!#(B
-SSL $B$O!"Aj8_G'>Z$K$h$C$F%5!<%P$H%/%i%$%"%s%H4V$N0BA4$JDL?.$r!"(B
-$BEE;R=pL>$K$h$C$F%G!<%?$N40A4@-$r!"(B
-$B$=$7$F0E9f2=$K$h$C$F%W%i%$%P%7$rDs6!$7$^$9!#(B</p>
-
-<p>SSL $B%W%m%H%3%k$O0E9f2=!"%@%$%8%'%9%H!"EE;R=pL>$K$D$$$F!"(B
-$BMM!9$J%"%k%4%j%:%`$r%5%]!<%H$9$k$h$&$K$G$-$F$$$^$9!#(B
-$B$3$&$9$k$3$H$G!"K!$dM"=P$N5,@)$r9MN8$KF~$l$F!"%5!<%P$K9g$o$;$?(B
-$B%"%k%4%j%:%`$rA*$V$3$H$,$G$-!"$^$?!"?7$7$$%"%k%4%j%:%`$r(B
-$BMxMQ$7$F$$$/$3$H$b2DG=$K$7$F$$$^$9!#(B
-$B%"%k%4%j%:%`$NA*Br$O%W%m%H%3%k%;%C%7%g%s3+;O;~$K(B
-$B%5!<%P$H%/%i%$%"%s%H4V$G<h$j7h$a$i$l$^$9!#(B</p>
-
-<section id="table4">
-<title>$BI=(B4: SSL $B%W%m%H%3%k$N%P!<%8%g%s(B</title>
-    <table border="1">
-    <columnspec><column width=".15"/><column width=".2"/>
-     <column width=".30"/><column width=".25"/></columnspec>
-    <tr><th>$B%P!<%8%g%s(B</th>
-        <th>$B=PE5(B</th>
-        <th>$B@bL@(B</th>
-        <th>$B%V%i%&%6$N%5%]!<%H(B</th></tr>
-    <tr><td>SSL v2.0</td>
-        <td>Vendor Standard (Netscape Corp. $B$h$j(B) [<a href="#SSL2"
-        >SSL2</a>]</td>
-        <td>$B<BAu$,8=B8$9$k=i$a$F$N(B SSL $B%W%m%H%3%k(B</td>
-        <td>- NS Navigator 1.x/2.x<br />
-        - MS IE 3.x<br />
-        - Lynx/2.8+OpenSSL</td></tr>
-    <tr><td>SSL v3.0</td>
-        <td>Expired Internet Draft (Netscape Corp. $B$h$j(B) [<a href="#SSL3"
-        >SSL3</a>]</td>
-        <td>$BFCDj$N%;%-%e%j%F%#967b$rKI$0$?$a$N2~D{!"(B
-        $BHs(BRSA $B0E9f$NDI2C!">ZL@=q3,AX9=B$$N%5%]!<%H(B</td>
-        <td>- NS Navigator 2.x/3.x/4.x<br />
-        - MS IE 3.x/4.x<br />
-        - Lynx/2.8+OpenSSL</td></tr>
-    <tr><td>TLS v1.0</td>
-        <td>Proposed Internet Standard (IETF $B$h$j(B) [<a href="#TLS1"
-        >TLS1</a>]</td>
-        <td>MAC $B%l%$%d$r(B HMAC $B$X99?7!"%V%m%C%/0E9f$N(B block
-        padding$B!"%a%C%;!<%8=g=x$NI8=`2=!"7Y9pJ8$N=<<B$J$I$N$?$a(B
-        SSL 3.0 $B$r2~D{!#(B</td>
-        <td>- Lynx/2.8+OpenSSL</td></tr>
-    </table>
-</section>
-
-<p><a href="#table4">$BI=(B4</a>$B$K<($5$l$k$H$*$j!"(BSSL $B%W%m%H%3%k$K$O(B
-$B$$$/$D$b$N%P!<%8%g%s$,$"$j$^$9!#(B
-$BI=$K$b=q$+$l$F$$$k$h$&$K!"(BSSL 3.0 $B$NMxE@$N0l$D$O(B
-$B>ZL@=q3,AX9=B$$r%5%]!<%H$9$k$3$H$G$9!#(B
-$B$3$N5!G=$K$h$C$F!"%5!<%P$O<+J,$N>ZL@=q$K2C$($F!"(B
-$BH/9T<T$N>ZL@=q$r%V%i%&%6$KEO$9$3$H$,$G$-$^$9!#(B
-$B>ZL@=q3,AX9=B$$K$h$C$F!"(B
-$B%V%i%&%6$KH/9T<T$N>ZL@=q$,D>@\EPO?$5$l$F$$$J$/$F$b!"(B
-$B3,AX$NCf$K4^$^$l$F$$$l$P!"(B
-$B%V%i%&%6$O%5!<%P$N>ZL@=q$rM-8z2=$9$k$3$H$,$G$-$^$9!#(B
-SSL 3.0 $B$O8=:_(B Internet Engineering Task Force (IETF) 
-$B$K$h$C$F3+H/$5$l$F$$$k(B Transport Layer Security 
-[<a href="#TLS1">TLS</a>] $B%W%m%H%3%kI8=`5,3J$N4pAC$H$J$C$F$$$^$9!#(B</p>
-
-<section id="session">
-<title>$B%;%C%7%g%s$N3NN)(B</title>
-    <p><a href="#figure1">$B?^(B1</a>$B$G<($5$l$k$h$&$K!"(B
-    $B%;%C%7%g%s$N3NN)$O%/%i%$%"%s%H$H%5!<%P4V$N(B
-    $B%O%s%I%7%'!<%/%7!<%/%(%s%9$K$h$C$F9T$J$o$l$^$9!#(B
-    $B%5!<%P$,>ZL@=q$rDs6!$9$k$+!"%/%i%$%"%s%H$N>ZL@=q$r%j%/%(%9%H$9$k$+(B
-    $B$H$$$&%5!<%P$N@_Dj$K$h$j!"$3$N%7!<%/%(%s%9$O0[$J$k$b$N$H$J$j$^$9!#(B
-    $B0E9f>pJs$N4IM}$N$?$a$K!"DI2C$N%O%s%I%7%'!<%/2aDx$,I,MW$K$J$k(B
-    $B>l9g$b$"$j$^$9$,!"$3$N5-;v$G$O(B
-    $B$h$/$"$k%7%J%j%*$r<jC;$K@bL@$7$^$9!#(B
-    $BA4$F$N2DG=@-$K$D$$$O!"(BSSL $B;EMM=q$r;2>H$7$F$/$@$5$$!#(B</p>
-
-    <note><title>$BCm0U(B</title>
-    <p>$B0lEY(B SSL $B%;%C%7%g%s$,3NN)$9$k$H!"%;%C%7%g%s$r:FMxMQ$9$k$3$H$G!"(B
-    $B%;%C%7%g%s$r3+;O$9$k$?$a$NB?$/$N2aDx$r7+$jJV$9$H$$$&(B
-    $B%Q%U%)!<%^%s%9$NB;<:$rKI$.$^$9!#(B
-    $B$=$N$?$a!"%5!<%P$OA4$F$N%;%C%7%g%s$K0l0U$J%;%C%7%g%s<1JLL>$r(B
-    $B3d$jEv$F!"%5!<%P$K%-%c%C%7%e$7!"%/%i%$%"%s%H$O<!2s$+$i(B
-    ($B<1JLL>$,%5!<%P$N%-%c%C%7%e$G4|8B@Z$l$K$J$k$^$G$O(B)
-    $B%O%s%I%7%'!<%/$J$7$G@\B3$9$k$3$H$,$G$-$^$9!#(B</p>
-    </note>
-
-    <p class="figure">
-    <img 
-    src="ssl_intro_fig1.gif" alt="" width="423" height="327" /><br />
-    <a id="figure1" name="figure1"><dfn>$B?^(B1</dfn></a>: SSL
-    $B%O%s%I%7%'!<%/%7!<%/%(%s%935N,(B</p>
-
-    <p>$B%5!<%P$H%/%i%$%"%s%H$G;H$o$l$k(B
-    $B%O%s%I%7%'!<%/%7!<%/%(%s%9$NMWAG$r0J2<$K<($7$^$9(B:</p>
-
-    <ol>
-    <li>$B%G!<%?DL?.$K;H$o$l$k0E9f%9%$!<%H$N<h$j7h$a(B</li>
-    <li>$B%/%i%$%"%s%H$H%5!<%P4V$G$N%;%C%7%g%s80$N3NN)$H6&M-(B</li>
-    <li>$B%*%W%7%g%s$H$7$F!"%/%i%$%"%s%H$KBP$9$k%5!<%P$NG'>Z(B</li>
-    <li>$B%*%W%7%g%s$H$7$F!"%5!<%P$KBP$9$k%/%i%$%"%s%H$NG'>Z(B</li>
-    </ol>
-
-    <p>$BBh0l%9%F%C%W$N0E9f%9%$!<%H<h$j7h$a$K$h$C$F!"(B
-    $B%5!<%P$H%/%i%$%"%s%H$O$=$l$>$l$K$"$C$?(B
-    $B0E9f%9%$!<%H$rA*$V$3$H$,$G$-$^$9!#(B
-    SSL3.0 $B%W%m%H%3%k$N;EMM=q$O(B 31 $B$N0E9f%9%$!<%H$rDj5A$7$F$$$^$9!#(B
-    $B0E9f%9%$!<%H$O0J2<$N%3%s%]!<%M%s%H$K$h$jDj5A$5$l$F$$$^$9(B:</p>
-
-    <ul>
-    <li>$B80$N8r49<jCJ(B</li>
-    <li>$B%G!<%?DL?.$N0E9f=Q(B</li>
-    <li>Message Authentication Code (MAC) $B:n@.$N$?$a$N(B
-    $B%a%C%;!<%8%@%$%8%'%9%H(B</li>
-    </ul>
-
-    <p>$B$3$l$i$N;0$D$NMWAG$O0J2<$N%;%/%7%g%s$G@bL@$5$l$F$$$^$9!#(B</p>
-</section>
-
-<section id="keyexchange">
-<title>$B80$N8r49<jCJ(B</title>
-    <p>$B80$N8r49<jCJ$O%"%W%j%1!<%7%g%s$N%G!<%?DL?.$K;H$o$l!"(B
-    $B6&M-$5$l$kBP>N0E9f80$r$I$N$h$&$K$,%/%i%$%"%s%H$H%5!<%P$G(B
-    $B<h$j7h$a$k$+$rDj5A$7$^$9!#(B
-    SSL 2.0 $B$O(B RSA $B808r49$7$+;H$$$^$;$s$,!"(B
-    SSL 3.0 $B$O>ZL@=q$,;H$o$l$k$H$-$O(B RSA $B808r49$r;H$$!"(B
-    $B>ZL@=q$,L5$/!"%/%i%$%"%s%H$H%5!<%P$N;vA0$NDL?.$,L5$$>l9g$O(B
-    Diffie-Hellman $B808r49$r;H$&(B
-    $B$J$IMM!9$J808r49%"%k%4%j%:%`$r%5%]!<%H$7$^$9!#(B</p>
-
-    <p>$B80$N8r49J}K!$K$*$1$k0l$D$NA*Br;h$OEE;R=pL>$G$9!#(B
-    $BEE;R=pL>$r;H$&$+$I$&$+!"$^$?!"(B
-    $B$I$N<oN`$N=pL>$r;H$&$+$H$$$&A*Br$,$"$j$^$9!#(B
-    $BHkL)80$G=pL>$9$k$3$H$G6&M-80$r@8@.$9$7!">pJs8r49$9$k;~$N(B
-    $B%^%s!&%$%s!&%6!&%_%I%k967b$rKI$0$3$H$,$G$-$^$9!#(B
-    [<a href="#AC96">AC96</a>, p516]</p>
-</section>
-
-<section id="ciphertransfer">
-<title>$B%G!<%?DL?.$N0E9f=Q(B</title>
-    <p>SSL $B$O%;%C%7%g%s$N%a%C%;!<%8$N0E9f2=$KA0=R$7$?(B
-    $B=>Mh7?0E9f(B($BBP>N0E9f(B)$B$rMQ$$$^$9!#(B
-    $B0E9f2=$7$J$$$H$$$&A*Br;h$b4^$a6e$D$NA*Br;h$,$"$j$^$9(B:</p>
-
-    <ul>
-    <li>$B0E9f2=$J$7(B</li>
-    <li>$B%9%H%j!<%`0E9f(B
-        <ul>
-        <li>40-bit $B80$G$N(B RC4</li>
-        <li>128-bit $B80$G$N(B RC4</li>
-        </ul></li>
-    <li>CBC $B%V%m%C%/0E9f(B
-        <ul><li>40 bit $B80$G$N(B RC2</li>
-        <li>40 bit $B80$G$N(B DES</li>
-        <li>56 bit $B80$G$N(B DES</li>
-        <li>168 bit $B80$G$N(B Triple-DES</li>
-        <li>Idea (128 bit $B80(B)</li>
-        <li>Fortezza (96 bit $B80(B)</li>
-        </ul></li>
-    </ul>
-
-    <p>$B$3$3$G$N(B CBC $B$H$O0E9f%V%m%C%/O":?(B (Cipher Block Chaining)
-     $B$NN,$G!"0l$DA0$N0E9f2=$5$l$?0E9fJ8$N0lIt$,(B
-    $B%V%m%C%/$N0E9f2=$K;H$o$l$k$3$H$r0UL#$7$^$9!#(B
-    DES $B$O%G!<%?0E9f2=I8=`5,3J(B (Data Encryption Standard)
-     [<a href="#AC96">AC96</a>, ch12] $B$NN,$G!"(B
-    DES40 $B$d(B 3DES_EDE $B$r4^$`$$$/$D$b$N<oN`$,$"$j$^$9!#(B
-    Idea $B$O:G9b$J$b$N$N0l$D$G!"0E9f=QE*$K$O8=:_$"$kCf$G(B
-    $B:G$b6/NO$J$b$N$G$9!#(B
-    RC2 $B$O(B RSA DSI $B$K$h$kFH@jE*$J%"%k%4%j%:%`$G$9!#(B
-     [<a href="#AC96">AC96</a>,
-    ch13]</p>
-</section>
-
-<section id="digestfuntion">
-<title>$B%@%$%8%'%9%H4X?t(B</title>
-    <p>
-    $B%@%$%8%'%9%H4X?t$NA*Br$O%l%3!<%I%f%K%C%H$+$i$I$N$h$&$K%@%$%8%'%9%H$,@8@.$5$l$k$+$r7hDj$7$^$9!#(B
-    SSL $B$O0J2<$r%5%]!<%H$7$^$9(B:</p>
-
-    <ul>
-    <li>$B%@%$%8%'%9%H$J$7(B</li>
-    <li>MD5 (128-bit $B%O%C%7%e(B)</li>
-    <li>Secure Hash Algorithm (SHA-1) (160-bit $B%O%C%7%e(B)</li>
-    </ul>
-
-    <p>$B%a%C%;!<%8%@%$%8%'%9%H$O(B Message Authentication Code (MAC) 
-    $B$N@8@.$K;H$o$l!"%a%C%;!<%8$H6&$K0E9f2=$5$l!"%a%C%;!<%8$N?.MQ$r(B
-    $BDs6!$7!"%j%W%l%$967b$rKI$.$^$9!#(B</p>
-</section>
-
-<section id="handshake">
-<title>$B%O%s%I%7%'!<%/%7!<%/%(%s%9%W%m%H%3%k(B</title>
-    <p>$B%O%s%I%7%'!<%/%7!<%/%(%s%9$O;0$D$N%W%m%H%3%k$r;H$$$^$9(B:</p>
-
-    <ul>
-    <li><dfn>SSL $B%O%s%I%7%'!<%/%W%m%H%3%k(B</dfn>$B$O(B
-    $B%/%i%$%"%s%H$H%5!<%P4V$G$N(B SSL $B%;%C%7%g%s$N3NN)$K;H$o$l$^$9!#(B</li>
-    <li><dfn>SSL $B0E9f;EMMJQ99%W%m%H%3%k(B</dfn>$B$O(B
-    $B%;%C%7%g%s$G$N0E9f%9%$!<%H$N<h$j7h$a$K;H$o$l$^$9!#(B</li>
-    <li><dfn>SSL $B7Y9p%W%m%H%3%k(B</dfn>$B$O(B
-    $B%/%i%$%"%s%H%5!<%P4V$G(B SSL $B%(%i!<$rEAC#$9$k$N$K;H$o$l$^$9!#(B</li>
-    </ul>
-
-    <p>$B;0$D$N%W%m%H%3%k$O!"%"%W%j%1!<%7%g%s%W%m%H%3%k%G!<%?$H$H$b$K!"(B
-    <a href="#figure2">$B?^(B2</a>$B$K<($9$H$*$j(B <dfn>SSL $B%l%3!<%I%W%m%H%3%k(B</dfn>
-    $B$G%+%W%;%k2=$5$l$^$9!#(B
-    $B%+%W%;%k2=$5$l$?%W%m%H%3%k$O%G!<%?$r8!::$7$J$$(B
-    $B2<AX$N%W%m%H%3%k$K$h$C$F%G!<%?$H$7$FEAC#$5$l$^$9!#(B
-    $B%+%W%;%k2=$5$l$?%W%m%H%3%k$O2<AX$N%W%m%H%3%k$K4X$7$F0l@Z4XCN$7$^$;$s!#(B</p>
-
-    <p class="figure">
-    <img src="ssl_intro_fig2.gif" alt="" width="428" height="217" /><br />
-    <a id="figure2" name="figure2"><dfn>$B?^(B2</dfn></a>: SSL $B%W%m%H%3%k%9%?%C%/(B
-    </p>
-
-    <p>
-    $B%l%3!<%I%W%m%H%3%k$K$h$k(B SSL $B%3%s%H%m!<%k%W%m%H%3%k$N%+%W%;%k2=$O!"(B
-    $B%"%/%F%#%V$J%;%C%7%g%s$NFs2sL\$NDL?.$,$"$C$?>l9g!"(B
-    $B%3%s%H%m!<%k%W%m%H%3%k$,0BA4$G$"$k$3$H$r0UL#$7$^$9!#(B
-    $B4{$K%;%C%7%g%s$,L5$$>l9g$O!"(BNull $B0E9f%9%$!<%H$,;H$o$l!"(B
-    $B0E9f2=$O9T$J$o$l$:!"%;%C%7%g%s$,3NN)$9$k$^$G$O(B
-    $B%@%$%8%'%9%H$bL5$$>uBV$H$J$j$^$9!#(B</p>
-</section>
-
-<section id="datatransfer">
-<title>$B%G!<%?DL?.(B</title>
-    <p><a href="#figure3">$B?^(B3</a>$B$K<($5$l$k(B SSL $B%l%3!<%I%W%m%H%3%k(B
-    $B$O%/%i%$%"%s%H$H%5!<%P4V$N%"%W%j%1!<%7%g%s$d(B
-    SSL $B%3%s%H%m!<%k%G!<%?$NDL?.$K;H$o$l$^$9!#(B
-    $B$3$N%G!<%?$O$h$j>.$5$$%f%K%C%H$KJ,$1$i$l$?$j!"(B
-    $B$$$/$D$+$N9b5i%W%m%H%3%k$r$^$H$a$F0l%f%K%C%H$H$7$FDL?.$,(B
-    $B9T$J$o$l$k$3$H$b$"$j$^$9!#(B
-    $B%G!<%?$r05=L$7!"%@%$%8%'%9%H=pL>$rE:IU$7$F!"(B
-    $B$3$l$i$N%f%K%C%H$r0E9f2=$7$?$N$A!"%Y!<%9$H$J$C$F$$$k(B
-    $B?.Mj@-$N$"$k%H%i%s%9%]!<%H%W%m%H%3%k$rMQ$$$k$+$b$7$l$^$;$s!#(B
-    ($BCm0U(B: $B8=:_%a%8%c!<$J(B SLL $B<BAu$G05=L$r%5%]!<%H$7$F$$$k$b$N$O$"$j$^$;$s(B)</p>
-
-    <p class="figure">
-    <img src="ssl_intro_fig3.gif" alt="" width="423" height="323" /><br />
-    <a id="figure3" name="figure3"><dfn>$B?^(B 3</dfn></a>: SSL $B%l%3!<%I%W%m%H%3%k(B
-    </p>
-</section>
-
-<section id="securehttp">
-<title>HTTP $BDL?.$N0BA42=(B</title>
-    <p>$B$h$/$"$k(B SSL $B$N;H$$J}$O%V%i%&%6$H%&%'%V%5!<%P4V$N(B HTTP $BDL?.(B
-    $B$N0BA42=$G$9!#(B
-    $B$3$l$O!"=>Mh$N0BA4$G$O$J$$(B HTTP $B$N;HMQ$r=|30$9$k$b$N$G$O$"$j$^$;$s!#(B
-    $B0BA42=$5$l$?$b$N$O<g$K(B SSH $B>e$NIaDL$N(B HTTP $B$G!"(BHTTPS $B$H8F$P$l$^$9!#(B
-    $BBg$-$J0c$$$O!"(BURL $B%9%-!<%`$K(B <code>http</code> $B$NBe$o$j$K(B <code>https</code>
-    $B$rMQ$$!"%5!<%P$,JL$N%]!<%H$r;H$&$3$H$G$9(B ($B%G%U%)%k%H$G$O(B443)$B!#(B
-    $B$3$l$,<g$K(B <module
-    >mod_ssl</module> $B$,(B Apache $B%&%'%V%5!<%P$KDs6!$9$k5!G=$G$9!#(B</p>
-</section>
-</section>
-<!-- /ssl -->
-
-<section id="references">
-<title>$B;29MJ88%(B</title>
-<dl>
-<dt><a id="AC96" name="AC96">[AC96]</a></dt>
-<dd>Bruce Schneier, <q>Applied Cryptography</q>, 2nd Edition, Wiley,
-1996. See <a href="http://www.counterpane.com/"
->http://www.counterpane.com/</a> for various other materials by Bruce
-Schneier.</dd>
-
-<dt><a id="X208" name="X208">[X208]</a></dt>
-<dd>ITU-T Recommendation X.208, <q>Specification of Abstract Syntax Notation
-One (ASN.1)</q>, 1988. See for instance <a
-href="http://www.itu.int/rec/recommendation.asp?type=items&amp;lang=e&amp;parent=T-REC-X.208-198811-I"
->http://www.itu.int/rec/recommendation.asp?type=items&amp;lang=e&amp;parent=T-REC-X.208-198811-I</a>.
-</dd>
-
-<dt><a id="X509" name="X509">[X509]</a></dt>
-<dd>ITU-T Recommendation X.509, <q>The Directory - Authentication
-Framework</q>. See for instance <a
-href="http://www.itu.int/rec/recommendation.asp?type=folders&amp;lang=e&amp;parent=T-REC-X.509"
->http://www.itu.int/rec/recommendation.asp?type=folders&amp;lang=e&amp;parent=T-REC-X.509</a>.
-</dd>
-
-<dt><a id="PKCS" name="PKCS">[PKCS]</a></dt>
-<dd><q>Public Key Cryptography Standards (PKCS)</q>, 
-RSA Laboratories Technical Notes, See <a
-href="http://www.rsasecurity.com/rsalabs/pkcs/"
->http://www.rsasecurity.com/rsalabs/pkcs/</a>.</dd>
-
-<dt><a id="MIME" name="MIME">[MIME]</a></dt>
-<dd>N. Freed, N. Borenstein, <q>Multipurpose Internet Mail Extensions
-(MIME) Part One: Format of Internet Message Bodies</q>, RFC2045.
-See for instance <a href="http://ietf.org/rfc/rfc2045.txt"
->http://ietf.org/rfc/rfc2045.txt</a>.</dd>
-
-<dt><a id="SSL2" name="SSL2">[SSL2]</a></dt>
-<dd>Kipp E.B. Hickman, <q>The SSL Protocol</q>, 1995. See <a
-href="http://www.netscape.com/eng/security/SSL_2.html"
->http://www.netscape.com/eng/security/SSL_2.html</a>.</dd>
-
-<dt><a id="SSL3" name="SSL3">[SSL3]</a></dt>
-<dd>Alan O. Freier, Philip Karlton, Paul C. Kocher, <q>The SSL Protocol
-Version 3.0</q>, 1996. See <a
-href="http://www.netscape.com/eng/ssl3/draft302.txt"
->http://www.netscape.com/eng/ssl3/draft302.txt</a>.</dd>
-
-<dt><a id="TLS1" name="TLS1">[TLS1]</a></dt>
-<dd>Tim Dierks, Christopher Allen, <q>The TLS Protocol Version 1.0</q>,
-1999. See <a href="http://ietf.org/rfc/rfc2246.txt"
->http://ietf.org/rfc/rfc2246.txt</a>.</dd>
-</dl>
-</section>
-<!-- /references -->
-
-</manualpage>
diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 574fb5858d..630b0148f9 100644
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -650,6 +650,12 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r,
     return APR_SUCCESS;
 }
 
+static int addit_dammit(void *v, const char *key, const char *val)
+{
+    apr_table_addn(v, key, val);
+    return 1;
+}
+
 static
 apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
                                             proxy_http_conn_t *p_conn,
@@ -669,6 +675,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
                                 * in the case that the origin told us
                                 * to HTTP_CONTINUE
                                 */
+    apr_table_t *save_table;
 
     /* Get response from the remote server, and pass it up the
      * filter chain
@@ -740,8 +747,14 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
             /* N.B. for HTTP/1.0 clients, we have to fold line-wrapped headers*/
             /* Also, take care with headers with multiple occurences. */
 
+            /* First, tuck away all already existing cookies */
+            save_table = apr_table_make(r->pool, 2);
+            apr_table_do(addit_dammit, save_table, r->err_headers_out, "Set-Cookie", NULL);
+            apr_table_do(addit_dammit, save_table, r->headers_out, "Set-Cookie", NULL);
+
             r->headers_out = ap_proxy_read_headers(r, rp, buffer,
                                                    sizeof(buffer), origin);
+
             if (r->headers_out == NULL) {
                 ap_log_error(APLOG_MARK, APLOG_WARNING, 0,
                              r->server, "proxy: bad HTTP/%d.%d header "
@@ -759,8 +772,19 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
                 return r->status;
 
             } else {
-                /* strip connection listed hop-by-hop headers from response */
                 const char *buf;
+
+                /* Now, add in the just read cookies */
+                apr_table_do(addit_dammit, save_table, r->headers_out, "Set-Cookie", NULL);
+
+                /* and now load 'em all in */
+                if (!apr_is_empty_table(save_table)) {
+                    apr_table_unset(r->headers_out, "Set-Cookie");
+                    r->headers_out = apr_table_overlay(r->pool,
+                                                           r->headers_out, save_table);
+                }
+                
+                /* strip connection listed hop-by-hop headers from response */
                 p_conn->close += ap_proxy_liststr(apr_table_get(r->headers_out,
                                                                 "Connection"),
                                                   "close");