2 files changed, 16 insertions, 14 deletions
diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1
index 6af6103ee5a..c904c3b12f2 100644
--- a/usr.bin/man/man.1
+++ b/usr.bin/man/man.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: man.1,v 1.7 1998/09/14 05:43:47 deraadt Exp $
+.\"	$OpenBSD: man.1,v 1.8 1998/09/26 19:55:06 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -48,7 +48,7 @@
 .Op Fl s Ar section
 .Op Fl S Ar subsection
 .Op Ar section
-.Ar name Ar ...
+.Ar name Op Ar ...
 .Nm man
 .Fl k Ar keyword
 .Nm man
@@ -65,7 +65,7 @@ manual pages entitled
 The options are as follows:
 .Bl -tag -width indent
 .It Fl k
-Locate manpages matching
+Locate man pages matching
 .Ar keyword
 in much the same way as
 .Xr apropos 1
@@ -92,7 +92,7 @@ and
 .Ar name
 combination.
 (Normally, only the first manual page found is displayed.)
-.It Fl C
+.It Fl C Ar file
 Use the specified 
 .Ar file
 instead of the default configuration file.
@@ -109,7 +109,7 @@ This is done by default if the standard output is not a terminal device.
 Display only the
 .Dq Tn SYNOPSIS
 lines of the requested manual pages.
-.It Fl M
+.It Fl M Ar path
 Override the list of standard directories which
 .Nm man
 searches for manual pages.
@@ -122,7 +122,7 @@ The subdirectories to be searched, and their search order,
 is specified by the ``_subdir'' line in the
 .Nm man
 configuration file.
-.It Fl m
+.It Fl m Ar path
 Augment the list of standard directories which
 .Nm man
 searches for manual pages.
@@ -139,11 +139,11 @@ The subdirectories to be searched, and their search order,
 is specified by the ``_subdir'' line in the
 .Nm man
 configuration file.
-.It Fl s
+.It Fl s Ar section
 Another way of specifying the section, for compatibility with
 .Nm man
 on other operating systems.
-.It Fl S
+.It Fl S Ar subsection
 Specifies the machine-dependent subsection.  This overrides the
 .Ev MACHINE
 environment variable.  See the ``ENVIRONMENT'' section below.
@@ -156,7 +156,7 @@ and
 .Ar name
 combination.
 .It Fl f
-Locate manpages matching the
+Locate man pages matching the
 .Ar command
 in much the same way
 .Xr whatis 1
@@ -213,7 +213,7 @@ will be used instead of the standard pagination program,
 .Sh FILES
 .Bl -tag -width /etc/man.conf -compact
 .It Pa /etc/man.conf
-default man configuration file.
+default man configuration file
 .El
 .Sh SEE ALSO
 .Xr apropos 1 ,
diff --git a/usr.bin/man/man.conf.5 b/usr.bin/man/man.conf.5
index e53ca5ace4b..4da4bab6eb4 100644
--- a/usr.bin/man/man.conf.5
+++ b/usr.bin/man/man.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: man.conf.5,v 1.2 1996/06/26 05:37:02 deraadt Exp $
+.\"	$OpenBSD: man.conf.5,v 1.3 1998/09/26 19:55:07 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -116,7 +116,7 @@ and
 .Fl m
 options.
 .It _suffix
-Man file names, regardless of their format are expected to end in
+Man file names, regardless of their format, are expected to end in
 a ``.*'' pattern, i.e. a ``.'' followed by some suffix.
 Each field of a _suffix line is a suffix which indicates
 files which do not need to be reformatted or manipulated
@@ -178,14 +178,16 @@ would search the directories
 and
 .Dq Pa /usr/share/man/cat3 ,
 in that order, for
-the mktemp manual page.
+the
+.Xr mktemp 1
+manual page.
 If a subdirectory with the same name as the current machine type
 existed in any of them, it would be searched as well, before each
 of them were searched.
 .Sh FILES
 .Bl -tag -width /etc/man.conf -compact
 .It Pa /etc/man.conf
-Standard manual directory search path.
+standard manual directory search path
 .El
 .Sh SEE ALSO
 .Xr apropos 1 ,