From: Paul Querna <pquerna@apache.org>
Date: Thu, 7 Apr 2005 02:04:03 +0000 (+0000)
Subject: rename mod_imap to mod_imagemap.
X-Git-Tag: 2.1.5~233
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a19987ca7f151b80c25e1fd6c24e938ca22987f4;p=apache

rename mod_imap to mod_imagemap.
Broken by this commit:
 - Win32 Build -- I didn't want to muck with .dsp files.
 - Netware Build - Same Story as Win32.
 - Documentation Translations (could get away with direct changes to the module name, but I am not sure)


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

diff --git a/CHANGES b/CHANGES
index 27a86a8003..f9603175b0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.5
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Rename mod_imap to mod_imagemap.
+     [Paul Querna]
+
   *) util_ldap: Eliminate the load ordering of mod_ldap and mod_authnz_ldap
      by changing the mod_ldap exported functions to optional functions.
      [Brad Nicholes]
diff --git a/docs/manual/handler.html.en b/docs/manual/handler.html.en
index 4bab347121..b2f347e4e9 100644
--- a/docs/manual/handler.html.en
+++ b/docs/manual/handler.html.en
@@ -34,7 +34,7 @@
 <div class="section">
 <h2><a name="definition" id="definition">What is a Handler</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_actions.html">mod_actions</a></code></li><li><code class="module"><a href="./mod/mod_asis.html">mod_asis</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_imap.html">mod_imap</a></code></li><li><code class="module"><a href="./mod/mod_info.html">mod_info</a></code></li><li><code class="module"><a href="./mod/mod_mime.html">mod_mime</a></code></li><li><code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code></li><li><code class="module"><a href="./mod/mod_status.html">mod_status</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_actions.html#action">Action</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removehandler">RemoveHandler</a></code></li><li><code class="directive"><a href="./mod/core.html#sethandler">SetHandler</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_actions.html">mod_actions</a></code></li><li><code class="module"><a href="./mod/mod_asis.html">mod_asis</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_imagemap.html">mod_imagemap</a></code></li><li><code class="module"><a href="./mod/mod_info.html">mod_info</a></code></li><li><code class="module"><a href="./mod/mod_mime.html">mod_mime</a></code></li><li><code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code></li><li><code class="module"><a href="./mod/mod_status.html">mod_status</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_actions.html#action">Action</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removehandler">RemoveHandler</a></code></li><li><code class="directive"><a href="./mod/core.html#sethandler">SetHandler</a></code></li></ul></td></tr></table>
 
 
     <p>A "handler" is an internal Apache representation of the
@@ -68,7 +68,7 @@
       script. (<code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code>)</li>
 
       <li><strong>imap-file</strong>: Parse as an imagemap rule
-      file. (<code class="module"><a href="./mod/mod_imap.html">mod_imap</a></code>)</li>
+      file. (<code class="module"><a href="./mod/mod_imagemap.html">mod_imagemap</a></code>)</li>
 
       <li><strong>server-info</strong>: Get the server's
       configuration information. (<code class="module"><a href="./mod/mod_info.html">mod_info</a></code>)</li>
diff --git a/docs/manual/handler.xml b/docs/manual/handler.xml
index 4934b9baf7..d9302af3e4 100644
--- a/docs/manual/handler.xml
+++ b/docs/manual/handler.xml
@@ -35,7 +35,7 @@
         <module>mod_actions</module>
         <module>mod_asis</module>
         <module>mod_cgi</module>
-        <module>mod_imap</module>
+        <module>mod_imagemap</module>
         <module>mod_info</module>
         <module>mod_mime</module>
         <module>mod_negotiation</module>
@@ -83,7 +83,7 @@
       script. (<module>mod_cgi</module>)</li>
 
       <li><strong>imap-file</strong>: Parse as an imagemap rule
-      file. (<module>mod_imap</module>)</li>
+      file. (<module>mod_imagemap</module>)</li>
 
       <li><strong>server-info</strong>: Get the server's
       configuration information. (<module>mod_info</module>)</li>
diff --git a/docs/manual/misc/rewriteguide.html.en b/docs/manual/misc/rewriteguide.html.en
index 2875995771..ab8cb1863c 100644
--- a/docs/manual/misc/rewriteguide.html.en
+++ b/docs/manual/misc/rewriteguide.html.en
@@ -543,7 +543,7 @@ RewriteRule   (.*)                     netsw-lsdir.cgi/$1
 
     
 
-    <h3>NCSA imagemap to Apache <code>mod_imap</code></h3>
+    <h3>NCSA imagemap to Apache <code>mod_imagemap</code></h3>
 
       
 
@@ -555,7 +555,7 @@ RewriteRule   (.*)                     netsw-lsdir.cgi/$1
           modern Apache webserver a lot of people want a smooth
           transition. So they want pages which use their old NCSA
           <code>imagemap</code> program to work under Apache with the
-          modern <code class="module"><a href="../mod/mod_imap.html">mod_imap</a></code>. The problem is that there
+          modern <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code>. The problem is that there
           are a lot of hyperlinks around which reference the
           <code>imagemap</code> program via
           <code>/cgi-bin/imagemap/path/to/page.map</code>. Under
diff --git a/docs/manual/misc/rewriteguide.xml b/docs/manual/misc/rewriteguide.xml
index c9f9fc98c6..170311439b 100644
--- a/docs/manual/misc/rewriteguide.xml
+++ b/docs/manual/misc/rewriteguide.xml
@@ -543,7 +543,7 @@ RewriteRule   (.*)                     netsw-lsdir.cgi/$1
 
     <section>
 
-      <title>NCSA imagemap to Apache <code>mod_imap</code></title>
+      <title>NCSA imagemap to Apache <code>mod_imagemap</code></title>
 
       <dl>
         <dt>Description:</dt>
@@ -553,7 +553,7 @@ RewriteRule   (.*)                     netsw-lsdir.cgi/$1
           modern Apache webserver a lot of people want a smooth
           transition. So they want pages which use their old NCSA
           <code>imagemap</code> program to work under Apache with the
-          modern <module>mod_imap</module>. The problem is that there
+          modern <module>mod_imagemap</module>. The problem is that there
           are a lot of hyperlinks around which reference the
           <code>imagemap</code> program via
           <code>/cgi-bin/imagemap/path/to/page.map</code>. Under
diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml
index a50db767ea..6742eaa740 100644
--- a/docs/manual/mod/allmodules.xml
+++ b/docs/manual/mod/allmodules.xml
@@ -40,7 +40,7 @@
   <modulefile>mod_filter.xml</modulefile>
   <modulefile>mod_headers.xml</modulefile>
   <modulefile>mod_ident.xml</modulefile>
-  <modulefile>mod_imap.xml</modulefile>
+  <modulefile>mod_imagemap.xml</modulefile>
   <modulefile>mod_include.xml</modulefile>
   <modulefile>mod_info.xml</modulefile>
   <modulefile>mod_isapi.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de
index 32fd220340..0ef2f06fb3 100644
--- a/docs/manual/mod/allmodules.xml.de
+++ b/docs/manual/mod/allmodules.xml.de
@@ -40,7 +40,7 @@
   <modulefile>mod_filter.xml</modulefile>
   <modulefile>mod_headers.xml</modulefile>
   <modulefile>mod_ident.xml</modulefile>
-  <modulefile>mod_imap.xml</modulefile>
+  <modulefile>mod_imagemap.xml</modulefile>
   <modulefile>mod_include.xml</modulefile>
   <modulefile>mod_info.xml</modulefile>
   <modulefile>mod_isapi.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es
