Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PATCH] Manual pages -- alphabetical listing (Svn 9717 2011-04-23) #3833

Closed
michaelrsweet opened this issue Apr 25, 2011 · 2 comments
Closed
Labels
enhancement wontfix
Milestone

Comments

@michaelrsweet
Copy link
Collaborator

michaelrsweet commented Apr 25, 2011

Version: -feature
CUPS.org User: jaalto

Hi,

Here are couple if patches to lay out the manual page similarly as in
cp(1), mv(1), ssh(1) etc.

The alphabetical order works well while searching; no oriantation
problems regardless of tools; even when you print on paper when you
don't have any computerized aids to help your search.

The patch is based on sources at the time of:


r9717 | mike | 2011-04-23 02:01:57 +0300 (Sat, 23 Apr 2011) | 3 lines

C

@michaelrsweet
Copy link
Collaborator Author

michaelrsweet commented Apr 25, 2011

CUPS.org User: mike

They are sorted already, just capital letters first...

@michaelrsweet
Copy link
Collaborator Author

michaelrsweet commented Apr 25, 2011

"0001-manual-pages-order-options-alphabetically.patch":

From 4e90c0d2e9ae00a25ea3cd07d9bbd94e4213f347 Mon Sep 17 00:00:00 2001
From: Jari Aalto jari.aalto@cante.net
Date: Tue, 28 Apr 2009 11:42:07 +0300
Subject: [PATCH] manual pages: order options alphabetically
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Signed-off-by: Jari Aalto jari.aalto@cante.net

man/lp.man | 177 ++++++++++++++++++++++++++++++++------------------
man/lpadmin.man | 88 ++++++++++++++++---------
man/lpc.man | 18 ++++--
man/lpinfo.man | 45 ++++++++-----
man/lpmove.man | 13 +++-
man/lpoptions.man.in | 30 ++++++--
man/lpq.man | 32 ++++++----
man/lpr.man | 61 +++++++++++------
man/lprm.man | 14 +++-
man/lpstat.man | 67 ++++++++++++-------
10 files changed, 354 insertions(+), 191 deletions(-)

diff --git a/man/lp.man b/man/lp.man
index 8b6e600..6272d81 100644
--- a/man/lp.man
+++ b/man/lp.man
@@ -59,9 +59,11 @@ lp - print files
] [ -P
.I page-list
]
+
.SH DESCRIPTION
\fIlp\fR submits files for printing or alters a pending job. Use
a filename of "-" to force printing from the standard input.
+
.SH THE DEFAULT DESTINATION
CUPS provides many ways to set the default destination. The "LPDEST" and
"PRINTER" environment variables are consulted first. If neither are set,
@@ -69,19 +71,13 @@ the current default set using the \fIlpoptions(1)\fR command is used,
followed by the default set using the \fIlpadmin(8)\fR command.
.SH OPTIONS
The following options are recognized by \fIlp\fR:
+
.TP 5

