From: Michael R Sweet <msweet@msweet.org>
Date: Mon, 16 Sep 2024 16:38:55 +0000 (-0400)
Subject: Update the cancel man page (Issue #984)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9035ac9903c4183c1a354d2d48e2cb829dfa713;p=thirdparty%2Fcups.git

Update the cancel man page (Issue #984)
---

diff --git a/CHANGES.md b/CHANGES.md
index 0b7af968b5..197b317a07 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -32,6 +32,7 @@ Changes in CUPS v2.5b1 (TBA)
 - Added a systemd slice to the systemd services included with the scheduler
 - Added localizations for deprecated IPP attributes/options (Issue #1020)
 - Added support for specifying permissions with the `cupsFileOpen` API.
+- Updated documents (Issue #984)
 - Updated CUPS to require TLS support - OpenSSL, GNUTLS and LibreSSL are
   supported.
 - Updated CUPS to require ZLIB.
diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html
index 3a18fac965..8b00f9e993 100644
--- a/doc/help/man-cancel.html
+++ b/doc/help/man-cancel.html
@@ -42,8 +42,7 @@ If no <em>destination</em> or <em>id</em> is specified, the currently printing j
 <p>The following options are recognized by <strong>cancel</strong>:
 </p>
     <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>-a</strong><br>
-Cancel all jobs on the named destination, or all jobs on all
-destinations if none is provided.
+Cancel all jobs on the named destination, or all jobs on all destinations if none is provided.
 </p>
     <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>-E</strong><br>
 Forces encryption when connecting to the server.
@@ -83,9 +82,16 @@ Deletes job data files in addition to canceling.
     cancel -a
 </pre>
     <h2 id="cancel-1.notes">Notes</h2>
-<p>Administrators wishing to prevent unauthorized cancellation of jobs via the <em>-u</em> option should require authentication for Cancel-Jobs operations in
-<strong>cupsd.conf</strong>(5).
+<p>The
+<strong>-a</strong>
+and
+<strong>-u</strong><em> username</em>
+
+options require administrative access.
+These restrictions are part of the operation policies defined in the
+<strong>cupsd.conf</strong>(5)
 
+file for the &quot;Cancel-Jobs&quot; and &quot;Cancel-My-Jobs&quot; operations, respectively.
 </p>
     <h2 id="cancel-1.see-also">See Also</h2>
 <p><strong>cupsd.conf</strong>(5),
diff --git a/man/cancel.1 b/man/cancel.1
index ef510930fb..ff1887edde 100644
--- a/man/cancel.1
+++ b/man/cancel.1
@@ -8,7 +8,7 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH cancel 1 "CUPS" "2022-05-02" "OpenPrinting"
+.TH cancel 1 "CUPS" "2024-09-16" "OpenPrinting"
 .SH NAME
 cancel \- cancel jobs
 .SH SYNOPSIS
@@ -42,8 +42,7 @@ If no \fIdestination\fR or \fIid\fR is specified, the currently printing job on
 The following options are recognized by \fBcancel\fR:
 .TP 5
 .B \-a
-Cancel all jobs on the named destination, or all jobs on all
-destinations if none is provided.
+Cancel all jobs on the named destination, or all jobs on all destinations if none is provided.
 .TP 5
 .B \-E
 Forces encryption when connecting to the server.
@@ -81,8 +80,14 @@ Cancel all jobs:
     cancel \-a
 .fi
 .SH NOTES
-Administrators wishing to prevent unauthorized cancellation of jobs via the \fI\-u\fR option should require authentication for Cancel-Jobs operations in
-.BR cupsd.conf (5).
+The
+.B \-a
+and
+.BI \-u " username"
+options require administrative access.
+These restrictions are part of the operation policies defined in the
+.BR cupsd.conf (5)
+file for the "Cancel-Jobs" and "Cancel-My-Jobs" operations, respectively.
 .SH SEE ALSO
 .BR cupsd.conf (5),
 .BR lp (1),