Replace magic mime type with handler name

Add notes to CacheNegotiatedDocs and LanguagePriority about HTTP/1.1

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

diff --git a/docs/manual/mod/mod_negotiation.html b/docs/manual/mod/mod_negotiation.html
index 8f341e6d7203c51d1ce4a9a5a0da9ff09fef40b9..3e19d419c3e42807fe3d025508aa1116e8071acc 100644 (file)
--- a/docs/manual/mod/mod_negotiation.html
+++ b/docs/manual/mod/mod_negotiation.html
@@ -8,11 +8,9 @@
 <!--#include virtual="header.html" -->
 <H1>Module mod_negotiation</h1>
 
-This module is contained in the <code>mod_negotiation.c</code> file, and
-is compiled in by default. It provides for
-<A HREF="content-negotiation.html">content negotiation</A>. Any document with
-mime type <code>application/x-type-map</code> will be processed by this module.
-<!--%plaintext &lt;?INDEX {\tt application/x-type-map} mime type&gt; -->
+This module is contained in the <code>mod_negotiation.c</code> file,
+and is compiled in by default. It provides for <A
+HREF="../content-negotiation.html">content negotiation</A>. 
 
 <h2>Summary</h2>
 Content negotiation, or more accurately content selection, is the
@@ -20,7 +18,7 @@ selection of the document that best matches the clients
 capabilities, from one of several available documents.
 There are two implementations of this.
 <ul>
-<li> A type map (a file with the mime type <code>application/x-type-map</code>)
+<li> A type map (a file with the handler <code>type-map</code>)
 which explicitly lists the files containing the variants.
 <li> A MultiViews search (enabled by the MultiViews
 <A HREF="core.html#options">Option</A>, where the server does an implicit
@@ -37,8 +35,7 @@ and the lines concatenated. A header record consists of a keyword
 name, which always ends in a colon, followed by a value. Whitespace is allowed
 between the header name and value, and between the tokens of value.
 
-The headers
-allowed are:
+The headers allowed are:
 
 <dl>
 <dt>Content-Encoding:
@@ -98,11 +95,18 @@ requirements, and returns that document.<p>
 <strong>Compatibility:</strong> CacheNegotiatedDocs is only available
 in Apache 1.1 and later.<p>
 
-<p>If set, this directive allows content-negotiated documents to be cached
-by
-proxy servers. This could mean that clients behind those proxys could
-retrieve versions of the documents that are not the best match for
-their abilities, but it will make caching more efficient.</p>
+<p>If set, this directive allows content-negotiated documents to be
+cached by proxy servers. This could mean that clients behind those
+proxys could retrieve versions of the documents that are not the best
+match for their abilities, but it will make caching more
+efficient.
+<p>
+
+This directive only applies to requests which come from HTTP/1.0 browsers.
+HTTP/1.1 provides much better control over the caching of negotiated
+documents, and this directive has no effect in responses to 
+HTTP/1.1 requests.
+
 
 
 <A name="languagepriority"><h2>LanguagePriority</h2></A>
@@ -124,6 +128,12 @@ For a request for <code>foo.html</code>, where <code>foo.html.fr</code>
 and <code>foo.html.de</code> both existed, but the browser did not express
 a language preference, then <code>foo.html.fr</code> would be returned.<p>
 
+<P>
+
+Note that this directive only has an effect if a 'best' language
+cannot be determined by other any other means. Correctly implemented
+HTTP/1.1 requests will mean this directive has no effect. 
+
 <!--#include virtual="footer.html" -->
 </BODY>
 </HTML>