Imported Upstream version 1.7.2upstream/1.7.2

3 files changed, 52 insertions, 42 deletions

diff --git a/man/cupsfilter.man b/man/cupsfilter.man
index e88d62be..4370f8f1 100644
--- a/man/cupsfilter.man
+++ b/man/cupsfilter.man
@@ -1,17 +1,17 @@
 .\"
-.\" "$Id: cupsfilter.man 11022 2013-06-06 22:14:09Z msweet $"
+.\" "$Id: cupsfilter.man 11772 2014-03-28 15:08:30Z msweet $"
 .\"
-.\"   cupsfilter man page for CUPS.
+.\" cupsfilter man page for CUPS.
 .\"
-.\"   Copyright 2007-2013 by Apple Inc.
+.\" Copyright 2007-2014 by Apple Inc.
 .\"
-.\"   These coded instructions, statements, and computer programs are the
-.\"   property of Apple Inc. and are protected by Federal copyright
-.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-.\"   which should have been included with this file.  If this file is
-.\"   file is missing or damaged, see the license at "http://www.cups.org/".
+.\" These coded instructions, statements, and computer programs are the
+.\" property of Apple Inc. and are protected by Federal copyright
+.\" law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\" which should have been included with this file.  If this file is
+.\" file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cupsfilter 8 "CUPS" "20 June 2012" "Apple Inc."
+.TH cupsfilter 8 "CUPS" "28 March 2014" "Apple Inc."
 .SH NAME
 cupsfilter \- convert a file to another format using cups filters
 .SH SYNOPSIS
@@ -41,7 +41,8 @@ cupsfilter \- convert a file to another format using cups filters
 .SH DESCRIPTION
 \fIcupsfilter\fR is a front-end to the CUPS filter subsystem which allows you
 to convert a file to a specific format, just as if you had printed the file
-through CUPS. By default, \fIcupsfilter\fR generates a PDF file.
+through CUPS. By default, \fIcupsfilter\fR generates a PDF file. The converted
+file is sent to the standard output.
 .SH OPTIONS
 .TP 5
 -D
@@ -54,7 +55,7 @@ Specifies the username passed to the filters. The default is the name of the cur
 .TP 5
 -c config-file
 .br
-Uses the named cupsd.conf configuration file.
+Uses the named cups-files.conf configuration file.
 .TP 5
 -d printer
 Uses information from the named printer.
@@ -99,11 +100,11 @@ Specifies the document title.
 .br
 Delete the PPD file after conversion.
 .SH SEE ALSO
-\fIcupsd.conf(5)\fR
+\fIcups-files.conf(5)\fR
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2013 by Apple Inc.
+Copyright 2007-2014 by Apple Inc.
 .\"
-.\" End of "$Id: cupsfilter.man 11022 2013-06-06 22:14:09Z msweet $".
+.\" End of "$Id: cupsfilter.man 11772 2014-03-28 15:08:30Z msweet $".
 .\"
diff --git a/man/ipptool.man b/man/ipptool.man
index 240c0445..5949d06f 100644
--- a/man/ipptool.man
+++ b/man/ipptool.man
@@ -1,17 +1,17 @@
 .\"
-.\" "$Id: ipptool.man 11022 2013-06-06 22:14:09Z msweet $"
+.\" "$Id: ipptool.man 11642 2014-02-27 15:57:59Z msweet $"
 .\"
-.\"   ipptool man page for CUPS.
+.\" ipptool man page for CUPS.
 .\"
-.\"   Copyright 2010-2013 by Apple Inc.
+.\" Copyright 2010-2014 by Apple Inc.
 .\"
-.\"   These coded instructions, statements, and computer programs are the
-.\"   property of Apple Inc. and are protected by Federal copyright
-.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-.\"   which should have been included with this file.  If this file is
-.\"   file is missing or damaged, see the license at "http://www.cups.org/".
+.\" These coded instructions, statements, and computer programs are the
+.\" property of Apple Inc. and are protected by Federal copyright
+.\" law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\" which should have been included with this file.  If this file is
+.\" file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH ipptool 1 "CUPS" "13 May 2013" "Apple Inc."
+.TH ipptool 1 "CUPS" "20 February 2014" "Apple Inc."
 .SH NAME
 ipptool - perform internet printing protocol requests
 .SH SYNOPSIS
