Blame SOURCES/0001-Update-man-pages-for-h-option-Issue-357.patch

b406c6
From 4d6787bd98c2fac8dcc58f34125d299d82e622aa Mon Sep 17 00:00:00 2001
b406c6
From: Michael R Sweet <michael.r.sweet@gmail.com>
b406c6
Date: Mon, 2 May 2022 15:35:20 -0400
b406c6
Subject: [PATCH] Update man pages for -h option (Issue #357)
b406c6
b406c6
---
b406c6
 CHANGES.md                  |  1 +
b406c6
 doc/help/man-cancel.html    |  7 ++++---
b406c6
 doc/help/man-cupsctl.html   |  7 ++++---
b406c6
 doc/help/man-ipptool.html   |  6 ++++++
b406c6
 doc/help/man-lp.html        |  9 +++++----
b406c6
 doc/help/man-lpinfo.html    |  9 +++++----
b406c6
 doc/help/man-lpmove.html    |  9 +++++----
b406c6
 doc/help/man-lpoptions.html | 17 +++++++++--------
b406c6
 doc/help/man-lpq.html       |  5 +++--
b406c6
 doc/help/man-lpr.html       |  5 +++--
b406c6
 doc/help/man-lprm.html      |  6 +++---
b406c6
 doc/help/man-lpstat.html    |  5 +++--
b406c6
 man/cancel.1                |  9 +++++----
b406c6
 man/cupsctl.8               |  9 +++++----
b406c6
 man/lp.1                    | 11 ++++++-----
b406c6
 man/lpinfo.8                | 11 ++++++-----
b406c6
 man/lpmove.8                | 11 ++++++-----
b406c6
 man/lpoptions.1             | 19 ++++++++++---------
b406c6
 man/lpq.1                   |  7 ++++---
b406c6
 man/lpr.1                   |  7 ++++---
b406c6
 man/lprm.1                  |  8 ++++----
b406c6
 man/lpstat.1                | 11 ++++++-----
b406c6
 22 files changed, 107 insertions(+), 82 deletions(-)
b406c6
b406c6
diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html
b406c6
index d51bb2b91..a0b52369c 100644
b406c6
--- a/doc/help/man-cancel.html
b406c6
+++ b/doc/help/man-cancel.html
b406c6
@@ -12,6 +12,9 @@ cancel - cancel jobs
b406c6
 

Synopsis

b406c6
 cancel
b406c6
 [
b406c6
+-h
b406c6
+hostname[:port]
b406c6
+] [
b406c6
 -E
b406c6
 ] [
b406c6
 -U
b406c6
@@ -19,9 +22,6 @@ cancel - cancel jobs
b406c6
 ] [
b406c6
 -a
b406c6
 ] [
b406c6
--h
b406c6
-hostname[:port]
b406c6
-] [
b406c6
 -u
b406c6
 username
b406c6
 ] [
b406c6
@@ -46,6 +46,7 @@ destinations if none is provided.
b406c6
 
Forces encryption when connecting to the server.
b406c6
 
-h hostname[:port]
b406c6
 
Specifies an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 
-U username
b406c6
 
Specifies the username to use when connecting to the server.
b406c6
 
-u username
b406c6
diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html
b406c6
index b3f892ef9..e5c98dccb 100644
b406c6
--- a/doc/help/man-cupsctl.html
b406c6
+++ b/doc/help/man-cupsctl.html
b406c6
@@ -12,14 +12,14 @@ cupsctl - configure cupsd.conf options
b406c6
 

Synopsis

b406c6
 cupsctl
b406c6
 [
b406c6
+-h
b406c6
+server[:port]
b406c6
+] [
b406c6
 -E
b406c6
 ] [
b406c6
 -U
b406c6
 username
b406c6
 ] [
b406c6
--h
b406c6
-server[:port]
b406c6
-] [
b406c6
 --[no-]debug-logging
b406c6
 ] [
b406c6
 --[no-]remote-admin
b406c6
@@ -45,6 +45,7 @@ The following options are recognized:
b406c6
 
Specifies an alternate username to use when authenticating with the scheduler.
b406c6
 
-h server[:port]
b406c6
 
Specifies the server address.
b406c6
+Note: This option must occur before all others.
b406c6
 
--[no-]debug-logging
b406c6
 
Enables (disables) debug logging to the error_log file.
b406c6
 
--[no-]remote-admin
b406c6
diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html
b406c6
index 81f67d77f..688454c69 100644
b406c6
--- a/doc/help/man-ipptool.html
b406c6
+++ b/doc/help/man-ipptool.html
b406c6
@@ -59,6 +59,8 @@ ipptool - perform internet printing protocol requests
b406c6
 -i
b406c6
 seconds
b406c6
 ] [
b406c6
+-j
b406c6
+] [
b406c6
 -n
b406c6
 repeat-count
b406c6
 ] [
b406c6
@@ -150,6 +152,10 @@ This option is incompatible with the -i (interval) and -n (repeat-
b406c6
 testfile
b406c6
 should be repeated at the specified interval.
b406c6
 This option is incompatible with the -X (XML plist output) option.
b406c6
+
-j
b406c6
+
Specifies that
b406c6
+ipptool
b406c6
+will produce JSON output.
b406c6
 
-l
b406c6
 
Specifies that plain text output is desired.
b406c6
 
-n repeat-count
b406c6
diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html
b406c6
index f70c088d3..6442e900d 100644
b406c6
--- a/doc/help/man-lp.html
b406c6
+++ b/doc/help/man-lp.html
b406c6
@@ -12,6 +12,8 @@ lp - print files
b406c6
 

Synopsis

b406c6
 lp
b406c6
 [
b406c6
+-h hostname[:port]
b406c6
+] [
b406c6
 -E
b406c6
 ] [
b406c6
 -U
b406c6
@@ -21,8 +23,6 @@ lp - print files
b406c6
 ] [
b406c6
 -d destination[/instance]
b406c6
 ] [
b406c6
--h hostname[:port]
b406c6
-] [
b406c6
 -m
b406c6
 ] [
b406c6
 -n
b406c6
@@ -51,6 +51,8 @@ lp - print files
b406c6
 
b406c6
 lp
b406c6
 [
b406c6
+-h hostname[:port]
b406c6
+] [
b406c6
 -E
b406c6
 ] [
b406c6
 -U
b406c6
@@ -58,8 +60,6 @@ lp - print files
b406c6
 ] [
b406c6
 -c
b406c6
 ] [
b406c6
--h hostname[:port]
b406c6
-] [
b406c6
 -i
b406c6
 job-id
b406c6
 ] [
b406c6
@@ -106,6 +106,7 @@ In CUPS, print files are always sent to the scheduler via IPP which has the same
b406c6
 
Prints files to the named printer.
b406c6
 
-h hostname[:port]
b406c6
 
Chooses an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 
-i job-id
b406c6
 
Specifies an existing job to modify.
b406c6
 
-m
b406c6
diff --git a/doc/help/man-lpinfo.html b/doc/help/man-lpinfo.html
b406c6
index a1aed9421..30df7691c 100644
b406c6
--- a/doc/help/man-lpinfo.html
b406c6
+++ b/doc/help/man-lpinfo.html
b406c6
@@ -12,10 +12,10 @@ lpinfo - show available devices or drivers (deprecated)
b406c6
 

Synopsis

b406c6
 lpinfo
b406c6
 [
b406c6
--E
b406c6
-] [
b406c6
 -h server[:port]
b406c6
 ] [
b406c6
+-E
b406c6
+] [
b406c6
 -l
b406c6
 ] [
b406c6
 --device-id
b406c6
@@ -40,10 +40,10 @@ lpinfo - show available devices or drivers (deprecated)
b406c6
 
b406c6
 lpinfo
b406c6
 [
b406c6
--E
b406c6
-] [
b406c6
 -h server[:port]
b406c6
 ] [
b406c6
+-E
b406c6
+] [
b406c6
 -l
b406c6
 ] [
b406c6
 --exclude-schemes
b406c6
@@ -66,6 +66,7 @@ The first form (-m) lists the available drivers, while the second form (<
b406c6
 
Forces encryption when connecting to the server.
b406c6
 
-h server[:port]
b406c6
 
Selects an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 
-l
b406c6
 
Shows a "long" listing of devices or drivers.
b406c6
 
--device-id device-id-string
b406c6
diff --git a/doc/help/man-lpmove.html b/doc/help/man-lpmove.html
b406c6
index d8019ee25..b0db753f9 100644
b406c6
--- a/doc/help/man-lpmove.html
b406c6
+++ b/doc/help/man-lpmove.html
b406c6
@@ -12,10 +12,10 @@ lpmove - move a job or all jobs to a new destination
b406c6
 

Synopsis

b406c6
 lpmove
b406c6
 [
b406c6
--E
b406c6
-] [
b406c6
 -h server[:port]
b406c6
 ] [
b406c6
+-E
b406c6
+] [
b406c6
 -U
b406c6
 username
b406c6
 ]
b406c6
@@ -24,10 +24,10 @@ lpmove - move a job or all jobs to a new destination
b406c6
 
b406c6
 lpmove
b406c6
 [
b406c6
--E
b406c6
-] [
b406c6
 -h server[:port]
b406c6
 ] [
b406c6
+-E
b406c6
+] [
b406c6
 -U
b406c6
 username
b406c6
 ]
b406c6
@@ -44,6 +44,7 @@ The lpmove command supports the following options:
b406c6
 
Specifies an alternate username.
b406c6
 
-h server[:port]
b406c6
 
Specifies an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 
b406c6
 

Examples

b406c6
 Move job 123 from "oldprinter" to "newprinter":
b406c6
diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html
b406c6
index 6dda87f64..6af78290b 100644
b406c6
--- a/doc/help/man-lpoptions.html
b406c6
+++ b/doc/help/man-lpoptions.html
b406c6
@@ -12,12 +12,12 @@
b406c6
 

Synopsis

b406c6
 lpoptions
b406c6
 [
b406c6
--E
b406c6
-] [
b406c6
--U
b406c6
-username
b406c6
-] [
b406c6
 -h server[:port]
b406c6
+] [
b406c6
+-E
b406c6
+] [
b406c6
+-U
b406c6
+username
b406c6
 ]
b406c6
 -d destination[/instance]
b406c6
 [
b406c6
@@ -26,26 +26,26 @@
b406c6
 
b406c6
 lpoptions
b406c6
 [
b406c6
--E
b406c6
-] [
b406c6
--U
b406c6
-username
b406c6
-] [
b406c6
 -h server[:port]
b406c6
 ] [
b406c6
+-E
b406c6
+] [
b406c6
+-U
b406c6
+username
b406c6
+] [
b406c6
 -p destination[/instance]
b406c6
 ]
b406c6
 -o option[=value] ...
b406c6
 
b406c6
 lpoptions
b406c6
 [
b406c6
--E
b406c6
-] [
b406c6
--U
b406c6
-username
b406c6
-] [
b406c6
 -h server[:port]
b406c6
 ] [
b406c6
+-E
b406c6
+] [
b406c6
+-U
b406c6
+username
b406c6
+] [
b406c6
 -p destination[/instance]
b406c6
 ]
b406c6
 -r
b406c6
@@ -53,12 +53,12 @@
b406c6
 
b406c6
 lpoptions
b406c6
 [
b406c6
--E
b406c6
-] [
b406c6
--U
b406c6
-username
b406c6
-] [
b406c6
 -h server[:port]
b406c6
+] [
b406c6
+-E
b406c6
+] [
b406c6
+-U
b406c6
+username
b406c6
 ]
b406c6
 -x destination[/instance]
b406c6
 

Description

b406c6
@@ -84,6 +84,7 @@
b406c6
 This option overrides the system default printer for the current user.
b406c6
 
-h server[:port]
b406c6
 
Uses an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 
-l
b406c6
 
Lists the printer specific options and their current settings.
b406c6
 
-o option[=value]
b406c6
@@ -119,7 +120,7 @@
b406c6
 lprm(1),
b406c6
 CUPS Online Help (http://localhost:631/help)
b406c6
 

Copyright

b406c6
-Copyright © 2007-2017 by Apple Inc.
b406c6
+Copyright © 2021-2022 by OpenPrinting.
b406c6
 
b406c6
 </body>
b406c6
 </html>
b406c6
diff --git a/doc/help/man-lpq.html b/doc/help/man-lpq.html
b406c6
index 1c9e704ff..19e536d3c 100644
b406c6
--- a/doc/help/man-lpq.html
b406c6
+++ b/doc/help/man-lpq.html
b406c6
@@ -12,13 +12,13 @@ lpq - show printer queue status
b406c6
 

Synopsis

b406c6
 lpq
b406c6
 [
b406c6
+-h server[:port]
b406c6
+] [
b406c6
 -E
b406c6
 ] [
b406c6
 -U
b406c6
 username
b406c6
 ] [
b406c6
--h server[:port]
b406c6
-] [
b406c6
 -P destination[/instance]
b406c6
 ] [
b406c6
 -a
b406c6
@@ -44,6 +44,7 @@ Jobs queued on the default destination will be shown if no printer or class is s
b406c6
 
Reports jobs on all printers.
b406c6
 
-h server[:port]
b406c6
 
Specifies an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 
-l
b406c6
 
Requests a more verbose (long) reporting format.
b406c6
 
b406c6
diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html
b406c6
index d044ab1a8..f9b19e1fe 100644
b406c6
--- a/doc/help/man-lpr.html
b406c6
+++ b/doc/help/man-lpr.html
b406c6
@@ -12,10 +12,10 @@ lpr - print files
b406c6
 

Synopsis

b406c6
 lpr
b406c6
 [
b406c6
--E
b406c6
-] [
b406c6
 -H server[:port]
b406c6
 ] [
b406c6
+-E
b406c6
+] [
b406c6
 -U
b406c6
 username
b406c6
 ] [
b406c6
@@ -67,6 +67,7 @@ The following options are recognized by lpr:
b406c6
 
Forces encryption when connecting to the server.
b406c6
 
-H server[:port]
b406c6
 
Specifies an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 
-C "name"
b406c6
 
-J "name"
b406c6
 
-T "name"
b406c6
diff --git a/doc/help/man-lprm.html b/doc/help/man-lprm.html
b406c6
index 7410320a3..dbe7f20de 100644
b406c6
--- a/doc/help/man-lprm.html
b406c6
+++ b/doc/help/man-lprm.html
b406c6
@@ -12,14 +12,13 @@ lprm - cancel print jobs
b406c6
 

Synopsis

b406c6
 lprm
b406c6
 [
b406c6
+-h hostname[:port]
b406c6
+] [
b406c6
 -E
b406c6
 ] [
b406c6
 -U
b406c6
 username
b406c6
 ] [
b406c6
--h
b406c6
-server[:port]
b406c6
-] [
b406c6
 -P
b406c6
 destination[/instance]
b406c6
 ] [
b406c6
@@ -45,6 +44,7 @@ command supports the following options:
b406c6
 
Specifies an alternate username.
b406c6
 
-h server[:port]
b406c6
 
Specifies an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 
b406c6
 

Conforming To

b406c6
 The CUPS version of
b406c6
diff --git a/doc/help/man-lpstat.html b/doc/help/man-lpstat.html
b406c6
index f23089bbe..2c5dedc7c 100644
b406c6
--- a/doc/help/man-lpstat.html
b406c6
+++ b/doc/help/man-lpstat.html
b406c6
@@ -12,6 +12,8 @@ lpstat - print cups status information
b406c6
 

Synopsis

b406c6
 lpstat
b406c6
 [
b406c6
+-h hostname[:port]
b406c6
+] [
b406c6
 -E
b406c6
 ] [
b406c6
 -H
b406c6
@@ -19,8 +21,6 @@ lpstat - print cups status information
b406c6
 -U
b406c6
 username
b406c6
 ] [
b406c6
--h hostname[:port]
b406c6
-] [
b406c6
 -l
b406c6
 ] [
b406c6
 -W
b406c6
@@ -91,6 +91,7 @@ If no classes are specified then all classes are listed.
b406c6
 
Shows all available destinations on the local network.
b406c6
 
-h server[:port]
b406c6
 
Specifies an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 
-l
b406c6
 
Shows a long listing of printers, classes, or jobs.
b406c6
 
-o [destination(s)]
b406c6
diff --git a/man/cancel.man b/man/cancel.man
b406c6
index 34a5d9fc0..caea0ed69 100644
b406c6
--- a/man/cancel.man
b406c6
+++ b/man/cancel.man
b406c6
@@ -10,12 +10,15 @@
b406c6
 .\" which should have been included with this file.  If this file is
b406c6
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
b406c6
 .\"
b406c6
-.TH cancel 1 "CUPS" "15 April 2014" "Apple Inc."
b406c6
+.TH cancel 1 "CUPS" "2022-05-02" "OpenPrinting"
b406c6
 .SH NAME
b406c6
 cancel \- cancel jobs
b406c6
 .SH SYNOPSIS
b406c6
 .B cancel
b406c6
 [
b406c6
+.B \-h
b406c6
+.I hostname[:port]
b406c6
+] [
b406c6
 .B \-E
b406c6
 ] [
b406c6
 .B \-U
b406c6
@@ -23,9 +26,6 @@
b406c6
 ] [
b406c6
 .B \-a
b406c6
 ] [
b406c6
-.B \-h
b406c6
-.I hostname[:port]
b406c6
-] [
b406c6
 .B \-u
b406c6
 .I username
b406c6
 ] [
b406c6
@@ -52,6 +52,7 @@
b406c6
 .TP 5
b406c6
 \fB\-h \fIhostname\fR[\fI:port\fR]
b406c6
 Specifies an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 .TP 5
b406c6
 \fB\-U \fIusername\fR
b406c6
 Specifies the username to use when connecting to the server.
b406c6
diff --git a/man/cupsctl.man b/man/cupsctl.man
b406c6
index 1b1ff4183..7e50d07ac 100644
b406c6
--- a/man/cupsctl.man
b406c6
+++ b/man/cupsctl.man
b406c6
@@ -10,20 +10,20 @@
b406c6
 .\" which should have been included with this file.  If this file is
b406c6
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
b406c6
 .\"
b406c6
-.TH cupsctl 8 "CUPS" "30 May 2016" "Apple Inc."
b406c6
+.TH cupsctl 8 "CUPS" "2022-05-02" "OpenPrinting"
b406c6
 .SH NAME
b406c6
 cupsctl \- configure cupsd.conf options
b406c6
 .SH SYNOPSIS
b406c6
 .B cupsctl
b406c6
 [
b406c6
+.B \-h
b406c6
+\fIserver\fR[\fB:\fIport\fR]
b406c6
+] [
b406c6
 .B \-E
b406c6
 ] [
b406c6
 .B \-U
b406c6
 .I username
b406c6
 ] [
b406c6
-.B \-h
b406c6
-\fIserver\fR[\fB:\fIport\fR]
b406c6
-] [
b406c6
 \fB\-\-\fR[\fBno\-\fR]\fBdebug\-logging\fR
b406c6
 ] [
b406c6
 \fB\-\-\fR[\fBno\-\fR]\fBremote\-admin\fR
b406c6
@@ -51,6 +51,7 @@
b406c6
 .TP 5
b406c6
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
 Specifies the server address.
b406c6
+Note: This option must occur before all others.
b406c6
 .TP 5
b406c6
 \fB\-\-\fR[\fBno\-\fR]\fBdebug\-logging\fR
b406c6
 Enables (disables) debug logging to the \fIerror_log\fR file.
b406c6
diff --git a/man/lp.man b/man/lp.man
b406c6
index a54f904a5..4bdd2de7b 100644
b406c6
--- a/man/lp.man
b406c6
+++ b/man/lp.man
b406c6
@@ -10,12 +10,14 @@
b406c6
 .\" which should have been included with this file.  If this file is
b406c6
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
b406c6
 .\"
b406c6
-.TH lp 1 "CUPS" "2 May 2016" "Apple Inc."
b406c6
+.TH lp 1 "CUPS" "2022-05-02" "OpenPrinting"
b406c6
 .SH NAME
b406c6
 lp \- print files
b406c6
 .SH SYNOPSIS
b406c6
 .B lp
b406c6
 [
b406c6
+\fB\-h \fIhostname\fR[\fB:\fIport\fR]
b406c6
+] [
b406c6
 .B \-E
b406c6
 ] [
b406c6
 .B \-U
b406c6
@@ -25,8 +27,6 @@
b406c6
 ] [
b406c6
 \fB\-d \fIdestination\fR[\fB/\fIinstance\fR]
b406c6
 ] [
b406c6
-\fB\-h \fIhostname\fR[\fB:\fIport\fR]
b406c6
-] [
b406c6
 .B \-m
b406c6
 ] [
b406c6
 .B \-n
b406c6
@@ -55,6 +55,8 @@
b406c6
 .br
b406c6
 .B lp
b406c6
 [
b406c6
+\fB\-h \fIhostname\fR[\fB:\fIport\fR]
b406c6
+] [
b406c6
 .B \-E
b406c6
 ] [
b406c6
 .B \-U
b406c6
@@ -62,8 +64,6 @@
b406c6
 ] [
b406c6
 .B \-c
b406c6
 ] [
b406c6
-\fB\-h \fIhostname\fR[\fB:\fIport\fR]
b406c6
-] [
b406c6
 .B \-i
b406c6
 .I job-id
b406c6
 ] [
b406c6
@@ -115,6 +115,7 @@
b406c6
 .TP 5
b406c6
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
b406c6
 Chooses an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 .TP 5
b406c6
 \fB\-i \fIjob-id\fR
b406c6
 Specifies an existing job to modify.
b406c6
diff --git a/man/lpinfo.man b/man/lpinfo.man
b406c6
index d238f9a60..d44b568d2 100644
b406c6
--- a/man/lpinfo.man
b406c6
+++ b/man/lpinfo.man
b406c6
@@ -10,16 +10,16 @@
b406c6
 .\" which should have been included with this file.  If this file is
b406c6
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
b406c6
 .\"
b406c6
-.TH lpinfo 8 "CUPS" "12 June 2014" "Apple Inc."
b406c6
+.TH lpinfo 8 "CUPS" "2022-05-02" "OpenPrinting"
b406c6
 .SH NAME
b406c6
 lpinfo \- show available devices or drivers
b406c6
 .SH SYNOPSIS
b406c6
 .B lpinfo
b406c6
 [
b406c6
-.B \-E
b406c6
-] [
b406c6
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
 ] [
b406c6
+.B \-E
b406c6
+] [
b406c6
 .B \-l
b406c6
 ] [
b406c6
 .B \-\-device\-id
b406c6
@@ -44,10 +44,10 @@
b406c6
 .br
b406c6
 .B lpinfo
b406c6
 [
b406c6
-.B \-E
b406c6
-] [
b406c6
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
 ] [
b406c6
+.B \-E
b406c6
+] [
b406c6
 .B \-l
b406c6
 ] [
b406c6
 .B \-\-exclude\-schemes
b406c6
@@ -71,6 +71,7 @@
b406c6
 .TP 5
b406c6
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
 Selects an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 .TP 5
b406c6
 .B \-l
b406c6
 Shows a "long" listing of devices or drivers.
b406c6
diff --git a/man/lpmove.man b/man/lpmove.man
b406c6
index af3c6b63c..62adba654 100644
b406c6
--- a/man/lpmove.man
b406c6
+++ b/man/lpmove.man
b406c6
@@ -10,16 +10,16 @@
b406c6
 .\" which should have been included with this file.  If this file is
b406c6
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
b406c6
 .\"
b406c6
-.TH lpmove 8 "CUPS" "26 May 2016" "Apple Inc."
b406c6
+.TH lpmove 8 "CUPS" "2022-05-02" "OpenPrinting"
b406c6
 .SH NAME
b406c6
 lpmove \- move a job or all jobs to a new destination
b406c6
 .SH SYNOPSIS
b406c6
 .B lpmove
b406c6
 [
b406c6
-.B \-E
b406c6
-] [
b406c6
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
 ] [
b406c6
+.B \-E
b406c6
+] [
b406c6
 .B \-U
b406c6
 .I username
b406c6
 ]
b406c6
@@ -28,10 +28,10 @@
b406c6
 .br
b406c6
 .B lpmove
b406c6
 [
b406c6
-.B \-E
b406c6
-] [
b406c6
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
 ] [
b406c6
+.B \-E
b406c6
+] [
b406c6
 .B \-U
b406c6
 .I username
b406c6
 ]
b406c6
@@ -50,6 +50,7 @@
b406c6
 .TP 5
b406c6
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
 Specifies an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 .SH EXAMPLES
b406c6
 Move job 123 from "oldprinter" to "newprinter":
b406c6
 .nf
b406c6
diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
b406c6
index 372f46a37..2eb5b6010 100644
b406c6
--- a/man/lpoptions.man.in
b406c6
+++ b/man/lpoptions.man.in
b406c6
@@ -10,18 +10,18 @@
b406c6
 .\" which should have been included with this file.  If this file is
b406c6
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
b406c6
 .\"
b406c6
-.TH lpoptions 1 "CUPS" "12 June 2014" "Apple Inc."
b406c6
+.TH lpoptions 1 "CUPS" "2022-05-02" "OpenPrinting"
b406c6
 .SH NAME
b406c6
 lpoptions \- display or set printer options and defaults
b406c6
 .SH SYNOPSIS
b406c6
 .B lpoptions
b406c6
 [
b406c6
+\fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
+] [
b406c6
 .B \-E
b406c6
 ] [
b406c6
 .B \-U
b406c6
 .I username
b406c6
-] [
b406c6
-\fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
 ]
b406c6
 \fB\-d \fIdestination\fR[\fB/\fIinstance\fR]
b406c6
 [
b406c6
@@ -30,13 +30,13 @@
b406c6
 .br
b406c6
 .B lpoptions
b406c6
 [
b406c6
+\fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
+] [
b406c6
 .B \-E
b406c6
 ] [
b406c6
 .B \-U
b406c6
 .I username
b406c6
 ] [
b406c6
-\fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
-] [
b406c6
 \fB\-p \fIdestination\fR[\fB/\fIinstance\fR]
b406c6
 ]
b406c6
 \fB\-o \fIoption\fR[\fB=\fIvalue\fR] ...
b406c6
@@ -43,13 +43,13 @@
b406c6
 .br
b406c6
 .B lpoptions
b406c6
 [
b406c6
+\fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
+] [
b406c6
 .B \-E
b406c6
 ] [
b406c6
 .B \-U
b406c6
 .I username
b406c6
 ] [
b406c6
-\fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
-] [
b406c6
 \fB\-p \fIdestination\fR[\fB/\fIinstance\fR]
b406c6
 ]
b406c6
 .B \-r
b406c6
@@ -57,12 +57,12 @@
b406c6
 .br
b406c6
 .B lpoptions
b406c6
 [
b406c6
+\fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
+] [
b406c6
 .B \-E
b406c6
 ] [
b406c6
 .B \-U
b406c6
 .I username
b406c6
-] [
b406c6
-\fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
 ]
b406c6
 \fB\-x \fIdestination\fR[\fB/\fIinstance\fR]
b406c6
 .SH DESCRIPTION
b406c6
@@ -96,6 +96,7 @@
b406c6
 .TP 5
b406c6
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
 Uses an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 .TP 5
b406c6
 .B \-l
b406c6
 Lists the printer specific options and their current settings.
b406c6
diff --git a/man/lpq.man b/man/lpq.man
b406c6
index ce23a6c81..a81633ecb 100644
b406c6
--- a/man/lpq.man
b406c6
+++ b/man/lpq.man
b406c6
@@ -10,19 +10,19 @@
b406c6
 .\" which should have been included with this file.  If this file is
b406c6
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
b406c6
 .\"
b406c6
-.TH lpq 1 "CUPS" "12 June 2014" "Apple Inc."
b406c6
+.TH lpq 1 "CUPS" "2022-05-02" "OpenPrinting"
b406c6
 .SH NAME
b406c6
 lpq \- show printer queue status
b406c6
 .SH SYNOPSIS
b406c6
 .B lpq
b406c6
 [
b406c6
+\fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
+] [
b406c6
 .B \-E
b406c6
 ] [
b406c6
 .B \-U
b406c6
 .I username
b406c6
 ] [
b406c6
-\fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
-] [
b406c6
 \fB\-P \fIdestination\fR[\fB/\fIinstance\fR]
b406c6
 ] [
b406c6
 .B \-a
b406c6
@@ -53,6 +53,7 @@
b406c6
 .TP 5
b406c6
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
 Specifies an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 .TP 5
b406c6
 .B \-l
b406c6
 Requests a more verbose (long) reporting format.
b406c6
diff --git a/man/lpr.man b/man/lpr.man
b406c6
index e5f9f9018..77a62b305 100644
b406c6
--- a/man/lpr.man
b406c6
+++ b/man/lpr.man
b406c6
@@ -10,16 +10,16 @@
b406c6
 .\" which should have been included with this file.  If this file is
b406c6
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
b406c6
 .\"
b406c6
-.TH lpr 1 "CUPS" "2 May 2016" "Apple Inc."
b406c6
+.TH lpr 1 "CUPS" "2022-05-02" "OpenPrinting"
b406c6
 .SH NAME
b406c6
 lpr \- print files
b406c6
 .SH SYNOPSIS
b406c6
 .B lpr
b406c6
 [
b406c6
-.B \-E
b406c6
-] [
b406c6
 \fB\-H \fIserver\fR[\fB:\fIport\fR]
b406c6
 ] [
b406c6
+.B \-E
b406c6
+] [
b406c6
 .B \-U
b406c6
 .I username
b406c6
 ] [
b406c6
@@ -72,6 +72,7 @@
b406c6
 .TP 5
b406c6
 \fB\-H \fIserver\fR[\fB:\fIport\fR]
b406c6
 Specifies an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 .TP 5
b406c6
 \fB\-C "\fIname\fB"\fR
b406c6
 .TP 5
b406c6
diff --git a/man/lprm.man b/man/lprm.man
b406c6
index 094166539..0cf88ac51 100644
b406c6
--- a/man/lprm.man
b406c6
+++ b/man/lprm.man
b406c6
@@ -10,20 +10,19 @@
b406c6
 .\" which should have been included with this file.  If this file is
b406c6
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
b406c6
 .\"
b406c6
-.TH lprm 1 "CUPS" "22 May 2014" "Apple Inc."
b406c6
+.TH lprm 1 "CUPS" "2022-05-02" "OpenPrinting"
b406c6
 .SH NAME
b406c6
 lprm \- cancel print jobs
b406c6
 .SH SYNOPSIS
b406c6
 .B lprm
b406c6
 [
b406c6
+\fB\-h \fIhostname\fR[\fB:\fIport\fR]
b406c6
+] [
b406c6
 .B \-E
b406c6
 ] [
b406c6
 .B \-U
b406c6
 .I username
b406c6
 ] [
b406c6
-.B \-h
b406c6
-.IR server [ :port ]
b406c6
-] [
b406c6
 .B \-P
b406c6
 .IR destination [ /instance ]
b406c6
 ] [
b406c6
@@ -52,6 +51,7 @@
b406c6
 .TP 5
b406c6
 \fB\-h \fIserver\fR[\fI:port\fR]
b406c6
 Specifies an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 .SH CONFORMING TO
b406c6
 The CUPS version of
b406c6
 .B lprm
b406c6
diff --git a/man/lpstat.man b/man/lpstat.man
b406c6
index 0a10cd9bc..88acff7b3 100644
b406c6
--- a/man/lpstat.man
b406c6
+++ b/man/lpstat.man
b406c6
@@ -1,8 +1,8 @@
b406c6
 .\"
b406c6
 .\" lpstat man page for CUPS.
b406c6
 .\"
b406c6
-.\" Copyright 2007-2017 by Apple Inc.
b406c6
-.\" Copyright 1997-2006 by Easy Software Products.
b406c6
+.\" Copyright © 2007-2019 by Apple Inc.
b406c6
+.\" Copyright © 1997-2006 by Easy Software Products.
b406c6
 .\"
b406c6
 .\" These coded instructions, statements, and computer programs are the
b406c6
 .\" property of Apple Inc. and are protected by Federal copyright
b406c6
@@ -10,12 +10,14 @@
b406c6
 .\" which should have been included with this file.  If this file is
b406c6
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
b406c6
 .\"
b406c6
-.TH lpstat 1 "CUPS" "26 May 2017" "Apple Inc."
b406c6
+.TH lpstat 1 "CUPS" "2022-05-02" "OpenPrinting"
b406c6
 .SH NAME
b406c6
 lpstat \- print cups status information
b406c6
 .SH SYNOPSIS
b406c6
 .B lpstat
b406c6
 [
b406c6
+\fB\-h \fIhostname\fR[\fB:\fIport\fR]
b406c6
+] [
b406c6
 .B \-E
b406c6
 ] [
b406c6
 .B \-H
b406c6
@@ -23,8 +25,6 @@
b406c6
 .B \-U
b406c6
 .I username
b406c6
 ] [
b406c6
-\fB\-h \fIhostname\fR[\fB:\fIport\fR]
b406c6
-] [
b406c6
 .B \-l
b406c6
 ] [
b406c6
 .B \-W
b406c6
@@ -104,6 +104,7 @@
b406c6
 .TP 5
b406c6
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
b406c6
 Specifies an alternate server.
b406c6
+Note: This option must occur before all others.
b406c6
 .TP 5
b406c6
 .B \-l
b406c6
 Shows a long listing of printers, classes, or jobs.