cleanup

15 files changed, 136 insertions, 142 deletions

diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index 8e1b4790f55..2353c46e673 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trpt.8,v 1.5 1997/09/08 09:23:14 deraadt Exp $
+.\"	$OpenBSD: trpt.8,v 1.6 1999/03/12 15:33:58 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -40,7 +40,7 @@
 .Nm trpt
 .Nd transliterate protocol trace
 .Sh SYNOPSIS
-.Nm trpt
+.Nm
 .Op Fl a
 .Op Fl f
 .Op Fl j
@@ -50,7 +50,7 @@
 .Op Fl N Ar system
 .Op Fl M Ar core
 .Sh DESCRIPTION
-.Nm Trpt
+.Nm
 interrogates the buffer of
 .Tn TCP
 trace records created
@@ -60,7 +60,7 @@ when a socket is marked for
 .Xr setsockopt 2 ) ,
 and prints a readable description of these records.
 When no options are supplied, 
-.Nm trpt
+.Nm
 prints all the trace records found in the system
 grouped according to
 .Tn TCP
@@ -105,7 +105,7 @@ instead of the default
 .El
 .Pp
 The recommended use of
-.Nm trpt
+.Nm
 is as follows.
 Isolate the problem and enable debugging on the
 socket(s) involved in the connection.
@@ -115,7 +115,7 @@ associated with the sockets using the
 option to 
 .Xr netstat 1 .
 Then run
-.Nm trpt
+.Nm
 with the
 .Fl p
 option, supplying the associated
diff --git a/usr.sbin/trsp/trsp.8 b/usr.sbin/trsp/trsp.8
index 2bff603ee9f..aefb5ccd5e6 100644
--- a/usr.sbin/trsp/trsp.8
+++ b/usr.sbin/trsp/trsp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trsp.8,v 1.4 1997/09/08 09:23:16 deraadt Exp $
+.\"	$OpenBSD: trsp.8,v 1.5 1999/03/12 15:33:58 aaron Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -40,7 +40,7 @@
 .Nm trsp
 .Nd transliterate sequenced packet protocol trace
 .Sh SYNOPSIS
-.Nm trsp
+.Nm
 .Op Fl a
 .Op Fl j
 .Op Fl p Ar hex-address
@@ -50,7 +50,7 @@
 .Op Fl N Ar system
 .Op Fl M Ar core
 .Sh DESCRIPTION
-.Nm Trsp
+.Nm
 interrogates the buffer of
 .Tn SPP
 trace records created
@@ -60,7 +60,7 @@ when a socket is marked for
 .Xr setsockopt 2 ) ,
 and prints a readable description of these records.
 When no options are supplied, 
-.Nm trsp
+.Nm
 prints all the trace records found in the system
 grouped according to
 .Tn SPP
@@ -104,7 +104,7 @@ instead of the default
 .El
 .Pp
 The recommended use of
-.Nm trsp
+.Nm
 is as follows.
 Isolate the problem and enable debugging on the
 socket(s) involved in the connection.
@@ -114,7 +114,7 @@ associated with the sockets using the
 option to 
 .Xr netstat 1 .
 Then run
-.Nm trsp
+.Nm
 with the
 .Fl p
 option, supplying the associated
diff --git a/usr.sbin/vipw/vipw.8 b/usr.sbin/vipw/vipw.8
index 79ea2cc0605..9df7ef250f8 100644
--- a/usr.sbin/vipw/vipw.8
+++ b/usr.sbin/vipw/vipw.8
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: vipw.8,v 1.3 1999/03/12 15:33:58 aaron Exp $
 .\"	$NetBSD: vipw.8,v 1.4 1995/01/20 19:19:56 mycroft Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -40,32 +41,32 @@
 .Nm vipw
 .Nd edit the password file
 .Sh SYNOPSIS
-.Nm vipw
+.Nm
 .Sh DESCRIPTION
-.Nm Vipw
+.Nm
 edits the password file after setting the appropriate locks,
 and does any necessary processing after the password file is unlocked.
 If the password file is already locked for editing by another user,
-.Nm vipw
+.Nm
 will ask you
 to try again later. The default editor for
-.Nm vipw
+.Nm
 is
 .Xr vi 1 .
 .Pp
-.Nm Vipw
+.Nm
 performs a number of consistency checks on the password entries,
 and will not allow a password file with a
 .Dq mangled
 entry to be
 installed.
 If
