httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r290817 - in /httpd/httpd/branches/2.2.x/docs/manual: ./ howto/ mod/ programs/
Date Wed, 21 Sep 2005 20:14:01 GMT
Author: slive
Date: Wed Sep 21 13:13:57 2005
New Revision: 290817

URL: http://svn.apache.org/viewcvs?rev=290817&view=rev
Log:
Merge r290816 from trunk:

Add <glossary> tag for mime-type where appropriate.


Modified:
    httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml
    httpd/httpd/branches/2.2.x/docs/manual/howto/cgi.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_actions.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_include.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime_magic.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_negotiation.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml
    httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml?rev=290817&r1=290816&r2=290817&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml Wed Sep 21 13:13:57 2005
@@ -112,13 +112,13 @@
 
    <section id="type-map"><title>Using a type-map file</title>
 
-    <p>A type map is a document which is associated with the
-    handler named <code>type-map</code> (or, for
-    backwards-compatibility with older Apache configurations, the
-    MIME type <code>application/x-type-map</code>). Note that to
-    use this feature, you must have a handler set in the
-    configuration that defines a file suffix as
-    <code>type-map</code>; this is best done with</p>
+    <p>A type map is a document which is associated with the handler
+    named <code>type-map</code> (or, for backwards-compatibility with
+    older Apache configurations, the <glossary>MIME-type</glossary>
+    <code>application/x-type-map</code>). Note that to use this
+    feature, you must have a handler set in the configuration that
+    defines a file suffix as <code>type-map</code>; this is best done
+    with</p>
 
 <example>AddHandler type-map .var</example>
 

Modified: httpd/httpd/branches/2.2.x/docs/manual/howto/cgi.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/howto/cgi.xml?rev=290817&r1=290816&r2=290817&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/howto/cgi.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/howto/cgi.xml Wed Sep 21 13:13:57 2005
@@ -202,7 +202,7 @@
     programming, and CGI programming.</p>
 
     <p>First, all output from your CGI program must be preceded by
-    a MIME-type header. This is HTTP header that tells the client
+    a <glossary>MIME-type</glossary> header. This is HTTP header that tells the
client
     what sort of content it is receiving. Most of the time, this
     will look like:</p>
 

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml?rev=290817&r1=290816&r2=290817&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml Wed Sep 21 13:13:57 2005
@@ -247,7 +247,7 @@
 <usage>
     <p>This directive activates a particular output <a
     href="../filter.html">filter</a> for a request depending on the
-    response MIME-type.</p>
+    response <glossary>MIME-type</glossary>.</p>
 
     <p>The following example uses the <code>DEFLATE</code> filter, which
     is provided by <module>mod_deflate</module>. It will compress all
@@ -281,7 +281,7 @@
     <note type="warning"><title>Note</title>
       <p>Enabling filters with <directive>AddOutputFilterByType</directive>
       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 <glossary>MIME-type</glossary> could not be
determined  and falls
       back to the <directive module="core">DefaultType</directive> setting,
       even if the <directive module="core">DefaultType</directive> is the
       same.</p>
@@ -582,8 +582,8 @@
 
 <usage>
     <p>There will be times when the server is asked to provide a
-    document whose type cannot be determined by its MIME types
-    mappings.</p>
+    document whose type cannot be determined by its <glossary
+    ref="mime-type">MIME types</glossary> mappings.</p>
 
     <p>The server must inform the client of the content-type of the
     document, so in the event of an unknown type it uses the

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_actions.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_actions.xml?rev=290817&r1=290816&r2=290817&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_actions.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_actions.xml Wed Sep 21 13:13:57 2005
@@ -34,12 +34,12 @@
 <summary>
     <p>This module has two directives. The <directive
     module="mod_actions">Action</directive> 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 <glossary
+    ref="mime-type">MIME content type</glossary> is requested. The
     <directive module="mod_actions">Script</directive> 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.</p>
