From: Graham Leggett <minfrin@apache.org>
Date: Sat, 20 Nov 2010 15:48:51 +0000 (+0000)
Subject: Rename mod_disk_cache to mod_cache_disk within the documentation.
X-Git-Tag: 2.3.9~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f74bae2d51d6362168b267249583a67ae1cb60a;p=thirdparty%2Fapache%2Fhttpd.git

Rename mod_disk_cache to mod_cache_disk within the documentation.


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

diff --git a/docs/man/htcacheclean.8 b/docs/man/htcacheclean.8
index 69b23391601..f04b295a547 100644
--- a/docs/man/htcacheclean.8
+++ b/docs/man/htcacheclean.8
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "HTCACHECLEAN" 8 "2010-10-13" "Apache HTTP Server" "htcacheclean"
+.TH "HTCACHECLEAN" 8 "2010-11-20" "Apache HTTP Server" "htcacheclean"
 
 .SH NAME
 htcacheclean \- Clean up the disk cache
@@ -42,7 +42,7 @@ htcacheclean \- Clean up the disk cache
 .SH "SUMMARY"
  
 .PP
-htcacheclean is used to keep the size of mod_disk_cache's storage within a given size limit, or limit on inodes in use\&. This tool can run either manually or in daemon mode\&. When running in daemon mode, it sleeps in the background and checks the cache directory at regular intervals for cached content to be removed\&. You can stop the daemon cleanly by sending it a TERM or INT signal\&. When run manually, a once off check of the cache directory is made for cached content to be removed\&. If one or more URLs are specified, each URL will be deleted from the cache, if present\&.
+htcacheclean is used to keep the size of mod_cache_disk's storage within a given size limit, or limit on inodes in use\&. This tool can run either manually or in daemon mode\&. When running in daemon mode, it sleeps in the background and checks the cache directory at regular intervals for cached content to be removed\&. You can stop the daemon cleanly by sending it a TERM or INT signal\&. When run manually, a once off check of the cache directory is made for cached content to be removed\&. If one or more URLs are specified, each URL will be deleted from the cache, if present\&.
  
 
 .SH "OPTIONS"
diff --git a/docs/manual/caching.html.en b/docs/manual/caching.html.en
index 0e4d6d3894a..7d61b6a5341 100644
--- a/docs/manual/caching.html.en
+++ b/docs/manual/caching.html.en
@@ -24,7 +24,7 @@
 </div>
 
     <p>This document supplements the <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>,
-    <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>, <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code> and <a href="programs/htcacheclean.html">htcacheclean</a> reference documentation.
+    <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>, <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code> and <a href="programs/htcacheclean.html">htcacheclean</a> reference documentation.
     It describes how to use the Apache HTTP Server's caching features to accelerate web and 
     proxy serving, while avoiding common problems and misconfigurations.</p>
   </div>
@@ -47,7 +47,7 @@
     handling, both as an origin webserver and as a proxy.</p>
 
     <p><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> and its provider modules 
-    <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> 
+    <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> 
     provide intelligent, HTTP-aware caching. The content itself is stored
     in the cache, and mod_cache aims to honor all of the various HTTP
     headers and options that control the cachability of content. It can
@@ -82,7 +82,7 @@
 
     
     
-    <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code></li><li><code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code></li><li><code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li><li><code class="directive"><a href="./mod/mod_file_cache.html#cachefile">CacheFile</a></code></li><li><code class="directive"><a href="./mod/mod_file_cache.html#mmapfile">MMapFile</a></code></li><li><code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code></li><li><code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code></li><li><code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li><li><code class="directive"><a href="./mod/mod_file_cache.html#cachefile">CacheFile</a></code></li><li><code class="directive"><a href="./mod/mod_file_cache.html#mmapfile">MMapFile</a></code></li><li><code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code></li><li><code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code></li></ul></td></tr></table>
 
     <p>There are two main stages in <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> that can
     occur in the lifetime of a request. First, <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>
@@ -197,7 +197,7 @@
       changed in size or modification time. As such, even if httpd is
       caching local content, even expired content may still be served faster
       from the cache if it has not changed. As long as reading from the cache
-      store is faster than reading from the backend (e.g. <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> with memory disk
+      store is faster than reading from the backend (e.g. <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> with memory disk
       compared to reading from disk).</p> 
     
 
@@ -337,12 +337,12 @@ Vary: negotiate,accept-language,accept-charset
 
       <p>If the Apache user is compromised, for example through a flaw in
       a CGI process, it is possible that the cache may be targeted. When
-      using <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>, it is relatively easy to 
+      using <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>, it is relatively easy to 
       insert or modify a cached entity.</p>
 
       <p>This presents a somewhat elevated risk in comparison to the other 
       types of attack it is possible to make as the Apache user. If you are 
-      using <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> you should bear this in mind - 
+      using <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> you should bear this in mind - 
       ensure you upgrade httpd when security upgrades are announced and 
       run CGI processes as a non-Apache user using <a href="suexec.html">suEXEC</a> if possible.</p>
 
@@ -508,9 +508,9 @@ sys     0m0.000s</pre></div>
 <h2><a name="disk" id="disk">Disk-based Caching</a></h2>
     
 
-     <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li></ul></td></tr></table>
+     <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li></ul></td></tr></table>
        
-    <p><code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> provides a disk-based caching mechanism 
+    <p><code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> provides a disk-based caching mechanism 
     for <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>. This cache is intelligent and content will
     be served from the cache only as long as it is considered valid.</p>
 
@@ -531,7 +531,7 @@ CacheDirLength 1</pre></div>
     <h3>Understanding the Cache-Store</h3>
       
 
-      <p>To store items in the cache, <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> creates
+      <p>To store items in the cache, <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> creates
       a 22 character hash of the URL being requested. This hash incorporates
       the hostname, protocol, port, path and any CGI arguments to the URL,
       to ensure that multiple URLs do not collide.</p>
@@ -541,13 +541,13 @@ CacheDirLength 1</pre></div>
       be hashed to <code>xyTGxSMO2b68mBCykqkp1w</code>. This hash is used
       as a prefix for the naming of the files specific to that URL within
       the cache, however first it is split up into directories as per
-      the <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code> and
-      <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code> 
+      the <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code> and
+      <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code> 
       directives.</p>
 
-      <p><code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code> 
+      <p><code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code> 
       specifies how many levels of subdirectory there should be, and
-      <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code>
+      <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code>
       specifies how many characters should be in each directory. With
       the example settings given above, the hash would be turned into
       a filename prefix as 
@@ -557,15 +557,15 @@ CacheDirLength 1</pre></div>
       subdirectories or files that may be in a particular directory,
       as most file-systems slow down as this number increases. With
       setting of "1" for 
-      <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code>
+      <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code>
       there can at most be 64 subdirectories at any particular level. 
       With a setting of 2 there can be 64 * 64 subdirectories, and so on.
       Unless you have a good reason not to, using a setting of "1"
-      for <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code>
+      for <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code>
       is recommended.</p>
 
       <p>Setting 
-      <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code>
+      <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code>
       depends on how many files you anticipate to store in the cache.
       With the setting of "2" used in the above example, a grand
       total of 4096 subdirectories can ultimately be created. With
@@ -586,7 +586,7 @@ CacheDirLength 1</pre></div>
     <h3>Maintaining the Disk Cache</h3>
       
     
-      <p>Although <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> will remove cached content
+      <p>Although <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> will remove cached content
       as it is expired, it does not maintain any information on the total
       size of the cache or how little free space may be left.</p>
 
@@ -608,7 +608,7 @@ CacheDirLength 1</pre></div>
       <a id="figure1" name="figure1"><dfn>Figure 1</dfn></a>: Typical
       cache growth / clean sequence.</p>
 
-      <p>Because <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> does not itself pay attention
+      <p>Because <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> does not itself pay attention
       to how much space is used you should ensure that 
       <a href="programs/htcacheclean.html">htcacheclean</a> is configured to 
       leave enough "grow room" following a clean.</p>
diff --git a/docs/manual/caching.html.fr b/docs/manual/caching.html.fr
index 7cb96f0d22a..d59e1529753 100644
--- a/docs/manual/caching.html.fr
+++ b/docs/manual/caching.html.fr
@@ -24,7 +24,7 @@
 </div>
 
     <p>Ce document complète la documentation de référence des modules
-    <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>,
+    <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>,
     <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code> et du programme <a href="programs/htcacheclean.html">htcacheclean</a>.
     Il décrit l'utilisation des fonctionnalités de mise en
     cache du serveur HTTP Apache
@@ -52,7 +52,7 @@
     que comme mandataire.</p>
 
     <p>Le module <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> et son module de soutien
-    <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>
+    <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>
     permettent une mise en cache intelligente du point de vue HTTP.
     Le contenu proprement dit est stocké dans le cache,
     et mod_cache tente d'honorer tous les en-têtes HTTP et les options
@@ -95,7 +95,7 @@
 
     
 
-    <table class="related"><tr><th>Modules Apparentés</th><th>Directives Apparentées</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code></li><li><code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code></li><li><code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li><li><code class="directive"><a href="./mod/mod_file_cache.html#cachefile">CacheFile</a></code></li><li><code class="directive"><a href="./mod/mod_file_cache.html#mmapfile">MMapFile</a></code></li><li><code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code></li><li><code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>Modules Apparentés</th><th>Directives Apparentées</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code></li><li><code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li><li><code class="directive"><a href="./mod/mod_file_cache.html#cachefile">CacheFile</a></code></li><li><code class="directive"><a href="./mod/mod_file_cache.html#mmapfile">MMapFile</a></code></li><li><code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code></li><li><code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code></li></ul></td></tr></table>
 
     <p><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> peut faire intervenir deux phases
     principales pendant la durée de vie d'une requête.
@@ -226,7 +226,7 @@
       depuis le cache s'il n'a pas été modifié, parce que la lecture depuis le
       cache est plus rapide que la lecture depuis le processus en arrière-plan
       (à comparer à la différence de vitesse entre la lecture depuis un cache en
-      mémoire avec <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> et la lecture depuis un disque).</p>
+      mémoire avec <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> et la lecture depuis un disque).</p>
     
 
     <h3>Que peut-on mettre en cache ?</h3>
@@ -386,11 +386,11 @@ Vary: negotiate,accept-language,accept-charset
       faille de sécurité dans un processus CGI, il est possible que le cache
       fasse l'objet d'une attaque. Il est relativement aisé d'insérer ou de
       modifier une entité dans le cache en utilisant le module
-      <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>.</p>
+      <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>.</p>
 
       <p>Cela représente un risque relativement élévé par rapport aux autres
       types d'attaques qu'il est possible de mener sous l'utilisateur apache.
-      Si vous utilisez <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>, vous devez garder ceci
+      Si vous utilisez <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>, vous devez garder ceci
       à l'esprit : effectuez toujours les mises à jour de
       httpdquand des
       correctifs de sécurité sont annoncés et exécutez les processus CGI sous
@@ -591,9 +591,9 @@ sys     0m0.000s</pre></div>
 <h2><a name="disk" id="disk">Mise en cache sur disque</a></h2>
     
 
-     <table class="related"><tr><th>Modules Apparentés</th><th>Directives Apparentées</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li></ul></td></tr></table>
+     <table class="related"><tr><th>Modules Apparentés</th><th>Directives Apparentées</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li></ul></td></tr></table>
 
-    <p>Le module <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> fournit un mécanisme de mise
+    <p>Le module <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> fournit un mécanisme de mise
     en cache sur disque au module <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>. Cette mise en cache est
     intelligente et le contenu ne sera servi qu'à partir du cache tant qu'il
     sera considéré comme valide.</p>
@@ -617,7 +617,7 @@ CacheDirLength 1</pre></div>
       
 
       <p>Pour stocker des entités dans le cache,
-      le module <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> crée une empreinte (hash) de 22
+      le module <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> crée une empreinte (hash) de 22
       caractères de l'URL qui a fait l'objet d'une requête. Cette empreinte
       comprend le nom d'hôte, le protocole, le port, le chemin et tout argument
       de type CGI associé à l'URL, afin d'être sur que plusieurs URLs
@@ -630,13 +630,13 @@ CacheDirLength 1</pre></div>
       utilisée pour préfixer les noms de fichiers spécifiques à cette URL à
       l'intérieur du cache; cependant, elle est tout d'abord placée dans les
       répertoires du cache selon les directives
-      <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code> et
-      <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code>.</p>
+      <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code> et
+      <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code>.</p>
 
       <p>La directive
-      <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code>
+      <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code>
       définit le nombre de niveaux de sous-répertoires, et
-      <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code>
+      <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code>
       le nombre de caractères composant le nom des sous-répertoires. Dans
       l'exemple donné plus haut, l'empreinte se trouvera à :
       <code>/var/cache/apache/x/y/TGxSMO2b68mBCykqkp1w</code>.</p>
@@ -645,16 +645,16 @@ CacheDirLength 1</pre></div>
       sous-répertoires ou de fichiers contenus dans un répertoire particulier,
       car le fonctionnement de la plupart des systèmes de fichiers est ralenti
       quand ce nombre augmente. Avec la valeur "1" pour la directive
-      <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code>,
+      <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code>,
       il peut y avoir au plus 64 sous-répertoires à un niveau quelconque.
       Avec la valeur "2", il peut y en avoir 64 * 64, etc...
       A moins d'avoir une bonne raison pour ne pas le faire, l'utilisation de
       la valeur "1" pour la directive
-      <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code>
+      <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code>
       est recommandée.</p>
 
       <p>Le paramétrage de la directive
-      <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code>
+      <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code>
       dépend du nombre de fichiers que vous pensez stocker dans le cache.
       Avec une valeur de "2" comme dans l'exemple donné plus haut,
       4096 sous-répertoires peuvent être créés au total. Avec 1 million de
@@ -675,7 +675,7 @@ CacheDirLength 1</pre></div>
     <h3>Maintenance du cache sur disque</h3>
       
 
-      <p>Bien que le module <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> supprime un contenu
+      <p>Bien que le module <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> supprime un contenu
       du cache lorsqu'il est arrivé à expiration, il ne maintient aucune
       information à propos de la taille totale du cache ou de l'espace restant
       disponible.</p>
@@ -702,7 +702,7 @@ CacheDirLength 1</pre></div>
       <a id="figure1" name="figure1"><dfn>Figure 1</dfn></a>: Croissance
       typique du cache / séquence de nettoyage.</p>
 
-      <p>Comme <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> ne tient pas compte de l'espace
+      <p>Comme <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> ne tient pas compte de l'espace
       utilisé dans le cache, vous devez vous assurer que
       <a href="programs/htcacheclean.html">htcacheclean</a> est configuré de
       façon à laisser suffisamment d'"espace de croissance"
diff --git a/docs/manual/caching.html.tr.utf8 b/docs/manual/caching.html.tr.utf8
index 0ddbc8b2c4e..30186fcdfbe 100644
--- a/docs/manual/caching.html.tr.utf8
+++ b/docs/manual/caching.html.tr.utf8
@@ -25,7 +25,7 @@
 <div class="outofdate">Bu Ã§eviri gÃ¼ncel olmayabilir. Son deÄiÅiklikler iÃ§in Ä°ngilizce sÃ¼rÃ¼m geÃ§erlidir.</div>
 
     <p>Bu belge <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>,
-      <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>, <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code>
+      <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>, <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code>
       modÃ¼lleri ve <a href="programs/htcacheclean.html">htcacheclean</a>
       iÃ§in bir baÅvuru kÄ±lavuzu niteliÄindedir. HTTP sunucusu ve vekil
       olarak Ã§alÄ±Åmada iÅlemleri hÄ±zlandÄ±rmak iÃ§in bilinen sorunlar ve
@@ -52,7 +52,7 @@
       gÃ¼Ã§ katarlar.</p>
 
     <p><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, ortam saÄlayÄ±cÄ± modÃ¼lÃ¼ olan
-      <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> ile birlikte HTTP Ã¶nbelleklemesini
+      <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> ile birlikte HTTP Ã¶nbelleklemesini
       akÄ±llÄ±ca yerine getirir. Ä°Ã§eriÄin kendisi Ã¶nbellekte saklanÄ±rken
       <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> iÃ§eriÄin Ã¶nbelleklenebilmesini denetim
       altÄ±nda tutan HTTP baÅlÄ±klarÄ± ve seÃ§enekleri ile ilgilenir. Yerel ve
@@ -89,7 +89,7 @@
 
     
 
-    <table class="related"><tr><th>Ä°lgili ModÃ¼ller</th><th>Ä°lgili YÃ¶nergeler</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code></li><li><code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code></li><li><code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li><li><code class="directive"><a href="./mod/mod_file_cache.html#cachefile">CacheFile</a></code></li><li><code class="directive"><a href="./mod/mod_file_cache.html#mmapfile">MMapFile</a></code></li><li><code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code></li><li><code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>Ä°lgili ModÃ¼ller</th><th>Ä°lgili YÃ¶nergeler</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code></li><li><code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li><li><code class="directive"><a href="./mod/mod_file_cache.html#cachefile">CacheFile</a></code></li><li><code class="directive"><a href="./mod/mod_file_cache.html#mmapfile">MMapFile</a></code></li><li><code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code></li><li><code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code></li></ul></td></tr></table>
 
     <p>Bir istek sonuÃ§lanÄ±ncaya kadar <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> modÃ¼lÃ¼nde iki
       aÅamadan geÃ§er. Ä°lkinde <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> bir URL eÅleme modÃ¼lÃ¼
@@ -342,12 +342,12 @@
 
       <p>EÄer Apache kullanÄ±cÄ±sÄ±, Ã¶rneÄin bir CGI sÃ¼recindeki aÃ§Ä±k nedeniyle
         tehlikeye atÄ±lÄ±rsa, Ã¶nbellek hedef alÄ±nabilir.
-        <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> kullanÄ±lÄ±rken Ã¶nbellekteki bir Ã¶Äeyi
+        <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> kullanÄ±lÄ±rken Ã¶nbellekteki bir Ã¶Äeyi
         deÄiÅtirmek veya Ã¶nbelleÄe yeni bir Ã¶Äe eklemek gÃ¶rece daha
         kolaydÄ±r.</p>
 
       <p>Bu risk, Apache kullanÄ±cÄ±sÄ±nÄ± kullanan diÄer saldÄ±rÄ± tÃ¼rleriyle
-        karÅÄ±laÅtÄ±rÄ±ldÄ±ÄÄ±nda daha yÃ¼ksektir. <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>
+        karÅÄ±laÅtÄ±rÄ±ldÄ±ÄÄ±nda daha yÃ¼ksektir. <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>
         kullanÄ±yorsanÄ±z ÅunlarÄ± aklÄ±nÄ±zdan Ã§Ä±karmayÄ±n: (1) httpd gÃ¼venlik
         gÃ¼ncellemelerini takip edin ve sunucunuzu buna gÃ¶re gÃ¼ncelleyin. (2)
         MÃ¼mkÃ¼nse <a href="suexec.html">suEXEC</a> kullanarak CGI sÃ¼reÃ§lerini
@@ -521,9 +521,9 @@
 <h2><a name="disk" id="disk">Disk Ãzerinde Ãnbellekleme</a></h2>
     
 
-     <table class="related"><tr><th>Ä°lgili ModÃ¼ller</th><th>Ä°lgili YÃ¶nergeler</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li></ul></td></tr></table>
+     <table class="related"><tr><th>Ä°lgili ModÃ¼ller</th><th>Ä°lgili YÃ¶nergeler</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li></ul></td></tr></table>
 
-    <p><code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> modÃ¼lÃ¼ Ã¶nbelleklemenin
+    <p><code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> modÃ¼lÃ¼ Ã¶nbelleklemenin
       <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> iÃ§in disk Ã¼zerinde yapÄ±lmasÄ±nÄ± mÃ¼mkÃ¼n
       kÄ±lar. Bbu Ã¶nbellekleme akÄ±llÄ±ca yapÄ±lÄ±r ve Ã¶nbellekteki iÃ§erik
       sadece geÃ§erli kabul edildiÄi sÃ¼rece sunulabilir.</p>
@@ -546,7 +546,7 @@
     <h3>Ãnbellekte SaklamanÄ±n AnlamÄ±</h3>
       
 
-      <p><code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> Ã¶Äeleri Ã¶nbellekte saklamak iÃ§in
+      <p><code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> Ã¶Äeleri Ã¶nbellekte saklamak iÃ§in
         istek yapÄ±lan URLânin 22 karakterlik Ã¶zetini oluÅturur. Bu Ã¶zet, Ã§ok
         sayÄ±da URLânin aynÄ± Ã¶zeti oluÅturmamasÄ± iÃ§in konak ismi, protokol,
         port ve varsa CGI argÃ¼manlarÄ±ndan oluÅur.</p>
@@ -556,10 +556,10 @@
         ÃrneÄin, bir URLânin <code>xyTGxSMO2b68mBCykqkp1w</code> gibi bir
         Ã¶zeti olabilir. Bu Ã¶zet, bu URL ile eriÅilen dosyalar Ã¶nbellek iÃ§inde
         saklanÄ±rken dosya ismi Ã¶neki olarak kullanÄ±lÄ±r. Ancak bununla
-        yetinilmez ve iÃ§erik <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code> ve <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code> yÃ¶nergelerinin
+        yetinilmez ve iÃ§erik <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code> ve <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code> yÃ¶nergelerinin
         deÄerlerine gÃ¶re Ã¶nce dizinlere ayrÄ±lÄ±r.</p>
 
-      <p><code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code>
+      <p><code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code>
         yÃ¶nergesi kaÃ§ alt seviye dizin olacaÄÄ±nÄ± belirler. ÃrneÄin, yukarÄ±daki
         Ã¶zete sahip bir dosyanÄ±n isminin baÅÄ±na yukarÄ±daki yapÄ±landÄ±rma
         Ã¶rneÄine uygun olarak
@@ -569,14 +569,14 @@
       <p>Bu tekniÄin asÄ±l amacÄ± belli bir dizin iÃ§inde bulunabilecek
         dosyalarÄ±n ve alt dizinlerin sayÄ±sÄ±nÄ± dÃ¼ÅÃ¼k tutmaktÄ±r. Bu sayÄ±nÄ±n
         bÃ¼yÃ¼k olmasÄ± Ã§oÄu iÅletim sisteminde baÅarÄ±mÄ±n dÃ¼Åmesine sebep olur.
-        <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code>
+        <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code>
         yÃ¶nergesi "1" deÄeriyle kullanÄ±ldÄ±ÄÄ±nda her dizin altÄ±nda en fazla 64
         alt dizin veya dosya aÃ§Ä±labilir. "2" deÄeriyle kullanÄ±ldÄ±ÄÄ±nda ise bu
         sayÄ± 64^2âye yÃ¼kselir ve bÃ¶yle artarak gider. Ä°yi bir sebebiniz
-        olmadÄ±kÃ§a <code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code> iÃ§in deÄer olarak
+        olmadÄ±kÃ§a <code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code> iÃ§in deÄer olarak
         "1" belirtmenizi Ã¶neririz.</p>
 
-      <p><code class="directive"><a href="./mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code>
+      <p><code class="directive"><a href="./mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code>
         yÃ¶nergesine atanacak deÄer Ã¶nbellekte saklamayÄ± dÃ¼ÅÃ¼ndÃ¼ÄÃ¼nÃ¼z olasÄ±
         dosya sayÄ±sÄ± ile ilgilidir. YukarÄ±daki Ã¶rnekte olduÄu gibi "2"
         deÄerini belirtirseniz, toplamda en fazla 4096 dizin oluÅturulabilir.
@@ -595,7 +595,7 @@
     <h3>Disk ÃnbelleÄinin BakÄ±mÄ±</h3>
       
 
-      <p><code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> zaman aÅÄ±mÄ±na uÄrayan Ã¶nbellekli
+      <p><code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> zaman aÅÄ±mÄ±na uÄrayan Ã¶nbellekli
         iÃ§eriÄi silse de Ã¶nbelleÄin toplam boyu ve ne kadar boÅ bellek kaldÄ±ÄÄ±
         hakkÄ±nda bilgi vermez.</p>
 
@@ -620,7 +620,7 @@
       <a id="figure1" name="figure1"><dfn>Åekil 1</dfn></a>:
  ÃnbelleÄin bÃ¼yÃ¼mesi ve dÃ¼zenli aralÄ±klarla temizlenmesi.</p>
 
-      <p><code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> ne kadar Ã¶nbellek alanÄ± kullandÄ±ÄÄ±
+      <p><code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> ne kadar Ã¶nbellek alanÄ± kullandÄ±ÄÄ±
         ile ilgili bir bilgi vermediÄinden <code class="program"><a href="./programs/htcacheclean.html">htcacheclean</a></code>âin
         bir temizlik sonrasÄ± yeterince bÃ¼yÃ¼k bir geniÅleme alanÄ± kalacak
         Åekilde yapÄ±landÄ±rÄ±lmasÄ± Ã¶nemlidir.</p>
diff --git a/docs/manual/caching.xml b/docs/manual/caching.xml
index a77b73debfa..933be6eaf0f 100644
--- a/docs/manual/caching.xml
+++ b/docs/manual/caching.xml
@@ -26,7 +26,7 @@
 
   <summary>
     <p>This document supplements the <module>mod_cache</module>,
-    <module>mod_disk_cache</module>, <module>mod_file_cache</module> and <a 
+    <module>mod_cache_disk</module>, <module>mod_file_cache</module> and <a 
     href="programs/htcacheclean.html">htcacheclean</a> reference documentation.
     It describes how to use the Apache HTTP Server's caching features to accelerate web and 
     proxy serving, while avoiding common problems and misconfigurations.</p>
@@ -42,7 +42,7 @@
     handling, both as an origin webserver and as a proxy.</p>
 
     <p><module>mod_cache</module> and its provider modules 
-    <module>mod_disk_cache</module> 
+    <module>mod_cache_disk</module> 
     provide intelligent, HTTP-aware caching. The content itself is stored
     in the cache, and mod_cache aims to honor all of the various HTTP
     headers and options that control the cachability of content. It can
@@ -82,7 +82,7 @@
     <related>
       <modulelist>
         <module>mod_cache</module>
-        <module>mod_disk_cache</module>
+        <module>mod_cache_disk</module>
         <module>mod_file_cache</module>
       </modulelist>
       <directivelist>
@@ -213,7 +213,7 @@
       caching local content, even expired content may still be served faster
       from the cache if it has not changed. As long as reading from the cache
       store is faster than reading from the backend (e.g. <module
-      >mod_disk_cache</module> with memory disk
+      >mod_cache_disk</module> with memory disk
       compared to reading from disk).</p> 
     </section>
 
@@ -355,12 +355,12 @@ Vary: negotiate,accept-language,accept-charset
 
       <p>If the Apache user is compromised, for example through a flaw in
       a CGI process, it is possible that the cache may be targeted. When
-      using <module>mod_disk_cache</module>, it is relatively easy to 
+      using <module>mod_cache_disk</module>, it is relatively easy to 
       insert or modify a cached entity.</p>
 
       <p>This presents a somewhat elevated risk in comparison to the other 
       types of attack it is possible to make as the Apache user. If you are 
-      using <module>mod_disk_cache</module> you should bear this in mind - 
+      using <module>mod_cache_disk</module> you should bear this in mind - 
       ensure you upgrade httpd when security upgrades are announced and 
       run CGI processes as a non-Apache user using <a 
       href="suexec.html">suEXEC</a> if possible.</p>
@@ -550,7 +550,7 @@ sys     0m0.000s</pre>
 
      <related>
       <modulelist>
-        <module>mod_disk_cache</module>
+        <module>mod_cache_disk</module>
       </modulelist>
       <directivelist>
         <directive module="mod_cache">CacheEnable</directive>
@@ -558,7 +558,7 @@ sys     0m0.000s</pre>
       </directivelist>
     </related>
        
-    <p><module>mod_disk_cache</module> provides a disk-based caching mechanism 
+    <p><module>mod_cache_disk</module> provides a disk-based caching mechanism 
     for <module>mod_cache</module>. This cache is intelligent and content will
     be served from the cache only as long as it is considered valid.</p>
 
@@ -581,7 +581,7 @@ CacheDirLength 1</pre>
     <section>
       <title>Understanding the Cache-Store</title>
 
-      <p>To store items in the cache, <module>mod_disk_cache</module> creates
+      <p>To store items in the cache, <module>mod_cache_disk</module> creates
       a 22 character hash of the URL being requested. This hash incorporates
       the hostname, protocol, port, path and any CGI arguments to the URL,
       to ensure that multiple URLs do not collide.</p>
@@ -591,13 +591,13 @@ CacheDirLength 1</pre>
       be hashed to <code>xyTGxSMO2b68mBCykqkp1w</code>. This hash is used
       as a prefix for the naming of the files specific to that URL within
       the cache, however first it is split up into directories as per
-      the <directive module="mod_disk_cache">CacheDirLevels</directive> and
-      <directive module="mod_disk_cache">CacheDirLength</directive> 
+      the <directive module="mod_cache_disk">CacheDirLevels</directive> and
+      <directive module="mod_cache_disk">CacheDirLength</directive> 
       directives.</p>
 
