From: Takashi Sato <takashi@apache.org>
Date: Wed, 21 May 2008 18:13:31 +0000 (+0000)
Subject: Merge r658549 and r658793 from trunk:
X-Git-Tag: 2.2.9~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04540f54a191dba624eeb76df3feb3abdffbdb9b;p=thirdparty%2Fapache%2Fhttpd.git

Merge r658549 and r658793 from trunk:

the example for IfDefine
*make the example for IfDefine use multiple-parameter.
 Pointed out by: Andrew Ford <A.Ford ford-mason.co uk>
* and minor cleanups

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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 3d2ec40e85c..bc481f43d72 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1394,13 +1394,28 @@ if a test is true at startup</description>
     multiple-parameter tests. Example:</p>
 
     <example>
-      httpd -DReverseProxy ...<br />
+      httpd -DReverseProxy -DUseCache -DMemCache ...<br />
       <br />
       # httpd.conf<br />
       &lt;IfDefine ReverseProxy&gt;<br />
       <indent>
-        LoadModule rewrite_module modules/mod_rewrite.so<br />
-        LoadModule proxy_module   modules/libproxy.so<br />
+        LoadModule proxy_module   modules/mod_proxy.so<br />
+        LoadModule proxy_http_module   modules/mod_proxy_http.so<br />
+        &lt;IfDefine UseCache&gt;<br />
+        <indent>
+          LoadModule cache_module   modules/mod_cache.so<br />
+          &lt;IfDefine MemCache&gt;<br />
+          <indent>
+            LoadModule mem_cache_module   modules/mod_mem_cache.so<br />
+          </indent>
+          &lt;/IfDefine&gt;<br />
+          &lt;IfDefine !MemCache&gt;<br />
+          <indent>
+            LoadModule disk_cache_module   modules/mod_disk_cache.so<br />
+          </indent>
+          &lt;/IfDefine&gt;
+        </indent>
+        &lt;/IfDefine&gt;
       </indent>
       &lt;/IfDefine&gt;
     </example>