summaryrefslogtreecommitdiff
path: root/conf/mime.types
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2008-06-18 16:44:53 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2008-06-18 16:44:53 +0000
commitdd1abb6b5f145c5e5f279d8848b5f3ec161fd227 (patch)
tree48d46ed8d33890c2b5d047996f5a61aab8990520 /conf/mime.types
parentc934a06cde0e8f2657b7e614df31fd300658d53e (diff)
Merge changes from CUPS 1.4svn-r7670.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@810 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf/mime.types')
-rw-r--r--conf/mime.types4
1 files changed, 3 insertions, 1 deletions
diff --git a/conf/mime.types b/conf/mime.types
index bda116265..1852d460c 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 by Apple Inc.
+# Copyright 2007-2008 by Apple Inc.
# Copyright 1997-2007 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
@@ -33,6 +33,8 @@
# extension Pattern match on "*.extension"
# ascii(offset,length) True if bytes are valid printable ASCII
# (CR, NL, TAB, BS, 32-126)
+# priority(number) Sets priority of type (0=lowest,
+# 100=default, 200=highest)
# printable(offset,length) True if bytes are printable 8-bit chars
# (CR, NL, TAB, BS, 32-126, 128-254)
# string(offset,"string") True if bytes are identical to string