index 2ee92861be..c4fe9a51ef 100644
--- a/docs/manual/mod/allmodules.xml.es
+++ b/docs/manual/mod/allmodules.xml.es
@@ -40,7 +40,7 @@
   <modulefile>mod_filter.xml</modulefile>
   <modulefile>mod_headers.xml</modulefile>
   <modulefile>mod_ident.xml</modulefile>
-  <modulefile>mod_imap.xml</modulefile>
+  <modulefile>mod_imagemap.xml</modulefile>
   <modulefile>mod_include.xml</modulefile>
   <modulefile>mod_info.xml</modulefile>
   <modulefile>mod_isapi.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja
index 642e8f35d1..0d91020fb3 100644
--- a/docs/manual/mod/allmodules.xml.ja
+++ b/docs/manual/mod/allmodules.xml.ja
@@ -40,7 +40,7 @@
   <modulefile>mod_filter.xml</modulefile>
   <modulefile>mod_headers.xml.ja</modulefile>
   <modulefile>mod_ident.xml</modulefile>
-  <modulefile>mod_imap.xml</modulefile>
+  <modulefile>mod_imagemap.xml</modulefile>
   <modulefile>mod_include.xml.ja</modulefile>
   <modulefile>mod_info.xml.ja</modulefile>
   <modulefile>mod_isapi.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko
index 553544424e..3590070569 100644
--- a/docs/manual/mod/allmodules.xml.ko
+++ b/docs/manual/mod/allmodules.xml.ko
@@ -40,7 +40,7 @@
   <modulefile>mod_filter.xml</modulefile>
   <modulefile>mod_headers.xml.ko</modulefile>
   <modulefile>mod_ident.xml.ko</modulefile>
-  <modulefile>mod_imap.xml.ko</modulefile>
+  <modulefile>mod_imagemap.xml.ko</modulefile>
   <modulefile>mod_include.xml</modulefile>
   <modulefile>mod_info.xml.ko</modulefile>
   <modulefile>mod_isapi.xml.ko</modulefile>
diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en
index e7dc2c0d72..2905b45487 100644
--- a/docs/manual/mod/directives.html.en
+++ b/docs/manual/mod/directives.html.en
@@ -195,9 +195,9 @@
 <li><a href="core.html#ifdefine">&lt;IfDefine&gt;</a></li>
 <li><a href="core.html#ifmodule">&lt;IfModule&gt;</a></li>
 <li><a href="mod_version.html#ifversion">&lt;IfVersion&gt;</a></li>
-<li><a href="mod_imap.html#imapbase">ImapBase</a></li>
-<li><a href="mod_imap.html#imapdefault">ImapDefault</a></li>
-<li><a href="mod_imap.html#imapmenu">ImapMenu</a></li>
+<li><a href="mod_imagemap.html#imapbase">ImapBase</a></li>
+<li><a href="mod_imagemap.html#imapdefault">ImapDefault</a></li>
+<li><a href="mod_imagemap.html#imapmenu">ImapMenu</a></li>
 <li><a href="core.html#include">Include</a></li>
 <li><a href="mod_autoindex.html#indexignore">IndexIgnore</a></li>
 <li><a href="mod_autoindex.html#indexoptions">IndexOptions</a></li>
diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en
index d4b43ee719..f1b7030487 100644
--- a/docs/manual/mod/index.html.en
+++ b/docs/manual/mod/index.html.en
@@ -127,7 +127,7 @@ delivery to the client</dd>
 <dt><a href="mod_headers.html" id="H" name="H">mod_headers</a></dt><dd>Customization of HTTP request and response
 headers</dd>
 <dt><a href="mod_ident.html" id="I" name="I">mod_ident</a></dt><dd>RFC 1413 ident lookups</dd>
-<dt><a href="mod_imap.html">mod_imap</a></dt><dd>Server-side imagemap processing</dd>
+<dt><a href="mod_imagemap.html">mod_imagemap</a></dt><dd>Server-side imagemap processing</dd>
 <dt><a href="mod_include.html">mod_include</a></dt><dd>Server-parsed html documents (Server Side Includes)</dd>
 <dt><a href="mod_info.html">mod_info</a></dt><dd>Provides a comprehensive overview of the server
 configuration</dd>
diff --git a/docs/manual/mod/mod_authz_host.xml.ja b/docs/manual/mod/mod_authz_host.xml.ja
index dcde34b201..c6393e8119 100644
--- a/docs/manual/mod/mod_authz_host.xml.ja
+++ b/docs/manual/mod/mod_authz_host.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:160356 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mod_authz_host.xml.ko b/docs/manual/mod/mod_authz_host.xml.ko
index af90dadecc..76ab7186d5 100644
--- a/docs/manual/mod/mod_authz_host.xml.ko
+++ b/docs/manual/mod/mod_authz_host.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: 151408 -->
+<!-- English Revision: 151408:160356 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mod_authz_host.xml.meta b/docs/manual/mod/mod_authz_host.xml.meta
index dbf3c742b1..55c328235f 100644
--- a/docs/manual/mod/mod_authz_host.xml.meta
+++ b/docs/manual/mod/mod_authz_host.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
-    <variant>ko</variant>
+    <variant outdated="yes">ja</variant>
+    <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_cache.xml.meta b/docs/manual/mod/mod_cache.xml.meta
index ecfabbb081..7713d67822 100644
--- a/docs/manual/mod/mod_cache.xml.meta
+++ b/docs/manual/mod/mod_cache.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">ja</variant>
+    <variant>ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_imap.html b/docs/manual/mod/mod_imagemap.html
similarity index 68%
rename from docs/manual/mod/mod_imap.html
rename to docs/manual/mod/mod_imagemap.html
index b75b87a1ff..b571be950b 100644
--- a/docs/manual/mod/mod_imap.html
+++ b/docs/manual/mod/mod_imagemap.html
@@ -1,7 +1,7 @@
-URI: mod_imap.html.en
+URI: mod_imagemap.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_imap.html.ko.euc-kr
+URI: mod_imagemap.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
diff --git a/docs/manual/mod/mod_imap.html.en b/docs/manual/mod/mod_imagemap.html.en
similarity index 96%
rename from docs/manual/mod/mod_imap.html.en
rename to docs/manual/mod/mod_imagemap.html.en
index 9e3351e2a8..898e04d5ff 100644
--- a/docs/manual/mod/mod_imap.html.en
+++ b/docs/manual/mod/mod_imagemap.html.en
@@ -5,7 +5,7 @@
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>mod_imap - Apache HTTP Server</title>
+<title>mod_imagemap - 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,15 +19,15 @@
 <div id="path">
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Documentation</a> &gt; <a href="../">Version 2.1</a> &gt; <a href="./">Modules</a></div>
 <div id="page-content">
-<div id="preamble"><h1>Apache Module mod_imap</h1>
+<div id="preamble"><h1>Apache Module mod_imagemap</h1>
 <div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_imap.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ko/mod/mod_imap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<p><span>Available Languages: </span><a href="../en/mod/mod_imagemap.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ko/mod/mod_imagemap.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>Server-side imagemap processing</td></tr>
 <tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>imap_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_imap.c</td></tr></table>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_imagemap.c</td></tr></table>
 <h3>Summary</h3>
 
     <p>This module processes <code>.map</code> files, thereby
