From: Lucien Gentis <lgentis@apache.org>
Date: Wed, 11 Feb 2009 17:11:26 +0000 (+0000)
Subject: MMapStatic directive doesn't exist.
X-Git-Tag: 2.2.12~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46a81392b656bc771ab59bf3c5177a58b2ad578a;p=thirdparty%2Fapache%2Fhttpd.git

MMapStatic directive doesn't exist.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@743406 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/caching.xml b/docs/manual/caching.xml
index 4c4116d1283..d4e417ffb2f 100644
--- a/docs/manual/caching.xml
+++ b/docs/manual/caching.xml
@@ -65,7 +65,7 @@
     <p>As <module>mod_file_cache</module> presents a relatively simple
     caching implementation, apart from the specific sections on <directive 
     module="mod_file_cache">CacheFile</directive> and <directive 
-    module="mod_file_cache">MMapStatic</directive>, the explanations
+    module="mod_file_cache">MMapFile</directive>, the explanations
     in this guide cover the <module>mod_cache</module> caching 
     architecture.</p>
 
@@ -90,9 +90,8 @@
       <directivelist>
         <directive module="mod_cache">CacheEnable</directive>
         <directive module="mod_cache">CacheDisable</directive>
-        <directive module="mod_file_cache">MMapStatic</directive>
-        <directive module="mod_file_cache">CacheFile</directive>
         <directive module="mod_file_cache">CacheFile</directive>
+        <directive module="mod_file_cache">MMapFile</directive>
         <directive module="core">UseCanonicalName</directive>
         <directive module="mod_negotiation">CacheNegotiatedDocs</directive>
       </directivelist>
@@ -475,7 +474,7 @@ Vary: negotiate,accept-language,accept-charset
       <directivelist>
         <directive module="mod_cache">CacheEnable</directive>
         <directive module="mod_cache">CacheDisable</directive>
-        <directive module="mod_file_cache">MMapStatic</directive>
+        <directive module="mod_file_cache">MMapFile</directive>
       </directivelist>
     </related>
        
@@ -541,16 +540,16 @@ sys     0m0.000s</pre>
     speed of in-memory caching, Apache's own memory caching is needed.</p>
 
     <section>
-      <title>MMapStatic Caching</title>
+      <title>MMapFile Caching</title>
 
       <p><module>mod_file_cache</module> provides the 
-      <directive module="mod_file_cache">MMapStatic</directive> directive, which
+      <directive module="mod_file_cache">MMapFile</directive> directive, which
       allows you to have Apache map a static file's contents into memory at
       start time (using the mmap system call). Apache will use the in-memory 
       contents for all subsequent accesses to this file.</p>
 
       <example>
-      <pre>MMapStatic /usr/local/apache2/htdocs/index.html</pre>
+      <pre>MMapFile /usr/local/apache2/htdocs/index.html</pre>
       </example>
 
       <p>As with the
@@ -558,7 +557,7 @@ sys     0m0.000s</pre>
       changes in these files will not be picked up by Apache after it has
       started.</p>
 
-      <p> The <directive module="mod_file_cache">MMapStatic</directive> 
+      <p> The <directive module="mod_file_cache">MMapFile</directive> 
       directive does not keep track of how much memory it allocates, so
       you must ensure not to over-use the directive. Each Apache child
       process will replicate this memory, so it is critically important
diff --git a/docs/manual/caching.xml.fr b/docs/manual/caching.xml.fr
index 78498f78733..f32c9f702a3 100644
--- a/docs/manual/caching.xml.fr
+++ b/docs/manual/caching.xml.fr
@@ -77,7 +77,7 @@
     impl&eacute;mentation de mise en cache relativement simple, mises &agrave; part les
     sections sp&eacute;cifiques sur les directives <directive
     module="mod_file_cache">CacheFile</directive> et <directive
-    module="mod_file_cache">MMapStatic</directive>, les explications fournies
+    module="mod_file_cache">MMapFile</directive>, les explications fournies
     dans ce guide concernent l'architecture de mise en cache du
     module <module>mod_cache</module>.</p>
 