-.Nm vipw
+.Nm
 rejects the new password file, the user is prompted to re-enter
 the edit session.
 .Pp
 Once the information has been verified,
-.Nm vipw
+.Nm
 uses
 .Xr pwd_mkdb 8
 to update the user database.  This is run in the background, and,
diff --git a/usr.sbin/yppoll/yppoll.8 b/usr.sbin/yppoll/yppoll.8
index 3cd58884f31..716bd616f72 100644
--- a/usr.sbin/yppoll/yppoll.8
+++ b/usr.sbin/yppoll/yppoll.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yppoll.8,v 1.2 1996/03/25 15:56:21 niklas Exp $
+.\"	$OpenBSD: yppoll.8,v 1.3 1999/03/12 15:33:58 aaron Exp $
 .\"	$NetBSD: yppoll.8,v 1.3 1996/02/28 01:23:12 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -42,12 +42,12 @@
 .Nm yppoll
 .Nd ask version of YP map from YP server
 .Sh SYNOPSIS
-.Nm yppoll
+.Nm
 .Op Fl h Ar host
 .Op Fl d Ar domain
 .Ar mapname
 .Sh DESCRIPTION
-.Nm Yppoll
+.Nm
 asks a YP server process for the order number and which host is the master
 server for
 .Ar mapname .
@@ -71,11 +71,11 @@ instead of the default domain as returned by
 .El
 .Sh SEE ALSO
 .Xr domainname 1 ,
-.Xr ypbind 8 ,
 .Xr ypcat 1 ,
 .Xr ypmatch 1 ,
-.Xr ypset 8 ,
 .Xr ypwhich 1 ,
-.Xr yp 8
+.Xr yp 8 ,
+.Xr ypbind 8 ,
+.Xr ypset 8
 .Sh AUTHORS
 Theo De Raadt and John Brezak
diff --git a/usr.sbin/ypserv/makedbm/makedbm.8 b/usr.sbin/ypserv/makedbm/makedbm.8
index 151d29f9b22..1c50dff7a22 100644
--- a/usr.sbin/ypserv/makedbm/makedbm.8
+++ b/usr.sbin/ypserv/makedbm/makedbm.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: makedbm.8,v 1.5 1997/07/22 10:53:00 maja Exp $
+.\"	$OpenBSD: makedbm.8,v 1.6 1999/03/12 15:33:59 aaron Exp $
 .\" Copyright (c) 1994-97 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -48,7 +48,7 @@
 .Ar infile
 .Ar outfile
 .Sh DESCRIPTION
-.Nm Makedbm
+.Nm
 is the utiliy in YP that creates the database file containing the YP map.
 The databse format is a slightly modified version of ndbm.
 .Pp
@@ -89,9 +89,9 @@ Include an entry the in the map with the key YP_MASTER_NAME and the argument
 as value.
 .El
 .Sh SEE ALSO
-.Xr yp 8 ,
 .Xr db 3 ,
-.Xr ypxfr 8 ,
-.Xr ypserv 8 
+.Xr yp 8 ,
+.Xr ypserv 8 ,
+.Xr ypxfr 8
 .Sh AUTHOR
 Mats O Jansson <moj@stacken.kth.se>
diff --git a/usr.sbin/ypserv/mkalias/mkalias.8 b/usr.sbin/ypserv/mkalias/mkalias.8
index 4d45396a7fb..4d9e71340b8 100644
--- a/usr.sbin/ypserv/mkalias/mkalias.8
+++ b/usr.sbin/ypserv/mkalias/mkalias.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkalias.8,v 1.1 1997/07/26 12:12:28 maja Exp $
+.\"	$OpenBSD: mkalias.8,v 1.2 1999/03/12 15:33:59 aaron Exp $
 .\" Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -33,7 +33,7 @@
 .Os
 .Sh NAME
 .Nm mkalias
-.Nd a YP map convertion program
+.Nd a YP map conversion program
 .Sh SYNOPSIS
 .Nm mkalias
 .Op Fl v
@@ -45,9 +45,9 @@
 .Ar input
 .Op Ar output
 .Sh DESCRIPTION
-.Nm Mkalias
-is used to convert a mail.aliases map to a mail.byaddr map. This is a
-a inverse map of user@host (or user!host) back to alias. 
+.Nm
+is used to convert a mail.aliases map to a mail.byaddr map. This is
+an inverse map of user@host (or user!host) back to alias. 
 .Pp
 .Pp
 The options are as follows:
@@ -73,7 +73,7 @@ or
 .It Fl n
 Capitalize name. eg mats.o.jansson becomes Mats.O.Jansson.  
 .It Ar input
-Use this map as input
+Use this map as input.
 .It Ar output
 Use this map as output. If the output map isn't given don't create database.
 Can be useful together with
@@ -82,10 +82,10 @@ or
 .Fl E .
 .El
 .Sh BUGS
-.Nm mkalias
+.Nm
 on SunOS 4.1.x seems to have a
 .Fl s .
-Since I don't know what it is supposed to do I havn't implemented it. But it is accepted by the program.
+Since I don't know what it is supposed to do I haven't implemented it. But it is accepted by the program.
 .Sh SEE ALSO
 .Xr yp 8 ,
 .Xr ypserv 8 
diff --git a/usr.sbin/ypserv/mknetid/mknetid.8 b/usr.sbin/ypserv/mknetid/mknetid.8
index 5e636d00f80..ec5bf86e066 100644
--- a/usr.sbin/ypserv/mknetid/mknetid.8
+++ b/usr.sbin/ypserv/mknetid/mknetid.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mknetid.8,v 1.3 1996/05/30 09:53:07 deraadt Exp $
+.\"	$OpenBSD: mknetid.8,v 1.4 1999/03/12 15:33:59 aaron Exp $
 .\" Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -43,7 +43,7 @@
 .Op Fl h Ar hostfile
 .Op Fl m Ar netidfile
 .Sh DESCRIPTION
-.Nm Mknetid
+.Nm
 is used to create a map named 
 .Ar netid.byname .
 The map consists of information from
@@ -60,26 +60,27 @@ The options are as follows:
 .It Fl d Ar domain
 Which yp-domain if not default yp-domain.
 .It Fl q
-Keep quiet about multipy occuraces of a uid. Ignore all but the first.
+Keep quiet about multiple occurrences of a UID. Ignore all but the first.
 .It Fl p Ar passwdfile
 Alternate
 .Xr passwd 5
 file. Default is
-.Nm /etc/passwd .
+.Pa /etc/passwd .
 .It Fl g Ar groupfile
 Alternate
 .Xr group 5
 file. Default is
-.Nm /etc/group .
+.Pa /etc/group .
 .It Fl h Ar hostfile
 Alternate
-.Xr hosts 5 Default is
-.Nm /etc/hosts .
-file
+.Xr hosts 5
+file. Default is
+.Pa /etc/hosts .
 .It Fl m Ar netidfile
 Alternate
-.Xr netid 5 Default is
-.Nm /etc/netid .
+.Xr netid 5
+file. Default is
+.Pa /etc/netid .
 file.
 .El
 .Sh FILES
@@ -90,10 +91,10 @@ file.
 .It Pa /etc/netid
 .El
 .Sh SEE ALSO
-.Xr yp 8
-.Xr passwd 5 ,
 .Xr group 5 ,
 .Xr hosts 5 ,
-.Xr netid 5
+.Xr netid 5 ,
+.Xr passwd 5 ,
+.Xr yp 8
 .Sh AUTHOR
 Mats O Jansson <moj@stacken.kth.se>
diff --git a/usr.sbin/ypserv/mknetid/netid.5 b/usr.sbin/ypserv/mknetid/netid.5
index ad07aeb6deb..e5e9a443ae7 100644
--- a/usr.sbin/ypserv/mknetid/netid.5
+++ b/usr.sbin/ypserv/mknetid/netid.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: netid.5,v 1.3 1996/05/30 09:53:10 deraadt Exp $
+.\"	$OpenBSD: netid.5,v 1.4 1999/03/12 15:33:59 aaron Exp $
 .\" Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -38,32 +38,31 @@
 network credential file
 .Sh DESCRIPTION
 Files in
-.Nm netid
-format is rare. One lives in the
+.Xr netid 5
+format are rare. One lives in the
 .Nm YP
 map
-.Nm netid.byname .
+.Dq netid.byname .
 The format is rather simple. Each row consists of two
 items, a key and a value. When created by
 .Xr mknetid 8
-there is three kind of records.
+there are three types of records.
 .Pp
-The first type is information about which gids a uid has:
+The first type is information about which GIDs a UID has:
 .Bd -literal
 unix.<uid>@<yp-domain> <uid>:<gid>,<gid>
 .Ed
 .Pp
-The second type has informations about hosts:
+The second type contains information about hosts:
 .Bd -literal
 unix.<hostname>@<yp-domain> 0:<hostname>
 .Ed
 .Pp
