httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yosh...@apache.org
Subject cvs commit: httpd-2.0/docs/manual/mod mod_negotiation.html.en mod_negotiation.xml
Date Wed, 31 Jul 2002 08:17:52 GMT
yoshiki     2002/07/31 01:17:52

  Modified:    docs/manual/mod mod_negotiation.html.en mod_negotiation.xml
  Log:
  Fix typo.
  
  Revision  Changes    Path
  1.6       +40 -16    httpd-2.0/docs/manual/mod/mod_negotiation.html.en
  
  Index: mod_negotiation.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_negotiation.html.en,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_negotiation.html.en	23 Jul 2002 17:46:39 -0000	1.5
  +++ mod_negotiation.html.en	31 Jul 2002 08:17:52 -0000	1.6
  @@ -1,8 +1,11 @@
  -<html xmlns="http://www.w3.org/TR/xhtml1/strict"><head><!-- 
  -          XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  -                This file is generated from xml source: DO NOT EDIT
  -          XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  -        --><title>mod_negotiation- Apache HTTP Server</title><link href="../style/manual.css"
type="text/css" rel="stylesheet"/></head><body><blockquote><div align="center"><img
src="../images/sub.gif" alt="[APACHE DOCUMENTATION]"/><h3>Apache HTTP Server Version
2.0</h3></div><h1 align="center">Apache Module mod_negotiation</h1><table
cellspacing="1" cellpadding="0" bgcolor="#cccccc"><tr><td><table bgcolor="#ffffff"><tr><td
nowrap="nowrap" valign="top"><span class="help">Description:</span></td><td>Provides
for <a href="../content-negotiation.html">content negotiation</a></td></tr><tr><td
nowrap="nowrap"><a href="module-dict.html#Status" class="help">Status:</a></td><td>Base</td></tr><tr><td
nowrap="nowrap"><a href="module-dict.html#ModuleIdentifier" class="help">Module&nbsp;Identifier:</a></td><td>negotiation_module</td></tr></table></td></tr></table><h2>Summary</h2>
  +<html xmlns="http://www.w3.org/TR/xhtml1/strict"><head><!--
  +        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  +              This file is generated from xml source: DO NOT EDIT
  +        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  +      --><title>mod_negotiation - Apache HTTP Server</title><link href="../style/manual.css"
type="text/css" rel="stylesheet"/></head><body><blockquote><div align="center"><img
src="../images/sub.gif" alt="[APACHE DOCUMENTATION]"/><h3>Apache HTTP Server Version
2.0</h3></div><h1 align="center">Apache Module mod_negotiation</h1><table
cellspacing="1" cellpadding="0" bgcolor="#cccccc"><tr><td><table bgcolor="#ffffff"><tr><td
nowrap="nowrap" valign="top"><span class="help">Description:
  +                      </span></td><td>Provides for <a href="../content-negotiation.html">content
negotiation</a></td></tr><tr><td nowrap="nowrap"><a href="module-dict.html#Status"
class="help">Status:
  +                      </a></td><td>Base</td></tr><tr><td
