Update doccos due to slotmem change

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

23 files changed, 55 insertions, 74 deletions

diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map
index ee03e959fe..f9d682be12 100644
--- a/docs/manual/convenience.map
+++ b/docs/manual/convenience.map
@@ -278,6 +278,7 @@ order	mod/mod_access_compat.html#order
 outputsed	mod/mod_sed.html#outputsed
 passenv	mod/mod_env.html#passenv
 pidfile	mod/mpm_common.html#pidfile
+privilegesmode	mod/mod_privileges.html#privilegesmode
 protocolecho	mod/mod_echo.html#protocolecho
 proxy	mod/mod_proxy.html#proxy
 proxybadheader	mod/mod_proxy.html#proxybadheader
@@ -434,6 +435,7 @@ sslrequire	mod/mod_ssl.html#sslrequire
 sslrequiressl	mod/mod_ssl.html#sslrequiressl
 sslsessioncache	mod/mod_ssl.html#sslsessioncache
 sslsessioncachetimeout	mod/mod_ssl.html#sslsessioncachetimeout
+sslstrictsnivhostcheck	mod/mod_ssl.html#sslstrictsnivhostcheck
 sslusername	mod/mod_ssl.html#sslusername
 sslverifyclient	mod/mod_ssl.html#sslverifyclient
 sslverifydepth	mod/mod_ssl.html#sslverifydepth
@@ -464,5 +466,4 @@ virtualdocumentrootip	mod/mod_vhost_alias.html#virtualdocumentrootip
 virtualhost	mod/core.html#virtualhost
 virtualscriptalias	mod/mod_vhost_alias.html#virtualscriptalias
 virtualscriptaliasip	mod/mod_vhost_alias.html#virtualscriptaliasip
-win32disableacceptex	mod/mpm_winnt.html#win32disableacceptex
 xbithack	mod/mod_include.html#xbithack
diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml
index ad38c25265..ce9a3cb3e9 100644
--- a/docs/manual/mod/allmodules.xml
+++ b/docs/manual/mod/allmodules.xml
@@ -65,7 +65,6 @@
   <modulefile>mod_mime_magic.xml</modulefile>
   <modulefile>mod_negotiation.xml</modulefile>
   <modulefile>mod_nw_ssl.xml</modulefile>
-  <modulefile>mod_plainmem.xml</modulefile>
   <modulefile>mod_privileges.xml</modulefile>
   <modulefile>mod_proxy.xml</modulefile>
   <modulefile>mod_proxy_ajp.xml</modulefile>
@@ -85,8 +84,8 @@
   <modulefile>mod_session_crypto.xml</modulefile>
   <modulefile>mod_session_dbd.xml</modulefile>
   <modulefile>mod_setenvif.xml</modulefile>
-  <modulefile>mod_sharedmem.xml</modulefile>
-  <modulefile>mod_slotmem.xml</modulefile>
+  <modulefile>mod_slotmem_plain.xml</modulefile>
+  <modulefile>mod_slotmem_shm.xml</modulefile>
   <modulefile>mod_so.xml</modulefile>
   <modulefile>mod_speling.xml</modulefile>
   <modulefile>mod_ssl.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de
index 593b6c02e8..7d0e1ebbae 100644
--- a/docs/manual/mod/allmodules.xml.de
+++ b/docs/manual/mod/allmodules.xml.de
@@ -65,7 +65,6 @@
   <modulefile>mod_mime_magic.xml</modulefile>
   <modulefile>mod_negotiation.xml</modulefile>
   <modulefile>mod_nw_ssl.xml</modulefile>
-  <modulefile>mod_plainmem.xml</modulefile>
   <modulefile>mod_privileges.xml</modulefile>
   <modulefile>mod_proxy.xml</modulefile>
   <modulefile>mod_proxy_ajp.xml</modulefile>
@@ -85,8 +84,8 @@
   <modulefile>mod_session_crypto.xml</modulefile>
   <modulefile>mod_session_dbd.xml</modulefile>
   <modulefile>mod_setenvif.xml</modulefile>
-  <modulefile>mod_sharedmem.xml</modulefile>
-  <modulefile>mod_slotmem.xml</modulefile>
+  <modulefile>mod_slotmem_plain.xml</modulefile>
+  <modulefile>mod_slotmem_shm.xml</modulefile>
   <modulefile>mod_so.xml</modulefile>
   <modulefile>mod_speling.xml</modulefile>
   <modulefile>mod_ssl.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es
index ad38c25265..ce9a3cb3e9 100644
--- a/docs/manual/mod/allmodules.xml.es
+++ b/docs/manual/mod/allmodules.xml.es
@@ -65,7 +65,6 @@
   <modulefile>mod_mime_magic.xml</modulefile>
   <modulefile>mod_negotiation.xml</modulefile>
   <modulefile>mod_nw_ssl.xml</modulefile>
-  <modulefile>mod_plainmem.xml</modulefile>
   <modulefile>mod_privileges.xml</modulefile>
   <modulefile>mod_proxy.xml</modulefile>
   <modulefile>mod_proxy_ajp.xml</modulefile>
