From: Joshua Slive Date: Wed, 21 Sep 2005 20:11:21 +0000 (+0000) Subject: Add tag for mime-type where appropriate. X-Git-Tag: 2.3.0~2958 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ea4eb418b9ca268253588f71314784d2ab7d5d4;p=thirdparty%2Fapache%2Fhttpd.git Add tag for mime-type where appropriate. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290816 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml index 500511403dc..febc707a750 100644 --- a/docs/manual/content-negotiation.xml +++ b/docs/manual/content-negotiation.xml @@ -112,13 +112,13 @@
Using a type-map file -

A type map is a document which is associated with the - handler named type-map (or, for - backwards-compatibility with older Apache configurations, the - MIME type application/x-type-map). Note that to - use this feature, you must have a handler set in the - configuration that defines a file suffix as - type-map; this is best done with

+

A type map is a document which is associated with the handler + named type-map (or, for backwards-compatibility with + older Apache configurations, the MIME-type + application/x-type-map). Note that to use this + feature, you must have a handler set in the configuration that + defines a file suffix as type-map; this is best done + with

AddHandler type-map .var diff --git a/docs/manual/howto/cgi.xml b/docs/manual/howto/cgi.xml index b80c9e784ec..8ead2795533 100644 --- a/docs/manual/howto/cgi.xml +++ b/docs/manual/howto/cgi.xml @@ -202,7 +202,7 @@ programming, and CGI programming.

First, all output from your CGI program must be preceded by - a MIME-type header. This is HTTP header that tells the client + a MIME-type header. This is HTTP header that tells the client what sort of content it is receiving. Most of the time, this will look like:

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 7e32546b73c..4f10298cb78 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -247,7 +247,7 @@ content-type is text/plain or text/html

This directive activates a particular output filter for a request depending on the - response MIME-type.

+ response MIME-type.

The following example uses the DEFLATE filter, which is provided by mod_deflate. It will compress all @@ -281,7 +281,7 @@ content-type is text/plain or text/html Note

Enabling filters with AddOutputFilterByType may fail partially or completely in some cases. For example, no - filters are applied if the MIME-type could not be determined and falls + filters are applied if the MIME-type could not be determined and falls back to the DefaultType setting, even if the DefaultType is the same.

@@ -582,8 +582,8 @@ server cannot determine a type in any other way

There will be times when the server is asked to provide a - document whose type cannot be determined by its MIME types - mappings.

+ document whose type cannot be determined by its MIME types mappings.

The server must inform the client of the content-type of the document, so in the event of an unknown type it uses the diff --git a/docs/manual/mod/mod_actions.xml b/docs/manual/mod/mod_actions.xml index 4dfb90d4860..235981bf1c9 100644 --- a/docs/manual/mod/mod_actions.xml +++ b/docs/manual/mod/mod_actions.xml @@ -34,12 +34,12 @@ media type or request method.

This module has two directives. The Action directive lets you run CGI - scripts whenever a file of a certain MIME content type is requested. The + scripts whenever a file of a certain MIME content type is requested. The Script directive lets you run CGI scripts whenever a particular method is used in a request. This makes it much easier to execute scripts that process - files.

- + files.

mod_cgi Dynamic Content with CGI @@ -60,17 +60,18 @@ introduced in Apache 2.1

This directive adds an action, which will activate - cgi-script when action-type is triggered by the - request. The cgi-script is the URL-path to a resource - that has been designated as a CGI script using cgi-script when action-type is triggered by + the request. The cgi-script is the URL-path to a + resource that has been designated as a CGI script using ScriptAlias or AddHandler. The action-type can be either a handler or a MIME content type. It - sends the URL and file path of the requested document using the - standard CGI PATH_INFO and PATH_TRANSLATED - environment variables. The handler used for the particular request is - passed using the REDIRECT_HANDLER variable.

+ href="../handler.html">handler or a MIME content type. It sends the URL and + file path of the requested document using the standard CGI + PATH_INFO and PATH_TRANSLATED + environment variables. The handler used for the particular request + is passed using the REDIRECT_HANDLER variable.