-The third type is records from a 
+The third type refers to records from a 
 .Xr netid 5
 file other than the two types above.
 .Sh EXAMPLES
-.Pp
-A configuration file might appear as follows:
+A configuration file might look like the following:
 .Bd -literal
 unix.10714@kaka 10714:400,10
 unix.jodie@kaka 0:jodie
@@ -71,11 +70,11 @@ unix.jodie@kaka 0:jodie
 .Sh FILES
 .Bl -tag -width /etc/netid -compact
 .It Pa /etc/netid
-A file for lines not generated automatic by
+for lines not generated automatically by
 .Xr mknetid 8 .
 .El
 .Sh SEE ALSO
-.Xr yp 8 ,
-.Xr mknetid 8
+.Xr mknetid 8 ,
+.Xr yp 8
 .Sh AUTHOR
 Mats O Jansson <moj@stacken.kth.se>
diff --git a/usr.sbin/ypserv/stdethers/stdethers.8 b/usr.sbin/ypserv/stdethers/stdethers.8
index 3740af7a655..b6e34606cd8 100644
--- a/usr.sbin/ypserv/stdethers/stdethers.8
+++ b/usr.sbin/ypserv/stdethers/stdethers.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stdethers.8,v 1.3 1996/05/30 09:53:11 deraadt Exp $
+.\"	$OpenBSD: stdethers.8,v 1.4 1999/03/12 15:33:59 aaron Exp $
 .\" Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -33,21 +33,18 @@
 .Os
 .Sh NAME
 .Nm stdethers
-.Nd a YP filter program
+.Nd YP filtering program
 .Sh SYNOPSIS
 .Nm stdethers
 .Op Ar file
 .Sh DESCRIPTION
-.Nm Stdethers
-is used to get ride of some unwanted information in file or stdin. This
-program is used by YP when creating some YP maps.
+.Nm
+is used to get rid of unwanted information in
+.Ar file ,
+or the standard input if no
+.Ar file
+argument is given. This utility is used by YP when creating YP maps.
 .Pp
-.Pp
-The options are as follows:
-.Bl -tag -width indent
-.It Ar file
-Use this file as input instead of stdin.
-.El
 .Sh SEE ALSO
 .Xr yp 8 ,
 .Xr ypserv 8 
diff --git a/usr.sbin/ypserv/stdhosts/stdhosts.8 b/usr.sbin/ypserv/stdhosts/stdhosts.8
index 6cd55404f65..3dcf7275d3c 100644
--- a/usr.sbin/ypserv/stdhosts/stdhosts.8
+++ b/usr.sbin/ypserv/stdhosts/stdhosts.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stdhosts.8,v 1.4 1996/06/26 21:26:36 maja Exp $
+.\"	$OpenBSD: stdhosts.8,v 1.5 1999/03/12 15:34:00 aaron Exp $
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -33,21 +33,18 @@
 .Os
 .Sh NAME
 .Nm stdhosts
-.Nd a YP filter program
+.Nd YP filtering program
 .Sh SYNOPSIS
 .Nm stdhosts
 .Op Ar file
 .Sh DESCRIPTION
-.Nm Stdhosts
-is used to get ride of some unwanted information in file or stdin. This
-program is used by YP when creating some YP maps.
+.Nm
+is used to get rid of unwanted information from
+.Ar file ,
+or the standard input if no
+.Ar file
+argument is given. This utility is used by YP when creating YP maps.
 .Pp
-.Pp
-The options are as follows:
-.Bl -tag -width indent
-.It Ar file
-Use this file as input instead of stdin.
-.El
 .Sh SEE ALSO
 .Xr yp 8 ,
 .Xr ypserv 8 
diff --git a/usr.sbin/ypserv/ypinit/ypinit.8 b/usr.sbin/ypserv/ypinit/ypinit.8
index b369db36406..9455804dc7d 100644
--- a/usr.sbin/ypserv/ypinit/ypinit.8
+++ b/usr.sbin/ypserv/ypinit/ypinit.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypinit.8,v 1.1 1997/04/20 10:00:25 maja Exp $
+.\"	$OpenBSD: ypinit.8,v 1.2 1999/03/12 15:34:00 aaron Exp $
 .\" Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -33,7 +33,7 @@
 .Os
 .Sh NAME
 .Nm ypinit
-.Nd create an YP server (master or slave)
+.Nd create a YP server (master or slave)
 .Sh SYNOPSIS
 .Nm ypinit
 .Fl m Op Ar domainname