@@ -85,8 +84,8 @@
   <modulefile>mod_session_crypto.xml</modulefile>
   <modulefile>mod_session_dbd.xml</modulefile>
   <modulefile>mod_setenvif.xml</modulefile>
-  <modulefile>mod_sharedmem.xml</modulefile>
-  <modulefile>mod_slotmem.xml</modulefile>
+  <modulefile>mod_slotmem_plain.xml</modulefile>
+  <modulefile>mod_slotmem_shm.xml</modulefile>
   <modulefile>mod_so.xml</modulefile>
   <modulefile>mod_speling.xml</modulefile>
   <modulefile>mod_ssl.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.fr b/docs/manual/mod/allmodules.xml.fr
index ad38c25265..ce9a3cb3e9 100644
--- a/docs/manual/mod/allmodules.xml.fr
+++ b/docs/manual/mod/allmodules.xml.fr
@@ -65,7 +65,6 @@
   <modulefile>mod_mime_magic.xml</modulefile>
   <modulefile>mod_negotiation.xml</modulefile>
   <modulefile>mod_nw_ssl.xml</modulefile>
-  <modulefile>mod_plainmem.xml</modulefile>
   <modulefile>mod_privileges.xml</modulefile>
   <modulefile>mod_proxy.xml</modulefile>
   <modulefile>mod_proxy_ajp.xml</modulefile>
@@ -85,8 +84,8 @@
   <modulefile>mod_session_crypto.xml</modulefile>
   <modulefile>mod_session_dbd.xml</modulefile>
   <modulefile>mod_setenvif.xml</modulefile>
-  <modulefile>mod_sharedmem.xml</modulefile>
-  <modulefile>mod_slotmem.xml</modulefile>
+  <modulefile>mod_slotmem_plain.xml</modulefile>
+  <modulefile>mod_slotmem_shm.xml</modulefile>
   <modulefile>mod_so.xml</modulefile>
   <modulefile>mod_speling.xml</modulefile>
   <modulefile>mod_ssl.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja
index 6e174fca5b..8d2210f1a2 100644
--- a/docs/manual/mod/allmodules.xml.ja
+++ b/docs/manual/mod/allmodules.xml.ja
@@ -65,7 +65,6 @@
   <modulefile>mod_mime_magic.xml</modulefile>
   <modulefile>mod_negotiation.xml.ja</modulefile>
   <modulefile>mod_nw_ssl.xml</modulefile>
-  <modulefile>mod_plainmem.xml</modulefile>
   <modulefile>mod_privileges.xml</modulefile>
   <modulefile>mod_proxy.xml.ja</modulefile>
   <modulefile>mod_proxy_ajp.xml.ja</modulefile>
@@ -85,8 +84,8 @@
   <modulefile>mod_session_crypto.xml</modulefile>
   <modulefile>mod_session_dbd.xml</modulefile>
   <modulefile>mod_setenvif.xml.ja</modulefile>
-  <modulefile>mod_sharedmem.xml</modulefile>
-  <modulefile>mod_slotmem.xml</modulefile>
+  <modulefile>mod_slotmem_plain.xml</modulefile>
+  <modulefile>mod_slotmem_shm.xml</modulefile>
   <modulefile>mod_so.xml.ja</modulefile>
   <modulefile>mod_speling.xml.ja</modulefile>
   <modulefile>mod_ssl.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko
index 2db417ac13..29d8c53b98 100644
--- a/docs/manual/mod/allmodules.xml.ko
+++ b/docs/manual/mod/allmodules.xml.ko
@@ -65,7 +65,6 @@
   <modulefile>mod_mime_magic.xml</modulefile>
   <modulefile>mod_negotiation.xml</modulefile>
   <modulefile>mod_nw_ssl.xml</modulefile>
-  <modulefile>mod_plainmem.xml</modulefile>
   <modulefile>mod_privileges.xml</modulefile>
   <modulefile>mod_proxy.xml</modulefile>
   <modulefile>mod_proxy_ajp.xml</modulefile>
@@ -85,8 +84,8 @@
   <modulefile>mod_session_crypto.xml</modulefile>
   <modulefile>mod_session_dbd.xml</modulefile>
   <modulefile>mod_setenvif.xml.ko</modulefile>
-  <modulefile>mod_sharedmem.xml</modulefile>
-  <modulefile>mod_slotmem.xml</modulefile>
+  <modulefile>mod_slotmem_plain.xml</modulefile>
+  <modulefile>mod_slotmem_shm.xml</modulefile>
   <modulefile>mod_so.xml.ko</modulefile>
   <modulefile>mod_speling.xml.ko</modulefile>
   <modulefile>mod_ssl.xml</modulefile>
diff --git a/docs/manual/mod/allmodules.xml.tr b/docs/manual/mod/allmodules.xml.tr
index 7628316daf..262c967f90 100644
--- a/docs/manual/mod/allmodules.xml.tr
+++ b/docs/manual/mod/allmodules.xml.tr
@@ -65,7 +65,6 @@
   <modulefile>mod_mime_magic.xml</modulefile>
   <modulefile>mod_negotiation.xml</modulefile>
   <modulefile>mod_nw_ssl.xml</modulefile>
