- simplify synopsis and sort options: from Igor Sobrado

- some small cleanup whilst here

1 files changed, 14 insertions, 21 deletions

diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index 44bb7c6ec8d..e85fc1356c2 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vgrind.1,v 1.10 2003/06/10 09:12:12 jmc Exp $
+.\"	$OpenBSD: vgrind.1,v 1.11 2007/03/16 16:03:03 jmc Exp $
 .\"	$NetBSD: vgrind.1,v 1.4 1994/11/17 08:28:04 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -38,17 +38,11 @@
 .Nd grind nice listings of programs
 .Sh SYNOPSIS
 .Nm vgrind
-.Op Fl
-.Op Fl W
+.Op Fl fnstWx
 .Op Fl d Ar file
-.Op Fl f
 .Op Fl h Ar header
 .Op Fl l Ar language
-.Op Fl n
-.Op Fl sn
-.Op Fl t
-.Op Fl x
-.Ar name Ar ...
+.Ar
 .Sh DESCRIPTION
 .Nm
 formats the program sources which are arguments
@@ -67,10 +61,9 @@ In filter mode
 acts as a filter in a manner similar to
 .Xr tbl 1 .
 The standard input is passed directly to the standard output except
-for lines bracketed by the
-.Em troff-like
-macros:
-.Bl -tag -width Ds
+for lines bracketed by the following troff-like macros:
+.Pp
+.Bl -tag -width Ds -offset indent -compact
 .It \&.vS
 starts processing
 .It \&.vE
@@ -91,6 +84,10 @@ In regular mode
 accepts input files, processes them, and passes them to
 .Xr troff 1
 for output.
+Input is taken from standard input if
+.Sq -
+is specified instead of
+.Ar file .
 .Pp
 In both modes
 .Nm
@@ -98,13 +95,6 @@ passes any lines beginning with a decimal point without conversion.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl
-Forces input to be taken from standard input (default if
-.Fl f
-is specified).
-.It Fl W
-Forces output to the (wide) Versatec printer rather than the (narrow)
-Varian.
 .It Fl d Ar file
 Specifies an alternate language definitions
 file (default is
@@ -114,7 +104,7 @@ Forces filter mode.
 .It Fl h Ar header
 Specifies a particular header to put on every output page (default is
 the file name).
-.It Fl l
+.It Fl l Ar language
 Specifies the language to use.
 Currently known are
 .Tn PASCAL
@@ -148,6 +138,9 @@ of a .ps).
 Similar to the same option in
 .Xr troff 1
 causing formatted text to go to the standard output
+.It Fl W
+Forces output to the (wide) Versatec printer rather than the (narrow)
+Varian.
 .It Fl x
 Outputs the index file in a
 .Dq pretty