-      <p><directive module="mod_disk_cache">CacheDirLevels</directive> 
+      <p><directive module="mod_cache_disk">CacheDirLevels</directive> 
       specifies how many levels of subdirectory there should be, and
-      <directive module="mod_disk_cache">CacheDirLength</directive>
+      <directive module="mod_cache_disk">CacheDirLength</directive>
       specifies how many characters should be in each directory. With
       the example settings given above, the hash would be turned into
       a filename prefix as 
@@ -607,15 +607,15 @@ CacheDirLength 1</pre>
       subdirectories or files that may be in a particular directory,
       as most file-systems slow down as this number increases. With
       setting of "1" for 
-      <directive module="mod_disk_cache">CacheDirLength</directive>
+      <directive module="mod_cache_disk">CacheDirLength</directive>
       there can at most be 64 subdirectories at any particular level. 
       With a setting of 2 there can be 64 * 64 subdirectories, and so on.
       Unless you have a good reason not to, using a setting of "1"
-      for <directive module="mod_disk_cache">CacheDirLength</directive>
+      for <directive module="mod_cache_disk">CacheDirLength</directive>
       is recommended.</p>
 
       <p>Setting 
-      <directive module="mod_disk_cache">CacheDirLevels</directive>
+      <directive module="mod_cache_disk">CacheDirLevels</directive>
       depends on how many files you anticipate to store in the cache.
       With the setting of "2" used in the above example, a grand
       total of 4096 subdirectories can ultimately be created. With
@@ -636,7 +636,7 @@ CacheDirLength 1</pre>
     <section>
       <title>Maintaining the Disk Cache</title>
     
-      <p>Although <module>mod_disk_cache</module> will remove cached content
+      <p>Although <module>mod_cache_disk</module> will remove cached content
       as it is expired, it does not maintain any information on the total
       size of the cache or how little free space may be left.</p>
 
@@ -662,7 +662,7 @@ CacheDirLength 1</pre>
       <a id="figure1" name="figure1"><dfn>Figure 1</dfn></a>: Typical
       cache growth / clean sequence.</p>
 
-      <p>Because <module>mod_disk_cache</module> does not itself pay attention
+      <p>Because <module>mod_cache_disk</module> does not itself pay attention
       to how much space is used you should ensure that 
       <a href="programs/htcacheclean.html">htcacheclean</a> is configured to 
       leave enough "grow room" following a clean.</p>
diff --git a/docs/manual/caching.xml.fr b/docs/manual/caching.xml.fr
index 646198ce6d0..956dc579333 100644
--- a/docs/manual/caching.xml.fr
+++ b/docs/manual/caching.xml.fr
@@ -28,7 +28,7 @@
 
   <summary>
     <p>Ce document compl&egrave;te la documentation de r&eacute;f&eacute;rence des modules
-    <module>mod_cache</module>, <module>mod_disk_cache</module>,
+    <module>mod_cache</module>, <module>mod_cache_disk</module>,
     <module>mod_file_cache</module> et du programme <a
     href="programs/htcacheclean.html">htcacheclean</a>.
     Il d&eacute;crit l'utilisation des fonctionnalit&eacute;s de mise en
@@ -49,7 +49,7 @@
     que comme mandataire.</p>
 
     <p>Le module <module>mod_cache</module> et son module de soutien
-    <module>mod_disk_cache</module>
+    <module>mod_cache_disk</module>
     permettent une mise en cache intelligente du point de vue HTTP.
     Le contenu proprement dit est stock&eacute; dans le cache,
     et mod_cache tente d'honorer tous les en-t&ecirc;tes HTTP et les options
@@ -97,7 +97,7 @@
     <related>
       <modulelist>
         <module>mod_cache</module>
-        <module>mod_disk_cache</module>
+        <module>mod_cache_disk</module>
         <module>mod_file_cache</module>
       </modulelist>
       <directivelist>
@@ -243,7 +243,7 @@
       depuis le cache s'il n'a pas &eacute;t&eacute; modifi&eacute;, parce que la lecture depuis le
       cache est plus rapide que la lecture depuis le processus en arri&egrave;re-plan
       (&agrave; comparer &agrave; la diff&eacute;rence de vitesse entre la lecture depuis un cache en
-      m&eacute;moire avec <module>mod_disk_cache</module> et la lecture depuis un disque).</p>
+      m&eacute;moire avec <module>mod_cache_disk</module> et la lecture depuis un disque).</p>
     </section>
 
     <section>
@@ -405,11 +405,11 @@ Vary: negotiate,accept-language,accept-charset
       faille de s&eacute;curit&eacute; dans un processus CGI, il est possible que le cache
       fasse l'objet d'une attaque. Il est relativement ais&eacute; d'ins&eacute;rer ou de
       modifier une entit&eacute; dans le cache en utilisant le module
-      <module>mod_disk_cache</module>.</p>
+      <module>mod_cache_disk</module>.</p>
 
       <p>Cela repr&eacute;sente un risque relativement &eacute;l&eacute;v&eacute; par rapport aux autres
       types d'attaques qu'il est possible de mener sous l'utilisateur apache.
-      Si vous utilisez <module>mod_disk_cache</module>, vous devez garder ceci
+      Si vous utilisez <module>mod_cache_disk</module>, vous devez garder ceci
       &agrave; l'esprit : effectuez toujours les mises &agrave; jour de
       httpdquand des
       correctifs de s&eacute;curit&eacute; sont annonc&eacute;s et ex&eacute;cutez les processus CGI sous
@@ -633,7 +633,7 @@ sys     0m0.000s</pre>
 
      <related>
       <modulelist>
-        <module>mod_disk_cache</module>
+        <module>mod_cache_disk</module>
       </modulelist>
       <directivelist>
         <directive module="mod_cache">CacheEnable</directive>
@@ -641,7 +641,7 @@ sys     0m0.000s</pre>
       </directivelist>
     </related>
 
-    <p>Le module <module>mod_disk_cache</module> fournit un m&eacute;canisme de mise
+    <p>Le module <module>mod_cache_disk</module> fournit un m&eacute;canisme de mise
     en cache sur disque au module <module>mod_cache</module>. Cette mise en cache est
     intelligente et le contenu ne sera servi qu'&agrave; partir du cache tant qu'il
     sera consid&eacute;r&eacute; comme valide.</p>
@@ -667,7 +667,7 @@ CacheDirLength 1</pre>
       <title>Comprendre le stockage dans le cache</title>
 
       <p>Pour stocker des entit&eacute;s dans le cache,
-      le module <module>mod_disk_cache</module> cr&eacute;e une empreinte (hash) de 22
+      le module <module>mod_cache_disk</module> cr&eacute;e une empreinte (hash) de 22
       caract&egrave;res de l'URL qui a fait l'objet d'une requ&ecirc;te. Cette empreinte
       comprend le nom d'h&ocirc;te, le protocole, le port, le chemin et tout argument
       de type CGI associ&eacute; &agrave; l'URL, afin d'&ecirc;tre sur que plusieurs URLs
@@ -680,13 +680,13 @@ CacheDirLength 1</pre>
       utilis&eacute;e pour pr&eacute;fixer les noms de fichiers sp&eacute;cifiques &agrave; cette URL &agrave;
       l'int&eacute;rieur du cache; cependant, elle est tout d'abord plac&eacute;e dans les
       r&eacute;pertoires du cache selon les directives
-      <directive module="mod_disk_cache">CacheDirLevels</directive> et
-      <directive module="mod_disk_cache">CacheDirLength</directive>.</p>
+      <directive module="mod_cache_disk">CacheDirLevels</directive> et
+      <directive module="mod_cache_disk">CacheDirLength</directive>.</p>
 
       <p>La directive
-      <directive module="mod_disk_cache">CacheDirLevels</directive>
+      <directive module="mod_cache_disk">CacheDirLevels</directive>
       d&eacute;finit le nombre de niveaux de sous-r&eacute;pertoires, et
-      <directive module="mod_disk_cache">CacheDirLength</directive>
+      <directive module="mod_cache_disk">CacheDirLength</directive>
       le nombre de caract&egrave;res composant le nom des sous-r&eacute;pertoires. Dans
       l'exemple donn&eacute; plus haut, l'empreinte se trouvera &agrave; :
       <code>/var/cache/apache/x/y/TGxSMO2b68mBCykqkp1w</code>.</p>
@@ -695,16 +695,16 @@ CacheDirLength 1</pre>
       sous-r&eacute;pertoires ou de fichiers contenus dans un r&eacute;pertoire particulier,
       car le fonctionnement de la plupart des syst&egrave;mes de fichiers est ralenti
       quand ce nombre augmente. Avec la valeur "1" pour la directive
-      <directive module="mod_disk_cache">CacheDirLength</directive>,
+      <directive module="mod_cache_disk">CacheDirLength</directive>,
       il peut y avoir au plus 64 sous-r&eacute;pertoires &agrave; un niveau quelconque.
       Avec la valeur "2", il peut y en avoir 64 * 64, etc...
       A moins d'avoir une bonne raison pour ne pas le faire, l'utilisation de
       la valeur "1" pour la directive
-      <directive module="mod_disk_cache">CacheDirLength</directive>
+      <directive module="mod_cache_disk">CacheDirLength</directive>
       est recommand&eacute;e.</p>
 
       <p>Le param&eacute;trage de la directive
-      <directive module="mod_disk_cache">CacheDirLevels</directive>
+      <directive module="mod_cache_disk">CacheDirLevels</directive>
       d&eacute;pend du nombre de fichiers que vous pensez stocker dans le cache.
       Avec une valeur de "2" comme dans l'exemple donn&eacute; plus haut,
       4096 sous-r&eacute;pertoires peuvent &ecirc;tre cr&eacute;&eacute;s au total. Avec 1 million de
@@ -725,7 +725,7 @@ CacheDirLength 1</pre>
     <section>
       <title>Maintenance du cache sur disque</title>
 
-      <p>Bien que le module <module>mod_disk_cache</module> supprime un contenu
+      <p>Bien que le module <module>mod_cache_disk</module> supprime un contenu
       du cache lorsqu'il est arriv&eacute; &agrave; expiration, il ne maintient aucune
       information &agrave; propos de la taille totale du cache ou de l'espace restant
       disponible.</p>
@@ -755,7 +755,7 @@ CacheDirLength 1</pre>
       <a id="figure1" name="figure1"><dfn>Figure 1</dfn></a>: Croissance
       typique du cache / s&eacute;quence de nettoyage.</p>
 
-      <p>Comme <module>mod_disk_cache</module> ne tient pas compte de l'espace
+      <p>Comme <module>mod_cache_disk</module> ne tient pas compte de l'espace
       utilis&eacute; dans le cache, vous devez vous assurer que
       <a href="programs/htcacheclean.html">htcacheclean</a> est configur&eacute; de
       fa&ccedil;on &agrave; laisser suffisamment d'"espace de croissance"
diff --git a/docs/manual/caching.xml.tr b/docs/manual/caching.xml.tr
index dec490c1b32..5e2ba2f4521 100644
--- a/docs/manual/caching.xml.tr
+++ b/docs/manual/caching.xml.tr
@@ -30,7 +30,7 @@
 
   <summary>
     <p>Bu belge <module>mod_cache</module>,
-      <module>mod_disk_cache</module>, <module>mod_file_cache</module>
+      <module>mod_cache_disk</module>, <module>mod_file_cache</module>
       modÃ¼lleri ve <a href="programs/htcacheclean.html">htcacheclean</a>
       iÃ§in bir baÅvuru kÄ±lavuzu niteliÄindedir. HTTP sunucusu ve vekil
       olarak Ã§alÄ±Åmada iÅlemleri hÄ±zlandÄ±rmak iÃ§in bilinen sorunlar ve
@@ -49,7 +49,7 @@
       gÃ¼Ã§ katarlar.</p>
 
     <p><module>mod_cache</module>, ortam saÄlayÄ±cÄ± modÃ¼lÃ¼ olan
-      <module>mod_disk_cache</module> ile birlikte HTTP Ã¶nbelleklemesini
+      <module>mod_cache_disk</module> ile birlikte HTTP Ã¶nbelleklemesini
       akÄ±llÄ±ca yerine getirir. Ä°Ã§eriÄin kendisi Ã¶nbellekte saklanÄ±rken
       <module>mod_cache</module> iÃ§eriÄin Ã¶nbelleklenebilmesini denetim
       altÄ±nda tutan HTTP baÅlÄ±klarÄ± ve seÃ§enekleri ile ilgilenir. Yerel ve
@@ -89,7 +89,7 @@
     <related>
       <modulelist>
         <module>mod_cache</module>
-        <module>mod_disk_cache</module>
+        <module>mod_cache_disk</module>
         <module>mod_file_cache</module>
       </modulelist>
       <directivelist>
@@ -360,12 +360,12 @@
 
       <p>EÄer Apache kullanÄ±cÄ±sÄ±, Ã¶rneÄin bir CGI sÃ¼recindeki aÃ§Ä±k nedeniyle
         tehlikeye atÄ±lÄ±rsa, Ã¶nbellek hedef alÄ±nabilir.
-        <module>mod_disk_cache</module> kullanÄ±lÄ±rken Ã¶nbellekteki bir Ã¶Äeyi
+        <module>mod_cache_disk</module> kullanÄ±lÄ±rken Ã¶nbellekteki bir Ã¶Äeyi
         deÄiÅtirmek veya Ã¶nbelleÄe yeni bir Ã¶Äe eklemek gÃ¶rece daha
         kolaydÄ±r.</p>
 
       <p>Bu risk, Apache kullanÄ±cÄ±sÄ±nÄ± kullanan diÄer saldÄ±rÄ± tÃ¼rleriyle
-        karÅÄ±laÅtÄ±rÄ±ldÄ±ÄÄ±nda daha yÃ¼ksektir. <module>mod_disk_cache</module>
+        karÅÄ±laÅtÄ±rÄ±ldÄ±ÄÄ±nda daha yÃ¼ksektir. <module>mod_cache_disk</module>
         kullanÄ±yorsanÄ±z ÅunlarÄ± aklÄ±nÄ±zdan Ã§Ä±karmayÄ±n: (1) httpd gÃ¼venlik
         gÃ¼ncellemelerini takip edin ve sunucunuzu buna gÃ¶re gÃ¼ncelleyin. (2)
         MÃ¼mkÃ¼nse <a href="suexec.html">suEXEC</a> kullanarak CGI sÃ¼reÃ§lerini
@@ -561,7 +561,7 @@
 
      <related>
       <modulelist>
-        <module>mod_disk_cache</module>
+        <module>mod_cache_disk</module>
       </modulelist>
       <directivelist>
         <directive module="mod_cache">CacheEnable</directive>
@@ -569,7 +569,7 @@
       </directivelist>
     </related>
 
-    <p><module>mod_disk_cache</module> modÃ¼lÃ¼ Ã¶nbelleklemenin
+    <p><module>mod_cache_disk</module> modÃ¼lÃ¼ Ã¶nbelleklemenin
       <module>mod_cache</module> iÃ§in disk Ã¼zerinde yapÄ±lmasÄ±nÄ± mÃ¼mkÃ¼n
       kÄ±lar. Bbu Ã¶nbellekleme akÄ±llÄ±ca yapÄ±lÄ±r ve Ã¶nbellekteki iÃ§erik
       sadece geÃ§erli kabul edildiÄi sÃ¼rece sunulabilir.</p>
@@ -592,7 +592,7 @@
     <section>
       <title>Ãnbellekte SaklamanÄ±n AnlamÄ±</title>
 
-      <p><module>mod_disk_cache</module> Ã¶Äeleri Ã¶nbellekte saklamak iÃ§in
+      <p><module>mod_cache_disk</module> Ã¶Äeleri Ã¶nbellekte saklamak iÃ§in
         istek yapÄ±lan URLânin 22 karakterlik Ã¶zetini oluÅturur. Bu Ã¶zet, Ã§ok
         sayÄ±da URLânin aynÄ± Ã¶zeti oluÅturmamasÄ± iÃ§in konak ismi, protokol,
         port ve varsa CGI argÃ¼manlarÄ±ndan oluÅur.</p>
@@ -603,11 +603,11 @@
         Ã¶zeti olabilir. Bu Ã¶zet, bu URL ile eriÅilen dosyalar Ã¶nbellek iÃ§inde
         saklanÄ±rken dosya ismi Ã¶neki olarak kullanÄ±lÄ±r. Ancak bununla
         yetinilmez ve iÃ§erik <directive
-        module="mod_disk_cache">CacheDirLevels</directive> ve <directive
-        module="mod_disk_cache">CacheDirLength</directive> yÃ¶nergelerinin
+        module="mod_cache_disk">CacheDirLevels</directive> ve <directive
+        module="mod_cache_disk">CacheDirLength</directive> yÃ¶nergelerinin
         deÄerlerine gÃ¶re Ã¶nce dizinlere ayrÄ±lÄ±r.</p>
 
-      <p><directive module="mod_disk_cache">CacheDirLevels</directive>
+      <p><directive module="mod_cache_disk">CacheDirLevels</directive>
         yÃ¶nergesi kaÃ§ alt seviye dizin olacaÄÄ±nÄ± belirler. ÃrneÄin, yukarÄ±daki
         Ã¶zete sahip bir dosyanÄ±n isminin baÅÄ±na yukarÄ±daki yapÄ±landÄ±rma
         Ã¶rneÄine uygun olarak
@@ -617,15 +617,15 @@
       <p>Bu tekniÄin asÄ±l amacÄ± belli bir dizin iÃ§inde bulunabilecek
         dosyalarÄ±n ve alt dizinlerin sayÄ±sÄ±nÄ± dÃ¼ÅÃ¼k tutmaktÄ±r. Bu sayÄ±nÄ±n
         bÃ¼yÃ¼k olmasÄ± Ã§oÄu iÅletim sisteminde baÅarÄ±mÄ±n dÃ¼Åmesine sebep olur.
-        <directive module="mod_disk_cache">CacheDirLength</directive>
+        <directive module="mod_cache_disk">CacheDirLength</directive>
         yÃ¶nergesi "1" deÄeriyle kullanÄ±ldÄ±ÄÄ±nda her dizin altÄ±nda en fazla 64
         alt dizin veya dosya aÃ§Ä±labilir. "2" deÄeriyle kullanÄ±ldÄ±ÄÄ±nda ise bu
         sayÄ± 64^2âye yÃ¼kselir ve bÃ¶yle artarak gider. Ä°yi bir sebebiniz
         olmadÄ±kÃ§a <directive
-        module="mod_disk_cache">CacheDirLength</directive> iÃ§in deÄer olarak
+        module="mod_cache_disk">CacheDirLength</directive> iÃ§in deÄer olarak
         "1" belirtmenizi Ã¶neririz.</p>
 
-      <p><directive module="mod_disk_cache">CacheDirLevels</directive>
+      <p><directive module="mod_cache_disk">CacheDirLevels</directive>
         yÃ¶nergesine atanacak deÄer Ã¶nbellekte saklamayÄ± dÃ¼ÅÃ¼ndÃ¼ÄÃ¼nÃ¼z olasÄ±
         dosya sayÄ±sÄ± ile ilgilidir. YukarÄ±daki Ã¶rnekte olduÄu gibi "2"
         deÄerini belirtirseniz, toplamda en fazla 4096 dizin oluÅturulabilir.
@@ -644,7 +644,7 @@
     <section>
       <title>Disk ÃnbelleÄinin BakÄ±mÄ±</title>
 
-      <p><module>mod_disk_cache</module> zaman aÅÄ±mÄ±na uÄrayan Ã¶nbellekli
+      <p><module>mod_cache_disk</module> zaman aÅÄ±mÄ±na uÄrayan Ã¶nbellekli
         iÃ§eriÄi silse de Ã¶nbelleÄin toplam boyu ve ne kadar boÅ bellek kaldÄ±ÄÄ±
         hakkÄ±nda bilgi vermez.</p>
 
@@ -670,7 +670,7 @@
       <a id="figure1" name="figure1"><dfn>Åekil 1</dfn></a>:
  ÃnbelleÄin bÃ¼yÃ¼mesi ve dÃ¼zenli aralÄ±klarla temizlenmesi.</p>
 
-      <p><module>mod_disk_cache</module> ne kadar Ã¶nbellek alanÄ± kullandÄ±ÄÄ±
+      <p><module>mod_cache_disk</module> ne kadar Ã¶nbellek alanÄ± kullandÄ±ÄÄ±
         ile ilgili bir bilgi vermediÄinden <program>htcacheclean</program>âin
         bir temizlik sonrasÄ± yeterince bÃ¼yÃ¼k bir geniÅleme alanÄ± kalacak
         Åekilde yapÄ±landÄ±rÄ±lmasÄ± Ã¶nemlidir.</p>
diff --git a/docs/manual/developer/new_api_2_4.html.en b/docs/manual/developer/new_api_2_4.html.en
index b755ba6cfa9..c0df650be7b 100644
--- a/docs/manual/developer/new_api_2_4.html.en
+++ b/docs/manual/developer/new_api_2_4.html.en
@@ -189,7 +189,7 @@
     and exposes functions to handle HTTP OPTIONS and TRACE.</p>
   
 
-  <h3><a name="mod_disk_cache" id="mod_disk_cache">mod_disk_cache (changed)</a></h3>
+  <h3><a name="mod_cache_disk" id="mod_cache_disk">mod_cache_disk (changed)</a></h3>
     
     <p>Changes the disk format of the disk cache to support atomic cache
     updates without locking. The device/inode pair of the body file is
@@ -197,6 +197,13 @@
     and body belong to one another.</p>
   
 
+  <h3><a name="mod_disk_cache" id="mod_disk_cache">mod_disk_cache (renamed)</a></h3>
+    
+    <p>The mod_disk_cache module has been renamed to mod_cache_disk in
+    order to be consistent with the naming of other modules within the
+    server.</p>
+  
+
   <h3><a name="mod_request" id="mod_request">mod_request (NEW!)</a></h3>
     
     <p>The API for <code class="module"><a href="../mod/mod_request.html">mod_request</a></code>, to make input data
diff --git a/docs/manual/developer/new_api_2_4.xml b/docs/manual/developer/new_api_2_4.xml
index 7d0c795c5ee..27920ed3bb6 100644
--- a/docs/manual/developer/new_api_2_4.xml
+++ b/docs/manual/developer/new_api_2_4.xml
@@ -188,14 +188,21 @@
     and exposes functions to handle HTTP OPTIONS and TRACE.</p>
   </section>
 
-  <section id="mod_disk_cache">
-    <title>mod_disk_cache (changed)</title>
+  <section id="mod_cache_disk">
+    <title>mod_cache_disk (changed)</title>
     <p>Changes the disk format of the disk cache to support atomic cache
     updates without locking. The device/inode pair of the body file is
     embedded in the header file, allowing confirmation that the header
     and body belong to one another.</p>
   </section>
 
+  <section id="mod_disk_cache">
+    <title>mod_disk_cache (renamed)</title>
+    <p>The mod_disk_cache module has been renamed to mod_cache_disk in
+    order to be consistent with the naming of other modules within the
+    server.</p>
+  </section>
+
   <section id="mod_request">
     <title>mod_request (NEW!)</title>
     <p>The API for <module>mod_request</module>, to make input data
diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml
index b28dbb91ac0..3fedc379358 100644
--- a/docs/manual/mod/allmodules.xml
+++ b/docs/manual/mod/allmodules.xml
@@ -28,6 +28,7 @@
   <modulefile>mod_autoindex.xml</modulefile>
   <modulefile>mod_buffer.xml</modulefile>
   <modulefile>mod_cache.xml</modulefile>
+  <modulefile>mod_cache_disk.xml</modulefile>
   <modulefile>mod_cern_meta.xml</modulefile>
   <modulefile>mod_cgi.xml</modulefile>
   <modulefile>mod_cgid.xml</modulefile>
@@ -39,7 +40,6 @@
   <modulefile>mod_deflate.xml</modulefile>
   <modulefile>mod_dialup.xml</modulefile>
   <modulefile>mod_dir.xml</modulefile>
-  <modulefile>mod_disk_cache.xml</modulefile>
   <modulefile>mod_dumpio.xml</modulefile>
   <modulefile>mod_echo.xml</modulefile>
   <modulefile>mod_env.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de
index a8ee209bf8d..0a4202607f0 100644
--- a/docs/manual/mod/allmodules.xml.de
+++ b/docs/manual/mod/allmodules.xml.de
@@ -28,6 +28,7 @@
   <modulefile>mod_autoindex.xml</modulefile>
   <modulefile>mod_buffer.xml</modulefile>
   <modulefile>mod_cache.xml</modulefile>
+  <modulefile>mod_cache_disk.xml</modulefile>
   <modulefile>mod_cern_meta.xml</modulefile>
   <modulefile>mod_cgi.xml</modulefile>
   <modulefile>mod_cgid.xml</modulefile>
@@ -39,7 +40,6 @@
   <modulefile>mod_deflate.xml</modulefile>
   <modulefile>mod_dialup.xml</modulefile>
   <modulefile>mod_dir.xml</modulefile>
-  <modulefile>mod_disk_cache.xml</modulefile>
   <modulefile>mod_dumpio.xml</modulefile>
   <modulefile>mod_echo.xml</modulefile>
   <modulefile>mod_env.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es
index b28dbb91ac0..3fedc379358 100644
--- a/docs/manual/mod/allmodules.xml.es
+++ b/docs/manual/mod/allmodules.xml.es
@@ -28,6 +28,7 @@
   <modulefile>mod_autoindex.xml</modulefile>
   <modulefile>mod_buffer.xml</modulefile>
   <modulefile>mod_cache.xml</modulefile>
+  <modulefile>mod_cache_disk.xml</modulefile>
   <modulefile>mod_cern_meta.xml</modulefile>
   <modulefile>mod_cgi.xml</modulefile>
   <modulefile>mod_cgid.xml</modulefile>
@@ -39,7 +40,6 @@
   <modulefile>mod_deflate.xml</modulefile>
   <modulefile>mod_dialup.xml</modulefile>
   <modulefile>mod_dir.xml</modulefile>
-  <modulefile>mod_disk_cache.xml</modulefile>
   <modulefile>mod_dumpio.xml</modulefile>
   <modulefile>mod_echo.xml</modulefile>
   <modulefile>mod_env.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.fr b/docs/manual/mod/allmodules.xml.fr
index 598ee80ffb3..c505e7ded8c 100644
--- a/docs/manual/mod/allmodules.xml.fr
+++ b/docs/manual/mod/allmodules.xml.fr
@@ -28,6 +28,7 @@
   <modulefile>mod_autoindex.xml.fr</modulefile>
   <modulefile>mod_buffer.xml.fr</modulefile>
   <modulefile>mod_cache.xml.fr</modulefile>
+  <modulefile>mod_cache_disk.xml.fr</modulefile>
   <modulefile>mod_cern_meta.xml</modulefile>
   <modulefile>mod_cgi.xml</modulefile>
   <modulefile>mod_cgid.xml</modulefile>
@@ -39,7 +40,6 @@
   <modulefile>mod_deflate.xml.fr</modulefile>
   <modulefile>mod_dialup.xml</modulefile>
   <modulefile>mod_dir.xml.fr</modulefile>
-  <modulefile>mod_disk_cache.xml.fr</modulefile>
   <modulefile>mod_dumpio.xml</modulefile>
   <modulefile>mod_echo.xml.fr</modulefile>
   <modulefile>mod_env.xml.fr</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja
index 45693827db4..a3a5ad9a98e 100644
--- a/docs/manual/mod/allmodules.xml.ja
+++ b/docs/manual/mod/allmodules.xml.ja
@@ -28,6 +28,7 @@
   <modulefile>mod_autoindex.xml.ja</modulefile>
   <modulefile>mod_buffer.xml</modulefile>
   <modulefile>mod_cache.xml.ja</modulefile>
+  <modulefile>mod_cache_disk.xml.ja</modulefile>
   <modulefile>mod_cern_meta.xml</modulefile>
   <modulefile>mod_cgi.xml.ja</modulefile>
   <modulefile>mod_cgid.xml.ja</modulefile>
@@ -39,7 +40,6 @@
   <modulefile>mod_deflate.xml.ja</modulefile>
   <modulefile>mod_dialup.xml</modulefile>
   <modulefile>mod_dir.xml.ja</modulefile>
-  <modulefile>mod_disk_cache.xml.ja</modulefile>
   <modulefile>mod_dumpio.xml.ja</modulefile>
   <modulefile>mod_echo.xml.ja</modulefile>
   <modulefile>mod_env.xml.ja</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko
index c893ca9bdad..c9508db9c32 100644
--- a/docs/manual/mod/allmodules.xml.ko
+++ b/docs/manual/mod/allmodules.xml.ko
@@ -28,6 +28,7 @@
   <modulefile>mod_autoindex.xml.ko</modulefile>
   <modulefile>mod_buffer.xml</modulefile>
   <modulefile>mod_cache.xml.ko</modulefile>
+  <modulefile>mod_cache_disk.xml.ko</modulefile>
   <modulefile>mod_cern_meta.xml.ko</modulefile>
   <modulefile>mod_cgi.xml.ko</modulefile>
   <modulefile>mod_cgid.xml.ko</modulefile>