-  <modulefile>mod_plainmem.xml</modulefile>
   <modulefile>mod_privileges.xml</modulefile>
   <modulefile>mod_proxy.xml</modulefile>
   <modulefile>mod_proxy_ajp.xml</modulefile>
@@ -85,8 +84,8 @@
   <modulefile>mod_session_crypto.xml</modulefile>
   <modulefile>mod_session_dbd.xml</modulefile>
   <modulefile>mod_setenvif.xml.tr</modulefile>
-  <modulefile>mod_sharedmem.xml</modulefile>
-  <modulefile>mod_slotmem.xml</modulefile>
+  <modulefile>mod_slotmem_plain.xml</modulefile>
+  <modulefile>mod_slotmem_shm.xml</modulefile>
   <modulefile>mod_so.xml.tr</modulefile>
   <modulefile>mod_speling.xml</modulefile>
   <modulefile>mod_ssl.xml</modulefile>
diff --git a/docs/manual/mod/index.html.de b/docs/manual/mod/index.html.de
index 83089b87a8..93a17a22bb 100644
--- a/docs/manual/mod/index.html.de
+++ b/docs/manual/mod/index.html.de
@@ -152,8 +152,7 @@ by other LDAP modules</dd>
     by looking at a few bytes of its contents</dd>
 <dt><a href="mod_negotiation.html" id="N" name="N">mod_negotiation</a></dt><dd>Provides for <a href="../content-negotiation.html">content negotiation</a></dd>
 <dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
-<dt><a href="mod_plainmem.html" id="P" name="P">mod_plainmem</a></dt><dd>Slot-based shared memory provider.</dd>
-<dt><a href="mod_privileges.html">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
+<dt><a href="mod_privileges.html" id="P" name="P">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
 under different user IDs.</dd>
 <dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
 <dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd>AJP support module for
@@ -184,8 +183,8 @@ URLs on the fly</dd>
 <dt><a href="mod_session_dbd.html">mod_session_dbd</a></dt><dd>DBD/SQL based session support</dd>
 <dt><a href="mod_setenvif.html">mod_setenvif</a></dt><dd>Allows the setting of environment variables based
 on characteristics of the request</dd>
-<dt><a href="mod_sharedmem.html">mod_sharedmem</a></dt><dd>Slot-based shared memory provider.</dd>
-<dt><a href="mod_slotmem.html">mod_slotmem</a></dt><dd>Slot-based memory implementation API.</dd>
+<dt><a href="mod_slotmem_plain.html">mod_slotmem_plain</a></dt><dd>Slot-based shared memory provider.</dd>
+<dt><a href="mod_slotmem_shm.html">mod_slotmem_shm</a></dt><dd>Slot-based shared memory provider.</dd>
 <dt><a href="mod_so.html">mod_so</a></dt><dd>Loading of executable code and
 modules into the server at start-up or restart time</dd>
 <dt><a href="mod_speling.html">mod_speling</a></dt><dd>Attempts to correct mistaken URLs that
diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en
index 0ab743a0a7..b7bd88e1c4 100644
--- a/docs/manual/mod/index.html.en
+++ b/docs/manual/mod/index.html.en
@@ -151,8 +151,7 @@ by other LDAP modules</dd>
     by looking at a few bytes of its contents</dd>
 <dt><a href="mod_negotiation.html" id="N" name="N">mod_negotiation</a></dt><dd>Provides for <a href="../content-negotiation.html">content negotiation</a></dd>
 <dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
-<dt><a href="mod_plainmem.html" id="P" name="P">mod_plainmem</a></dt><dd>Slot-based shared memory provider.</dd>
-<dt><a href="mod_privileges.html">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
+<dt><a href="mod_privileges.html" id="P" name="P">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
 under different user IDs.</dd>
 <dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
 <dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd>AJP support module for
@@ -183,8 +182,8 @@ URLs on the fly</dd>
 <dt><a href="mod_session_dbd.html">mod_session_dbd</a></dt><dd>DBD/SQL based session support</dd>
 <dt><a href="mod_setenvif.html">mod_setenvif</a></dt><dd>Allows the setting of environment variables based
 on characteristics of the request</dd>
-<dt><a href="mod_sharedmem.html">mod_sharedmem</a></dt><dd>Slot-based shared memory provider.</dd>
-<dt><a href="mod_slotmem.html">mod_slotmem</a></dt><dd>Slot-based memory implementation API.</dd>
+<dt><a href="mod_slotmem_plain.html">mod_slotmem_plain</a></dt><dd>Slot-based shared memory provider.</dd>
+<dt><a href="mod_slotmem_shm.html">mod_slotmem_shm</a></dt><dd>Slot-based shared memory provider.</dd>
 <dt><a href="mod_so.html">mod_so</a></dt><dd>Loading of executable code and
 modules into the server at start-up or restart time</dd>
 <dt><a href="mod_speling.html">mod_speling</a></dt><dd>Attempts to correct mistaken URLs that
