From: Rich Bowen <rbowen@apache.org>
Date: Thu, 21 Jul 2011 13:44:00 +0000 (+0000)
Subject: Small clarifications, as per tid 50730
X-Git-Tag: 2.3.14^2~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77bdf0dfe1c37fba8ff7b41a61e704693f3e0444;p=apache

Small clarifications, as per tid 50730


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

diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml
index c1464c0583..d7402657aa 100644
--- a/docs/manual/content-negotiation.xml
+++ b/docs/manual/content-negotiation.xml
@@ -125,15 +125,24 @@
     <p>in the server configuration file.</p>
 
     <p>Type map files should have the same name as the resource
-    which they are describing, and have an entry for each available
+    which they are describing, followed by the extension
+    <code>.var</code>. In the examples shown below, the resource is
+    named <code>foo</code>, so the type map file is named
+    <code>foo.var<code>.</p>
+    
+    <p>This file should have an entry for each available
     variant; these entries consist of contiguous HTTP-format header
     lines. Entries for different variants are separated by blank
     lines. Blank lines are illegal within an entry. It is
     conventional to begin a map file with an entry for the combined
     entity as a whole (although this is not required, and if
-    present will be ignored). An example map file is shown below.
-    This file would be named <code>foo.var</code>, as it describes
-    a resource named <code>foo</code>.</p>
+    present will be ignored). An example map file is shown below.</p>
+
+    <p>URIs in this file are relative to the location of the type map
+    file. Usually, these files will be located in the same directory as
+    the type map file, but this is not required. You may provide
+    absolute or relative URIs for any file located on the same server as
+    the map file.</p>
 
 <example>
   URI: foo<br />
@@ -146,6 +155,7 @@
   Content-type: text/html;charset=iso-8859-2<br />
   Content-language: fr, de<br />
 </example>
+
     <p>Note also that a typemap file will take precedence over the
     filename's extension, even when Multiviews is on. If the
     variants have different source qualities, that may be indicated