From: André Malo <nd@apache.org>
Date: Wed, 18 May 2005 17:26:38 +0000 (+0000)
Subject: update transformation
X-Git-Tag: 2.1.5~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35aee92aaabaa8ea6fb20a2803ad2fb6b14d4d21;p=apache

update transformation


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

diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml
index 6742eaa740..26b54c8672 100644
--- a/docs/manual/mod/allmodules.xml
+++ b/docs/manual/mod/allmodules.xml
@@ -27,6 +27,7 @@
   <modulefile>mod_dav.xml</modulefile>
   <modulefile>mod_dav_fs.xml</modulefile>
   <modulefile>mod_dav_lock.xml</modulefile>
+  <modulefile>mod_dbd.xml</modulefile>
   <modulefile>mod_deflate.xml</modulefile>
   <modulefile>mod_dir.xml</modulefile>
   <modulefile>mod_disk_cache.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de
index 0ef2f06fb3..623d205982 100644
--- a/docs/manual/mod/allmodules.xml.de
+++ b/docs/manual/mod/allmodules.xml.de
@@ -27,6 +27,7 @@
   <modulefile>mod_dav.xml</modulefile>
   <modulefile>mod_dav_fs.xml</modulefile>
   <modulefile>mod_dav_lock.xml</modulefile>
+  <modulefile>mod_dbd.xml</modulefile>
   <modulefile>mod_deflate.xml</modulefile>
   <modulefile>mod_dir.xml</modulefile>
   <modulefile>mod_disk_cache.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es
index c4fe9a51ef..725cb14c37 100644
--- a/docs/manual/mod/allmodules.xml.es
+++ b/docs/manual/mod/allmodules.xml.es
@@ -27,6 +27,7 @@
   <modulefile>mod_dav.xml</modulefile>
   <modulefile>mod_dav_fs.xml</modulefile>
   <modulefile>mod_dav_lock.xml</modulefile>
+  <modulefile>mod_dbd.xml</modulefile>
   <modulefile>mod_deflate.xml</modulefile>
   <modulefile>mod_dir.xml</modulefile>
   <modulefile>mod_disk_cache.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja
index 0d91020fb3..17bf5ea91d 100644
--- a/docs/manual/mod/allmodules.xml.ja
+++ b/docs/manual/mod/allmodules.xml.ja
@@ -27,6 +27,7 @@
   <modulefile>mod_dav.xml.ja</modulefile>
   <modulefile>mod_dav_fs.xml.ja</modulefile>
   <modulefile>mod_dav_lock.xml.ja</modulefile>
+  <modulefile>mod_dbd.xml</modulefile>
   <modulefile>mod_deflate.xml.ja</modulefile>
   <modulefile>mod_dir.xml.ja</modulefile>
   <modulefile>mod_disk_cache.xml.ja</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko
index 3590070569..2a3bfab2f0 100644
--- a/docs/manual/mod/allmodules.xml.ko
+++ b/docs/manual/mod/allmodules.xml.ko
@@ -27,6 +27,7 @@
   <modulefile>mod_dav.xml.ko</modulefile>
   <modulefile>mod_dav_fs.xml.ko</modulefile>
   <modulefile>mod_dav_lock.xml</modulefile>
+  <modulefile>mod_dbd.xml</modulefile>
   <modulefile>mod_deflate.xml.ko</modulefile>
   <modulefile>mod_dir.xml.ko</modulefile>
   <modulefile>mod_disk_cache.xml.ko</modulefile>
diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de
index c32e08c486..3cdc5ab174 100644
--- a/docs/manual/mod/directives.html.de
+++ b/docs/manual/mod/directives.html.de
@@ -147,6 +147,14 @@
 <li><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB</a></li>
 <li><a href="mod_dav_fs.html#davlockdb">DavLockDB</a></li>
 <li><a href="mod_dav.html#davmintimeout">DavMinTimeout</a></li>
+<li><a href="mod_dbd.html#dbdexptime">DBDExptime</a></li>
+<li><a href="mod_dbd.html#dbdkeep">DBDKeep</a></li>
+<li><a href="mod_dbd.html#dbdmax">DBDMax</a></li>
+<li><a href="mod_dbd.html#dbdmin">DBDMin</a></li>
+<li><a href="mod_dbd.html#dbdparams">DBDParams</a></li>
+<li><a href="mod_dbd.html#dbdpersist">DBDPersist</a></li>
+<li><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL</a></li>
+<li><a href="mod_dbd.html#dbdriver">DBDriver</a></li>
 <li><a href="mod_autoindex.html#defaulticon">DefaultIcon</a></li>
 <li><a href="mod_mime.html#defaultlanguage">DefaultLanguage</a></li>
 <li><a href="core.html#defaulttype">DefaultType</a></li>
diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en
index c37e8709a5..1f09bc9f02 100644
--- a/docs/manual/mod/directives.html.en
+++ b/docs/manual/mod/directives.html.en
@@ -148,6 +148,14 @@
 <li><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB</a></li>
 <li><a href="mod_dav_fs.html#davlockdb">DavLockDB</a></li>
 <li><a href="mod_dav.html#davmintimeout">DavMinTimeout</a></li>
+<li><a href="mod_dbd.html#dbdexptime">DBDExptime</a></li>
+<li><a href="mod_dbd.html#dbdkeep">DBDKeep</a></li>
+<li><a href="mod_dbd.html#dbdmax">DBDMax</a></li>
+<li><a href="mod_dbd.html#dbdmin">DBDMin</a></li>
+<li><a href="mod_dbd.html#dbdparams">DBDParams</a></li>
+<li><a href="mod_dbd.html#dbdpersist">DBDPersist</a></li>
+<li><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL</a></li>
+<li><a href="mod_dbd.html#dbdriver">DBDriver</a></li>
 <li><a href="mod_autoindex.html#defaulticon">DefaultIcon</a></li>
 <li><a href="mod_mime.html#defaultlanguage">DefaultLanguage</a></li>
 <li><a href="core.html#defaulttype">DefaultType</a></li>
diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es
index 5f84c62eb1..71ab7ac99e 100644
--- a/docs/manual/mod/directives.html.es
+++ b/docs/manual/mod/directives.html.es
@@ -150,6 +150,14 @@
 <li><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB</a></li>
 <li><a href="mod_dav_fs.html#davlockdb">DavLockDB</a></li>
 <li><a href="mod_dav.html#davmintimeout">DavMinTimeout</a></li>
