From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 28 Jul 2014 14:04:41 +0000 (+0000)
Subject: Mirror change from trunk.
X-Git-Tag: release-2.1.4~16^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9825762812c417ed3da362d8e0e8fc869c2bed6d;p=thirdparty%2Fcups.git

Mirror change from trunk.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@12060 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index b6e9f3ee0e..2a4bcd38ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 1.7.4 - 2014-07-22
+CHANGES.txt - 1.7.5 - 2014-07-28
 --------------------------------
 
 CHANGES IN CUPS V1.7.5
@@ -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 60c61f7da9..9aa8d4b9f4 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" "8 July 2013" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "28 July 2014" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -180,6 +180,18 @@ Encryption Required
 Specifies the level of encryption that is required for a particular
 location.
 .TP 5
+ErrorPolicy abort-job
+Specifies that a failed print job should be aborted (discarded) unless otherwise specified for the printer.
+.TP 5
+ErrorPolicy retry-job
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+.TP 5
+ErrorPolicy retry-this-job
+Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+.TP 5
+ErrorPolicy stop-printer
+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
 FilterLimit limit
 .br
 Specifies the maximum cost of filters that are run concurrently.