sort options and sync usage(); from Igor Sobrado

2 files changed, 12 insertions, 12 deletions

diff --git a/usr.sbin/lpr/lpq/lpq.1 b/usr.sbin/lpr/lpq/lpq.1
index 87e7cfd45ae..9bcb080030a 100644
--- a/usr.sbin/lpr/lpq/lpq.1
+++ b/usr.sbin/lpr/lpq/lpq.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lpq.1,v 1.8 2003/06/02 23:36:53 millert Exp $
+.\"	$OpenBSD: lpq.1,v 1.9 2007/02/16 13:29:04 jmc Exp $
 .\"	$NetBSD: lpq.1,v 1.11 2002/01/19 03:23:11 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -54,7 +54,14 @@ without any arguments reports on any jobs currently in the queue.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl P
+.It Fl a
+Report on the local queues for all printers,
+rather than just the specified printer.
+.It Fl l
+Information about each of the files comprising the job entry
+is printed.
+Normally, only as much information as will fit on one line is displayed.
+.It Fl P Ns Ar printer
 Specify a particular printer, otherwise the default
 line printer is used (or the value of the
 .Ev PRINTER
@@ -62,13 +69,6 @@ variable in the
 environment).
 All other arguments supplied are interpreted as user
 names or job numbers to filter out only those jobs of interest.
-.It Fl l
-Information about each of the files comprising the job entry
-is printed.
-Normally, only as much information as will fit on one line is displayed.
-.It Fl a
-Report on the local queues for all printers,
-rather than just the specified printer.
 .El
 .Pp
 For each job submitted (i.e., invocation of
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index 98b94c94fba..c94787af3f0 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpq.c,v 1.15 2003/09/03 20:23:26 tedu Exp $	*/
+/*	$OpenBSD: lpq.c,v 1.16 2007/02/16 13:29:04 jmc Exp $	*/
 /*	$NetBSD: lpq.c,v 1.9 1999/12/07 14:54:47 mrg Exp $	*/
 
 /*
@@ -41,7 +41,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)lpq.c	8.3 (Berkeley) 5/10/95";
 #else
-static const char rcsid[] = "$OpenBSD: lpq.c,v 1.15 2003/09/03 20:23:26 tedu Exp $";
+static const char rcsid[] = "$OpenBSD: lpq.c,v 1.16 2007/02/16 13:29:04 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -192,7 +192,7 @@ usage(void)
 	extern char *__progname;
 
 	fprintf(stderr,
-	    "usage: %s [-a] [-l] [-Pprinter] [user ...] [job ...]\n",
+	    "usage: %s [-al] [-Pprinter] [job# ...] [user ...]\n",
 	    __progname);
 	exit(1);
 }