+<li><a href="mod_dbd.html#dbdexptime">DBDExptime</a></li>
+<li><a href="mod_dbd.html#dbdkeep">DBDKeep</a></li>
+<li><a href="mod_dbd.html#dbdmax">DBDMax</a></li>
+<li><a href="mod_dbd.html#dbdmin">DBDMin</a></li>
+<li><a href="mod_dbd.html#dbdparams">DBDParams</a></li>
+<li><a href="mod_dbd.html#dbdpersist">DBDPersist</a></li>
+<li><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL</a></li>
+<li><a href="mod_dbd.html#dbdriver">DBDriver</a></li>
 <li><a href="mod_autoindex.html#defaulticon">DefaultIcon</a></li>
 <li><a href="mod_mime.html#defaultlanguage">DefaultLanguage</a></li>
 <li><a href="core.html#defaulttype">DefaultType</a></li>
diff --git a/docs/manual/mod/directives.html.ja.euc-jp b/docs/manual/mod/directives.html.ja.euc-jp
index f29bcc5e02..729b6b22e0 100644
--- a/docs/manual/mod/directives.html.ja.euc-jp
+++ b/docs/manual/mod/directives.html.ja.euc-jp
@@ -144,6 +144,14 @@
 <li><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB</a></li>
 <li><a href="mod_dav_fs.html#davlockdb">DavLockDB</a></li>
 <li><a href="mod_dav.html#davmintimeout">DavMinTimeout</a></li>
+<li><a href="mod_dbd.html#dbdexptime">DBDExptime</a></li>
+<li><a href="mod_dbd.html#dbdkeep">DBDKeep</a></li>
+<li><a href="mod_dbd.html#dbdmax">DBDMax</a></li>
+<li><a href="mod_dbd.html#dbdmin">DBDMin</a></li>
+<li><a href="mod_dbd.html#dbdparams">DBDParams</a></li>
+<li><a href="mod_dbd.html#dbdpersist">DBDPersist</a></li>
+<li><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL</a></li>
+<li><a href="mod_dbd.html#dbdriver">DBDriver</a></li>
 <li><a href="mod_autoindex.html#defaulticon">DefaultIcon</a></li>
 <li><a href="mod_mime.html#defaultlanguage">DefaultLanguage</a></li>
 <li><a href="core.html#defaulttype">DefaultType</a></li>
diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr
index acc12052e4..ce1d881c07 100644
--- a/docs/manual/mod/directives.html.ko.euc-kr
+++ b/docs/manual/mod/directives.html.ko.euc-kr
@@ -142,6 +142,14 @@
 <li><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB</a></li>
 <li><a href="mod_dav_fs.html#davlockdb">DavLockDB</a></li>
 <li><a href="mod_dav.html#davmintimeout">DavMinTimeout</a></li>
+<li><a href="mod_dbd.html#dbdexptime">DBDExptime</a></li>
+<li><a href="mod_dbd.html#dbdkeep">DBDKeep</a></li>
+<li><a href="mod_dbd.html#dbdmax">DBDMax</a></li>
+<li><a href="mod_dbd.html#dbdmin">DBDMin</a></li>
+<li><a href="mod_dbd.html#dbdparams">DBDParams</a></li>
+<li><a href="mod_dbd.html#dbdpersist">DBDPersist</a></li>
+<li><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL</a></li>
+<li><a href="mod_dbd.html#dbdriver">DBDriver</a></li>
 <li><a href="mod_autoindex.html#defaulticon">DefaultIcon</a></li>
 <li><a href="mod_mime.html#defaultlanguage">DefaultLanguage</a></li>
 <li><a href="core.html#defaulttype">DefaultType</a></li>
diff --git a/docs/manual/mod/index.html.de b/docs/manual/mod/index.html.de
index 3510b8e0df..ec8ac728a9 100644
--- a/docs/manual/mod/index.html.de
+++ b/docs/manual/mod/index.html.de
@@ -108,6 +108,7 @@ address)</dd>
 (<a href="http://www.webdav.org/">WebDAV</a>) functionality</dd>
 <dt><a href="mod_dav_fs.html">mod_dav_fs</a></dt><dd>filesystem provider for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></dd>
 <dt><a href="mod_dav_lock.html">mod_dav_lock</a></dt><dd>generic locking module for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></dd>
+<dt><a href="mod_dbd.html">mod_dbd</a></dt><dd>Manages SQL database connections</dd>
 <dt><a href="mod_deflate.html">mod_deflate</a></dt><dd>Compress content before it is delivered to the
 client</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>Provides for "trailing slash" redirects and
diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en
index f1b7030487..164c136701 100644
--- a/docs/manual/mod/index.html.en
+++ b/docs/manual/mod/index.html.en
@@ -106,6 +106,7 @@ address)</dd>
 (<a href="http://www.webdav.org/">WebDAV</a>) functionality</dd>
 <dt><a href="mod_dav_fs.html">mod_dav_fs</a></dt><dd>filesystem provider for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></dd>
 <dt><a href="mod_dav_lock.html">mod_dav_lock</a></dt><dd>generic locking module for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></dd>
+<dt><a href="mod_dbd.html">mod_dbd</a></dt><dd>Manages SQL database connections</dd>
 <dt><a href="mod_deflate.html">mod_deflate</a></dt><dd>Compress content before it is delivered to the
 client</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>Provides for "trailing slash" redirects and
diff --git a/docs/manual/mod/index.html.es b/docs/manual/mod/index.html.es
index 812c08544c..678bf69cea 100644
--- a/docs/manual/mod/index.html.es
+++ b/docs/manual/mod/index.html.es
@@ -109,6 +109,7 @@ address)</dd>
 (<a href="http://www.webdav.org/">WebDAV</a>) functionality</dd>
 <dt><a href="mod_dav_fs.html">mod_dav_fs</a></dt><dd>filesystem provider for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></dd>
 <dt><a href="mod_dav_lock.html">mod_dav_lock</a></dt><dd>generic locking module for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></dd>
+<dt><a href="mod_dbd.html">mod_dbd</a></dt><dd>Manages SQL database connections</dd>
 <dt><a href="mod_deflate.html">mod_deflate</a></dt><dd>Compress content before it is delivered to the
 client</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>Provides for "trailing slash" redirects and