-</summary>
+    files.</p> </summary>
 
 <seealso><module>mod_cgi</module></seealso>
 <seealso><a href="../howto/cgi.html">Dynamic Content with CGI</a></seealso>
@@ -60,17 +60,18 @@
 
 <usage>
     <p>This directive adds an action, which will activate
-    <var>cgi-script</var> when <var>action-type</var> is triggered
by the
-    request.  The <var>cgi-script</var> is the URL-path to a resource
-    that has been designated as a CGI script using <directive
+    <var>cgi-script</var> when <var>action-type</var> is triggered
by
+    the request.  The <var>cgi-script</var> is the URL-path to a
+    resource that has been designated as a CGI script using <directive
     module="mod_alias">ScriptAlias</directive> or <directive
     module="mod_mime">AddHandler</directive>.  The
     <var>action-type</var> can be either a <a
-    href="../handler.html">handler</a> or a MIME content type. It
-    sends the URL and file path of the requested document using the
-    standard CGI <code>PATH_INFO</code> and <code>PATH_TRANSLATED</code>
-    environment variables. The handler used for the particular request is
-    passed using the <code>REDIRECT_HANDLER</code> variable.</p>
+    href="../handler.html">handler</a> or a <glossary
+    ref="mime-type">MIME content type</glossary>. It sends the URL and
+    file path of the requested document using the standard CGI
+    <code>PATH_INFO</code> and <code>PATH_TRANSLATED</code>
+    environment variables. The handler used for the particular request
+    is passed using the <code>REDIRECT_HANDLER</code> variable.</p>
 
     <example><title>Examples</title>
       # Requests for files of a particular MIME content type:<br />

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_include.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_include.xml?rev=290817&r1=290816&r2=290817&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_include.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_include.xml Wed Sep 21 13:13:57 2005
@@ -306,14 +306,14 @@
 
     <section id="element.include"><title>The include Element</title>
       <p>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 <a href="core.html#options">Options</a>
-      <code>IncludesNOEXEC</code> set, then only documents with
-      a text MIME type (<code>text/plain</code>, <code>text/html</code>
-      etc.) will be included. Otherwise CGI scripts are invoked as normal
-      using the complete URL given in the command, including any query
-      string.</p>
+      into the parsed file. Any included file is subject to the usual
+      access control. If the directory containing the parsed file has
+      <a href="core.html#options">Options</a>
+      <code>IncludesNOEXEC</code> set, then only documents with a text
+      <glossary>MIME-type</glossary> (<code>text/plain</code>,
+      <code>text/html</code> etc.) will be included. Otherwise CGI
+      scripts are invoked as normal using the complete URL given in
+      the command, including any query string.</p>
 
       <p>An attribute defines the location of the document; the
       inclusion is done for each attribute given to the include
@@ -757,7 +757,7 @@
 <usage>
     <p>The <directive>XBitHack</directive> directive controls the parsing
     of ordinary html documents. This directive only affects files associated
-    with the MIME type <code>text/html</code>. <directive
+    with the <glossary>MIME-type</glossary> <code>text/html</code>.
<directive
     >XBitHack</directive> can take on the following values:</p>
 
     <dl>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml?rev=290817&r1=290816&r2=290817&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml Wed Sep 21 13:13:57 2005
@@ -49,7 +49,7 @@
     module="mod_mime">AddType</directive> 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 <directive
+    and <glossary>MIME-type</glossary> (content-type) of documents.  The directive
<directive
     module="mod_mime">TypesConfig</directive> is used to specify a
     file which also maps extensions onto MIME types. </p>
 
@@ -103,14 +103,15 @@
     extensions is <em>normally</em> irrelevant. For example, if the
     file <code>welcome.html.fr</code> maps onto content type
     <code>text/html</code> and language French then the file
