remove argument from .Os macros so value in /usr/share/tmac/mdoc/doc-common

is used instead; kwesterback@home.com

44 files changed, 129 insertions, 118 deletions

diff --git a/usr.sbin/accton/accton.8 b/usr.sbin/accton/accton.8
index 3e272675afe..bb7f0af4369 100644
--- a/usr.sbin/accton/accton.8
+++ b/usr.sbin/accton/accton.8
@@ -24,11 +24,11 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: accton.8,v 1.1 1995/10/18 08:47:09 deraadt Exp $
+.\"	$Id: accton.8,v 1.2 1999/05/23 14:11:31 aaron Exp $
 .\"
 .Dd October 18, 1993
 .Dt ACCTON 8
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm accton
 .Nd enable/disable system accounting
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index 371fa921a4c..6f97c524535 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: adduser.8,v 1.6 1998/12/29 12:04:37 deraadt Exp $
+.\"	$OpenBSD: adduser.8,v 1.7 1999/05/23 14:11:31 aaron Exp $
 .\"
 .\" Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" $From: adduser.8,v 1.12 1996/08/28 17:54:13 adam Exp $
 .Dd Jan, 9, 1995
 .Dt ADDUSER 8
-.Os OpenBSD
+.Os
 .Sh NAME
 .Nm adduser
 .Nd command for adding new users
diff --git a/usr.sbin/adduser/adduser_proc.8 b/usr.sbin/adduser/adduser_proc.8
index 0f0c727090f..188688fc453 100644
--- a/usr.sbin/adduser/adduser_proc.8
+++ b/usr.sbin/adduser/adduser_proc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: adduser_proc.8,v 1.2 1998/11/08 00:21:25 aaron Exp $
+.\"	$OpenBSD: adduser_proc.8,v 1.3 1999/05/23 14:11:31 aaron Exp $
 .\"	$NetBSD: adduser.8,v 1.4 1994/11/30 19:36:21 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -36,7 +36,7 @@
 .\"
 .Dd June 5, 1993
 .Dt ADDUSER_PROC 8
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm adduser_proc
 .Nd procedure for adding new users
diff --git a/usr.sbin/amd/mk-amd-map/mk-amd-map.8 b/usr.sbin/amd/mk-amd-map/mk-amd-map.8
index 0ae86d71bed..4feb8fc793b 100644
--- a/usr.sbin/amd/mk-amd-map/mk-amd-map.8
+++ b/usr.sbin/amd/mk-amd-map/mk-amd-map.8
@@ -31,11 +31,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)mk-amd-map.8	8.1 (Berkeley) 6/28/93
-.\"	$Id: mk-amd-map.8,v 1.3 1998/12/15 01:20:47 aaron Exp $
+.\"	$Id: mk-amd-map.8,v 1.4 1999/05/23 14:11:31 aaron Exp $
 .\"
 .Dd June, 28, 1993
 .Dt MK-AMD-MAP 8
-.Os BSD 4.4
+.Os
 .Sh NAME
 .Nm mk-amd-map
 .Nd create database maps for Amd
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index 8f26b0a83fc..d1865f8d5b8 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -24,11 +24,11 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: apm.8,v 1.6 1999/02/24 19:51:25 marc Exp $
+.\"	$Id: apm.8,v 1.7 1999/05/23 14:11:31 aaron Exp $
 .\"
 .Dd March 18, 1996
 .Dt APM 8
-.Os OpenBSD
+.Os
 .Sh NAME
 .Nm apm
 .Nd Advanced Power Management control program
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index cead4d46812..f2e6a28b8d2 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -24,11 +24,11 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: apmd.8,v 1.8 1999/02/23 04:17:34 marc Exp $
+.\"	$Id: apmd.8,v 1.9 1999/05/23 14:11:32 aaron Exp $
 .\"
 .Dd March 24, 1996
 .Dt APMD 8
-.Os OpenBSD
+.Os
 .Sh NAME
 .Nm apmd
 .Nd Advanced Power Management monitor daemon
diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8
index 0cc99ad80b4..777d6f1365c 100644
--- a/usr.sbin/arp/arp.8
+++ b/usr.sbin/arp/arp.8
@@ -35,7 +35,7 @@
 .\"
 .Dd June 6, 1993
 .Dt ARP 8
-.Os BSD 4.3
+.Os
 .Sh NAME
 .Nm arp
 .Nd address resolution display and control
