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

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

diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml
index 1284cef8a62888bef76a3fc527c42c2e4956f441..4c91c35110d5dcab01b66739cb9e8e22c272060f 100644 (file)
--- a/docs/manual/mod/mod_cache.xml
+++ b/docs/manual/mod/mod_cache.xml
@@ -101,7 +101,7 @@
     HTTP header with a 111 response code.</p>
 
     <p><module>mod_cache</module> requires the services of one or more
-    storage management modules. One storage management module is included in
+    storage management modules. The following storage management modules are included in
     the base Apache distribution:</p>
     <dl>
     <dt><module>mod_cache_disk</module></dt>
@@ -162,7 +162,7 @@ LoadModule cache_module modules/mod_cache.so
         CacheDirLevels 5
         CacheDirLength 3
     &lt;/IfModule&gt;
-    
+
     # When acting as a proxy, don't cache the list of security updates
     CacheDisable http://security.update.server/update-list/
 &lt;/IfModule&gt;
@@ -327,10 +327,10 @@ AddOutputFilterByType INCLUDES;CACHE;DEFLATE text/html
   as per the following example:</p>
 
   <highlight language="config">
-CustomLog cached-requests.log common env=cache-hit
-CustomLog uncached-requests.log common env=cache-miss
-CustomLog revalidated-requests.log common env=cache-revalidate
-CustomLog invalidated-requests.log common env=cache-invalidate
+CustomLog "cached-requests.log" common env=cache-hit
+CustomLog "uncached-requests.log" common env=cache-miss
+CustomLog "revalidated-requests.log" common env=cache-revalidate
+CustomLog "invalidated-requests.log" common env=cache-invalidate
   </highlight>
 
   <p>For module authors, a hook called <var>cache_status</var> is available,
@@ -374,19 +374,19 @@ manager</description>
     <directive type="section">LocationMatch</directive> sections are processed
     before globally defined <directive>CacheEnable</directive> directives.</p>
 
-    <p>When acting as a forward proxy server, <var>url-string</var> must 
+    <p>When acting as a forward proxy server, <var>url-string</var> must
     minimally begin with a protocol for which caching should be enabled.</p>
 
     <highlight language="config">
 # Cache content (normal handler only)
 CacheQuickHandler off
-&lt;Location /foo&gt;
+&lt;Location "/foo"&gt;
     CacheEnable disk
 &lt;/Location&gt;
 
 # Cache regex (normal handler only)
 CacheQuickHandler off
-&lt;LocationMatch foo$&gt;
+&lt;LocationMatch "foo$"&gt;
     CacheEnable disk
 &lt;/LocationMatch&gt;
 
@@ -444,7 +444,7 @@ CacheEnable  disk  http://.example.org/
 
     <example><title>Example</title>
     <highlight language="config">
-&lt;Location /foo&gt;
+&lt;Location "/foo"&gt;
     CacheDisable on
 &lt;/Location&gt;
       </highlight>
@@ -470,7 +470,7 @@ CacheEnable  disk  http://.example.org/
 
 <usage>
     <p>The <directive>CacheMaxExpire</directive> directive specifies the maximum number of
-    seconds for which cachable HTTP documents will be retained without checking the origin
+    seconds for which cacheable HTTP documents will be retained without checking the origin
     server. Thus, documents will be out of date at most this number of seconds. This maximum
     value is enforced even if an expiry date was supplied with the document.</p>
 
@@ -493,7 +493,7 @@ CacheEnable  disk  http://.example.org/
 
 <usage>
     <p>The <directive>CacheMinExpire</directive> directive specifies the minimum number of
-    seconds for which cachable HTTP documents will be retained without checking the origin
+    seconds for which cacheable HTTP documents will be retained without checking the origin
     server. This is only used if no valid expire time was supplied with the document.</p>
 
 
@@ -570,7 +570,7 @@ header.</description>
     <directive>CacheIgnoreCacheControl</directive> directive allows this
     behavior to be overridden.  <directive>CacheIgnoreCacheControl On</directive>
     tells the server to attempt to serve the resource from the cache even
-    if the request contains no-cache header values.</p>  
+    if the request contains no-cache header values.</p>
 
     <highlight language="config">
       CacheIgnoreCacheControl On
@@ -723,10 +723,10 @@ LastModified date.</description>
       <li><code>/someapplication/image.gif;jsessionid=123456789</code></li>
       <li><code>/someapplication/image.gif?PHPSESSIONID=12345678</code></li>
     </ul>
-    <p>This causes cachable resources to be stored separately for each session, which
+    <p>This causes cacheable resources to be stored separately for each session, which
     is often not desired. <directive>CacheIgnoreURLSessionIdentifiers</directive> lets
     define a list of identifiers that are removed from the key that is used to identify
-    an entity in the cache, such that cachable resources are not stored separately for
+    an entity in the cache, such that cacheable resources are not stored separately for
     each session.
     </p>
     <p><code>CacheIgnoreURLSessionIdentifiers None</code> clears the list of ignored
@@ -877,7 +877,7 @@ CacheLock on
 <usage>
   <p>The <directive>CacheLockPath</directive> directive allows you to specify the
   directory in which the locks are created.  If <var>directory</var> is not an absolute
-  path, the location specified will be relative to the value of 
+  path, the location specified will be relative to the value of
   <directive module="core">DefaultRuntimeDir</directive>.</p>
 </usage>
 </directivesynopsis>