@@ -39,7 +40,6 @@
   <modulefile>mod_deflate.xml.ko</modulefile>
   <modulefile>mod_dialup.xml</modulefile>
   <modulefile>mod_dir.xml.ko</modulefile>
-  <modulefile>mod_disk_cache.xml.ko</modulefile>
   <modulefile>mod_dumpio.xml</modulefile>
   <modulefile>mod_echo.xml.ko</modulefile>
   <modulefile>mod_env.xml.ko</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.tr b/docs/manual/mod/allmodules.xml.tr
index 58676758694..d9954e127b9 100644
--- a/docs/manual/mod/allmodules.xml.tr
+++ b/docs/manual/mod/allmodules.xml.tr
@@ -28,6 +28,7 @@
   <modulefile>mod_autoindex.xml.tr</modulefile>
   <modulefile>mod_buffer.xml</modulefile>
   <modulefile>mod_cache.xml</modulefile>
+  <modulefile>mod_cache_disk.xml</modulefile>
   <modulefile>mod_cern_meta.xml</modulefile>
   <modulefile>mod_cgi.xml</modulefile>
   <modulefile>mod_cgid.xml</modulefile>
@@ -39,7 +40,6 @@
   <modulefile>mod_deflate.xml</modulefile>
   <modulefile>mod_dialup.xml</modulefile>
   <modulefile>mod_dir.xml.tr</modulefile>
-  <modulefile>mod_disk_cache.xml</modulefile>
   <modulefile>mod_dumpio.xml</modulefile>
   <modulefile>mod_echo.xml</modulefile>
   <modulefile>mod_env.xml.tr</modulefile>
diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de
index 409b6edb07c..0fada977af1 100644
--- a/docs/manual/mod/core.html.de
+++ b/docs/manual/mod/core.html.de
@@ -981,7 +981,7 @@ Dateien an den Client auszuliefern</td></tr>
     </code></p></div>
     <p>Beachten Sie bitte, dass die verzeichnisbasierte und
        .htaccess-Konfiguration von <code class="directive">EnableSendfile</code>
-       nicht vom <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>-Modul unterstützt wird.
+       nicht vom <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>-Modul unterstützt wird.
        Nur die globale Konfiguration von <code class="directive">EnableSendfile</code>
        wird vom Modul beachtet.
     </p>
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index ee4b8848f15..b9a95ab55be 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -933,7 +933,7 @@ version 2.3.9.</td></tr>
     </code></p></div>
     <p>Please note that the per-directory and .htaccess configuration
        of <code class="directive">EnableSendfile</code> is not supported by
-       <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>.
+       <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>.
        Only global definition of <code class="directive">EnableSendfile</code>
        is taken into account by the module.
     </p>
@@ -1683,7 +1683,7 @@ if a test is true at startup</td></tr>
           &lt;/IfDefine&gt;<br />
           &lt;IfDefine !MemCache&gt;<br />
           <span class="indent">
-            LoadModule disk_cache_module   modules/mod_disk_cache.so<br />
+            LoadModule cache_disk_module   modules/mod_cache_disk.so<br />
           </span>
           &lt;/IfDefine&gt;
         </span>
diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr
index 730a54f0d63..3a3ec978aba 100644
--- a/docs/manual/mod/core.html.fr
+++ b/docs/manual/mod/core.html.fr
@@ -986,7 +986,7 @@ sup
     <p>Veuillez noter que la configuration de la directive
     <code class="directive">EnableSendfile</code> dans un contexte de répertoire
     ou de fichier .htaccess n'est pas supportée par
-    <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>. Le module ne prend en compte la
+    <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>. Le module ne prend en compte la
     définition de <code class="directive">EnableSendfile</code> que dans un
     contexte global.
     </p>
@@ -1804,7 +1804,7 @@ test retourne "vrai" au d
           &lt;/IfDefine&gt;<br />
           &lt;IfDefine !MemCache&gt;<br />
           <span class="indent">
-            LoadModule disk_cache_module   modules/mod_disk_cache.so<br />
+            LoadModule cache_disk_module   modules/mod_cache_disk.so<br />
           </span>
           &lt;/IfDefine&gt;
         </span>
diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8
index 8869358c2f1..d7d63bb46f4 100644
--- a/docs/manual/mod/core.html.ja.utf8
+++ b/docs/manual/mod/core.html.ja.utf8
@@ -1435,7 +1435,7 @@
           &lt;/IfDefine&gt;<br />
           &lt;IfDefine !MemCache&gt;<br />
           <span class="indent">
-            LoadModule disk_cache_module   modules/mod_disk_cache.so<br />
+            LoadModule cache_disk_module   modules/mod_cache_disk.so<br />
           </span>
       &lt;/IfDefine&gt;
         </span>
diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8
index 9d2db15beaf..2a136451904 100644
--- a/docs/manual/mod/core.html.tr.utf8
+++ b/docs/manual/mod/core.html.tr.utf8
@@ -993,7 +993,7 @@ edilmiÅtir.</td></tr>
       &lt;/Directory&gt;
     </code></p></div>
     <p><code class="directive">EnableSendfile</code> yÃ¶nergesinin .htaccess ve diziniÃ§i
-      yapÄ±landÄ±rmalarÄ±nÄ±nÄ± <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> tarafÄ±ndan
+      yapÄ±landÄ±rmalarÄ±nÄ±nÄ± <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> tarafÄ±ndan
       desteklenmediÄini lÃ¼tfen aklÄ±nÄ±zdan Ã§Ä±karmayÄ±n.
       <code class="directive">EnableSendfile</code> yÃ¶nergesinin sadece kÃ¼resel
       tanÄ±mlarÄ± hesaba katÄ±lÄ±r.</p>
@@ -1489,7 +1489,7 @@ sokulacak yÃ¶nergeleri sarmalar.</td></tr>
           &lt;/IfDefine&gt;<br />
           &lt;IfDefine !MemCache&gt;<br />
           <span class="indent">
-            LoadModule disk_cache_module   modules/mod_disk_cache.so<br />
+            LoadModule cache_disk_module   modules/mod_cache_disk.so<br />
           </span>
           &lt;/IfDefine&gt;
         </span>
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 6aa40a85edc..57838f24cb1 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -882,7 +882,7 @@ version 2.3.9.</compatibility>
     </example>
     <p>Please note that the per-directory and .htaccess configuration
        of <directive>EnableSendfile</directive> is not supported by
-       <module>mod_disk_cache</module>.
+       <module>mod_cache_disk</module>.
        Only global definition of <directive>EnableSendfile</directive>
        is taken into account by the module.
     </p>
@@ -1662,7 +1662,7 @@ if a test is true at startup</description>
           &lt;/IfDefine&gt;<br />
           &lt;IfDefine !MemCache&gt;<br />
           <indent>
-            LoadModule disk_cache_module   modules/mod_disk_cache.so<br />
+            LoadModule cache_disk_module   modules/mod_cache_disk.so<br />
           </indent>
           &lt;/IfDefine&gt;
         </indent>
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 7c8a2c53f61..5ee2ee23a89 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -927,7 +927,7 @@ Dateien an den Client auszuliefern</description>
     </example>
     <p>Beachten Sie bitte, dass die verzeichnisbasierte und
        .htaccess-Konfiguration von <directive>EnableSendfile</directive>
-       nicht vom <module>mod_disk_cache</module>-Modul unterst&uuml;tzt wird.
+       nicht vom <module>mod_cache_disk</module>-Modul unterst&uuml;tzt wird.
        Nur die globale Konfiguration von <directive>EnableSendfile</directive>
        wird vom Modul beachtet.
     </p>
diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr
index c007b076b83..26b80b2efa9 100644
--- a/docs/manual/mod/core.xml.fr
+++ b/docs/manual/mod/core.xml.fr
@@ -971,7 +971,7 @@ sup&eacute;rieures. Par d&eacute;faut &agrave; Off depuis la version 2.3.9.</com
     <p>Veuillez noter que la configuration de la directive
     <directive>EnableSendfile</directive> dans un contexte de r&eacute;pertoire
     ou de fichier .htaccess n'est pas support&eacute;e par
-    <module>mod_disk_cache</module>. Le module ne prend en compte la
+    <module>mod_cache_disk</module>. Le module ne prend en compte la
     d&eacute;finition de <directive>EnableSendfile</directive> que dans un
     contexte global.
     </p>
@@ -1839,7 +1839,7 @@ host</context>
           &lt;/IfDefine&gt;<br />
           &lt;IfDefine !MemCache&gt;<br />
           <indent>
-            LoadModule disk_cache_module   modules/mod_disk_cache.so<br />
+            LoadModule cache_disk_module   modules/mod_cache_disk.so<br />
           </indent>
           &lt;/IfDefine&gt;
         </indent>
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 6157e2a5d70..a1dce086bf6 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -1398,7 +1398,7 @@ module="core">Directory</directive></seealso>
           &lt;/IfDefine&gt;<br />
           &lt;IfDefine !MemCache&gt;<br />
           <indent>
-            LoadModule disk_cache_module   modules/mod_disk_cache.so<br />
+            LoadModule cache_disk_module   modules/mod_cache_disk.so<br />
           </indent>
       &lt;/IfDefine&gt;
         </indent>
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index fe213ed5729..8a80ebabdc5 100644
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.xml.tr
@@ -938,7 +938,7 @@ edilmiÅtir.</compatibility>
       &lt;/Directory&gt;
     </example>
     <p><directive>EnableSendfile</directive> yÃ¶nergesinin .htaccess ve diziniÃ§i
-      yapÄ±landÄ±rmalarÄ±nÄ±nÄ± <module>mod_disk_cache</module> tarafÄ±ndan
+      yapÄ±landÄ±rmalarÄ±nÄ±nÄ± <module>mod_cache_disk</module> tarafÄ±ndan
       desteklenmediÄini lÃ¼tfen aklÄ±nÄ±zdan Ã§Ä±karmayÄ±n.
       <directive>EnableSendfile</directive> yÃ¶nergesinin sadece kÃ¼resel
       tanÄ±mlarÄ± hesaba katÄ±lÄ±r.</p>
@@ -1439,7 +1439,7 @@ sokulacak yÃ¶nergeleri sarmalar.</description>
           &lt;/IfDefine&gt;<br />
           &lt;IfDefine !MemCache&gt;<br />
           <indent>
-            LoadModule disk_cache_module   modules/mod_disk_cache.so<br />
+            LoadModule cache_disk_module   modules/mod_cache_disk.so<br />
           </indent>
           &lt;/IfDefine&gt;
         </indent>
diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de
index 8aa14df650a..cf4cce68e4b 100644
--- a/docs/manual/mod/directives.html.de
+++ b/docs/manual/mod/directives.html.de
@@ -149,8 +149,8 @@
 <li><a href="mod_buffer.html#buffersize">BufferSize</a></li>
 <li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
 <li><a href="mod_cache.html#cachedetailheader">CacheDetailHeader</a></li>
-<li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
-<li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
+<li><a href="mod_cache_disk.html#cachedirlength">CacheDirLength</a></li>
+<li><a href="mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></li>
 <li><a href="mod_cache.html#cachedisable">CacheDisable</a></li>
 <li><a href="mod_cache.html#cacheenable">CacheEnable</a></li>
 <li><a href="mod_file_cache.html#cachefile">CacheFile</a></li>
@@ -166,14 +166,14 @@
 <li><a href="mod_cache.html#cachelockmaxage">CacheLockMaxAge</a></li>
 <li><a href="mod_cache.html#cachelockpath">CacheLockPath</a></li>
 <li><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire</a></li>
-<li><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></li>
+<li><a href="mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></li>
 <li><a href="mod_cache.html#cacheminexpire">CacheMinExpire</a></li>
-<li><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></li>
+<li><a href="mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></li>
 <li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
 <li><a href="mod_cache.html#cachequickhandler">CacheQuickHandler</a></li>
-<li><a href="mod_disk_cache.html#cachereadsize">CacheReadSize</a></li>
-<li><a href="mod_disk_cache.html#cachereadtime">CacheReadTime</a></li>
-<li><a href="mod_disk_cache.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_cache_disk.html#cachereadsize">CacheReadSize</a></li>
+<li><a href="mod_cache_disk.html#cachereadtime">CacheReadTime</a></li>
+<li><a href="mod_cache_disk.html#cacheroot">CacheRoot</a></li>
 <li><a href="mod_cache.html#cachestaleonerror">CacheStaleOnError</a></li>
 <li><a href="mod_cache.html#cachestoreexpired">CacheStoreExpired</a></li>
 <li><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore</a></li>
diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en
index 2332727e3bf..14d94047dea 100644
--- a/docs/manual/mod/directives.html.en
+++ b/docs/manual/mod/directives.html.en
@@ -147,8 +147,8 @@
 <li><a href="mod_buffer.html#buffersize">BufferSize</a></li>
 <li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
 <li><a href="mod_cache.html#cachedetailheader">CacheDetailHeader</a></li>
-<li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
-<li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
+<li><a href="mod_cache_disk.html#cachedirlength">CacheDirLength</a></li>
+<li><a href="mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></li>
 <li><a href="mod_cache.html#cachedisable">CacheDisable</a></li>
 <li><a href="mod_cache.html#cacheenable">CacheEnable</a></li>
 <li><a href="mod_file_cache.html#cachefile">CacheFile</a></li>
@@ -164,14 +164,14 @@
 <li><a href="mod_cache.html#cachelockmaxage">CacheLockMaxAge</a></li>
 <li><a href="mod_cache.html#cachelockpath">CacheLockPath</a></li>
 <li><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire</a></li>
-<li><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></li>
+<li><a href="mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></li>
 <li><a href="mod_cache.html#cacheminexpire">CacheMinExpire</a></li>
-<li><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></li>
+<li><a href="mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></li>
 <li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
 <li><a href="mod_cache.html#cachequickhandler">CacheQuickHandler</a></li>
-<li><a href="mod_disk_cache.html#cachereadsize">CacheReadSize</a></li>
-<li><a href="mod_disk_cache.html#cachereadtime">CacheReadTime</a></li>
-<li><a href="mod_disk_cache.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_cache_disk.html#cachereadsize">CacheReadSize</a></li>
+<li><a href="mod_cache_disk.html#cachereadtime">CacheReadTime</a></li>
+<li><a href="mod_cache_disk.html#cacheroot">CacheRoot</a></li>
 <li><a href="mod_cache.html#cachestaleonerror">CacheStaleOnError</a></li>
 <li><a href="mod_cache.html#cachestoreexpired">CacheStoreExpired</a></li>
 <li><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore</a></li>
diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es
index 637dd22e5df..3a6e0861e3b 100644
--- a/docs/manual/mod/directives.html.es
+++ b/docs/manual/mod/directives.html.es
@@ -149,8 +149,8 @@
 <li><a href="mod_buffer.html#buffersize">BufferSize</a></li>
 <li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
 <li><a href="mod_cache.html#cachedetailheader">CacheDetailHeader</a></li>
-<li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
-<li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
+<li><a href="mod_cache_disk.html#cachedirlength">CacheDirLength</a></li>
+<li><a href="mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></li>
 <li><a href="mod_cache.html#cachedisable">CacheDisable</a></li>
 <li><a href="mod_cache.html#cacheenable">CacheEnable</a></li>
 <li><a href="mod_file_cache.html#cachefile">CacheFile</a></li>
@@ -166,14 +166,14 @@
 <li><a href="mod_cache.html#cachelockmaxage">CacheLockMaxAge</a></li>
 <li><a href="mod_cache.html#cachelockpath">CacheLockPath</a></li>
 <li><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire</a></li>
-<li><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></li>
+<li><a href="mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></li>
 <li><a href="mod_cache.html#cacheminexpire">CacheMinExpire</a></li>
-<li><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></li>
+<li><a href="mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></li>
 <li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
 <li><a href="mod_cache.html#cachequickhandler">CacheQuickHandler</a></li>
-<li><a href="mod_disk_cache.html#cachereadsize">CacheReadSize</a></li>
-<li><a href="mod_disk_cache.html#cachereadtime">CacheReadTime</a></li>
-<li><a href="mod_disk_cache.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_cache_disk.html#cachereadsize">CacheReadSize</a></li>
+<li><a href="mod_cache_disk.html#cachereadtime">CacheReadTime</a></li>
+<li><a href="mod_cache_disk.html#cacheroot">CacheRoot</a></li>
 <li><a href="mod_cache.html#cachestaleonerror">CacheStaleOnError</a></li>
 <li><a href="mod_cache.html#cachestoreexpired">CacheStoreExpired</a></li>
 <li><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore</a></li>
diff --git a/docs/manual/mod/directives.html.ja.utf8 b/docs/manual/mod/directives.html.ja.utf8
index 8ee87ae8843..57d75908a04 100644
--- a/docs/manual/mod/directives.html.ja.utf8
+++ b/docs/manual/mod/directives.html.ja.utf8
@@ -144,8 +144,8 @@
 <li><a href="mod_log_config.html#bufferedlogs">BufferedLogs</a></li>
 <li><a href="mod_buffer.html#buffersize">BufferSize</a></li>
 <li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
-<li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
-<li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
+<li><a href="mod_cache_disk.html#cachedirlength">CacheDirLength</a></li>
+<li><a href="mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></li>
 <li><a href="mod_cache.html#cachedisable">CacheDisable</a></li>
 <li><a href="mod_cache.html#cacheenable">CacheEnable</a></li>
 <li><a href="mod_file_cache.html#cachefile">CacheFile</a></li>
@@ -155,11 +155,11 @@
 <li><a href="mod_cache.html#cacheignorequerystring">CacheIgnoreQueryString</a></li>
 <li><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor</a></li>
 <li><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire</a></li>
-<li><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></li>
+<li><a href="mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></li>
 <li><a href="mod_cache.html#cacheminexpire">CacheMinExpire</a></li>
-<li><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></li>
+<li><a href="mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></li>
 <li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
-<li><a href="mod_disk_cache.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_cache_disk.html#cacheroot">CacheRoot</a></li>
 <li><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore</a></li>
 <li><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate</a></li>
 <li><a href="core.html#cgimapextension">CGIMapExtension</a></li>
diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr
index 838eccada37..a739af46e76 100644
--- a/docs/manual/mod/directives.html.ko.euc-kr
+++ b/docs/manual/mod/directives.html.ko.euc-kr
@@ -146,8 +146,8 @@
 <li><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></li>
 <li><a href="mod_buffer.html#buffersize">BufferSize</a></li>
 <li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
-<li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
-<li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
+<li><a href="mod_cache_disk.html#cachedirlength">CacheDirLength</a></li>
+<li><a href="mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></li>
 <li><a href="mod_cache.html#cachedisable">CacheDisable</a></li>
 <li><a href="mod_cache.html#cacheenable">CacheEnable</a></li>
 <li><a href="mod_file_cache.html#cachefile">CacheFile</a></li>
@@ -156,10 +156,10 @@
 <li><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod</a></li>
 <li><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor</a></li>
 <li><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire</a></li>
-<li><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></li>
-<li><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></li>
+<li><a href="mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></li>
+<li><a href="mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></li>
 <li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
-<li><a href="mod_disk_cache.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_cache_disk.html#cacheroot">CacheRoot</a></li>
 <li><a href="core.html#cgimapextension">CGIMapExtension</a></li>
 <li><a href="mod_charset_lite.html#charsetdefault">CharsetDefault</a></li>
 <li><a href="mod_charset_lite.html#charsetoptions">CharsetOptions</a></li>
diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8
index 594fe767529..bc75ab48fd3 100644
--- a/docs/manual/mod/directives.html.tr.utf8
+++ b/docs/manual/mod/directives.html.tr.utf8
@@ -145,8 +145,8 @@
 <li><a href="mod_buffer.html#buffersize">BufferSize</a></li>
 <li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
 <li><a href="mod_cache.html#cachedetailheader">CacheDetailHeader</a></li>
-<li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
-<li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
+<li><a href="mod_cache_disk.html#cachedirlength">CacheDirLength</a></li>
+<li><a href="mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></li>
 <li><a href="mod_cache.html#cachedisable">CacheDisable</a></li>
 <li><a href="mod_cache.html#cacheenable">CacheEnable</a></li>
 <li><a href="mod_file_cache.html#cachefile">CacheFile</a></li>
@@ -162,14 +162,14 @@
 <li><a href="mod_cache.html#cachelockmaxage">CacheLockMaxAge</a></li>
 <li><a href="mod_cache.html#cachelockpath">CacheLockPath</a></li>
 <li><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire</a></li>
-<li><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></li>
+<li><a href="mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></li>
 <li><a href="mod_cache.html#cacheminexpire">CacheMinExpire</a></li>
-<li><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></li>
+<li><a href="mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></li>
 <li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
 <li><a href="mod_cache.html#cachequickhandler">CacheQuickHandler</a></li>
-<li><a href="mod_disk_cache.html#cachereadsize">CacheReadSize</a></li>
-<li><a href="mod_disk_cache.html#cachereadtime">CacheReadTime</a></li>
-<li><a href="mod_disk_cache.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_cache_disk.html#cachereadsize">CacheReadSize</a></li>
+<li><a href="mod_cache_disk.html#cachereadtime">CacheReadTime</a></li>
+<li><a href="mod_cache_disk.html#cacheroot">CacheRoot</a></li>
 <li><a href="mod_cache.html#cachestaleonerror">CacheStaleOnError</a></li>
 <li><a href="mod_cache.html#cachestoreexpired">CacheStoreExpired</a></li>
 <li><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore</a></li>
diff --git a/docs/manual/mod/index.html.de b/docs/manual/mod/index.html.de
index d9fbfec21ac..4f1248ae9b7 100644
--- a/docs/manual/mod/index.html.de
+++ b/docs/manual/mod/index.html.de
@@ -105,6 +105,7 @@ address)</dd>
     Win32 <code>dir</code> shell command</dd>
 <dt><a href="mod_buffer.html" id="B" name="B">mod_buffer</a></dt><dd>Support for request buffering</dd>
 <dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>RFC 2616 compliant HTTP caching filter.</dd>
+<dt><a href="mod_cache_disk.html">mod_cache_disk</a></dt><dd>Disk based storage module for the HTTP caching filter.</dd>
 <dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
 <dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>Execution of CGI scripts</dd>
 <dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>Execution of CGI scripts using an
@@ -120,7 +121,6 @@ client</dd>
 <dt><a href="mod_dialup.html">mod_dialup</a></dt><dd>Send static content at a bandwidth rate limit, defined by the various old modem standards</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>Provides for "trailing slash" redirects and
     serving directory index files</dd>
-<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>Disk based storage module for the HTTP caching filter.</dd>
 <dt><a href="mod_dumpio.html">mod_dumpio</a></dt><dd>Dumps all I/O to error log as desired.</dd>
 <dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>A simple echo server to illustrate protocol 
 modules</dd>
diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en
index 81b13efd1c5..58669b33a82 100644
--- a/docs/manual/mod/index.html.en
+++ b/docs/manual/mod/index.html.en
@@ -101,6 +101,7 @@ address)</dd>
     Win32 <code>dir</code> shell command</dd>
 <dt><a href="mod_buffer.html" id="B" name="B">mod_buffer</a></dt><dd>Support for request buffering</dd>
 <dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>RFC 2616 compliant HTTP caching filter.</dd>
+<dt><a href="mod_cache_disk.html">mod_cache_disk</a></dt><dd>Disk based storage module for the HTTP caching filter.</dd>
 <dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
 <dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>Execution of CGI scripts</dd>
 <dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>Execution of CGI scripts using an
@@ -116,7 +117,6 @@ client</dd>
 <dt><a href="mod_dialup.html">mod_dialup</a></dt><dd>Send static content at a bandwidth rate limit, defined by the various old modem standards</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>Provides for "trailing slash" redirects and
     serving directory index files</dd>
-<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>Disk based storage module for the HTTP caching filter.</dd>
 <dt><a href="mod_dumpio.html">mod_dumpio</a></dt><dd>Dumps all I/O to error log as desired.</dd>
 <dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>A simple echo server to illustrate protocol 
 modules</dd>
diff --git a/docs/manual/mod/index.html.es b/docs/manual/mod/index.html.es
index 929b0c42d0e..f1114c2ad88 100644
--- a/docs/manual/mod/index.html.es
+++ b/docs/manual/mod/index.html.es
@@ -107,6 +107,7 @@ address)</dd>
     Win32 <code>dir</code> shell command</dd>
 <dt><a href="mod_buffer.html" id="B" name="B">mod_buffer</a></dt><dd>Support for request buffering</dd>
 <dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>RFC 2616 compliant HTTP caching filter.</dd>
+<dt><a href="mod_cache_disk.html">mod_cache_disk</a></dt><dd>Disk based storage module for the HTTP caching filter.</dd>
 <dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
 <dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>Execution of CGI scripts</dd>
 <dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>Execution of CGI scripts using an
@@ -122,7 +123,6 @@ client</dd>
 <dt><a href="mod_dialup.html">mod_dialup</a></dt><dd>Send static content at a bandwidth rate limit, defined by the various old modem standards</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>Provides for "trailing slash" redirects and
     serving directory index files</dd>
-<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>Disk based storage module for the HTTP caching filter.</dd>
 <dt><a href="mod_dumpio.html">mod_dumpio</a></dt><dd>Dumps all I/O to error log as desired.</dd>
 <dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>A simple echo server to illustrate protocol 
 modules</dd>
diff --git a/docs/manual/mod/index.html.fr b/docs/manual/mod/index.html.fr
index bcde2cfd5e6..e7a8d9a37d0 100644
--- a/docs/manual/mod/index.html.fr
+++ b/docs/manual/mod/index.html.fr
@@ -101,6 +101,8 @@ mani
 shell Win32 <code>dir</code></dd>
 <dt><a href="mod_buffer.html" id="B" name="B">mod_buffer</a></dt><dd>Support de la mise en tampon des requêtes</dd>
 <dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>Filtre de mise en cache HTTP conforme à la RFC 2616</dd>
+<dt><a href="mod_cache_disk.html">mod_cache_disk</a></dt><dd>Module de stockage sur disque pour le filtre de mise en
+cache HTTP.</dd>
 <dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
 <dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>Execution of CGI scripts</dd>
 <dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>Execution of CGI scripts using an
@@ -117,8 +119,6 @@ client</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>Permet la redirection des adresses se terminant par un
 répertoire sans slash de fin et la mise à disposition des fichiers index
 de répertoire</dd>
-<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>Module de stockage sur disque pour le filtre de mise en
-cache HTTP.</dd>
 <dt><a href="mod_dumpio.html">mod_dumpio</a></dt><dd>Dumps all I/O to error log as desired.</dd>
 <dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>Un simple serveur d'écho pour illustrer les modules de
 protocole</dd>
diff --git a/docs/manual/mod/index.html.ja.utf8 b/docs/manual/mod/index.html.ja.utf8
index a9b30e35af8..b52a054f1dc 100644
--- a/docs/manual/mod/index.html.ja.utf8
+++ b/docs/manual/mod/index.html.ja.utf8
@@ -100,6 +100,7 @@ address)</dd>
     ãã£ã¬ã¯ããªã¤ã³ããã¯ã¹ãçæãã</dd>
 <dt><a href="mod_buffer.html" id="B" name="B">mod_buffer</a></dt><dd>Support for request buffering</dd>
 <dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>URI ãã­ã¼ã«ããã³ã³ãã³ãã®ã­ã£ãã·ã¥</dd>
+<dt><a href="mod_cache_disk.html">mod_cache_disk</a></dt><dd>URI ãã­ã¼ã«ããã³ã³ãã³ãã­ã£ãã·ã¥ã¹ãã¬ã¼ã¸ç®¡ç</dd>
 <dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
 <dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>CGI ã¹ã¯ãªããã®å®è¡</dd>
 <dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>å¤é¨ CGI ãã¼ã¢ã³ãä½¿ã£ã CGI ã¹ã¯ãªããã®å®è¡</dd>
@@ -113,7 +114,6 @@ address)</dd>
 <dt><a href="mod_dialup.html">mod_dialup</a></dt><dd>Send static content at a bandwidth rate limit, defined by the various old modem standards</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>ãæå¾ã®ã¹ã©ãã·ã¥ãã®ãªãã¤ã¬ã¯ãã¨ããã£ã¬ã¯ããªã®
 ã¤ã³ããã¯ã¹ãã¡ã¤ã«ãæ±ãæ©è½ãæä¾ãã</dd>
-<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>URI ãã­ã¼ã«ããã³ã³ãã³ãã­ã£ãã·ã¥ã¹ãã¬ã¼ã¸ç®¡ç</dd>
 <dt><a href="mod_dumpio.html">mod_dumpio</a></dt><dd>æãããã«ãã¹ã¦ã® I/O ãã¨ã©ã¼ã­ã°ã«ãã³ããã</dd>
 <dt><a href="mod_echo.html" id="E" name="E">mod_echo</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 4cc277c65a0..c2ffe3d51ee 100644
