svn commit: r1515245 - in /httpd/httpd/trunk/docs/manual/mod: mod_negotiation.html.en mod_negotiation.xml

[co...@apache.org]

Author: covener
Date: Mon Aug 19 00:28:27 2013
New Revision: 1515245

URL: http://svn.apache.org/r1515245
Log:
PR 55447: Elaborate on how a type map foo.html.var can be found when 
requesting foo.html (this was automatic in 1.3)


Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_negotiation.xml

Modified: httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.en?rev=1515245&r1=1515244&r2=1515245&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.en Mon Aug 19 00:28:27 2013
@@ -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>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_negotiation.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_negotiation.xml?rev=1515245&r1=1515244&r2=1515245&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_negotiation.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_negotiation.xml Mon Aug 19 00:28:27 2013
@@ -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>