Merge changes from CUPS 1.4svn-r8443.

[thirdparty/cups.git] / packaging / LICENSE.rtf

diff --git a/packaging/LICENSE.rtf b/packaging/LICENSE.rtf
index 55d7de1f56988d2c8a3dd6cce7bfe5e08810835d..2fbacac7220c18465260e512c49de4340424cf83 100644 (file)
--- a/packaging/LICENSE.rtf
+++ b/packaging/LICENSE.rtf
@@ -10,12 +10,10 @@
 {\list\listtemplateid6\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid501\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid6}
 {\list\listtemplateid7\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid601\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid7}}
 {\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}}
-{\info
-{\title Software License Agreement - Common UNIX Printing System}}\margl1440\margr1440\margb1800\margt1800\vieww15960\viewh16860\viewkind0
 \deftab720
 \pard\pardeftab720\sa280\qc
 
-\f0\b\fs36 \cf0 Common UNIX Printing System License Agreement\
+\f0\b\fs36 \cf0 CUPS License Agreement\
 \pard\pardeftab720\sa240\qc
 
 \b0\fs24 \cf0 Copyright 2007-2009 by Apple Inc.
@@ -30,11 +28,9 @@
 \b\fs28 \cf0 Introduction\
 \pard\pardeftab720\sa240\ql\qnatural
 
-\b0\fs24 \cf0 The Common UNIX Printing System
+\b0\fs24 \cf0 CUPS
 \fs20 \super TM
-\fs24 \nosupersub , ("CUPS
-\fs20 \super TM
-\fs24 \nosupersub "), is provided under the GNU General Public License ("GPL") and GNU Library General Public License ("LGPL"), Version 2, with exceptions for Apple operating systems and the OpenSSL toolkit. A copy of the exceptions and licenses follow this introduction.\
+\fs24 \nosupersub  is provided under the GNU General Public License ("GPL") and GNU Library General Public License ("LGPL"), Version 2, with exceptions for Apple operating systems and the OpenSSL toolkit. A copy of the exceptions and licenses follow this introduction.\
 The GNU LGPL applies to the CUPS API library, located in the "cups" subdirectory of the CUPS source distribution and in the "cups" include directory and library files in the binary distributions. The GNU GPL applies to the remainder of the CUPS distribution, including the "pdftops" filter which is based upon Xpdf and the CUPS imaging library.\
 For those not familiar with the GNU GPL, the license basically allows you to:\
 \pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural