Merge changes from CUPS 1.6svn-r10024.

[thirdparty/cups.git] / README.txt

diff --git a/README.txt b/README.txt
index 2535148646180fa3ab3f0beb3524f1cf39d33059..f278e4dec3cade71559a24b896242b6ed87ed74a 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,18 +1,5 @@
-README - CUPS v1.4b2 - 2009-01-07
----------------------------------
-
-**********************************************************************
-**********************************************************************
-**********                                                  **********
-**********  THIS IS BETA-RELEASE SOFTWARE.  DO NOT USE ON   **********
-**********  PRODUCTION SYSTEMS!  REPORT PROBLEMS TO THE     **********
-**********  CUPS FORUMS OR BUG REPORTING PAGES:             **********
-**********                                                  **********
-**********    http://www.cups.org/newsgroups.php (FORUMS)   **********
-**********    http://www.cups.org/str.php        (BUGS)     **********
-**********                                                  **********
-**********************************************************************
-**********************************************************************
+README - CUPS v1.5.0 - 2011-07-25
+----------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt"
 instead...
@@ -20,13 +7,13 @@ instead...
 
 INTRODUCTION
 
-    The Common UNIX Printing System ("CUPS") is a standards-based, open source
-    printing system developed by Apple Inc. for Mac OS® X and other UNIX®-like
-    operating systems.  CUPS uses the Internet Printing Protocol ("IPP") and
-    provides System V and Berkeley command-line interfaces, a web interface,
-    and a C API to manage printers and print jobs.  It supports printing to
-    both local (parallel, serial, USB) and networked printers, and printers can
-    be shared from one computer to another, even over the Internet!
+    CUPS is a standards-based, open source printing system developed by Apple
+    Inc. for Mac OS® X and other UNIX®-like operating systems.  CUPS uses the
+    Internet Printing Protocol ("IPP") and provides System V and Berkeley
+    command-line interfaces, a web interface, and a C API to manage printers and
+    print jobs.  It supports printing to both local (parallel, serial, USB) and
+    networked printers, and printers can be shared from one computer to another,
+    even over the Internet!
 
     Internally, CUPS uses PostScript Printer Description ("PPD") files to
     describe printer capabilities and features and a wide variety of generic
@@ -163,8 +150,8 @@ PRINTING FILES
 
 LEGAL STUFF
 
-    CUPS is Copyright 2007-2009 by Apple Inc.  CUPS, the CUPS logo, and the
-    Common UNIX Printing System are trademarks of Apple Inc.
+    CUPS is Copyright 2007-2011 by Apple Inc.  CUPS and the CUPS logo are
+    trademarks of Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.