diff --git a/docs/manual/mod/index.html.ja.euc-jp b/docs/manual/mod/index.html.ja.euc-jp
index 65f60a2b70..7b08b58365 100644
--- a/docs/manual/mod/index.html.ja.euc-jp
+++ b/docs/manual/mod/index.html.ja.euc-jp
@@ -101,6 +101,7 @@ for HTTP Basic authentication.</dd>
 (<a href="http://www.webdav.org/">WebDAV</a>) µ¡Ç½</dd>
 <dt><a href="mod_dav_fs.html">mod_dav_fs</a></dt><dd><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥×¥í¥Ð¥¤¥À</dd>
 <dt><a href="mod_dav_lock.html">mod_dav_lock</a></dt><dd><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ÍѤÎÈÆÍÑ¥í¥Ã¥¯¥â¥¸¥å¡¼¥ë</dd>
+<dt><a href="mod_dbd.html">mod_dbd</a></dt><dd>Manages SQL database connections</dd>
 <dt><a href="mod_deflate.html">mod_deflate</a></dt><dd>¥¯¥é¥¤¥¢¥ó¥È¤ØÁ÷¤é¤ì¤ëÁ°¤Ë¥³¥ó¥Æ¥ó¥Ä¤ò°µ½Ì¤¹¤ë</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>¡ÖºÇ¸å¤Î¥¹¥é¥Ã¥·¥å¡×¤Î¥ê¥À¥¤¥ì¥¯¥È¤È¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Î
 ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤ò°·¤¦µ¡Ç½¤òÄ󶡤¹¤ë</dd>
diff --git a/docs/manual/mod/index.html.ko.euc-kr b/docs/manual/mod/index.html.ko.euc-kr
index bf4a6be20b..8acb4462a2 100644
--- a/docs/manual/mod/index.html.ko.euc-kr
+++ b/docs/manual/mod/index.html.ko.euc-kr
@@ -96,6 +96,7 @@ for HTTP Basic authentication.</dd>
 (<a href="http://www.webdav.org/">WebDAV</a>) ±â´É</dd>
 <dt><a href="mod_dav_fs.html">mod_dav_fs</a></dt><dd><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>À» À§ÇÑ ÆÄÀϽýºÅÛ Á¦°øÀÚ</dd>
 <dt><a href="mod_dav_lock.html">mod_dav_lock</a></dt><dd>generic locking module for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></dd>
+<dt><a href="mod_dbd.html">mod_dbd</a></dt><dd>Manages SQL database connections</dd>
 <dt><a href="mod_deflate.html">mod_deflate</a></dt><dd>³»¿ëÀ» Ŭ¶óÀ̾ðÆ®·Î º¸³»±â Àü¿¡ ¾ÐÃàÇÑ´Ù</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>"¸¶Áö¸· ½½·¡½¬" ¸®´ÙÀÌ·º¼ÇÀ» Á¦°øÇÏ°í µð·ºÅ丮
 index ÆÄÀÏÀ» ¼­ºñ½ºÇÑ´Ù</dd>
diff --git a/docs/manual/mod/mod_dbd.html.en b/docs/manual/mod/mod_dbd.html.en
index fc085ba63d..fef43f4c26 100644
--- a/docs/manual/mod/mod_dbd.html.en
+++ b/docs/manual/mod/mod_dbd.html.en
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><!--
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
 <title>mod_dbd - Apache HTTP Server</title>
-<link title="Main stylesheet" type="text/css" media="all" rel="stylesheet" href="../style/css/manual.css" />
-<link title="No Sidebar - Default font size" type="text/css" media="all" rel="alternate stylesheet" href="../style/css/manual-loose-100pc.css" />
-<link type="text/css" media="print" rel="stylesheet" href="../style/css/manual-print.css" />
-<link rel="shortcut icon" href="../images/favicon.ico" /></head>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
 <body>
 <div id="page-header">
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
 <p class="apache">Apache HTTP Server Version 2.1</p>
-<img src="../images/feather.gif" alt="" /></div>
-<div class="up"><a href="./"><img src="../images/left.gif" alt="&lt;-" title="&lt;-" /></a></div>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
 <div id="path">
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Documentation</a> &gt; <a href="../">Version 2.1</a> &gt; <a href="./">Modules</a></div>
 <div id="page-content">
@@ -30,7 +30,7 @@
 <tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Version 2.1 and higher</td></tr></table>
 <h3>Summary</h3>
 
-    <p>mod_dbd manages SQL database connections using
+    <p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> manages SQL database connections using
     <a href="http://people.apache.org/~niq/dbd.html">apr_dbd</a>.
     It provides database connections on request to modules
     requiring SQL database functions, and takes care of
@@ -39,38 +39,39 @@
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
 <ul id="toc">
-<li><img src="../images/down.gif" alt="" /> <a href="#dbdexptime">DBDExptime</a></li>
-<li><img src="../images/down.gif" alt="" /> <a href="#dbdkeep">DBDKeep</a></li>
-<li><img src="../images/down.gif" alt="" /> <a href="#dbdmax">DBDMax</a></li>
-<li><img src="../images/down.gif" alt="" /> <a href="#dbdmin">DBDMin</a></li>
-<li><img src="../images/down.gif" alt="" /> <a href="#dbdparams">DBDParams</a></li>
-<li><img src="../images/down.gif" alt="" /> <a href="#dbdpersist">DBDPersist</a></li>
-<li><img src="../images/down.gif" alt="" /> <a href="#dbdpreparesql">DBDPrepareSQL</a></li>
-<li><img src="../images/down.gif" alt="" /> <a href="#dbdriver">DBDriver</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#dbdexptime">DBDExptime</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#dbdkeep">DBDKeep</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#dbdmax">DBDMax</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#dbdmin">DBDMin</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#dbdparams">DBDParams</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#dbdpersist">DBDPersist</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#dbdpreparesql">DBDPrepareSQL</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#dbdriver">DBDriver</a></li>
 </ul>
 <h3>Topics</h3>
 <ul id="topics">
-<li><img src="../images/down.gif" alt="" /> <a href="#reslist">Connection Pooling</a></li>
-<li><img src="../images/down.gif" alt="" /> <a href="#API">Apache DBD API</a></li>
-<li><img src="../images/down.gif" alt="" /> <a href="#prepared">SQL Prepared Statements</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#pooling">Connection Pooling</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#API">Apache DBD API</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#prepared">SQL Prepared Statements</a></li>
 </ul></div>
-<div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a id="reslist" name="reslist">Connection Pooling</a></h2>
+<h2><a name="pooling" id="pooling">Connection Pooling</a></h2>
     <p>This module manages database connections, in a manner
     optimised for the platform.  On non-threaded platforms,
     it provides a persistent connection in the manner of
     classic LAMP (Linux, Apache, Mysql, Perl/PHP/Python).
     On threaded platform, it provides an altogether more
     scalable and efficient <em>connection pool</em>, as
-    described in <a href="http://www.apachetutor.org/dev/reslist" title="Connection pooling in Apache">this article at ApacheTutor</a>.
-    mod_dbd supersedes the modules presented in that article.</p>
-</div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div>
+    described in <a href="http://www.apachetutor.org/dev/reslist">this article at ApacheTutor</a>. <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> supersedes
+    the modules presented in that article.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a id="API" name="API">Apache DBD API</a></h2>
-    <p>mod_dbd exports three functions for other modules to use.
-    The API is as follows:</p>
-<pre><code>typedef struct {
+<h2><a name="API" id="API">Apache DBD API</a></h2>
+    <p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> exports three functions for other modules
+    to use. The API is as follows:</p>
+
+    <div class="example"><pre><code>typedef struct {
     apr_dbd_t *handle;
     apr_dbd_driver_t *driver;
     apr_hash_t *prepared;
@@ -95,23 +96,23 @@ AP_DECLARE(ap_dbd_t*) ap_dbd_acquire(request_rec*);
 /* Also export them as optional functions for modules that prefer it */
 APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_open, (apr_pool_t*, server_rec*));
 APR_DECLARE_OPTIONAL_FN(void, ap_dbd_close, (server_rec*, ap_dbd_t*));
-APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
-</code></pre>
-</div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div>
+APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));</code></pre></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a id="prepared" name="prepared">SQL Prepared Statements</a></h2>
-    <p>mod_dbd supports SQL prepared statements on behalf of
-    modules that may wish to use them.  Each prepared statement
+<h2><a name="prepared" id="prepared">SQL Prepared Statements</a></h2>
+    <p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> supports SQL prepared statements on behalf
+    of modules that may wish to use them.  Each prepared statement
     must be assigned a name (label), and they are stored in a hash:
     the <code>prepared</code> field of an <code>ap_dbd_t</code>.
     Hash entries are of type <code>apr_dbd_prepared_t</code>
     and can be used in any of the apr_dbd prepared statement
     SQL query or select commands.</p>
+
     <p>It is up to dbd user modules to use the prepared statements
     and document what statements can be specified in httpd.conf.</p>
 </div>
-<div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div>
-<div class="directive-section"><h2><a id="DBDExptime" name="DBDExptime">DBDExptime</a> <a id="dbdexptime" name="dbdexptime">Directive</a></h2>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DBDExptime" id="DBDExptime">DBDExptime</a> <a name="dbdexptime" id="dbdexptime">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Keepalive time for idle connections</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDExptime <var>time-in-seconds</var></code></td></tr>
@@ -124,8 +125,8 @@ APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
     platforms only).</p>
 
 </div>
-<div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div>
-<div class="directive-section"><h2><a id="DBDKeep" name="DBDKeep">DBDKeep</a> <a id="dbdkeep" name="dbdkeep">Directive</a></h2>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DBDKeep" id="DBDKeep">DBDKeep</a> <a name="dbdkeep" id="dbdkeep">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum sustainednumber of connections</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDKeep <var>number</var></code></td></tr>
@@ -138,8 +139,8 @@ APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
     platforms only).</p>
 
 </div>
-<div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div>
-<div class="directive-section"><h2><a id="DBDMax" name="DBDMax">DBDMax</a> <a id="dbdmax" name="dbdmax">Directive</a></h2>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DBDMax" id="DBDMax">DBDMax</a> <a name="dbdmax" id="dbdmax">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum number of connections</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDMax <var>number</var></code></td></tr>
@@ -151,8 +152,8 @@ APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
     (threaded platforms only).</p>
 
 </div>
-<div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div>
-<div class="directive-section"><h2><a id="DBDMin" name="DBDMin">DBDMin</a> <a id="dbdmin" name="dbdmin">Directive</a></h2>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DBDMin" id="DBDMin">DBDMin</a> <a name="dbdmin" id="dbdmin">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Minimum number of connections</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDMin <var>number</var></code></td></tr>
@@ -164,11 +165,12 @@ APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
     platforms only).</p>
 
 </div>
-<div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div>
-<div class="directive-section"><h2><a id="DBDParams" name="DBDParams">DBDParams</a> <a id="dbdparams" name="dbdparams">Directive</a></h2>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DBDParams" id="DBDParams">DBDParams</a> <a name="dbdparams" id="dbdparams">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Parameters for database connection</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDParams <var>param1=value1,param2=value2</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDParams
+<var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_dbd</td></tr>
@@ -178,11 +180,11 @@ APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
     password, database name, hostname and port number for connection.</p>
 
 </div>
-<div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div>
-<div class="directive-section"><h2><a id="DBDPersist" name="DBDPersist">DBDPersist</a> <a id="dbdpersist" name="dbdpersist">Directive</a></h2>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DBDPersist" id="DBDPersist">DBDPersist</a> <a name="dbdpersist" id="dbdpersist">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Whether to use persistent connections</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDPersist <var>[0|1]</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDPersist 0|1</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_dbd</td></tr>
@@ -191,13 +193,14 @@ APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
     A new database connection is opened when requested by a client,
     and closed immediately on release.  This option is for debugging
     and low-usage servers.</p>
+
     <p>The default is to enable a pool of persistent connections
     (or a single LAMP-style persistent connection in the case of a
     non-threaded server), and should almost always be used in operation.</p>
 
 </div>
-<div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div>
-<div class="directive-section"><h2><a id="DBDPrepareSQL" name="DBDPrepareSQL">DBDPrepareSQL</a> <a id="dbdpreparesql" name="dbdpreparesql">Directive</a></h2>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DBDPrepareSQL" id="DBDPrepareSQL">DBDPrepareSQL</a> <a name="dbdpreparesql" id="dbdpreparesql">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define an SQL prepared statement</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDPrepareSQL <var>"SQL statement"</var> <var>label</var></code></td></tr>
@@ -211,8 +214,8 @@ APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
     This directive prepares an SQL statement and assigns it a label.</p>
 
 </div>
-<div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div>
-<div class="directive-section"><h2><a id="DBDriver" name="DBDriver">DBDriver</a> <a id="dbdriver" name="dbdriver">Directive</a></h2>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DBDriver" id="DBDriver">DBDriver</a> <a name="dbdriver" id="dbdriver">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specify an SQL driver</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDriver <var>name</var></code></td></tr>
@@ -232,4 +235,4 @@ APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy.html.ja.euc-jp b/docs/manual/mod/mod_proxy.html.ja.euc-jp
index 6c90e0a145..502812d9a8 100644
--- a/docs/manual/mod/mod_proxy.html.ja.euc-jp
+++ b/docs/manual/mod/mod_proxy.html.ja.euc-jp
@@ -24,6 +24,8 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_proxy.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_proxy.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>HTTP/1.1 ¥×¥í¥­¥·/¥²¡¼¥È¥¦¥§¥¤¥µ¡¼¥Ð</td></tr>
 <tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>proxy_module</td></tr>
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index 6709055cf6..e303e25c5d 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -258,6 +258,15 @@ HTTP-Response-Headern</td></tr>
 <tr class="odd"><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
 <tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
 a DAV resource</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
+<var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Parameters for database connection</td></tr>
+<tr><td><a href="mod_dbd.html#dbdpersist">DBDPersist 0|1</a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL <var>"SQL statement"</var> <var>label</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Define an SQL prepared statement</td></tr>
+<tr><td><a href="mod_dbd.html#dbdriver">DBDriver <var>name</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Specify an SQL driver</td></tr>
 <tr class="odd"><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Icon to display for files when no specific icon is
 configured</td></tr>
 <tr><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets all files in the given scope to the specified
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 7099e04ec8..c62476c181 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -254,6 +254,15 @@ switch before dumping core</td></tr>
 <tr class="odd"><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
 <tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
 a DAV resource</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
+<var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Parameters for database connection</td></tr>
+<tr><td><a href="mod_dbd.html#dbdpersist">DBDPersist 0|1</a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL <var>"SQL statement"</var> <var>label</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Define an SQL prepared statement</td></tr>
+<tr><td><a href="mod_dbd.html#dbdriver">DBDriver <var>name</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Specify an SQL driver</td></tr>
 <tr class="odd"><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Icon to display for files when no specific icon is
 configured</td></tr>
 <tr><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets all files in the given scope to the specified
diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
index eed731f7c6..c9d4156c57 100644
--- a/docs/manual/mod/quickreference.html.es
+++ b/docs/manual/mod/quickreference.html.es
@@ -257,6 +257,15 @@ switch before dumping core</td></tr>
 <tr class="odd"><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
 <tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
 a DAV resource</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
+<var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Parameters for database connection</td></tr>
+<tr><td><a href="mod_dbd.html#dbdpersist">DBDPersist 0|1</a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL <var>"SQL statement"</var> <var>label</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Define an SQL prepared statement</td></tr>
+<tr><td><a href="mod_dbd.html#dbdriver">DBDriver <var>name</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Specify an SQL driver</td></tr>
 <tr class="odd"><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Icon to display for files when no specific icon is
 configured</td></tr>
 <tr><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets all files in the given scope to the specified
diff --git a/docs/manual/mod/quickreference.html.ja.euc-jp b/docs/manual/mod/quickreference.html.ja.euc-jp
index 521db43dbb..291dd26d61 100644
--- a/docs/manual/mod/quickreference.html.ja.euc-jp
+++ b/docs/manual/mod/quickreference.html.ja.euc-jp
@@ -237,6 +237,15 @@ processes</td></tr>
 <tr><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">DAV ¥í¥Ã¥¯¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î°ÌÃÖ</td></tr>
 <tr class="odd"><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬ DAV ¥ê¥½¡¼¥¹¤Î¥í¥Ã¥¯¤ò°Ý»ý¤¹¤ëºÇ¾®»þ´Ö¤Ç¤¹¡£
 </td></tr>
+<tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdparams">DBDParams
+<var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Parameters for database connection</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdpersist">DBDPersist 0|1</a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL <var>"SQL statement"</var> <var>label</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Define an SQL prepared statement</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdriver">DBDriver <var>name</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Specify an SQL driver</td></tr>
 <tr><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ÆÃÄê¤Î¥¢¥¤¥³¥ó¤¬²¿¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤»þ¤Ë
 ¥Õ¥¡¥¤¥ë¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td></td><td>svdh</td><td /></tr><tr class="odd"><td class="descr" colspan="4">¤¢¤ë¥¹¥³¡¼¥×¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤵ¤ì¤¿¸À¸ì¤Ë
diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr
index 2347041d11..8a2b1ac638 100644
--- a/docs/manual/mod/quickreference.html.ko.euc-kr
+++ b/docs/manual/mod/quickreference.html.ko.euc-kr
@@ -224,6 +224,15 @@ switch before dumping core</td></tr>
 <tr class="odd"><td><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB <var>file-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
 <tr><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">DAV Àá±Ý µ¥ÀÌÅͺ£À̽º À§Ä¡</td></tr>
 <tr class="odd"><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¼­¹ö°¡ DAV ÀÚ¿ø¿¡ ´ëÇØ À¯ÁöÇÒ Àá±ÝÀÇ Ãּҽð£</td></tr>
+<tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdparams">DBDParams
+<var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Parameters for database connection</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdpersist">DBDPersist 0|1</a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL <var>"SQL statement"</var> <var>label</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Define an SQL prepared statement</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdriver">DBDriver <var>name</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Specify an SQL driver</td></tr>
 <tr><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ƯÁ¤ ¾ÆÀÌÄÜÀ» ¼³Á¤ÇÏÁö¾ÊÀº ÆÄÀÏ¿¡ »ç¿ëÇÒ ¾ÆÀÌÄÜ</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets all files in the given scope to the specified
 language</td></tr>
diff --git a/docs/manual/sitemap.html.de b/docs/manual/sitemap.html.de
index eb8fb17ba5..38212a1abb 100644
--- a/docs/manual/sitemap.html.de
+++ b/docs/manual/sitemap.html.de
@@ -186,6 +186,7 @@ HPUX betreiben</a></li>
 <li><a href="mod/mod_dav.html">Apache-Modul mod_dav</a></li>
 <li><a href="mod/mod_dav_fs.html">Apache-Modul mod_dav_fs</a></li>
 <li><a href="mod/mod_dav_lock.html">Apache-Modul mod_dav_lock</a></li>
+<li><a href="mod/mod_dbd.html">Apache-Modul mod_dbd</a></li>
 <li><a href="mod/mod_deflate.html">Apache-Modul mod_deflate</a></li>
 <li><a href="mod/mod_dir.html">Apache-Modul mod_dir</a></li>
 <li><a href="mod/mod_disk_cache.html">Apache-Modul mod_disk_cache</a></li>
diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index 400cbe3fed..b8dbb93805 100644
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -184,6 +184,7 @@ Server on HPUX</a></li>
 <li><a href="mod/mod_dav.html">Apache Module mod_dav</a></li>
 <li><a href="mod/mod_dav_fs.html">Apache Module mod_dav_fs</a></li>
 <li><a href="mod/mod_dav_lock.html">Apache Module mod_dav_lock</a></li>
+<li><a href="mod/mod_dbd.html">Apache Module mod_dbd</a></li>
 <li><a href="mod/mod_deflate.html">Apache Module mod_deflate</a></li>
 <li><a href="mod/mod_dir.html">Apache Module mod_dir</a></li>
 <li><a href="mod/mod_disk_cache.html">Apache Module mod_disk_cache</a></li>
diff --git a/docs/manual/sitemap.html.es b/docs/manual/sitemap.html.es
index c49f98929e..58c83b9c49 100644
--- a/docs/manual/sitemap.html.es
+++ b/docs/manual/sitemap.html.es
@@ -192,6 +192,7 @@ usados para describir las directivas de Apache</a></li>
 <li><a href="mod/mod_dav.html">Módulo Apache mod_dav</a></li>
 <li><a href="mod/mod_dav_fs.html">Módulo Apache mod_dav_fs</a></li>
 <li><a href="mod/mod_dav_lock.html">Módulo Apache mod_dav_lock</a></li>
+<li><a href="mod/mod_dbd.html">Módulo Apache mod_dbd</a></li>
 <li><a href="mod/mod_deflate.html">Módulo Apache mod_deflate</a></li>
 <li><a href="mod/mod_dir.html">Módulo Apache mod_dir</a></li>
 <li><a href="mod/mod_disk_cache.html">Módulo Apache mod_disk_cache</a></li>
diff --git a/docs/manual/sitemap.html.ja.euc-jp b/docs/manual/sitemap.html.ja.euc-jp
index cb97b03284..bfe85fc03c 100644
--- a/docs/manual/sitemap.html.ja.euc-jp
+++ b/docs/manual/sitemap.html.ja.euc-jp
@@ -183,6 +183,7 @@
 <li><a href="mod/mod_dav.html">Apache ¥â¥¸¥å¡¼¥ë mod_dav</a></li>
 <li><a href="mod/mod_dav_fs.html">Apache ¥â¥¸¥å¡¼¥ë mod_dav_fs</a></li>
 <li><a href="mod/mod_dav_lock.html">Apache ¥â¥¸¥å¡¼¥ë mod_dav_lock</a></li>
+<li><a href="mod/mod_dbd.html">Apache ¥â¥¸¥å¡¼¥ë mod_dbd</a></li>
 <li><a href="mod/mod_deflate.html">Apache ¥â¥¸¥å¡¼¥ë mod_deflate</a></li>
 <li><a href="mod/mod_dir.html">Apache ¥â¥¸¥å¡¼¥ë mod_dir</a></li>
 <li><a href="mod/mod_disk_cache.html">Apache ¥â¥¸¥å¡¼¥ë mod_disk_cache</a></li>
diff --git a/docs/manual/sitemap.html.ko.euc-kr b/docs/manual/sitemap.html.ko.euc-kr
index 9fd1e94cd3..5e2248ec80 100644
--- a/docs/manual/sitemap.html.ko.euc-kr
+++ b/docs/manual/sitemap.html.ko.euc-kr
@@ -190,6 +190,7 @@
 <li><a href="mod/mod_dav.html">¾ÆÆÄÄ¡ ¸ðµâ mod_dav</a></li>
 <li><a href="mod/mod_dav_fs.html">¾ÆÆÄÄ¡ ¸ðµâ mod_dav_fs</a></li>
 <li><a href="mod/mod_dav_lock.html">¾ÆÆÄÄ¡ ¸ðµâ mod_dav_lock</a></li>
+<li><a href="mod/mod_dbd.html">¾ÆÆÄÄ¡ ¸ðµâ mod_dbd</a></li>
 <li><a href="mod/mod_deflate.html">¾ÆÆÄÄ¡ ¸ðµâ mod_deflate</a></li>
 <li><a href="mod/mod_dir.html">¾ÆÆÄÄ¡ ¸ðµâ mod_dir</a></li>
 <li><a href="mod/mod_disk_cache.html">¾ÆÆÄÄ¡ ¸ðµâ mod_disk_cache</a></li>
diff --git a/docs/manual/upgrading.html.de b/docs/manual/upgrading.html.de
index b8d90560d5..ec749e137a 100644
--- a/docs/manual/upgrading.html.de
+++ b/docs/manual/upgrading.html.de
@@ -5,7 +5,7 @@
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>Upgrade von 1.3 auf 2.0 - Apache HTTP Server</title>
+<title>Upgrade von 2.0 auf 2.1 - Apache HTTP Server</title>
 <link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
@@ -16,7 +16,7 @@
 <img alt="" src="./images/feather.gif" /></div>
 <div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP-Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> &gt; <a href="./">Version 2.1</a></div><div id="page-content"><div id="preamble"><h1>Upgrade von 1.3 auf 2.0</h1>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP-Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> &gt; <a href="./">Version 2.1</a></div><div id="page-content"><div id="preamble"><h1>Upgrade von 2.0 auf 2.1</h1>
 <div class="toplang">
 <p><span>Verfügbare Sprachen: </span><a href="./de/upgrading.html" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
@@ -26,16 +26,18 @@
 <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
 <a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div>
-<div class="outofdate">Diese Übersetzung ist möglicherweise
-            nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
-            die neuesten Änderungen.</div>
 
-    <p>Dieses Dokument dient der Unterstützung beim Upgrade. Es
+  <p>Dieses Dokument dient der Unterstützung beim Upgrade. Es
     enthält die entscheidenden Informationen für bisherige
     Apache-Nutzer. Diese sind als kurze Anmerkungen
     gedacht. Weitere Informationen finden Sie entweder unter
-    <a href="new_features_2_0.html">Neue Funktionen</a> oder in
+    <a href="new_features_2_2.html">Neue Funktionen</a> oder in
     den <code>src/CHANGES</code>-Dateien.</p>