diff --git a/docs/manual/mod/index.html.es b/docs/manual/mod/index.html.es
index e16727b423..f491f04599 100644
--- a/docs/manual/mod/index.html.es
+++ b/docs/manual/mod/index.html.es
@@ -153,8 +153,7 @@ by other LDAP modules</dd>
     by looking at a few bytes of its contents</dd>
 <dt><a href="mod_negotiation.html" id="N" name="N">mod_negotiation</a></dt><dd>Provides for <a href="../content-negotiation.html">content negotiation</a></dd>
 <dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
-<dt><a href="mod_plainmem.html" id="P" name="P">mod_plainmem</a></dt><dd>Slot-based shared memory provider.</dd>
-<dt><a href="mod_privileges.html">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
+<dt><a href="mod_privileges.html" id="P" name="P">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
 under different user IDs.</dd>
 <dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
 <dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd>AJP support module for
@@ -185,8 +184,8 @@ URLs on the fly</dd>
 <dt><a href="mod_session_dbd.html">mod_session_dbd</a></dt><dd>DBD/SQL based session support</dd>
 <dt><a href="mod_setenvif.html">mod_setenvif</a></dt><dd>Allows the setting of environment variables based
 on characteristics of the request</dd>
-<dt><a href="mod_sharedmem.html">mod_sharedmem</a></dt><dd>Slot-based shared memory provider.</dd>
-<dt><a href="mod_slotmem.html">mod_slotmem</a></dt><dd>Slot-based memory implementation API.</dd>
+<dt><a href="mod_slotmem_plain.html">mod_slotmem_plain</a></dt><dd>Slot-based shared memory provider.</dd>
+<dt><a href="mod_slotmem_shm.html">mod_slotmem_shm</a></dt><dd>Slot-based shared memory provider.</dd>
 <dt><a href="mod_so.html">mod_so</a></dt><dd>Loading of executable code and
 modules into the server at start-up or restart time</dd>
 <dt><a href="mod_speling.html">mod_speling</a></dt><dd>Attempts to correct mistaken URLs that
diff --git a/docs/manual/mod/index.html.ja.utf8 b/docs/manual/mod/index.html.ja.utf8
index 468928d49c..79e9a642d7 100644
--- a/docs/manual/mod/index.html.ja.utf8
+++ b/docs/manual/mod/index.html.ja.utf8
@@ -142,8 +142,7 @@ by other LDAP modules</dd>
 <dt><a href="mod_negotiation.html" id="N" name="N">mod_negotiation</a></dt><dd><a href="../content-negotiation.html">コンテントネゴシエーション</a>
   機能を提供する</dd>
 <dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
-<dt><a href="mod_plainmem.html" id="P" name="P">mod_plainmem</a></dt><dd>Slot-based shared memory provider.</dd>
-<dt><a href="mod_privileges.html">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
+<dt><a href="mod_privileges.html" id="P" name="P">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
 under different user IDs.</dd>
 <dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>HTTP/1.1 プロキシ/ゲートウェイサーバ</dd>
 <dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> で AJP 
@@ -173,8 +172,8 @@ URLs on the fly</dd>
 <dt><a href="mod_session_crypto.html">mod_session_crypto</a></dt><dd>Session encryption support</dd>
 <dt><a href="mod_session_dbd.html">mod_session_dbd</a></dt><dd>DBD/SQL based session support</dd>
 <dt><a href="mod_setenvif.html">mod_setenvif</a></dt><dd>リクエストの特徴に基づいた環境変数の設定を可能にする</dd>
-<dt><a href="mod_sharedmem.html">mod_sharedmem</a></dt><dd>Slot-based shared memory provider.</dd>
-<dt><a href="mod_slotmem.html">mod_slotmem</a></dt><dd>Slot-based memory implementation API.</dd>
+<dt><a href="mod_slotmem_plain.html">mod_slotmem_plain</a></dt><dd>Slot-based shared memory provider.</dd>
+<dt><a href="mod_slotmem_shm.html">mod_slotmem_shm</a></dt><dd>Slot-based shared memory provider.</dd>
 <dt><a href="mod_so.html">mod_so</a></dt><dd>起動時や再起動時に実行コードとモジュールをサーバにロードする
 </dd>
 <dt><a href="mod_speling.html">mod_speling</a></dt><dd>ユーザが入力したであろう間違った URL を、
diff --git a/docs/manual/mod/index.html.ko.euc-kr b/docs/manual/mod/index.html.ko.euc-kr
index 4f23dc5b21..8cb5e696fa 100644
--- a/docs/manual/mod/index.html.ko.euc-kr
+++ b/docs/manual/mod/index.html.ko.euc-kr
@@ -138,8 +138,7 @@ by other LDAP modules</dd>
     by looking at a few bytes of its contents</dd>
 <dt><a href="mod_negotiation.html" id="N" name="N">mod_negotiation</a></dt><dd>Provides for <a href="../content-negotiation.html">content negotiation</a></dd>
 <dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
-<dt><a href="mod_plainmem.html" id="P" name="P">mod_plainmem</a></dt><dd>Slot-based shared memory provider.</dd>
-<dt><a href="mod_privileges.html">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
+<dt><a href="mod_privileges.html" id="P" name="P">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
 under different user IDs.</dd>
 <dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
 <dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd>AJP support module for