Examples # Requests for files of a particular MIME content type:
diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml index 435e2604d3b..5f8355b0287 100644 --- a/docs/manual/mod/mod_include.xml +++ b/docs/manual/mod/mod_include.xml @@ -306,14 +306,14 @@
The include Element

This command inserts the text of another document or file - into the parsed file. Any included file is subject to the - usual access control. If the directory containing the - parsed file has Options - IncludesNOEXEC set, then only documents with - a text MIME type (text/plain, text/html - etc.) will be included. Otherwise CGI scripts are invoked as normal - using the complete URL given in the command, including any query - string.

+ into the parsed file. Any included file is subject to the usual + access control. If the directory containing the parsed file has + Options + IncludesNOEXEC set, then only documents with a text + MIME-type (text/plain, + text/html etc.) will be included. Otherwise CGI + scripts are invoked as normal using the complete URL given in + the command, including any query string.

An attribute defines the location of the document; the inclusion is done for each attribute given to the include @@ -757,7 +757,7 @@ set

The XBitHack directive controls the parsing of ordinary html documents. This directive only affects files associated - with the MIME type text/html. MIME-type text/html. XBitHack can take on the following values:

diff --git a/docs/manual/mod/mod_mime.xml b/docs/manual/mod/mod_mime.xml index b811495375e..1c372172e81 100644 --- a/docs/manual/mod/mod_mime.xml +++ b/docs/manual/mod/mod_mime.xml @@ -49,7 +49,7 @@ module="mod_mime">AddType are all used to map file extensions onto the meta-information for that file. Respectively they set the character set, content-encoding, content-language, - and MIME-type (content-type) of documents. The directive MIME-type (content-type) of documents. The directive TypesConfig is used to specify a file which also maps extensions onto MIME types.

@@ -103,14 +103,15 @@ module="mod_mime_magic">MimeMagicFile extensions is normally irrelevant. For example, if the file welcome.html.fr maps onto content type text/html and language French then the file - welcome.fr.html will map onto exactly the same information. - If more than one extension is given which maps onto the same - type of meta-information, then the one to the right will be - used, except for languages and content encodings. For example, if - .gif maps to the MIME-type image/gif and - .html maps to the MIME-type text/html, then the - file welcome.gif.html will be associated with the MIME-type - text/html.

+ welcome.fr.html will map onto exactly the same + information. If more than one extension is given which maps onto + the same type of meta-information, then the one to the right will + be used, except for languages and content encodings. For example, + if .gif maps to the MIME-type + image/gif and .html maps to the + MIME-type text/html, then the file + welcome.gif.html will be associated with the + MIME-type text/html.

Languages and content encodings are treated accumulative, because one can assign @@ -120,7 +121,7 @@ module="mod_mime_magic">MimeMagicFile text/html.