+
+  <p>Dieses Dokument beschreibt lediglich die Änderungen von Version
+    2.2 gegenüber Version 2.0. Wenn Sie ein Upgrade von Version 1.3
+    durchführen, sollten Sie auch <a href="http://httpd.apache.org/docs-2.0/upgrading.html">Upgrade von 1.3
+    auf 2.0</a> zu Rate ziehen.</p>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">Änderungen der Konfiguration bei der Kompilierung</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#run-time">Änderungen der Laufzeit-Konfiguration</a></li>
@@ -48,174 +50,51 @@
 <h2><a name="compile-time" id="compile-time">Änderungen der Konfiguration bei der Kompilierung</a></h2>
     
 
-    <ul>
-      <li>Der Apache benutzt jetzt ein <code>autoconf</code>- und
-      <code>libtool</code>-System zur <a href="install.html">Konfiguration des
-      Erstellungsverfahrens</a>. Die Verwendung dieses Systems ist
-      ähnlich, aber nicht identisch mit dem APACI-System des
-	  Apache 1.3.</li>
-
-      <li>Zusätzlich zu der üblichen Auswahl von Modulen, die
-      kompiliert werden sollen, wurde der Hauptteil der
-      Request-Verarbeitung im Apache 2.0 in die <a href="mpm.html">
-      Multi-Processing-Module</a> (MPMs) verschoben.</li>
-    </ul>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="run-time" id="run-time">Änderungen der Laufzeit-Konfiguration</a></h2>
     
 
     <ul>
-      <li>Viele Anweisungen aus dem Serverkern des Apache 1.3 sind
-      jetzt in den MPMs enthalten. Wenn Sie ein Serververhalten
-      wünschen, das demjenigen des Apache 1.3 möglichst
-      ähnlich ist, sollten Sie das <code class="module"><a href="./mod/prefork.html">prefork</a></code>-MPM
-      auswählen. Andere MPMs verwenden abweichende Anweisungen
-      für die Prozess-Erstellung und Request-Verarbeitung.</li>
-
-      <li>Das <a href="mod/mod_proxy.html">Proxy-Modul</a> wurde
-      umgearbeitet, um es auf den Stand von HTTP/1.1 zu bringen. Eine
-      der bedeutendsten Änderungen ist die Platzierung der
-      Proxy-Zugriffskontrolle innerhalb eines <code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>-Blocks, statt innerhalb eines
-      <code>&lt;Directory proxy:&gt;</code>-Blocks.</li>
-
-      <li>Die Behandlung von <code>PATH_INFO</code> (hinter dem
-      tatsächlichen Dateinamen angefügte Pfadangaben) wurde
-      für einige Module geändert. Module, die bisher als Handler
-      implementiert waren, jetzt aber als Filter implementiert sind,
-      akzeptieren möglicherweise keine Requests mit
-      <code>PATH_INFO</code> mehr. Filter wie <a href="mod/mod_include.html">INCLUDES</a> oder <a href="http://www.php.net/">PHP</a> sind gleich oben im
-      Core-Handler implementiert und weisen deshalb Requests mit
-      <code>PATH_INFO</code> ab. Sie können die <code class="directive"><a href="./mod/core.html#acceptpathinfo">AcceptPathInfo</a></code>-Direktive
-      verwenden, um den Core-Handler zu zwingen, Requests mit
-      <code>PATH_INFO</code> zu akzeptieren, und dadurch die Fähigkeit
-      wiederherstellen, <code>PATH_INFO</code> in Server Side Includes zu
-      benutzen.</li>
-
-      <li>Die <code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code>-Direktive
-      hat jetzt das Argument an (<code>on</code>) oder aus
-      (<code>off</code>). Die vorhandenen Anweisungen <code class="directive">CacheNegotiatedDocs</code> sollten durch
-      <code>CacheNegotiatedDocs on</code> ersetzt werden.</li>
-
-      <li>
-        Die <code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code>-Direktive
-        verwendet kein Anführungszeichen mehr am Anfang des
-        Arguments, um eine
-        Textnachricht anzuzeigen. Stattdessen sollten Sie die
-        Nachricht in doppelte Anführungszeichen einschließen.
-        Zum Beispiel sollten existierende Angaben wie
-
-        <div class="example"><p><code>
-          ErrorDocument 403 "Eine Nachricht
-        </code></p></div>
-        durch
-
-        <div class="example"><p><code>
-          ErrorDocument 403 "Eine Nachricht"
-        </code></p></div>
-
-        ersetzt werden.
-        Solange das zweite Argument kein gültiger URL oder
-        Pfadname ist, wird es als Textnachricht behandelt.
+      <li>Die mit dem Apache HTTP Server ausgelieferte Konfigurationsdatei
+        <code>httpd.conf</code> wurde stark vereinfacht, indem alle außer
+        den unbedingt notwendigen Konfigurationseinstellungen entfernt wurden.
+        Im <code>conf/extra/</code>-Verzeichnis Ihrer Installation finden Sie
+        eine Reihe von Konfigurationsbeispielen für erweiterte Funktionen.
       </li>
 