@@ -294,7 +294,7 @@
 <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#Override">Override:</a></th><td>Indexes</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_imap</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_imagemap</td></tr>
 </table>
     <p>The <code class="directive">ImapBase</code> directive sets the default
     <code>base</code> used in the imagemap files. Its value is
@@ -317,7 +317,7 @@ that are not explicitly mapped</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#Override">Override:</a></th><td>Indexes</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_imap</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_imagemap</td></tr>
 </table>
     <p>The <code class="directive">ImapDefault</code> directive sets the default
     <code>default</code> used in the imagemap files. Its value is
@@ -337,7 +337,7 @@ an imagemap</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#Override">Override:</a></th><td>Indexes</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_imap</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_imagemap</td></tr>
 </table>
     <p>The <code class="directive">ImapMenu</code> directive determines the
     action taken if an imagemap file is called without valid
@@ -374,8 +374,8 @@ an imagemap</td></tr>
 </div>
 </div>
 <div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_imap.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ko/mod/mod_imap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<p><span>Available Languages: </span><a href="../en/mod/mod_imagemap.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ko/mod/mod_imagemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
diff --git a/docs/manual/mod/mod_imap.xml b/docs/manual/mod/mod_imagemap.xml
similarity index 97%
rename from docs/manual/mod/mod_imap.xml
rename to docs/manual/mod/mod_imagemap.xml
index ab3d53d8f9..0aba85511c 100644
--- a/docs/manual/mod/mod_imap.xml
+++ b/docs/manual/mod/mod_imagemap.xml
@@ -20,12 +20,12 @@
  limitations under the License.
 -->
 
-<modulesynopsis metafile="mod_imap.xml.meta">
+<modulesynopsis metafile="mod_imagemap.xml.meta">
 
-<name>mod_imap</name>
+<name>mod_imagemap</name>
 <description>Server-side imagemap processing</description>
 <status>Base</status>
-<sourcefile>mod_imap.c</sourcefile>
+<sourcefile>mod_imagemap.c</sourcefile>
 <identifier>imap_module</identifier>
 
 <summary>
@@ -101,7 +101,7 @@
       <dd><p>Has the effect of <code>&lt;base href="<var>value</var>"&gt;
       </code>. The non-absolute URLs of the map-file are taken relative
       to this value. The <code>base</code> directive overrides
-      <directive module="mod_imap">ImapBase</directive> as set in a
+      <directive module="mod_imagemap">ImapBase</directive> as set in a
       <code>.htaccess</code> file or in the server configuration files.
       In the absence of an <directive>ImapBase</directive> configuration
       directive, <code>base</code> defaults to
@@ -115,7 +115,7 @@
       of the <code>poly</code>, <code>circle</code> or
       <code>rect</code> directives, and there are no
       <code>point</code> directives. Defaults to <code>nocontent</code>
-      in the absence of an <directive module="mod_imap"
+      in the absence of an <directive module="mod_imagemap"
       >ImapDefault</directive> configuration setting, causing a status
       code of <code>204 No Content</code> to be returned. The client
       should keep the same page displayed.</dd>
@@ -166,7 +166,7 @@
 
       <dd>Equivalent to the URL of the imagemap file itself. No
       coordinates are sent with this, so a menu will be generated
-      unless <directive module="mod_imap">ImapMenu</directive> is set to
+      unless <directive module="mod_imagemap">ImapMenu</directive> is set to
       <code>none</code>.</dd>
 
       <dt><code>menu</code></dt>
diff --git a/docs/manual/mod/mod_imap.xml.ko b/docs/manual/mod/mod_imagemap.xml.ko
similarity index 100%
rename from docs/manual/mod/mod_imap.xml.ko
rename to docs/manual/mod/mod_imagemap.xml.ko
diff --git a/docs/manual/mod/mod_imap.xml.meta b/docs/manual/mod/mod_imagemap.xml.meta
similarity index 84%
rename from docs/manual/mod/mod_imap.xml.meta
rename to docs/manual/mod/mod_imagemap.xml.meta
index f432326a62..ee6b545f7c 100644
--- a/docs/manual/mod/mod_imap.xml.meta
+++ b/docs/manual/mod/mod_imagemap.xml.meta
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <metafile>
-  <basename>mod_imap</basename>
+  <basename>mod_imagemap</basename>
   <path>/mod/</path>
   <relpath>..</relpath>
 