@@ -42,8 +42,10 @@ The following options are recognized by \fIipptool\fR:
 .TP 5
 --help
 Shows program help.
+.TP 5
 --stop-after-include-error
 Tells \fIipptool\fR to stop if an error occurs in an included file. Normally \fIipptool\fR will continue with subsequent tests after the INCLUDE directive.
+.TP 5
 --version
 Shows the version of \fIipptool\fR being used.
 .TP 5
@@ -150,11 +152,15 @@ The following standard files are available:
     validate-job.test
 .fi
 .SH SEE ALSO
-\fIipptoolfile(5)\fR,
+\fIipptoolfile(5)\fR, RFC 2911,
 .br
 http://localhost:631/help
+.br
+http://www.iana.org/assignments/ipp-registrations
+.br
+http://www.pwg.org/ipp
 .SH COPYRIGHT
-Copyright 2007-2013 by Apple Inc.
+Copyright 2007-2014 by Apple Inc.
 .\"
-.\" End of "$Id: ipptool.man 11022 2013-06-06 22:14:09Z msweet $".
+.\" End of "$Id: ipptool.man 11642 2014-02-27 15:57:59Z msweet $".
 .\"
diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man
index ed71842d..3a154900 100644
--- a/man/ipptoolfile.man
+++ b/man/ipptoolfile.man
@@ -1,17 +1,17 @@
 .\"
-.\" "$Id: ipptoolfile.man 11022 2013-06-06 22:14:09Z msweet $"
+.\" "$Id: ipptoolfile.man 11734 2014-03-25 18:01:47Z msweet $"
 .\"
-.\"   ipptoolfile man page for CUPS.
+.\" ipptoolfile man page for CUPS.
 .\"
-.\"   Copyright 2010-2013 by Apple Inc.
+.\" Copyright 2010-2014 by Apple Inc.
 .\"
-.\"   These coded instructions, statements, and computer programs are the
-.\"   property of Apple Inc. and are protected by Federal copyright
-.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-.\"   which should have been included with this file.  If this file is
-.\"   file is missing or damaged, see the license at "http://www.cups.org/".
+.\" These coded instructions, statements, and computer programs are the
+.\" property of Apple Inc. and are protected by Federal copyright
+.\" law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\" which should have been included with this file.  If this file is
+.\" file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH ipptoolfile 5 "CUPS" "13 May 2013" "Apple Inc."
+.TH ipptoolfile 5 "CUPS" "25 March 2014" "Apple Inc."
 .SH NAME
 ipptoolfile \- ipptool file format
 
@@ -152,7 +152,7 @@ The following directives are understood in a test:
 .TP 5
 ATTR tag attribute-name value(s)
 Adds an attribute to the test request. Values are separated by the comma (",")
-character - escape commas using the "\" character.
+character - escape commas using the "\" character. Common attributes and values are listed in the IANA IPP registry - see references below.
 .TP 5
 ATTR collection attribute-name { MEMBER tag member-name value(s) ... } [ ... { ... } ]
 Adds a collection attribute to the test request. Member attributes follow the
@@ -423,8 +423,8 @@ RFC 2911 and other IPP extension specifications. Here is a complete list:
     Cancel-Subscription
     Close-Job
     Create-Job
-    Create-Job-Subscription
-    Create-Printer-Subscription
+    Create-Job-Subscriptions
+    Create-Printer-Subscriptions
     Deactivate-Printer
     Disable-Printer
     Enable-Printer
@@ -614,12 +614,15 @@ $username
 Inserts the username from the URI provided to \fIipptool\fR, if any.
 
 .SH SEE ALSO
-\fIipptool(1)\fR,
+\fIipptool(1)\fR, RFC 2911,
 .br
 http://localhost:631/help
-
+.br
+http://www.iana.org/assignments/ipp-registrations
+.br
+http://www.pwg.org/ipp
 .SH COPYRIGHT
-Copyright 2007-2013 by Apple Inc.
+Copyright 2007-2014 by Apple Inc.
 .\"
-.\" End of "$Id: ipptoolfile.man 11022 2013-06-06 22:14:09Z msweet $".
+.\" End of "$Id: ipptoolfile.man 11734 2014-03-25 18:01:47Z msweet $".
 .\"