-      <li>Die Direktiven <code>AccessConfig</code> und
-      <code>ResourceConfig</code> sind entfallen.
-      Diese Direktiven können durch die <code class="directive"><a href="./mod/core.html#include">Include</a></code>-Direktive
-      ersetzt werden, die eine äquivalente Funktionalität besitzt.
-      Wenn Sie die Defaultwerte dieser Direktiven verwendet haben,
-      ohne sie in die Konfigurationsdateien einzufügen, müssen Sie
-      möglicherweise <code>Include conf/access.conf</code> und
-      <code>Include conf/srm.conf</code> zu Ihrer <code>httpd.conf</code>
-      hinzufügen. Um sicherzustellen, daß der Apache die
-      Konfigurationsdateien in der gleichen Reihenfolge liest, wie sie von
-      den älteren Direktiven impliziert wurde, sollten die <code class="directive"><a href="./mod/core.html#include">Include</a></code>-Direktiven ans Ende der
-      <code>httpd.conf</code> gestellt werden, wobei die Direktive für
-      <code>srm.conf</code> derjenigen für <code>access.conf</code>
-      vorangeht.</li>
-
-      <li>Die Direktiven <code>BindAddress</code> und <code>Port</code>
-      sind entfallen. Eine äquivalente Funktionalität wird von der
-      flexibleren Direktive  <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> bereitgestellt.</li>
-
-      <li>Im Apache 1.3 wurde die <code>Port</code>-Direktive außerdem
-      dazu verwendet, die Portnummer für
-      selbstreferenzierende URLs festzulegen.
-      Die neue <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>-Syntax
-      stellt das Apache-2.0-Äquivalent dar:
-      sie wurde dahingehend verändert, sowohl den Hostnamen
-      <em>als auch</em> die Portnummer für selbstreferenzierende URLs
-      in einer Direktive angeben zu können.</li>
-
-      <li>Die <code>ServerType</code>-Direktive entfällt.
-      Die Methode zum Bedienen der Requests wird nun durch die Auswahl
-      des MPM ermittelt. Derzeit ist kein MPM dafür bestimmt, von inetd
-      gestartet zu werden.</li>
-
-      <li>Die Module <code>mod_log_agent</code> und <code>
-      mod_log_referer</code>, welche die Direktiven <code>AgentLog</code>,
-      <code>RefererLog</code> und <code>RefererIgnore</code> bereitgestellt
-      hatten, wurden entfernt. Durch Verwendung der Direktive <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> aus mod_log_config
-      sind die Agent- und Refererlogs auch weiterhin verfügbar.</li>
-
-      <li>Die Direktiven <code>AddModule</code> und
-      <code>ClearModuleList</code> sind entfallen.
-      Diese Direktiven wurden benutzt, um sicherzustellen, daß die
-      Module in der richtigen Reihenfolge aktiviert werden können.
-      Die neue Apache 2.0 API erlaubt es Modulen, ihre Reihenfolge
-      explizit anzugeben, und macht diese Direktiven damit
-      überflüssig.</li>
-
-      <li>Die Direktive <code>FancyIndexing</code> wurde entfernt.
-      Die gleiche Funktionalität ist nun mit der Option
-      <code>FancyIndexing</code> der Direktive <code class="directive"><a href="./mod/mod_autoindex.html#indexoptions">IndexOptions</a></code> verfügbar.</li>
-
-      <li>Die von <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> bereitgestellte
-      Content-Negotiation-Technik MultiViews führt nun eine strengere
-      Dateierkennung durch. Es wird ausschließlich unter den
-      <em>aushandelbaren</em> Dateien gewählt. Das bisherige Verhalten
-      kann jedoch mit der Direktive <code class="directive"><a href="./mod/mod_mime.html#multiviewsmatch">MultiviewsMatch</a></code> wiederhergestellt
-      werden.</li>
-
-      <li>(<em>Ab Version 2.0.51</em>)
-        <p><code>ErrorHeader</code> war eine Fehlbenennung, weshalb die
-          Funktionalität dieser Direktive mit der
-          <code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code>-Anweisung
-          zusammengelegt wurde. Verwenden Sie stattdessen</p>
+      <li>Die <code class="program"><a href="./programs/apachectl.html">apachectl</a></code>-Option <code>startssl</code> gibt es
+        nicht mehr. Um SSL-Unterstützung zu aktivieren müssen Sie die
+        <code>httpd.conf</code> editieren und die entsprechenden
+        <code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code>-Anweisungen einfügen und
+        anschließend den Server mit <code>apachectl start</code> starten.
+        Eine Beispielkonfiguration zum Aktivieren von <code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code>
+        ist in <code>conf/extra/httpd-ssl.conf</code> enthalten.
+      </li>
 
-      <div class="example"><p><code>
-        Header always set foo bar
-      </code></p></div>
+      <li>Die Voreinstellung von <code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code> ist jetzt <code>Off</code>.
+        Wenn diese Anweisung nicht in Ihrer Konfigurationsdatei enthalten ist,
+        können Sie <code>UseCanonicalName On</code> einfügen, um das
+        bisherige Verhalten beizubehalten.
+      </li>
 
-      <p>um den gleichen Effekt zu erzielen.</p></li>
-</ul>
+      <li>Das Modul <code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code> reagiert nicht länger auf
+        Anfragen, solange nicht in der Konfigurationsdatei eine <code class="directive"><a href="./mod/mod_userdir.html#userdir">UserDir</a></code>-Anweisung enthalten ist, die
+        einen Verzeichnisnamen angibt. Fügen Sie Ihrer Konfigurationsdatei
+        die Anweisung <code>UserDir public_html</code> hinzu, um das
+        bisherige Verhalten wiederherzustellen.
+      </li>
+    </ul>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="misc" id="misc">Sonstige Änderungen</a></h2>
     
 
-    <ul>
-      <li>Das Modul <code class="module"><a href="./mod/mod_auth_digest.html">mod_auth_digest</a></code>, das im Apache 1.3
-      experimentellen Status hatte, ist nun ein Standardmodul.</li>
-
-      <li>Das Modul <code>mod_mmap_static</code>, das im Apache 1.3
-      experimentellen Status hatte, wurde durch das Modul <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code> ersetzt.</li>
-
-      <li>Die Distribution wurde komplett reorganisiert und enthält kein
-      unabhängiges <code>src</code>-Verzeichnis mehr. Stattdessen wurden
-      die Quellcodes logisch unterhalb des Hauptverzeichnisses der
-      Distribution angeordnet. Installationen des kompilierten Servers
-      sollten in ein separates Verzeichnis erfolgen.</li>
-    </ul>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="third-party" id="third-party">Module von Drittanbietern</a></h2>
     
 
-    <p>An der API des Apache 2.0 wurden umfassende Änderungen
-    vorgenommen. Bestehende Module, die für die Apache 1.3 API
-    entwickelt wurden, werden <strong>nicht</strong> ohne Modifikationen mit
-    der Version 2.0 des Apache zusammenarbeiten. Details sind in der <a href="developer/">Dokumentation für Entwickler</a> beschrieben.</p>
   </div></div>
 <div class="bottomlang">
 <p><span>Verfügbare Sprachen: </span><a href="./de/upgrading.html" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta
index f4c18ef596..f738d57345 100644
--- a/docs/manual/upgrading.xml.meta
+++ b/docs/manual/upgrading.xml.meta
@@ -6,7 +6,7 @@
   <relpath>.</relpath>
 
   <variants>
-    <variant outdated="yes">de</variant>
+    <variant>de</variant>
     <variant>en</variant>
     <variant htmlonly="yes">fr</variant>
     <variant outdated="yes">ja</variant>