@@ -169,8 +168,8 @@ URLs on the fly</dd>
 <dt><a href="mod_session_crypto.html">mod_session_crypto</a></dt><dd>Session encryption support</dd>
 <dt><a href="mod_session_dbd.html">mod_session_dbd</a></dt><dd>DBD/SQL based session support</dd>
 <dt><a href="mod_setenvif.html">mod_setenvif</a></dt><dd>��û�� ���ݿ� ���� ȯ�溯�� ������ �����Ѵ�</dd>
-<dt><a href="mod_sharedmem.html">mod_sharedmem</a></dt><dd>Slot-based shared memory provider.</dd>
-<dt><a href="mod_slotmem.html">mod_slotmem</a></dt><dd>Slot-based memory implementation API.</dd>
+<dt><a href="mod_slotmem_plain.html">mod_slotmem_plain</a></dt><dd>Slot-based shared memory provider.</dd>
+<dt><a href="mod_slotmem_shm.html">mod_slotmem_shm</a></dt><dd>Slot-based shared memory provider.</dd>
 <dt><a href="mod_so.html">mod_so</a></dt><dd>�����Ҷ� Ȥ�� ������Ҷ� ���డ���� �ڵ�� �����
 ������ �о���δ�</dd>
 <dt><a href="mod_speling.html">mod_speling</a></dt><dd>����ڰ� ��ҹ��ڸ� �߸� ����ϰų� ������� Ʋ����
diff --git a/docs/manual/mod/index.html.tr.utf8 b/docs/manual/mod/index.html.tr.utf8
index d8f628cecd..ee47b454a3 100644
--- a/docs/manual/mod/index.html.tr.utf8
+++ b/docs/manual/mod/index.html.tr.utf8
@@ -147,8 +147,7 @@ by other LDAP modules</dd>
     by looking at a few bytes of its contents</dd>
 <dt><a href="mod_negotiation.html" id="N" name="N">mod_negotiation</a></dt><dd>Provides for <a href="../content-negotiation.html">content negotiation</a></dd>
 <dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
-<dt><a href="mod_plainmem.html" id="P" name="P">mod_plainmem</a></dt><dd>Slot-based shared memory provider.</dd>
-<dt><a href="mod_privileges.html">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
+<dt><a href="mod_privileges.html" id="P" name="P">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
 under different user IDs.</dd>
 <dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
 <dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd>AJP support module for
@@ -178,8 +177,8 @@ URLs on the fly</dd>
 <dt><a href="mod_session_crypto.html">mod_session_crypto</a></dt><dd>Session encryption support</dd>
 <dt><a href="mod_session_dbd.html">mod_session_dbd</a></dt><dd>DBD/SQL based session support</dd>
 <dt><a href="mod_setenvif.html">mod_setenvif</a></dt><dd>Ortam değişkenlerinin isteğin özelliklerine uygun olarak atanmasını sağlar</dd>
-<dt><a href="mod_sharedmem.html">mod_sharedmem</a></dt><dd>Slot-based shared memory provider.</dd>
-<dt><a href="mod_slotmem.html">mod_slotmem</a></dt><dd>Slot-based memory implementation API.</dd>
+<dt><a href="mod_slotmem_plain.html">mod_slotmem_plain</a></dt><dd>Slot-based shared memory provider.</dd>
+<dt><a href="mod_slotmem_shm.html">mod_slotmem_shm</a></dt><dd>Slot-based shared memory provider.</dd>
 <dt><a href="mod_so.html">mod_so</a></dt><dd>Modüllerin ve çalıştırılabilir kodun sunucunun başlatılması veya
 yeniden başlatılması sırasında yüklenmesini sağlar.</dd>
 <dt><a href="mod_speling.html">mod_speling</a></dt><dd>Attempts to correct mistaken URLs that
diff --git a/docs/manual/mod/mod_slotmem_plain.xml b/docs/manual/mod/mod_slotmem_plain.xml
index be327fbbd3..efebe59304 100644
--- a/docs/manual/mod/mod_slotmem_plain.xml
+++ b/docs/manual/mod/mod_slotmem_plain.xml
@@ -22,24 +22,24 @@
 
 <modulesynopsis metafile="mod_slotmem_plain.xml.meta">
 
-<name>mod_slotmem_shm</name>
+<name>mod_slotmem_plain</name>
 <description>Slot-based shared memory provider.</description>
 <status>Extension</status>
-<sourcefile>mod_slotmem_shm.c</sourcefile>
-<identifier>mod_slotmem_shm_module</identifier>
+<sourcefile>mod_slotmem_plain.c</sourcefile>
+<identifier>mod_slotmem_plain</identifier>
 
 <summary>
-    <p><code>mod_slotmem_shm</code> is a memory provider which
+    <p><code>mod_slotmem_plain</code> is a memory provider which
     provides for creation and access to a plain memory segment
     in which the datasets are organized in "slots."
     </p>
 
     <p>If the memory needs to be shared between threads and
     processes, a better provider would be
-    <module>mod_slotmem_plain</module>.
+    <module>mod_slotmem_shm</module>.
     </p>
 
-    <p><code>mod_plainmem</code> provides the following
+    <p><code>mod_slotmem_plain</code> provides the following
     API functions:
     </p>
 
