From: Andre Malo Date: Tue, 17 Dec 2002 18:29:13 +0000 (+0000) Subject: - markup & reformatting X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91e2d3af3fd4f672de613c0b7522edf9083788f4;p=apache - markup & reformatting - changed overloaded s to (hopefully) better ones - added rather specialized s to the directive descriptions - one may specify more than one language in the content-language header git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97979 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_negotiation.xml b/docs/manual/mod/mod_negotiation.xml index 8b3d454e98..82dbbed2a6 100644 --- a/docs/manual/mod/mod_negotiation.xml +++ b/docs/manual/mod/mod_negotiation.xml @@ -21,21 +21,19 @@ type-map) which explicitly lists the files containing the variants. -
  • A MultiViews search (enabled by the MultiViews Options, where the server does an - implicit filename pattern match, and choose from amongst the +
  • A MultiViews search (enabled by the MultiViews + Options), where the server does + an implicit filename pattern match, and choose from amongst the results.
    • - -DefaultLanguage -AddEncoding -AddLanguage -AddType -MultiViewsMatch +Options +mod_mime +Content +Negotiation
    Type maps -

    A type map has the same format as RFC822 mail headers. It +

    A type map has a format similar to RFC822 mail headers. It contains document descriptions separated by blank lines, with lines beginning with a hash character ('#') treated as comments. A document description consists of several header @@ -47,8 +45,7 @@ and between the tokens of value. The headers allowed are:

    -
    Content-Encoding:
    - +
    Content-Encoding:
    The encoding of the file. Apache only recognizes encodings that are defined by an AddEncoding directive. @@ -57,18 +54,18 @@ files. The x- prefix is ignored for encoding comparisons.
    -
    Content-Language:
    - -
    The language of the variant, as an Internet standard - language tag (RFC 1766). An example is en, - meaning English.
    - -
    Content-Length:
    +
    Content-Language:
    +
    The language(s) of the variant, as an Internet standard + language tag (RFC 1766). An example is en, + meaning English. If the variant contains more than one + language, they are separated by a comma.
    +
    Content-Length:
    The length of the file, in bytes. If this header is not present, then the actual length of the file is used.
    -
    Content-Type:
    +
    Content-Type:
    The MIME media type of the document, with optional @@ -77,14 +74,12 @@ name=value. Common parameters include:
    -
    level
    - +
    level
    an integer specifying the version of the media type. For text/html this defaults to 2, otherwise 0.
    -
    qs
    - +
    qs
    a floating-point number with a value in the range 0.0 to 1.0, indicating the relative 'quality' of this variant compared to the other available variants, independent of @@ -93,16 +88,16 @@ is attempting to represent a photograph. However, if the resource being represented is ascii art, then an ascii file would have a higher source quality than a jpeg file. - All qs values are therefore specific to a given + All qs values are therefore specific to a given resource.
    - Example: -Content-Type: image/jpeg; qs=0.8 + Example + Content-Type: image/jpeg; qs=0.8 +
    -
    URI:
    - +
    URI:
    uri of the file containing the variant (of the given media type, encoded with the given content encoding). These are interpreted as URLs relative to the map file; they must @@ -110,34 +105,30 @@ which the client would be granted access if they were to be requested directly.
    -
    Body:
    - -

    New in Apache 2.0, the actual content of the resource may +

    Body:
    +
    New in Apache 2.0, the actual content of the resource may be included in the type-map file using the Body header. This header must contain a string that designates a delimiter for - the body content. Then all following lines in the type map + the body content. Then all following lines in the type map file will be considered part of the resource body until the - delimiter string is found.

    - -

    Example:

    - -Body:----xyz----
    -<html>
    -<body>
    -<p>Content of the page.</p>
    -</body>
    -</html>
    -----xyz---- -     + delimiter string is found. + + Example: + Body:----xyz----
    + <html>
    + <body>
    + <p>Content of the page.</p>
    + </body>
    + </html>
    + ----xyz---- +
    -
    - MultiViews - -

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

    MultiViews +

    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 @@ -152,8 +143,8 @@ Body:----xyz----
    CacheNegotiatedDocs Allows content-negotiated documents to be cached by proxy servers -CacheNegotiatedDocs on|off -CacheNegotiatedDocs off +CacheNegotiatedDocs On|Off +CacheNegotiatedDocs Off server configvirtual host The syntax changed in version 2.0. @@ -183,11 +174,8 @@ cached by proxy servers found ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback] ForceLanguagePriority Prefer -server config -virtual host -directory -.htaccess - +server configvirtual host +directory.htaccess FileInfo Available in version 2.0.30 and later @@ -202,56 +190,59 @@ found LanguagePriority to serve a one valid result, rather 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 the first matching - variant, en, will be served.

    + given, and the user's Accept-Language header assigned + en and de each as quality .500 + (equally acceptable) then the first matching variant, en, + will be served.

    - + LanguagePriority en fr de
    ForceLanguagePriority Prefer -     +

    ForceLanguagePriority Fallback uses - LanguagePriority to serve a valid result, rather than - returning an HTTP result 406 (NOT ACCEPTABLE). If the directives - below were given, and the user's Accept-Language only permitted an - es language response, but such a variant isn't found, then the - first variant from the LanguagePriority list below will be - served.

    - - + LanguagePriority to + serve a valid result, rather than returning an HTTP result 406 + (NOT ACCEPTABLE). If the directives below were given, and the user's + Accept-Language only permitted an es + language response, but such a variant isn't found, then the first + variant from the LanguagePriority list below will be served.

    + + LanguagePriority en fr de
    ForceLanguagePriority Fallback -     - -

    Both options, Prefer and Fallback, may be specified, so either the - first matching variant from LanguagePriority will be served if more - 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.

    +     + +

    Both options, Prefer and Fallback, may be + specified, so either the first matching variant from LanguagePriority will be served if + more than one variant is acceptable, or first available document will + be served if none of the variants matched the client's acceptable list + of languages.

    +AddLanguage LanguagePriority The precendence of language variants for cases where the client does not express a preference -LanguagePriority MIME-lang [MIME-lang] ... -server config -virtual host -directory -.htaccess - +LanguagePriority MIME-lang [MIME-lang] +... +server configvirtual host +directory.htaccess FileInfo

    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 - of MIME-lang are in order of decreasing preference. - Example:

    + of MIME-lang are in order of decreasing preference.

    -LanguagePriority en fr de + Example: + LanguagePriority en fr de +

    For a request for foo.html, where foo.html.fr and foo.html.de both @@ -264,6 +255,7 @@ the client does not express a preference is not None. Correctly implemented HTTP/1.1 requests will mean this directive has no effect.

     +AddLanguage