- In 2.0 it is possible for LanguagePriority to have an effect, even for

a properly configured HTTP/1.1 client.

- Reference MultiViewsMatch.

PR: 21726, 21830

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

diff --git a/docs/manual/mod/mod_negotiation.html.en b/docs/manual/mod/mod_negotiation.html.en
index d331484f0777c0818928a0271c2219fcae8b6f47..61bc7d5ece17cc8b58359e88a95dc916d2c3c734 100644 (file)
--- a/docs/manual/mod/mod_negotiation.html.en
+++ b/docs/manual/mod/mod_negotiation.html.en
@@ -169,6 +169,11 @@ Negotiation</a></li>
     content-encodings it would have if the client had asked for one
     of them by name. It then chooses the best match to the client's
     requirements, and returns that document.</p>
+
+    <p>The <code class="directive"><a href="../mod/mod_mime.html#multiviewsmatch">MultiViewsMatch</a></code>
+    directive configures whether Apache will consider files
+    that do not have content negotiation meta-information assigned
+    to them when choosing files.</p>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="CacheNegotiatedDocs" id="CacheNegotiatedDocs">CacheNegotiatedDocs</a> <a name="cachenegotiateddocs" id="cachenegotiateddocs">Directive</a></h2>
@@ -283,8 +288,8 @@ the client does not express a preference</td></tr>
 
     <p>Note that this directive only has an effect if a 'best'
     language cannot be determined by any other means or the <code class="directive"><a href="#forcelanguagepriority">ForceLanguagePriority</a></code> directive
-    is not <code>None</code>. Correctly implemented HTTP/1.1 requests
-    will mean this directive has no effect.</p>
+    is not <code>None</code>. In general, the client determines the
+    language preference, not the server.</p>
 
 <h3>See also</h3>
 <ul>

diff --git a/docs/manual/mod/mod_negotiation.xml b/docs/manual/mod/mod_negotiation.xml
index 0904ccb3da84600e4275ca810726cd660abd2da6..77d6344bd6842a739a5d745fd83458f9813bfc0e 100644 (file)
--- a/docs/manual/mod/mod_negotiation.xml
+++ b/docs/manual/mod/mod_negotiation.xml
@@ -138,6 +138,11 @@ Negotiation</a></seealso>
     content-encodings it would have if the client had asked for one
     of them by name. It then chooses the best match to the client's
     requirements, and returns that document.</p>
+
+    <p>The <directive module="mod_mime">MultiViewsMatch</directive>
+    directive configures whether Apache will consider files
+    that do not have content negotiation meta-information assigned
+    to them when choosing files.</p>
 </section>
 
 <directivesynopsis>
@@ -253,8 +258,8 @@ the client does not express a preference</description>
     <p>Note that this directive only has an effect if a 'best'
     language cannot be determined by any other means or the <directive
     module="mod_negotiation">ForceLanguagePriority</directive> directive
-    is not <code>None</code>. Correctly implemented HTTP/1.1 requests
-    will mean this directive has no effect.</p>
+    is not <code>None</code>. In general, the client determines the
+    language preference, not the server.</p>
 </usage>
 <seealso><directive module="mod_mime">AddLanguage</directive></seealso>
 </directivesynopsis>