diff --git a/docs/manual/mod/mod_slotmem_shm.xml b/docs/manual/mod/mod_slotmem_shm.xml
index 3d5e01ac86..fca2fa3ec2 100644
--- a/docs/manual/mod/mod_slotmem_shm.xml
+++ b/docs/manual/mod/mod_slotmem_shm.xml
@@ -34,7 +34,7 @@
     in which the datasets are organized in "slots."
     </p>
 
-    <p><code>mod_sharedmem</code> provides the following
+    <p><code>mod_slotmem_shm</code> provides the following
     API functions:
     </p>
 
diff --git a/docs/manual/sitemap.html.de b/docs/manual/sitemap.html.de
index 7c723b2b59..bfdaad5ede 100644
--- a/docs/manual/sitemap.html.de
+++ b/docs/manual/sitemap.html.de
@@ -228,7 +228,6 @@ HPUX betreiben</a></li>
 <li><a href="mod/mod_mime_magic.html">Apache-Modul mod_mime_magic</a></li>
 <li><a href="mod/mod_negotiation.html">Apache-Modul mod_negotiation</a></li>
 <li><a href="mod/mod_nw_ssl.html">Apache-Modul mod_nw_ssl</a></li>
-<li><a href="mod/mod_plainmem.html">Apache-Modul mod_plainmem</a></li>
 <li><a href="mod/mod_privileges.html">Apache-Modul mod_privileges</a></li>
 <li><a href="mod/mod_proxy.html">Apache-Modul mod_proxy</a></li>
 <li><a href="mod/mod_proxy_ajp.html">Apache-Modul mod_proxy_ajp</a></li>
@@ -248,8 +247,8 @@ HPUX betreiben</a></li>
 <li><a href="mod/mod_session_crypto.html">Apache-Modul mod_session_crypto</a></li>
 <li><a href="mod/mod_session_dbd.html">Apache-Modul mod_session_dbd</a></li>
 <li><a href="mod/mod_setenvif.html">Apache-Modul mod_setenvif</a></li>
-<li><a href="mod/mod_sharedmem.html">Apache-Modul mod_sharedmem</a></li>
-<li><a href="mod/mod_slotmem.html">Apache-Modul mod_slotmem</a></li>
+<li><a href="mod/mod_slotmem_plain.html">Apache-Modul mod_slotmem_plain</a></li>
+<li><a href="mod/mod_slotmem_shm.html">Apache-Modul mod_slotmem_shm</a></li>
 <li><a href="mod/mod_so.html">Apache-Modul mod_so</a></li>
 <li><a href="mod/mod_speling.html">Apache-Modul mod_speling</a></li>
 <li><a href="mod/mod_ssl.html">Apache-Modul mod_ssl</a></li>
diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index 8fd59477f6..c86c5fbd39 100644
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -228,7 +228,6 @@ Server on HPUX</a></li>
 <li><a href="mod/mod_mime_magic.html">Apache Module mod_mime_magic</a></li>
 <li><a href="mod/mod_negotiation.html">Apache Module mod_negotiation</a></li>
 <li><a href="mod/mod_nw_ssl.html">Apache Module mod_nw_ssl</a></li>
-<li><a href="mod/mod_plainmem.html">Apache Module mod_plainmem</a></li>
 <li><a href="mod/mod_privileges.html">Apache Module mod_privileges</a></li>
 <li><a href="mod/mod_proxy.html">Apache Module mod_proxy</a></li>
 <li><a href="mod/mod_proxy_ajp.html">Apache Module mod_proxy_ajp</a></li>
@@ -248,8 +247,8 @@ Server on HPUX</a></li>
 <li><a href="mod/mod_session_crypto.html">Apache Module mod_session_crypto</a></li>
 <li><a href="mod/mod_session_dbd.html">Apache Module mod_session_dbd</a></li>
 <li><a href="mod/mod_setenvif.html">Apache Module mod_setenvif</a></li>
-<li><a href="mod/mod_sharedmem.html">Apache Module mod_sharedmem</a></li>
-<li><a href="mod/mod_slotmem.html">Apache Module mod_slotmem</a></li>
+<li><a href="mod/mod_slotmem_plain.html">Apache Module mod_slotmem_plain</a></li>
+<li><a href="mod/mod_slotmem_shm.html">Apache Module mod_slotmem_shm</a></li>
 <li><a href="mod/mod_so.html">Apache Module mod_so</a></li>
 <li><a href="mod/mod_speling.html">Apache Module mod_speling</a></li>
 <li><a href="mod/mod_ssl.html">Apache Module mod_ssl</a></li>
diff --git a/docs/manual/sitemap.html.es b/docs/manual/sitemap.html.es
index a82648976b..6250264397 100644
--- a/docs/manual/sitemap.html.es
+++ b/docs/manual/sitemap.html.es
@@ -226,7 +226,6 @@ usados para describir las directivas de Apache</a></li>
 <li><a href="mod/mod_mime_magic.html">M�dulo Apache mod_mime_magic</a></li>
 <li><a href="mod/mod_negotiation.html">M�dulo Apache mod_negotiation</a></li>
 <li><a href="mod/mod_nw_ssl.html">M�dulo Apache mod_nw_ssl</a></li>
