summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2014-08-14 19:24:43 +0200
committerDidier Raboud <odyx@debian.org>2014-08-14 19:24:43 +0200
commitbfb777710c78378a70ec9f424210ebc7d466efab (patch)
tree09e4c9ad7eb89d057621366e51538c87489f9f79 /man
parenta96f84159b3bcbfc3f14965efd935dd9478c152d (diff)
downloadcups-bfb777710c78378a70ec9f424210ebc7d466efab.tar.gz
Imported Upstream version 1.7.5upstream/1.7.5upstream
Diffstat (limited to 'man')
-rw-r--r--man/cupsd.conf.man.in18
1 files changed, 15 insertions, 3 deletions
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index 3435f393..3e427c33 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,5 +1,5 @@
.\"
-.\" "$Id: cupsd.conf.man.in 11109 2013-07-08 21:15:13Z msweet $"
+.\" "$Id: cupsd.conf.man.in 12060 2014-07-28 14:04:41Z msweet $"
.\"
.\" cupsd.conf man page for CUPS.
.\"
@@ -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.
@@ -521,5 +533,5 @@ http://localhost:631/help
.SH COPYRIGHT
Copyright 2007-2013 by Apple Inc.
.\"
-.\" End of "$Id: cupsd.conf.man.in 11109 2013-07-08 21:15:13Z msweet $".
+.\" End of "$Id: cupsd.conf.man.in 12060 2014-07-28 14:04:41Z msweet $".
.\"