- make synopsis and usage() match the order of the options list

- kill a raft of unneeded .Bk/.Ek

mostly from Igor Sobrado

2 files changed, 36 insertions, 41 deletions

diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index ca161e73578..e0fa0f43af1 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pr.1,v 1.15 2003/06/03 02:56:14 millert Exp $
+.\"	$OpenBSD: pr.1,v 1.16 2007/03/03 23:16:02 jmc Exp $
 .\"
 .\" Copyright (c) 1991 Keith Muller.
 .\" Copyright (c) 1993
@@ -42,53 +42,39 @@
 .Sh SYNOPSIS
 .Nm pr
 .Bk -words
-.Op Ar \&+page
-.Ek
-.Bk -words
+.Op Ar +page
 .Op Fl Ar column
-.Ek
-.Op Fl adfFmrt
-.Bk -words
-.Oo
-.Op Fl e
+.Op Fl adFfmrt
+.Xo Oo
+.Fl e
 .Op Ar char
 .Op Ar gap
 .Oc
-.Ek
-.Bk -words
+.Xc
 .Op Fl h Ar header
-.Ek
-.Bk -words
-.Oo
-.Op Fl i
+.Xo Oo
+.Fl i
 .Op Ar char
 .Op Ar gap
 .Oc
-.Ek
-.Bk -words
+.Xc
 .Op Fl l Ar lines
-.Ek
-.Bk -words
-.Op Fl o Ar offset
-.Ek
-.Bk -words
-.Oo
-.Op Fl s
+.Xo Oo
+.Fl n
 .Op Ar char
+.Op Ar width
 .Oc
-.Ek
-.Bk -words
-.Oo
-.Op Fl n
+.Xc
+.Op Fl o Ar offset
+.Xo Oo
+.Fl s
 .Op Ar char
-.Op Ar width
 .Oc
-.Ek
-.Bk -words
+.Xc
 .Op Fl w Ar width
-.Ek
 .Op -
 .Op Ar file ...
+.Ek
 .Sh DESCRIPTION
 The
 .Nm pr
@@ -182,7 +168,10 @@ An extra
 character is output following every
 .Em <newline>
 found in the input.
-.It Fl e Ar \&[char\&]\&[gap\&]
+.It Xo Fl e
+.Op Ar char
+.Op Ar gap
+.Xc
 Expand each input
 .Em <tab>
 to the next greater column
@@ -220,7 +209,10 @@ Use the string
 to replace the
 .Ar file name
 in the header line.
-.It Fl i Ar \&[char\&]\&[gap\&]
+.It Xo Fl i
+.Op Ar char
+.Op Ar gap
+.Xc
 In output, replace multiple
 .Em <space> Ns s
 with
@@ -268,7 +260,10 @@ The options
 and
 .Fl i
 are assumed.
-.It Fl n Ar \&[char\&]\&[width\&]
+.It Xo Fl n
+.Op Ar char
+.Op Ar width
+.Xc
 Provide
 .Ar width
 digit line numbering.
@@ -301,7 +296,7 @@ option is not specified, the default is zero.
 The space taken is in addition to the output line width.
 .It Fl r
 Write no diagnostic reports on failure to open a file.
-.It Fl s Ar char
+.It Fl s Op Ar char
 Separate text columns by the single character
 .Ar char
 instead of by the appropriate number of
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index a9cf9289a0d..d203e373096 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pr.c,v 1.22 2007/02/20 16:55:37 moritz Exp $	*/
+/*	$OpenBSD: pr.c,v 1.23 2007/03/03 23:16:02 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1991 Keith Muller.
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)pr.c	8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: pr.c,v 1.22 2007/02/20 16:55:37 moritz Exp $";
+static char *rcsid = "$OpenBSD: pr.c,v 1.23 2007/03/03 23:16:02 jmc Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -1728,11 +1728,11 @@ void
 usage(void)
 {
     ferrout(
-     "usage: pr [+page] [-col] [-adfFmrt] [-e[ch][gap]] [-h header]\n");
+     "usage: pr [+page] [-column] [-adFfmrt] [-e [char] [gap]] [-h header]\n");
     ferrout(
-     "          [-i[ch][gap]] [-l line] [-n[ch][width]] [-o offset]\n");
+     "\t[-i [char] [gap]] [-l lines] [-n [char] [width]] [-o offset]\n");
     ferrout(
-     "          [-s[ch]] [-w width] [-] [file ...]\n");
+     "\t[-s [char]] [-w width] [-] [file ...]\n");
 }
 
 /*