backport + compat

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

diff --git a/docs/manual/mod/mod_filter.xml b/docs/manual/mod/mod_filter.xml
index 780b6f572d7bfcea00b5371f3f8c5c0da1e103d6..54e9c01bfebfe25c67d7658df6148e4af2f47cda 100644 (file)
--- a/docs/manual/mod/mod_filter.xml
+++ b/docs/manual/mod/mod_filter.xml
@@ -405,12 +405,19 @@ for a complete reference and examples.</seealso>
     With two arguments it applies to a <var>filter-name</var> whenever the
     filter runs <em>any</em> provider.</p>
 
+    <p>Flags specified with this directive are merged with the flags 
+    that underlying providers may have registerd with 
+    <module>mod_filter</module>. For example, a filter may internally specify
+    the equivalent of <code>change=yes</code>, but a particular 
+    configuration of the module can override with <code>change=no</code>.
+    </p>
+
     <p><var>proto-flags</var> is one or more of</p>
 
     <dl>
-    <dt><code>change=yes</code></dt>
-    <dd>The filter changes the content, including possibly the content
-    length</dd>
+    <dt><code>change=yes|no</code></dt>
+    <dd>Specifies whether the filter changes the content, including possibly 
+    the content length.  The "no" argument is supported in 2.4.7 and later.</dd>
 
     <dt><code>change=1:1</code></dt>
     <dd>The filter changes the content, but will not change the content