diff --git a/usr.sbin/bad144/bad144.8 b/usr.sbin/bad144/bad144.8
index b39af9f6554..7099a5faefd 100644
--- a/usr.sbin/bad144/bad144.8
+++ b/usr.sbin/bad144/bad144.8
@@ -30,11 +30,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)bad144.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: bad144.8,v 1.3 1998/11/08 00:21:27 aaron Exp $
+.\"	$Id: bad144.8,v 1.4 1999/05/23 14:11:32 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt BAD144 8
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm bad144
 .Nd read/write DEC standard 144 bad sector information
diff --git a/usr.sbin/chroot/chroot.8 b/usr.sbin/chroot/chroot.8
index 25146e491a9..4e59eeb66fd 100644
--- a/usr.sbin/chroot/chroot.8
+++ b/usr.sbin/chroot/chroot.8
@@ -30,11 +30,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)chroot.8	5.3 (Berkeley) 3/16/91
-.\"	$Id: chroot.8,v 1.2 1998/11/08 00:21:28 aaron Exp $
+.\"	$Id: chroot.8,v 1.3 1999/05/23 14:11:32 aaron Exp $
 .\"
 .Dd March 16, 1991
 .Dt CHROOT 8
-.Os BSD 4.3
+.Os
 .Sh NAME
 .Nm chroot
 .Nd change root directory
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index e5177a6c3e7..a41abd0214f 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: config.8,v 1.8 1999/03/17 15:56:25 millert Exp $
+.\"	$OpenBSD: config.8,v 1.9 1999/05/23 14:11:32 aaron Exp $
 .\"	$NetBSD: config.8,v 1.10 1996/08/31 20:58:16 mycroft Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -36,7 +36,7 @@
 .\"
 .Dd April 19, 1994
 .Dt CONFIG 8
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm config
 .Nd build kernel compilation directories
diff --git a/usr.sbin/grfconfig/grfconfig.8 b/usr.sbin/grfconfig/grfconfig.8
index 3c56ada3018..a437d7f1048 100644
--- a/usr.sbin/grfconfig/grfconfig.8
+++ b/usr.sbin/grfconfig/grfconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: grfconfig.8,v 1.5 1998/12/15 01:20:47 aaron Exp $
+.\"	$OpenBSD: grfconfig.8,v 1.6 1999/05/23 14:11:33 aaron Exp $
 .\"	$NetBSD: grfconfig.8,v 1.4 1997/07/29 17:40:47 veego Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 .\"
 .Dd October 7, 1994
 .Dt GRFCONFIG 8 amiga
-.Os OpenBSD
+.Os
 .Sh NAME
 .Nm grfconfig 
 .Nd alter grf device screen mode definitions at run time
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index df7b68d8c36..a1fbd88fb46 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -30,11 +30,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	6.7 (Berkeley) 3/16/91
-.\"	$Id: inetd.8,v 1.8 1998/12/04 07:52:02 deraadt Exp $
+.\"	$Id: inetd.8,v 1.9 1999/05/23 14:11:33 aaron Exp $
 .\"
 .Dd March 16, 1991
 .Dt INETD 8
-.Os BSD 4.3
+.Os
 .Sh NAME
 .Nm inetd
 .Nd internet
diff --git a/usr.sbin/iteconfig/iteconfig_amiga.8 b/usr.sbin/iteconfig/iteconfig_amiga.8
index ac43cace6d4..940ff68beb5 100644
--- a/usr.sbin/iteconfig/iteconfig_amiga.8
+++ b/usr.sbin/iteconfig/iteconfig_amiga.8
@@ -31,7 +31,7 @@
 .\"
 .Dd February 3, 1994
 .Dt ITECONFIG 8 amiga
-.Os 
+.Os
 .Sh NAME
 .Nm iteconfig 
 .Nd modify console attributes at run time
diff --git a/usr.sbin/iteconfig/iteconfig_atari.8 b/usr.sbin/iteconfig/iteconfig_atari.8
index 90034d96ceb..e306f0cbb5b 100644
--- a/usr.sbin/iteconfig/iteconfig_atari.8
+++ b/usr.sbin/iteconfig/iteconfig_atari.8
@@ -31,7 +31,7 @@
 .\"
 .Dd April 15, 1995
 .Dt ITECONFIG 8 atari
-.Os 
+.Os
 .Sh NAME
 .Nm iteconfig 
 .Nd modify console attributes at run time