--- a/docs/manual/mod/index.html.ko.euc-kr
+++ b/docs/manual/mod/index.html.ko.euc-kr
@@ -96,6 +96,7 @@ address)</dd>
     <code>dir</code> ½©¸í·É¾î¿Í À¯»çÇÑ µð·ºÅä¸® ¸ñ·ÏÀ» ¸¸µç´Ù</dd>
 <dt><a href="mod_buffer.html" id="B" name="B">mod_buffer</a></dt><dd>Support for request buffering</dd>
 <dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>URI¸¦ Å°·Î »ç¿ëÇÏ¿© ³»¿ëÀ» Ä³½¬ÇÑ´Ù.</dd>
+<dt><a href="mod_cache_disk.html">mod_cache_disk</a></dt><dd>Content cache storage manager keyed to URIs</dd>
 <dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN À¥¼­¹ö ¸ÞÅ¸ÆÄÀÏ Áö¿ø</dd>
 <dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>CGI ½ºÅ©¸³Æ® ½ÇÇà</dd>
 <dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>¿ÜºÎ CGI µ¥¸óÀ» »ç¿ëÇÏ¿© CGI ½ºÅ©¸³Æ®¸¦ ½ÇÇà</dd>
@@ -109,7 +110,6 @@ address)</dd>
 <dt><a href="mod_dialup.html">mod_dialup</a></dt><dd>Send static content at a bandwidth rate limit, defined by the various old modem standards</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>"¸¶Áö¸· ½½·¡½¬" ¸®´ÙÀÌ·º¼ÇÀ» Á¦°øÇÏ°í µð·ºÅä¸®
 index ÆÄÀÏÀ» ¼­ºñ½ºÇÑ´Ù</dd>
-<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>Content cache storage manager keyed to URIs</dd>
 <dt><a href="mod_dumpio.html">mod_dumpio</a></dt><dd>Dumps all I/O to error log as desired.</dd>
 <dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>ÇÁ·ÎÅäÄÝ ¸ðµâÀ» ¼³¸íÇÏ±âÀ§ÇÑ °£´ÜÇÑ echo ¼­¹ö</dd>
 <dt><a href="mod_env.html">mod_env</a></dt><dd>CGI ½ºÅ©¸³Æ®³ª SSI ÆäÀÌÁö¿¡ Àü´ÞÇÒ È¯°æº¯¼ö¸¦
diff --git a/docs/manual/mod/index.html.tr.utf8 b/docs/manual/mod/index.html.tr.utf8
index 9b3989e2e86..c9623f84552 100644
--- a/docs/manual/mod/index.html.tr.utf8
+++ b/docs/manual/mod/index.html.tr.utf8
@@ -97,6 +97,7 @@ address)</dd>
 yaptÄ±ÄÄ± gibi dizin iÃ§eriÄini listeler.</dd>
 <dt><a href="mod_buffer.html" id="B" name="B">mod_buffer</a></dt><dd>Support for request buffering</dd>
 <dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>RFC 2616 compliant HTTP caching filter.</dd>
+<dt><a href="mod_cache_disk.html">mod_cache_disk</a></dt><dd>Disk based storage module for the HTTP caching filter.</dd>
 <dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
 <dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>Execution of CGI scripts</dd>
 <dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>Execution of CGI scripts using an
@@ -111,7 +112,6 @@ yaptÄ±ÄÄ± gibi dizin iÃ§eriÄini listeler.</dd>
 client</dd>
 <dt><a href="mod_dialup.html">mod_dialup</a></dt><dd>Send static content at a bandwidth rate limit, defined by the various old modem standards</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>BÃ¶lÃ¼ Ã§izgisiyle biten yÃ¶nlendirmeleri yapar ve dizin iÃ§eriÄi dosyalarÄ±nÄ± sunar.</dd>
-<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>Disk based storage module for the HTTP caching filter.</dd>
 <dt><a href="mod_dumpio.html">mod_dumpio</a></dt><dd>Dumps all I/O to error log as desired.</dd>
 <dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>A simple echo server to illustrate protocol 
 modules</dd>
diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en
index aa3e0660475..9bb206c506a 100644
--- a/docs/manual/mod/mod_cache.html.en
+++ b/docs/manual/mod/mod_cache.html.en
@@ -104,7 +104,7 @@
     storage management modules. One storage management module is included in
     the base Apache distribution:</p>
     <dl>
-    <dt><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></dt>
+    <dt><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></dt>
     <dd>Implements a disk based storage manager. Headers and bodies are
     stored separately on disk, in a directory structure derived from the
     md5 hash of the cached URL. Multiple content negotiated responses can
@@ -156,7 +156,7 @@
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="related" id="related">Related Modules and Directives</a></h2>
-    <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li></ul></td></tr></table>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="sampleconf" id="sampleconf">Sample Configuration</a></h2>
@@ -168,8 +168,8 @@
       <br />
       &lt;IfModule mod_cache.c&gt;<br />
       <span class="indent">
-        LoadModule disk_cache_module modules/mod_disk_cache.so<br />
-        &lt;IfModule mod_disk_cache.c&gt;<br />
+        LoadModule cache_disk_module modules/mod_cache_disk.so<br />
+        &lt;IfModule mod_cache_disk.c&gt;<br />
         <span class="indent">
           CacheRoot c:/cacheroot<br />
           CacheEnable disk  /<br />
@@ -458,7 +458,7 @@ manager</td></tr>
     directive, the <var>url-string</var> becomes optional.
     <var>cache_type</var> <code>disk</code> instructs
     <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> to use the disk based storage manager
-    implemented by <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>.</p>
+    implemented by <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>.</p>
     <p>In the event that the URL space overlaps between different
     <code class="directive">CacheEnable</code> directives (as in the example below),
     each possible storage manager will be run until the first one that
diff --git a/docs/manual/mod/mod_cache.html.fr b/docs/manual/mod/mod_cache.html.fr
index 373c1c815d2..6793d380e66 100644
--- a/docs/manual/mod/mod_cache.html.fr
+++ b/docs/manual/mod/mod_cache.html.fr
@@ -108,7 +108,7 @@
     plusieurs modules de gestion de stockage. La distribution Apache de base
     inclut un module de gestion de stockage :</p>
     <dl>
-    <dt><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></dt>
+    <dt><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></dt>
     
     <dd>implémente un gestionnaire de stockage sur disque. Les en-têtes
     et corps sont stockés séparément sur le disque dans une structure de
@@ -165,7 +165,7 @@ cache</a></li>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="related" id="related">Modules apparentés et directives</a></h2>
-    <table class="related"><tr><th>Modules Apparentés</th><th>Directives Apparentées</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>Modules Apparentés</th><th>Directives Apparentées</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li></ul></td></tr></table>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="sampleconf" id="sampleconf">Exemple de configuration</a></h2>
@@ -177,8 +177,8 @@ cache</a></li>
       <br />
       &lt;IfModule mod_cache.c&gt;<br />
       <span class="indent">
-        LoadModule disk_cache_module modules/mod_disk_cache.so<br />
-        &lt;IfModule mod_disk_cache.c&gt;<br />
+        LoadModule cache_disk_module modules/mod_cache_disk.so<br />
+        &lt;IfModule mod_cache_disk.c&gt;<br />
         <span class="indent">
           CacheRoot c:/cacheroot<br />
           CacheEnable disk  /<br />
@@ -503,7 +503,7 @@ gestionnaire de stockage pr
     <var>url-string</var> devient optionnel. Si <var>type de cache</var>
     a pour valeur <code>disk</code>, <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>
     utilisera le gestionnaire de stockage sur disque implémenté par
-    <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>.</p>
+    <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>.</p>
     <p>Si les différentes directives <code class="directive">CacheEnable</code>
     spécifient des URLs qui se recoupent (comme dans l'exemple
     ci-dessous), tous les gestionnaires de stockage possibles seront
diff --git a/docs/manual/mod/mod_cache.html.ja.utf8 b/docs/manual/mod/mod_cache.html.ja.utf8
index 707aa76bebc..af26eb730fe 100644
--- a/docs/manual/mod/mod_cache.html.ja.utf8
+++ b/docs/manual/mod/mod_cache.html.ja.utf8
@@ -47,7 +47,7 @@
     Apache éå¸ã«ã¯äºã¤ã¹ãã¬ã¼ã¸ç®¡çã¢ã¸ã¥ã¼ã«ãå«ã¾ãã¦ãã¾ã:</p>
     
     <dl>
-    <dt><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></dt>
+    <dt><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></dt>
     <dd>ãã£ã¹ã¯ãä½¿ç¨ããã¹ãã¬ã¼ã¸ç®¡çæ©æ§ãå®è£ãã¦ãã¾ãã</dd>
 
     <dt><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></dt>
@@ -93,7 +93,7 @@
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="related" id="related">é¢é£ã¢ã¸ã¥ã¼ã«ã¨ãã£ã¬ã¯ãã£ã</a></h2>
-    <table class="related"><tr><th>é¢é£ã¢ã¸ã¥ã¼ã«</th><th>é¢é£ãã£ã¬ã¯ãã£ã</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></li><li><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachesize">MCacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>é¢é£ã¢ã¸ã¥ã¼ã«</th><th>é¢é£ãã£ã¬ã¯ãã£ã</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_dist.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachesize">MCacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></code></li></ul></td></tr></table>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="sampleconf" id="sampleconf">ãµã³ãã«è¨­å®</a></h2>
@@ -105,10 +105,10 @@
       <br />
       &lt;IfModule mod_cache.c&gt;<br />
       <span class="indent">
-        #LoadModule disk_cache_module modules/mod_disk_cache.so<br />
-        # If you want to use mod_disk_cache instead of mod_mem_cache,<br />
+        #LoadModule cache_disk_module modules/mod_cache_disk.so<br />
+        # If you want to use mod_cache_disk instead of mod_mem_cache,<br />
         # uncomment the line above and comment out the LoadModule line below.<br />
-        &lt;IfModule mod_disk_cache.c&gt;<br />
+        &lt;IfModule mod_cache_disk.c&gt;<br />
         <span class="indent">
           CacheRoot c:/cacheroot<br />
           CacheEnable disk  /<br />
@@ -188,7 +188,7 @@
     <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> ã§å®è£ããã¦ããã¡ã¢ãªãä½¿ã£ãã¹ãã¬ã¼ã¸
     ç®¡çæ¹å¼ãä½¿ãããã« <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ã«æç¤ºãã¾ãã
     <var>cache_type</var> <code>disk</code> ã§ã
-    <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> ã§å®è£ããã¦ãããã£ã¹ã¯ãä½¿ã£ãã¹ãã¬ã¼ã¸
+    <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> ã§å®è£ããã¦ãããã£ã¹ã¯ãä½¿ã£ãã¹ãã¬ã¼ã¸
     ç®¡çãä½¿ãããã« <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ã«æç¤ºãã¾ãã
     <var>cache_type</var> <code>fd</code> ã¯ <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ã«
     <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> ã«ããå®è£ããã¦ãããã¡ã¤ã«è¨è¿°å­ã®
diff --git a/docs/manual/mod/mod_cache.html.ko.euc-kr b/docs/manual/mod/mod_cache.html.ko.euc-kr
index 2c6d694669e..42d8dcc602f 100644
--- a/docs/manual/mod/mod_cache.html.ko.euc-kr
+++ b/docs/manual/mod/mod_cache.html.ko.euc-kr
@@ -44,7 +44,7 @@
     »ç¿ëÇÏ·Á¸é ÀúÀå°ü¸®¸ðµâ(storage management module)ÀÌ ÇÊ¿äÇÏ´Ù.
     ±âº» ¾ÆÆÄÄ¡ ¹èÆ÷º»¿¡´Â µÎ°¡Áö ÀúÀå°ü¸®¸ðµâÀÌ ÀÖ´Ù:</p>
     <dl>
-    <dt><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></dt>
+    <dt><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></dt>
     <dd>´Â µð½ºÅ©±â¹Ý ÀúÀå°ü¸®ÀÚ¸¦ ±¸ÇöÇÑ´Ù.</dd>
 
     <dt><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></dt>
@@ -80,7 +80,7 @@
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="related" id="related">°ü·ÃµÈ ¸ðµâ°ú Áö½Ã¾î</a></h2>
-    <table class="related"><tr><th>°ü·ÃµÈ ¸ðµâ</th><th>°ü·ÃµÈ Áö½Ã¾î</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></li><li><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachesize">CacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcinterval">CacheGcInterval</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheexpirycheck">CacheExpiryCheck</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachetimemargin">CacheTimeMargin</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcdaily">CacheGcDaily</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcunused">CacheGcUnused</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcclean">CacheGcClean</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcmemusage">CacheGcMemUsage</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachesize">MCacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>°ü·ÃµÈ ¸ðµâ</th><th>°ü·ÃµÈ Áö½Ã¾î</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachesize">CacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcinterval">CacheGcInterval</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheexpirycheck">CacheExpiryCheck</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachetimemargin">CacheTimeMargin</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcdaily">CacheGcDaily</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcunused">CacheGcUnused</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcclean">CacheGcClean</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcmemusage">CacheGcMemUsage</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachesize">MCacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></code></li></ul></td></tr></table>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="sampleconf" id="sampleconf">¼³Á¤¿¹</a></h2>
@@ -92,8 +92,8 @@
       <br />
       &lt;IfModule mod_cache.c&gt;<br />
       <span class="indent">
-        #LoadModule disk_cache_module modules/mod_disk_cache.so<br />
-        &lt;IfModule mod_disk_cache.c&gt;<br />
+        #LoadModule cache_disk_module modules/mod_cache_disk.so<br />
+        &lt;IfModule mod_cache_disk.c&gt;<br />
         <span class="indent">
           CacheRoot c:/cacheroot<br />
           CacheSize 256<br />
@@ -170,7 +170,7 @@
     ¾Æ±Ô¸ÕÆ®·Î ÁöÁ¤ÇÑ´Ù. <var>cache_type</var> <code>mem</code>Àº
     <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code>°¡ ±¸ÇöÇÏ´Â ¸Þ¸ð¸®±â¹Ý
     ÀúÀå°ü¸®ÀÚ¸¦ »ç¿ëÇÑ´Ù. <var>cache_type</var> <code>disk</code>´Â
-    <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>°¡ ±¸ÇöÇÏ´Â µð½ºÅ©±â¹Ý
+    <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>°¡ ±¸ÇöÇÏ´Â µð½ºÅ©±â¹Ý
     ÀúÀå°ü¸®ÀÚ¸¦ »ç¿ëÇÑ´Ù. <var>cache_type</var> <code>fd</code>´Â
     <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code>°¡ ±¸ÇöÇÏ´Â ÆÄÀÏ±â¼úÀÚ Ä³½¬¸¦
     »ç¿ëÇÑ´Ù.</p>
diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml
index fa6f493412b..21280a253bc 100644
--- a/docs/manual/mod/mod_cache.xml
+++ b/docs/manual/mod/mod_cache.xml
@@ -104,7 +104,7 @@
     storage management modules. One storage management module is included in
     the base Apache distribution:</p>
     <dl>
-    <dt><module>mod_disk_cache</module></dt>
+    <dt><module>mod_cache_disk</module></dt>
     <dd>Implements a disk based storage manager. Headers and bodies are
     stored separately on disk, in a directory structure derived from the
     md5 hash of the cached URL. Multiple content negotiated responses can
@@ -122,14 +122,14 @@
 <section id="related"><title>Related Modules and Directives</title>
     <related>
       <modulelist>
-        <module>mod_disk_cache</module>
+        <module>mod_cache_disk</module>
       </modulelist>
       <directivelist>
-        <directive module="mod_disk_cache">CacheRoot</directive>
-        <directive module="mod_disk_cache">CacheDirLevels</directive>
-        <directive module="mod_disk_cache">CacheDirLength</directive>
-        <directive module="mod_disk_cache">CacheMinFileSize</directive>
-        <directive module="mod_disk_cache">CacheMaxFileSize</directive>
+        <directive module="mod_cache_disk">CacheRoot</directive>
+        <directive module="mod_cache_disk">CacheDirLevels</directive>
+        <directive module="mod_cache_disk">CacheDirLength</directive>
+        <directive module="mod_cache_disk">CacheMinFileSize</directive>
+        <directive module="mod_cache_disk">CacheMaxFileSize</directive>
       </directivelist>
     </related>
 </section>
@@ -143,8 +143,8 @@
       <br />
       &lt;IfModule mod_cache.c&gt;<br />
       <indent>
-        LoadModule disk_cache_module modules/mod_disk_cache.so<br />
-        &lt;IfModule mod_disk_cache.c&gt;<br />
+        LoadModule cache_disk_module modules/mod_cache_disk.so<br />
+        &lt;IfModule mod_cache_disk.c&gt;<br />
         <indent>
           CacheRoot c:/cacheroot<br />
           CacheEnable disk  /<br />
@@ -339,7 +339,7 @@ manager</description>
     directive, the <var>url-string</var> becomes optional.
     <var>cache_type</var> <code>disk</code> instructs
     <module>mod_cache</module> to use the disk based storage manager
-    implemented by <module>mod_disk_cache</module>.</p>
+    implemented by <module>mod_cache_disk</module>.</p>
     <p>In the event that the URL space overlaps between different
     <directive>CacheEnable</directive> directives (as in the example below),
     each possible storage manager will be run until the first one that
diff --git a/docs/manual/mod/mod_cache.xml.fr b/docs/manual/mod/mod_cache.xml.fr
index 558e6537f64..04740c1ea3f 100644
--- a/docs/manual/mod/mod_cache.xml.fr
+++ b/docs/manual/mod/mod_cache.xml.fr
@@ -117,7 +117,7 @@
     plusieurs modules de gestion de stockage. La distribution Apache de base
     inclut un module de gestion de stockage :</p>
     <dl>
-    <dt><module>mod_disk_cache</module></dt>
+    <dt><module>mod_cache_disk</module></dt>
     
     <dd>impl&eacute;mente un gestionnaire de stockage sur disque. Les en-t&ecirc;tes
     et corps sont stock&eacute;s s&eacute;par&eacute;ment sur le disque dans une structure de
@@ -140,14 +140,14 @@ cache</a></seealso>
 <section id="related"><title>Modules apparent&eacute;s et directives</title>
     <related>
       <modulelist>
-        <module>mod_disk_cache</module>
+        <module>mod_cache_disk</module>
       </modulelist>
       <directivelist>
-        <directive module="mod_disk_cache">CacheRoot</directive>
-        <directive module="mod_disk_cache">CacheDirLevels</directive>
-        <directive module="mod_disk_cache">CacheDirLength</directive>
-        <directive module="mod_disk_cache">CacheMinFileSize</directive>
-        <directive module="mod_disk_cache">CacheMaxFileSize</directive>
+        <directive module="mod_cache_disk">CacheRoot</directive>
+        <directive module="mod_cache_disk">CacheDirLevels</directive>
+        <directive module="mod_cache_disk">CacheDirLength</directive>
+        <directive module="mod_cache_disk">CacheMinFileSize</directive>
+        <directive module="mod_cache_disk">CacheMaxFileSize</directive>
       </directivelist>
     </related>
 </section>
@@ -161,8 +161,8 @@ cache</a></seealso>
       <br />
       &lt;IfModule mod_cache.c&gt;<br />
       <indent>
-        LoadModule disk_cache_module modules/mod_disk_cache.so<br />
-        &lt;IfModule mod_disk_cache.c&gt;<br />
+        LoadModule cache_disk_module modules/mod_cache_disk.so<br />
+        &lt;IfModule mod_cache_disk.c&gt;<br />
         <indent>
           CacheRoot c:/cacheroot<br />
           CacheEnable disk  /<br />
@@ -386,7 +386,7 @@ gestionnaire de stockage pr&eacute;cis&eacute;</description>
     <var>url-string</var> devient optionnel. Si <var>type de cache</var>
     a pour valeur <code>disk</code>, <module>mod_cache</module>
     utilisera le gestionnaire de stockage sur disque impl&eacute;ment&eacute; par
-    <module>mod_disk_cache</module>.</p>
+    <module>mod_cache_disk</module>.</p>
     <p>Si les diff&eacute;rentes directives <directive>CacheEnable</directive>
     sp&eacute;cifient des URLs qui se recoupent (comme dans l'exemple
     ci-dessous), tous les gestionnaires de stockage possibles seront
diff --git a/docs/manual/mod/mod_cache.xml.ja b/docs/manual/mod/mod_cache.xml.ja
index 926d278a012..b241d6a0fca 100644
--- a/docs/manual/mod/mod_cache.xml.ja
+++ b/docs/manual/mod/mod_cache.xml.ja
@@ -44,7 +44,7 @@
     Apache éå¸ã«ã¯äºã¤ã¹ãã¬ã¼ã¸ç®¡çã¢ã¸ã¥ã¼ã«ãå«ã¾ãã¦ãã¾ã:</p>
     
     <dl>
-    <dt><module>mod_disk_cache</module></dt>
+    <dt><module>mod_cache_disk</module></dt>
     <dd>ãã£ã¹ã¯ãä½¿ç¨ããã¹ãã¬ã¼ã¸ç®¡çæ©æ§ãå®è£ãã¦ãã¾ãã</dd>
 
     <dt><module>mod_mem_cache</module></dt>
@@ -69,15 +69,15 @@
 <section id="related"><title>é¢é£ã¢ã¸ã¥ã¼ã«ã¨ãã£ã¬ã¯ãã£ã</title>
     <related>
       <modulelist>
-        <module>mod_disk_cache</module>
+        <module>mod_cache_disk</module>
         <module>mod_mem_cache</module>
       </modulelist>
       <directivelist>
-        <directive module="mod_disk_cache">CacheRoot</directive>
-        <directive module="mod_disk_cache">CacheDirLevels</directive>
-        <directive module="mod_disk_cache">CacheDirLength</directive>
-        <directive module="mod_disk_cache">CacheMinFileSize</directive>
-        <directive module="mod_disk_cache">CacheMaxFileSize</directive>
+        <directive module="mod_cache_disk">CacheRoot</directive>
+        <directive module="mod_cache_disk">CacheDirLevels</directive>
+        <directive module="mod_cache_disk">CacheDirLength</directive>
+        <directive module="mod_cache_disk">CacheMinFileSize</directive>
+        <directive module="mod_cache_dist">CacheMaxFileSize</directive>
         <directive module="mod_mem_cache">MCacheSize</directive>
         <directive module="mod_mem_cache">MCacheMaxObjectCount</directive>
         <directive module="mod_mem_cache">MCacheMinObjectSize</directive>
@@ -97,10 +97,10 @@
       <br />
       &lt;IfModule mod_cache.c&gt;<br />
       <indent>
-        #LoadModule disk_cache_module modules/mod_disk_cache.so<br />
-        # If you want to use mod_disk_cache instead of mod_mem_cache,<br />
+        #LoadModule cache_disk_module modules/mod_cache_disk.so<br />
+        # If you want to use mod_cache_disk instead of mod_mem_cache,<br />
         # uncomment the line above and comment out the LoadModule line below.<br />
-        &lt;IfModule mod_disk_cache.c&gt;<br />
+        &lt;IfModule mod_cache_disk.c&gt;<br />
         <indent>
           CacheRoot c:/cacheroot<br />
           CacheEnable disk  /<br />
@@ -142,7 +142,7 @@
     <module>mod_mem_cache</module> ã§å®è£ããã¦ããã¡ã¢ãªãä½¿ã£ãã¹ãã¬ã¼ã¸
     ç®¡çæ¹å¼ãä½¿ãããã« <module>mod_cache</module> ã«æç¤ºãã¾ãã
     <var>cache_type</var> <code>disk</code> ã§ã
-    <module>mod_disk_cache</module> ã§å®è£ããã¦ãããã£ã¹ã¯ãä½¿ã£ãã¹ãã¬ã¼ã¸
+    <module>mod_cache_disk</module> ã§å®è£ããã¦ãããã£ã¹ã¯ãä½¿ã£ãã¹ãã¬ã¼ã¸
     ç®¡çãä½¿ãããã« <module>mod_cache</module> ã«æç¤ºãã¾ãã
     <var>cache_type</var> <code>fd</code> ã¯ <module>mod_cache</module> ã«
     <module>mod_mem_cache</module> ã«ããå®è£ããã¦ãããã¡ã¤ã«è¨è¿°å­ã®
diff --git a/docs/manual/mod/mod_cache.xml.ko b/docs/manual/mod/mod_cache.xml.ko
index a83922cf2cc..17a811b56db 100644
--- a/docs/manual/mod/mod_cache.xml.ko
+++ b/docs/manual/mod/mod_cache.xml.ko
@@ -40,7 +40,7 @@
     »ç¿ëÇÏ·Á¸é ÀúÀå°ü¸®¸ðµâ(storage management module)ÀÌ ÇÊ¿äÇÏ´Ù.
     ±âº» ¾ÆÆÄÄ¡ ¹èÆ÷º»¿¡´Â µÎ°¡Áö ÀúÀå°ü¸®¸ðµâÀÌ ÀÖ´Ù:</p>
     <dl>
-    <dt><module>mod_disk_cache</module></dt>
+    <dt><module>mod_cache_disk</module></dt>
     <dd>´Â µð½ºÅ©±â¹Ý ÀúÀå°ü¸®ÀÚ¸¦ ±¸ÇöÇÑ´Ù.</dd>
 
     <dt><module>mod_mem_cache</module></dt>
@@ -61,23 +61,23 @@
 <section id="related"><title>°ü·ÃµÈ ¸ðµâ°ú Áö½Ã¾î</title>
     <related>
       <modulelist>
-        <module>mod_disk_cache</module>
+        <module>mod_cache_disk</module>
         <module>mod_mem_cache</module>
       </modulelist>
       <directivelist>
-        <directive module="mod_disk_cache">CacheRoot</directive>
-        <directive module="mod_disk_cache">CacheSize</directive>
-        <directive module="mod_disk_cache">CacheGcInterval</directive>
-        <directive module="mod_disk_cache">CacheDirLevels</directive>
-        <directive module="mod_disk_cache">CacheDirLength</directive>
-        <directive module="mod_disk_cache">CacheExpiryCheck</directive>
-        <directive module="mod_disk_cache">CacheMinFileSize</directive>
-        <directive module="mod_disk_cache">CacheMaxFileSize</directive>
-        <directive module="mod_disk_cache">CacheTimeMargin</directive>
-        <directive module="mod_disk_cache">CacheGcDaily</directive>
-        <directive module="mod_disk_cache">CacheGcUnused</directive>
-        <directive module="mod_disk_cache">CacheGcClean</directive>
-        <directive module="mod_disk_cache">CacheGcMemUsage</directive>
+        <directive module="mod_cache_disk">CacheRoot</directive>
+        <directive module="mod_cache_disk">CacheSize</directive>
+        <directive module="mod_cache_disk">CacheGcInterval</directive>
+        <directive module="mod_cache_disk">CacheDirLevels</directive>
+        <directive module="mod_cache_disk">CacheDirLength</directive>
+        <directive module="mod_cache_disk">CacheExpiryCheck</directive>
+        <directive module="mod_cache_disk">CacheMinFileSize</directive>
+        <directive module="mod_cache_disk">CacheMaxFileSize</directive>
+        <directive module="mod_cache_disk">CacheTimeMargin</directive>
+        <directive module="mod_cache_disk">CacheGcDaily</directive>
+        <directive module="mod_cache_disk">CacheGcUnused</directive>
+        <directive module="mod_cache_disk">CacheGcClean</directive>
+        <directive module="mod_cache_disk">CacheGcMemUsage</directive>
         <directive module="mod_mem_cache">MCacheSize</directive>
         <directive module="mod_mem_cache">MCacheMaxObjectCount</directive>
         <directive module="mod_mem_cache">MCacheMinObjectSize</directive>
@@ -97,8 +97,8 @@
       <br />
       &lt;IfModule mod_cache.c&gt;<br />
       <indent>
-        #LoadModule disk_cache_module modules/mod_disk_cache.so<br />
-        &lt;IfModule mod_disk_cache.c&gt;<br />
+        #LoadModule cache_disk_module modules/mod_cache_disk.so<br />
+        &lt;IfModule mod_cache_disk.c&gt;<br />
         <indent>
           CacheRoot c:/cacheroot<br />
           CacheSize 256<br />
@@ -137,7 +137,7 @@
     ¾Æ±Ô¸ÕÆ®·Î ÁöÁ¤ÇÑ´Ù. <var>cache_type</var> <code>mem</code>Àº
     <module>mod_mem_cache</module>°¡ ±¸ÇöÇÏ´Â ¸Þ¸ð¸®±â¹Ý
     ÀúÀå°ü¸®ÀÚ¸¦ »ç¿ëÇÑ´Ù. <var>cache_type</var> <code>disk</code>´Â
-    <module>mod_disk_cache</module>°¡ ±¸ÇöÇÏ´Â µð½ºÅ©±â¹Ý
+    <module>mod_cache_disk</module>°¡ ±¸ÇöÇÏ´Â µð½ºÅ©±â¹Ý
     ÀúÀå°ü¸®ÀÚ¸¦ »ç¿ëÇÑ´Ù. <var>cache_type</var> <code>fd</code>´Â
     <module>mod_mem_cache</module>°¡ ±¸ÇöÇÏ´Â ÆÄÀÏ±â¼úÀÚ Ä³½¬¸¦
     »ç¿ëÇÑ´Ù.</p>