diff --git a/docs/manual/mod/mod_imap.html.ko.euc-kr b/docs/manual/mod/mod_imap.html.ko.euc-kr
deleted file mode 100644
index e884582aca..0000000000
--- a/docs/manual/mod/mod_imap.html.ko.euc-kr
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="EUC-KR"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_imap - 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" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<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>
-<p class="apache">Apache HTTP Server Version 2.1</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Documentation</a> &gt; <a href="../">Version 2.1</a> &gt; <a href="./">¸ðµâ</a></div>
-<div id="page-content">
-<div id="preamble"><h1>¾ÆÆÄÄ¡ ¸ðµâ mod_imap</h1>
-<div class="toplang">
-<p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_imap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ko/mod/mod_imap.html" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">¼³¸í:</a></th><td>¼­¹öÃø À̹ÌÁö¸Ê(imagemap) ó¸®</td></tr>
-<tr><th><a href="module-dict.html#Status">»óÅÂ:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¸ðµâ¸í:</a></th><td>imap_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¼Ò½ºÆÄÀÏ:</a></th><td>mod_imap.c</td></tr></table>
-<h3>¿ä¾à</h3>
-
-    <p>ÀÌ ¸ðµâÀº <code>imagemap</code> CGI ÇÁ·Î±×·¥À» ´ë½ÅÇÏ¿©
-    <code>.map</code> ÆÄÀÏÀ» ó¸®ÇÑ´Ù. ÀÌ ¸ðµâÀº (<code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code>³ª <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code>¸¦ »ç¿ëÇÏ¿©)
-    <code>imap-file</code> Çڵ鷯¸¦ »ç¿ëÇϵµ·Ï ¼³Á¤ÇÑ µð·ºÅ丮³ª
-    ¹®¼­¸¦ ó¸®ÇÑ´Ù.</p>
-
-    <p>¾Æ·¡ Áö½Ã¾î´Â <code>.map</code>À¸·Î ³¡³ª´Â ÆÄÀÏÀ» À̹ÌÁö¸Ê
-    ÆÄÀÏ·Î ¼³Á¤ÇÑ´Ù.</p>
-
-    <div class="example"><p><code>AddHandler imap-file map</code></p></div>
-
-    <p>¾ÆÁ÷µµ ¾Æ·¡¿Í °°Àº ¼³Á¤À» Áö¿øÇÑ´Ù.</p>
-
-    <div class="example"><p><code>AddType application/x-httpd-imap map</code></p></div>
-
-    <p>±×·¯³ª ¿ì¸®´Â Á¡Â÷ "¼­¹ö¿¡°Ô Ưº°ÇÑ Àǹ̰¡ ÀÖ´Â MIME
-    type"À» Á¦°ÅÇÏ·Á°í Çϱ⶧¹®¿¡ ÀÌ ¹æ¹ýÀº ¾ø¾îÁú °ÍÀÌ´Ù.</p>
-</div>
-<div id="quickview"><h3 class="directives">Áö½Ã¾îµé</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#imapbase">ImapBase</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#imapdefault">ImapDefault</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#imapmenu">ImapMenu</a></li>
-</ul>
-<h3>ÁÖÁ¦</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#features">»õ·Î¿î ±â´É</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#imapfile">À̹ÌÁö¸Ê ÆÄÀÏ</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#example">¸ÊÆÄÀÏ ¿¹Á¦</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#referencing">¸ÊÆÄÀÏ »ç¿ëÇϱâ</a></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="features" id="features">»õ·Î¿î ±â´É</a></h2>
-
-    <p>À̹ÌÁö¸Ê ¸ðµâ¿¡´Â ÀÌÀü À̹ÌÁö¸Ê ÇÁ·Î±×·¥¿¡´Â ¾ø´Â ¸î°¡Áö
-    »õ·Î¿î ±â´ÉÀÌ ÀÖ´Ù.</p>
-
-    <ul>
-      <li>Referer: Á¤º¸¿¡ »ó´ëÀûÀÎ URL ÂüÁ¶.</li>
-
-      <li>»õ·Î¿î <code>base</code> ¸ÊÁö½Ã¾î¸¦ »ç¿ëÇÏ¿© ±âº»
-      <code>&lt;base&gt;</code> ÁöÁ¤.</li>
-
-      <li><code>imagemap.conf</code> ÆÄÀÏ ÇÊ¿ä¾øÀ½.</li>
-
-      <li>Á¡(point) ÂüÁ¶.</li>
-
-      <li>À̹ÌÁö¸Ê ¸Þ´º Á¶Á¤ °¡´É.</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="imapfile" id="imapfile">À̹ÌÁö¸Ê ÆÄÀÏ</a></h2>
-
-    <p>À̹ÌÁö¸Ê ÆÄÀÏÀº ¾Æ·¡¿Í °°Àº Çü½ÄÀ¸·Î ÀÛ¼ºÇÑ´Ù.</p>
-
-    <div class="example"><p><code>
-      directive value [<var>x</var>,<var>y</var> ...]<br />
-      directive value "<var>Menu text</var>" [<var>x</var>,<var>y</var>
-      ...]<br />
-      directive value <var>x</var>,<var>y</var> ... "<var>Menu text</var>"
-    </code></p></div>
-
-    <p>directive´Â <code>base</code>, <code>default</code>,
-    <code>poly</code>, <code>circle</code>, <code>rect</code>,
-    <code>point</code> Áß Çϳª´Ù. value¿¡´Â Àý´ë URLÀ̳ª »ó´ë
-    URL ȤÀº ¾Æ·¡¿¡¼­ ¿­°ÅÇÒ Æ¯¼ö°ªÀ» »ç¿ëÇÑ´Ù. ÁÂÇ¥´Â °ø¹éÀ¸·Î
-    ±¸ºÐÇÑ <code><var>x</var>,<var>y</var></code> ½ÖÀÌ´Ù. µû¿ÈÇ¥·Î
-    ¹­Àº ¹®±¸´Â À̹ÌÁö¸Ê ¸Þ´º¸¦ ¸¸µé¶§ ¸µÅ© Á¦¸ñÀ¸·Î »ç¿ëÇÑ´Ù.
-    '#'·Î ½ÃÀÛÇÏ´Â ÁÙÀº ÁÖ¼®ÀÌ´Ù.</p>
-
-    <h3><a name="imapfile.directives" id="imapfile.directives">À̹ÌÁö¸Ê ÆÄÀÏ Áö½Ã¾î</a></h3>
-      <p>À̹ÌÁö¸Ê ÆÄÀÏ¿¡¼­ 6°¡Áö Áö½Ã¾î¸¦ »ç¿ëÇÒ ¼ö ÀÖ´Ù. Áö½Ã¾î´Â
-      Ưº°ÇÑ ¼ø¼­¾øÀÌ »ç¿ëÇÒ ¼ö ÀÖÁö¸¸, À̹ÌÁö¸Ê ÆÄÀÏ¿¡ ³ª¿Â
-      ¼ø¼­´ë·Î ó¸®ÇÑ´Ù.</p>
-
-      <dl>
-      <dt><code>base</code> Áö½Ã¾î</dt>
-
-      <dd><p><code>&lt;base href="<var>value</var>"&gt;</code>
-      ±â´ÉÀ» ÇÑ´Ù. ¸ÊÆÄÀÏ¿¡¼­ ³ª¿À´Â URLÀº Àý´ë URLÀÌ ¾Æ´Ï¶ó¸é
-      ÀÌ °ª¿¡ »ó´ë URL·Î Ãë±ÞÇÑ´Ù. <code>base</code> Áö½Ã¾î´Â
-      <code>.htaccess</code> ÆÄÀÏÀ̳ª ¼­¹ö¼³Á¤ÆÄÀÏ¿¡¼­ ¼³Á¤ÇÑ
-      <code class="directive"><a href="#imapbase">ImapBase</a></code> °ªÀ»
-      ¹«½ÃÇÑ´Ù. <code class="directive">ImapBase</code> ¼³Á¤Áö½Ã¾î°¡
-      ¾ø´Ù¸é ±âº» <code>base</code> °ªÀº
-      <code>http://server_name/</code>ÀÌ´Ù.</p>
-      <p><code>base_uri</code>´Â <code>base</code>¿Í °°´Ù. URL¿¡¼­
-      ¸¶Áö¸· ½½·¡½¬¸¦ ÀØÁö¸¶¶ó.</p></dd>
-
-      <dt><code>default</code> Áö½Ã¾î</dt>
-
-      <dd>ÇØ´ç ÁÂÇ¥°¡ <code>poly</code>, <code>circle</code>,
-      <code>rect</code> Áö½Ã¾î¿¡ ÇØ´çÇÏÁö ¾Ê°í <code>point</code>
-      Áö½Ã¾î¸¦ »ç¿ëÇÏÁö ¾ÊÀº °æ¿ì ÇൿÀ» ÁöÁ¤ÇÑ´Ù. <code class="directive"><a href="#imapdefault">ImapDefault</a></code> ¼³Á¤ÀÌ ¾ø´Ù¸é
-      ±âº»°ªÀº <code>204 No Content</code> »óÅÂÄڵ带 ¹ÝȯÇÏ´Â
-      <code>nocontent</code>ÀÌ´Ù. ÀÌ °æ¿ì Ŭ¶óÀ̾ðÆ®´Â µ¿ÀÏÇÑ
-      ÆäÀÌÁö¸¦ º¸¿©Áà¾ß ÇÑ´Ù.</dd>
-
-      <dt><code>poly</code> Áö½Ã¾î</dt>
-
-      <dd>Á¡À» ¼¼°³¿¡¼­ ¹é°³±îÁö ÁöÁ¤ÇÒ ¼ö ÀÖ´Ù. »ç¿ëÀÚ°¡ ÀÌ
-      Á¡µé·Î ÀÌ·ç¾îÁø ´Ù°¢Çü ¾ÈÀÇ ÁÂÇ¥¸¦ ¼±ÅÃÇÑ °æ¿ì¿¡ »ç¿ëÇÑ´Ù.</dd>
-
-      <dt><code>circle</code></dt>
-
-      <dd>¿øÀÇ Á߽ɰú ¿øÀ§ÀÇ ÇÑ Á¡ÀÇ ÁÂÇ¥¸¦ ¹Þ´Â´Ù. »ç¿ëÀÚ°¡
-      ¿ø ¾ÈÀÇ ÁÂÇ¥¸¦ ¼±ÅÃÇÑ °æ¿ì¿¡ »ç¿ëÇÑ´Ù.</dd>
-
-      <dt><code>rect</code> Áö½Ã¾î</dt>
-
-      <dd>»ç°¢ÇüÀÇ µÎ ¸ð¼­¸® Á¡ÀÇ ÁÂÇ¥¸¦ ¹Þ´Â´Ù. »ç°¢Çü ¾ÈÀÇ
-      ÁÂÇ¥¸¦ ¼±ÅÃÇÑ °æ¿ì¿¡ »ç¿ëÇÑ´Ù.</dd>
-
-      <dt><code>point</code> Áö½Ã¾î</dt>
-
-      <dd>ÇÑ Á¡ÀÇ ÁÂÇ¥¸¦ ¹Þ´Â´Ù. ´Ù¸¥ Áö½Ã¾îµéÀ» ¸¸Á·ÇÏÁö ¾ÊÀº
-      °æ¿ì »ç¿ëÀÚ°¡ ¼±ÅÃÇÑ ÁÂÇ¥¿¡ °¡Àå °¡±î¿î point Áö½Ã¾î¸¦
-      »ç¿ëÇÑ´Ù. <code>point</code> Áö½Ã¾î¸¦ »ç¿ëÇÏ°í À¯È¿ÇÑ
-      ÁÂÇ¥¸¦ ¼±ÅÃÇÑ °æ¿ì <code>default</code>´Â Àý´ë·Î »ç¿ëµÇÁö
-      ¾Ê´Â´Ù.</dd>
-      </dl>
-    
-
-    <h3><a name="imapfile.values" id="imapfile.values">Áö½Ã¾î¿¡ »ç¿ëÇÒ ¼ö ÀÖ´Â °ªµé</a></h3>
-
-      <p>Áö½Ã¾î¿¡ ¾Æ·¡ value¸¦ »ç¿ëÇÒ ¼ö ÀÖ´Ù.</p>
-
-      <dl>
-      <dt>URL</dt>
-
-      <dd><p>»ó´ë URLÀ̳ª Àý´ë URLÀ» »ç¿ëÇÒ ¼ö ÀÖ´Ù. »ó´ë URL¿¡
-      '..'À» »ç¿ëÇÒ ¼ö ÀÖÀ¸¸ç, <code>base</code> °ªÀ» ±âÁØÀ¸·Î
-      ã´Â´Ù.</p>
-      <p><code>base</code>¸¦ ¼³Á¤ÇÒ¶§´Â ÇöÀç base°ªÀº ¹«½ÃÇÑ´Ù.
-      ±×·¯³ª, <code>base mailto:</code> ¹®Àº »ç¿ëÇÒ ¼ö ÀÖ´Ù.</p></dd>
-
-      <dt><code>map</code></dt>
-
-      <dd>À̹ÌÁö¸Ê ÆÄÀÏ ÀÚü URL°ú °°´Ù. ÁÂÇ¥°¡ ¾ø°í <code class="directive"><a href="#imapmenu">ImapMenu</a></code>°¡ <code>none</code>ÀÌ
-      ¾Æ´Ï¶ó¸é ¸Þ´º¸¦ ¸¸µç´Ù.</dd>
-
-      <dt><code>menu</code></dt>
-      <dd><code>map</code>°ú °°´Ù.</dd>
-
-      <dt><code>referer</code></dt>
-
-      <dd>ÂüÁ¶(¸µÅ©¸¦ µû¶ó¿À±â Àü) ¹®¼­ URL°ú °°´Ù.
-      <code>Referer:</code> Çì´õ°¡ ¾ø´Ù¸é ±âº»°ªÀº
-      <code>http://servername/</code>ÀÌ´Ù.</dd>
-
-      <dt><code>nocontent</code></dt>
-
-      <dd>Ŭ¶óÀ̾ðÆ®¿¡°Ô µ¿ÀÏÇÑ ÆäÀÌÁö¸¦ ±×´ë·Î º¸¿©ÁÖ¶ó´Â
-      <code>204 No Content</code> »óÅÂÄڵ带 º¸³½´Ù.
-      <code>base</code>¸¦ Á¦¿ÜÇÑ ¸ðµç Áö½Ã¾î¿¡¼­ »ç¿ëÇÒ ¼ö ÀÖ´Ù.</dd>
-
-      <dt><code>error</code></dt>
-
-      <dd>½ÇÆи¦ ³ªÅ¸³»´Â <code>500 Server Error</code>¸¦ º¸³½´Ù.
-      <code>base</code>¸¦ Á¦¿ÜÇÑ ¸ðµç Áö½Ã¾î¿¡¼­ »ç¿ëÇÒ ¼ö ÀÖÁö¸¸,
-      <code>default</code> ¿Ü¿¡´Â »ç¿ëÇÒ ÀÏÀÌ ¾ø´Ù.</dd>
-      </dl>
-    
-
-    <h3><a name="imapfile.coords" id="imapfile.coords">ÁÂÇ¥</a></h3>
-
-      <dl>
-      <dt><code>0,0 200,200</code></dt>
-
-      <dd>ÁÂÇ¥´Â ½°Ç¥·Î ±¸ºÐÇÑ <var>x</var>¿Í <var>y</var> °ªÀÌ´Ù.
-      ÁÂÇ¥µéÀº ¼­·Î °ø¹éÀ¸·Î ±¸ºÐÇÑ´Ù. À̹ÌÁö¸ÊÀ» ´Ù·ç´Â ¹æ½Ä»ó
-      LynxÀÇ ÆíÀǸ¦ À§ÇØ »ç¿ëÀÚ°¡ <code>0,0</code> ÁÂÇ¥¸¦ ¼±ÅÃÇÏ¿´´Ù¸é
-      ÁÂÇ¥¸¦ ¼±ÅÃÇÏÁö ¾ÊÀº °Íó·³ µ¿ÀÛÇÑ´Ù.</dd>
-      </dl>
-
-    
-
-    <h3><a name="imapfile.quotedtext" id="imapfile.quotedtext">µû¿ÈÇ¥·Î ¹­Àº ¹®±¸</a></h3>
-
-      <dl>
-      <dt><code>"<var>Menu Text</var>"</code></dt>
-
-      <dd><p>value µÚ³ª ÁÂÇ¥ µÚ¿¡ ½Öµû¿ÈÇ¥·Î ¹­Àº ¹®±¸¸¦ ÀûÀ»
-      ¼öµµ ÀÖ´Ù. ÀÌ ¹®ÀÚ¿­Àº ¸Þ´º¸¦ ¸¸µé¶§ ¸µÅ© Á¦¸ñÀ¸·Î »ç¿ëÇÑ´Ù.</p>
-
-      <div class="example"><p><code>
-        &lt;a href="http://foo.com/"&gt;<var>Menu text</var>&lt;/a&gt;
-      </code></p></div>
-
-      <p>µû¿ÈÇ¥·Î ¹­Àº ¹®±¸°¡ ¾ø´Ù¸é ´ÙÀ½°ú °°ÀÌ ¸µÅ©¸¦ ¸µÅ©
-      Á¦¸ñÀ¸·Î »ç¿ëÇÑ´Ù.</p>
-
-      <div class="example"><p><code>
-        &lt;a href="http://foo.com/"&gt;http://foo.com&lt;/a&gt;
-      </code></p></div>
-
-      <p>¹®±¸¿¡ ½Öµû¿ÈÇ¥¸¦ ¾²·Á¸é <code>&amp;quot;</code>¿Í
-      °°ÀÌ Àû¾î¾ß ÇÑ´Ù.</p></dd>
-      </dl>
-
-    
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="example" id="example">¸ÊÆÄÀÏ ¿¹Á¦</a></h2>
-
-    <div class="example"><p><code>
-      #'formatted'³ª 'semiformatted' ¸Þ´º´Â ÁÖ¼®À» Ãâ·ÂÇÑ´Ù.<br />
-      #±×¸®°í ÁÖ¼®¿¡ html ű׸¦ ¾µ ¼ö ÀÖ´Ù. &lt;hr&gt;<br />
-      base referer<br />
-      poly map "¸Þ´º¸¦ º¸¿©ÁÖ¼¼¿ä." 0,0 0,10 10,10 10,0<br />
-      rect .. 0,0 77,27 "ÂüÁ¶ ¹®¼­°¡ ÀÖ´Â µð·ºÅ丮"<br />
-      circle http://www.inetnebr.com/lincoln/feedback/ 195,0 305,27<br />
-      rect another_file "ÂüÁ¶ ¹®¼­¿Í °°Àº µð·ºÅ丮¿¡ ÀÖ´Â" 306,0 419,27<br />
-      point http://www.zyzzyva.com/ 100,100<br />
-      point http://www.tripod.com/ 200,200<br />
-      rect mailto:nate@tripod.com 100,150 200,0 "¹ö±×?"<br />
-    </code></p></div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="referencing" id="referencing">¸ÊÆÄÀÏ »ç¿ëÇϱâ</a></h2>
-
-    <div class="example"><h3>HTML ¿¡Á¦</h3><p><code>
-      &lt;a href="/maps/imagemap1.map"&gt;<br />
-      <span class="indent">
-        &lt;img ismap src="/images/imagemap1.gif"&gt;<br />
-      </span>
-      &lt;/a&gt;
-    </code></p></div>
-
-    <div class="example"><h3>XHTML ¿¹Á¦</h3><p><code>
-      &lt;a href="/maps/imagemap1.map"&gt;<br />
-      <span class="indent">
-        &lt;img ismap="ismap" src="/images/imagemap1.gif" /&gt;<br />
-      </span>
-      &lt;/a&gt;
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ImapBase" id="ImapBase">ImapBase</a> <a name="imapbase" id="imapbase">Áö½Ã¾î</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">¼³¸í:</a></th><td>À̹ÌÁö¸Ê ÆÄÀÏ¿¡¼­ <code>base</code> ±âº»°ª</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹®¹ý:</a></th><td><code>ImapBase map|referer|<var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">±âº»°ª:</a></th><td><code>ImapBase http://servername/</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">»ç¿ëÀå¼Ò:</a></th><td>ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override ¿É¼Ç:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">»óÅÂ:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_imap</td></tr>
-</table>
-    <p><code class="directive">ImapBase</code> Áö½Ã¾î´Â À̹ÌÁö¸Ê ÆÄÀÏ¿¡¼­
-    »ç¿ëÇÒ <code>base</code> ±âº»°ªÀ» ¼³Á¤ÇÑ´Ù. À̹ÌÁö¸Ê ÆÄÀÏ
-    ¾È¿¡¼­ <code>base</code> Áö½Ã¾î¸¦ »ç¿ëÇÏ¸é ¿©±â¼­ ¼³Á¤ÇÑ
-    °ªÀº ¹«½ÃÇÑ´Ù. µÑ ¸ðµÎ ¾ø´Ù¸é, <code>base</code> ±âº»°ªÀº
-    <code>http://<var>servername</var>/</code>ÀÌ´Ù.</p>
-
-<h3>Âü°í</h3>
-<ul>
-<li><code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ImapDefault" id="ImapDefault">ImapDefault</a> <a name="imapdefault" id="imapdefault">Áö½Ã¾î</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">¼³¸í:</a></th><td>À̹ÌÁö¸Ê¿¡ ¾î´À ¿µ¿ª¿¡µµ ÇØ´çÇÏÁö ¾Ê´Â ÁÂÇ¥¸¦ ÁØ
-°æ¿ì ±âº» Çൿ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹®¹ý:</a></th><td><code>ImapDefault error|nocontent|map|referer|<var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">±âº»°ª:</a></th><td><code>ImapDefault nocontent</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">»ç¿ëÀå¼Ò:</a></th><td>ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override ¿É¼Ç:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">»óÅÂ:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_imap</td></tr>
-</table>
-    <p><code class="directive">ImapDefault</code> Áö½Ã¾î´Â À̹ÌÁö¸Ê
-    ÆÄÀÏ¿¡¼­ »ç¿ëÇÒ <code>default</code> ±âº»°ªÀ» ¼³Á¤ÇÑ´Ù.
-    À̹ÌÁö¸Ê ÆÄÀÏ ¾È¿¡¼­ <code>default</code> Áö½Ã¾î¸¦ »ç¿ëÇϸé
-    ¿©±â¼­ ¼³Á¤ÇÑ °ªÀº ¹«½ÃÇÑ´Ù. µÑ ¸ðµÎ ¾ø´Ù¸é, <code>default</code>
-    ÇൿÀº Ŭ¶óÀ̾ðÆ®¿¡°Ô <code>204 No Content</code>¸¦ º¸³»´Â
-    <code>nocontent</code>ÀÌ´Ù. ÀÌ °æ¿ì Ŭ¶óÀ̾ðÆ®´Â ¿ø·¡ ÆäÀÌÁö¸¦
-    ±×´ë·Î º¸¿©Áà¾ß ÇÑ´Ù.</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ImapMenu" id="ImapMenu">ImapMenu</a> <a name="imapmenu" id="imapmenu">Áö½Ã¾î</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">¼³¸í:</a></th><td>ÁÂÇ¥¾øÀÌ À̹ÌÁö¸Ê ¿äû½Ã ÃëÇÒ Çൿ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹®¹ý:</a></th><td><code>ImapMenu none|formatted|semiformatted|unformatted</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">»ç¿ëÀå¼Ò:</a></th><td>ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override ¿É¼Ç:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">»óÅÂ:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¸ðµâ:</a></th><td>mod_imap</td></tr>
-</table>
-    <p><code class="directive">ImapMenu</code> Áö½Ã¾î´Â À̹ÌÁö¸Ê ÆÄÀÏ¿¡
-    À¯È¿ÇÑ ÁÂÇ¥¸¦ ÁÖÁö ¾ÊÀº °æ¿ì ÃëÇÒ ÇൿÀ» °áÁ¤ÇÑ´Ù.</p>
-
-    <dl>
-      <dt><code>none</code></dt>
-      <dd>ImapMenu°¡ <code>none</code>À̸é, ¸Þ´º¸¦ ¸¸µéÁö¾Ê°í
-      <code>default</code> ÇൿÀ» ÃëÇÑ´Ù.</dd>
-
-      <dt><code>formatted</code></dt>
-      <dd><code>formatted</code> ¸Þ´º´Â °¡Àå °£´ÜÇÑ ¸Þ´º´Ù.
-      À̹ÌÁö¸Ê ÆÄÀÏÀÇ ÁÖ¼®Àº ¹«½ÃÇÑ´Ù. °¡Àå Å« Ç¥Á¦¿Í ¼öÁ÷¼±À»
-      Ãâ·ÂÇÏ°í, ¸µÅ©¸¦ ÇÑÁÙ¾¿ Ãâ·ÂÇÑ´Ù. ¸Þ´º´Â ÀÏ°üµÇ°í ÆòÀÌÇϸç,
-      µð·ºÅ丮 ¸ñ·Ï°ú Èí»çÇÏ´Ù.</dd>
-
-      <dt><code>semiformatted</code></dt>
-      <dd><code>semiformatted</code> ¸Þ´º´Â À̹ÌÁö¸Ê ÆÄÀÏ¿¡
-      ³ª¿À´Â ÁÖ¼®À» Ãâ·ÂÇÑ´Ù. ºóÁÙÀº HTML Çà¹Ù²ÞÀ¸·Î º¯È¯ÇÑ´Ù.
-      Ç¥Á¦³ª ¼öÁ÷¼±À» ±×¸®Áö ¾ÊÁö¸¸, ³ª¸ÓÁö´Â <code>formatted</code>
-      ¸Þ´º¿Í °°´Ù.</dd>
-
-      <dt><code>unformatted</code></dt>
-      <dd>ÁÖ¼®Àº Ãâ·ÂÇÏ°í, ºóÁÙÀº ¹«½ÃÇÑ´Ù. À̹ÌÁö¸Ê ÆÄÀÏ¿¡
-      ÀÖ´Â ³»¿ë¸¸ Ãâ·ÂÇÑ´Ù. À̹ÌÁö¸Ê ÆÄÀÏÀÇ ÁÖ¼®¿¡ ÇÊ¿äÇÑ ¸ðµç
-      Çà¹Ù²Þ°ú Ç¥Á¦¸¦ Àû¾î¾ß ÇÑ´Ù. ¸Þ´ºÀÇ ¿Ü°üÀ» °¡Àå ÀÚÀ¯ÀÚÁ¦·Î
-      ²Ù¹Ð ¼ö ÀÖÁö¸¸, À̹ÌÁö¸Ê ÆÄÀÏÀ» »ç½Ç»ó ÀÏ¹Ý ¹®ÀÚÆÄÀÏÀÌ
-      ¾Æ´Ñ HTML·Î ºÁ¾ß ÇÑ´Ù.</dd>
-    </dl>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_imap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ko/mod/mod_imap.html" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_info.xml.meta b/docs/manual/mod/mod_info.xml.meta
index 65662859bc..6394d97498 100644
--- a/docs/manual/mod/mod_info.xml.meta
+++ b/docs/manual/mod/mod_info.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">ja</variant>
+    <variant>ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_log_config.xml.meta b/docs/manual/mod/mod_log_config.xml.meta
index f9817111e8..34d03d2b3e 100644
--- a/docs/manual/mod/mod_log_config.xml.meta
+++ b/docs/manual/mod/mod_log_config.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">ja</variant>
+    <variant>ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_mime.html.en b/docs/manual/mod/mod_mime.html.en
index 13a0cc44be..00a963d067 100644
--- a/docs/manual/mod/mod_mime.html.en
+++ b/docs/manual/mod/mod_mime.html.en
@@ -135,12 +135,12 @@
     usually result in the request being by the module associated
     with the handler. For example, if the <code>.imap</code>
     extension is mapped to the handler <code>imap-file</code> (from
-    <code class="module"><a href="../mod/mod_imap.html">mod_imap</a></code>) and the <code>.html</code> extension is
+    <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code>) and the <code>.html</code> extension is
     mapped to the MIME-type <code>text/html</code>, then the file
     <code>world.imap.html</code> will be associated with both the
     <code>imap-file</code> handler and <code>text/html</code> MIME-type.
     When it is processed, the <code>imap-file</code> handler will be used,
