Clarify meaning of printer errors (Issue #5404)

diff --git a/CHANGES.md b/CHANGES.md
index d3bf37235aecc9d9c06057df5c2591cc7cb95626..95b5c4ce09b7101f58d0ee9b5cb427de53e7436e 100644 (file)
--- 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 ca523ddd78fbf439e5876ed4554c858d719a8387..47fee815d09837aa95a3651d534b51bacea04bda 100644 (file)
--- 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 19d050b3555a934787042f05848aad98d2831b14..61d9033799672d6a584edef9188a5266462112c8 100644 (file)
--- 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