Return-Path: <apache-cvs-owner-apache-cvs-archive=hyperreal.org@apache.org>
Delivered-To: apache-cvs-archive@hyperreal.org
Received: (qmail 18528 invoked by uid 6000); 29 Apr 1999 19:56:40 -0000
Received: (qmail 18037 invoked by alias); 29 Apr 1999 19:56:10 -0000
Delivered-To: apache-1.3-cvs@hyperreal.org
Received: (qmail 18007 invoked by uid 161); 29 Apr 1999 19:55:57 -0000
Date: 29 Apr 1999 19:55:56 -0000
Message-ID: <19990429195556.18006.qmail@hyperreal.org>
From: coar@hyperreal.org
To: apache-1.3-cvs@hyperreal.org
Subject: cvs commit: apache-1.3/htdocs/manual/mod mod_mime.html
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

coar        99/04/29 12:55:55

  Modified:    htdocs/manual/mod mod_mime.html
  Log:
  	Point out that for multiple AddLanguage directives with the
  	same extension, the last one encountered dominates.  This is
  	true of lots of directives, but this is the one on which we
  	got a PR..
  
  PR:	3570
  
  Revision  Changes    Path
  1.32      +25 -8     apache-1.3/htdocs/manual/mod/mod_mime.html
  
  Index: mod_mime.html
  ===================================================================
  RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_mime.html,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- mod_mime.html	1999/01/08 23:13:29	1.31
  +++ mod_mime.html	1999/04/29 19:55:53	1.32
  @@ -226,34 +226,51 @@
   <A
    HREF="directive-dict.html#Module"
    REL="Help"
  -><STRONG>Module:</STRONG></A> mod_mime<P>
  +><STRONG>Module:</STRONG></A> mod_mime
   
  +<P>
   The AddLanguage directive maps the given filename extensions to the
   specified content language. <EM>MIME-lang</EM> is the MIME language of
   filenames containing <EM>extension</EM>.  This mapping is added to any
   already in force, overriding any mappings that already exist for the
   same <EM>extension</EM>.
  -
  +</P>
  +<P>
   Example: <BLOCKQUOTE><CODE>
   AddEncoding x-compress Z<BR> AddLanguage en .en<BR> AddLanguage fr
   .fr<BR> </CODE></BLOCKQUOTE>
  -
  +</P>
  +<P>
   Then the document <CODE>xxxx.en.Z</CODE> will be treated as being a
   compressed English document (as will the document
   <CODE>xxxx.Z.en</CODE>). Although the content language is reported to
   the client, the browser is unlikely to use this information. The
  -AddLanguage directive is more useful for <A
  -HREF="../content-negotiation.html">content negotiation</A>, where
  +AddLanguage directive is more useful for
  +<A HREF="../content-negotiation.html">content negotiation</A>, where
   the server returns one from several documents based on the client's
  -language preference.<P>
  -
  +language preference.
  +</P>
   <P>
  -
  +If multiple language assignments are made for the same extension,
  +the last one encountered is the one that is used.  That is, for the
  +case of:
  +</P>
  +<PRE>
  +    AddLanguage en .en
  +    AddLanguage en-uk .en
  +    AddLanguage en-us .en
  +</PRE>
  +<P>
  +documents with the extension "<CODE>.en</CODE>" would be treated as
  +being "<CODE>en-us</CODE>".
  +</P>
  +<P>
   <STRONG>See also</STRONG>: <A HREF="#multipleext">Files with
   multiple extensions</A>
   <BR>
   <STRONG>See also</STRONG>: <A
   HREF="./mod_negotiation.html">mod_negotiation</A>
  +</P>
   
   <HR>