From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 28 Jul 2014 14:04:32 +0000 (+0000)
Subject: Update cupsd.conf man page to list the ErrorPolicy directive (STR #4457)
X-Git-Tag: v2.2b1~546
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=053939b362288781547d0e4ebc05d675e81cc19b;p=thirdparty%2Fcups.git

Update cupsd.conf man page to list the ErrorPolicy directive (STR #4457)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12059 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 77ae38365a..854f263f1f 100644
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -7,6 +7,8 @@ CHANGES IN CUPS V1.7.5
 	  be served by the web interface (STR #4455)
 	- The LPD backend did not work with some versions of glibc (STR #4452)
 	- CGI scripts did not work (STR #4454)
+	- The cupsd.conf man page did not list the ErrorPolicy directive
+	  (STR #4457)
 
 
 CHANGES IN CUPS V1.7.4
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index dd19a4e0aa..307f5dfa75 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -12,7 +12,7 @@
 .\" 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 cupsd.conf 5 "CUPS" "11 June 2014" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "28 July 2014" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -131,6 +131,18 @@ Specifies the delay for updating of configuration and state files.
 A value of 0 causes the update to happen as soon as possible, typically within a few milliseconds.
 The default value is "30".
 .TP 5
+\fBErrorPolicy abort-job\fR
+Specifies that a failed print job should be aborted (discarded) unless otherwise specified for the printer.
+.TP 5
+\fBErrorPolicy retry-job\fR
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+.TP 5
+\fBErrorPolicy retry-this-job\fR
+Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+.TP 5
+\fBErrorPolicy stop-printer\fR
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+.TP 5
 \fBFilterLimit \fIlimit\fR
 Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
@@ -386,7 +398,7 @@ Specifies what information is included in the Server header of HTTP responses.
 "Major" reports "CUPS 2".
 "Minor" reports "CUPS 2.0".
 "Minimal" reports "CUPS 2.0.0".
-"OS" reports "CUPS 2.0.0 (UNAME)" where UNAME is the output of the 
+"OS" reports "CUPS 2.0.0 (UNAME)" where UNAME is the output of the
 .BR uname (1)
 command.
 "Full" reports "CUPS 2.0.0 (UNAME) IPP/2.0".