Merge in APR[-util] macros from branches/trunk-buildconf-noapr

[apache] / docs / manual / mod / mod_file_cache.xml

diff --git a/docs/manual/mod/mod_file_cache.xml b/docs/manual/mod/mod_file_cache.xml
index a475c47e2220cec029cc210bdd66935b4f7bcc5e..aacc99165537e5647dfe5a470c1e1f8aa31c18f4 100644 (file)
--- a/docs/manual/mod/mod_file_cache.xml
+++ b/docs/manual/mod/mod_file_cache.xml
@@ -4,12 +4,12 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
@@ -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
@@ -79,7 +76,7 @@
       directive of <module>mod_file_cache</module> maps a list of
       statically configured files into memory through the system call
       <code>mmap()</code>. This system call is available on most modern
-      Unix derivates, but not on all. There are sometimes system-specific
+      Unix derivatives, but not on all. There are sometimes system-specific
       limits on the size and number of files that can be
       <code>mmap()</code>ed, experimentation is probably the easiest way
       to find out.</p>
@@ -127,7 +124,7 @@
 
     <note><title>Note</title>
       <p>Don't bother asking for a directive which recursively
-      caches all the files in a directory. Try this instead... See the 
+      caches all the files in a directory. Try this instead... See the
       <directive module="core">Include</directive> directive, and consider
       this command:</p>
 
@@ -162,7 +159,9 @@
     <module>mod_rewrite</module>.</p>
 
     <example><title>Example</title>
+    <highlight language="config">
       MMapFile /usr/local/apache/htdocs/index.html
+      </highlight>
     </example>
 </usage>
 </directivesynopsis>
@@ -179,7 +178,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
@@ -191,7 +190,9 @@
     <module>mod_rewrite</module>.</p>
 
     <example><title>Example</title>
+    <highlight language="config">
       CacheFile /usr/local/apache/htdocs/index.html
+      </highlight>
     </example>
 </usage>
 </directivesynopsis>