Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@4166 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/LICENSE.html b/LICENSE.html
index ad9a570b017d1a051f1aba262e8cbf2ea33b3517..17bfcc72cd5bd35bfa7fa17e6f916916cd01b31b 100644 (file)
--- a/LICENSE.html
+++ b/LICENSE.html
@@ -7,9 +7,9 @@
 
 <H2 ALIGN="CENTER">Common UNIX Printing System License Agreement</H2>
 
-<P ALIGN="CENTER">Copyright 1997-2002 by Easy Software Products<BR>
+<P ALIGN="CENTER">Copyright 1997-2004 by Easy Software Products<BR>
 44141 AIRPORT VIEW DR STE 204<BR>
-HOLLYWOOD, MARYLAND 20636-3111 USA<BR>
+HOLLYWOOD, MARYLAND 20636-3142 USA<BR>
 <BR>
 Voice: +1.301.373.9600<BR>
 Email: <A HREF="mailto:cups-info@cups.org">cups-info@cups.org</A><BR>
@@ -138,13 +138,12 @@ derived work.
 <H3>Trademarks</H3>
 
 <P>Easy Software Products has trademarked the Common UNIX
-Printing System, CUPS, and CUPS logo. These names and logos may
-be used freely in any direct port or binary distribution of
-CUPS. Please contract Easy Software Products for written
-permission to use them in derivative products. Our intention is
-to protect the value of these trademarks and ensure that any
-derivative product meets the same high-quality standards as the
-original.
+Printing System, CUPS, and CUPS logo. You may use these names
+and logos in any direct port or binary distribution of CUPS.
+Please contact Easy Software Products for written permission to
+use them in derivative products. Our intention is to protect the
+value of these trademarks and ensure that any derivative product
+meets the same high-quality standards as the original.
 
 <H3>Binary Distribution Rights</H3>
 

diff --git a/LICENSE.txt b/LICENSE.txt
index afb3bb73810fcdfe8d5fff47dac5b5c2060a3a1a..d3095f2fed771f85f42a41957807cd63aae2f3d5 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,8 +1,8 @@
                 Common UNIX Printing System License Agreement
 
-                Copyright 1997-2003 by Easy Software Products
+                Copyright 1997-2004 by Easy Software Products
                         44141 AIRPORT VIEW DR STE 204
-                     HOLLYWOOD, MARYLAND 20636-3111 USA
+                     HOLLYWOOD, MARYLAND 20636-3142 USA
 
                            Voice: +1.301.373.9600
                           Email: cups-info@cups.org
@@ -107,9 +107,9 @@ derived work.
 TRADEMARKS
 
 Easy Software Products has trademarked the Common UNIX Printing
-System, CUPS, and CUPS logo. These names and logos may be used
-freely in any direct port or binary distribution of CUPS. Please
-contract Easy Software Products for written permission to use
+System, CUPS, and CUPS logo. You may use these names and logos
+in any direct port or binary distribution of CUPS. Please
+contact Easy Software Products for written permission to use
 them in derivative products. Our intention is to protect the
 value of these trademarks and ensure that any derivative product
 meets the same high-quality standards as the original.