summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2018-02-20 21:28:13 -0500
committerMichael R Sweet <michael.r.sweet@gmail.com>2018-02-20 21:28:13 -0500
commit53f8d64f8451caa0737c635aa4eb126a1869d624 (patch)
treed60d7b5a189ff52a1bdd41773ce888f9e779a810 /conf
parenteb61cb5bf0329f6678397e33ea26ff66df013420 (diff)
downloadcups-53f8d64f8451caa0737c635aa4eb126a1869d624.tar.gz
Update copyrights and license text on files that were missed.
Diffstat (limited to 'conf')
-rw-r--r--conf/mime.convs.in13
-rw-r--r--conf/mime.types13
2 files changed, 10 insertions, 16 deletions
diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index bffd04f84..57b459d73 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -5,14 +5,11 @@
#
# Base MIME conversions file for CUPS.
#
-# Copyright 2007-2016 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products.
-#
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law. Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file. If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# Copyright © 2007-2016 by Apple Inc.
+# Copyright © 1997-2007 by Easy Software Products.
+#
+# Licensed under Apache License v2.0. See the file "LICENSE" for more
+# information.
#
########################################################################
diff --git a/conf/mime.types b/conf/mime.types
index fa5371486..fcd6b6eff 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -5,14 +5,11 @@
# VERSIONS OF CUPS. Instead, create a "local.types" file that
# reflects your local configuration changes.
#
-# Copyright 2007-2017 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products.
-#
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law. Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file. If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# Copyright © 2007-2017 by Apple Inc.
+# Copyright © 1997-2007 by Easy Software Products.
+#
+# Licensed under Apache License v2.0. See the file "LICENSE" for more
+# information.
#
########################################################################