Merge changes from CUPS 1.5svn-r9352.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2848 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 17 insertions, 19 deletions

diff --git a/IPPTOOL.txt b/IPPTOOL.txt
index c96822017..c13da01ae 100644
--- a/IPPTOOL.txt
+++ b/IPPTOOL.txt
@@ -1,24 +1,23 @@
-IPPTOOL.txt - 2010-04-07
+IPPTOOL.txt - 2010-10-17
 ------------------------
 
 
 INTRODUCTION
 
-    Starting with CUPS 1.5, CUPS now installs a user program called
-    ipptool that can be used to send arbitrary IPP requests to a CUPS
-    server or IPP printer. This tool started life as part of the CUPS
-    automated test suite and has grown to support complex conformance
-    tests and a simple way to query printer, job, and subscription
-    attributes.
+    Starting with CUPS 1.5, CUPS now installs a user program called ipptool that
+    can be used to send arbitrary IPP requests to a CUPS server or IPP printer.
+    This tool started life as part of the CUPS automated test suite and has
+    grown to support complex conformance tests and a simple way to query
+    printer, job, and subscription attributes.
 
 
 BASIC USAGE
 
-    The ipptool command requires a printer URI and one or more "test"
-    files that describe the operations, attributes to display, and
-    expected status and attribute values. Several standard files are
-    included with CUPS, for example to show a list of pending print jobs
-    on a CUPS printer called "myprinter" you'd run:
+    The ipptool command requires a printer URI and one or more "test" files that
+    describe the operations, attributes to display, and expected status and
+    attribute values. Several standard files are included with CUPS, for example
+    to show a list of pending print jobs on a CUPS printer called "myprinter"
+    you'd run:
 
         ipptool ipp://localhost/printers/myprinter get-jobs.test
 
@@ -31,8 +30,8 @@ BASIC USAGE
 	74     pending-held testfile.jpg msweet
 	75     pending-held testfile.txt msweet
 
-    To get output suitable for import into a spreadsheet, use the "-c"
-    (CSV) option:
+    To get output suitable for import into a spreadsheet, use the "-c" (CSV)
+    option:
 
         ipptool -c ipp://localhost/printers/myprinter get-jobs.test
 
@@ -47,9 +46,8 @@ BASIC USAGE
 
 CONFORMANCE TESTS
 
-    We provide basic IPP conformance tests for IPP/1.1, IPP/2.0, and
-    IPP/2.1. For a given printer URI, the following commands perform
-    tests at each level:
+    We provide basic IPP conformance tests for IPP/1.1, IPP/2.0, and IPP/2.1.
+    For a given printer URI, the following commands perform tests at each level:
 
         ipptool -t printer-uri ipp-1.1.test
         ipptool -t -V 2.0 printer-uri ipp-2.0.test
@@ -58,8 +56,8 @@ CONFORMANCE TESTS
 
 READING THE DOCUMENTATION
 
-    The command usage is described in the ipptest(1) man page, while the
-    file format is described in the ipptestfile(5) man page.
+    The command usage is described in the ipptest(1) man page, while the file
+    format is described in the ipptestfile(5) man page.
 
 
 GETTING SUPPORT AND OTHER RESOURCES