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 7d80518a35470130fe3e6404ff5428e8db63583e..75c4a376f195b555fc4d998bc4c1001b2525902a 100644 (file)
--- 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 2b7c2460f7123fe987f73b9ae781eedd5fcbd737..9bbc729edf19a661e4b73921482ad58acb9618e8 100644 (file)
--- 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