@@ -42,22 +42,22 @@
 .Nm ypinit
 .Fl u Op Ar domainname
 .Sh DESCRIPTION
-.Nm Ypinit
-is the utiliy to setup an YP server, or changing the ypserver map.
+.Nm
+may be used to setup a YP server, or to change the ypserver map.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
-.It Fl m
+.It Fl m Ar domainname
 Setup a master YP server. If 
 .Ar domainname
 is not given the default domainname will be used.
-.It Fl s
-Setup a slave YP server.
+.It Fl s Ar master_server Op Ar domainname
+Setup a slave YP server. If
 .Ar domainname
 is not given the default domainname will be used.
 .Ar master_server
 must be a running YP master server.
-.It Fl u
+.It Fl u Op Ar domainname
 Update the ypserver map on a YP master server. If 
 .Ar domainname
 is not given the default domainname will be used.
diff --git a/usr.sbin/ypserv/ypserv/securenet.5 b/usr.sbin/ypserv/ypserv/securenet.5
index bb14ae718cf..ad0d98f9213 100644
--- a/usr.sbin/ypserv/ypserv/securenet.5
+++ b/usr.sbin/ypserv/ypserv/securenet.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: securenet.5,v 1.4 1996/06/26 21:26:37 maja Exp $
+.\"	$OpenBSD: securenet.5,v 1.5 1999/03/12 15:34:00 aaron Exp $
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -38,7 +38,7 @@
 configuration file for secure networks
 .Sh DESCRIPTION
 The 
-.Nm securenet
+.Nm
 file controls which hosts can connect to the
 .Nm YP
 server.
@@ -46,8 +46,7 @@ server.
 The format is rather simple. Each row consists of two items. The first item
 is the network mask. The second item is the network.
 .Sh EXAMPLES
-.Pp
-A configuration file might appear as follows:
+A configuration file might look like the following:
 .Bd -literal
 #
 # Only my local net is secure. 
@@ -57,18 +56,18 @@ A configuration file might appear as follows:
 .Sh FILES
 .Bl -tag -width /var/yp/securenet -compact
 .It Pa /var/yp/securenet
-A
+a
 .Xr ypserv 8
-configuration file.
+configuration file
 .El
 .Sh SEE ALSO
+.Xr ypserv.acl 5 ,
 .Xr yp 8 ,
-.Xr ypserv 8 ,
-.Xr ypserv.acl 5
+.Xr ypserv 8
 .Sh HISTORY
 The
-.Nm securenet
-was added to
-.Nm NIS
+.Xr securenet 5
+file was added to
+.Tn NIS
 by Sun Microsystems, Inc. as a bugfix for weak security.
 
diff --git a/usr.sbin/ypserv/ypserv/ypserv.acl.5 b/usr.sbin/ypserv/ypserv/ypserv.acl.5
index 4e00b7bca1b..fd2f2f4036c 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.acl.5
+++ b/usr.sbin/ypserv/ypserv/ypserv.acl.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypserv.acl.5,v 1.6 1997/08/05 09:26:56 maja Exp $
+.\"	$OpenBSD: ypserv.acl.5,v 1.7 1999/03/12 15:34:00 aaron Exp $
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -38,14 +38,14 @@
 configuration file
 .Sh DESCRIPTION
 The 
-.Nm ypserv.acl
+.Nm
 file controls which hosts can connect to the
 .Nm YP
 server.
 .Pp
 The format is more complex than the format for
 .Xr securenet 5 .
-The first two verbs on each line controls if the line will
+The first two words on each line controls if the line will
 .Nm allow
 or
 .Nm deny
@@ -59,13 +59,14 @@ hosts.
 .Pp
 The
 .Nm YP
-server reads the configuration file and build a list in memory. This list
+server reads the configuration file and builds a list in memory. This list
 is processed from the beginning for every incomming request. As soon a
 match is found in the list the search terminates and it returns success
-or failure depending on 
+or failure depending on which of
 .Nm allow
 or 
-.Nm deny .
+.Nm deny
+was specified.
 If no match was found in the list success is returned.
 .Pp
 If access is denied every call will cause a 
@@ -74,51 +75,50 @@ error for the caller.
 .Pp
 Don't forget to allow localhost access if you want the machine running
 .Nm ypserv
-access it too.
+to be able to access it too.
 .Pp
 There is no default name for this file. Start 
 .Nm ypserv
 with a