.br
Marks the end of options; use this to print a file whose name
begins with a dash (-).
-.TP 5
--E
-.br
-Forces encryption when connecting to the server.
-.TP 5
--U username
-.br
-Specifies the username to use when connecting to the server.
+
.TP 5
-c
.br
@@ -90,159 +86,212 @@ systems that support it, this option forces the print file to be
copied to the spool directory before printing. In CUPS, print
files are always sent to the scheduler via IPP which has the
same effect.
+
.TP 5
-d destination
.br
Prints files to the named printer.
+
+.TP 5
+-E
+.br
+Forces encryption when connecting to the server.
+
.TP 5
-h hostname[:port]
.br
Chooses an alternate server.
+
+.TP 5
+-H hh:mm
+
+.TP 5
+-H hold
+
+.TP 5
+-H immediate
+
+.TP 5
+-H restart
+
+.TP 5
+-H resume
+.br
+Specifies when the job should be printed. A value of
+\fIimmediate\fR will print the file immediately, a value of
+\fIhold\fR will hold the job indefinitely, and a time value
+(HH:MM) will hold the job until the specified time. Use a value
+of \fIresume\fR with the \fI-i\fR option to resume a held job.
+Use a value of \fIrestart\fR with the \fI-i\fR option to restart
+a completed job.
+
.TP 5
-i job-id
.br
Specifies an existing job to modify.
+
.TP 5
-m
.br
Sends an email when the job is completed.
+
.TP 5
-n copies
.br
Sets the number of copies to print from 1 to 100.
+
.TP 5
-o "name=value [name=value ...]"
.br
Sets one or more job options.
+
+.TP 5
+-P page-list
+.br
+Specifies which pages to print in the document. The list can
+contain a list of numbers and ranges (#-#) separated by commas
+(e.g. 1,3-5,16). The page numbers refer to the output pages and
+not the document's original pages - options like "number-up" can
+affect the numbering of the pages.
+that are
+
.TP 5
-q priority
.br
Sets the job priority from 1 (lowest) to 100 (highest). The
default priority is 50.
+
.TP 5
-s
.br
Do not report the resulting job IDs (silent mode.)
+
.TP 5
-t "name"
.br
Sets the job name.
+
.TP 5
-u username
.br
Submits jobs as \fIusername\fR.
+
.TP 5
--H hh:mm
-.TP 5
--H hold
-.TP 5
--H immediate
-.TP 5
--H restart
-.TP 5
--H resume
-.br
-Specifies when the job should be printed. A value of
-\fIimmediate\fR will print the file immediately, a value of
-\fIhold\fR will hold the job indefinitely, and a time value
-(HH:MM) will hold the job until the specified time. Use a value
-of \fIresume\fR with the \fI-i\fR option to resume a held job.
-Use a value of \fIrestart\fR with the \fI-i\fR option to restart
-a completed job.
-.TP 5
--P page-list
+-U username
.br
-Specifies which pages to print in the document. The list can
-contain a list of numbers and ranges (#-#) separated by commas
-(e.g. 1,3-5,16). The page numbers refer to the output pages and
-not the document's original pages - options like "number-up" can
-affect the numbering of the pages.
-that are
+Specifies the username to use when connecting to the server.
+
.SH COMMON JOB OPTIONS
Aside from the printer-specific options reported by the
\fIlpoptions(1)\fR command, the following generic options are
available:
+
.TP 5
--o media=size
+-o cpi=N
.br
-Sets the page size to \fIsize\fR. Most printers support at least
-the size names "a4", "letter", and "legal".
-.TP 5
--o landscape
+Sets the number of characters per inch to use when printing a
+text file. The default is 10.
+
.TP 5
--o orientation-requested=4
+-o fitplot
.br
-Prints the job in landscape (rotated 90 degrees).
-.TP 5
--o sides=one-sided
+Scales the print file to fit on the page.
+
.TP 5
--o sides=two-sided-long-edge
+-o landscape
+
.TP 5
--o sides=two-sided-short-edge
+-o lpi=N
.br
-Prints on one or two sides of the paper. The value
-"two-sided-long-edge" is normally used when printing portrait
-(unrotated) pages, while "two-sided-short-edge" is used for
-landscape pages.
+Sets the number of lines per inch to use when printing a text
+file. The default is 6.
+
.TP 5
--o fitplot
+-o media=size
.br
-Scales the print file to fit on the page.
+Sets the page size to \fIsize\fR. Most printers support at least
+the size names "a4", "letter", and "legal".
+
.TP 5
-o number-up=2
+
.TP 5
-o number-up=4
+
.TP 5
-o number-up=6
+
.TP 5
-o number-up=9
+
.TP 5
-o number-up=16
.br
Prints multiple document pages on each output page.
+
.TP 5
--o scaling=number
-.br
-Scales image files to use up to \fInumber\fR percent of the page.
-Values greater than 100 cause the image file to be printed across
-multiple pages.
-.TP 5
--o cpi=N
-.br
-Sets the number of characters per inch to use when printing a
-text file. The default is 10.
-.TP 5
--o lpi=N
+-o orientation-requested=4
.br
-Sets the number of lines per inch to use when printing a text
-file. The default is 6.
+Prints the job in landscape (rotated 90 degrees).
+
.TP 5
-o page-bottom=N
+
.TP 5
-o page-left=N
+
.TP 5
-o page-right=N
+
.TP 5
-o page-top=N
.br
Sets the page margins when printing text files. The values are in
points - there are 72 points to the inch.
+
+.TP 5
+-o scaling=number
+.br
+Scales image files to use up to \fInumber\fR percent of the page.
+Values greater than 100 cause the image file to be printed across
+multiple pages.
+
+.TP 5
+-o sides=one-sided
+
+.TP 5
+-o sides=two-sided-long-edge
+
+.TP 5
+-o sides=two-sided-short-edge
+.br
+Prints on one or two sides of the paper. The value
+"two-sided-long-edge" is normally used when printing portrait
+(unrotated) pages, while "two-sided-short-edge" is used for
+landscape pages.
+
.SH EXAMPLES
Print a double-sided legal document to a printer called "foo":
+.P
.nf
lp -d foo -o media=legal -o sides=two-sided-long-edge filename
.fi
+
.LP
Print an image across 4 pages:
+.P
.nf
lp -d bar -o scaling=200 filename
.fi
+
.LP
Print a text file with 12 characters per inch, 8 lines per inch, and
a 1 inch left margin:
+.P
.nf
lp -d bar -o cpi=12 -o lpi=8 -o page-left=72 filename
.fi
+
.SH COMPATIBILITY
Unlike the System V printing system, CUPS allows printer names to
contain any printable character except SPACE, TAB, "/", or "#".
diff --git a/man/lpadmin.man b/man/lpadmin.man
index 37084bc..1ea819f 100644
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -39,6 +39,7 @@ lpadmin - configure cups printers and classes
.I server[:port]
] -x
.I destination
+
.SH DESCRIPTION
\fIlpadmin\fR configures printer and class queues provided by
CUPS. It can also be used to set the server default printer or
@@ -64,62 +65,90 @@ will be aborted.
.SH CONFIGURATION OPTIONS
The following options are recognized when configuring a printer
queue:
+
.TP 5
-c class
.br
Adds the named \fIprinter\fR to \fIclass\fR. If \fIclass\fR does
not exist it is created automatically.
+
+.TP 5
+-D "info"
+.br
+Provides a textual description of the printer.
+
+.TP 5
+-E
+.br
+Enables the printer and accepts jobs; this is the same as running the
+\fIcupsaccept(8)\fR and \fIcupsenable(8)\fR programs on the printer.
+
.TP 5
-i interface
.br
Sets a System V style interface script for the printer. This
option cannot be specified with the \fI-P\fR option (PPD file)
and is intended for providing support for legacy printer drivers.
+
+.TP 5
+-L "location"
+.br
+Provides a textual location of the printer.
+
.TP 5
-m model
.br
Sets a standard System V interface script or PPD file from the
\fImodel\fR directory.
+
+.TP 5
+-o name=value
+.br
+Sets a PPD option for the printer. PPD options can be
+listed using the \fI-l\fR option with the \fIlpoptions(1)\fR
+command.
+
+.TP 5
+-o name-default=value
+.br
+Sets a default server-side option for the printer. Any print-time
+option can be defaulted, e.g. "-o cpi-default=17" to set the default
+"cpi" option value to 17.
+
.TP 5
-o job-k-limit=value
.br
Sets the kilobyte limit for per-user quotas. The value is an
integer number of kilobytes; one kilobyte is 1024 bytes.
+
.TP 5
-o job-page-limit=value
.br
Sets the page limit for per-user quotas. The value is the integer
number of pages that can be printed; double-sided pages are
counted as two pages.
+
.TP 5
-o job-quota-period=value
.br
Sets the accounting period for per-user quotas. The value is an
integer number of seconds; 86,400 seconds are in one day.
+
.TP 5
-o job-sheets-default=banner
+
.TP 5
-o job-sheets-default=banner,banner
.br
Sets the default banner page(s) to use for print jobs.
-.TP 5
--o name=value
-.br
-Sets a PPD option for the printer. PPD options can be
-listed using the \fI-l\fR option with the \fIlpoptions(1)\fR
-command.
-.TP 5
--o name-default=value
-.br
-Sets a default server-side option for the printer. Any print-time
-option can be defaulted, e.g. "-o cpi-default=17" to set the default
-"cpi" option value to 17.
+
.TP 5
-o port-monitor=name
.br
Sets the binary communications program to use when printing,
"none", "bcp", or "tbcp". The default program is "none". The
specified port monitor must be listed in the printer's PPD file.
+
.TP 5
-o printer-error-policy=name
.br
@@ -127,6 +156,7 @@ Sets the error policy to be used when the printer backend is
unable to send the job to the printer. The name must be one of
"abort-job", "retry-job" or "stop-printer". The default error
policy is "stop-printer".
+
.TP 5
-o printer-is-shared=true/false
.br
@@ -135,29 +165,43 @@ Shared/published printers are publically announced by the server
on the LAN based on the browsing configuration in
\fBcupsd.conf\fR, while unshared/unpublished printers are not
announced. The default value is "true".
+
.TP 5
-o printer-op-policy=name
.br
Sets the IPP operation policy associated with the printer. The
name must be defined in the \fBcupsd.conf\fR in a Policy section.
The default operation policy is "default".
+
+.TP 5
+-P ppd-file
+.br
+Specifies a PostScript Printer Description file to use with the
+printer. If specified, this option overrides the \fI-i\fR option
+(interface script).
+
.TP 5
-r class
.br
Removes the named \fIprinter\fR from \fIclass\fR. If the
resulting class becomes empty it is removed.
+
.TP 5
-u allow:user,user,@group
+
.TP 5
-u deny:user,user,@group
+
.TP 5
-u allow:all
+
.TP 5
-u deny:none
.br
Sets user-level access control on a printer. Names starting with
"@" are interpreted as UNIX groups. The latter two forms turn
user-level access control off.
+
.TP 5
-v "device-uri"
.br
@@ -165,25 +209,7 @@ Sets the \fIdevice-uri\fR attribute of the printer queue. If
\fIdevice-uri\fR is a filename it is automatically converted to
the form \fIfile:///file/name\fR. Use the \fIlpinfo(8)\fR command
to get a list of supported device URIs and schemes.
-.TP 5
--D "info"
-.br
-Provides a textual description of the printer.
-.TP 5
--E
-.br
-Enables the printer and accepts jobs; this is the same as running the
-\fIcupsaccept(8)\fR and \fIcupsenable(8)\fR programs on the printer.
-.TP 5
--L "location"
-.br
-Provides a textual location of the printer.
-.TP 5
--P ppd-file
-.br
-Specifies a PostScript Printer Description file to use with the
-printer. If specified, this option overrides the \fI-i\fR option
-(interface script).
+
.SH COMPATIBILITY
Unlike the System V printing system, CUPS allows printer names to
contain any printable character except SPACE, TAB, "/", or "#".
diff --git a/man/lpc.man b/man/lpc.man
index 22a6050..5c06f8d 100644
--- a/man/lpc.man
+++ b/man/lpc.man
@@ -32,24 +32,30 @@ display a prompt and accept commands from the standard input.
.SH COMMANDS
The \fIlpc\fR program accepts a subset of commands accepted by
the Berkeley \fIlpc\fR program of the same name:
+
+.TP 5
+? [command]
+.br
+Displays a short help message.
+
.TP 5
exit
.br
Exits the command interpreter.
+
.TP 5
help [command]
+
.TP 5
-? [command]
+status [queue]
.br
-Displays a short help message.
+Displays the status of one or more printer or class queues.
+
.TP 5
quit
.br
Exits the command interpreter.
-.TP 5
-status [queue]
-.br
-Displays the status of one or more printer or class queues.
+
.SH LIMITATIONS
Since \fIlpc\fR is geared towards the Berkeley printing system,
it is impossible to use \fIlpc\fR to configure printer or class
diff --git a/man/lpinfo.man b/man/lpinfo.man
index 8606579..d74f637 100644
--- a/man/lpinfo.man
+++ b/man/lpinfo.man
@@ -52,58 +52,71 @@ lpinfo - show available devices or drivers
CUPS server. The first form (\fI-m\fR) lists the available
drivers, while the second form (\fI-v\fR) lists the available
devices.
+
.SH OPTIONS
\fIlpinfo\fR accepts the following options:
-.TP 5
--E
-.br
-Forces encryption when connecting to the server.
-.TP 5
--U username
-.br
-Sets the username to use when connecting to the server.
-.TP 5
--h server[:port]
-.br
-Selects an alternate server.
-.TP 5
--l
-.br
-Shows a "long" listing of devices or drivers.
+
.TP 5
--device-id device-id-string
.br
Specifies the IEEE-1284 device ID to match when listing drivers with the
\fI-m\fR option.
+
+.TP 5
+-E
+.br
+Forces encryption when connecting to the server.
+
.TP 5
--exclude-schemes scheme-list
.br
Specifies a comma-separated list of device or PPD schemes that should be
excluded from the results. Static PPD files use the "file" scheme.
+
+.TP 5
+-h server[:port]
+.br
+Selects an alternate server.
+
.TP 5
--include-schemes scheme-list
.br
Specifies a comma-separated list of device or PPD schemes that should be
included in the results. Static PPD files use the "file" scheme.
+
+.TP 5
+-l
+.br
+Shows a "long" listing of devices or drivers.
+
.TP 5
--language locale
.br
Specifies the language to match when listing drivers with the \fI-m\fR option.
+
.TP 5
--make-and-model name
.br
Specifies the make and model to match when listing drivers with the \fI-m\fR
option.
+
.TP 5
--product name
.br
Specifies the product to match when listing drivers with the \fI-m\fR option.
+
.TP 5
--timeout seconds
.br
Specifies the timeout when listing devices with the \fI-v\fR option.
.SH COMPATIBILITY
The \fIlpinfo\fR command is unique to CUPS.
+
+.TP 5
+-U username
+.br
+Sets the username to use when connecting to the server.
+
.SH SEE ALSO
\fIlpadmin(8)\fR,
.br
diff --git a/man/lpmove.man b/man/lpmove.man
index 635cede..537ccb7 100644
--- a/man/lpmove.man
+++ b/man/lpmove.man
@@ -41,20 +41,25 @@ number or the old destination and job ID:
lpmove 123 newprinter
lpmove oldprinter-123 newprinter
.fi
+
.SH OPTIONS
The \fIlpmove\fR command supports the following options:
+
.TP 5
-E
.br
Forces encryption when connecting to the server.
-.TP 5
--U username
-.br
-Specifies an alternate username.
+
.TP 5
-h server[:port]
.br
Specifies an alternate server.
+
+.TP 5
+-U username
+.br
+Specifies an alternate username.
+
.SH SEE ALSO
\fIcancel(1)\fR, \fIlp(1)\fR,
.br
diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
index acfbef6..05e756c 100644
--- a/man/lpoptions.man.in
+++ b/man/lpoptions.man.in
@@ -63,61 +63,75 @@ lpoptions - display or set printer options and defaults
\fIlpoptions\fR displays or sets printer options and defaults.
\fIlpoptions\fR shows the default printer options when run with no
arguments. Other options include:
-.TP 5
--E
-.br
-Enables encryption when communicating with the CUPS server.
-.TP 5
--U username
-.br
-Uses an alternate username.
+
.TP 5
-d destination[/instance]
.br
Sets the user default printer to \fIdestination\fR. If \fIinstance\fR
is supplied then that particular instance is used. This option
overrides the system default printer for the current user.
+
+.TP 5
+-E
+.br
+Enables encryption when communicating with the CUPS server.
+
.TP 5
-h server[:port]
.br
Uses an alternate server.
+
.TP 5
-l
.br
Lists the printer specific options and their current settings.
+
.TP 5
-o option[=value]
.br
Specifies a new option for the named destination.
+
.TP 5
-p destination[/instance]
.br
Sets the destination and instance, if specified, for any options
that follow. If the named instance does not exist then it is
created.
+
.TP 5
-r option
.br
Removes the specified option for the named destination.
+
+.TP 5
+-U username
+.br
+Uses an alternate username.
+
.TP 5
-x destination[/instance]
.br
Removes the options for the named destination and instance, if
specified. If the named instance does not exist then this does
nothing.
+
.LP
If no options are specified using the \fI-o\fR option, then the
current options for the named printer are reported on the
standard output.
+
.LP
Options set with the \fIlpoptions\fR command are used by the
\fIlp(1)\fR and \fIlpr(1)\fR commands when submitting jobs.
+
.SH ROOT ACCOUNT OPTIONS
When run by the root user, \fIlpoptions\fR gets and sets default
options and instances for \fIall users\fR in the
@CUPS_SERVERROOT@/lpoptions file.
+
.SH COMPATIBILITY
The \fIlpoptions\fR command is unique to CUPS.
+
.SH FILES
~/.cups/lpoptions - user defaults and instances created by non-root
users.
diff --git a/man/lpq.man b/man/lpq.man
index ce5f092..9a84381 100644
--- a/man/lpq.man
+++ b/man/lpq.man
@@ -34,32 +34,40 @@ no printer or class is specified on the command-line.
The \fI+interval\fR option allows you to continuously report the
jobs in the queue until the queue is empty; the list of jobs is
shown once every \fIinterval\fR seconds.
+
.SH OPTIONS
\fIlpq\fR supports the following options:
-.TP 5
--E
-.br
-Forces encryption when connecting to the server.
-.TP 5
--P destination[/instance]
-.br
-Specifies an alternate printer or class name.
-.TP 5
--U username
-.br
-Specifies an alternate username.
+
.TP 5
-a
.br
Reports jobs on all printers.
+
+.TP 5
+-E
+.br
+Forces encryption when connecting to the server.
+
.TP 5
-h server[:port]
.br
Specifies an alternate server.
+
.TP 5
-l
.br
Requests a more verbose (long) reporting format.
+
+.TP 5
+-P destination[/instance]
+.br
+Specifies an alternate printer or class name.
+
+.TP 5
+-U username
+.br
+Specifies an alternate username.
+
.SH SEE ALSO
\fIcancel(1)\fR, \fIlp(1)\fR, \fIlpr(1)\fR, \fIlprm(1)\fR,
\fIlpstat(1)\fR,
diff --git a/man/lpr.man b/man/lpr.man
index ab8c4ae..4a370b7 100644
--- a/man/lpr.man
+++ b/man/lpr.man
@@ -42,55 +42,54 @@ CUPS provides many ways to set the default destination. The "LPDEST" and
"PRINTER" environment variables are consulted first. If neither are set,
the current default set using the \fIlpoptions(1)\fR command is used,
followed by the default set using the \fIlpadmin(8)\fR command.
+
.SH OPTIONS
The following options are recognized by \fIlpr\fR:
+
.TP 5
--E
-.br
-Forces encryption when connecting to the server.
-.TP 5
--H server[:port]
+-# \fIcopies\fR
.br
-Specifies an alternate server.
+Sets the number of copies to print from 1 to 100.
+
.TP 5
-C "name"
+
.TP 5
--J "name"
-.TP 5
--T "name"
-.br
-Sets the job name.
-.TP 5
--P destination[/instance]
-.br
-Prints files to the named printer.
-.TP 5
--U username
-.br
-Specifies an alternate username.
-.TP 5
--# \fIcopies\fR
+-E
.br
-Sets the number of copies to print from 1 to 100.
+Forces encryption when connecting to the server.
+
.TP 5
-h
.br
Disables banner printing. This option is equivalent to "-o
job-sheets=none".
+
+.TP 5
+-H server[:port]
+.br
+Specifies an alternate server.
+
+.TP 5
+-J "name"
+
.TP 5
-l
.br
Specifies that the print file is already formatted for the
destination and should be sent without filtering. This option is
equivalent to "-o raw".
+
.TP 5
-m
.br
Send an email on job completion.
+
.TP 5
-o option[=value]
.br
Sets a job option.
+
.TP 5
-p
.br
@@ -98,15 +97,33 @@ Specifies that the print file should be formatted with a shaded
header with the date, time, job name, and page number. This
option is equivalent to "-o prettyprint" and is only useful when
printing text files.
+
+.TP 5
+-P destination[/instance]
+.br
+Prints files to the named printer.
+
.TP 5
-q
.br
Hold job for printing.
+
.TP 5
-r
.br
Specifies that the named print files should be deleted after
printing them.
+
+.TP 5
+-T "name"
+.br
+Sets the job name.
+
+.TP 5
+-U username
+.br
+Specifies an alternate username.
+
.SH COMPATIBILITY
The "c", "d", "f", "g", "i", "n", "t", "v", and "w" options
are not supported by CUPS and produce a warning message if used.
diff --git a/man/lprm.man b/man/lprm.man
index 49745c5..2c3db62 100644
--- a/man/lprm.man
+++ b/man/lprm.man
@@ -32,24 +32,30 @@ If no arguments are supplied, the current job on the default
destination is cancelled. You can specify one or more job ID
numbers to cancel those jobs or use the \fI-\fR option to cancel
all jobs.
+
.SH OPTIONS
The \fIlprm\fR command supports the following options:
+
.TP 5
-E
.br
Forces encryption when connecting to the server.
+
+.TP 5
+-h server[:port]
+.br
+Specifies and alternate server.
+
.TP 5
-P destination[/instance]
.br
Specifies the destination printer or class.
+
.TP 5
-U username
.br
Specifies an alternate username.
-.TP 5
--h server[:port]
-.br
-Specifies and alternate server.
+
.SH COMPATIBILITY
The CUPS version of \fIlprm\fR is compatible with the standard
Berkeley \fIlprm\fR command.
diff --git a/man/lpstat.man b/man/lpstat.man
index 0b8511c..9222dc0 100644
--- a/man/lpstat.man
+++ b/man/lpstat.man
@@ -40,68 +40,69 @@ lpstat - print cups status information
\fIlpstat\fR displays status information about the current
classes, jobs, and printers. When run with no arguments,
\fIlpstat\fR will list jobs queued by the current user.
+
.SH OPTIONS
The \fIlpstat\fR command supports the following options:
-.TP 5
--E
-.br
-Forces encryption when connecting to the server.
-.TP 5
--H
-.br
-Shows the server hostname and port.
-.TP 5
--R
-.br
-Shows the ranking of print jobs.
-.TP 5
--U username
-.br
-Specifies an alternate username.
-.TP 5
--W which-jobs
-.br
-Specifies which jobs to show, \fIcompleted\fR or
-\fInot-completed\fR (the default). This option \fImust\fR appear
-before the \fI-o\fR option and/or any printer names, otherwise
-the default (not-completed) value will be used in the request to
-the scheduler.
+
.TP 5
-a [printer(s)]
.br
Shows the accepting state of printer queues. If no printers are
specified then all printers are listed.
+
.TP 5
-c [class(es)]
.br
Shows the printer classes and the printers that belong to them.
If no classes are specified then all classes are listed.
+
.TP 5
-d
.br
Shows the current default destination.
+
+.TP 5
+-E
+.br
+Forces encryption when connecting to the server.
+
.TP 5
-h server[:port]
.br
Specifies an alternate server.
+
+.TP 5
+-H
+.br
+Shows the server hostname and port.
+
.TP 5
-l
.br
Shows a long listing of printers, classes, or jobs.
+
.TP 5
-o [destination(s)]
.br
Shows the jobs queue on the specified destinations. If no destinations are
specified all jobs are shown.
+
.TP 5
-p [printer(s)]
.br
Shows the printers and whether or not they are enabled for printing. If
no printers are specified then all printers are listed.
+
.TP 5
-r
.br
Shows whether the CUPS server is running.
+
+.TP 5
+-R
+.br
+Shows the ranking of print jobs.
+
.TP 5
-s
.br
@@ -109,21 +110,39 @@ Shows a status summary, including the default destination, a
list of classes and their member printers, and a list of printers and
their associated devices. This is equivalent to using the "-d", "-c",
and "-v" options.
+
.TP 5
-t
.br
Shows all status information. This is equivalent to using the "-r",
"-d", "-c", "-v", "-a", "-p", and "-o" options.
+
.TP 5
-u [user(s)]
.br
Shows a list of print jobs queued by the specified users. If no users
are specified, lists the jobs queued by the current user.
+
+.TP 5
+-U username
+.br
+Specifies an alternate username.
+
.TP 5
-v [printer(s)]
.br
Shows the printers and what device they are attached to. If no printers
are specified then all printers are listed.
+
+.TP 5
+-W which-jobs
+.br
+Specifies which jobs to show, \fIcompleted\fR or
+\fInot-completed\fR (the default). This option \fImust\fR appear
+before the \fI-o\fR option and/or any printer names, otherwise
+the default (not-completed) value will be used in the request to
+the scheduler.
+
.SH COMPATIBILITY
Unlike the System V printing system, CUPS allows printer names to

contain any printable character except SPACE, TAB, "/", and "#".

1.7.4.1

@michaelrsweet michaelrsweet added enhancement wontfix labels Mar 17, 2016
@michaelrsweet michaelrsweet added this to the Stable milestone Mar 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement wontfix
Projects
None yet
Development

No branches or pull requests

1 participant