diff --git a/docs/manual/mod/mod_disk_cache.html b/docs/manual/mod/mod_cache_disk.html
similarity index 70%
rename from docs/manual/mod/mod_disk_cache.html
rename to docs/manual/mod/mod_cache_disk.html
index 7d9c1d0a585..650b6e301c3 100644
--- a/docs/manual/mod/mod_disk_cache.html
+++ b/docs/manual/mod/mod_cache_disk.html
@@ -1,17 +1,17 @@
 # GENERATED FROM XML -- DO NOT EDIT
 
-URI: mod_disk_cache.html.en
+URI: mod_cache_disk.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_disk_cache.html.fr
+URI: mod_cache_disk.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_disk_cache.html.ja.utf8
+URI: mod_cache_disk.html.ja.utf8
 Content-Language: ja
 Content-type: text/html; charset=UTF-8
 
-URI: mod_disk_cache.html.ko.euc-kr
+URI: mod_cache_disk.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
diff --git a/docs/manual/mod/mod_disk_cache.html.en b/docs/manual/mod/mod_cache_disk.html.en
similarity index 90%
rename from docs/manual/mod/mod_disk_cache.html.en
rename to docs/manual/mod/mod_cache_disk.html.en
index 974dc57926f..ce3ddacfb95 100644
--- a/docs/manual/mod/mod_disk_cache.html.en
+++ b/docs/manual/mod/mod_cache_disk.html.en
@@ -5,7 +5,7 @@
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>mod_disk_cache - Apache HTTP Server</title>
+<title>mod_cache_disk - 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" />
@@ -19,20 +19,20 @@
 <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/">Documentation</a> &gt; <a href="../">Version 2.3</a> &gt; <a href="./">Modules</a></div>
 <div id="page-content">
-<div id="preamble"><h1>Apache Module mod_disk_cache</h1>
+<div id="preamble"><h1>Apache Module mod_cache_disk</h1>
 <div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_disk_cache.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/mod/mod_disk_cache.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="../ja/mod/mod_disk_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_disk_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<p><span>Available Languages: </span><a href="../en/mod/mod_cache_disk.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/mod/mod_cache_disk.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/mod/mod_cache_disk.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cache_disk.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Disk based storage module for the HTTP caching filter.</td></tr>
 <tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>disk_cache_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_disk_cache.c</td></tr></table>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>cache_disk_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_cache_disk.c</td></tr></table>
 <h3>Summary</h3>
 
-    <p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> implements a disk based storage
+    <p><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> implements a disk based storage
     manager for <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
 
     <p>The headers and bodies of cached responses are stored separately on
@@ -54,17 +54,17 @@
     can be daemonized to offer continuous monitoring of directory sizes.</p>
 
     <div class="note"><h3>Note:</h3>
-      <p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> requires the services of
+      <p><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> requires the services of
       <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>, which must be
-      loaded before mod_disk_cache.</p>
+      loaded before mod_cache_disk.</p>
     </div>
     <div class="note"><h3>Note:</h3>
-      <p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> uses the sendfile feature to
+      <p><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> uses the sendfile feature to
       serve files from the cache when supported by the platform, and
       when enabled with <code class="directive"><a href="../mod/core.html#enablesendfile">EnableSendfile</a></code>.
       However, per-directory and .htaccess configuration of
       <code class="directive"><a href="../mod/core.html#enablesendfile">EnableSendfile</a></code> are ignored by
-      <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> as the corresponding settings are not
+      <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> as the corresponding settings are not
       available to the module when a request is being served from the
       cache.</p>
     </div>
@@ -89,7 +89,7 @@
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheDirLength 2</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>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>The <code class="directive">CacheDirLength</code> directive sets the number
     of characters for each subdirectory name in the cache hierarchy. It can
@@ -116,7 +116,7 @@ cache.</td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheDirLevels 2</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>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>The <code class="directive">CacheDirLevels</code> directive sets the number
     of subdirectory levels in the cache. Cached data will be saved this
@@ -143,7 +143,7 @@ cache</td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheMaxFileSize 1000000</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>The <code class="directive">CacheMaxFileSize</code> directive sets the
     maximum size, in bytes, for a document to be considered for storage in
@@ -163,7 +163,7 @@ cache</td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheMinFileSize 1</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>The <code class="directive">CacheMinFileSize</code> directive sets the
     minimum size, in bytes, for a document to be considered for storage
@@ -183,7 +183,7 @@ cache</td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheReadSize 0</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>The <code class="directive">CacheReadSize</code> directive sets the
     minimum amount of data, in bytes, to be read from the backend before the
@@ -210,7 +210,7 @@ cache</td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheReadTime 0</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>The <code class="directive">CacheReadTime</code> directive sets the minimum amount
     of elapsed time that should pass before making an attempt to send data
@@ -240,10 +240,10 @@ stored</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheRoot <var>directory</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>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>The <code class="directive">CacheRoot</code> directive defines the name of
-    the directory on the disk to contain cache files. If the <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> module has been loaded or compiled in to the
+    the directory on the disk to contain cache files. If the <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> module has been loaded or compiled in to the
     Apache server, this directive <em>must</em> be defined. Failing to
     provide a value for <code class="directive">CacheRoot</code> will result in
     a configuration file processing error. The <code class="directive"><a href="#cachedirlevels">CacheDirLevels</a></code> and <code class="directive"><a href="#cachedirlength">CacheDirLength</a></code> directives define
@@ -256,10 +256,10 @@ stored</td></tr>
 </div>
 </div>
 <div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_disk_cache.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/mod/mod_disk_cache.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="../ja/mod/mod_disk_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_disk_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<p><span>Available Languages: </span><a href="../en/mod/mod_cache_disk.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/mod/mod_cache_disk.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/mod/mod_cache_disk.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cache_disk.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 2010 The Apache Software Foundation.<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>
diff --git a/docs/manual/mod/mod_disk_cache.html.fr b/docs/manual/mod/mod_cache_disk.html.fr
similarity index 91%
rename from docs/manual/mod/mod_disk_cache.html.fr
rename to docs/manual/mod/mod_cache_disk.html.fr
index 07e9c344578..f31753116e1 100644
--- a/docs/manual/mod/mod_disk_cache.html.fr
+++ b/docs/manual/mod/mod_cache_disk.html.fr
@@ -5,7 +5,7 @@
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>mod_disk_cache - Serveur Apache HTTP</title>
+<title>mod_cache_disk - Serveur Apache HTTP</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" />
@@ -19,21 +19,21 @@
 <div id="path">
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">Serveur HTTP</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.3</a> &gt; <a href="./">Modules</a></div>
 <div id="page-content">
-<div id="preamble"><h1>Module Apache mod_disk_cache</h1>
+<div id="preamble"><h1>Module Apache mod_cache_disk</h1>
 <div class="toplang">
-<p><span>Langues Disponibles: </span><a href="../en/mod/mod_disk_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/mod/mod_disk_cache.html" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="../ja/mod/mod_disk_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_disk_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<p><span>Langues Disponibles: </span><a href="../en/mod/mod_cache_disk.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/mod/mod_cache_disk.html" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/mod/mod_cache_disk.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cache_disk.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Module de stockage sur disque pour le filtre de mise en
 cache HTTP.</td></tr>
 <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur de Module:</a></th><td>disk_cache_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">Fichier Source:</a></th><td>mod_disk_cache.c</td></tr></table>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur de Module:</a></th><td>cache_disk_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Fichier Source:</a></th><td>mod_cache_disk.c</td></tr></table>
 <h3>Sommaire</h3>
 
-    <p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> implémente un gestionnaire de
+    <p><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> implémente un gestionnaire de
     stockage sur disque pour le module <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
 
     <p>Les en-têtes et corps des réponses mises en cache sont stockés
@@ -58,14 +58,14 @@ cache HTTP.</td></tr>
 
     <div class="note"><h3>Note :</h3>
       <p><code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> doit être chargé avant
-      <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> pour que ce dernier puisse
+      <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> pour que ce dernier puisse
       fonctionner.</p>
     </div>
     <p>Lorsque la plate-forme la supporte, et si elle est activée via la
     directive <code class="directive"><a href="../mod/core.html#enablesendfile">EnableSendfile</a></code>,
-    <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> utilise la fonctionnalité sendfile
+    <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> utilise la fonctionnalité sendfile
     pour servir les fichiers à partir du cache. Cependant,
-    <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> ignore la configuration de la
+    <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> ignore la configuration de la
     directive <code class="directive"><a href="../mod/core.html#enablesendfile">EnableSendfile</a></code> dans
     un contexte de répertoire ou de fichier .htaccess, car le module ne
     dispose pas des définitions correspondantes lorsque la requête est
@@ -92,7 +92,7 @@ sous-r
 <tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>CacheDirLength 2</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>la directive <code class="directive">CacheDirLength</code> permet de
     définir le nombre de caractères que comportera chaque nom de
@@ -123,7 +123,7 @@ cache.</td></tr>
 <tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>CacheDirLevels 2</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>La directive <code class="directive">CacheDirLevels</code> permet de
     définir le nombre de niveaux de sous-répertoires que comportera le
@@ -152,7 +152,7 @@ cache.</td></tr>
 <tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>CacheMaxFileSize 1000000</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, répertoire, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>La directive <code class="directive">CacheMaxFileSize</code> permet de
     définir la taille maximale d'un document, en octets, pour que
@@ -172,7 +172,7 @@ cache.</td></tr>
 <tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>CacheMinFileSize 1</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, répertoire, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>La directive <code class="directive">CacheMinFileSize</code> permet de
     définir la taille minimale d'un document, en octets, pour que
@@ -192,7 +192,7 @@ mettre en cache avant de les envoyer au client</td></tr>
 <tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>CacheReadSize 0</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, répertoire, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>La directive <code class="directive">CacheReadSize</code> permet de
     définir la quantité minimale de données, en octets, à lire depuis le
@@ -222,7 +222,7 @@ avant d'envoyer les donn
 <tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>CacheReadTime 0</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, répertoire, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>La directive <code class="directive">CacheReadTime</code> permet de
     définir le temps minimum qui doit s'écouler avant d'essayer
@@ -253,11 +253,11 @@ seront stock
 <tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>CacheRoot <var>répertoire</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p>La directive <code class="directive">CacheRoot</code> permet de définir
     le nom du répertoire sur disque qui contiendra les fichiers du
-    cache. Si le module <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> a été chargé ou
+    cache. Si le module <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> a été chargé ou
     compilé dans le serveur Apache, cette directive <em>doit</em> être
     définie. L'absence de définition de la directive
     <code class="directive">CacheRoot</code> provoquera une erreur de traitement
@@ -272,10 +272,10 @@ seront stock
 </div>
 </div>
 <div class="bottomlang">
-<p><span>Langues Disponibles: </span><a href="../en/mod/mod_disk_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/mod/mod_disk_cache.html" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="../ja/mod/mod_disk_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_disk_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<p><span>Langues Disponibles: </span><a href="../en/mod/mod_cache_disk.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/mod/mod_cache_disk.html" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/mod/mod_cache_disk.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cache_disk.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 2010 The Apache Software Foundation.<br />Autorisé sous <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">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
diff --git a/docs/manual/mod/mod_disk_cache.html.ja.utf8 b/docs/manual/mod/mod_cache_disk.html.ja.utf8
similarity index 90%
rename from docs/manual/mod/mod_disk_cache.html.ja.utf8
rename to docs/manual/mod/mod_cache_disk.html.ja.utf8
index b5c59f87efd..51cb1906128 100644
--- a/docs/manual/mod/mod_disk_cache.html.ja.utf8
+++ b/docs/manual/mod/mod_cache_disk.html.ja.utf8
@@ -5,7 +5,7 @@
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>mod_disk_cache - Apache HTTP ãµã¼ã</title>
+<title>mod_cache_disk - Apache HTTP ãµã¼ã</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" />
@@ -20,22 +20,22 @@
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ãµã¼ã</a> &gt; <a href="http://httpd.apache.org/docs/">ãã­ã¥ã¡ã³ãã¼ã·ã§ã³</a> &gt; <a href="../">ãã¼ã¸ã§ã³
             2.3</a> &gt; <a href="./">ã¢ã¸ã¥ã¼ã«</a></div>
 <div id="page-content">
-<div id="preamble"><h1>Apache ã¢ã¸ã¥ã¼ã« mod_disk_cache</h1>
+<div id="preamble"><h1>Apache ã¢ã¸ã¥ã¼ã« mod_cache_disk</h1>
 <div class="toplang">
-<p><span>è¨èª: </span><a href="../en/mod/mod_disk_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/mod/mod_disk_cache.html" hreflang="fr" rel="alternate" title="FranÃ§ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/mod/mod_disk_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_disk_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<p><span>è¨èª: </span><a href="../en/mod/mod_cache_disk.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/mod/mod_cache_disk.html" hreflang="fr" rel="alternate" title="FranÃ§ais">&nbsp;fr&nbsp;</a> |
+<a href="../ja/mod/mod_cache_disk.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cache_disk.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 <div class="outofdate">ãã®æ¥æ¬èªè¨³ã¯ãã§ã«å¤ããªã£ã¦ããå¯è½æ§ãããã¾ãã
           æ´æ°ãããåå®¹ãè¦ãã«ã¯è±èªçããè¦§ä¸ããã</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">èª¬æ:</a></th><td>URI ãã­ã¼ã«ããã³ã³ãã³ãã­ã£ãã·ã¥ã¹ãã¬ã¼ã¸ç®¡ç</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>disk_cache_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">ã½ã¼ã¹ãã¡ã¤ã«:</a></th><td>mod_disk_cache.c</td></tr></table>
+<tr><th><a href="module-dict.html#ModuleIdentifier">ã¢ã¸ã¥ã¼ã«è­å¥å­:</a></th><td>cache_disk_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ã½ã¼ã¹ãã¡ã¤ã«:</a></th><td>mod_cache_disk.c</td></tr></table>
 <h3>æ¦è¦</h3>
 
-    <p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> ã¯ãã£ã¹ã¯ãä½¿ç¨ããã¹ãã¬ã¼ã¸
+    <p><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> ã¯ãã£ã¹ã¯ãä½¿ç¨ããã¹ãã¬ã¼ã¸
     ç®¡çæ©æ§ãå®è£ãã¦ãã¾ããä¸»ã«
     <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ã¨çµã¿åããã¦ä½¿ããã¾ãã</p>
 
@@ -46,7 +46,7 @@
     <code class="program"><a href="../programs/htcacheclean.html">htcacheclean</a></code> ãä½¿ããã¨ãã§ãã¾ãã</p>
 
     <div class="note"><h3>æ³¨:</h3>
-      <p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> ã¯
+      <p><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> ã¯
       <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ãå¿è¦ã¨ãã¾ã</p>
     </div>
 </div>
@@ -68,7 +68,7 @@
 <tr><th><a href="directive-dict.html#Default">ããã©ã«ã:</a></th><td><code>CacheDirLength 2</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">ã³ã³ãã­ã¹ã:</a></th><td>ãµã¼ãè¨­å®ãã¡ã¤ã«, ãã¼ãã£ã«ãã¹ã</td></tr>
 <tr><th><a href="directive-dict.html#Status">ã¹ãã¼ã¿ã¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">ã¢ã¸ã¥ã¼ã«:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">ã¢ã¸ã¥ã¼ã«:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p><code class="directive">CacheDirLength</code> ãã£ã¬ã¯ãã£ãã¯ã­ã£ãã·ã¥
     éå±¤ã®åãµããã£ã¬ã¯ããªã®æå­æ°ãè¨­å®ãã¾ãã
@@ -95,7 +95,7 @@
 <tr><th><a href="directive-dict.html#Default">ããã©ã«ã:</a></th><td><code>CacheDirLevels 2</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">ã³ã³ãã­ã¹ã:</a></th><td>ãµã¼ãè¨­å®ãã¡ã¤ã«, ãã¼ãã£ã«ãã¹ã</td></tr>
 <tr><th><a href="directive-dict.html#Status">ã¹ãã¼ã¿ã¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">ã¢ã¸ã¥ã¼ã«:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">ã¢ã¸ã¥ã¼ã«:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p><code class="directive">CacheDirLevels</code> ãã£ã¬ã¯ãã£ãã¯ã­ã£ãã·ã¥ã®
     ãµããã£ã¬ã¯ããªã®æ·±ããè¨­å®ãã¾ããã­ã£ãã·ã¥ãã¼ã¿ã¯ <code class="directive"><a href="#cacheroot">CacheRoot</a></code> ãã£ã¬ã¯ããªãã
@@ -121,7 +121,7 @@
 <tr><th><a href="directive-dict.html#Default">ããã©ã«ã:</a></th><td><code>CacheMaxFileSize 1000000</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">ã³ã³ãã­ã¹ã:</a></th><td>ãµã¼ãè¨­å®ãã¡ã¤ã«, ãã¼ãã£ã«ãã¹ã</td></tr>
 <tr><th><a href="directive-dict.html#Status">ã¹ãã¼ã¿ã¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">ã¢ã¸ã¥ã¼ã«:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">ã¢ã¸ã¥ã¼ã«:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p><code class="directive">CacheMaxFileSize</code> ãã£ã¬ã¯ãã£ãã¯ããã­ã¥ã¡ã³ãã
     ã­ã£ãã·ã¥ãããã©ãããå¤å®ãããæå¤§ã®ãµã¤ãºããã¤ãæ°ã§è¨­å®ãã¾ãã</p>
@@ -139,7 +139,7 @@
 <tr><th><a href="directive-dict.html#Default">ããã©ã«ã:</a></th><td><code>CacheMinFileSize 1</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">ã³ã³ãã­ã¹ã:</a></th><td>ãµã¼ãè¨­å®ãã¡ã¤ã«, ãã¼ãã£ã«ãã¹ã</td></tr>
 <tr><th><a href="directive-dict.html#Status">ã¹ãã¼ã¿ã¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">ã¢ã¸ã¥ã¼ã«:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">ã¢ã¸ã¥ã¼ã«:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p><code class="directive">CacheMinFileSize</code> ãã£ã¬ã¯ãã£ãã¯ããã­ã¥ã¡ã³ãã
     ã­ã£ãã·ã¥ãããã©ãããå¤å®ãããæå°ã®ãµã¤ãºããã¤ãæ°ã§è¨­å®ãã¾ãã</p>
@@ -156,10 +156,10 @@
 <tr><th><a href="directive-dict.html#Syntax">æ§æ:</a></th><td><code>CacheRoot <var>directory</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Context">ã³ã³ãã­ã¹ã:</a></th><td>ãµã¼ãè¨­å®ãã¡ã¤ã«, ãã¼ãã£ã«ãã¹ã</td></tr>
 <tr><th><a href="directive-dict.html#Status">ã¹ãã¼ã¿ã¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">ã¢ã¸ã¥ã¼ã«:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">ã¢ã¸ã¥ã¼ã«:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p><code class="directive">CacheRoot</code> ãã£ã¬ã¯ãã£ãã¯ã­ã£ãã·ã¥ãã¡ã¤ã«ã
-    ä¿ç®¡ããããã®ãã£ã¹ã¯ä¸ã®ãã£ã¬ã¯ããªãæå®ãã¾ãã<code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> ã¢ã¸ã¥ã¼ã«ã Apache ãµã¼ãã«ã­ã¼ãããã¦
+    ä¿ç®¡ããããã®ãã£ã¹ã¯ä¸ã®ãã£ã¬ã¯ããªãæå®ãã¾ãã<code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> ã¢ã¸ã¥ã¼ã«ã Apache ãµã¼ãã«ã­ã¼ãããã¦
     ããããçµã¿è¾¼ã¾ãã¦ããã°ããã®ãã£ã¬ã¯ãã£ãã¯<em>å¿ã</em>
     å®ç¾©ããªããã°ãªãã¾ããã
     <code class="directive">CacheRoot</code> ã®å¤ãæå®ããªããã°ã
@@ -173,10 +173,10 @@
 </div>
 </div>
 <div class="bottomlang">
-<p><span>è¨èª: </span><a href="../en/mod/mod_disk_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/mod/mod_disk_cache.html" hreflang="fr" rel="alternate" title="FranÃ§ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/mod/mod_disk_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_disk_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<p><span>è¨èª: </span><a href="../en/mod/mod_cache_disk.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/mod/mod_cache_disk.html" hreflang="fr" rel="alternate" title="FranÃ§ais">&nbsp;fr&nbsp;</a> |
+<a href="../ja/mod/mod_cache_disk.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cache_disk.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 2010 The Apache Software Foundation.<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/">ã¢ã¸ã¥ã¼ã«</a> | <a href="../mod/directives.html">ãã£ã¬ã¯ãã£ã</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ç¨èª</a> | <a href="../sitemap.html">ãµã¤ãããã</a></p></div>
diff --git a/docs/manual/mod/mod_disk_cache.html.ko.euc-kr b/docs/manual/mod/mod_cache_disk.html.ko.euc-kr
similarity index 90%
rename from docs/manual/mod/mod_disk_cache.html.ko.euc-kr
rename to docs/manual/mod/mod_cache_disk.html.ko.euc-kr
index 70067e9c982..ccc19019c1d 100644
--- a/docs/manual/mod/mod_disk_cache.html.ko.euc-kr
+++ b/docs/manual/mod/mod_cache_disk.html.ko.euc-kr
@@ -5,7 +5,7 @@
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>mod_disk_cache - Apache HTTP Server</title>
+<title>mod_cache_disk - 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" />
@@ -19,26 +19,26 @@
 <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/">Documentation</a> &gt; <a href="../">Version 2.3</a> &gt; <a href="./">¸ðµâ</a></div>
 <div id="page-content">
-<div id="preamble"><h1>¾ÆÆÄÄ¡ ¸ðµâ mod_disk_cache</h1>
+<div id="preamble"><h1>¾ÆÆÄÄ¡ ¸ðµâ mod_cache_disk</h1>
 <div class="toplang">
-<p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_disk_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/mod/mod_disk_cache.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/mod/mod_disk_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_disk_cache.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_cache_disk.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/mod/mod_cache_disk.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
+<a href="../ja/mod/mod_cache_disk.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cache_disk.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇÏ¼¼¿ä.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">¼³¸í:</a></th><td>Content cache storage manager keyed to URIs</td></tr>
 <tr><th><a href="module-dict.html#Status">»óÅÂ:</a></th><td>Experimental</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¸ðµâ¸í:</a></th><td>disk_cache_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¼Ò½ºÆÄÀÏ:</a></th><td>mod_disk_cache.c</td></tr></table>
+<tr><th><a href="module-dict.html#ModuleIdentifier">¸ðµâ¸í:</a></th><td>cache_disk_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">¼Ò½ºÆÄÀÏ:</a></th><td>mod_cache_disk.c</td></tr></table>
 <h3>¿ä¾à</h3>
 
     <div class="warning">
       ÀÌ ¸ðµâÀº ½ÇÇèÀûÀÎ »óÅÂÀÌ´Ù. ¹®¼­´Â ¾ÆÁ÷ ÀÛ¾÷ÁßÀÌ´Ù...
     </div>
 
-    <p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>´Â µð½ºÅ©±â¹Ý ÀúÀå°ü¸®ÀÚ¸¦
+    <p><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>´Â µð½ºÅ©±â¹Ý ÀúÀå°ü¸®ÀÚ¸¦
     ±¸ÇöÇÑ´Ù. ÀÌ ¸ðµâÀº ±âº»ÀûÀ¸·Î <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>¿Í
     °°ÀÌ »ç¿ëÇÑ´Ù.</p>
 
@@ -46,7 +46,7 @@
     Á¢±Ùº¸È£°¡ µÈ ³»¿ëÀº Ä³½¬ÇÏÁö¾Ê´Â´Ù.</p>
 
     <div class="note"><h3>ÁÖÀÇ:</h3>
-      <p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>´Â
+      <p><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>´Â
       <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>°¡ ÇÊ¿äÇÏ´Ù.</p>
     </div>
 </div>
@@ -68,7 +68,7 @@
 <tr><th><a href="directive-dict.html#Default">±âº»°ª:</a></th><td><code>CacheDirLength 2</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">»ç¿ëÀå¼Ò:</a></th><td>ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®</td></tr>
 <tr><th><a href="directive-dict.html#Status">»óÅÂ:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p><code class="directive">CacheDirLength</code> Áö½Ã¾î´Â Ä³½¬
     °èÃþ±¸Á¶¿¡¼­ °¢ ÇÏÀ§µð·ºÅä¸®¸íÀÇ ¹®ÀÚ¼ö¸¦ ÁöÁ¤ÇÑ´Ù.</p>
@@ -92,7 +92,7 @@
 <tr><th><a href="directive-dict.html#Default">±âº»°ª:</a></th><td><code>CacheDirLevels 3</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">»ç¿ëÀå¼Ò:</a></th><td>ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®</td></tr>
 <tr><th><a href="directive-dict.html#Status">»óÅÂ:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p><code class="directive">CacheDirLevels</code> Áö½Ã¾î´Â Ä³½¬ÀÇ
     ÇÏÀ§µð·ºÅä¸® ±íÀÌ¸¦ ÁöÁ¤ÇÑ´Ù. Ä³½¬µÈ ÀÚ·á¸¦ <code class="directive"><a href="#cacheroot">CacheRoot</a></code> µð·ºÅä¸®
@@ -116,7 +116,7 @@
 <tr><th><a href="directive-dict.html#Default">±âº»°ª:</a></th><td><code>CacheMaxFileSize 1000000</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">»ç¿ëÀå¼Ò:</a></th><td>ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®</td></tr>
 <tr><th><a href="directive-dict.html#Status">»óÅÂ:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p><code class="directive">CacheMaxFileSize</code> Áö½Ã¾î´Â Ä³½¬¿¡
     ÀúÀåÇÒ ¹®¼­ÀÇ ÃÖ´ëÅ©±â¸¦ ¹ÙÀÌÆ® ´ÜÀ§·Î ÁöÁ¤ÇÑ´Ù.</p>
@@ -134,7 +134,7 @@
 <tr><th><a href="directive-dict.html#Default">±âº»°ª:</a></th><td><code>CacheMinFileSize 1</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">»ç¿ëÀå¼Ò:</a></th><td>ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®</td></tr>
 <tr><th><a href="directive-dict.html#Status">»óÅÂ:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p><code class="directive">CacheMinFileSize</code> Áö½Ã¾î´Â Ä³½¬¿¡
     ÀúÀåÇÒ ¹®¼­ÀÇ ÃÖ¼ÒÅ©±â¸¦ ¹ÙÀÌÆ® ´ÜÀ§·Î ÁöÁ¤ÇÑ´Ù.</p>
@@ -151,10 +151,10 @@
 <tr><th><a href="directive-dict.html#Syntax">¹®¹ý:</a></th><td><code>CacheRoot <var>directory</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Context">»ç¿ëÀå¼Ò:</a></th><td>ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®</td></tr>
 <tr><th><a href="directive-dict.html#Status">»óÅÂ:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_disk_cache</td></tr>
+<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_cache_disk</td></tr>
 </table>
     <p><code class="directive">CacheRoot</code> Áö½Ã¾î´Â µð½ºÅ©¿¡¼­
-    Ä³½¬ ÆÄÀÏÀ» ÀúÀåÇÒ µð·ºÅä¸®¸¦ ÁöÁ¤ÇÑ´Ù. <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> ¸ðµâÀ» ¾ÆÆÄÄ¡ ¼­¹ö¿Í °°ÀÌ ÄÄÆÄÀÏÇÏ¿´°Å³ª
+    Ä³½¬ ÆÄÀÏÀ» ÀúÀåÇÒ µð·ºÅä¸®¸¦ ÁöÁ¤ÇÑ´Ù. <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> ¸ðµâÀ» ¾ÆÆÄÄ¡ ¼­¹ö¿Í °°ÀÌ ÄÄÆÄÀÏÇÏ¿´°Å³ª
     ÀÐ¾îµéÀÎ °æ¿ì <em>¹Ýµå½Ã</em> ÀÌ Áö½Ã¾î¸¦ Á¤ÀÇÇØ¾ß ÇÑ´Ù.
     <code class="directive">CacheRoot</code>¿¡ °ªÀÌ ¾øÀ¸¸é ¼³Á¤ÆÄÀÏÀ»
     Ã³¸®ÇÏÁö ¾Ê´Â´Ù. <code class="directive"><a href="#cachedirlevels">CacheDirLevels</a></code>¿Í <code class="directive"><a href="#cachedirlength">CacheDirLength</a></code> Áö½Ã¾î´Â
@@ -167,10 +167,10 @@
 </div>
 </div>
 <div class="bottomlang">
-<p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_disk_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/mod/mod_disk_cache.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/mod/mod_disk_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_disk_cache.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_cache_disk.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/mod/mod_cache_disk.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
+<a href="../ja/mod/mod_cache_disk.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cache_disk.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 2010 The Apache Software Foundation.<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/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
diff --git a/docs/manual/mod/mod_disk_cache.xml b/docs/manual/mod/mod_cache_disk.xml
similarity index 90%
rename from docs/manual/mod/mod_disk_cache.xml
rename to docs/manual/mod/mod_cache_disk.xml
index 3deda75cb96..03335a549ad 100644
--- a/docs/manual/mod/mod_disk_cache.xml
+++ b/docs/manual/mod/mod_cache_disk.xml
@@ -20,16 +20,16 @@
  limitations under the License.
 -->
 
