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

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

Synopsis

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

Synopsis

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

Synopsis

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

Synopsis

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

Synopsis

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

Examples

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

Synopsis

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

Description

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

Copyright

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

Synopsis

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

Synopsis

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

Synopsis

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

Conforming To

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

Synopsis

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