From 09f2e87e2b274826461bb9919f1092f58c213dd8 Mon Sep 17 00:00:00 2001 From: Andre Malo Date: Tue, 17 Dec 2002 18:34:31 +0000 Subject: [PATCH] update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97981 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_negotiation.html.en | 146 ++++++++++++------------ docs/manual/mod/quickreference.html.en | 5 +- 2 files changed, 78 insertions(+), 73 deletions(-) diff --git a/docs/manual/mod/mod_negotiation.html.en b/docs/manual/mod/mod_negotiation.html.en index 902187fcc1..a640022f1b 100644 --- a/docs/manual/mod/mod_negotiation.html.en +++ b/docs/manual/mod/mod_negotiation.html.en @@ -36,8 +36,9 @@ 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.
    • @@ -53,16 +54,15 @@
  • MultiViews

    • See also

    top

    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 @@ -74,8 +74,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. This normally includes the encodings x-compress @@ -83,18 +82,17 @@ 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 @@ -103,14 +101,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 @@ -119,16 +115,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 @@ -136,33 +132,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---- +

    top

    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 @@ -177,8 +170,8 @@ Body:----xyz----
    - - + + @@ -223,41 +216,47 @@ foundLanguagePriority 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.

    +

    See also

    +
    top

    LanguagePriority Directive

    Description:Allows content-negotiated documents to be cached by proxy servers
    Syntax:CacheNegotiatedDocs on|off
    Default:CacheNegotiatedDocs off
    Syntax:CacheNegotiatedDocs On|Off
    Default:CacheNegotiatedDocs Off
    Context:server config, virtual host
    Status:Base
    Module:mod_negotiation
    - + @@ -266,10 +265,11 @@ the client does not express a preference

    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 @@ -281,6 +281,10 @@ the client does not express a preference is not None. Correctly implemented HTTP/1.1 requests will mean this directive has no effect.

    +

    See also

    + - @@ -350,7 +350,8 @@ extensions - -- 2.50.1
    Description:The precendence of language variants for cases where the client does not express a preference
    Syntax:LanguagePriority MIME-lang [MIME-lang] ...
    Syntax:LanguagePriority MIME-lang [MIME-lang] +...
    Context:server config, virtual host, directory, .htaccess
    Override:FileInfo
    Status:Base
    CacheMinFileSize bytes 1 svX
    The minimum size (in bytes) of a document to be placed in the cache
    CacheNegotiatedDocs on|off off svB
    Allows content-negotiated documents to be +
    CacheNegotiatedDocs On|Off Off svB
    Allows content-negotiated documents to be cached by proxy servers
    CacheRoot directorysvX
    The directory root under which cache files are stored
    KeepAlive on|off On svC
    Enables HTTP persistent connections
    KeepAliveTimeout seconds 15 svC
    Amount of time the server will wait for subsequent requests on a persistent connection
    LanguagePriority MIME-lang [MIME-lang] ...svdhB
    The precendence of language variants for cases where +
    LanguagePriority MIME-lang [MIME-lang] +...svdhB
    The precendence of language variants for cases where the client does not express a preference
    LDAPCacheEntries number 1024 sX
    Maximum number of entires in the primary LDAP cache
    LDAPCacheTTL seconds 600 sX
    Time that cached items remain valid