-    <code>welcome.fr.html</code> 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
-    <code>.gif</code> maps to the MIME-type <code>image/gif</code>
and
-    <code>.html</code> maps to the MIME-type <code>text/html</code>,
then the
-    file <code>welcome.gif.html</code> will be associated with the MIME-type
-    <code>text/html</code>.</p>
+    <code>welcome.fr.html</code> 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 <code>.gif</code> maps to the <glossary>MIME-type</glossary>
+    <code>image/gif</code> and <code>.html</code> maps to the
+    MIME-type <code>text/html</code>, then the file
+    <code>welcome.gif.html</code> will be associated with the
+    MIME-type <code>text/html</code>.</p>
 
     <p><a href="#charset-lang">Languages</a> and <a href="#contentencoding"
     >content encodings</a> are treated accumulative, because one can assign
@@ -120,7 +121,7 @@
     text/html</code>.</p>
 
     <p>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 <glossary>MIME-type</glossary> and a handler.
This will
     usually result in the request being by the module associated
     with the handler. For example, if the <code>.imap</code>
     extension is mapped to the handler <code>imap-file</code> (from
@@ -134,7 +135,7 @@
 </section>
 
 <section id="contentencoding"><title>Content encoding</title>
-    <p>A file of a particular MIME type can additionally be encoded a
+    <p>A file of a particular <glossary>MIME-type</glossary> can additionally
be encoded a
     particular way to simplify transmission over the Internet.
     While this usually will refer to compression, such as
     <code>gzip</code>, it can also refer to encryption, such a
@@ -479,13 +480,15 @@
 <override>FileInfo</override>
 
 <usage>
-    <p>The <directive>AddType</directive> directive maps the given filename
-    extensions onto the specified content type. <var>MIME-type</var> is the
-    MIME type to use for filenames containing <var>extension</var>. This
-    mapping is added to any already in force, overriding any mappings that
-    already exist for the same <var>extension</var>. This directive can
-    be used to add mappings not listed in the MIME types file (see the
-    <directive module="mod_mime">TypesConfig</directive> directive).</p>
+    <p>The <directive>AddType</directive> directive maps the given
+    filename extensions onto the specified content
+    type. <var>MIME-type</var> is the <glossary ref="mime-type">MIME
+    type</glossary> to use for filenames containing
+    <var>extension</var>. This mapping is added to any already in
+    force, overriding any mappings that already exist for the same
+    <var>extension</var>. This directive can be used to add mappings
+    not listed in the MIME types file (see the <directive
+    module="mod_mime">TypesConfig</directive> directive).</p>
     
     <example><title>Example</title>
       AddType image/gif .gif
@@ -823,11 +826,12 @@
 <override>FileInfo</override>
 
 <usage>
-    <p>The <directive>RemoveType</directive> directive removes any MIME
-    type associations for files with the given extensions. This allows
-    <code>.htaccess</code> files in subdirectories to undo any
-    associations inherited from parent directories or the server
-    config files. An example of its use might be:</p>
+    <p>The <directive>RemoveType</directive> directive removes any
+    <glossary ref="mime-type">MIME type</glossary> associations for files with
+    the given extensions. This allows <code>.htaccess</code> files in
+    subdirectories to undo any associations inherited from parent
+    directories or the server config files. An example of its use
+    might be:</p>
 
     <example><title>/foo/.htaccess:</title>
       RemoveType .cgi
@@ -858,20 +862,22 @@
 <contextlist><context>server config</context></contextlist>
 
 <usage>
-    <p>The <directive>TypesConfig</directive> directive sets the location
-    of the MIME types configuration file. <var>File-path</var> is relative
-    to the <directive module="core">ServerRoot</directive>. This file sets
+    <p>The <directive>TypesConfig</directive> directive sets the
+    location of the <glossary ref="mime-type">MIME types</glossary>
+    configuration file. <var>File-path</var> is relative to the
+    <directive module="core">ServerRoot</directive>. This file sets
     the default list of mappings from filename extensions to content
-    types. Most administrators use the provided <code>mime.types</code>
-    file, which associates common filename extensions with IANA registered
-    content types. The current list is maintained at <a href=
+    types. Most administrators use the provided
+    <code>mime.types</code> file, which associates common filename
+    extensions with IANA registered content types. The current list is
+    maintained at <a href=
     "http://www.iana.org/assignments/media-types/index.html"
-    >http://www.iana.org/assignments/media-types/index.html</a>.
-    This simplifies the <code>httpd.conf</code> file by providing the
+    >http://www.iana.org/assignments/media-types/index.html</a>.  This
+    simplifies the <code>httpd.conf</code> file by providing the
     majority of media-type definitions, and may be overridden by
     <directive module="mod_mime">AddType</directive> directives as
-    needed. You should not edit the <code>mime.types</code> file, because
-    it may be replaced when you upgrade your server.</p>
+    needed. You should not edit the <code>mime.types</code> file,
+    because it may be replaced when you upgrade your server.</p>
 
     <p>The file contains lines in the format of the arguments to
     an <directive module="mod_mime">AddType</directive> directive:</p>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime_magic.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime_magic.xml?rev=290817&r1=290816&r2=290817&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime_magic.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime_magic.xml Wed Sep 21 13:13:57 2005
@@ -30,9 +30,10 @@
 <identifier>mime_magic_module</identifier>
 
 <summary>
-    <p>This module determines the MIME type of files in the same
-    way the Unix <code>file(1)</code> command works: it looks at the first
-    few bytes of the file. It is intended as a "second line of defense"
+    <p>This module determines the <glossary ref="mime-type">MIME
+    type</glossary> of files in the same way the Unix
+    <code>file(1)</code> command works: it looks at the first few
+    bytes of the file. It is intended as a "second line of defense"
     for cases that <module>mod_mime</module> can't resolve.</p>
 
     <p>This module is derived from a free version of the

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_negotiation.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_negotiation.xml?rev=290817&r1=290816&r2=290817&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_negotiation.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_negotiation.xml Wed Sep 21 13:13:57 2005
@@ -88,10 +88,11 @@
       <dt><code>Content-Type:</code></dt>
 
       <dd>
-        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
-        <code>name=value</code>. Common parameters include: 
+        The <glossary ref="mime-type">MIME media type</glossary> 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 <code>name=value</code>. Common
+        parameters include:
 
         <dl>
           <dt><code>level</code></dt>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml?rev=290817&r1=290816&r2=290817&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml Wed Sep 21 13:13:57 2005
@@ -1474,7 +1474,7 @@
         <li>
         '<strong><code>type|T</code></strong>=<em>MIME-type</em>'
         (force MIME <strong>t</strong>ype)<br />
-         Force the MIME-type of the target file to be
+         Force the <glossary>MIME-type</glossary> of the target file to be
         <em>MIME-type</em>. For instance, this can be used to
         setup the content-type based on some conditions.
         For example, the following snippet allows <code>.php</code> files to

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml?rev=290817&r1=290816&r2=290817&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml Wed Sep 21 13:13:57 2005
@@ -370,10 +370,10 @@
           to the server without this module.</dd>
 
         <dt><code>--disable-mime</code></dt>
-        <dd><module>mod_mime</module> 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.</dd>
+        <dd><module>mod_mime</module> associates the requested
+        filename's extensions with the file's behavior and content
+        (<glossary>mime-type</glossary>, language, character set and
+        encoding). Disabling this module is normally not recommended.</dd>
 
         <dt><code>--disable-negotiation</code></dt>
         <dd>Disable content negotiation provided by
@@ -498,9 +498,11 @@
         <dd>Enable memory caching provided by
           <module>mod_mem_cache</module>.</dd>
 
-        <dt><code>--enable-mime-magic</code></dt>
-        <dd>Enable automatical determining of MIME types, which is provided by
-          <module>mod_mime_magic</module>.</dd>
+        <dt><code>--enable-mime-magic</code></dt> 
+        <dd>Enable
+        automatical determining of <glossary ref="mime-type">MIME
+        types</glossary>, which is provided by
+        <module>mod_mime_magic</module>.</dd>
 
         <dt><code>--enable-isapi</code></dt>
         <dd>Enable the isapi extension support provided by



Mime
View raw message