-<li><a href="mod/mod_plainmem.html">M�dulo Apache mod_plainmem</a></li>
 <li><a href="mod/mod_privileges.html">M�dulo Apache mod_privileges</a></li>
 <li><a href="mod/mod_proxy.html">M�dulo Apache mod_proxy</a></li>
 <li><a href="mod/mod_proxy_ajp.html">M�dulo Apache mod_proxy_ajp</a></li>
@@ -246,8 +245,8 @@ usados para describir las directivas de Apache</a></li>
 <li><a href="mod/mod_session_crypto.html">M�dulo Apache mod_session_crypto</a></li>
 <li><a href="mod/mod_session_dbd.html">M�dulo Apache mod_session_dbd</a></li>
 <li><a href="mod/mod_setenvif.html">M�dulo Apache mod_setenvif</a></li>
-<li><a href="mod/mod_sharedmem.html">M�dulo Apache mod_sharedmem</a></li>
-<li><a href="mod/mod_slotmem.html">M�dulo Apache mod_slotmem</a></li>
+<li><a href="mod/mod_slotmem_plain.html">M�dulo Apache mod_slotmem_plain</a></li>
+<li><a href="mod/mod_slotmem_shm.html">M�dulo Apache mod_slotmem_shm</a></li>
 <li><a href="mod/mod_so.html">M�dulo Apache mod_so</a></li>
 <li><a href="mod/mod_speling.html">M�dulo Apache mod_speling</a></li>
 <li><a href="mod/mod_ssl.html">M�dulo Apache mod_ssl</a></li>
diff --git a/docs/manual/sitemap.html.fr b/docs/manual/sitemap.html.fr
index 3b1194d118..7ebf230bde 100644
--- a/docs/manual/sitemap.html.fr
+++ b/docs/manual/sitemap.html.fr
@@ -240,7 +240,6 @@ pour d�crire les directives Apache</a></li>
 <li><a href="mod/mod_mime_magic.html">Mudule Apache mod_mime_magic</a></li>
 <li><a href="mod/mod_negotiation.html">Mudule Apache mod_negotiation</a></li>
 <li><a href="mod/mod_nw_ssl.html">Mudule Apache mod_nw_ssl</a></li>
-<li><a href="mod/mod_plainmem.html">Mudule Apache mod_plainmem</a></li>
 <li><a href="mod/mod_privileges.html">Mudule Apache mod_privileges</a></li>
 <li><a href="mod/mod_proxy.html">Mudule Apache mod_proxy</a></li>
 <li><a href="mod/mod_proxy_ajp.html">Mudule Apache mod_proxy_ajp</a></li>
@@ -260,8 +259,8 @@ pour d�crire les directives Apache</a></li>
 <li><a href="mod/mod_session_crypto.html">Mudule Apache mod_session_crypto</a></li>
 <li><a href="mod/mod_session_dbd.html">Mudule Apache mod_session_dbd</a></li>
 <li><a href="mod/mod_setenvif.html">Mudule Apache mod_setenvif</a></li>
-<li><a href="mod/mod_sharedmem.html">Mudule Apache mod_sharedmem</a></li>
-<li><a href="mod/mod_slotmem.html">Mudule Apache mod_slotmem</a></li>
+<li><a href="mod/mod_slotmem_plain.html">Mudule Apache mod_slotmem_plain</a></li>
+<li><a href="mod/mod_slotmem_shm.html">Mudule Apache mod_slotmem_shm</a></li>
 <li><a href="mod/mod_so.html">Mudule Apache mod_so</a></li>
 <li><a href="mod/mod_speling.html">Mudule Apache mod_speling</a></li>
 <li><a href="mod/mod_ssl.html">Mudule Apache mod_ssl</a></li>
diff --git a/docs/manual/sitemap.html.ja.utf8 b/docs/manual/sitemap.html.ja.utf8
index 56b8811cbd..9b93e70ad0 100644
--- a/docs/manual/sitemap.html.ja.utf8
+++ b/docs/manual/sitemap.html.ja.utf8
@@ -224,7 +224,6 @@
 <li><a href="mod/mod_mime_magic.html">Apache モジュール mod_mime_magic</a></li>
 <li><a href="mod/mod_negotiation.html">Apache モジュール mod_negotiation</a></li>
 <li><a href="mod/mod_nw_ssl.html">Apache モジュール mod_nw_ssl</a></li>
-<li><a href="mod/mod_plainmem.html">Apache モジュール mod_plainmem</a></li>
 <li><a href="mod/mod_privileges.html">Apache モジュール mod_privileges</a></li>
 <li><a href="mod/mod_proxy.html">Apache モジュール mod_proxy</a></li>
 <li><a href="mod/mod_proxy_ajp.html">Apache モジュール mod_proxy_ajp</a></li>
@@ -244,8 +243,8 @@
 <li><a href="mod/mod_session_crypto.html">Apache モジュール mod_session_crypto</a></li>
 <li><a href="mod/mod_session_dbd.html">Apache モジュール mod_session_dbd</a></li>
 <li><a href="mod/mod_setenvif.html">Apache モジュール mod_setenvif</a></li>