diff --git a/usr.sbin/kgmon/kgmon.8 b/usr.sbin/kgmon/kgmon.8
index acdd310d7c9..a285f01d95e 100644
--- a/usr.sbin/kgmon/kgmon.8
+++ b/usr.sbin/kgmon/kgmon.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: kgmon.8,v 1.3 1998/12/20 23:59:18 millert Exp $
+.\" $OpenBSD: kgmon.8,v 1.4 1999/05/23 14:11:33 aaron Exp $
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -31,11 +31,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)kgmon.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: kgmon.8,v 1.3 1998/12/20 23:59:18 millert Exp $
+.\"	$Id: kgmon.8,v 1.4 1999/05/23 14:11:33 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt KGMON 8
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm kgmon
 .Nd generate a dump of the operating system's profile buffers
@@ -45,14 +45,17 @@
 .Op Fl M Ar core
 .Op Fl N Ar system
 .Sh DESCRIPTION
-.Nm Kgmon
+.Nm kgmon
 is a tool used when profiling the operating system.
 When no arguments are supplied,
 .Nm kgmon
-indicates the state of operating system profiling as running,
-off, or not configured.
+indicates the state of operating system profiling as
+.Dq running ,
+.Dq off ,
+or
+.Dq not configured
 (see
-.Xr config 8 )
+.Xr config 8 ) .
 If the
 .Fl p
 flag is specified,
@@ -81,10 +84,12 @@ flag is also specified, the
 file is generated before the buffers are reset.
 .It Fl M
 Extract values associated with the name list from the specified core
-instead of the default ``/dev/kmem''.
+instead of the default
+.Pa /dev/kmem .
 .It Fl N
 Extract the name list from the specified system instead of the
-default ``/bsd''.
+default 
+.Pa /bsd .
 .El
 .Pp
 If neither 
@@ -101,9 +106,9 @@ and profiling will be immediately resumed.
 .Sh FILES
 .Bl -tag -width /dev/kmemx -compact
 .It Pa /bsd
-the default system
+default system
 .It Pa /dev/kmem
-the default memory
+default memory
 .El
 .Sh SEE ALSO
 .Xr gprof 1 ,
diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8
index f8845f4f736..790c83d297e 100644
--- a/usr.sbin/lpr/lpc/lpc.8
+++ b/usr.sbin/lpr/lpc/lpc.8
@@ -33,7 +33,7 @@
 .\"
 .Dd April 28, 1995
 .Dt LPC 8
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm lpc
 .Nd line printer control program
@@ -44,7 +44,7 @@
 .Op Ar argument ...
 .Oc
 .Sh DESCRIPTION
-.Nm Lpc
+.Nm lpc
 is used by the system administrator to control the
 operation of the line printer system.  
 For each line printer configured in
@@ -77,8 +77,8 @@ Commands may be abbreviated;
 the following is the list of recognized commands.
 .Pp
 .Bl -tag -width Ds -compact
-.It Ic \&? No [ command ... ]
-.It Ic help No [ command ... ]
+.It Ic \&? No [ Ar command Ar ... ]
+.It Ic help No [ Ar command Ar ... ]
 Print a short description of each command specified in the argument list,
 or, if no argument is given, a list of the recognized commands.
 .Pp
@@ -98,7 +98,9 @@ Turn the specified printer queues off.  This prevents new
 printer jobs from being entered into the queue by
 .Xr lpr .
 .Pp
-.It Ic down No {\ all\ |\ printer\ } message ...
+.It Xo Ic down No {\ all\ |\ printer\ } Ar message
+.Op Ar ...
+.Xc
 Turn the specified printer queue off, disable printing and put
 .Em message
 in the printer status file. The message doesn't need to be quoted, the
@@ -106,7 +108,7 @@ remaining arguments are treated like
 .Xr echo 1 .
 This is normally used to take a printer down and let others know why
 .Xr lpq 1
-will indicate the printer is down and print the status message).
+will indicate the printer is down and print the status message.
 .Pp
 .It Ic enable  No {\ all\ |\ printer\ }
 Enable spooling on the local queue for the listed printers. 
@@ -162,11 +164,15 @@ lock file for queue control
 .Sh DIAGNOSTICS
 .Bl -tag -width Ds
 .It Sy "?Ambiguous command"
-abbreviation matches more than one command
+Abbreviation matches more than one command.
 .It Sy "?Invalid command"
-no match was found
+No match was found.
 .It Sy "?Privileged command"
-you must be a member of group "operator" or root to execute this command
+You must be a member of group
+.Dq operator
+or user
+.Dq root
+to execute this command.
 .El
 .Sh HISTORY
 The
diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8
index 386f48384c7..fb119db5287 100644
--- a/usr.sbin/lpr/lpd/lpd.8
+++ b/usr.sbin/lpr/lpd/lpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lpd.8,v 1.6 1999/05/16 19:58:10 alex Exp $
+.\"	$OpenBSD: lpd.8,v 1.7 1999/05/23 14:11:34 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
 .\"
 .Dd April 19, 1994
 .Dt LPD 8
-.Os BSD 4.4
+.Os
 .Sh NAME
 .Nm lpd
 .Nd line printer spooler daemon
@@ -43,7 +43,7 @@
 .Nm lpd
 .Op Fl l
 .Sh DESCRIPTION
-.Nm Lpd
+.Nm lpd
 is the line printer daemon (spool area handler) and is normally invoked
 at boot time from the
 .Xr rc 8
@@ -76,7 +76,7 @@ one of the machines listed in the file
 or
 .Pa /etc/hosts.lpd .
 Second, if the
-.Li rs
+.Dq rs
 capability is specified in the
 .Xr printcap
 entry for the printer being accessed,
@@ -117,19 +117,21 @@ Title.  String to be used as the title for
 .Xr pr 1 .
 .It H
 Host Name.  Name of the machine where
-.Xr lpr
+.Xr lpr 1
 was invoked.
 .It P
 Person.  Login name of the person who invoked
-.Xr lpr .
+.Xr lpr 1 .
 This is used to verify ownership by
-.Xr lprm .
+.Xr lprm 1 .
 .It M
 Send mail to the specified user when the current print job completes.
 .It f
 Formatted File.  Name of a file to print which is already formatted.
 .It l
-Like ``f'' but passes control characters and does not make page breaks.
+Like
+.Dq f
+but passes control characters and does not make page breaks.
 .It p
 Name of a file to print using
 .Xr pr 1
@@ -176,7 +178,7 @@ Unlink.  Name of file to remove upon completion of printing.
 .It N
 File name.  The name of the file which is being printed, or a blank
 for the standard input (when 
-.Xr lpr
+.Xr lpr 1
 is invoked in a pipeline).
 .El
 .Pp
@@ -185,12 +187,12 @@ If a file cannot be opened, a message will be logged via
 using the
 .Em LOG_LPR
 facility.
-.Nm Lpd
+.Nm lpd
 will try up to 20 times
 to reopen a file it expects to be there, after which it will
 skip the file to be printed.
 .Pp
-.Nm Lpd
+.Nm lpd
 uses
 .Xr flock 2
 to provide exclusive access to the lock file and to prevent multiple
@@ -200,7 +202,7 @@ The lock file is kept in a readable
 .Tn ASCII
 form
 and contains two lines.
-The first is the process id of the daemon and the second is the control
+The first is the process ID of the daemon and the second is the control
 file name of the current job being printed.  The second line is updated to
 reflect the current status of
 .Nm lpd
@@ -224,7 +226,7 @@ socket for local requests
 lists machine names allowed printer access
 .It Pa /etc/hosts.lpd
 lists machine names allowed printer access,
-but not under same administrative control.
+but not under same administrative control
 .El
 .Sh SEE ALSO
 .Xr lpq 1 ,
diff --git a/usr.sbin/lpr/pac/pac.8 b/usr.sbin/lpr/pac/pac.8
index 6e7ffc0b765..444fa786d57 100644
--- a/usr.sbin/lpr/pac/pac.8
+++ b/usr.sbin/lpr/pac/pac.8
@@ -33,7 +33,7 @@
 .\"
 .Dd June 6, 1993
 .Dt PAC 8
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm pac
 .Nd printer/plotter accounting information
@@ -47,7 +47,7 @@
 .Op Fl r
 .Op Ar name ...
 .Sh DESCRIPTION
-.Nm Pac
+.Nm pac
 reads the printer/plotter accounting files, accumulating the number
 of pages (the usual case) or feet (for raster devices)
 of paper consumed by each user, and printing out
@@ -62,10 +62,10 @@ the value of the environment variable
 .Ev PRINTER
 is used.
 .It Fl c
-flag causes the output to be sorted by cost; usually the
+Causes the output to be sorted by cost; usually the
 output is sorted alphabetically by name.
 .It Fl m
-flag causes the host name to be ignored in the accounting file.  This
+Causes the host name to be ignored in the accounting file.  This
 allows for a user on multiple machines to have all of his printing
 charges grouped together.
 .It Fl p Ns Ar price
@@ -92,7 +92,7 @@ raw accounting files
 .It Pa /var/account/?_sum
 summary accounting files
 .It Pa /etc/printcap
-printer capability data base
+printer capability database
 .El
 .Sh SEE ALSO
 .Xr printcap 5
