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

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

Synopsis

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

Synopsis

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

Synopsis

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

Synopsis

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

Synopsis

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

Examples

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

Synopsis

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

Description

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

Copyright

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

Synopsis

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

Synopsis

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

Synopsis

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

Conforming To

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

Synopsis

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