nowrap="nowrap"><a href="module-dict.html#ModuleIdentifier" class="help">Module&nbsp;Identifier:
  +                        </a></td><td>negotiation_module</td></tr></table></td></tr></table><h2>Summary</h2>
       <p>Content negotiation, or more accurately content selection, is
       the selection of the document that best matches the clients
       capabilities, from one of several available documents. There
  @@ -13,11 +16,11 @@
         <code>type-map</code>) which explicitly lists the files
         containing the variants.</li>
   
  -      <li>A MultiViews search (enabled by the MultiViews <a href="core.html#options"
class="directive"><code class="directive">Options</code></a>, where the
server does an
  +      <li>A MultiViews search (enabled by the MultiViews <a href="../mod/core.html#options"
class="directive"><code class="directive">Options</code></a>, where the
server does an
         implicit filename pattern match, and choose from amongst the
         results.</li>
       </ul>
  -<h2>Directives</h2><ul><li><a href="#cachenegotiateddocs">CacheNegotiatedDocs</a></li><li><a
href="#forcelanguagepriority">ForceLanguagePriority</a></li><li><a
href="#languagepriority">LanguagePriority</a></li></ul><p><strong>See
also </strong></p><ul><li><a href="mod_mime.html#defaultlanguage"
class="directive"><code class="directive">DefaultLanguage</code></a></li><li><a
href="mod_mime.html#addencoding" class="directive"><code class="directive">AddEncoding</code></a></li><li><a
href="mod_mime.html#addlanguage" class="directive"><code class="directive">AddLanguage</code></a></li><li><a
href="mod_mime.html#addtype" class="directive"><code class="directive">AddType</code></a></li><li><a
href="mod_mime.html#multiviewsmatch" class="directive"><code class="directive">MultiViewsMatch</code></a></li></ul><h2><a
name="typemaps">Type maps</a></h2>
  +<h2>Directives</h2><ul><li><a href="#cachenegotiateddocs">CacheNegotiatedDocs</a></li><li><a
href="#forcelanguagepriority">ForceLanguagePriority</a></li><li><a
href="#languagepriority">LanguagePriority</a></li></ul><p><strong>See
also </strong></p><ul><li><a href="../mod/mod_mime.html#defaultlanguage"
class="directive"><code class="directive">DefaultLanguage</code></a></li><li><a
href="../mod/mod_mime.html#addencoding" class="directive"><code class="directive">AddEncoding</code></a></li><li><a
href="../mod/mod_mime.html#addlanguage" class="directive"><code class="directive">AddLanguage</code></a></li><li><a
href="../mod/mod_mime.html#addtype" class="directive"><code class="directive">AddType</code></a></li><li><a
href="../mod/mod_mime.html#multiviewsmatch" class="directive"><code class="directive">MultiViewsMatch</code></a></li></ul><h2><a
name="typemaps">Type maps</a></h2>
       <p>A type map has the same format as RFC822 mail headers. It
       contains document descriptions separated by blank lines, with
       lines beginning with a hash character ('#') treated as
  @@ -33,7 +36,7 @@
         <dt>Content-Encoding:</dt>
   
         <dd>The encoding of the file. Apache only recognizes
  -      encodings that are defined by an <a href="mod_mime.html#addencoding" class="directive"><code
class="directive">AddEncoding</code></a> directive.
  +      encodings that are defined by an <a href="../mod/mod_mime.html#addencoding" class="directive"><code
class="directive">AddEncoding</code></a> directive.
         This normally includes the encodings <code>x-compress</code>
         for compress'd files, and <code>x-gzip</code> for gzip'd
         files. The <code>x-</code> prefix is ignored for encoding
  @@ -115,7 +118,7 @@
       </dl>
   <h2>MultiViews</h2>
   
  -    <p>A MultiViews search is enabled by the MultiViews <a href="core.html#options"
class="directive"><code class="directive">Options</code></a>. If the
server receives a
  +    <p>A MultiViews search is enabled by the MultiViews <a href="../mod/core.html#options"
class="directive"><code class="directive">Options</code></a>. If the
server receives a
       request for <code>/some/dir/foo</code> and
       <code>/some/dir/foo</code> does <em>not</em> exist, then the
       server reads the directory looking for all files named
  @@ -124,8 +127,15 @@
       content-encodings it would have if the client had asked for one
       of them by name. It then chooses the best match to the client's
       requirements, and returns that document.</p>
  -<hr/><h2><a name="CacheNegotiatedDocs">CacheNegotiatedDocs</a>
<a name="cachenegotiateddocs">Directive</a></h2><table cellpadding="1"
cellspacing="0" border="0" bgcolor="#cccccc"><tr><td><table bgcolor="#ffffff"><tr><td
nowrap="nowrap"><strong>Description: </strong></td><td>Allows content-negotiated
documents to be 
  -cached by proxy servers</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Syntax" class="help">Syntax:</a></td><td>CacheNegotiatedDocs
on|off</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Default"
class="help">Default:</a></td><td><code>CacheNegotiatedDocs off</code></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:</a></td><td>server
config</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Status"
class="help">Status:</a></td><td>Base</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:</a></td><td>mod_negotiation</td></tr><tr><td
nowrap="nowrap" align="left" valign="top"><a href="directive-dict.html#Compatibility"
class="help">Compatibility:</a></td><td>The syntax changed in version
2.0.</td></tr></table></td></tr></table>
  +<hr/><h2><a name="CacheNegotiatedDocs">CacheNegotiatedDocs</a>
<a name="cachenegotiateddocs">Directive</a></h2><table cellpadding="1"
cellspacing="0" border="0" bgcolor="#cccccc"><tr><td><table bgcolor="#ffffff"><tr><td
nowrap="nowrap"><strong>Description: 
  +                  </strong></td><td>Allows content-negotiated documents
to be 
  +cached by proxy servers</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Syntax" class="help">Syntax:
  +                  </a></td><td>CacheNegotiatedDocs on|off</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Default" class="help">Default: 
  +                    </a></td><td><code>CacheNegotiatedDocs off</code></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
  +                  </a></td><td>server config</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
  +                  </a></td><td>Base</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
  +                  </a></td><td>mod_negotiation</td></tr><tr><td
nowrap="nowrap" align="left" valign="top"><a href="directive-dict.html#Compatibility"
class="help">Compatibility:
  +                    </a></td><td>The syntax changed in version 2.0.</td></tr></table></td></tr></table>
       <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
  @@ -141,8 +151,16 @@
       <code class="directive">CacheNegotiatedDocs</code> did not take an
       argument; it was turned on by the presence of the directive by
       itself.</p>
  -<hr/><h2><a name="ForceLanguagePriority">ForceLanguagePriority</a>
<a name="forcelanguagepriority">Directive</a></h2><table cellpadding="1"
cellspacing="0" border="0" bgcolor="#cccccc"><tr><td><table bgcolor="#ffffff"><tr><td
nowrap="nowrap"><strong>Description: </strong></td><td>Action to
take if a single acceptable document is not 
  -found</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax"
class="help">Syntax:</a></td><td>ForceLanguagePriority None|Prefer|Fallback
[Prefer|Fallback]</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Default"
class="help">Default:</a></td><td><code>ForceLanguagePriority Prefer</code></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:</a></td><td>server
config, virtual host, directory, .htaccess</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Override" class="help">Override:</a></td><td>FileInfo</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:</a></td><td>Base</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:</a></td><td>mod_negotiation</td></tr><tr><td
nowrap="nowrap" align="left" valign="top"><a href="directive-dict.html#Compatibility"
class="help">Compatibility:</a></td><td>Available in version 2.0.30 and
later</td></tr></table></td></tr></table>
  +<hr/><h2><a name="ForceLanguagePriority">ForceLanguagePriority</a>
<a name="forcelanguagepriority">Directive</a></h2><table cellpadding="1"
cellspacing="0" border="0" bgcolor="#cccccc"><tr><td><table bgcolor="#ffffff"><tr><td
nowrap="nowrap"><strong>Description: 
  +                  </strong></td><td>Action to take if a single acceptable
document is not 
  +found</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax"
class="help">Syntax:
  +                  </a></td><td>ForceLanguagePriority None|Prefer|Fallback
[Prefer|Fallback]</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Default"
class="help">Default: 
  +                    </a></td><td><code>ForceLanguagePriority Prefer</code></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
  +                  </a></td><td>server config, virtual host, directory,
.htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override"
class="help">Override:
  +                    </a></td><td>FileInfo</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
  +                  </a></td><td>Base</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
  +                  </a></td><td>mod_negotiation</td></tr><tr><td
nowrap="nowrap" align="left" valign="top"><a href="directive-dict.html#Compatibility"
class="help">Compatibility:
  +                    </a></td><td>Available in version 2.0.30 and later</td></tr></table></td></tr></table>
       <p>The <code class="directive">ForceLanguagePriority</code> directive
uses
       the given <a href="#languagepriority" class="directive"><code class="directive">LanguagePriority</code></a>
to satisfy
       negotation where the server could otherwise not return a single
  @@ -153,7 +171,7 @@
       than returning an HTTP result 300 (MULTIPLE CHOICES) when there
       are several equally valid choices.  If the directives below were
       given, and the user's Accept-Language header assigned en and de
  -    each as quality .500 (equally acceptable) then then first matching
  +    each as quality .500 (equally acceptable) then the first matching
       variant, en, will be served.</p>
   
   <blockquote><table cellpadding="10"><tr><td bgcolor="#eeeeee"><code>
  @@ -179,8 +197,14 @@
       that one variant is acceptable, or first available document will be
       served if none of the variants matched the client's acceptable list of
       languages.</p>
  -<hr/><h2><a name="LanguagePriority">LanguagePriority</a> <a
name="languagepriority">Directive</a></h2><table cellpadding="1" cellspacing="0"
border="0" bgcolor="#cccccc"><tr><td><table bgcolor="#ffffff"><tr><td
nowrap="nowrap"><strong>Description: </strong></td><td>The precendence
of language variants for cases where
  -the client does not express a preference</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Syntax" class="help">Syntax:</a></td><td>LanguagePriority
<em>MIME-lang</em> [<em>MIME-lang</em>] ...</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:</a></td><td>server
config, virtual host, directory, .htaccess</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Override" class="help">Override:</a></td><td>FileInfo</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:</a></td><td>Base</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:</a></td><td>mod_negotiation</td></tr></table></td></tr></table>
  +<hr/><h2><a name="LanguagePriority">LanguagePriority</a> <a
name="languagepriority">Directive</a></h2><table cellpadding="1" cellspacing="0"
border="0" bgcolor="#cccccc"><tr><td><table bgcolor="#ffffff"><tr><td
nowrap="nowrap"><strong>Description: 
  +                  </strong></td><td>The precendence of language variants
for cases where
  +the client does not express a preference</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Syntax" class="help">Syntax:
  +                  </a></td><td>LanguagePriority <em>MIME-lang</em>
[<em>MIME-lang</em>] ...</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Context" class="help">Context:
  +                  </a></td><td>server config, virtual host, directory,
.htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override"
class="help">Override:
  +                    </a></td><td>FileInfo</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
  +                  </a></td><td>Base</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
  +                  </a></td><td>mod_negotiation</td></tr></table></td></tr></table>
       <p>The <code class="directive">LanguagePriority</code> sets the precedence
       of language variants for the case where the client does not
       express a preference, when handling a MultiViews request. The list
  
  
  
  1.7       +1 -1      httpd-2.0/docs/manual/mod/mod_negotiation.xml
  
  Index: mod_negotiation.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_negotiation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_negotiation.xml	29 May 2002 16:26:43 -0000	1.6
  +++ mod_negotiation.xml	31 Jul 2002 08:17:52 -0000	1.7
  @@ -201,7 +201,7 @@
       than returning an HTTP result 300 (MULTIPLE CHOICES) when there
       are several equally valid choices.  If the directives below were
       given, and the user's Accept-Language header assigned en and de
  -    each as quality .500 (equally acceptable) then then first matching
  +    each as quality .500 (equally acceptable) then the first matching
       variant, en, will be served.</p>
   
   <example>
  
  
  

Mime
View raw message