@@ -104,9 +104,8 @@
       <directivelist>
         <directive module="mod_cache">CacheEnable</directive>
         <directive module="mod_cache">CacheDisable</directive>
-        <directive module="mod_file_cache">MMapStatic</directive>
-        <directive module="mod_file_cache">CacheFile</directive>
         <directive module="mod_file_cache">CacheFile</directive>
+        <directive module="mod_file_cache">MMapFile</directive>
         <directive module="core">UseCanonicalName</directive>
         <directive module="mod_negotiation">CacheNegotiatedDocs</directive>
       </directivelist>
@@ -536,7 +535,7 @@ Vary: negotiate,accept-language,accept-charset
       <directivelist>
         <directive module="mod_cache">CacheEnable</directive>
         <directive module="mod_cache">CacheDisable</directive>
-        <directive module="mod_file_cache">MMapStatic</directive>
+        <directive module="mod_file_cache">MMapFile</directive>
       </directivelist>
     </related>
 
@@ -612,9 +611,9 @@ sys     0m0.000s</pre>
     m&eacute;moire, la mise en cache propre &agrave; Apache sera n&eacute;cessaire.</p>
 
     <section>
-      <title>Mise en cache &agrave; l'aide de la directive MMapStatic</title>
+      <title>Mise en cache &agrave; l'aide de la directive MMapFile</title>
 
-      <p>La directive <directive module="mod_file_cache">MMapStatic</directive>
+      <p>La directive <directive module="mod_file_cache">MMapFile</directive>
       fournie par le module <module>mod_file_cache</module> vous permet de
       demander &agrave; Apache de charger un contenu de fichier statique en m&eacute;moire
       lors de son d&eacute;marrage (&agrave; l'aide de l'appel syst&egrave;me mmap). Apache
@@ -622,7 +621,7 @@ sys     0m0.000s</pre>
       toutes les demandes d'acc&egrave;s &agrave; ce fichier.</p>
 
       <example>
-      <pre>MMapStatic /usr/local/apache2/htdocs/index.html</pre>
+      <pre>MMapFile /usr/local/apache2/htdocs/index.html</pre>
       </example>
 
       <p>Comme dans le cas de la directive
@@ -631,7 +630,7 @@ sys     0m0.000s</pre>
       ce dernier d&eacute;marr&eacute;.</p>
 
       <p> La directive
-      <directive module="mod_file_cache">MMapStatic</directive> ne gardant
+      <directive module="mod_file_cache">MMapFile</directive> ne gardant
       pas la trace de la quantit&eacute; de m&eacute;moire qu'elle alloue, vous devez prendre
       garde de ne pas en abuser. Chaque processus enfant d'Apache utilisant
       sa propre r&eacute;plique de la m&eacute;moire allou&eacute;e, il est donc d'une importance
diff --git a/docs/manual/mod/mod_file_cache.xml b/docs/manual/mod/mod_file_cache.xml
index 9f777b6cdee..78609e65c52 100644
--- a/docs/manual/mod/mod_file_cache.xml
+++ b/docs/manual/mod/mod_file_cache.xml
@@ -63,10 +63,7 @@
     >MMapFile</directive> or <directive module="mod_file_cache"
     >CacheFile</directive> directives in the main server configuration.</p>
 
-    <p>Not all platforms support both directives. For example, Apache
-    on Windows does not currently support the <directive
-    module="mod_file_cache">MMapStatic</directive> directive, while
-    other platforms, like AIX, support both. You will receive an error
+    <p>Not all platforms support both directives. You will receive an error
     message in the server error log if you attempt to use an
     unsupported directive. If given an unsupported directive, the
     server will start but the file will not be cached. On platforms
@@ -179,7 +176,7 @@
     places these handles into the cache at server startup
     time. Handles to cached files are automatically closed on a server
     shutdown.  When the files have changed on the filesystem, the
-    server should be restarted to to re-cache them.</p>
+    server should be restarted to re-cache them.</p>
 
     <p>Be careful with the <var>file-path</var> arguments: They have
     to literally match the filesystem path Apache's URL-to-filename