httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/docs/manual/mod mod_mime.html.en mod_mime.xml
Date Sun, 02 Nov 2003 12:51:59 GMT
nd          2003/11/02 04:51:59

  Modified:    docs/manual/mod mod_mime.html.en mod_mime.xml
  Log:
  add a note about the incremental behaviour of language and encoding
  extensions.
  
  Revision  Changes    Path
  1.31      +12 -5     httpd-2.0/docs/manual/mod/mod_mime.html.en
  
  Index: mod_mime.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_mime.html.en,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -u -r1.30 -r1.31
  --- mod_mime.html.en	29 May 2003 16:13:22 -0000	1.30
  +++ mod_mime.html.en	2 Nov 2003 12:51:59 -0000	1.31
  @@ -118,10 +118,17 @@
       <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. 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>
  +    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>
  +
  +    <p><a href="#charset-lang">Languages</a> and <a href="#contentencoding">content
encodings</a> are treated accumulative, because one can assign
  +    more than one language or encoding to a particular ressource. For example,
  +    the file <code>welcome.html.en.de</code> will be delivered with
  +    <code>Content-Language: en, de</code> and <code>Content-Type:
  +    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
  @@ -169,7 +176,7 @@
       <code>.doc</code> extension is associated with the Microsoft
       Word file type, and the <code>.zip</code> extension is
       associated with the pkzip file encoding, then the file
  -    <code>Resume.doc.zip</code>would be known to be a pkzip'ed Word
  +    <code>Resume.doc.zip</code> would be known to be a pkzip'ed Word
       document.</p>
   
       <p>Apache sends a <code>Content-encoding</code> header with the
  
  
  
  1.23      +13 -5     httpd-2.0/docs/manual/mod/mod_mime.xml
  
  Index: mod_mime.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_mime.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -u -r1.22 -r1.23
  --- mod_mime.xml	5 May 2003 15:05:30 -0000	1.22
  +++ mod_mime.xml	2 Nov 2003 12:51:59 -0000	1.23
  @@ -87,10 +87,18 @@
       <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. 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>
  +    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>
  +
  +    <p><a href="#charset-lang">Languages</a> and <a href="#contentencoding"
  +    >content encodings</a> are treated accumulative, because one can assign
  +    more than one language or encoding to a particular ressource. For example,
  +    the file <code>welcome.html.en.de</code> will be delivered with
  +    <code>Content-Language: en, de</code> and <code>Content-Type:
  +    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
  @@ -139,7 +147,7 @@
       <code>.doc</code> extension is associated with the Microsoft
       Word file type, and the <code>.zip</code> extension is
       associated with the pkzip file encoding, then the file
  -    <code>Resume.doc.zip</code>would be known to be a pkzip'ed Word
  +    <code>Resume.doc.zip</code> would be known to be a pkzip'ed Word
       document.</p>
   
       <p>Apache sends a <code>Content-encoding</code> header with the
  
  
  

Mime
View raw message