-    and so it will be treated as a <code class="module"><a href="../mod/mod_imap.html">mod_imap</a></code> imagemap
+    and so it will be treated as a <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code> imagemap
     file.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
diff --git a/docs/manual/mod/mod_mime.xml b/docs/manual/mod/mod_mime.xml
index fb517d63ef..926e58ea3b 100644
--- a/docs/manual/mod/mod_mime.xml
+++ b/docs/manual/mod/mod_mime.xml
@@ -124,12 +124,12 @@ module="mod_mime_magic">MimeMagicFile</directive></seealso>
     usually result in the request being by the module associated
     with the handler. For example, if the <code>.imap</code>
     extension is mapped to the handler <code>imap-file</code> (from
-    <module>mod_imap</module>) and the <code>.html</code> extension is
+    <module>mod_imagemap</module>) and the <code>.html</code> extension is
     mapped to the MIME-type <code>text/html</code>, then the file
     <code>world.imap.html</code> will be associated with both the
     <code>imap-file</code> handler and <code>text/html</code> MIME-type.
     When it is processed, the <code>imap-file</code> handler will be used,
-    and so it will be treated as a <module>mod_imap</module> imagemap
+    and so it will be treated as a <module>mod_imagemap</module> imagemap
     file.</p>
 </section>
 
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index aee74719a1..adbf4ebe22 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -338,10 +338,10 @@ if a test is true at startup</td></tr>
 presence or absence of a specific module</td></tr>
 <tr class="odd"><td><a href="mod_version.html#ifversion">&lt;IfVersion [[!]<var>operator</var>] <var>version</var>&gt; ...
 &lt;/IfVersion&gt;</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">contains version dependent configuration</td></tr>
