Final changes to license agreement text.

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

diff --git a/LICENSE.html b/LICENSE.html
index d6e7bf33936ea5044b9565fe4f7150333abb18d1..7a25722a6e6dc8b53f641bafdab89920483d47f2 100644 (file)
--- a/LICENSE.html
+++ b/LICENSE.html
@@ -35,14 +35,14 @@ basically allows you to:
        sell support for the software.
 
        <LI>Distribute or sell printer drivers and filters that use the
-       CUPS API so long as source code is made available.
+       CUPS API so long as source code is made available under the GPL.
 
 </UL>
 
 <P>What this license <B>does not</B> allow you to do is make changes or
-add features to CUPS and then sell a binary-only distribution. You have
-to provide source for any new drivers, changes, or additions to the
-software.
+add features to CUPS and then sell a binary distribution without source
+code. You have to provide source for any new drivers, changes, or
+additions to the software, and all code must be provided under the GPL.
 
 <P>Also, since we have trademarked the Common UNIX Printing System, CUPS,
 and CUPS logo, you may not release a derivative product using those names
@@ -50,14 +50,15 @@ without permission from Easy Software Products.
 
 <H3>Binary Distribution Rights</H3>
 
-<P>Easy Software Products also sells the CUPS source code under a
-binary-only license for vendors that are unable to release source code
-for their drivers or additions and modifications to CUPS under the GPL.
-For pricing information please contact us at the address shown above.
+<P>Easy Software Products also sells rights to the CUPS source code
+under a binary distribution license for vendors that are unable to
+release source code for their drivers or additions and modifications to
+CUPS under the GPL. For pricing information please contact us at the
+address shown above.
 
-<P>The Common UNIX Printing System utilizes GNU GhostScript 4.03 to convert
-PostScript files into a stream of raster images. For binary-only licensing
-of this software, please contact:
+<P>The Common UNIX Printing System utilizes GNU GhostScript 4.03 to
+convert PostScript files into a stream of raster images. For binary
+distribution licensing of this software, please contact:
 
 <BLOCKQUOTE>Miles Jones<BR>
 Director of Marketing<BR>
@@ -73,7 +74,7 @@ EMail: info@arsoft.com
 
 <P>Easy Software Products sells software support for distributors and
 resellers of CUPS. Support for users of CUPS is available from Easy
-Software Products by purchasing our ESP Print software.
+Software Products through our ESP Print software.
 
 <H3>Trademarks</H3>
 

diff --git a/LICENSE.txt b/LICENSE.txt
index e858aa673cf98eb702649a38cb4db3e2bd3365cd..08320767e75665e4d841d8552fa70a292c11f19d 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -22,11 +22,12 @@ basically allows you to:
    * Sell verbatim copies of the software for a media fee, or sell support
      for the software.
    * Distribute or sell printer drivers and filters that use the CUPS API so
-     long as source code is made available.
+     long as source code is made available under the GPL.
 
 What this license does not allow you to do is make changes or add features
-to CUPS and then sell a binary-only distribution. You have to provide source
-for any new drivers, changes, or additions to the software.
+to CUPS and then sell a binary distribution without source code. You have to
+provide source for any new drivers, changes, or additions to the software,
+and all code must be provided under the GPL.
 
 Also, since we have trademarked the Common UNIX Printing System, CUPS, and
 CUPS logo, you may not release a derivative product using those names
@@ -34,14 +35,14 @@ without permission from Easy Software Products.
 
 Binary Distribution Rights
 
-Easy Software Products also sells the CUPS source code under a binary-only
-license for vendors that are unable to release source code for their drivers
-or additions and modifications to CUPS under the GPL. For pricing
-information please contact us at the address shown above.
+Easy Software Products also sells rights to the CUPS source code under a
+binary distribution license for vendors that are unable to release source
+code for their drivers or additions and modifications to CUPS under the GPL.
+For pricing information please contact us at the address shown above.
 
 The Common UNIX Printing System utilizes GNU GhostScript 4.03 to convert
-PostScript files into a stream of raster images. For binary-only licensing
-of this software, please contact:
+PostScript files into a stream of raster images. For binary distribution
+licensing of this software, please contact:
 
      Miles Jones
      Director of Marketing
@@ -56,7 +57,7 @@ Support
 
 Easy Software Products sells software support for distributors and resellers
 of CUPS. Support for users of CUPS is available from Easy Software Products
-by purchasing our ESP Print software.
+through our ESP Print software.
 
 Trademarks