httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbo...@apache.org
Subject svn commit: r1149174 - /httpd/httpd/trunk/docs/manual/content-negotiation.xml
Date Thu, 21 Jul 2011 13:44:03 GMT
Author: rbowen
Date: Thu Jul 21 13:44:00 2011
New Revision: 1149174

URL: http://svn.apache.org/viewvc?rev=1149174&view=rev
Log:
Small clarifications, as per tid 50730

Modified:
    httpd/httpd/trunk/docs/manual/content-negotiation.xml

Modified: httpd/httpd/trunk/docs/manual/content-negotiation.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/content-negotiation.xml?rev=1149174&r1=1149173&r2=1149174&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/content-negotiation.xml (original)
+++ httpd/httpd/trunk/docs/manual/content-negotiation.xml Thu Jul 21 13:44:00 2011
@@ -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



Mime
View raw message