-<modulesynopsis metafile="mod_disk_cache.xml.meta">
+<modulesynopsis metafile="mod_cache_disk.xml.meta">
 
-<name>mod_disk_cache</name>
+<name>mod_cache_disk</name>
 <description>Disk based storage module for the HTTP caching filter.</description>
 <status>Extension</status>
-<sourcefile>mod_disk_cache.c</sourcefile>
-<identifier>disk_cache_module</identifier>
+<sourcefile>mod_cache_disk.c</sourcefile>
+<identifier>cache_disk_module</identifier>
 
 <summary>
-    <p><module>mod_disk_cache</module> implements a disk based storage
+    <p><module>mod_cache_disk</module> implements a disk based storage
     manager for <module>mod_cache</module>.</p>
 
     <p>The headers and bodies of cached responses are stored separately on
@@ -51,17 +51,17 @@
     can be daemonized to offer continuous monitoring of directory sizes.</p>
 
     <note><title>Note:</title>
-      <p><module>mod_disk_cache</module> requires the services of
+      <p><module>mod_cache_disk</module> requires the services of
       <module>mod_cache</module>, which must be
-      loaded before mod_disk_cache.</p>
+      loaded before mod_cache_disk.</p>
     </note>
     <note><title>Note:</title>
-      <p><module>mod_disk_cache</module> uses the sendfile feature to
+      <p><module>mod_cache_disk</module> uses the sendfile feature to
       serve files from the cache when supported by the platform, and
       when enabled with <directive module="core">EnableSendfile</directive>.
       However, per-directory and .htaccess configuration of
       <directive module="core">EnableSendfile</directive> are ignored by
-      <module>mod_disk_cache</module> as the corresponding settings are not
+      <module>mod_cache_disk</module> as the corresponding settings are not
       available to the module when a request is being served from the
       cache.</p>
     </note>
@@ -78,12 +78,12 @@ stored</description>
 <usage>
     <p>The <directive>CacheRoot</directive> directive defines the name of
     the directory on the disk to contain cache files. If the <module
-    >mod_disk_cache</module> module has been loaded or compiled in to the
+    >mod_cache_disk</module> module has been loaded or compiled in to the
     Apache server, this directive <em>must</em> be defined. Failing to
     provide a value for <directive>CacheRoot</directive> will result in
     a configuration file processing error. The <directive
-    module="mod_disk_cache">CacheDirLevels</directive> and <directive
-    module="mod_disk_cache">CacheDirLength</directive> directives define
+    module="mod_cache_disk">CacheDirLevels</directive> and <directive
+    module="mod_cache_disk">CacheDirLength</directive> directives define
     the structure of the directories under the specified root directory.</p>
 
     <example>
@@ -104,7 +104,7 @@ cache.</description>
 <usage>
     <p>The <directive>CacheDirLevels</directive> directive sets the number
     of subdirectory levels in the cache. Cached data will be saved this
-    many directory levels below the <directive module="mod_disk_cache"
+    many directory levels below the <directive module="mod_cache_disk"
     >CacheRoot</directive> directory.</p>
     <p>A high value for <directive>CacheDirLevels</directive> combined
     with a low value for <directive>CacheDirLength</directive> will result in
@@ -113,7 +113,7 @@ cache.</description>
 
     <note>
       <p>The result of <directive>CacheDirLevels</directive>*
-      <directive module="mod_disk_cache">CacheDirLength</directive> must
+      <directive module="mod_cache_disk">CacheDirLength</directive> must
       not be higher than 20.</p>
     </note>
 
@@ -139,7 +139,7 @@ cache.</description>
     level.</p>
 
     <note>
-      <p>The result of <directive module="mod_disk_cache"
+      <p>The result of <directive module="mod_cache_disk"
       >CacheDirLevels</directive>* <directive>CacheDirLength</directive>
       must not be higher than 20.</p>
     </note>
@@ -247,7 +247,7 @@ cache</description>
     <p>This directive only takes effect when the data is being saved to the
     cache, as opposed to data being served from the cache. It is recommended
     that this option be used alongside the
-    <directive module="mod_disk_cache">CacheReadSize</directive> directive to
+    <directive module="mod_cache_disk">CacheReadSize</directive> directive to
     ensure that the server does not buffer excessively should data arrive faster
     than expected.</p>
 
diff --git a/docs/manual/mod/mod_disk_cache.xml.fr b/docs/manual/mod/mod_cache_disk.xml.fr
similarity index 92%
rename from docs/manual/mod/mod_disk_cache.xml.fr
rename to docs/manual/mod/mod_cache_disk.xml.fr
index 092ed7c157b..e0f9fc60b74 100644
--- a/docs/manual/mod/mod_disk_cache.xml.fr
+++ b/docs/manual/mod/mod_cache_disk.xml.fr
@@ -22,17 +22,17 @@
  limitations under the License.
 -->
 
-<modulesynopsis metafile="mod_disk_cache.xml.meta">
+<modulesynopsis metafile="mod_cache_disk.xml.meta">
 
-<name>mod_disk_cache</name>
+<name>mod_cache_disk</name>
 <description>Module de stockage sur disque pour le filtre de mise en
 cache HTTP.</description>
 <status>Extension</status>
-<sourcefile>mod_disk_cache.c</sourcefile>
-<identifier>disk_cache_module</identifier>
+<sourcefile>mod_cache_disk.c</sourcefile>
+<identifier>cache_disk_module</identifier>
 
 <summary>
-    <p><module>mod_disk_cache</module> impl&eacute;mente un gestionnaire de
+    <p><module>mod_cache_disk</module> impl&eacute;mente un gestionnaire de
     stockage sur disque pour le module <module>mod_cache</module>.</p>
 
     <p>Les en-t&ecirc;tes et corps des r&eacute;ponses mises en cache sont stock&eacute;s
@@ -57,14 +57,14 @@ cache HTTP.</description>
 
     <note><title>Note :</title>
       <p><module>mod_cache</module> doit &ecirc;tre charg&eacute; avant
-      <module>mod_disk_cache</module> pour que ce dernier puisse
+      <module>mod_cache_disk</module> pour que ce dernier puisse
       fonctionner.</p>
     </note>
     <p>Lorsque la plate-forme la supporte, et si elle est activ&eacute;e via la
     directive <directive module="core">EnableSendfile</directive>,
-    <module>mod_disk_cache</module> utilise la fonctionnalit&eacute; sendfile
+    <module>mod_cache_disk</module> utilise la fonctionnalit&eacute; sendfile
     pour servir les fichiers &agrave; partir du cache. Cependant,
-    <module>mod_disk_cache</module> ignore la configuration de la
+    <module>mod_cache_disk</module> ignore la configuration de la
     directive <directive module="core">EnableSendfile</directive> dans
     un contexte de r&eacute;pertoire ou de fichier .htaccess, car le module ne
     dispose pas des d&eacute;finitions correspondantes lorsque la requ&ecirc;te est
@@ -82,13 +82,13 @@ seront stock&eacute;s</description>
 <usage>
     <p>La directive <directive>CacheRoot</directive> permet de d&eacute;finir
     le nom du r&eacute;pertoire sur disque qui contiendra les fichiers du
-    cache. Si le module <module>mod_disk_cache</module> a &eacute;t&eacute; charg&eacute; ou
+    cache. Si le module <module>mod_cache_disk</module> a &eacute;t&eacute; charg&eacute; ou
     compil&eacute; dans le serveur Apache, cette directive <em>doit</em> &ecirc;tre
     d&eacute;finie. L'absence de d&eacute;finition de la directive
     <directive>CacheRoot</directive> provoquera une erreur de traitement
     du fichier de configuration. Les directives <directive
-    module="mod_disk_cache">CacheDirLevels</directive> et <directive
-    module="mod_disk_cache">CacheDirLength</directive> permettent de
+    module="mod_cache_disk">CacheDirLevels</directive> et <directive
+    module="mod_cache_disk">CacheDirLength</directive> permettent de
     d&eacute;finir la structure des sous-r&eacute;pertoires du r&eacute;pertoire racine
     sp&eacute;cifi&eacute;.</p>
 
@@ -111,7 +111,7 @@ cache.</description>
     <p>La directive <directive>CacheDirLevels</directive> permet de
     d&eacute;finir le nombre de niveaux de sous-r&eacute;pertoires que comportera le
     cache. Les donn&eacute;es du cache seront stok&eacute;es au niveau correspondant
-    par rapport au r&eacute;pertoire <directive module="mod_disk_cache"
+    par rapport au r&eacute;pertoire <directive module="mod_cache_disk"
     >CacheRoot</directive>.</p>
     <p>Une valeur haute pour <directive>CacheDirLevels</directive>
     combin&eacute;e avec une valeur basse pour
@@ -121,7 +121,7 @@ cache.</description>
 
     <note>
       <p>La valeur du produit <directive>CacheDirLevels</directive> *
-      <directive module="mod_disk_cache">CacheDirLength</directive> ne
+      <directive module="mod_cache_disk">CacheDirLength</directive> ne
       doit pas d&eacute;passer 20.</p>
     </note>
 
@@ -152,7 +152,7 @@ sous-r&eacute;pertoires</description>
 
     <note>
       <p>La valeur du produit <directive>CacheDirLevels</directive> *
-      <directive module="mod_disk_cache">CacheDirLength</directive> ne
+      <directive module="mod_cache_disk">CacheDirLength</directive> ne
       doit pas d&eacute;passer 20.</p>
     </note>
 
@@ -259,7 +259,7 @@ avant d'envoyer les donn&eacute;es au client</description>
     enregistr&eacute;es dans le cache, et non lorsque les donn&eacute;es sont servies &agrave;
     partir du cache. Il est recommand&eacute; d'harmoniser l'utilisation de cette
     directive avec celle de la directive <directive
-    module="mod_disk_cache">CacheReadSize</directive>, afin de s'assurer
+    module="mod_cache_disk">CacheReadSize</directive>, afin de s'assurer
     que le serveur n'effectue pas une mise en tampon excessive au cas
     o&ugrave; les donn&eacute;es arriveraient plus vite que pr&eacute;vu.</p>
 
diff --git a/docs/manual/mod/mod_disk_cache.xml.ja b/docs/manual/mod/mod_cache_disk.xml.ja
similarity index 89%
rename from docs/manual/mod/mod_disk_cache.xml.ja
rename to docs/manual/mod/mod_cache_disk.xml.ja
index 42dc668cd7e..8565b8063ca 100644
--- a/docs/manual/mod/mod_disk_cache.xml.ja
+++ b/docs/manual/mod/mod_cache_disk.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 515267:1029833 (outdated) -->
+<!-- English Revision: 515267:-1 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,16 +20,16 @@
  limitations under the License.
 -->
 
-<modulesynopsis metafile="mod_disk_cache.xml.meta">
+<modulesynopsis metafile="mod_cache_disk.xml.meta">
 
-<name>mod_disk_cache</name>
+<name>mod_cache_disk</name>
 <description>URI ãã­ã¼ã«ããã³ã³ãã³ãã­ã£ãã·ã¥ã¹ãã¬ã¼ã¸ç®¡ç</description>
 <status>Extension</status>
-<sourcefile>mod_disk_cache.c</sourcefile>
-<identifier>disk_cache_module</identifier>
+<sourcefile>mod_cache_disk.c</sourcefile>
+<identifier>cache_disk_module</identifier>
 
 <summary>
-    <p><module>mod_disk_cache</module> ã¯ãã£ã¹ã¯ãä½¿ç¨ããã¹ãã¬ã¼ã¸
+    <p><module>mod_cache_disk</module> ã¯ãã£ã¹ã¯ãä½¿ç¨ããã¹ãã¬ã¼ã¸
     ç®¡çæ©æ§ãå®è£ãã¦ãã¾ããä¸»ã«
     <module>mod_cache</module> ã¨çµã¿åããã¦ä½¿ããã¾ãã</p>
 
@@ -40,7 +40,7 @@
     <program>htcacheclean</program> ãä½¿ããã¨ãã§ãã¾ãã</p>
 
     <note><title>æ³¨:</title>
-      <p><module>mod_disk_cache</module> ã¯
+      <p><module>mod_cache_disk</module> ã¯
       <module>mod_cache</module> ãå¿è¦ã¨ãã¾ã</p>
     </note>
 </summary>
@@ -55,13 +55,13 @@
 <usage>
     <p><directive>CacheRoot</directive> ãã£ã¬ã¯ãã£ãã¯ã­ã£ãã·ã¥ãã¡ã¤ã«ã
     ä¿ç®¡ããããã®ãã£ã¹ã¯ä¸ã®ãã£ã¬ã¯ããªãæå®ãã¾ãã<module
-    >mod_disk_cache</module> ã¢ã¸ã¥ã¼ã«ã Apache ãµã¼ãã«ã­ã¼ãããã¦
+    >mod_cache_disk</module> ã¢ã¸ã¥ã¼ã«ã Apache ãµã¼ãã«ã­ã¼ãããã¦
     ããããçµã¿è¾¼ã¾ãã¦ããã°ããã®ãã£ã¬ã¯ãã£ãã¯<em>å¿ã</em>
     å®ç¾©ããªããã°ãªãã¾ããã
     <directive>CacheRoot</directive> ã®å¤ãæå®ããªããã°ã
     è¨­å®ãã¡ã¤ã«ã®å¦çã§ã¨ã©ã¼ã«ãªãã¾ãã<directive
-    module="mod_disk_cache">CacheDirLevels</directive> ãã£ã¬ã¯ãã£ãã¨ <directive
-    module="mod_disk_cache">CacheDirLength</directive> ãã£ã¬ã¯ãã£ãã
+    module="mod_cache_disk">CacheDirLevels</directive> ãã£ã¬ã¯ãã£ãã¨ <directive
+    module="mod_cache_disk">CacheDirLength</directive> ãã£ã¬ã¯ãã£ãã
     æå®ãããã«ã¼ããã£ã¬ã¯ããªä¸ã®ãã£ã¬ã¯ããªæ§æãå®ç¾©ãã¾ãã</p>
 
     <example>
@@ -81,7 +81,7 @@
 <usage>
     <p><directive>CacheDirLevels</directive> ãã£ã¬ã¯ãã£ãã¯ã­ã£ãã·ã¥ã®
     ãµããã£ã¬ã¯ããªã®æ·±ããè¨­å®ãã¾ããã­ã£ãã·ã¥ãã¼ã¿ã¯ <directive
-    module="mod_disk_cache">CacheRoot</directive> ãã£ã¬ã¯ããªãã
+    module="mod_cache_disk">CacheRoot</directive> ãã£ã¬ã¯ããªãã
     ãã®ãã£ã¬ã¯ããªã®æ·±ãåä¸ã®ãã£ã¬ã¯ããªã«ä¿å­ããã¾ãã</p>
     <p><directive>CacheDirLevels</directive> ãå¤§ããã¦
     <directive>CacheDirLength</directive> ãå°ããå ´åã
@@ -90,7 +90,7 @@
 
     <note>
       <p><directive>CacheDirLevels</directive>*
-      <directive module="mod_disk_cache">CacheDirLength</directive> ã®
+      <directive module="mod_cache_disk">CacheDirLength</directive> ã®
       çµæã¯ 20 ä»¥åã§ãªããã°ãªãã¾ããã</p>
     </note>
 
@@ -117,7 +117,7 @@
 
     <note>
       <p><directive>CacheDirLevels</directive>*
-      <directive module="mod_disk_cache">CacheDirLength</directive> ã®
+      <directive module="mod_cache_disk">CacheDirLength</directive> ã®
       çµæã¯ 20 ä»¥åã§ãªããã°ãªãã¾ããã</p>
     </note>
 
diff --git a/docs/manual/mod/mod_disk_cache.xml.ko b/docs/manual/mod/mod_cache_disk.xml.ko
similarity index 86%
rename from docs/manual/mod/mod_disk_cache.xml.ko
rename to docs/manual/mod/mod_cache_disk.xml.ko
index f0653d96574..6ddb360518c 100644
--- a/docs/manual/mod/mod_disk_cache.xml.ko
+++ b/docs/manual/mod/mod_cache_disk.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1029833 (outdated) -->
+<!-- English Revision: 105989:-1 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,20 +20,20 @@
  limitations under the License.
 -->
 
-<modulesynopsis metafile="mod_disk_cache.xml.meta">
+<modulesynopsis metafile="mod_cache_disk.xml.meta">
 
-<name>mod_disk_cache</name>
+<name>mod_cache_disk</name>
 <description>Content cache storage manager keyed to URIs</description>
 <status>Experimental</status>
-<sourcefile>mod_disk_cache.c</sourcefile>
-<identifier>disk_cache_module</identifier>
+<sourcefile>mod_cache_disk.c</sourcefile>
+<identifier>cache_disk_module</identifier>
 
 <summary>
     <note type="warning">
       ÀÌ ¸ðµâÀº ½ÇÇèÀûÀÎ »óÅÂÀÌ´Ù. ¹®¼­´Â ¾ÆÁ÷ ÀÛ¾÷ÁßÀÌ´Ù...
     </note>
 
-    <p><module>mod_disk_cache</module>´Â µð½ºÅ©±â¹Ý ÀúÀå°ü¸®ÀÚ¸¦
+    <p><module>mod_cache_disk</module>´Â µð½ºÅ©±â¹Ý ÀúÀå°ü¸®ÀÚ¸¦
     ±¸ÇöÇÑ´Ù. ÀÌ ¸ðµâÀº ±âº»ÀûÀ¸·Î <module>mod_proxy</module>¿Í
     °°ÀÌ »ç¿ëÇÑ´Ù.</p>
 
@@ -41,7 +41,7 @@
     Á¢±Ùº¸È£°¡ µÈ ³»¿ëÀº Ä³½¬ÇÏÁö¾Ê´Â´Ù.</p>
 
     <note><title>ÁÖÀÇ:</title>
-      <p><module>mod_disk_cache</module>´Â
+      <p><module>mod_cache_disk</module>´Â
       <module>mod_cache</module>°¡ ÇÊ¿äÇÏ´Ù.</p>
     </note>
 </summary>
@@ -56,12 +56,12 @@
 <usage>
     <p><directive>CacheRoot</directive> Áö½Ã¾î´Â µð½ºÅ©¿¡¼­
     Ä³½¬ ÆÄÀÏÀ» ÀúÀåÇÒ µð·ºÅä¸®¸¦ ÁöÁ¤ÇÑ´Ù. <module
-    >mod_disk_cache</module> ¸ðµâÀ» ¾ÆÆÄÄ¡ ¼­¹ö¿Í °°ÀÌ ÄÄÆÄÀÏÇÏ¿´°Å³ª
+    >mod_cache_disk</module> ¸ðµâÀ» ¾ÆÆÄÄ¡ ¼­¹ö¿Í °°ÀÌ ÄÄÆÄÀÏÇÏ¿´°Å³ª
     ÀÐ¾îµéÀÎ °æ¿ì <em>¹Ýµå½Ã</em> ÀÌ Áö½Ã¾î¸¦ Á¤ÀÇÇØ¾ß ÇÑ´Ù.
     <directive>CacheRoot</directive>¿¡ °ªÀÌ ¾øÀ¸¸é ¼³Á¤ÆÄÀÏÀ»
     Ã³¸®ÇÏÁö ¾Ê´Â´Ù. <directive
-    module="mod_disk_cache">CacheDirLevels</directive>¿Í <directive
-    module="mod_disk_cache">CacheDirLength</directive> Áö½Ã¾î´Â
+    module="mod_cache_disk">CacheDirLevels</directive>¿Í <directive
+    module="mod_cache_disk">CacheDirLength</directive> Áö½Ã¾î´Â
     ÀÌ Áö½Ã¾î·Î ÁöÁ¤ÇÑ root µð·ºÅä¸®ÀÇ ÇÏÀ§µð·ºÅä¸® ±¸Á¶¸¦ Áö½ÃÇÑ´Ù.</p>
 
     <example>
@@ -81,12 +81,12 @@
 <usage>
     <p><directive>CacheDirLevels</directive> Áö½Ã¾î´Â Ä³½¬ÀÇ
     ÇÏÀ§µð·ºÅä¸® ±íÀÌ¸¦ ÁöÁ¤ÇÑ´Ù. Ä³½¬µÈ ÀÚ·á¸¦ <directive
-    module="mod_disk_cache">CacheRoot</directive> µð·ºÅä¸®
+    module="mod_cache_disk">CacheRoot</directive> µð·ºÅä¸®
     ¾Æ·¡ ÀÌ ±íÀÌ±îÁö ÀúÀåÇÑ´Ù.</p>
 
     <note>
       <p><directive>CacheDirLevels</directive>¿Í <directive
-      module="mod_disk_cache">CacheDirLength</directive>¸¦
+      module="mod_cache_disk">CacheDirLength</directive>¸¦
       °öÇÏ¿© 20 º¸´Ù Å©¸é ¾ÈµÈ´Ù.</p>
     </note>
 
@@ -109,7 +109,7 @@
     °èÃþ±¸Á¶¿¡¼­ °¢ ÇÏÀ§µð·ºÅä¸®¸íÀÇ ¹®ÀÚ¼ö¸¦ ÁöÁ¤ÇÑ´Ù.</p>
 
     <note>
-      <p><directive module="mod_disk_cache">CacheDirLevels</directive>¿Í
+      <p><directive module="mod_cache_disk">CacheDirLevels</directive>¿Í
       <directive>CacheDirLength</directive>¸¦ °öÇÏ¿© 20 º¸´Ù
       Å©¸é ¾ÈµÈ´Ù.</p>
     </note>
diff --git a/docs/manual/mod/mod_disk_cache.xml.meta b/docs/manual/mod/mod_cache_disk.xml.meta
similarity index 89%
rename from docs/manual/mod/mod_disk_cache.xml.meta
rename to docs/manual/mod/mod_cache_disk.xml.meta
index f2adf7a4215..74abbc57abd 100644
--- a/docs/manual/mod/mod_disk_cache.xml.meta
+++ b/docs/manual/mod/mod_cache_disk.xml.meta
@@ -2,7 +2,7 @@
 <!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
-  <basename>mod_disk_cache</basename>
+  <basename>mod_cache_disk</basename>
   <path>/mod/</path>
   <relpath>..</relpath>
 
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index 7a579e36507..eec727f2726 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -261,8 +261,8 @@ respect to case</td></tr>
 <tr class="odd"><td><a href="mod_buffer.html#buffersize">BufferSize integer</a></td><td> 131072 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum size in bytes to buffer by the buffer filter</td></tr>
 <tr><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (one hour) </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The default duration to cache a document when no expiry date is specified.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachedetailheader">CacheDetailHeader <var>on|off</var></a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Add an X-Cache-Detail header to the response.</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The number of characters in subdirectory names</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The number of levels of subdirectories in the
+<tr><td><a href="mod_cache_disk.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The number of characters in subdirectory names</td></tr>
+<tr class="odd"><td><a href="mod_cache_disk.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The number of levels of subdirectories in the
 cache.</td></tr>
 <tr><td><a href="mod_cache.html#cachedisable">CacheDisable <var>url-string</var> | <var>on</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Disable caching of specified URLs</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable caching of specified URLs using a specified storage
@@ -284,19 +284,19 @@ LastModified date.</td></tr>
 <tr><td><a href="mod_cache.html#cachelockmaxage">CacheLockMaxAge <var>integer</var></a></td><td> 5 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Set the maximum possible age of a cache lock.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachelockpath">CacheLockPath <var>directory</var></a></td><td> /tmp/mod_cache-lock +</td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Set the lock path directory.</td></tr>
 <tr><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (one day) </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum time in seconds to cache a document</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
+<tr class="odd"><td><a href="mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
 cache</td></tr>
 <tr><td><a href="mod_cache.html#cacheminexpire">CacheMinExpire <var>seconds</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum time in seconds to cache a document</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
+<tr class="odd"><td><a href="mod_cache_disk.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
 cache</td></tr>
 <tr><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Allows content-negotiated documents to be 
 cached by proxy servers</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachequickhandler">CacheQuickHandler <var>on|off</var></a></td><td> on </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Run the cache from the quick handler.</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachereadsize">CacheReadSize <var>bytes</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of the document to read and be cached
+<tr><td><a href="mod_cache_disk.html#cachereadsize">CacheReadSize <var>bytes</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of the document to read and be cached
   before sending the data downstream</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachereadtime">CacheReadTime <var>milliseconds</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum time (in milliseconds) that should elapse while reading
+<tr class="odd"><td><a href="mod_cache_disk.html#cachereadtime">CacheReadTime <var>milliseconds</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum time (in milliseconds) that should elapse while reading
   before data is sent downstream</td></tr>
-<tr><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The directory root under which cache files are
+<tr><td><a href="mod_cache_disk.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The directory root under which cache files are
 stored</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachestaleonerror">CacheStaleOnError <var>on|off</var></a></td><td> on </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Serve stale content in place of 5xx responses.</td></tr>
 <tr><td><a href="mod_cache.html#cachestoreexpired">CacheStoreExpired On|Off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Attempt to cache responses that the server reports as expired</td></tr>
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 7f39982d445..cf6f054ffcd 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -248,8 +248,8 @@ respect to case</td></tr>
 <tr><td><a href="mod_buffer.html#buffersize">BufferSize integer</a></td><td> 131072 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum size in bytes to buffer by the buffer filter</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (one hour) </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The default duration to cache a document when no expiry date is specified.</td></tr>
 <tr><td><a href="mod_cache.html#cachedetailheader">CacheDetailHeader <var>on|off</var></a></td><td> off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Add an X-Cache-Detail header to the response.</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The number of characters in subdirectory names</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The number of levels of subdirectories in the
+<tr class="odd"><td><a href="mod_cache_disk.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The number of characters in subdirectory names</td></tr>
+<tr><td><a href="mod_cache_disk.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The number of levels of subdirectories in the
 cache.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachedisable">CacheDisable <var>url-string</var> | <var>on</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Disable caching of specified URLs</td></tr>
 <tr><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable caching of specified URLs using a specified storage
@@ -271,19 +271,19 @@ LastModified date.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachelockmaxage">CacheLockMaxAge <var>integer</var></a></td><td> 5 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Set the maximum possible age of a cache lock.</td></tr>
 <tr><td><a href="mod_cache.html#cachelockpath">CacheLockPath <var>directory</var></a></td><td> /tmp/mod_cache-lock +</td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Set the lock path directory.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (one day) </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum time in seconds to cache a document</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
+<tr><td><a href="mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
 cache</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cacheminexpire">CacheMinExpire <var>seconds</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum time in seconds to cache a document</td></tr>
-<tr><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
+<tr><td><a href="mod_cache_disk.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
 cache</td></tr>
 <tr class="odd"><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Allows content-negotiated documents to be 
 cached by proxy servers</td></tr>
 <tr><td><a href="mod_cache.html#cachequickhandler">CacheQuickHandler <var>on|off</var></a></td><td> on </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Run the cache from the quick handler.</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachereadsize">CacheReadSize <var>bytes</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of the document to read and be cached
+<tr class="odd"><td><a href="mod_cache_disk.html#cachereadsize">CacheReadSize <var>bytes</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of the document to read and be cached
   before sending the data downstream</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachereadtime">CacheReadTime <var>milliseconds</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum time (in milliseconds) that should elapse while reading
+<tr><td><a href="mod_cache_disk.html#cachereadtime">CacheReadTime <var>milliseconds</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum time (in milliseconds) that should elapse while reading
   before data is sent downstream</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The directory root under which cache files are
+<tr class="odd"><td><a href="mod_cache_disk.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The directory root under which cache files are
 stored</td></tr>
 <tr><td><a href="mod_cache.html#cachestaleonerror">CacheStaleOnError <var>on|off</var></a></td><td> on </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Serve stale content in place of 5xx responses.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachestoreexpired">CacheStoreExpired On|Off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Attempt to cache responses that the server reports as expired</td></tr>
diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
index 99f0e097ef8..3f6db85a33e 100644
--- a/docs/manual/mod/quickreference.html.es
+++ b/docs/manual/mod/quickreference.html.es
@@ -255,8 +255,8 @@ respect to case</td></tr>
 <tr><td><a href="mod_buffer.html#buffersize">BufferSize integer</a></td><td> 131072 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum size in bytes to buffer by the buffer filter</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (one hour) </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The default duration to cache a document when no expiry date is specified.</td></tr>
 <tr><td><a href="mod_cache.html#cachedetailheader">CacheDetailHeader <var>on|off</var></a></td><td> off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Add an X-Cache-Detail header to the response.</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The number of characters in subdirectory names</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The number of levels of subdirectories in the
+<tr class="odd"><td><a href="mod_cache_disk.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The number of characters in subdirectory names</td></tr>
+<tr><td><a href="mod_cache_disk.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The number of levels of subdirectories in the
 cache.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachedisable">CacheDisable <var>url-string</var> | <var>on</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Disable caching of specified URLs</td></tr>
 <tr><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable caching of specified URLs using a specified storage
