tidy up synopsis, usage(), and options list; from Igor Sobrado

2 files changed, 26 insertions, 44 deletions

diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1
index 4b92bec6e47..3e493354abe 100644
--- a/usr.sbin/lpr/lpr/lpr.1
+++ b/usr.sbin/lpr/lpr/lpr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lpr.1,v 1.9 2003/06/12 12:59:51 jmc Exp $
+.\"	$OpenBSD: lpr.1,v 1.10 2007/03/06 11:11:53 jmc Exp $
 .\"	$NetBSD: lpr.1,v 1.10 2002/01/19 03:23:26 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -38,34 +38,17 @@
 .Nd off line print
 .Sh SYNOPSIS
 .Nm lpr
-.Op Fl cdfghlmnpqrstv
-.Bk -words
-.Op Fl P Ns Ar printer
-.Ek
-.Bk -words
-.Op Fl \&# Ns Ar num
-.Ek
 .Bk -words
+.Op Fl cdfghlmnpqrstv
+.Op Fl # Ns Ar num
+.Op Fl 1234 Ar font
 .Op Fl C Ar class
-.Ek
-.Bk -words
+.Op Fl i Op Ar numcols
 .Op Fl J Ar job
-.Ek
-.Bk -words
+.Op Fl P Ns Ar printer
 .Op Fl T Ar title
-.Ek
-.Bk -words
 .Op Fl U Ar user
-.Ek
-.Bk -words
-.Op Fl i Op Ar numcols
-.Ek
-.Bk -words
-.Op Fl 1234 Ar font
-.Ek
-.Bk -words
 .Op Fl w Ns Ar num
-.Ek
 .Op Ar name ...
 .Sh DESCRIPTION
 .Nm lpr
@@ -120,16 +103,16 @@ Benson Varian.
 These options apply to the handling of
 the print job:
 .Bl -tag -width indent
-.It Fl P
+.It Fl h
+Suppress the printing of the burst page.
+.It Fl m
+Send mail upon completion.
+.It Fl P Ns Ar printer
 Force output to a specific printer.
 Normally, the default printer is used (site dependent), or the value of the
 environment variable
 .Ev PRINTER
 is used.
-.It Fl h
-Suppress the printing of the burst page.
-.It Fl m
-Send mail upon completion.
 .It Fl q
 Queue the print job but do not start the spooling daemon.
 .It Fl r
@@ -152,7 +135,7 @@ not be modified or removed until they have been printed.
 .Pp
 The remaining options apply to copies, the page display, and headers:
 .Bl -tag -width indent
-.It Fl \&# Ns Ar num
+.It Fl # Ns Ar num
 The quantity
 .Ar num
 is the number of copies desired of each file named.
@@ -171,9 +154,7 @@ $ cat foo.c bar.c more.c \&| lpr \-#3
 will give three copies of the concatenation of the files.
 Often a site will disable this feature to encourage use of a photocopier
 instead.
-.It Xo
-.Fl Ns Oo Cm 1234 Oc Ar font
-.Xc
+.It Fl 1234 Ar font
 Specifies a
 .Ar font
 to be mounted on font position
@@ -196,6 +177,12 @@ causes the system name (the name returned by
 to be replaced on the burst page by
 .Tn EECS ,
 and the file foo.c to be printed.
+.It Fl i Op Ar numcols
+The output is indented.
+If the next argument is numeric
+.Pq Ar numcols ,
+it is used as the number of blanks to be printed before each
+line; otherwise, 8 characters are printed.
 .It Fl J Ar job
 Job name to print on the burst page.
 Normally, the first file's name is used.
@@ -209,13 +196,7 @@ also for accounting purposes.
 This option is only honored if the real user ID is daemon
 (or that specified in the printcap file instead of daemon),
 and is intended for those instances where print filters wish to requeue jobs.
-.It Fl i Op numcols
-The output is indented.
-If the next argument is numeric
-.Pq Ar numcols ,
-it is used as the number of blanks to be printed before each
-line; otherwise, 8 characters are printed.
-.It Fl w Ar num
+.It Fl w Ns Ar num
 Uses
 .Ar num
 as the page width for
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 7624b63bd9e..26041c18ca2 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpr.c,v 1.39 2006/10/11 20:56:59 deraadt Exp $ */
+/*	$OpenBSD: lpr.c,v 1.40 2007/03/06 11:11:53 jmc Exp $ */
 /*	$NetBSD: lpr.c,v 1.19 2000/10/11 20:23:52 is Exp $	*/
 
 /*
@@ -46,7 +46,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)lpr.c	8.4 (Berkeley) 4/28/95";
 #else
-static const char rcsid[] = "$OpenBSD: lpr.c,v 1.39 2006/10/11 20:56:59 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: lpr.c,v 1.40 2007/03/06 11:11:53 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -727,8 +727,9 @@ usage(void)
 	extern char *__progname;
 
 	fprintf(stderr,
-	    "usage: %s [-cdfghlmnpqrstv] [-Pprinter] [-#num] [-C class] "
-	    "[-J job] [-T title]\n           [-U user] [-i [numcols]] "
-	    "[-1234 font] [-wnum] [name ...]\n", __progname);
+	    "usage: %s [-cdfghlmnpqrstv] [-#num] [-1234 font] "
+	    "[-C class] [-i [numcols]]\n"
+	    "\t[-J job] [-Pprinter] [-T title] [-U user] "
+	    "[-wnum] [name ...]\n", __progname);
 	exit(1);
 }