-<tr><td><a href="mod_imap.html#imapbase">ImapBase map|referer|<var>URL</var></a></td><td> http://servername/ </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Default <code>base</code> for imagemap files</td></tr>
-<tr class="odd"><td><a href="mod_imap.html#imapdefault">ImapDefault error|nocontent|map|referer|<var>URL</var></a></td><td> nocontent </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Default action when an imagemap is called with coordinates
+<tr><td><a href="mod_imagemap.html#imapbase">ImapBase map|referer|<var>URL</var></a></td><td> http://servername/ </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Default <code>base</code> for imagemap files</td></tr>
+<tr class="odd"><td><a href="mod_imagemap.html#imapdefault">ImapDefault error|nocontent|map|referer|<var>URL</var></a></td><td> nocontent </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Default action when an imagemap is called with coordinates
 that are not explicitly mapped</td></tr>
-<tr><td><a href="mod_imap.html#imapmenu">ImapMenu none|formatted|semiformatted|unformatted</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Action if no coordinates are given when calling
+<tr><td><a href="mod_imagemap.html#imapmenu">ImapMenu none|formatted|semiformatted|unformatted</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Action if no coordinates are given when calling
 an imagemap</td></tr>
 <tr class="odd"><td><a href="core.html#include">Include <var>file-path</var>|<var>directory-path</var></a></td><td></td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Includes other configuration files from within
 the server configuration files</td></tr>
