From 68b10830fa5eca364644a90bb564821698611ff7 Mon Sep 17 00:00:00 2001 From: msweet Date: Mon, 18 May 2009 22:09:10 +0000 Subject: Merge changes from CUPS 1.4svn-r8659 git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1516 a1ca3aef-8c08-0410-bb20-df032aa958be --- conf/mime.types | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'conf') diff --git a/conf/mime.types b/conf/mime.types index 21089d60b..ba97930d5 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -7,7 +7,7 @@ # VERSIONS OF CUPS. Instead, create a "local.types" file that # reflects your local configuration changes. # -# Copyright 2007-2008 by Apple Inc. +# Copyright 2007-2009 by Apple Inc. # Copyright 1997-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -50,10 +50,12 @@ # # MIME type names are case-insensitive. Internally they are converted # to lowercase. Multiple occurrences of a type will cause the provided -# rules to be appended to the existing definition. Type names are sorted -# in ascending order, so if two types use the same rules to resolve a type -# (e.g. doc extension for two types), the returned type will be the first -# type in the sorted list. +# rules to be appended to the existing definition. If two types use the same +# rules to resolve a type and have the same priority, e.g. "doc" extension for +# "text/bar" and "text/foo", the returned type will be the first type as +# sorted in alphanumerically ascending order without regard to case. Thus, +# the "text/bar" type will match the "doc" extension first unless the +# "text/foo" type has specified a higher priority. # # The "printable" rule differs from the "ascii" rule in that it also # accepts 8-bit characters in the range 128-255. -- cgit v1.2.1