backport the note about accumulative extension behaviours.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@101680 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_mime.html.en b/docs/manual/mod/mod_mime.html.en
index 752a9baac60d92e09685fcfe72652afa864de515..610b077bcdfa6dbd47fca504d468b1fe13e364a1 100644 (file)
--- a/docs/manual/mod/mod_mime.html.en
+++ b/docs/manual/mod/mod_mime.html.en
@@ -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

diff --git a/docs/manual/mod/mod_mime.xml b/docs/manual/mod/mod_mime.xml
index a5cbe58329ddbecd2f680c296ecfc5a7fbca8c8b..ad509aeb67cd9184b071abb91cb60d0c89abca9f 100644 (file)
--- a/docs/manual/mod/mod_mime.xml
+++ b/docs/manual/mod/mod_mime.xml
@@ -87,10 +87,18 @@ module="mod_mime_magic">MimeMagicFile</directive></seealso>
     <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 @@ module="mod_mime_magic">MimeMagicFile</directive></seealso>
     <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