Care should be taken when a file with multiple extensions - gets associated with both a MIME-type and a handler. This will + gets associated with both a MIME-type and a handler. This will usually result in the request being by the module associated with the handler. For example, if the .imap extension is mapped to the handler imap-file (from @@ -134,7 +135,7 @@ module="mod_mime_magic">MimeMagicFile

Content encoding -

A file of a particular MIME type can additionally be encoded a +

A file of a particular MIME-type can additionally be encoded a particular way to simplify transmission over the Internet. While this usually will refer to compression, such as gzip, it can also refer to encryption, such a @@ -479,13 +480,15 @@ type FileInfo -

The AddType directive maps the given filename - extensions onto the specified content type. MIME-type is the - MIME type to use for filenames containing extension. This - mapping is added to any already in force, overriding any mappings that - already exist for the same extension. This directive can - be used to add mappings not listed in the MIME types file (see the - TypesConfig directive).

+

The AddType directive maps the given + filename extensions onto the specified content + type. MIME-type is the MIME + type to use for filenames containing + extension. This mapping is added to any already in + force, overriding any mappings that already exist for the same + extension. This directive can be used to add mappings + not listed in the MIME types file (see the TypesConfig directive).

Example AddType image/gif .gif @@ -823,11 +826,12 @@ extensions FileInfo -

The RemoveType directive removes any MIME - type associations for files with the given extensions. This allows - .htaccess files in subdirectories to undo any - associations inherited from parent directories or the server - config files. An example of its use might be:

+

The RemoveType directive removes any + MIME type associations for files with + the given extensions. This allows .htaccess files in + subdirectories to undo any associations inherited from parent + directories or the server config files. An example of its use + might be:

/foo/.htaccess: RemoveType .cgi @@ -858,20 +862,22 @@ extensions server config -

The TypesConfig directive sets the location - of the MIME types configuration file. File-path is relative - to the ServerRoot. This file sets +

The TypesConfig directive sets the + location of the MIME types + configuration file. File-path is relative to the + ServerRoot. This file sets the default list of mappings from filename extensions to content - types. Most administrators use the provided mime.types - file, which associates common filename extensions with IANA registered - content types. The current list is maintained at mime.types file, which associates common filename + extensions with IANA registered content types. The current list is + maintained at http://www.iana.org/assignments/media-types/index.html. - This simplifies the httpd.conf file by providing the + >http://www.iana.org/assignments/media-types/index.html. This + simplifies the httpd.conf file by providing the majority of media-type definitions, and may be overridden by AddType directives as - needed. You should not edit the mime.types file, because - it may be replaced when you upgrade your server.

+ needed. You should not edit the mime.types file, + because it may be replaced when you upgrade your server.

The file contains lines in the format of the arguments to an AddType directive:

diff --git a/docs/manual/mod/mod_mime_magic.xml b/docs/manual/mod/mod_mime_magic.xml index 70d00681506..53f88e5fc31 100644 --- a/docs/manual/mod/mod_mime_magic.xml +++ b/docs/manual/mod/mod_mime_magic.xml @@ -30,9 +30,10 @@ mime_magic_module -

This module determines the MIME type of files in the same - way the Unix file(1) command works: it looks at the first - few bytes of the file. It is intended as a "second line of defense" +

This module determines the MIME + type of files in the same way the Unix + file(1) command works: it looks at the first few + bytes of the file. It is intended as a "second line of defense" for cases that mod_mime can't resolve.

This module is derived from a free version of the diff --git a/docs/manual/mod/mod_negotiation.xml b/docs/manual/mod/mod_negotiation.xml index 8a16763d97b..4cec684c84e 100644 --- a/docs/manual/mod/mod_negotiation.xml +++ b/docs/manual/mod/mod_negotiation.xml @@ -88,10 +88,11 @@ Negotiation

Content-Type:
- The MIME media type of the document, with optional - parameters. Parameters are separated from the media type - and from one another by a semi-colon, with a syntax of - name=value. Common parameters include: + The MIME media type of + the document, with optional parameters. Parameters are + separated from the media type and from one another by a + semi-colon, with a syntax of name=value. Common + parameters include:
level
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml index d08d3c1c38d..42763cc0c7a 100644 --- a/docs/manual/mod/mod_rewrite.xml +++ b/docs/manual/mod/mod_rewrite.xml @@ -1474,7 +1474,7 @@ When using the NOT character
  • 'type|T=MIME-type' (force MIME type)
    - Force the MIME-type of the target file to be + Force the MIME-type of the target file to be MIME-type. For instance, this can be used to setup the content-type based on some conditions. For example, the following snippet allows .php files to diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml index cf59786a7a8..5ad7dad7ac4 100644 --- a/docs/manual/programs/configure.xml +++ b/docs/manual/programs/configure.xml @@ -370,10 +370,10 @@ to the server without this module.
    • --disable-mime
    -
    mod_mime associates the requested filename's - extensions with the file's behavior and content (mime-type, - language, character set and encoding). Disabling the mapping of - file-extensions to MIME is normally not recommended.
    +
    mod_mime associates the requested + filename's extensions with the file's behavior and content + (mime-type, language, character set and + encoding). Disabling this module is normally not recommended.
    --disable-negotiation
    Disable content negotiation provided by @@ -498,9 +498,11 @@
    Enable memory caching provided by mod_mem_cache.
    -
    --enable-mime-magic
    -
    Enable automatical determining of MIME types, which is provided by - mod_mime_magic.
    +
    --enable-mime-magic
    +
    Enable + automatical determining of MIME + types, which is provided by + mod_mime_magic.
    --enable-isapi
    Enable the isapi extension support provided by