diff --git a/usr.sbin/pcmciad/pcmciad.8 b/usr.sbin/pcmciad/pcmciad.8
index e6c5376b291..daa0876905c 100644
--- a/usr.sbin/pcmciad/pcmciad.8
+++ b/usr.sbin/pcmciad/pcmciad.8
@@ -24,11 +24,11 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: pcmciad.8,v 1.3 1998/12/15 01:20:48 aaron Exp $
+.\"	$Id: pcmciad.8,v 1.4 1999/05/23 14:11:34 aaron Exp $
 .\"
 .Dd October 29, 1995
 .Dt PCMCIAD 8
-.Os OpenBSD
+.Os
 .Sh NAME
 .Nm pcmciad
 .Nd PC-CARD slot monitor daemon
diff --git a/usr.sbin/portmap/portmap.8 b/usr.sbin/portmap/portmap.8
index 00a6d4d8074..a7b649ef3b5 100644
--- a/usr.sbin/portmap/portmap.8
+++ b/usr.sbin/portmap/portmap.8
@@ -31,11 +31,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)portmap.8	5.3 (Berkeley) 3/16/91
-.\"	$Id: portmap.8,v 1.2 1999/05/16 19:58:15 alex Exp $
+.\"	$Id: portmap.8,v 1.3 1999/05/23 14:11:34 aaron Exp $
 .\"
 .Dd March 16, 1991
 .Dt PORTMAP 8
-.Os BSD 4.3
+.Os
 .Sh NAME
 .Nm portmap
 .Nd
@@ -47,7 +47,7 @@ program number mapper
 .Nm portmap
 .Op Fl d
 .Sh DESCRIPTION
-.Nm Portmap
+.Nm portmap
 is a server that converts
 .Tn RPC
 program numbers into
@@ -74,7 +74,7 @@ the port number where
 .Tn RPC
 packets should be sent.
 .Pp
-.Nm Portmap
+.Nm portmap
 must be started before any
 .Tn RPC
 servers are invoked.
@@ -83,7 +83,7 @@ Normally
 .Nm portmap
 forks and dissociates itself from the terminal
 like any other daemon.
-.Nm Portmap
+.Nm portmap
 then logs errors using
 .Xr syslog 3 .
 .Pp
diff --git a/usr.sbin/ppp/ppp/ppp.8 b/usr.sbin/ppp/ppp/ppp.8
index 1fee5050f17..9df6a98b1f7 100644
--- a/usr.sbin/ppp/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp/ppp.8
@@ -1,7 +1,7 @@
-.\" $Id: ppp.8,v 1.41 1999/05/16 13:38:47 brian Exp $
+.\" $Id: ppp.8,v 1.42 1999/05/23 14:11:35 aaron Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
-.Os FreeBSD
+.Os
 .Dt PPP 8
 .Sh NAME
 .Nm ppp
diff --git a/usr.sbin/ppp/pppctl/pppctl.8 b/usr.sbin/ppp/pppctl/pppctl.8
index b0c29a52b0b..f43ed42378b 100644
--- a/usr.sbin/ppp/pppctl/pppctl.8
+++ b/usr.sbin/ppp/pppctl/pppctl.8
@@ -1,6 +1,6 @@
-.\" $Id: pppctl.8,v 1.3 1999/03/11 19:09:53 aaron Exp $
+.\" $Id: pppctl.8,v 1.4 1999/05/23 14:11:35 aaron Exp $
 .Dd 26 June 1997
-.Os FreeBSD
+.Os
 .Dt PPPCTL 8
 .Sh NAME
 .Nm pppctl
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index eb8c6a3de4d..306ece1b4b8 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -35,7 +35,7 @@
 .\"
 .Dd April 19, 1994
 .Dt PSTAT 8
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm pstat
 .Nd display system data structures
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8
index 59159756524..fe6ce3b46a0 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.8
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pwd_mkdb.8,v 1.6 1999/04/02 15:12:19 aaron Exp $
+.\"	$OpenBSD: pwd_mkdb.8,v 1.7 1999/05/23 14:11:36 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
 .\"
 .Dd June 6, 1993
 .Dt PWD_MKDB 8
-.Os OpenBSD
+.Os
 .Sh NAME
 .Nm pwd_mkdb
 .Nd "generate the password databases"
diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8
index 0150cfa5f90..499f2a693d0 100644
--- a/usr.sbin/quot/quot.8
+++ b/usr.sbin/quot/quot.8
@@ -27,11 +27,11 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: quot.8,v 1.6 1999/04/02 15:12:20 aaron Exp $
+.\"	$Id: quot.8,v 1.7 1999/05/23 14:11:36 aaron Exp $
 .\"
 .Dd February 8, 1994
 .Dt QUOT 8
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm quot
 .Nd display disk space occupied by each user
