Update man pages for -h option (Issue #357)

diff --git a/CHANGES.md b/CHANGES.md
index 0449417bd9068499f6c09560ea0a368e063e9f2d..2516e232716a76cbb2cf739564a3fc843224dd2b 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ Changes in CUPS v2.4.2 (TBA)
 - Fixed copyright in CUPS Web UI trailer template (Issue #346)
 - mDNS hostname in device uri is not resolved when installaling a permanent
   IPP Everywhere queue (Issues #340, #343)
+- Updated the man pages concerning the `-h` option (Issue #357)
 - Re-added LibreSSL/OpenSSL support (Issue #362)
 - Updated the Solaris smf service file (Issue #368)
 - Fixed a regression in lpoptions option support (Issue #370)

diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html
index d51bb2b913f7afc551f5f5bc3e951a8c35e82372..a0b52369cd3c593eda19ec2f97542c3be9ed0012 100644 (file)
--- a/doc/help/man-cancel.html
+++ b/doc/help/man-cancel.html
@@ -12,6 +12,9 @@ cancel - cancel jobs
 <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
 <b>cancel</b>
 [
+<b>-h</b>
+<i>hostname[:port]</i>
+] [
 <b>-E</b>
 ] [
 <b>-U</b>
@@ -19,9 +22,6 @@ cancel - cancel jobs
 ] [
 <b>-a</b>
 ] [
-<b>-h</b>
-<i>hostname[:port]</i>
-] [
 <b>-u</b>
 <i>username</i>
 ] [
@@ -46,6 +46,7 @@ destinations if none is provided.
 <dd style="margin-left: 5.0em">Forces encryption when connecting to the server.
 <dt><b>-h </b><i>hostname</i>[<i>:port</i>]
 <dd style="margin-left: 5.0em">Specifies an alternate server.
+Note: This option must occur before all others.
 <dt><b>-U </b><i>username</i>
 <dd style="margin-left: 5.0em">Specifies the username to use when connecting to the server.
 <dt><b>-u </b><i>username</i>

diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html
index b3f892ef92519d77186213c2483d7e9aae01355c..e5c98dccbec8638f6bdda7b7469a87020fc7b974 100644 (file)
--- a/doc/help/man-cupsctl.html
+++ b/doc/help/man-cupsctl.html
@@ -12,14 +12,14 @@ cupsctl - configure cupsd.conf options
 <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
 <b>cupsctl</b>
 [
+<b>-h</b>
+<i>server</i>[<b>:</b><i>port</i>]
+] [
 <b>-E</b>
 ] [
 <b>-U</b>
 <i>username</i>
 ] [
-<b>-h</b>
-<i>server</i>[<b>:</b><i>port</i>]
-] [
 <b>--</b>[<b>no-</b>]<b>debug-logging</b>
 ] [
 <b>--</b>[<b>no-</b>]<b>remote-admin</b>
@@ -45,6 +45,7 @@ The following options are recognized:
 <dd style="margin-left: 5.0em">Specifies an alternate username to use when authenticating with the scheduler.
 <dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 <dd style="margin-left: 5.0em">Specifies the server address.
+Note: This option must occur before all others.
 <dt><b>--</b>[<b>no-</b>]<b>debug-logging</b>
 <dd style="margin-left: 5.0em">Enables (disables) debug logging to the <i>error_log</i> file.
 <dt><b>--</b>[<b>no-</b>]<b>remote-admin</b>

diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html
index 81f67d77f461e1a6972c8b51c80fab70e347227b..688454c69997b3e5ef0858c7ab7857d582a425b3 100644 (file)
--- a/doc/help/man-ipptool.html
+++ b/doc/help/man-ipptool.html
@@ -59,6 +59,8 @@ ipptool - perform internet printing protocol requests
 <b>-i</b>
 <i>seconds</i>
 ] [
+<b>-j</b>
+] [
 <b>-n</b>
 <i>repeat-count</i>
 ] [
@@ -150,6 +152,10 @@ This option is incompatible with the <b>-i</b> (interval) and <b>-n</b> (repeat-
 <i>testfile</i>
 should be repeated at the specified interval.
 This option is incompatible with the <b>-X</b> (XML plist output) option.
+<dt><b>-j</b>
+<dd style="margin-left: 5.0em">Specifies that
+<b>ipptool</b>
+will produce JSON output.
 <dt><b>-l</b>
 <dd style="margin-left: 5.0em">Specifies that plain text output is desired.
 <dt><b>-n</b><i> repeat-count</i>

diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html
index f70c088d35e94f9515ba4f7785576d5eaf0b26b0..6442e900d4cd945761fea2efd51095f73e4145ea 100644 (file)
--- a/doc/help/man-lp.html
+++ b/doc/help/man-lp.html
@@ -12,6 +12,8 @@ lp - print files
 <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
 <b>lp</b>
 [
+<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
+] [
 <b>-E</b>
 ] [
 <b>-U</b>
@@ -21,8 +23,6 @@ lp - print files
 ] [
 <b>-d </b><i>destination</i>[<b>/</b><i>instance</i>]
 ] [
-<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
-] [
 <b>-m</b>
 ] [
 <b>-n</b>
@@ -51,6 +51,8 @@ lp - print files
 <br>
 <b>lp</b>
 [
+<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
+] [
 <b>-E</b>
 ] [
 <b>-U</b>
@@ -58,8 +60,6 @@ lp - print files
 ] [
 <b>-c</b>
 ] [
-<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
-] [
 <b>-i</b>
 <i>job-id</i>
 ] [
@@ -106,6 +106,7 @@ In CUPS, print files are always sent to the scheduler via IPP which has the same
 <dd style="margin-left: 5.0em">Prints files to the named printer.
 <dt><b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
 <dd style="margin-left: 5.0em">Chooses an alternate server.
+Note: This option must occur before all others.
 <dt><b>-i </b><i>job-id</i>
 <dd style="margin-left: 5.0em">Specifies an existing job to modify.
 <dt><b>-m</b>

diff --git a/doc/help/man-lpinfo.html b/doc/help/man-lpinfo.html
index a1aed942122f968b6484fb926c0c8fbe62c51803..30df7691cb4920155369f8c95e4af844effc2db5 100644 (file)
--- a/doc/help/man-lpinfo.html
+++ b/doc/help/man-lpinfo.html
@@ -12,10 +12,10 @@ lpinfo - show available devices or drivers (deprecated)
 <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
 <b>lpinfo</b>
 [
-<b>-E</b>
-] [
 <b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 ] [
+<b>-E</b>
+] [
 <b>-l</b>
 ] [
 <b>--device-id</b>
@@ -40,10 +40,10 @@ lpinfo - show available devices or drivers (deprecated)
 <br>
 <b>lpinfo</b>
 [
-<b>-E</b>
-] [
 <b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 ] [
+<b>-E</b>
+] [
 <b>-l</b>
 ] [
 <b>--exclude-schemes</b>
@@ -66,6 +66,7 @@ The first form (<i>-m</i>) lists the available drivers, while the second form (<
 <dd style="margin-left: 5.0em">Forces encryption when connecting to the server.
 <dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 <dd style="margin-left: 5.0em">Selects an alternate server.
+Note: This option must occur before all others.
 <dt><b>-l</b>
 <dd style="margin-left: 5.0em">Shows a "long" listing of devices or drivers.
 <dt><b>--device-id </b><i>device-id-string</i>

diff --git a/doc/help/man-lpmove.html b/doc/help/man-lpmove.html
index d8019ee25a2fdb5b669547211749229e06b47996..b0db753f907b60514594effa17d61df121053614 100644 (file)
--- a/doc/help/man-lpmove.html
+++ b/doc/help/man-lpmove.html
@@ -12,10 +12,10 @@ lpmove - move a job or all jobs to a new destination
 <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
 <b>lpmove</b>
 [
-<b>-E</b>
-] [
 <b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 ] [
+<b>-E</b>
+] [
 <b>-U</b>
 <i>username</i>
 ]
@@ -24,10 +24,10 @@ lpmove - move a job or all jobs to a new destination
 <br>
 <b>lpmove</b>
 [
-<b>-E</b>
-] [
 <b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 ] [
+<b>-E</b>
+] [
 <b>-U</b>
 <i>username</i>
 ]
@@ -44,6 +44,7 @@ The <b>lpmove</b> command supports the following options:
 <dd style="margin-left: 5.0em">Specifies an alternate username.
 <dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 <dd style="margin-left: 5.0em">Specifies an alternate server.
+Note: This option must occur before all others.
 </dl>
 <h2 class="title"><a name="EXAMPLES">Examples</a></h2>
 Move job 123 from "oldprinter" to "newprinter":

diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html
index 6dda87f6462776420d2672290feb36224198f95e..6af78290b9f7adaeee6d155bc1e4e68349e5a3c0 100644 (file)
--- a/doc/help/man-lpoptions.html
+++ b/doc/help/man-lpoptions.html
@@ -12,9 +12,9 @@ lpoptions - display or set printer options and defaults
 <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
 <b>lpoptions</b>
 [
-<b>-E</b>
-] [
 <b>-h </b><i>server</i>[<b>:</b><i>port</i>]
+] [
+<b>-E</b>
 ]
 <b>-d </b><i>destination</i>[<b>/</b><i>instance</i>]
 [
@@ -23,20 +23,20 @@ lpoptions - display or set printer options and defaults
 <br>
 <b>lpoptions</b>
 [
-<b>-E</b>
-] [
 <b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 ] [
+<b>-E</b>
+] [
 <b>-p </b><i>destination</i>[<b>/</b><i>instance</i>]
 ]
 <b>-o </b><i>option</i>[<b>=</b><i>value</i>] ...
 <br>
 <b>lpoptions</b>
 [
-<b>-E</b>
-] [
 <b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 ] [
+<b>-E</b>
+] [
 <b>-p </b><i>destination</i>[<b>/</b><i>instance</i>]
 ]
 <b>-r</b>
@@ -44,9 +44,9 @@ lpoptions - display or set printer options and defaults
 <br>
 <b>lpoptions</b>
 [
-<b>-E</b>
-] [
 <b>-h </b><i>server</i>[<b>:</b><i>port</i>]
+] [
+<b>-E</b>
 ]
 <b>-x </b><i>destination</i>[<b>/</b><i>instance</i>]
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
@@ -72,6 +72,7 @@ If <i>instance</i> is supplied then that particular instance is used.
 This option overrides the system default printer for the current user.
 <dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 <dd style="margin-left: 5.0em">Uses an alternate server.
+Note: This option must occur before all others.
 <dt><b>-l</b>
 <dd style="margin-left: 5.0em">Lists the printer specific options and their current settings.
 <dt><b>-o </b><i>option</i>[<b>=</b><i>value</i>]

diff --git a/doc/help/man-lpq.html b/doc/help/man-lpq.html
index 1c9e704ff3442f8570d9078a061f241f5b31e7d1..19e536d3c8b8699553916b0370486df0f8331fd8 100644 (file)
--- a/doc/help/man-lpq.html
+++ b/doc/help/man-lpq.html
@@ -12,13 +12,13 @@ lpq - show printer queue status
 <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
 <b>lpq</b>
 [
+<b>-h </b><i>server</i>[<b>:</b><i>port</i>]
+] [
 <b>-E</b>
 ] [
 <b>-U</b>
 <i>username</i>
 ] [
-<b>-h </b><i>server</i>[<b>:</b><i>port</i>]
-] [
 <b>-P </b><i>destination</i>[<b>/</b><i>instance</i>]
 ] [
 <b>-a</b>
@@ -44,6 +44,7 @@ Jobs queued on the default destination will be shown if no printer or class is s
 <dd style="margin-left: 5.0em">Reports jobs on all printers.
 <dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 <dd style="margin-left: 5.0em">Specifies an alternate server.
+Note: This option must occur before all others.
 <dt><b>-l</b>
 <dd style="margin-left: 5.0em">Requests a more verbose (long) reporting format.
 </dl>

diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html
index d044ab1a828aeced1db922dc4d4f3b372b8f333a..f9b19e1fe79a78f726f595688f58b9062078f947 100644 (file)
--- a/doc/help/man-lpr.html
+++ b/doc/help/man-lpr.html
@@ -12,10 +12,10 @@ lpr - print files
 <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
 <b>lpr</b>
 [
-<b>-E</b>
-] [
 <b>-H </b><i>server</i>[<b>:</b><i>port</i>]
 ] [
+<b>-E</b>
+] [
 <b>-U</b>
 <i>username</i>
 ] [
@@ -67,6 +67,7 @@ The following options are recognized by <i>lpr</i>:
 <dd style="margin-left: 5.0em">Forces encryption when connecting to the server.
 <dt><b>-H </b><i>server</i>[<b>:</b><i>port</i>]
 <dd style="margin-left: 5.0em">Specifies an alternate server.
+Note: This option must occur before all others.
 <dt><b>-C "</b><i>name</i><b>"</b>
 <dd style="margin-left: 5.0em"><dt><b>-J "</b><i>name</i><b>"</b>
 <dd style="margin-left: 5.0em"><dt><b>-T "</b><i>name</i><b>"</b>

diff --git a/doc/help/man-lprm.html b/doc/help/man-lprm.html
index 7410320a37ba3c18a9ee82b10f786628d37ef716..dbe7f20de4ec1004df0e7a507e1a3080d02591a3 100644 (file)
--- a/doc/help/man-lprm.html
+++ b/doc/help/man-lprm.html
@@ -12,14 +12,13 @@ lprm - cancel print jobs
 <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
 <b>lprm</b>
 [
+<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
+] [
 <b>-E</b>
 ] [
 <b>-U</b>
 <i>username</i>
 ] [
-<b>-h</b>
-<i>server</i>[<i>:port</i>]
-] [
 <b>-P</b>
 <i>destination</i>[<i>/instance</i>]
 ] [
@@ -45,6 +44,7 @@ command supports the following options:
 <dd style="margin-left: 5.0em">Specifies an alternate username.
 <dt><b>-h </b><i>server</i>[<i>:port</i>]
 <dd style="margin-left: 5.0em">Specifies an alternate server.
+Note: This option must occur before all others.
 </dl>
 <h2 class="title"><a name="CONFORMING_TO">Conforming To</a></h2>
 The CUPS version of

diff --git a/doc/help/man-lpstat.html b/doc/help/man-lpstat.html
index f23089bbeae66869f3d90f01789ad601ac16cb23..2c5dedc7cb76e9e8c43cad31704eae56ac807fc6 100644 (file)
--- a/doc/help/man-lpstat.html
+++ b/doc/help/man-lpstat.html
@@ -12,6 +12,8 @@ lpstat - print cups status information
 <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
 <b>lpstat</b>
 [
+<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
+] [
 <b>-E</b>
 ] [
 <b>-H</b>
@@ -19,8 +21,6 @@ lpstat - print cups status information
 <b>-U</b>
 <i>username</i>
 ] [
-<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
-] [
 <b>-l</b>
 ] [
 <b>-W</b>
@@ -91,6 +91,7 @@ If no classes are specified then all classes are listed.
 <dd style="margin-left: 5.0em">Shows all available destinations on the local network.
 <dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 <dd style="margin-left: 5.0em">Specifies an alternate server.
+Note: This option must occur before all others.
 <dt><b>-l</b>
 <dd style="margin-left: 5.0em">Shows a long listing of printers, classes, or jobs.
 <dt><b>-o </b>[<i>destination(s)</i>]

diff --git a/man/cancel.1 b/man/cancel.1
index 34a5d9fc09ad39a59c5e9e3b29cc10a39582042b..caea0ed69bfbccf3668b7a2a6f9fab607d6ea40e 100644 (file)
--- a/man/cancel.1
+++ b/man/cancel.1
@@ -8,12 +8,15 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH cancel 1 "CUPS" "2021-02-28" "OpenPrinting"
+.TH cancel 1 "CUPS" "2022-05-02" "OpenPrinting"
 .SH NAME
 cancel \- cancel jobs
 .SH SYNOPSIS
 .B cancel
 [
+.B \-h
+.I hostname[:port]
+] [
 .B \-E
 ] [
 .B \-U
@@ -21,9 +24,6 @@ cancel \- cancel jobs
 ] [
 .B \-a
 ] [
-.B \-h
-.I hostname[:port]
-] [
 .B \-u
 .I username
 ] [
@@ -50,6 +50,7 @@ Forces encryption when connecting to the server.
 .TP 5
 \fB\-h \fIhostname\fR[\fI:port\fR]
 Specifies an alternate server.
+Note: This option must occur before all others.
 .TP 5
 \fB\-U \fIusername\fR
 Specifies the username to use when connecting to the server.

diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 1b1ff418329e938172690db901a9bf37aca516f5..7e50d07ac02cbe44010aa64ef5eabdc52eb9366d 100644 (file)
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -8,20 +8,20 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH cupsctl 8 "CUPS" "2021-02-28" "OpenPrinting"
+.TH cupsctl 8 "CUPS" "2022-05-02" "OpenPrinting"
 .SH NAME
 cupsctl \- configure cupsd.conf options
 .SH SYNOPSIS
 .B cupsctl
 [
+.B \-h
+\fIserver\fR[\fB:\fIport\fR]
+] [
 .B \-E
 ] [
 .B \-U
 .I username
 ] [
-.B \-h
-\fIserver\fR[\fB:\fIport\fR]
-] [
 \fB\-\-\fR[\fBno\-\fR]\fBdebug\-logging\fR
 ] [
 \fB\-\-\fR[\fBno\-\fR]\fBremote\-admin\fR
@@ -49,6 +49,7 @@ Specifies an alternate username to use when authenticating with the scheduler.
 .TP 5
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 Specifies the server address.
+Note: This option must occur before all others.
 .TP 5
 \fB\-\-\fR[\fBno\-\fR]\fBdebug\-logging\fR
 Enables (disables) debug logging to the \fIerror_log\fR file.

diff --git a/man/lp.1 b/man/lp.1
index a54f904a5411f07cd5e2adae11d9b86f377f0784..4bdd2de7b6f21cff2fb638df03352c8c4990298b 100644 (file)
--- a/man/lp.1
+++ b/man/lp.1
@@ -8,12 +8,14 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH lp 1 "CUPS" "2021-02-28" "OpenPrinting"
+.TH lp 1 "CUPS" "2022-05-02" "OpenPrinting"
 .SH NAME
 lp \- print files
 .SH SYNOPSIS
 .B lp
 [
+\fB\-h \fIhostname\fR[\fB:\fIport\fR]
+] [
 .B \-E
 ] [
 .B \-U
@@ -23,8 +25,6 @@ lp \- print files
 ] [
 \fB\-d \fIdestination\fR[\fB/\fIinstance\fR]
 ] [
-\fB\-h \fIhostname\fR[\fB:\fIport\fR]
-] [
 .B \-m
 ] [
 .B \-n
@@ -53,6 +53,8 @@ lp \- print files
 .br
 .B lp
 [
+\fB\-h \fIhostname\fR[\fB:\fIport\fR]
+] [
 .B \-E
 ] [
 .B \-U
@@ -60,8 +62,6 @@ lp \- print files
 ] [
 .B \-c
 ] [
-\fB\-h \fIhostname\fR[\fB:\fIport\fR]
-] [
 .B \-i
 .I job-id
 ] [
@@ -113,6 +113,7 @@ Prints files to the named printer.
 .TP 5
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 Chooses an alternate server.
+Note: This option must occur before all others.
 .TP 5
 \fB\-i \fIjob-id\fR
 Specifies an existing job to modify.

diff --git a/man/lpinfo.8 b/man/lpinfo.8
index d238f9a605095be7ed7527b46ba59186617172d8..d44b568d22e39f90b30ef3a22fed7a9a2fdaf319 100644 (file)
--- a/man/lpinfo.8
+++ b/man/lpinfo.8
@@ -8,16 +8,16 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH lpinfo 8 "CUPS" "2021-02-28" "OpenPrinting"
+.TH lpinfo 8 "CUPS" "2022-05-02" "OpenPrinting"
 .SH NAME
 lpinfo \- show available devices or drivers (deprecated)
 .SH SYNOPSIS
 .B lpinfo
 [
-.B \-E
-] [
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 ] [
+.B \-E
+] [
 .B \-l
 ] [
 .B \-\-device\-id
@@ -42,10 +42,10 @@ lpinfo \- show available devices or drivers (deprecated)
 .br
 .B lpinfo
 [
-.B \-E
-] [
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 ] [
+.B \-E
+] [
 .B \-l
 ] [
 .B \-\-exclude\-schemes
@@ -69,6 +69,7 @@ Forces encryption when connecting to the server.
 .TP 5
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 Selects an alternate server.
+Note: This option must occur before all others.
 .TP 5
 .B \-l
 Shows a "long" listing of devices or drivers.

diff --git a/man/lpmove.8 b/man/lpmove.8
index af3c6b63c7a50204672dda3428f8f154737555fa..62adba654eabc15171ca3a2ea6156c764c705dc0 100644 (file)
--- a/man/lpmove.8
+++ b/man/lpmove.8
@@ -8,16 +8,16 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH lpmove 8 "CUPS" "2021-02-28" "OpenPrinting"
+.TH lpmove 8 "CUPS" "2022-05-02" "OpenPrinting"
 .SH NAME
 lpmove \- move a job or all jobs to a new destination
 .SH SYNOPSIS
 .B lpmove
 [
-.B \-E
-] [
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 ] [
+.B \-E
+] [
 .B \-U
 .I username
 ]
@@ -26,10 +26,10 @@ lpmove \- move a job or all jobs to a new destination
 .br
 .B lpmove
 [
-.B \-E
-] [
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 ] [
+.B \-E
+] [
 .B \-U
 .I username
 ]
@@ -48,6 +48,7 @@ Specifies an alternate username.
 .TP 5
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 Specifies an alternate server.
+Note: This option must occur before all others.
 .SH EXAMPLES
 Move job 123 from "oldprinter" to "newprinter":
 .nf

diff --git a/man/lpoptions.1 b/man/lpoptions.1
index 372f46a3711230aabf1f4c5678ae7979e0410b72..2eb5b6010c145b3041a072c9766e4005580171fc 100644 (file)
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -8,15 +8,15 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH lpoptions 1 "CUPS" "2021-02-28" "OpenPrinting"
+.TH lpoptions 1 "CUPS" "2022-05-02" "OpenPrinting"
 .SH NAME
 lpoptions \- display or set printer options and defaults
 .SH SYNOPSIS
 .B lpoptions
 [
-.B \-E
-] [
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
+] [
+.B \-E
 ]
 \fB\-d \fIdestination\fR[\fB/\fIinstance\fR]
 [
@@ -25,20 +25,20 @@ lpoptions \- display or set printer options and defaults
 .br
 .B lpoptions
 [
-.B \-E
-] [
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 ] [
+.B \-E
+] [
 \fB\-p \fIdestination\fR[\fB/\fIinstance\fR]
 ]
 \fB\-o \fIoption\fR[\fB=\fIvalue\fR] ...
 .br
 .B lpoptions
 [
-.B \-E
-] [
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 ] [
+.B \-E
+] [
 \fB\-p \fIdestination\fR[\fB/\fIinstance\fR]
 ]
 .B \-r
@@ -46,9 +46,9 @@ lpoptions \- display or set printer options and defaults
 .br
 .B lpoptions
 [
-.B \-E
-] [
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
+] [
+.B \-E
 ]
 \fB\-x \fIdestination\fR[\fB/\fIinstance\fR]
 .SH DESCRIPTION
@@ -79,6 +79,7 @@ This option overrides the system default printer for the current user.
 .TP 5
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 Uses an alternate server.
+Note: This option must occur before all others.
 .TP 5
 .B \-l
 Lists the printer specific options and their current settings.

diff --git a/man/lpq.1 b/man/lpq.1
index ce23a6c81da930bcb877027c6611d03499788d63..a81633ecb819aaf377c275a91b69b229472a00d6 100644 (file)
--- a/man/lpq.1
+++ b/man/lpq.1
@@ -8,19 +8,19 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH lpq 1 "CUPS" "2021-02-28" "OpenPrinting"
+.TH lpq 1 "CUPS" "2022-05-02" "OpenPrinting"
 .SH NAME
 lpq \- show printer queue status
 .SH SYNOPSIS
 .B lpq
 [
+\fB\-h \fIserver\fR[\fB:\fIport\fR]
+] [
 .B \-E
 ] [
 .B \-U
 .I username
 ] [
-\fB\-h \fIserver\fR[\fB:\fIport\fR]
-] [
 \fB\-P \fIdestination\fR[\fB/\fIinstance\fR]
 ] [
 .B \-a
@@ -51,6 +51,7 @@ Reports jobs on all printers.
 .TP 5
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 Specifies an alternate server.
+Note: This option must occur before all others.
 .TP 5
 .B \-l
 Requests a more verbose (long) reporting format.

diff --git a/man/lpr.1 b/man/lpr.1
index e5f9f901860e2856e509aefa410a01a7e9f8686d..77a62b3057a9556edd744daab2c75423845a7d8f 100644 (file)
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -8,16 +8,16 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH lpr 1 "CUPS" "2021-02-28" "OpenPrinting"
+.TH lpr 1 "CUPS" "2022-05-02" "OpenPrinting"
 .SH NAME
 lpr \- print files
 .SH SYNOPSIS
 .B lpr
 [
-.B \-E
-] [
 \fB\-H \fIserver\fR[\fB:\fIport\fR]
 ] [
+.B \-E
+] [
 .B \-U
 .I username
 ] [
@@ -70,6 +70,7 @@ Forces encryption when connecting to the server.
 .TP 5
 \fB\-H \fIserver\fR[\fB:\fIport\fR]
 Specifies an alternate server.
+Note: This option must occur before all others.
 .TP 5
 \fB\-C "\fIname\fB"\fR
 .TP 5

diff --git a/man/lprm.1 b/man/lprm.1
index 0941665393e94d952c7a9c2687a7356834de2461..0cf88ac51edc52884b6780a1e2c5dbec260108e3 100644 (file)
--- a/man/lprm.1
+++ b/man/lprm.1
@@ -8,20 +8,19 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH lprm 1 "CUPS" "2021-02-28" "OpenPrinting"
+.TH lprm 1 "CUPS" "2022-05-02" "OpenPrinting"
 .SH NAME
 lprm \- cancel print jobs
 .SH SYNOPSIS
 .B lprm
 [
+\fB\-h \fIhostname\fR[\fB:\fIport\fR]
+] [
 .B \-E
 ] [
 .B \-U
 .I username
 ] [
-.B \-h
-.IR server [ :port ]
-] [
 .B \-P
 .IR destination [ /instance ]
 ] [
@@ -50,6 +49,7 @@ Specifies an alternate username.
 .TP 5
 \fB\-h \fIserver\fR[\fI:port\fR]
 Specifies an alternate server.
+Note: This option must occur before all others.
 .SH CONFORMING TO
 The CUPS version of
 .B lprm

diff --git a/man/lpstat.1 b/man/lpstat.1
index 0a10cd9bcd9df8fcaa83c9349a2ff157e81f6b6b..88acff7b315a96fac160d0090885ca05713a4457 100644 (file)
--- a/man/lpstat.1
+++ b/man/lpstat.1
@@ -2,17 +2,19 @@
 .\" lpstat man page for CUPS.
 .\"
 .\" Copyright © 2021-2022 by OpenPrinting.
-.\" Copyright 2007-2019 by Apple Inc.
-.\" Copyright 1997-2006 by Easy Software Products.
+.\" Copyright © 2007-2019 by Apple Inc.
+.\" Copyright © 1997-2006 by Easy Software Products.
 .\"
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
 .\"
-.TH lpstat 1 "CUPS" "2021-02-28" "OpenPrinting"
+.TH lpstat 1 "CUPS" "2022-05-02" "OpenPrinting"
 .SH NAME
 lpstat \- print cups status information
 .SH SYNOPSIS
 .B lpstat
 [
+\fB\-h \fIhostname\fR[\fB:\fIport\fR]
+] [
 .B \-E
 ] [
 .B \-H
@@ -20,8 +22,6 @@ lpstat \- print cups status information
 .B \-U
 .I username
 ] [
-\fB\-h \fIhostname\fR[\fB:\fIport\fR]
-] [
 .B \-l
 ] [
 .B \-W
@@ -101,6 +101,7 @@ Shows all available destinations on the local network.
 .TP 5
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 Specifies an alternate server.
+Note: This option must occur before all others.
 .TP 5
 .B \-l
 Shows a long listing of printers, classes, or jobs.