-.Ar -a filename
+.Fl a Ar filename
 to read a file with this format.
 .Pp
-The following different syntax can be used:
+The following syntaxes may be used:
 .Pp
 <
-.Nm allow|deny
+.Ic allow|deny
 >
-.Nm host
+.Ic host
 <
-.Nm hostname|ip-address
+.Ic hostname|ip-address
 >
 .Pp
 If 
-.Nm hostname
-has more than one ip address then all will be added to the list.
+.Ic hostname
+has more than one IP address then all will be added to the list.
 .Pp
 <
-.Nm allow|deny
+.Ic allow|deny
 >
-.Nm net
+.Ic net
 <
-.Nm netname|netnumber
+.Ic netname|netnumber
 >
-.Op Nm netmask <netname|netnumber>
+.Op Ic netmask <netname|netnumber>
 .Pp
-If
-.Nm netmask
+If the the the the
+.Ic netmask
 part of the command isn't given then the netmask will be assumed to be a
 class A, B or C net depending on the net number.
 .Pp
 <
-.Nm allow|deny 
+.Ic allow|deny 
 >
-.Nm all
+.Ic all
 .Pp
 A line containing one of these commands will always match any host.
 .Sh EXAMPLES
-.Pp
-A configuration file might appear as follows:
+A configuration file might look like the following:
 .Bd -literal
 # This is an example of an access control file to be used by ypserv.
 #
@@ -169,14 +169,14 @@ deny all
 .Sh FILES
 .Bl -tag -width /var/yp/ypserv.acl -compact
 .It Pa /var/yp/ypserv.acl
-A
+a
 .Xr ypserv 8
-configuration file.
+configuration file
 .El
 .Sh SEE ALSO
+.Xr securenet 5 ,
 .Xr yp 8 ,
-.Xr ypserv 8 ,
-.Xr securenet 5
+.Xr ypserv 8
 .Sh AUTHOR
 Mats O Jansson <moj@stacken.kth.se>
 
diff --git a/usr.sbin/ypserv/yptest/yptest.8 b/usr.sbin/ypserv/yptest/yptest.8
index 76db7be1048..f9c8695ced0 100644
--- a/usr.sbin/ypserv/yptest/yptest.8
+++ b/usr.sbin/ypserv/yptest/yptest.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yptest.8,v 1.4 1996/06/26 21:26:40 maja Exp $
+.\"	$OpenBSD: yptest.8,v 1.5 1999/03/12 15:34:00 aaron Exp $
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -46,8 +46,8 @@
 .\".Ar infile
 .\".Ar outfile
 .Sh DESCRIPTION
-.Nm Yptest
-is a utility written to check if the YP server works as expected.
+.Nm
+checks various YP functions to see if the YP server works as expected.
 .Pp
 .Pp
 .\"The options are as follows:
diff --git a/usr.sbin/ypset/ypset.8 b/usr.sbin/ypset/ypset.8
index 09c0c231ec8..47598be4f69 100644
--- a/usr.sbin/ypset/ypset.8
+++ b/usr.sbin/ypset/ypset.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypset.8,v 1.3 1996/04/24 21:39:27 deraadt Exp $
+.\"	$OpenBSD: ypset.8,v 1.4 1999/03/12 15:34:00 aaron Exp $
 .\"	$NetBSD: ypset.8,v 1.2 1996/02/28 01:25:08 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@ which YP server process to use
 .Op Fl d Ar domain
 .Ar server
 .Sh DESCRIPTION
-.Nm Ypset
+.Nm
 tells the
 .Xr ypbind 8
 process on the current machine which YP server process to communicate with.
@@ -60,7 +60,7 @@ a YP client process attempts to access a YP map, at which time
 .Xr ypbind 8
 tests the binding and takes appropriate action.
 .Pp
-.Nm Ypset
+.Nm
 is most useful for binding a YP client that is not on the same broadcast
 network as the closest YP server, but can also be used for debugging
 a local network's YP configuration, testing specific YP client
@@ -81,11 +81,11 @@ instead of the default domain as returned by
 .El
 .Sh SEE ALSO
 .Xr domainname 1 ,
-.Xr ypbind 8 ,
 .Xr ypcat 1 ,
 .Xr ypmatch 1 ,
-.Xr yppoll 8 ,
 .Xr ypwhich 1 ,
-.Xr yp 8
+.Xr yp 8 ,
+.Xr ypbind 8 ,
+.Xr yppoll 8
 .Sh AUTHOR
 Theo de Raadt