@@ -278,19 +278,19 @@ LastModified date.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachelockmaxage">CacheLockMaxAge <var>integer</var></a></td><td> 5 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Set the maximum possible age of a cache lock.</td></tr>
 <tr><td><a href="mod_cache.html#cachelockpath">CacheLockPath <var>directory</var></a></td><td> /tmp/mod_cache-lock +</td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Set the lock path directory.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (one day) </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum time in seconds to cache a document</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
+<tr><td><a href="mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
 cache</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cacheminexpire">CacheMinExpire <var>seconds</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum time in seconds to cache a document</td></tr>
-<tr><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
+<tr><td><a href="mod_cache_disk.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
 cache</td></tr>
 <tr class="odd"><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Allows content-negotiated documents to be 
 cached by proxy servers</td></tr>
 <tr><td><a href="mod_cache.html#cachequickhandler">CacheQuickHandler <var>on|off</var></a></td><td> on </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Run the cache from the quick handler.</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachereadsize">CacheReadSize <var>bytes</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of the document to read and be cached
+<tr class="odd"><td><a href="mod_cache_disk.html#cachereadsize">CacheReadSize <var>bytes</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of the document to read and be cached
   before sending the data downstream</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachereadtime">CacheReadTime <var>milliseconds</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum time (in milliseconds) that should elapse while reading
+<tr><td><a href="mod_cache_disk.html#cachereadtime">CacheReadTime <var>milliseconds</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum time (in milliseconds) that should elapse while reading
   before data is sent downstream</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The directory root under which cache files are
+<tr class="odd"><td><a href="mod_cache_disk.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The directory root under which cache files are
 stored</td></tr>
 <tr><td><a href="mod_cache.html#cachestaleonerror">CacheStaleOnError <var>on|off</var></a></td><td> on </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Serve stale content in place of 5xx responses.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachestoreexpired">CacheStoreExpired On|Off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Attempt to cache responses that the server reports as expired</td></tr>
diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8
index 5dbfd5e0ef9..69255f35f94 100644
--- a/docs/manual/mod/quickreference.html.ja.utf8
+++ b/docs/manual/mod/quickreference.html.ja.utf8
@@ -245,8 +245,8 @@ alias</td></tr>
 <tr class="odd"><td><a href="mod_log_config.html#bufferedlogs">BufferedLogs On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ãã£ã¹ã¯ã«æ¸ãåºãåã«ã¡ã¢ãªã«ã­ã°ã¨ã³ããªããããã¡ãã</td></tr>
 <tr><td><a href="mod_buffer.html#buffersize">BufferSize integer</a></td><td> 131072 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum size in bytes to buffer by the buffer filter</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (1æé) </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ææ¥ãæå®ããã¦ããªãã¨ãã«ãã­ã¥ã¡ã³ããã­ã£ãã·ã¥ããããã©ã«ãã®æé</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">ãµããã£ã¬ã¯ããªåã®æå­æ°</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ã­ã£ãã·ã¥ã®ãµããã£ã¬ã¯ããªã®æ·±ãã®æ°</td></tr>
+<tr><td><a href="mod_cache_disk.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">ãµããã£ã¬ã¯ããªåã®æå­æ°</td></tr>
+<tr class="odd"><td><a href="mod_cache_disk.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ã­ã£ãã·ã¥ã®ãµããã£ã¬ã¯ããªã®æ·±ãã®æ°</td></tr>
 <tr><td><a href="mod_cache.html#cachedisable">CacheDisable <var> url-string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">ç¹å®ã® URL ãã­ã£ãã·ã¥ããªã</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">æå®ããã¹ãã¬ã¼ã¸ç®¡çæ¹å¼ãä½¿ã£ã¦ã®ã­ã£ãã·ã¥ãæå¹ã«ãã</td></tr>
 <tr><td><a href="mod_file_cache.html#cachefile">CacheFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td></td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Cache a list of file handles at startup time</td></tr>
@@ -260,12 +260,12 @@ alias</td></tr>
 ãè¨ç®ããããã®éã¿ãæå®ãã
 </td></tr>
 <tr><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (ä¸æ¥) </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">ãã­ã¥ã¡ã³ããã­ã£ãã·ã¥ããæå¤§æéãç§æ°ã§è¡¨ãããã®</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ã­ã£ãã·ã¥ã«ä¿ç®¡ããããã­ã¥ã¡ã³ãã®æå¤§ã® (ãã¤ãã§ã®) ãµã¤ãº</td></tr>
+<tr class="odd"><td><a href="mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ã­ã£ãã·ã¥ã«ä¿ç®¡ããããã­ã¥ã¡ã³ãã®æå¤§ã® (ãã¤ãã§ã®) ãµã¤ãº</td></tr>
 <tr><td><a href="mod_cache.html#cacheminexpire">CacheMinExpire <var>seconds</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">ãã­ã¥ã¡ã³ããã­ã£ãã·ã¥ããæå°ç§æ°</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ã­ã£ãã·ã¥ã«ä¿ç®¡ããããã­ã¥ã¡ã³ãã®æå°éã® (ãã¤ãã§ã®) å¤§ãã</td></tr>
+<tr class="odd"><td><a href="mod_cache_disk.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ã­ã£ãã·ã¥ã«ä¿ç®¡ããããã­ã¥ã¡ã³ãã®æå°éã® (ãã¤ãã§ã®) å¤§ãã</td></tr>
 <tr><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">ã³ã³ãã³ããã´ã·ã¨ã¼ã·ã§ã³ããããã­ã¥ã¡ã³ãããã­ã­ã·ãµã¼ãã
 ã­ã£ãã·ã¥ã§ããããã«ãã</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ã­ã£ãã·ã¥ãã¡ã¤ã«ãä¿ç®¡ãããã«ã¼ããã£ã¬ã¯ããª</td></tr>
+<tr class="odd"><td><a href="mod_cache_disk.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ã­ã£ãã·ã¥ãã¡ã¤ã«ãä¿ç®¡ãããã«ã¼ããã£ã¬ã¯ããª</td></tr>
 <tr><td><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">no-store ã¨æå®ããã¦ããã¬ã¹ãã³ã¹ã®ã­ã£ãã·ã¥ãè©¦ã¿ãã</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">private ã¨æå®ããã¦ããã¬ã¹ãã³ã¹ã®ã­ã£ãã·ã¥ãè©¦ã¿ãã</td></tr>
 <tr><td><a href="core.html#cgimapextension">CGIMapExtension <var>cgi-path</var> <var>.extension</var></a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">CGI ã¹ã¯ãªããã®ã¤ã³ã¿ã¼ããªã¿ã®ä½ç½®ãèª¿ã¹ãããã®ææ³</td></tr>
diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr
index 3b18c436133..1cfa2edb881 100644
--- a/docs/manual/mod/quickreference.html.ko.euc-kr
+++ b/docs/manual/mod/quickreference.html.ko.euc-kr
@@ -240,8 +240,8 @@ alias</td></tr>
 ¼³Á¤ÇÑ´Ù</td></tr>
 <tr class="odd"><td><a href="mod_buffer.html#buffersize">BufferSize integer</a></td><td> 131072 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum size in bytes to buffer by the buffer filter</td></tr>
 <tr><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (one hour) </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">¸¸±â½Ã°£À» ÁöÁ¤ÇÏÁö¾ÊÀº ¹®¼­¸¦ Ä³½¬ÇÒ ±âº» ±â°£.</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">ÇÏÀ§µð·ºÅä¸®¸íÀÇ ¹®ÀÚ°³¼ö</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 3 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Ä³½¬ÀÇ ÇÏÀ§µð·ºÅä¸® ±íÀÌ.</td></tr>
+<tr class="odd"><td><a href="mod_cache_disk.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">ÇÏÀ§µð·ºÅä¸®¸íÀÇ ¹®ÀÚ°³¼ö</td></tr>
+<tr><td><a href="mod_cache_disk.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 3 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Ä³½¬ÀÇ ÇÏÀ§µð·ºÅä¸® ±íÀÌ.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachedisable">CacheDisable <var> url-string</var></a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Æ¯Á¤ URLÀ» Ä³½¬ÇÏÁö ¾Ê´Â´Ù</td></tr>
 <tr><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">ÁöÁ¤ÇÑ ÀúÀå°ü¸®ÀÚ¸¦ »ç¿ëÇÏ¿© ÁöÁ¤ÇÑ URLÀ» Ä³½¬ÇÑ´Ù</td></tr>
 <tr class="odd"><td><a href="mod_file_cache.html#cachefile">CacheFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td></td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">½ÃÀÛ½Ã ¿©·¯ ÆÄÀÏ ÇÚµéÀ» Ä³½¬ÇÑ´Ù</td></tr>
@@ -252,11 +252,11 @@ alias</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor <var>float</var></a></td><td> 0.1 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">LastModified ½Ã°£À¸·Î ¸¸±â½Ã°£À» °è»êÇÏ´Âµ¥ »ç¿ëÇÏ´Â
 °è¼ö.</td></tr>
 <tr><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (ÇÏ·ç) </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">¹®¼­¸¦ Ä³½¬ÇÏ´Â ÃÊ´ÜÀ§ ÃÖ´ë½Ã°£</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Ä³½¬¿¡ ÀúÀåÇÒ ¹®¼­ÀÇ ÃÖ´ëÅ©±â (¹ÙÀÌÆ® ´ÜÀ§)</td></tr>
-<tr><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Ä³½¬¿¡ ÀúÀåÇÒ ¹®¼­ÀÇ ÃÖ¼ÒÅ©±â (¹ÙÀÌÆ® ´ÜÀ§)</td></tr>
+<tr class="odd"><td><a href="mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Ä³½¬¿¡ ÀúÀåÇÒ ¹®¼­ÀÇ ÃÖ´ëÅ©±â (¹ÙÀÌÆ® ´ÜÀ§)</td></tr>
+<tr><td><a href="mod_cache_disk.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Ä³½¬¿¡ ÀúÀåÇÒ ¹®¼­ÀÇ ÃÖ¼ÒÅ©±â (¹ÙÀÌÆ® ´ÜÀ§)</td></tr>
 <tr class="odd"><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Allows content-negotiated documents to be 
 cached by proxy servers</td></tr>
-<tr><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Ä³½¬ ÆÄÀÏÀ» ÀúÀåÇÒ µð·ºÅä¸® root</td></tr>
+<tr><td><a href="mod_cache_disk.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Ä³½¬ ÆÄÀÏÀ» ÀúÀåÇÒ µð·ºÅä¸® root</td></tr>
 <tr class="odd"><td><a href="core.html#cgimapextension">CGIMapExtension <var>cgi-path</var> <var>.extension</var></a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Technique for locating the interpreter for CGI
 scripts</td></tr>
 <tr><td><a href="mod_charset_lite.html#charsetdefault">CharsetDefault <var>charset</var></a></td><td></td><td>svdh</td><td>X</td></tr><tr><td class="descr" colspan="4">º¯È¯ÇÒ ¹®ÀÚÁýÇÕ</td></tr>
diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8
index 4c423402e10..fd3bfc4d076 100644
--- a/docs/manual/mod/quickreference.html.tr.utf8
+++ b/docs/manual/mod/quickreference.html.tr.utf8
@@ -251,8 +251,8 @@ duyarsÄ±z eÅleÅmelerine baÄlÄ± olarak belirler.</td></tr>
 <tr><td><a href="mod_buffer.html#buffersize">BufferSize integer</a></td><td> 131072 </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum size in bytes to buffer by the buffer filter</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (one hour) </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The default duration to cache a document when no expiry date is specified.</td></tr>
 <tr><td><a href="mod_cache.html#cachedetailheader">CacheDetailHeader <var>on|off</var></a></td><td> off </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Add an X-Cache-Detail header to the response.</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The number of characters in subdirectory names</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 2 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">The number of levels of subdirectories in the
+<tr class="odd"><td><a href="mod_cache_disk.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The number of characters in subdirectory names</td></tr>
+<tr><td><a href="mod_cache_disk.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 2 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">The number of levels of subdirectories in the
 cache.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachedisable">CacheDisable <var>url-string</var> | <var>on</var></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Disable caching of specified URLs</td></tr>
 <tr><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable caching of specified URLs using a specified storage
@@ -274,19 +274,19 @@ LastModified date.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachelockmaxage">CacheLockMaxAge <var>integer</var></a></td><td> 5 </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Set the maximum possible age of a cache lock.</td></tr>
 <tr><td><a href="mod_cache.html#cachelockpath">CacheLockPath <var>directory</var></a></td><td> /tmp/mod_cache-lock +</td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Set the lock path directory.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (one day) </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum time in seconds to cache a document</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
+<tr><td><a href="mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
 cache</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cacheminexpire">CacheMinExpire <var>seconds</var></a></td><td> 0 </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum time in seconds to cache a document</td></tr>
-<tr><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
+<tr><td><a href="mod_cache_disk.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
 cache</td></tr>
 <tr class="odd"><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sk</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Allows content-negotiated documents to be 
 cached by proxy servers</td></tr>
 <tr><td><a href="mod_cache.html#cachequickhandler">CacheQuickHandler <var>on|off</var></a></td><td> on </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Run the cache from the quick handler.</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachereadsize">CacheReadSize <var>bytes</var></a></td><td> 0 </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of the document to read and be cached
+<tr class="odd"><td><a href="mod_cache_disk.html#cachereadsize">CacheReadSize <var>bytes</var></a></td><td> 0 </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of the document to read and be cached
   before sending the data downstream</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachereadtime">CacheReadTime <var>milliseconds</var></a></td><td> 0 </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum time (in milliseconds) that should elapse while reading
+<tr><td><a href="mod_cache_disk.html#cachereadtime">CacheReadTime <var>milliseconds</var></a></td><td> 0 </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum time (in milliseconds) that should elapse while reading
   before data is sent downstream</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The directory root under which cache files are
+<tr class="odd"><td><a href="mod_cache_disk.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The directory root under which cache files are
 stored</td></tr>
 <tr><td><a href="mod_cache.html#cachestaleonerror">CacheStaleOnError <var>on|off</var></a></td><td> on </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Serve stale content in place of 5xx responses.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cachestoreexpired">CacheStoreExpired On|Off</a></td><td> Off </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Attempt to cache responses that the server reports as expired</td></tr>
diff --git a/docs/manual/new_features_2_2.html.en b/docs/manual/new_features_2_2.html.en
index c5f3089398d..b64eca33e21 100644
--- a/docs/manual/new_features_2_2.html.en
+++ b/docs/manual/new_features_2_2.html.en
@@ -51,10 +51,10 @@
           writers.</dd>
 
       <dt>Caching</dt>
-      <dd><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>, and
+      <dd><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>, and
           mod_mem_cache(already removed from 2.3/2.4) have undergone a lot of changes, and
           are now considered production-quality. <code class="program"><a href="./programs/htcacheclean.html">htcacheclean</a></code>
-          has been introduced to clean up <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>
+          has been introduced to clean up <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>
           setups.</dd>
 
       <dt>Configuration</dt>
diff --git a/docs/manual/new_features_2_2.html.fr b/docs/manual/new_features_2_2.html.fr
index 6ba3266dc0e..28024d683e3 100644
--- a/docs/manual/new_features_2_2.html.fr
+++ b/docs/manual/new_features_2_2.html.fr
@@ -57,13 +57,13 @@
 	  modules.</dd>
 
       <dt>Mise en cache</dt>
-      <dd><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>, et
+      <dd><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>, et
           mod_mem_cache (supprimés dans la version 2.3/2.4) ont subi de nombreuses
 	  modifications, et l'on considère qu'ils ont maintenant atteint
 	  un degré de qualité suffisant pour leur mise en production. Le programme
 	  <code class="program"><a href="./programs/htcacheclean.html">htcacheclean</a></code> a été ajouté afin de rendre
 	  plus propre la configuration du module
-	  <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>.</dd>
+	  <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>.</dd>
 
       <dt>Configuration</dt>
       <dd>L'agencement de la configuration par défaut a été simplifié
diff --git a/docs/manual/new_features_2_2.html.tr.utf8 b/docs/manual/new_features_2_2.html.tr.utf8
index 4488998e1b6..78994b459fb 100644
--- a/docs/manual/new_features_2_2.html.tr.utf8
+++ b/docs/manual/new_features_2_2.html.tr.utf8
@@ -50,11 +50,11 @@
         <a href="#module">modÃ¼l deÄiÅikliklerine</a> ve <a href="#developer">geliÅtirici deÄiÅikliklerine</a> bakabilirsiniz.</dd>
 
       <dt>Ãnbellekleme</dt>
-      <dd><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> ve
+      <dd><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> ve
         <code>mod_mem_cache</code> (2.3/2.4 sÃ¼rÃ¼mlerinde kaldÄ±rÄ±lmÄ±ÅtÄ±r)
         modÃ¼llerinde bÃ¼yÃ¼k oranda deÄiÅikliÄe gidilerek bunlar deneysel
         olmaktan Ã§Ä±karÄ±lÄ±p Ã¼retim amaÃ§lÄ± modÃ¼ller haline getirildiler.
-        <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> tarafÄ±ndan kullanÄ±lan disk
+        <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> tarafÄ±ndan kullanÄ±lan disk
         alanÄ±nÄ±n  <code class="program"><a href="./programs/htcacheclean.html">htcacheclean</a></code> tarafÄ±ndan
         dÃ¼zenli aralÄ±klarla temizlenebilmesi saÄlandÄ±.</dd>
 
diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml
index 4af67e12a9a..f89ffa72467 100644
--- a/docs/manual/new_features_2_2.xml
+++ b/docs/manual/new_features_2_2.xml
@@ -45,10 +45,10 @@
           writers.</dd>
 
       <dt>Caching</dt>
-      <dd><module>mod_cache</module>, <module>mod_disk_cache</module>, and
+      <dd><module>mod_cache</module>, <module>mod_cache_disk</module>, and
           mod_mem_cache(already removed from 2.3/2.4) have undergone a lot of changes, and
           are now considered production-quality. <program>htcacheclean</program>
-          has been introduced to clean up <module>mod_disk_cache</module>
+          has been introduced to clean up <module>mod_cache_disk</module>
           setups.</dd>
 
       <dt>Configuration</dt>
diff --git a/docs/manual/new_features_2_2.xml.fr b/docs/manual/new_features_2_2.xml.fr
index 9c9f10bd3ab..7e9af653198 100644
--- a/docs/manual/new_features_2_2.xml.fr
+++ b/docs/manual/new_features_2_2.xml.fr
@@ -52,13 +52,13 @@
 	  modules.</dd>
 
       <dt>Mise en cache</dt>
-      <dd><module>mod_cache</module>, <module>mod_disk_cache</module>, et
+      <dd><module>mod_cache</module>, <module>mod_cache_disk</module>, et
           mod_mem_cache (supprim&eacute;s dans la version 2.3/2.4) ont subi de nombreuses
 	  modifications, et l'on consid&egrave;re qu'ils ont maintenant atteint
 	  un degr&eacute; de qualit&eacute; suffisant pour leur mise en production. Le programme
 	  <program>htcacheclean</program> a &eacute;t&eacute; ajout&eacute; afin de rendre
 	  plus propre la configuration du module
-	  <module>mod_disk_cache</module>.</dd>
+	  <module>mod_cache_disk</module>.</dd>
 
       <dt>Configuration</dt>
       <dd>L'agencement de la configuration par d&eacute;faut a &eacute;t&eacute; simplifi&eacute;
diff --git a/docs/manual/new_features_2_2.xml.tr b/docs/manual/new_features_2_2.xml.tr
index 3714fa341b0..ca1ac9c338e 100644
--- a/docs/manual/new_features_2_2.xml.tr
+++ b/docs/manual/new_features_2_2.xml.tr
@@ -49,11 +49,11 @@
         >geliÅtirici deÄiÅikliklerine</a> bakabilirsiniz.</dd>
 
       <dt>Ãnbellekleme</dt>
-      <dd><module>mod_cache</module>, <module>mod_disk_cache</module> ve
+      <dd><module>mod_cache</module>, <module>mod_cache_disk</module> ve
         <code>mod_mem_cache</code> (2.3/2.4 sÃ¼rÃ¼mlerinde kaldÄ±rÄ±lmÄ±ÅtÄ±r)
         modÃ¼llerinde bÃ¼yÃ¼k oranda deÄiÅikliÄe gidilerek bunlar deneysel
         olmaktan Ã§Ä±karÄ±lÄ±p Ã¼retim amaÃ§lÄ± modÃ¼ller haline getirildiler.
-        <module>mod_disk_cache</module> tarafÄ±ndan kullanÄ±lan disk
+        <module>mod_cache_disk</module> tarafÄ±ndan kullanÄ±lan disk
         alanÄ±nÄ±n  <program>htcacheclean</program> tarafÄ±ndan
         dÃ¼zenli aralÄ±klarla temizlenebilmesi saÄlandÄ±.</dd>
 
diff --git a/docs/manual/programs/configure.html.en b/docs/manual/programs/configure.html.en
index 05f97892324..3f0c056b891 100644
--- a/docs/manual/programs/configure.html.en
+++ b/docs/manual/programs/configure.html.en
@@ -418,7 +418,7 @@
             ./configure \<br />
             <span class="indent">
                 --with-ldap \<br />
-                --enable-mods-shared="all ssl ldap cache proxy authn_alias file_cache authnz_ldap charset_lite dav_lock disk_cache"
+                --enable-mods-shared="all ssl ldap cache proxy authn_alias file_cache authnz_ldap charset_lite dav_lock cache_disk"
             </span>
           </code></p></div>
         </dd>
diff --git a/docs/manual/programs/configure.html.ko.euc-kr b/docs/manual/programs/configure.html.ko.euc-kr
index 36f8e12669a..b84e90c3590 100644
--- a/docs/manual/programs/configure.html.ko.euc-kr
+++ b/docs/manual/programs/configure.html.ko.euc-kr
@@ -423,7 +423,7 @@
           ÆÄÀÏÀÇ Ä³½Ì ±â´ÉÀ» »ç¿ëÇÑ´Ù. ¸Å¿ì ºÎÇÏ°¡ ¸¹°Å³ª ÇÁ·Ï½Ã
           ¼­¹ö¸¦ Ä³½ÌÇÏ´Â ¼­¹ö¿¡°Ô ÀÌ ½ÇÇèÀûÀÎ ¸ðµâÀÌ À¯¿ëÇÒ
           ¼ö ÀÖ´Ù. ÃÖ¼ÒÇÑ ÇÑ°¡Áö ÀúÀå°ü¸®¸ðµâ(storage management
-          module)À» (¿¹¸¦ µé¾î, <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>³ª
+          module)À» (¿¹¸¦ µé¾î, <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>³ª
           <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code>) °°ÀÌ »ç¿ëÇØ¾ß ÇÑ´Ù.</dd>
 
         <dt><code>--enable-cern-meta</code></dt>
@@ -455,7 +455,7 @@
           ÀÎÄÚµù ±â´ÉÀ» »ç¿ëÇÑ´Ù.</dd>
 
         <dt><code>--enable-disk-cache</code></dt>
-        <dd><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>°¡ Á¦°øÇÏ´Â µð½ºÅ©
+        <dd><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>°¡ Á¦°øÇÏ´Â µð½ºÅ©
           Ä³½Ì ±â´ÉÀ» »ç¿ëÇÑ´Ù.</dd>
 
         <dt><code>--enable-expires</code></dt>
diff --git a/docs/manual/programs/configure.html.tr.utf8 b/docs/manual/programs/configure.html.tr.utf8
index f46580883d3..96a9dfcfce5 100644
--- a/docs/manual/programs/configure.html.tr.utf8
+++ b/docs/manual/programs/configure.html.tr.utf8
@@ -444,7 +444,7 @@
           dosya Ã¶nbelleklemesi etkin kÄ±lÄ±nÄ±r. Bu deneysel modÃ¼lÃ¼n kullanÄ±mÄ±,
           aÅÄ±rÄ± yÃ¼klÃ¼ sunucularda ya da Ã¶nbellekli vekillerde ilginÃ§ sonuÃ§lar
           verebilir. Bunun yanÄ±nda en azÄ±ndan bir saklama alanÄ± yÃ¶netim modÃ¼lÃ¼
-          (Ã¶rn, <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>) gerekebilir.</dd>
+          (Ã¶rn, <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>) gerekebilir.</dd>
 
         <dt><code>--enable-cern-meta</code></dt>
         <dd><code class="module"><a href="../mod/mod_cern_meta.html">mod_cern_meta</a></code> modÃ¼lÃ¼ tarafÄ±ndan saÄlanan CERN
@@ -484,7 +484,7 @@
           sÄ±kÄ±ÅtÄ±rÄ±lmÄ±Å aktarÄ±m kodlamasÄ± etkin kÄ±lÄ±nÄ±r.</dd>
 
         <dt><code>--enable-disk-cache</code></dt>
-        <dd><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> modÃ¼lÃ¼ tarafÄ±ndan saÄlanan diskte
+        <dd><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> modÃ¼lÃ¼ tarafÄ±ndan saÄlanan diskte
           Ã¶nbellekleme etkin kÄ±lÄ±nÄ±r.</dd>
 
         <dt><code>--enable-expires</code></dt>
@@ -732,7 +732,7 @@
             <span class="indent">
                 --with-ldap \<br />
                 --enable-mods-shared="all ssl ldap cache proxy authn_alias
-                file_cache authnz_ldap charset_lite dav_lock disk_cache"
+                file_cache authnz_ldap charset_lite dav_lock cache_disk"
             </span>
           </code></p></div>
         </dd>
diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml
index e58af489357..33c7f7337b2 100644
--- a/docs/manual/programs/configure.xml
+++ b/docs/manual/programs/configure.xml
@@ -422,7 +422,7 @@
             ./configure \<br />
             <indent>
                 --with-ldap \<br />
-                --enable-mods-shared="all ssl ldap cache proxy authn_alias file_cache authnz_ldap charset_lite dav_lock disk_cache"
+                --enable-mods-shared="all ssl ldap cache proxy authn_alias file_cache authnz_ldap charset_lite dav_lock cache_disk"
             </indent>
           </example>
         </dd>
diff --git a/docs/manual/programs/configure.xml.ko b/docs/manual/programs/configure.xml.ko
index 4ee6f30929c..5c88c243b6a 100644
--- a/docs/manual/programs/configure.xml.ko
+++ b/docs/manual/programs/configure.xml.ko
@@ -423,7 +423,7 @@
           ÆÄÀÏÀÇ Ä³½Ì ±â´ÉÀ» »ç¿ëÇÑ´Ù. ¸Å¿ì ºÎÇÏ°¡ ¸¹°Å³ª ÇÁ·Ï½Ã
           ¼­¹ö¸¦ Ä³½ÌÇÏ´Â ¼­¹ö¿¡°Ô ÀÌ ½ÇÇèÀûÀÎ ¸ðµâÀÌ À¯¿ëÇÒ
           ¼ö ÀÖ´Ù. ÃÖ¼ÒÇÑ ÇÑ°¡Áö ÀúÀå°ü¸®¸ðµâ(storage management
-          module)À» (¿¹¸¦ µé¾î, <module>mod_disk_cache</module>³ª
+          module)À» (¿¹¸¦ µé¾î, <module>mod_cache_disk</module>³ª
           <module>mod_mem_cache</module>) °°ÀÌ »ç¿ëÇØ¾ß ÇÑ´Ù.</dd>
 
         <dt><code>--enable-cern-meta</code></dt>
@@ -455,7 +455,7 @@
           ÀÎÄÚµù ±â´ÉÀ» »ç¿ëÇÑ´Ù.</dd>
 
         <dt><code>--enable-disk-cache</code></dt>
-        <dd><module>mod_disk_cache</module>°¡ Á¦°øÇÏ´Â µð½ºÅ©
+        <dd><module>mod_cache_disk</module>°¡ Á¦°øÇÏ´Â µð½ºÅ©
           Ä³½Ì ±â´ÉÀ» »ç¿ëÇÑ´Ù.</dd>
 
         <dt><code>--enable-expires</code></dt>
diff --git a/docs/manual/programs/configure.xml.tr b/docs/manual/programs/configure.xml.tr
index 68feea1b0bc..fd50107fe31 100644
--- a/docs/manual/programs/configure.xml.tr
+++ b/docs/manual/programs/configure.xml.tr
@@ -451,7 +451,7 @@
           dosya Ã¶nbelleklemesi etkin kÄ±lÄ±nÄ±r. Bu deneysel modÃ¼lÃ¼n kullanÄ±mÄ±,
           aÅÄ±rÄ± yÃ¼klÃ¼ sunucularda ya da Ã¶nbellekli vekillerde ilginÃ§ sonuÃ§lar
           verebilir. Bunun yanÄ±nda en azÄ±ndan bir saklama alanÄ± yÃ¶netim modÃ¼lÃ¼
