cvs commit: apache/htdocs/manual/mod mod_negotiation.html

[Paul Sutton <pc...@hyperreal.com>]

pcs         96/11/26 01:23:52

  Modified:    htdocs/manual/mod  mod_negotiation.html
  Log:
  Replace magic mime type with handler name
  Add notes to CacheNegotiatedDocs and LanguagePriority about HTTP/1.1
  
  Revision  Changes    Path
  1.3       +23 -13    apache/htdocs/manual/mod/mod_negotiation.html
  
  Index: mod_negotiation.html
  ===================================================================
  RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_negotiation.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -C3 -r1.2 -r1.3
  *** mod_negotiation.html	1996/11/21 10:30:52	1.2
  --- mod_negotiation.html	1996/11/26 09:23:51	1.3
  ***************
  *** 8,18 ****
    <!--#include virtual="header.html" -->
    <H1>Module mod_negotiation</h1>
    
  ! This module is contained in the <code>mod_negotiation.c</code> file, and
  ! is compiled in by default. It provides for
  ! <A HREF="content-negotiation.html">content negotiation</A>. Any document with
  ! mime type <code>application/x-type-map</code> will be processed by this module.
  ! <!--%plaintext &lt;?INDEX {\tt application/x-type-map} mime type&gt; -->
    
    <h2>Summary</h2>
    Content negotiation, or more accurately content selection, is the
  --- 8,16 ----
    <!--#include virtual="header.html" -->
    <H1>Module mod_negotiation</h1>
    
  ! This module is contained in the <code>mod_negotiation.c</code> file,
  ! and is compiled in by default. It provides for <A
  ! HREF="../content-negotiation.html">content negotiation</A>. 
    
    <h2>Summary</h2>
    Content negotiation, or more accurately content selection, is the
  ***************
  *** 20,26 ****
    capabilities, from one of several available documents.
    There are two implementations of this.
    <ul>
  ! <li> A type map (a file with the mime type <code>application/x-type-map</code>)
    which explicitly lists the files containing the variants.
    <li> A MultiViews search (enabled by the MultiViews
    <A HREF="core.html#options">Option</A>, where the server does an implicit
  --- 18,24 ----
    capabilities, from one of several available documents.
    There are two implementations of this.
    <ul>
  ! <li> A type map (a file with the handler <code>type-map</code>)
    which explicitly lists the files containing the variants.
    <li> A MultiViews search (enabled by the MultiViews
    <A HREF="core.html#options">Option</A>, where the server does an implicit
  ***************
  *** 37,44 ****
    name, which always ends in a colon, followed by a value. Whitespace is allowed
    between the header name and value, and between the tokens of value.
    
  ! The headers
  ! allowed are:
    
    <dl>
    <dt>Content-Encoding:
  --- 35,41 ----
    name, which always ends in a colon, followed by a value. Whitespace is allowed
    between the header name and value, and between the tokens of value.
    
  ! The headers allowed are:
    
    <dl>
    <dt>Content-Encoding:
  ***************
  *** 98,108 ****
    <strong>Compatibility:</strong> CacheNegotiatedDocs is only available
    in Apache 1.1 and later.<p>
    
  ! <p>If set, this directive allows content-negotiated documents to be cached
  ! by
  ! proxy servers. This could mean that clients behind those proxys could
  ! retrieve versions of the documents that are not the best match for
  ! their abilities, but it will make caching more efficient.</p>
    
    
    <A name="languagepriority"><h2>LanguagePriority</h2></A>
  --- 95,112 ----
    <strong>Compatibility:</strong> CacheNegotiatedDocs is only available
    in Apache 1.1 and later.<p>
    
  ! <p>If set, this directive allows content-negotiated documents to be
  ! cached by proxy servers. This could mean that clients behind those
  ! proxys could retrieve versions of the documents that are not the best
  ! match for their abilities, but it will make caching more
  ! efficient.
  ! <p>
  ! 
  ! This directive only applies to requests which come from HTTP/1.0 browsers.
  ! HTTP/1.1 provides much better control over the caching of negotiated
  ! documents, and this directive has no effect in responses to 
  ! HTTP/1.1 requests.
  ! 
    
    
    <A name="languagepriority"><h2>LanguagePriority</h2></A>
  ***************
  *** 123,128 ****
  --- 127,138 ----
    For a request for <code>foo.html</code>, where <code>foo.html.fr</code>
    and <code>foo.html.de</code> both existed, but the browser did not express
    a language preference, then <code>foo.html.fr</code> would be returned.<p>
  + 
  + <P>
  + 
  + Note that this directive only has an effect if a 'best' language
  + cannot be determined by other any other means. Correctly implemented
  + HTTP/1.1 requests will mean this directive has no effect. 
    
    <!--#include virtual="footer.html" -->
    </BODY>