From 9135aedbb4d91d2e20e7b767c2368eadf6d5a5d4 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 24 Apr 2018 20:31:40 -0400 Subject: [PATCH] Update ErrorPolicy in cupsd.conf man page (Issue #5301) --- CHANGES.md | 6 +++++- doc/help/man-cupsd.conf.html | 6 +++--- man/cupsd.conf.man.in | 14 +++++++------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 9492abd7b..9e25a2ade 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -CHANGES - 2.2.8 - 2018-04-18 +CHANGES - 2.2.8 - 2018-04-24 ============================ @@ -18,7 +18,11 @@ Changes in CUPS v2.2.8 - Added a workaround for certain web browsers that do not support multiple authentication schemes in a single response header (Issue #5289) - Fixed policy limits containing the `All` operation (Issue #5296) +<<<<<<< HEAD - The scheduler was always restarted after idle-exit with systemd (Issue #5297) +======= +- Documentation updates (Issue #5301) +>>>>>>> Update ErrorPolicy in cupsd.conf man page (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 fe4902df7..943895387 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -88,10 +88,10 @@ A value of 0 causes the update to happen as soon as possible, typically within a The default value is "30".
ErrorPolicy abort-job
Specifies that a failed print job should be aborted (discarded) unless otherwise specified for the printer. +
ErrorPolicy retry-current-job +
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
ErrorPolicy retry-job
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. -
ErrorPolicy retry-this-job -
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
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.
FilterLimit limit @@ -605,7 +605,7 @@ Require authentication for accesses from outside the 10. network: subscriptions.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index ab89e156a..aa59a27e0 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -1,8 +1,8 @@ .\" .\" cupsd.conf man page for CUPS. .\" -.\" Copyright 2007-2017 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2018 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the .\" property of Apple Inc. and are protected by Federal copyright @@ -10,7 +10,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" "19 October 2017" "Apple Inc." +.TH cupsd.conf 5 "CUPS" "24 April 2018" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION @@ -132,12 +132,12 @@ The default value is "30". \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 @@ -884,4 +884,4 @@ Require authentication for accesses from outside the 10. network: .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. -- 2.39.2