diff --git a/usr.sbin/quotaon/quotaon.8 b/usr.sbin/quotaon/quotaon.8
index 1658d91cb6f..63eb08f4d86 100644
--- a/usr.sbin/quotaon/quotaon.8
+++ b/usr.sbin/quotaon/quotaon.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: quotaon.8,v 1.2 1999/03/11 19:39:43 aaron Exp $
+.\"	$OpenBSD: quotaon.8,v 1.3 1999/05/23 14:11:36 aaron Exp $
 .\" Copyright (c) 1983, 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -33,11 +33,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)quotaon.8	8.2 (Berkeley) 12/11/93
-.\"	$Id: quotaon.8,v 1.2 1999/03/11 19:39:43 aaron Exp $
+.\"	$Id: quotaon.8,v 1.3 1999/05/23 14:11:36 aaron Exp $
 .\"
 .Dd December 11, 1993
 .Dt QUOTAON 8
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm quotaon ,
 .Nm quotaoff
diff --git a/usr.sbin/rdconfig/rdconfig.8 b/usr.sbin/rdconfig/rdconfig.8
index 360e8498810..97bcb230355 100644
--- a/usr.sbin/rdconfig/rdconfig.8
+++ b/usr.sbin/rdconfig/rdconfig.8
@@ -28,7 +28,7 @@
 .\"
 .Dd July 8, 1993
 .Dt RDCONFIG 8
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm rdconfig
 .Nd configure RAM disks
@@ -60,7 +60,6 @@ process started earlier.
 .It Pa /dev/rd??
 .El
 .Sh EXAMPLES
-.Pp
 .Dl rdconfig /dev/rd0a 2048 &
 .Pp
 Configures the RAM disk
diff --git a/usr.sbin/repquota/repquota.8 b/usr.sbin/repquota/repquota.8
index 169c07a3120..9e9faeded3f 100644
--- a/usr.sbin/repquota/repquota.8
+++ b/usr.sbin/repquota/repquota.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: repquota.8,v 1.2 1999/03/11 19:39:44 aaron Exp $
+.\"	$OpenBSD: repquota.8,v 1.3 1999/05/23 14:11:37 aaron Exp $
 .\" Copyright (c) 1983, 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -34,11 +34,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)repquota.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: repquota.8,v 1.2 1999/03/11 19:39:44 aaron Exp $
+.\"	$Id: repquota.8,v 1.3 1999/05/23 14:11:37 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt REPQUOTA 8
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm repquota
 .Nd summarize quotas for a file system
diff --git a/usr.sbin/rmt/rmt.8 b/usr.sbin/rmt/rmt.8
index 901989b9f44..38abe659076 100644
--- a/usr.sbin/rmt/rmt.8
+++ b/usr.sbin/rmt/rmt.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rmt.8,v 1.4 1999/04/02 15:12:20 aaron Exp $
+.\"	$OpenBSD: rmt.8,v 1.5 1999/05/23 14:11:37 aaron Exp $
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -31,11 +31,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rmt.8	6.5 (Berkeley) 3/16/91
-.\"	$Id: rmt.8,v 1.4 1999/04/02 15:12:20 aaron Exp $
+.\"	$Id: rmt.8,v 1.5 1999/05/23 14:11:37 aaron Exp $
 .\"
 .Dd March 16, 1991
 .Dt RMT 8
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm rmt
 .Nd remote magtape protocol module
diff --git a/usr.sbin/rwhod/rwhod.8 b/usr.sbin/rwhod/rwhod.8
index df64af3e6f6..7fc3bac5453 100644
--- a/usr.sbin/rwhod/rwhod.8
+++ b/usr.sbin/rwhod/rwhod.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rwhod.8,v 1.8 1999/04/02 15:12:20 aaron Exp $
+.\"	$OpenBSD: rwhod.8,v 1.9 1999/05/23 14:11:37 aaron Exp $
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -31,11 +31,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rwhod.8	8.2 (Berkeley) 12/11/93
-.\"     $OpenBSD: rwhod.8,v 1.8 1999/04/02 15:12:20 aaron Exp $
+.\"     $OpenBSD: rwhod.8,v 1.9 1999/05/23 14:11:37 aaron Exp $
 .\"
 .Dd December 11, 1993
 .Dt RWHOD 8
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm rwhod
 .Nd system status server
