diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-04-24 20:28:36 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-04-24 20:28:36 -0400 |
| commit | b95156db4ccca88324b2e075b2a9f64240469fa1 (patch) | |
| tree | f0311c0dc30b4fabd6b1f80fce4eddce1f4753a5 | |
| parent | ff82ce17bf30d8e26022520afb69e45745e48180 (diff) | |
Update ErrorPolicy in cupsd.conf man page (Issue #5301)
| -rw-r--r-- | CHANGES.md | 3 | ||||
| -rw-r--r-- | doc/help/man-cupsd.conf.html | 4 | ||||
| -rw-r--r-- | man/cupsd.conf.man.in | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/CHANGES.md b/CHANGES.md index a5b17c1f7..e257f8bc2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -CHANGES - 2.3rc1 - 2018-04-18 +CHANGES - 2.3rc1 - 2018-04-24 ============================= Changes in CUPS v2.3rc1 @@ -14,6 +14,7 @@ Changes in CUPS v2.3rc1 authentication schemes in a single response header (Issue #5289) - Fixed policy limits containing the `All` operation (Issue #5296) - The scheduler was always restarted after idle-exit with systemd (Issue #5297) +- Documentation updates (Issue #5301) - Fax queues did not support pause (p) or wait-for-dialtone (w) characters (rdar://39212256) - Fixed a parsing bug in the new authentication code. diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index 77428bdb6..0fff92d2e 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -95,10 +95,10 @@ The default value is "30". The default is typically the server's ".local" hostname. <dt><a name="ErrorPolicy"></a><b>ErrorPolicy abort-job</b> <dd style="margin-left: 5.0em">Specifies that a failed print job should be aborted (discarded) unless otherwise specified for the printer. +<dt><b>ErrorPolicy retry-current-job</b> +<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer. <dt><b>ErrorPolicy retry-job</b> <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. -<dt><b>ErrorPolicy retry-this-job</b> -<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer. <dt><b>ErrorPolicy stop-printer</b> <dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default. <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i> diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index 4a7f9e50f..3ffc80e42 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -6,7 +6,7 @@ .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. .\" -.TH cupsd.conf 5 "CUPS" "9 November 2017" "Apple Inc." +.TH cupsd.conf 5 "CUPS" "24 April 2018" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION @@ -139,12 +139,12 @@ The default is typically the server's ".local" hostname. \fBErrorPolicy abort-job\fR Specifies that a failed print job should be aborted (discarded) unless otherwise specified for the printer. .TP 5 +\fBErrorPolicy retry-current-job\fR +Specifies that a failed print job should be retried immediately 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. .\"#FilterLimit |