From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Mon, 23 Apr 2012 16:37:45 +0000 (+0000)
Subject: Track some name changes:
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;ds=sidebyside;h=9d450f5e81a86cff6b03f26169007826e67ccc07;p=thirdparty%2Fcups.git

Track some name changes:

1. Apple Computer, Inc. to Apple Inc.
2. Mac OS X to OS X.



git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10423 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/LICENSE.txt b/LICENSE.txt
index 7d80518a3..75c4a376f 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
                           CUPS License Agreement
 
-		      Copyright 2007-2011 by Apple Inc.
+		      Copyright 2007-2012 by Apple Inc.
 			     1 Infinite Loop
 			  Cupertino, CA 95014 USA
 
@@ -68,11 +68,11 @@ the following special exceptions:
 	   source code of the Apple OS-Developed Software.
 
 	b. An Apple Operating System means any operating system
-	   software developed and/or marketed by Apple Computer,
-	   Inc., including but not limited to all existing
-	   releases and versions of Apple's Darwin, Mac OS X,
-	   and Mac OS X Server products and all follow-on
-	   releases and future versions thereof.
+	   software developed and/or marketed by Apple Inc.,
+	   including but not limited to all existing releases and
+	   versions of Apple's Darwin, OS X, and OS X Server
+	   products and all follow-on releases and future
+	   versions thereof.
 
 	c. This exception is only available for Apple
 	   OS-Developed Software and does not apply to software
diff --git a/doc/help/license.html b/doc/help/license.html
index 2b7c2460f..9bbc729ed 100644
--- a/doc/help/license.html
+++ b/doc/help/license.html
@@ -8,7 +8,7 @@
 
 <H1 CLASS="title">Software License Agreement</H1>
 
-<P ALIGN="CENTER">Copyright 2007-2011 by Apple Inc.<BR>
+<P ALIGN="CENTER">Copyright 2007-2012 by Apple Inc.<BR>
 1 Infinite Loop<BR>
 Cupertino, CA 95014 USA<BR>
 <BR>
@@ -91,11 +91,10 @@ the following special exceptions:</P>
 
 		<LI>An Apple Operating System means any
 		operating system software developed and/or
-		marketed by Apple Computer, Inc., including but
-		not limited to all existing releases and
-		versions of Apple's Darwin, Mac OS X, and Mac OS
-		X Server products and all follow-on releases and
-		future versions thereof.</LI>
+		marketed by Apple Inc., including but not limited
+		to all existing releases and versions of Apple's
+		Darwin, OS X, and OS X Server products and all
+		follow-on releases and future versions thereof.</LI>
 
 		<LI>This exception is only available for Apple
 		OS-Developed Software and does not apply to