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 ae4011fb93d2b2eae5b42aa3325150f5355e113c..d05ce49e61e3c737d53a17557e521dfef5aa78bd 100644 (file)
--- 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 05d3b39b85054222b8f217450e677368ff1ee024..26cb7c03ca66d321cd9eaf57867d595cd72bc2f1 100644 (file)
--- 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 489dc2a1e4adf2cf853915f21a9c85a6282c690d..de91fe8a8f0eecab5bfdf4c259cf5110d52b8e5c 100644 (file)
--- 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 227ccfe2fb5669bda0888edf5c6baf6cc30113e1..542d9c1593334508ae4be44de05d989921d79ed7 100644 (file)
--- 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>