From: Yoshiki Hayashi Date: Wed, 31 Jul 2002 08:17:52 +0000 (+0000) Subject: Fix typo. X-Git-Tag: 2.0.40~62 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2591f7007019cd5fe4bf76dbd1fc61b64641a80d;p=apache Fix typo. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96257 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_negotiation.html.en b/docs/manual/mod/mod_negotiation.html.en index 5f8a3b5b51..ed1b4aa873 100644 --- a/docs/manual/mod/mod_negotiation.html.en +++ b/docs/manual/mod/mod_negotiation.html.en @@ -1,8 +1,11 @@ -mod_negotiation- Apache HTTP Server
[APACHE DOCUMENTATION]

Apache HTTP Server Version 2.0

Apache Module mod_negotiation

Description:Provides for content negotiation
Status:Base
Module Identifier:negotiation_module

Summary

+mod_negotiation - Apache HTTP Server
[APACHE DOCUMENTATION]

Apache HTTP Server Version 2.0

Apache Module mod_negotiation

Description: + Provides for content negotiation
Status: + Base
Module Identifier: + negotiation_module

Summary

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 @@ type-map) which explicitly lists the files containing the variants. -

  • A MultiViews search (enabled by the MultiViews Options, where the server does an +
  • A MultiViews search (enabled by the MultiViews Options, where the server does an implicit filename pattern match, and choose from amongst the results.
    • -

    Directives

    See also

    Type maps

    +

    Directives

    See also

    Type maps

    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 @@

    Content-Encoding:
    The encoding of the file. Apache only recognizes - encodings that are defined by an AddEncoding directive. + encodings that are defined by an AddEncoding directive. This normally includes the encodings x-compress for compress'd files, and x-gzip for gzip'd files. The x- prefix is ignored for encoding @@ -115,7 +118,7 @@ Body:----xyz----

    MultiViews

    -

    A MultiViews search is enabled by the MultiViews Options. If the server receives a +

    A MultiViews search is enabled by the MultiViews Options. If the server receives a request for /some/dir/foo and /some/dir/foo does not exist, then the server reads the directory looking for all files named @@ -124,8 +127,15 @@ Body:----xyz----
    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.

    -

    CacheNegotiatedDocs Directive

    Description: Allows content-negotiated documents to be -cached by proxy servers
    Syntax:CacheNegotiatedDocs on|off
    Default:CacheNegotiatedDocs off
    Context:server config
    Status:Base
    Module:mod_negotiation
    Compatibility:The syntax changed in version 2.0.
    +

    CacheNegotiatedDocs Directive

    Description: + Allows content-negotiated documents to be +cached by proxy servers
    Syntax: + CacheNegotiatedDocs on|off
    Default: + CacheNegotiatedDocs off
    Context: + server config
    Status: + Base
    Module: + mod_negotiation
    Compatibility: + The syntax changed in version 2.0.

    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 @@ cached by proxy serversCacheNegotiatedDocs did not take an argument; it was turned on by the presence of the directive by itself.

    -

    ForceLanguagePriority Directive

    Description: Action to take if a single acceptable document is not -found
    Syntax:ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]
    Default:ForceLanguagePriority Prefer
    Context:server config, virtual host, directory, .htaccess
    Override:FileInfo
    Status:Base
    Module:mod_negotiation
    Compatibility:Available in version 2.0.30 and later
    +

    ForceLanguagePriority Directive

    Description: + Action to take if a single acceptable document is not +found
    Syntax: + ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]
    Default: + ForceLanguagePriority Prefer
    Context: + server config, virtual host, directory, .htaccess
    Override: + FileInfo
    Status: + Base
    Module: + mod_negotiation
    Compatibility: + Available in version 2.0.30 and later

    The ForceLanguagePriority directive uses the given LanguagePriority to satisfy negotation where the server could otherwise not return a single @@ -153,7 +171,7 @@ found

    @@ -179,8 +197,14 @@ found
    -

    LanguagePriority Directive

    Description: The precendence of language variants for cases where -the client does not express a preference
    Syntax:LanguagePriority MIME-lang [MIME-lang] ...
    Context:server config, virtual host, directory, .htaccess
    Override:FileInfo
    Status:Base
    Module:mod_negotiation
    +

    LanguagePriority Directive

    Description: + The precendence of language variants for cases where +the client does not express a preference
    Syntax: + LanguagePriority MIME-lang [MIME-lang] ...
    Context: + server config, virtual host, directory, .htaccess
    Override: + FileInfo
    Status: + Base
    Module: + mod_negotiation

    The LanguagePriority sets the precedence of language variants for the case where the client does not express a preference, when handling a MultiViews request. The list diff --git a/docs/manual/mod/mod_negotiation.xml b/docs/manual/mod/mod_negotiation.xml index a16372be99..b847facff0 100644 --- a/docs/manual/mod/mod_negotiation.xml +++ b/docs/manual/mod/mod_negotiation.xml @@ -201,7 +201,7 @@ found 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.