document the changed behaviour of mod_negotiation.

add a cross link from mod_negotiation docs to env.html

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98872 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en
index 9d0dd31860c7405d8c699e460214bc8ae786e601..9959b0b0dc037403a7c2f4ea6127e7d04ea54c90 100644 (file)
--- a/docs/manual/env.html.en
+++ b/docs/manual/env.html.en
@@ -249,13 +249,18 @@
 
         <p>When set to a value of "1", this variable disables the DEFLATE
         output filter provided by <code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code> for
-        content-types other than <code>text/html</code>.</p>
+        content-types other than <code>text/html</code>. If you'd rather
+        use statically compressed files; <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code>
+        evaluates the variable as well (not only for gzip, but for all
+        encodings that differ from "identity").</p>
     
 
     <h3><a name="no-gzip" id="no-gzip">no-gzip</a></h3>
 
         <p>When set, the <code>DEFLATE</code> filter of
-        <code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code> will be turned off.</p>
+        <code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code> will be turned off and
+        <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> will refuse to deliver encoded
+        resources.</p>
 
     
 

diff --git a/docs/manual/env.xml b/docs/manual/env.xml
index 50ce966ac4a55b90c0242c2df741b3160b887bd1..04299dc6f4dd5c3e94c90d9eb5b96110e0d49dee 100644 (file)
--- a/docs/manual/env.xml
+++ b/docs/manual/env.xml
@@ -279,13 +279,18 @@
 
         <p>When set to a value of "1", this variable disables the DEFLATE
         output filter provided by <module>mod_deflate</module> for
-        content-types other than <code>text/html</code>.</p>
+        content-types other than <code>text/html</code>. If you'd rather
+        use statically compressed files; <module>mod_negotiation</module>
+        evaluates the variable as well (not only for gzip, but for all
+        encodings that differ from "identity").</p>
     </section>
 
     <section id="no-gzip"><title>no-gzip</title>
 
         <p>When set, the <code>DEFLATE</code> filter of
-        <module>mod_deflate</module> will be turned off.</p>
+        <module>mod_deflate</module> will be turned off and
+        <module>mod_negotiation</module> will refuse to deliver encoded
+        resources.</p>
 
     </section>
 

diff --git a/docs/manual/mod/mod_negotiation.html.en b/docs/manual/mod/mod_negotiation.html.en
index a640022f1b634ff56adc4e4ca23ade45b07d378c..4350a23f9465670d678a75ad471bf4a2301ca879 100644 (file)
--- a/docs/manual/mod/mod_negotiation.html.en
+++ b/docs/manual/mod/mod_negotiation.html.en
@@ -58,6 +58,7 @@
 <li><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li>
 <li><a href="../content-negotiation.html">Content
 Negotiation</a></li>
+<li><a href="../env.html">Environment Variables</a></li>
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">

diff --git a/docs/manual/mod/mod_negotiation.xml b/docs/manual/mod/mod_negotiation.xml
index 82dbbed2a66d4ff4cc8f36b7d131a9ad03c0e31d..98b80f7b1f7a5e6db57c77577c0b86d549c5b6af 100644 (file)
--- a/docs/manual/mod/mod_negotiation.xml
+++ b/docs/manual/mod/mod_negotiation.xml
@@ -31,6 +31,7 @@
 <seealso><module>mod_mime</module></seealso>
 <seealso><a href="../content-negotiation.html">Content
 Negotiation</a></seealso>
+<seealso><a href="../env.html">Environment Variables</a></seealso>
 
 <section id="typemaps"><title>Type maps</title>
     <p>A type map has a format similar to RFC822 mail headers. It