From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 31 Jul 2014 00:25:50 +0000 (+0000)
Subject: Prep for 1.7.5 release.
X-Git-Tag: release-2.1.4~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71389998b881e750f32928b34657efb743803dfc;p=thirdparty%2Fcups.git

Prep for 1.7.5 release.


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

diff --git a/CHANGES.txt b/CHANGES.txt
index ae4011fb93..d05ce49e61 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 1.7.5 - 2014-07-28
+CHANGES.txt - 1.7.5 - 2014-07-30
 --------------------------------
 
 CHANGES IN CUPS V1.7.5
diff --git a/INSTALL.txt b/INSTALL.txt
index 05d3b39b85..26cb7c03ca 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.7.4 - 2014-06-10
+INSTALL - CUPS v1.7.5 - 2014-07-30
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more
diff --git a/README.txt b/README.txt
index 489dc2a1e4..de91fe8a8f 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README - CUPS v1.7.4 - 2014-06-10
+README - CUPS v1.7.5 - 2014-07-30
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt" instead...
diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 227ccfe2fb..542d9c1593 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -227,6 +227,22 @@ milliseconds.
 <dd>Specifies the level of encryption that is required for a particular
 location.
 </dd>
+<dt>ErrorPolicy abort-job
+</dt>
+<dd>Specifies that a failed print job should be aborted (discarded) unless otherwise specified for the printer.
+</dd>
+<dt>ErrorPolicy retry-job
+</dt>
+<dd>Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+</dd>
+<dt>ErrorPolicy retry-this-job
+</dt>
+<dd>Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+</dd>
+<dt>ErrorPolicy stop-printer
+</dt>
+<dd>Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+</dd>
 <dt>FilterLimit limit
 </dt>
 <dd></dd>