-<li><a href="mod/mod_sharedmem.html">Apache モジュール mod_sharedmem</a></li>
-<li><a href="mod/mod_slotmem.html">Apache モジュール mod_slotmem</a></li>
+<li><a href="mod/mod_slotmem_plain.html">Apache モジュール mod_slotmem_plain</a></li>
+<li><a href="mod/mod_slotmem_shm.html">Apache モジュール mod_slotmem_shm</a></li>
 <li><a href="mod/mod_so.html">Apache モジュール mod_so</a></li>
 <li><a href="mod/mod_speling.html">Apache モジュール mod_speling</a></li>
 <li><a href="mod/mod_ssl.html">Apache モジュール mod_ssl</a></li>
diff --git a/docs/manual/sitemap.html.ko.euc-kr b/docs/manual/sitemap.html.ko.euc-kr
index 2ec1ed9679..d480b64d28 100644
--- a/docs/manual/sitemap.html.ko.euc-kr
+++ b/docs/manual/sitemap.html.ko.euc-kr
@@ -224,7 +224,6 @@
 <li><a href="mod/mod_mime_magic.html">����ġ ��� mod_mime_magic</a></li>
 <li><a href="mod/mod_negotiation.html">����ġ ��� mod_negotiation</a></li>
 <li><a href="mod/mod_nw_ssl.html">����ġ ��� mod_nw_ssl</a></li>
-<li><a href="mod/mod_plainmem.html">����ġ ��� mod_plainmem</a></li>
 <li><a href="mod/mod_privileges.html">����ġ ��� mod_privileges</a></li>
 <li><a href="mod/mod_proxy.html">����ġ ��� mod_proxy</a></li>
 <li><a href="mod/mod_proxy_ajp.html">����ġ ��� mod_proxy_ajp</a></li>
@@ -244,8 +243,8 @@
 <li><a href="mod/mod_session_crypto.html">����ġ ��� mod_session_crypto</a></li>
 <li><a href="mod/mod_session_dbd.html">����ġ ��� mod_session_dbd</a></li>
 <li><a href="mod/mod_setenvif.html">����ġ ��� mod_setenvif</a></li>
-<li><a href="mod/mod_sharedmem.html">����ġ ��� mod_sharedmem</a></li>
-<li><a href="mod/mod_slotmem.html">����ġ ��� mod_slotmem</a></li>
+<li><a href="mod/mod_slotmem_plain.html">����ġ ��� mod_slotmem_plain</a></li>
+<li><a href="mod/mod_slotmem_shm.html">����ġ ��� mod_slotmem_shm</a></li>
 <li><a href="mod/mod_so.html">����ġ ��� mod_so</a></li>
 <li><a href="mod/mod_speling.html">����ġ ��� mod_speling</a></li>
 <li><a href="mod/mod_ssl.html">����ġ ��� mod_ssl</a></li>
diff --git a/docs/manual/sitemap.html.tr.utf8 b/docs/manual/sitemap.html.tr.utf8
index 4ea2529892..8a7ba0d209 100644
--- a/docs/manual/sitemap.html.tr.utf8
+++ b/docs/manual/sitemap.html.tr.utf8
@@ -224,7 +224,6 @@ Windows ile Apache Kullanımı</a></li>
 <li><a href="mod/mod_mime_magic.html">Apache Modülü mod_mime_magic</a></li>
 <li><a href="mod/mod_negotiation.html">Apache Modülü mod_negotiation</a></li>
 <li><a href="mod/mod_nw_ssl.html">Apache Modülü mod_nw_ssl</a></li>
-<li><a href="mod/mod_plainmem.html">Apache Modülü mod_plainmem</a></li>
 <li><a href="mod/mod_privileges.html">Apache Modülü mod_privileges</a></li>
 <li><a href="mod/mod_proxy.html">Apache Modülü mod_proxy</a></li>
 <li><a href="mod/mod_proxy_ajp.html">Apache Modülü mod_proxy_ajp</a></li>
@@ -244,8 +243,8 @@ Windows ile Apache Kullanımı</a></li>
 <li><a href="mod/mod_session_crypto.html">Apache Modülü mod_session_crypto</a></li>
 <li><a href="mod/mod_session_dbd.html">Apache Modülü mod_session_dbd</a></li>
 <li><a href="mod/mod_setenvif.html">Apache Modülü mod_setenvif</a></li>
-<li><a href="mod/mod_sharedmem.html">Apache Modülü mod_sharedmem</a></li>
-<li><a href="mod/mod_slotmem.html">Apache Modülü mod_slotmem</a></li>
+<li><a href="mod/mod_slotmem_plain.html">Apache Modülü mod_slotmem_plain</a></li>
+<li><a href="mod/mod_slotmem_shm.html">Apache Modülü mod_slotmem_shm</a></li>
 <li><a href="mod/mod_so.html">Apache Modülü mod_so</a></li>
 <li><a href="mod/mod_speling.html">Apache Modülü mod_speling</a></li>
 <li><a href="mod/mod_ssl.html">Apache Modülü mod_ssl</a></li>