[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r10423 - in trunk: . doc/help
From:       cups-dev () easysw ! com
Date:       2012-04-23 16:37:45
Message-ID: 11195-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2012-04-23 09:37:45 -0700 (Mon, 23 Apr 2012)
New Revision: 10423
Log:
Track some name changes:

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



Modified:
   trunk/LICENSE.txt
   trunk/doc/help/license.html

Modified: trunk/LICENSE.txt
===================================================================
--- trunk/LICENSE.txt	2012-04-23 15:06:22 UTC (rev 10422)
+++ trunk/LICENSE.txt	2012-04-23 16:37:45 UTC (rev 10423)
@@ -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 @@
 	   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

Modified: trunk/doc/help/license.html
===================================================================
--- trunk/doc/help/license.html	2012-04-23 15:06:22 UTC (rev 10422)
+++ trunk/doc/help/license.html	2012-04-23 16:37:45 UTC (rev 10423)
@@ -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 @@
 
 		<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

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]