Return-Path: 
 <cvs-return-32143-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 39199 invoked from network); 11 Feb 2009 17:11:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 11 Feb 2009 17:11:53 -0000
Received: (qmail 19701 invoked by uid 500); 11 Feb 2009 17:11:52 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 19660 invoked by uid 500); 11 Feb 2009 17:11:52 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 19651 invoked by uid 99); 11 Feb 2009 17:11:52 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Feb 2009 09:11:52 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Feb 2009 17:11:48 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A3727238899B; Wed, 11 Feb 2009 17:11:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r743406 - in /httpd/httpd/branches/2.2.x/docs/manual:
 caching.xml caching.xml.fr mod/mod_file_cache.xml
Date: Wed, 11 Feb 2009 17:11:27 -0000
To: cvs@httpd.apache.org
From: lgentis@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090211171127.A3727238899B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: lgentis
Date: Wed Feb 11 17:11:26 2009
New Revision: 743406

URL: http://svn.apache.org/viewvc?rev=743406&view=rev
Log:
MMapStatic directive doesn't exist.

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/caching.xml
    httpd/httpd/branches/2.2.x/docs/manual/caching.xml.fr
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_file_cache.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/caching.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/caching.xml?rev=743406&r1=743405&r2=743406&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/caching.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/caching.xml Wed Feb 11 17:11:26 2009
@@ -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 @@
       <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 @@
     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 @@
       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

Modified: httpd/httpd/branches/2.2.x/docs/manual/caching.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/caching.xml.fr?rev=743406&r1=743405&r2=743406&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/caching.xml.fr (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/caching.xml.fr Wed Feb 11 17:11:26 2009
@@ -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 @@
       <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 @@
     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 @@
       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 @@
       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

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_file_cache.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_file_cache.xml?rev=743406&r1=743405&r2=743406&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_file_cache.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_file_cache.xml Wed Feb 11 17:11:26 2009
@@ -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