-          (Ã¶rn, <module>mod_disk_cache</module>) gerekebilir.</dd>
+          (Ã¶rn, <module>mod_cache_disk</module>) gerekebilir.</dd>
 
         <dt><code>--enable-cern-meta</code></dt>
         <dd><module>mod_cern_meta</module> modÃ¼lÃ¼ tarafÄ±ndan saÄlanan CERN
@@ -491,7 +491,7 @@
           sÄ±kÄ±ÅtÄ±rÄ±lmÄ±Å aktarÄ±m kodlamasÄ± etkin kÄ±lÄ±nÄ±r.</dd>
 
         <dt><code>--enable-disk-cache</code></dt>
-        <dd><module>mod_disk_cache</module> modÃ¼lÃ¼ tarafÄ±ndan saÄlanan diskte
+        <dd><module>mod_cache_disk</module> modÃ¼lÃ¼ tarafÄ±ndan saÄlanan diskte
           Ã¶nbellekleme etkin kÄ±lÄ±nÄ±r.</dd>
 
         <dt><code>--enable-expires</code></dt>
@@ -743,7 +743,7 @@
             <indent>
                 --with-ldap \<br />
                 --enable-mods-shared="all ssl ldap cache proxy authn_alias
-                file_cache authnz_ldap charset_lite dav_lock disk_cache"
+                file_cache authnz_ldap charset_lite dav_lock cache_disk"
             </indent>
           </example>
         </dd>
diff --git a/docs/manual/programs/htcacheclean.html.en b/docs/manual/programs/htcacheclean.html.en
index 89b963faedb..349ef8dd78c 100644
--- a/docs/manual/programs/htcacheclean.html.en
+++ b/docs/manual/programs/htcacheclean.html.en
@@ -24,7 +24,7 @@
 </div>
 
     <p><code>htcacheclean</code> is used to keep the size of
-    <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>'s storage within a given size limit, or
+    <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>'s storage within a given size limit, or
     limit on inodes in use. This tool can run either manually or in daemon mode.
     When running in daemon mode, it sleeps in the background and checks the cache
     directory at regular intervals for cached content to be removed. You can stop
@@ -38,7 +38,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#delete">Deleting a specific URL</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#list">Listing URLs in the Cache</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#exit">Exit Status</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></li></ul></div>
+</ul><h3>See also</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></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="synopsis" id="synopsis">Synopsis</a></h2>
@@ -121,7 +121,7 @@
 
     <dt><code>-p<var>path</var></code></dt>
     <dd>Specify <var>path</var> as the root directory of the disk cache. This
-    should be the same value as specified with the <code class="directive"><a href="../mod/mod_disk_cache.html#cacheroot">CacheRoot</a></code> directive.</dd>
+    should be the same value as specified with the <code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code> directive.</dd>
 
     <dt><code>-P<var>pidfile</var></code></dt>
     <dd>Specify <var>pidfile</var> as the name of the file to write the
diff --git a/docs/manual/programs/htcacheclean.html.ko.euc-kr b/docs/manual/programs/htcacheclean.html.ko.euc-kr
index 5d581fcb730..f947c23cec9 100644
--- a/docs/manual/programs/htcacheclean.html.ko.euc-kr
+++ b/docs/manual/programs/htcacheclean.html.ko.euc-kr
@@ -25,7 +25,7 @@
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇÏ¼¼¿ä.</div>
 
-    <p><code>htcacheclean</code>Àº <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>°¡
+    <p><code>htcacheclean</code>Àº <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>°¡
     »ç¿ëÇÏ´Â ÀúÀå¼Ò ¿ë·®À» ÀÏÁ¤ ÇÑµµ·Î À¯ÁöÇÑ´Ù. ÀÌ µµ±¸´Â Á÷Á¢
     ½ÇÇàÇÏ°Å³ª µ¥¸ó(daemon)À¸·Î ½ÇÇàÇÒ ¼ö ÀÖ´Ù. ÇÁ·Î±×·¥À» µ¥¸óÀ¸·Î
     ½ÇÇàÇÏ¸é ¹é±×¶ó¿îµå¿¡¼­ ÀáÀÚ°í ÀÖ´Ù°¡ ÀÏÁ¤ ÁÖ±â·Î Ä³½¬
@@ -35,7 +35,7 @@
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#synopsis">°³¿ä</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">¿É¼Ç</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#exit">Á¾·áÄÚµå</a></li>
-</ul><h3>Âü°í</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></li></ul></div>
+</ul><h3>Âü°í</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></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="synopsis" id="synopsis">°³¿ä</a></h2>
@@ -85,7 +85,7 @@
 
     <dt><code>-p<var>path</var></code></dt>
     <dd><var>path</var>¸¦ µð½ºÅ© Ä³½¬ÀÇ ÃÖ»óÀ§ µð·ºÅä¸®·Î ÁöÁ¤ÇÑ´Ù.
-    <code class="directive"><a href="../mod/mod_disk_cache.html#cacheroot">CacheRoot</a></code>
+    <code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code>
     Áö½Ã¾î¿¡ »ç¿ëÇÑ °ª°ú µ¿ÀÏÇÑ °ªÀ» »ç¿ëÇØ¾ß ÇÑ´Ù.</dd>
 
     <dt><code>-l<var>limit</var></code></dt>
diff --git a/docs/manual/programs/htcacheclean.html.tr.utf8 b/docs/manual/programs/htcacheclean.html.tr.utf8
index fb21d12adb0..4e6247528a5 100644
--- a/docs/manual/programs/htcacheclean.html.tr.utf8
+++ b/docs/manual/programs/htcacheclean.html.tr.utf8
@@ -25,7 +25,7 @@
 <div class="outofdate">Bu Ã§eviri gÃ¼ncel olmayabilir. Son deÄiÅiklikler iÃ§in Ä°ngilizce sÃ¼rÃ¼m geÃ§erlidir.</div>
 
     <p><code><strong>htcacheclean</strong></code>,
-    <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> deposunun boyutlarÄ±nÄ± belli sÄ±nÄ±rlar
+    <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> deposunun boyutlarÄ±nÄ± belli sÄ±nÄ±rlar
     iÃ§inde tutmak iÃ§in kullanÄ±lÄ±r. Bu araÃ§ ya elle ya da bir artalan sÃ¼reci
     olarak Ã§alÄ±ÅtÄ±rÄ±lÄ±r. Artalan sÃ¼reci olarak Ã§alÄ±ÅtÄ±rÄ±ldÄ±ÄÄ±nda, silinecek
     arabellek iÃ§eriÄini tespit etmek iÃ§in arabellek dizinlerine belli
@@ -35,7 +35,7 @@
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#synopsis">KullanÄ±m</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#exit">ÃÄ±kÄ±Å Durumu</a></li>
-</ul><h3>AyrÄ±ca bakÄ±nÄ±z:</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></li></ul></div>
+</ul><h3>AyrÄ±ca bakÄ±nÄ±z:</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></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="synopsis" id="synopsis">KullanÄ±m</a></h2>
@@ -96,7 +96,7 @@
 
     <dt><code><strong>-p</strong><var> yol</var></code></dt>
     <dd><code><var>yol</var></code>, disk arabelleÄinin kÃ¶k dizini olarak
-    belirtilir. <code class="directive"><a href="../mod/mod_disk_cache.html#cacheroot">CacheRoot</a></code>
+    belirtilir. <code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code>
     yÃ¶nergesinde belirtilen dizin olmalÄ±dÄ±r.</dd>
 
     <dt><code><strong>-l</strong><var> sÄ±nÄ±r</var></code></dt>
diff --git a/docs/manual/programs/htcacheclean.xml b/docs/manual/programs/htcacheclean.xml
index 4f5b7ebe139..a6a5cedbfc1 100644
--- a/docs/manual/programs/htcacheclean.xml
+++ b/docs/manual/programs/htcacheclean.xml
@@ -27,7 +27,7 @@
 
 <summary>
     <p><code>htcacheclean</code> is used to keep the size of
-    <module>mod_disk_cache</module>'s storage within a given size limit, or
+    <module>mod_cache_disk</module>'s storage within a given size limit, or
     limit on inodes in use. This tool can run either manually or in daemon mode.
     When running in daemon mode, it sleeps in the background and checks the cache
     directory at regular intervals for cached content to be removed. You can stop
@@ -36,7 +36,7 @@
     removed. If one or more URLs are specified, each URL will be deleted from
     the cache, if present.</p>
 </summary>
-<seealso><module>mod_disk_cache</module></seealso>
+<seealso><module>mod_cache_disk</module></seealso>
 
 <section id="synopsis"><title>Synopsis</title>
     <p><code><strong>htcacheclean</strong>
@@ -119,7 +119,7 @@
     <dt><code>-p<var>path</var></code></dt>
     <dd>Specify <var>path</var> as the root directory of the disk cache. This
     should be the same value as specified with the <directive
-    module="mod_disk_cache">CacheRoot</directive> directive.</dd>
+    module="mod_cache_disk">CacheRoot</directive> directive.</dd>
 
     <dt><code>-P<var>pidfile</var></code></dt>
     <dd>Specify <var>pidfile</var> as the name of the file to write the
diff --git a/docs/manual/programs/htcacheclean.xml.ko b/docs/manual/programs/htcacheclean.xml.ko
index f9e316898ea..a940d3c5489 100644
--- a/docs/manual/programs/htcacheclean.xml.ko
+++ b/docs/manual/programs/htcacheclean.xml.ko
@@ -26,14 +26,14 @@
 <title>htcacheclean - µð½ºÅ© Ä³½¬¸¦ Ã»¼ÒÇÑ´Ù</title>
 
 <summary>
-    <p><code>htcacheclean</code>Àº <module>mod_disk_cache</module>°¡
+    <p><code>htcacheclean</code>Àº <module>mod_cache_disk</module>°¡
     »ç¿ëÇÏ´Â ÀúÀå¼Ò ¿ë·®À» ÀÏÁ¤ ÇÑµµ·Î À¯ÁöÇÑ´Ù. ÀÌ µµ±¸´Â Á÷Á¢
     ½ÇÇàÇÏ°Å³ª µ¥¸ó(daemon)À¸·Î ½ÇÇàÇÒ ¼ö ÀÖ´Ù. ÇÁ·Î±×·¥À» µ¥¸óÀ¸·Î
     ½ÇÇàÇÏ¸é ¹é±×¶ó¿îµå¿¡¼­ ÀáÀÚ°í ÀÖ´Ù°¡ ÀÏÁ¤ ÁÖ±â·Î Ä³½¬
     µð·ºÅä¸®¿¡¼­ Áö¿ï °ÍÀÌ ÀÖ´ÂÁö °Ë»çÇÑ´Ù. µ¥¸ó¿¡°Ô TERMÀÌ³ª
     INT ½Ã±×³ÎÀ» º¸³»¸é ¾ÈÀüÇÏ°Ô Á¾·áÇÑ´Ù.</p>
 </summary>
-<seealso><module>mod_disk_cache</module></seealso>
+<seealso><module>mod_cache_disk</module></seealso>
 
 <section id="synopsis"><title>°³¿ä</title>
     <p><code><strong>htcacheclean</strong>
@@ -82,7 +82,7 @@
 
     <dt><code>-p<var>path</var></code></dt>
     <dd><var>path</var>¸¦ µð½ºÅ© Ä³½¬ÀÇ ÃÖ»óÀ§ µð·ºÅä¸®·Î ÁöÁ¤ÇÑ´Ù.
-    <directive module="mod_disk_cache">CacheRoot</directive>
+    <directive module="mod_cache_disk">CacheRoot</directive>
     Áö½Ã¾î¿¡ »ç¿ëÇÑ °ª°ú µ¿ÀÏÇÑ °ªÀ» »ç¿ëÇØ¾ß ÇÑ´Ù.</dd>
 
     <dt><code>-l<var>limit</var></code></dt>
diff --git a/docs/manual/programs/htcacheclean.xml.tr b/docs/manual/programs/htcacheclean.xml.tr
index 0f108f8a277..9543439807e 100644
--- a/docs/manual/programs/htcacheclean.xml.tr
+++ b/docs/manual/programs/htcacheclean.xml.tr
@@ -31,14 +31,14 @@
 
 <summary>
     <p><code><strong>htcacheclean</strong></code>,
-    <module>mod_disk_cache</module> deposunun boyutlarÄ±nÄ± belli sÄ±nÄ±rlar
+    <module>mod_cache_disk</module> deposunun boyutlarÄ±nÄ± belli sÄ±nÄ±rlar
     iÃ§inde tutmak iÃ§in kullanÄ±lÄ±r. Bu araÃ§ ya elle ya da bir artalan sÃ¼reci
     olarak Ã§alÄ±ÅtÄ±rÄ±lÄ±r. Artalan sÃ¼reci olarak Ã§alÄ±ÅtÄ±rÄ±ldÄ±ÄÄ±nda, silinecek
     arabellek iÃ§eriÄini tespit etmek iÃ§in arabellek dizinlerine belli
     aralÄ±klarla bakmak dÄ±ÅÄ±nda uykuda olur. Artalan sÃ¼recini temiz olarak
     durdurmak iÃ§in TERM veya INT sinyali gÃ¶ndermeniz yeterlidir.</p>
 </summary>
-<seealso><module>mod_disk_cache</module></seealso>
+<seealso><module>mod_cache_disk</module></seealso>
 
 <section id="synopsis"><title>KullanÄ±m</title>
     <p><code><strong>htcacheclean</strong>
@@ -98,7 +98,7 @@
 
     <dt><code><strong>-p</strong><var> yol</var></code></dt>
     <dd><code><var>yol</var></code>, disk arabelleÄinin kÃ¶k dizini olarak
-    belirtilir. <directive module="mod_disk_cache">CacheRoot</directive>
+    belirtilir. <directive module="mod_cache_disk">CacheRoot</directive>
     yÃ¶nergesinde belirtilen dizin olmalÄ±dÄ±r.</dd>
 
     <dt><code><strong>-l</strong><var> sÄ±nÄ±r</var></code></dt>
diff --git a/docs/manual/sitemap.html.de b/docs/manual/sitemap.html.de
index 2d2f667d023..6e667e26f86 100644
--- a/docs/manual/sitemap.html.de
+++ b/docs/manual/sitemap.html.de
@@ -192,6 +192,7 @@ HPUX betreiben</a></li>
 <li><a href="mod/mod_autoindex.html">Apache-Modul mod_autoindex</a></li>
 <li><a href="mod/mod_buffer.html">Apache-Modul mod_buffer</a></li>
 <li><a href="mod/mod_cache.html">Apache-Modul mod_cache</a></li>
+<li><a href="mod/mod_cache_disk.html">Apache-Modul mod_cache_disk</a></li>
 <li><a href="mod/mod_cern_meta.html">Apache-Modul mod_cern_meta</a></li>
 <li><a href="mod/mod_cgi.html">Apache-Modul mod_cgi</a></li>
 <li><a href="mod/mod_cgid.html">Apache-Modul mod_cgid</a></li>
@@ -203,7 +204,6 @@ HPUX betreiben</a></li>
 <li><a href="mod/mod_deflate.html">Apache-Modul mod_deflate</a></li>
 <li><a href="mod/mod_dialup.html">Apache-Modul mod_dialup</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>
 <li><a href="mod/mod_dumpio.html">Apache-Modul mod_dumpio</a></li>
 <li><a href="mod/mod_echo.html">Apache-Modul mod_echo</a></li>
 <li><a href="mod/mod_env.html">Apache-Modul mod_env</a></li>
diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index 9f79ffaeff7..b49ce62c43b 100644
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -192,6 +192,7 @@ Server on HPUX</a></li>
 <li><a href="mod/mod_autoindex.html">Apache Module mod_autoindex</a></li>
 <li><a href="mod/mod_buffer.html">Apache Module mod_buffer</a></li>
 <li><a href="mod/mod_cache.html">Apache Module mod_cache</a></li>
+<li><a href="mod/mod_cache_disk.html">Apache Module mod_cache_disk</a></li>
 <li><a href="mod/mod_cern_meta.html">Apache Module mod_cern_meta</a></li>
 <li><a href="mod/mod_cgi.html">Apache Module mod_cgi</a></li>
 <li><a href="mod/mod_cgid.html">Apache Module mod_cgid</a></li>
@@ -203,7 +204,6 @@ Server on HPUX</a></li>
 <li><a href="mod/mod_deflate.html">Apache Module mod_deflate</a></li>
 <li><a href="mod/mod_dialup.html">Apache Module mod_dialup</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>
 <li><a href="mod/mod_dumpio.html">Apache Module mod_dumpio</a></li>
 <li><a href="mod/mod_echo.html">Apache Module mod_echo</a></li>
 <li><a href="mod/mod_env.html">Apache Module mod_env</a></li>
diff --git a/docs/manual/sitemap.html.es b/docs/manual/sitemap.html.es
index df0eed42781..fa4235f19ba 100644
--- a/docs/manual/sitemap.html.es
+++ b/docs/manual/sitemap.html.es
@@ -190,6 +190,7 @@ usados para describir las directivas de Apache</a></li>
 <li><a href="mod/mod_autoindex.html">Módulo Apache mod_autoindex</a></li>
 <li><a href="mod/mod_buffer.html">Módulo Apache mod_buffer</a></li>
 <li><a href="mod/mod_cache.html">Módulo Apache mod_cache</a></li>
+<li><a href="mod/mod_cache_disk.html">Módulo Apache mod_cache_disk</a></li>
 <li><a href="mod/mod_cern_meta.html">Módulo Apache mod_cern_meta</a></li>
 <li><a href="mod/mod_cgi.html">Módulo Apache mod_cgi</a></li>
 <li><a href="mod/mod_cgid.html">Módulo Apache mod_cgid</a></li>
@@ -201,7 +202,6 @@ usados para describir las directivas de Apache</a></li>
 <li><a href="mod/mod_deflate.html">Módulo Apache mod_deflate</a></li>
 <li><a href="mod/mod_dialup.html">Módulo Apache mod_dialup</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>
 <li><a href="mod/mod_dumpio.html">Módulo Apache mod_dumpio</a></li>
 <li><a href="mod/mod_echo.html">Módulo Apache mod_echo</a></li>
 <li><a href="mod/mod_env.html">Módulo Apache mod_env</a></li>
diff --git a/docs/manual/sitemap.html.fr b/docs/manual/sitemap.html.fr
index e8b878c1add..b9c0751ae3e 100644
--- a/docs/manual/sitemap.html.fr
+++ b/docs/manual/sitemap.html.fr
@@ -205,6 +205,7 @@ pour d
 <li><a href="mod/mod_autoindex.html">Module Apache mod_autoindex</a></li>
 <li><a href="mod/mod_buffer.html">Module Apache mod_buffer</a></li>
 <li><a href="mod/mod_cache.html">Module Apache mod_cache</a></li>
+<li><a href="mod/mod_cache_disk.html">Module Apache mod_cache_disk</a></li>
 <li><a href="mod/mod_cern_meta.html">Module Apache mod_cern_meta</a></li>
 <li><a href="mod/mod_cgi.html">Module Apache mod_cgi</a></li>
 <li><a href="mod/mod_cgid.html">Module Apache mod_cgid</a></li>
@@ -216,7 +217,6 @@ pour d
 <li><a href="mod/mod_deflate.html">Module Apache mod_deflate</a></li>
 <li><a href="mod/mod_dialup.html">Module Apache mod_dialup</a></li>
 <li><a href="mod/mod_dir.html">Module Apache mod_dir</a></li>
-<li><a href="mod/mod_disk_cache.html">Module Apache mod_disk_cache</a></li>
 <li><a href="mod/mod_dumpio.html">Module Apache mod_dumpio</a></li>
 <li><a href="mod/mod_echo.html">Module Apache mod_echo</a></li>
 <li><a href="mod/mod_env.html">Module Apache mod_env</a></li>
diff --git a/docs/manual/sitemap.html.ja.utf8 b/docs/manual/sitemap.html.ja.utf8
index e22381ebab6..da8b5ebb9e3 100644
--- a/docs/manual/sitemap.html.ja.utf8
+++ b/docs/manual/sitemap.html.ja.utf8
@@ -188,6 +188,7 @@
 <li><a href="mod/mod_autoindex.html">Apache ã¢ã¸ã¥ã¼ã« mod_autoindex</a></li>
 <li><a href="mod/mod_buffer.html">Apache ã¢ã¸ã¥ã¼ã« mod_buffer</a></li>
 <li><a href="mod/mod_cache.html">Apache ã¢ã¸ã¥ã¼ã« mod_cache</a></li>
+<li><a href="mod/mod_cache_disk.html">Apache ã¢ã¸ã¥ã¼ã« mod_cache_disk</a></li>
 <li><a href="mod/mod_cern_meta.html">Apache ã¢ã¸ã¥ã¼ã« mod_cern_meta</a></li>
 <li><a href="mod/mod_cgi.html">Apache ã¢ã¸ã¥ã¼ã« mod_cgi</a></li>
 <li><a href="mod/mod_cgid.html">Apache ã¢ã¸ã¥ã¼ã« mod_cgid</a></li>
@@ -199,7 +200,6 @@
 <li><a href="mod/mod_deflate.html">Apache ã¢ã¸ã¥ã¼ã« mod_deflate</a></li>
 <li><a href="mod/mod_dialup.html">Apache ã¢ã¸ã¥ã¼ã« mod_dialup</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>
 <li><a href="mod/mod_dumpio.html">Apache ã¢ã¸ã¥ã¼ã« mod_dumpio</a></li>
 <li><a href="mod/mod_echo.html">Apache ã¢ã¸ã¥ã¼ã« mod_echo</a></li>
 <li><a href="mod/mod_env.html">Apache ã¢ã¸ã¥ã¼ã« mod_env</a></li>
diff --git a/docs/manual/sitemap.html.ko.euc-kr b/docs/manual/sitemap.html.ko.euc-kr
index 82f37a8890e..22dfbe6376a 100644
--- a/docs/manual/sitemap.html.ko.euc-kr
+++ b/docs/manual/sitemap.html.ko.euc-kr
@@ -188,6 +188,7 @@
 <li><a href="mod/mod_autoindex.html">¾ÆÆÄÄ¡ ¸ðµâ mod_autoindex</a></li>
 <li><a href="mod/mod_buffer.html">¾ÆÆÄÄ¡ ¸ðµâ mod_buffer</a></li>
 <li><a href="mod/mod_cache.html">¾ÆÆÄÄ¡ ¸ðµâ mod_cache</a></li>
+<li><a href="mod/mod_cache_disk.html">¾ÆÆÄÄ¡ ¸ðµâ mod_cache_disk</a></li>
 <li><a href="mod/mod_cern_meta.html">¾ÆÆÄÄ¡ ¸ðµâ mod_cern_meta</a></li>
 <li><a href="mod/mod_cgi.html">¾ÆÆÄÄ¡ ¸ðµâ mod_cgi</a></li>
 <li><a href="mod/mod_cgid.html">¾ÆÆÄÄ¡ ¸ðµâ mod_cgid</a></li>
@@ -199,7 +200,6 @@
 <li><a href="mod/mod_deflate.html">¾ÆÆÄÄ¡ ¸ðµâ mod_deflate</a></li>
 <li><a href="mod/mod_dialup.html">¾ÆÆÄÄ¡ ¸ðµâ mod_dialup</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>
 <li><a href="mod/mod_dumpio.html">¾ÆÆÄÄ¡ ¸ðµâ mod_dumpio</a></li>
 <li><a href="mod/mod_echo.html">¾ÆÆÄÄ¡ ¸ðµâ mod_echo</a></li>
 <li><a href="mod/mod_env.html">¾ÆÆÄÄ¡ ¸ðµâ mod_env</a></li>
diff --git a/docs/manual/sitemap.html.tr.utf8 b/docs/manual/sitemap.html.tr.utf8
index f87d538ef4f..63574605a56 100644
--- a/docs/manual/sitemap.html.tr.utf8
+++ b/docs/manual/sitemap.html.tr.utf8
@@ -189,6 +189,7 @@ Windows ile Apache KullanÄ±mÄ±</a></li>
 <li><a href="mod/mod_autoindex.html">Apache ModÃ¼lÃ¼ mod_autoindex</a></li>
 <li><a href="mod/mod_buffer.html">Apache ModÃ¼lÃ¼ mod_buffer</a></li>
 <li><a href="mod/mod_cache.html">Apache ModÃ¼lÃ¼ mod_cache</a></li>
+<li><a href="mod/mod_cache_disk.html">Apache ModÃ¼lÃ¼ mod_cache_disk</a></li>
 <li><a href="mod/mod_cern_meta.html">Apache ModÃ¼lÃ¼ mod_cern_meta</a></li>
 <li><a href="mod/mod_cgi.html">Apache ModÃ¼lÃ¼ mod_cgi</a></li>
 <li><a href="mod/mod_cgid.html">Apache ModÃ¼lÃ¼ mod_cgid</a></li>
@@ -200,7 +201,6 @@ Windows ile Apache KullanÄ±mÄ±</a></li>
 <li><a href="mod/mod_deflate.html">Apache ModÃ¼lÃ¼ mod_deflate</a></li>
 <li><a href="mod/mod_dialup.html">Apache ModÃ¼lÃ¼ mod_dialup</a></li>
 <li><a href="mod/mod_dir.html">Apache ModÃ¼lÃ¼ mod_dir</a></li>
-<li><a href="mod/mod_disk_cache.html">Apache ModÃ¼lÃ¼ mod_disk_cache</a></li>
 <li><a href="mod/mod_dumpio.html">Apache ModÃ¼lÃ¼ mod_dumpio</a></li>
 <li><a href="mod/mod_echo.html">Apache ModÃ¼lÃ¼ mod_echo</a></li>
 <li><a href="mod/mod_env.html">Apache ModÃ¼lÃ¼ mod_env</a></li>
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index 140de595703..8a1d533e9f0 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -61,7 +61,7 @@
     <ul>
       <li>These modules have been removed: mod_authn_default,
       mod_authz_default, mod_mem_cache.  If you were using
-      mod_mem_cache in 2.2, look at <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> in
+      mod_mem_cache in 2.2, look at <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> in
       2.4.</li>
 
       <li>All load balancing implementations have been moved to
diff --git a/docs/manual/upgrading.html.fr b/docs/manual/upgrading.html.fr
index 3face72ac72..ed68d9e54fd 100644
--- a/docs/manual/upgrading.html.fr
+++ b/docs/manual/upgrading.html.fr
@@ -70,7 +70,7 @@ fonctionnalit
       <li>Les modules suivants ont été supprimés : mod_authn_default,
       mod_authz_default et mod_mem_cache. Si vous utilisiez
       mod_mem_cache sous la version 2.2, reportez-vous à
-      <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> dans la version 2.4.</li>
+      <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code> dans la version 2.4.</li>
 
       <li>Toutes les implémentations de répartition de charge ont été
       déplacées vers des sous-modules spécifiques de mod_proxy, comme
diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index 1336306dfb8..3a4ac4c7525 100644
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -61,7 +61,7 @@
     <ul>
       <li>These modules have been removed: mod_authn_default,
       mod_authz_default, mod_mem_cache.  If you were using
-      mod_mem_cache in 2.2, look at <module>mod_disk_cache</module> in
+      mod_mem_cache in 2.2, look at <module>mod_cache_disk</module> in
       2.4.</li>
 
       <li>All load balancing implementations have been moved to
diff --git a/docs/manual/upgrading.xml.fr b/docs/manual/upgrading.xml.fr
index 463da64e644..fa2df2367f9 100644
--- a/docs/manual/upgrading.xml.fr
+++ b/docs/manual/upgrading.xml.fr
@@ -68,7 +68,7 @@ fonctionnalit&eacute;s du serveur HTTP Apache 2.4</a></seealso>
       <li>Les modules suivants ont &eacute;t&eacute; supprim&eacute;s : mod_authn_default,
       mod_authz_default et mod_mem_cache. Si vous utilisiez
       mod_mem_cache sous la version 2.2, reportez-vous &agrave;
-      <module>mod_disk_cache</module> dans la version 2.4.</li>
+      <module>mod_cache_disk</module> dans la version 2.4.</li>
 
       <li>Toutes les impl&eacute;mentations de r&eacute;partition de charge ont &eacute;t&eacute;
       d&eacute;plac&eacute;es vers des sous-modules sp&eacute;cifiques de mod_proxy, comme

Description:	Disk based storage module for the HTTP caching filter.
Status:	Extension
Module Identifier:	disk_cache_module
Source File:	mod_disk_cache.c
Description:	Module de stockage sur disque pour le filtre de mise en cache HTTP.
Statut:	Extension
Identificateur de Module:	disk_cache_module
Fichier Source:	mod_disk_cache.c
èª¬æ:	URI ããã¼ã«ããã³ã³ãã³ããã£ãã·ã¥ã¹ãã¬ã¼ã¸ç®¡ç
ã¹ãã¼ã¿ã¹:	Extension
ã¢ã¸ã¥ã¼ã«èå¥å:	disk_cache_module
ã½ã¼ã¹ãã¡ã¤ã«:	mod_disk_cache.c
¼³¸í:	Content cache storage manager keyed to URIs
»óÅÂ:	Experimental
¸ðµâ¸í:	disk_cache_module
¼Ò½ºÆÄÀÏ:	mod_disk_cache.c