From: Eric Covener <covener@apache.org>
Date: Mon, 19 Aug 2013 00:28:51 +0000 (+0000)
Subject: Merge r1515245 from trunk:
X-Git-Tag: 2.4.7~291
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5adda3984b51765072976039b450552da6c83d71;p=apache

Merge r1515245 from trunk:

PR 55447: Elaborate on how a type map foo.html.var can be found when
requesting foo.html (this was automatic in 1.3)




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

diff --git a/docs/manual/mod/mod_negotiation.html.en b/docs/manual/mod/mod_negotiation.html.en
index e08f47ce8c..6d123f2ead 100644
--- a/docs/manual/mod/mod_negotiation.html.en
+++ b/docs/manual/mod/mod_negotiation.html.en
@@ -197,11 +197,18 @@ Negotiation</a></li>
     </pre>
 
 
-    <p>A request for <code>document.html</code> in this directory will
-    result in <code>document.html.var</code> being consulted, and the
-    variant chosen which most closely matches the language preference
+    <p>A request for <code>document.html.var</code> in this directory will
+    result in choosing the variant which most closely matches the language preference
     specified in the user's <code>Accept-Language</code> request
     header.</p>
+
+    <p>If <code>Multiviews</code> is enabled, and <code class="directive"><a href="../mod/mod_mime.html#multiviewsmatch">MultiviewsMatch</a></code> is set to "handlers" or "any",  a request to
+    <code>document.html</code> will discover <code>document.html.var</code> and
+    continue negotiating with the explicit type map.</p>
+
+    <p>Other configuration directives, such as <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code> can be used to map <code>document.html</code> to
+    <code>document.html.var</code></p>.
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="multiviews" id="multiviews">Multiviews</a></h2>
diff --git a/docs/manual/mod/mod_negotiation.xml b/docs/manual/mod/mod_negotiation.xml
index e7109bfe94..87b6371016 100644
--- a/docs/manual/mod/mod_negotiation.xml
+++ b/docs/manual/mod/mod_negotiation.xml
@@ -181,11 +181,20 @@ Negotiation</a></seealso>
     AddHandler type-map .var
     </highlight>
 
-    <p>A request for <code>document.html</code> in this directory will
-    result in <code>document.html.var</code> being consulted, and the
-    variant chosen which most closely matches the language preference
+    <p>A request for <code>document.html.var</code> in this directory will
+    result in choosing the variant which most closely matches the language preference
     specified in the user's <code>Accept-Language</code> request
     header.</p>
+
+    <p>If <code>Multiviews</code> is enabled, and <directive module="mod_mime"
+    >MultiviewsMatch</directive> is set to "handlers" or "any",  a request to
+    <code>document.html</code> will discover <code>document.html.var</code> and
+    continue negotiating with the explicit type map.</p>
+
+    <p>Other configuration directives, such as <directive module="mod_alias"
+    >Alias</directive> can be used to map <code>document.html</code> to
+    <code>document.html.var</code></p>.
+
 </section>
 
 <section id="multiviews"><title>Multiviews</title>