Simplify license exception for OpenSSL.

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

diff --git a/LICENSE.html b/LICENSE.html
index a9d9ff79309d2b490438b2e6eded9170ef594cb1..c035b5ce53d988cc0d41b8e4d11d18d17ac203da 100644 (file)
--- a/LICENSE.html
+++ b/LICENSE.html
@@ -107,12 +107,7 @@ Software exception.</BLOCKQUOTE>
 grants the following special exception:
 
 <BLOCKQUOTE>Easy Software Products explicitly allows the compilation and
-distribution of the CUPS software with the OpenSSL Toolkit. The
-requirement for disclosure of the use of OpenSSL in CUPS-derived
-software is not deemed by Easy Software Products to constitute a
-violation of the distribution terms of the GNU GPL, since the GNU GPL
-specifically requires acknowledgement of the original copyright holder
-in derived works.</BLOCKQUOTE>
+distribution of the CUPS software with the OpenSSL Toolkit.</BLOCKQUOTE>
 
 <H3>Trademarks</H3>
 

diff --git a/LICENSE.txt b/LICENSE.txt
index a819cbf84a1692f395c6ddbd16bbbda5400b86bb..c931644dcdc0976ae75c8f82f745ba9a106adcec 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -93,12 +93,7 @@ In addition, as the copyright holder of CUPS, Easy Software Products
 grants the following special exception:
 
     Easy Software Products explicitly allows the compilation and
-    distribution of the CUPS software with the OpenSSL Toolkit. The
-    requirement for disclosure of the use of OpenSSL in CUPS-derived
-    software is not deemed by Easy Software Products to constitute a
-    violation of the distribution terms of the GNU GPL, since the GNU GPL
-    specifically requires acknowledgement of the original copyright holder
-    in derived works.
+    distribution of the CUPS software with the OpenSSL Toolkit.
 
 
 TRADEMARKS