diff --git a/usr.sbin/sendmail/mailstats/mailstats.8 b/usr.sbin/sendmail/mailstats/mailstats.8
index be2203d85fa..515b0848f56 100644
--- a/usr.sbin/sendmail/mailstats/mailstats.8
+++ b/usr.sbin/sendmail/mailstats/mailstats.8
@@ -9,7 +9,7 @@
 .\"
 .Dd April 25, 1996
 .Dt MAILSTATS 1
-.Os BSD 3
+.Os
 .Sh NAME
 .Nm mailstats
 .Nd display mail statistics
diff --git a/usr.sbin/sendmail/makemap/makemap.8 b/usr.sbin/sendmail/makemap/makemap.8
index 27b89936bc0..a1d86a323f2 100644
--- a/usr.sbin/sendmail/makemap/makemap.8
+++ b/usr.sbin/sendmail/makemap/makemap.8
@@ -11,7 +11,7 @@
 .\"
 .Dd November 16, 1992
 .Dt MAKEMAP 8
-.Os BSD 4.4
+.Os
 .Sh NAME
 .Nm makemap
 .Nd create database maps for sendmail
diff --git a/usr.sbin/sendmail/src/aliases.5 b/usr.sbin/sendmail/src/aliases.5
index bf4583837e0..7be4c7dcbf5 100644
--- a/usr.sbin/sendmail/src/aliases.5
+++ b/usr.sbin/sendmail/src/aliases.5
@@ -12,7 +12,7 @@
 .\"
 .Dd May 19, 1998
 .Dt ALIASES 5
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm aliases
 .Nd aliases file for sendmail
diff --git a/usr.sbin/sendmail/src/sendmail.8 b/usr.sbin/sendmail/src/sendmail.8
index 093b6e6f9f2..f38a6381924 100644
--- a/usr.sbin/sendmail/src/sendmail.8
+++ b/usr.sbin/sendmail/src/sendmail.8
@@ -12,7 +12,7 @@
 .\"
 .Dd August 2, 1998
 .Dt SENDMAIL 8
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm sendmail
 .Nd an electronic mail transport agent
@@ -304,7 +304,7 @@ Use alternate alias file.
 .It Li HoldExpensive
 On mailers that are considered ``expensive'' to connect to,
 don't initiate immediate connection.
-This requires queueing.
+This requires queuing.
 .It Li CheckpointInterval= Ns Ar N
 Checkpoint the queue file after every
 .Ar N
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index fe244ade808..576f2da6b65 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: syslogd.8,v 1.9 1999/04/02 15:12:21 aaron Exp $
+.\"	$OpenBSD: syslogd.8,v 1.10 1999/05/23 14:11:38 aaron Exp $
 .\" Copyright (c) 1983, 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -35,7 +35,7 @@
 .\"
 .Dd June 6, 1993
 .Dt SYSLOGD 8
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm syslogd
 .Nd log systems messages
diff --git a/usr.sbin/timed/timed/timed.8 b/usr.sbin/timed/timed/timed.8
index 809f9f6749a..75d3da67528 100644
--- a/usr.sbin/timed/timed/timed.8
+++ b/usr.sbin/timed/timed/timed.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timed.8,v 1.3 1999/04/02 15:12:21 aaron Exp $
+.\"	$OpenBSD: timed.8,v 1.4 1999/05/23 14:11:38 aaron Exp $
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -34,7 +34,7 @@
 .\"
 .Dd May 11, 1993
 .Dt TIMED 8
-.Os BSD 4.3
+.Os
 .Sh NAME
 .Nm timed
 .Nd time server daemon
diff --git a/usr.sbin/timed/timedc/timedc.8 b/usr.sbin/timed/timedc/timedc.8
index b83297bf7b7..c5a1481f3e7 100644
--- a/usr.sbin/timed/timedc/timedc.8
+++ b/usr.sbin/timed/timedc/timedc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timedc.8,v 1.3 1999/04/02 15:12:21 aaron Exp $
+.\"	$OpenBSD: timedc.8,v 1.4 1999/05/23 14:11:38 aaron Exp $
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -34,7 +34,7 @@
 .\"
 .Dd May 11, 1993
 .Dt TIMEDC 8
-.Os BSD 4.3
+.Os
 .ad
 .Sh NAME
 .Nm timedc
diff --git a/usr.sbin/traceroute/traceroute.8 b/usr.sbin/traceroute/traceroute.8
index 278c5a1e63b..cec7f223ae0 100644
--- a/usr.sbin/traceroute/traceroute.8
+++ b/usr.sbin/traceroute/traceroute.8
@@ -38,7 +38,7 @@
 .\"
 .Dd June 6, 1993
 .Dt TRACEROUTE 8