diff --git a/docs/manual/mpm.xml.meta b/docs/manual/mpm.xml.meta
index 03696010e1..ddd57d214b 100644
--- a/docs/manual/mpm.xml.meta
+++ b/docs/manual/mpm.xml.meta
@@ -9,7 +9,7 @@
     <variant>de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
-    <variant outdated="yes">ja</variant>
+    <variant>ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/platform/ebcdic.html.en b/docs/manual/platform/ebcdic.html.en
index 1a88167b2d..e2c2d8ce79 100644
--- a/docs/manual/platform/ebcdic.html.en
+++ b/docs/manual/platform/ebcdic.html.en
@@ -432,7 +432,7 @@
       </tr>
 
       <tr>
-        <td><code class="module"><a href="../mod/mod_imap.html">mod_imap</a></code></td>
+        <td><code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code></td>
         <td class="centered">+</td>
         <td />
       </tr>
diff --git a/docs/manual/platform/ebcdic.xml b/docs/manual/platform/ebcdic.xml
index f91acb3af0..40aef0634b 100644
--- a/docs/manual/platform/ebcdic.xml
+++ b/docs/manual/platform/ebcdic.xml
@@ -429,7 +429,7 @@
       </tr>
 
       <tr>
-        <td><module>mod_imap</module></td>
+        <td><module>mod_imagemap</module></td>
         <td class="centered">+</td>
         <td></td>
       </tr>
