diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-11-08 09:43:18 -0500 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-11-08 09:43:18 -0500 |
| commit | b167c7fcf86da6c67a50a4a2c090e6919b7503a1 (patch) | |
| tree | 7051439d191e16b69029ff97e1b20d871415594d | |
| parent | f07dbc95aa9bcb82dd4e45b7f23bc87b572b4baf (diff) | |
| download | cups-b167c7fcf86da6c67a50a4a2c090e6919b7503a1.tar.gz | |
Clarify meaning of printer errors (Issue #5404)
| -rw-r--r-- | CHANGES.md | 2 | ||||
| -rw-r--r-- | doc/help/admin.html | 2 | ||||
| -rw-r--r-- | man/lpadmin.man | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md index d3bf37235..95b5c4ce0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,7 +6,7 @@ Changes in CUPS v2.3b6 - Localization update (Issue #5339, Issue #5348, Issue #5362, Issue #5408, Issue #5410) -- Documentation updates (Issue #5369, Issue #5403) +- Documentation updates (Issue #5369, Issue #5403, Issue #5404) - The lpadmin command would create a non-working printer in some error cases (Issue #5305) - The scheduler would crash if an empty `AccessLog` directive was specified diff --git a/doc/help/admin.html b/doc/help/admin.html index ca523ddd7..47fee815d 100644 --- a/doc/help/admin.html +++ b/doc/help/admin.html @@ -140,7 +140,7 @@ direct usb://ZP/LazerJet%20MFP?serial=42</pre> <dd>Sets the default value for the named PPD option. For example, <code>-o PageSize=Legal</code> sets the default page size to US Legal.</dd> <dt><code>-o printer-error-policy=name</code></dt> - <dd>Sets the error handling policy:<dl> + <dd>Sets the policy for errors such as printers that cannot be found or accessed, don't support the format being printed, fail during submission of the print data, or cause one or more filters to crash:<dl> <dt><code>abort-job</code></dt> <dd>Aborts the job on error.</dd> <dt><code>retry-job</code></dt> diff --git a/man/lpadmin.man b/man/lpadmin.man index 19d050b35..61d903379 100644 --- a/man/lpadmin.man +++ b/man/lpadmin.man @@ -127,8 +127,8 @@ The default program is "none". The specified port monitor must be listed in the printer's PPD file. .TP 5 \fB\-o printer-error-policy=\fIname\fR -Sets the error policy to be used when the printer backend is unable to send the job to the printer. -The name must be one of "abort-job", "retry-job", "retry-current-job", or "stop-printer". +Sets the policy for errors such as printers that cannot be found or accessed, don't support the format being printed, fail during submission of the print data, or cause one or more filters to crash. +The name must be one of "abort-job" (abort the job on error), "retry-job" (retry the job at a future time), "retry-current-job" (retry the current job immediately), or "stop-printer" (stop the printer on error). The default error policy is "stop-printer" for printers and "retry-current-job" for classes. .TP 5 |