-.Os BSD 4.3
+.Os
 .Sh NAME
 .Nm traceroute
 .Nd print the route packets take to network host
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index 75a5d948237..e5ce52a7b62 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trpt.8,v 1.7 1999/04/02 15:12:22 aaron Exp $
+.\"	$OpenBSD: trpt.8,v 1.8 1999/05/23 14:11:38 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
 .\"
 .Dd December 11, 1993
 .Dt TRPT 8
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm trpt
 .Nd transliterate protocol trace
diff --git a/usr.sbin/trsp/trsp.8 b/usr.sbin/trsp/trsp.8
index fdeb590b4df..82c1be6965f 100644
--- a/usr.sbin/trsp/trsp.8
+++ b/usr.sbin/trsp/trsp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trsp.8,v 1.6 1999/04/02 15:12:22 aaron Exp $
+.\"	$OpenBSD: trsp.8,v 1.7 1999/05/23 14:11:39 aaron Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
 .\"
 .Dd June 6, 1993
 .Dt TRSP 8
-.Os BSD 4.3
+.Os
 .Sh NAME
 .Nm trsp
 .Nd transliterate sequenced packet protocol trace
diff --git a/usr.sbin/vipw/vipw.8 b/usr.sbin/vipw/vipw.8
index 44fec390f9d..58ea7d8b8d1 100644
--- a/usr.sbin/vipw/vipw.8
+++ b/usr.sbin/vipw/vipw.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vipw.8,v 1.4 1999/04/02 15:12:22 aaron Exp $
+.\"	$OpenBSD: vipw.8,v 1.5 1999/05/23 14:11:39 aaron Exp $
 .\"	$NetBSD: vipw.8,v 1.4 1995/01/20 19:19:56 mycroft Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -36,7 +36,7 @@
 .\"
 .Dd June 6, 1993
 .Dt VIPW 8
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm vipw
 .Nd edit the password file
diff --git a/usr.sbin/vnconfig/vnconfig.8 b/usr.sbin/vnconfig/vnconfig.8
index 315cd3ec98c..c04cf9af409 100644
--- a/usr.sbin/vnconfig/vnconfig.8
+++ b/usr.sbin/vnconfig/vnconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vnconfig.8,v 1.6 1999/05/16 19:58:17 alex Exp $
+.\"	$OpenBSD: vnconfig.8,v 1.7 1999/05/23 14:11:39 aaron Exp $
 .\
 .\" Copyright (c) 1993 University of Utah.
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -40,7 +40,7 @@
 .\"
 .Dd July 8, 1993
 .Dt VNCONFIG 8
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm vnconfig
 .Nd configure vnode disks
@@ -92,7 +92,6 @@ is assumed.
 .It Pa /dev/{,r}{,s}vnd*
 .El
 .Sh EXAMPLES
-.Pp
 .Dl vnconfig svnd0 /tmp/diskimage
 .Pp
 Configures the vnode disk
diff --git a/usr.sbin/ypserv/mknetid/mknetid.8 b/usr.sbin/ypserv/mknetid/mknetid.8
index ec5bf86e066..543582577cb 100644
--- a/usr.sbin/ypserv/mknetid/mknetid.8
+++ b/usr.sbin/ypserv/mknetid/mknetid.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mknetid.8,v 1.4 1999/03/12 15:33:59 aaron Exp $
+.\"	$OpenBSD: mknetid.8,v 1.5 1999/05/23 14:11:06 aaron Exp $
 .\" Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -30,7 +30,7 @@
 .\"
 .Dd January 13, 1996
 .Dt MKNETID 8
-.Os 
+.Os
 .Sh NAME
 .Nm mknetid
 .Nd a YP filter program
diff --git a/usr.sbin/ypserv/mknetid/netid.5 b/usr.sbin/ypserv/mknetid/netid.5
index e5e9a443ae7..ace8d553c1b 100644
--- a/usr.sbin/ypserv/mknetid/netid.5
+++ b/usr.sbin/ypserv/mknetid/netid.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: netid.5,v 1.4 1999/03/12 15:33:59 aaron Exp $
+.\"	$OpenBSD: netid.5,v 1.5 1999/05/23 14:11:06 aaron Exp $
 .\" Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -30,7 +30,7 @@
 .\"
 .Dd January 13, 1996
 .Dt NETID 5
-.Os 
+.Os
 .Sh NAME
 .Nm netid
 .Nd