diff --git a/docs/manual/programs/configure.html.en b/docs/manual/programs/configure.html.en
index 7c3a145152..6b5d9c9d2a 100644
--- a/docs/manual/programs/configure.html.en
+++ b/docs/manual/programs/configure.html.en
@@ -352,9 +352,9 @@
             <br />
             Note: This module will always be linked statically.</dd> 
 
-        <dt><code>--disable-imap</code></dt>
+        <dt><code>--disable-imagemap</code></dt>
         <dd>Disable support for server based imagemaps, which provided by
-          <code class="module"><a href="../mod/mod_imap.html">mod_imap</a></code>.</dd>
+          <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code>.</dd>
 
         <dt><code>--disable-include</code></dt>
         <dd>Disable Server Side Includes provided by
diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml
index 7bb20df233..4fbda1a72e 100644
--- a/docs/manual/programs/configure.xml
+++ b/docs/manual/programs/configure.xml
@@ -356,9 +356,9 @@
             <br/>
             Note: This module will always be linked statically.</dd> 
 
-        <dt><code>--disable-imap</code></dt>
+        <dt><code>--disable-imagemap</code></dt>
         <dd>Disable support for server based imagemaps, which provided by
-          <module>mod_imap</module>.</dd>
+          <module>mod_imagemap</module>.</dd>
 
         <dt><code>--disable-include</code></dt>
         <dd>Disable Server Side Includes provided by
diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index b2e769b9a8..400cbe3fed 100644
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -197,7 +197,7 @@ Server on HPUX</a></li>
 <li><a href="mod/mod_filter.html">Apache Module mod_filter</a></li>
 <li><a href="mod/mod_headers.html">Apache Module mod_headers</a></li>
 <li><a href="mod/mod_ident.html">Apache Module mod_ident</a></li>
-<li><a href="mod/mod_imap.html">Apache Module mod_imap</a></li>
+<li><a href="mod/mod_imagemap.html">Apache Module mod_imagemap</a></li>
 <li><a href="mod/mod_include.html">Apache Module mod_include</a></li>
 <li><a href="mod/mod_info.html">Apache Module mod_info</a></li>
 <li><a href="mod/mod_isapi.html">Apache Module mod_isapi</a></li>
diff --git a/docs/manual/sitemap.xml.meta b/docs/manual/sitemap.xml.meta
index 4e2470686c..470f98c179 100644
--- a/docs/manual/sitemap.xml.meta
+++ b/docs/manual/sitemap.xml.meta
@@ -9,7 +9,7 @@
     <variant>de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
-    <variant outdated="yes">ja</variant>
+    <variant>ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index f3d0e48dc0..49bcd680db 100644
--- a/modules/mappers/config9.m4
+++ b/modules/mappers/config9.m4
@@ -7,7 +7,7 @@ APACHE_MODPATH_INIT(mappers)
 APACHE_MODULE(vhost_alias, mass virtual hosting module, , , most)
 APACHE_MODULE(negotiation, content negotiation, , , yes)
 APACHE_MODULE(dir, directory request handling, , , yes)
-APACHE_MODULE(imap, server-side imagemaps, , , most)
+APACHE_MODULE(imagemap, server-side imagemaps, , , most)
 APACHE_MODULE(actions, Action triggering on requests, , , yes)
 APACHE_MODULE(speling, correct common URL misspellings, , , most)
 APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , yes)
diff --git a/modules/mappers/mod_imap.c b/modules/mappers/mod_imagemap.c
similarity index 99%
rename from modules/mappers/mod_imap.c
rename to modules/mappers/mod_imagemap.c
index d5f2a955ad..eada55e440 100644
--- a/modules/mappers/mod_imap.c
+++ b/modules/mappers/mod_imagemap.c
@@ -83,7 +83,7 @@
 double strtod();                /* SunOS needed this */
 #endif
 
-module AP_MODULE_DECLARE_DATA imap_module;
+module AP_MODULE_DECLARE_DATA imagemap_module;
 
 typedef struct {
     char *imap_menu;
@@ -593,7 +593,7 @@ static int imap_handler_internal(request_rec *r)
 
     ap_configfile_t *imap; 
 
-    icr = ap_get_module_config(r->per_dir_config, &imap_module);
+    icr = ap_get_module_config(r->per_dir_config, &imagemap_module);
 
     imap_menu = icr->imap_menu ? icr->imap_menu : IMAP_MENU_DEFAULT;
     imap_default = icr->imap_default
@@ -882,7 +882,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_handler(imap_handler,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA imap_module =
+module AP_MODULE_DECLARE_DATA imagemap_module =
 {
     STANDARD20_MODULE_STUFF,
     create_imap_dir_config,     /* dir config creater */
diff --git a/modules/mappers/mod_imap.dsp b/modules/mappers/mod_imagemap.dsp
similarity index 97%
rename from modules/mappers/mod_imap.dsp
rename to modules/mappers/mod_imagemap.dsp
index 492bf35bfb..fdc563902b 100644
--- a/modules/mappers/mod_imap.dsp
+++ b/modules/mappers/mod_imagemap.dsp
@@ -1,128 +1,128 @@
-# Microsoft Developer Studio Project File - Name="mod_imap" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_imap - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mod_imap.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mod_imap.mak" CFG="mod_imap - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mod_imap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_imap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "mod_imap - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_imap_src" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so /opt:ref
-
-!ELSEIF  "$(CFG)" == "mod_imap - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_imap_src" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mod_imap - Win32 Release"
-# Name "mod_imap - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_imap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_imap.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF  "$(CFG)" == "mod_imap - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_imap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	awk -f ../../build/win32/win32ver.awk mod_imap.so "imap_module for Apache" ../../include/ap_release.h > .\mod_imap.rc
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "mod_imap - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_imap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	awk -f ../../build/win32/win32ver.awk mod_imap.so "imap_module for Apache" ../../include/ap_release.h > .\mod_imap.rc
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="mod_imap" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=mod_imap - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mod_imap.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mod_imap.mak" CFG="mod_imap - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mod_imap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_imap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mod_imap - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_imap_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so /opt:ref
+
+!ELSEIF  "$(CFG)" == "mod_imap - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_imap_src" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mod_imap - Win32 Release"
+# Name "mod_imap - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\mod_imap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_imap.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\win32ver.awk
+
+!IF  "$(CFG)" == "mod_imap - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_imap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	awk -f ../../build/win32/win32ver.awk mod_imap.so "imap_module for Apache" ../../include/ap_release.h > .\mod_imap.rc
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "mod_imap - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_imap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	awk -f ../../build/win32/win32ver.awk mod_imap.so "imap_module for Apache" ../../include/ap_release.h > .\mod_imap.rc
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project
diff --git a/modules/mappers/mod_imap.exp b/modules/mappers/mod_imagemap.exp
similarity index 100%
rename from modules/mappers/mod_imap.exp
rename to modules/mappers/mod_imagemap.exp