remove redundant .Pp macros

58 files changed, 114 insertions, 206 deletions

diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 6e9137aaa6e..79bae808c0a 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chio.1,v 1.11 1999/05/30 17:44:54 aaron Exp $
+.\"	$OpenBSD: chio.1,v 1.12 1999/07/03 02:11:06 aaron Exp $
 .\"	$NetBSD: chio.1,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
@@ -84,7 +84,6 @@ the first robotic arm in the changer, the ET would be
 .Dq picker
 and the EU would be
 .Dq 0 .
-.Pp
 .Sh SUPPORTED COMMANDS
 .Cm chio move
 .Aq Ar from ET
@@ -192,7 +191,6 @@ Element supports passing media (exporting) to an outside human operator.
 .It Dv INENAB
 Element supports receiving media (importing) from an outside human operator.
 .El
-.Pp
 .Sh EXAMPLES
 .Cm chio move slot 3 drive 0
 .Pp
@@ -201,7 +199,6 @@ Moves the media in slot 3 (fourth slot) to drive 0 (first drive).
 .Cm chio setpicker 2
 .Pp
 Configures the changer to use picker 2 (third picker) for operations.
-.Pp
 .Sh FILES
 .Bl -tag -width /dev/ch0 -compact
 .It Pa /dev/ch0
diff --git a/games/tetris/tetris.6 b/games/tetris/tetris.6
index 68eb46347be..2eb96cf3798 100644
--- a/games/tetris/tetris.6
+++ b/games/tetris/tetris.6
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tetris.6,v 1.7 1999/07/02 20:11:52 aaron Exp $
+.\"	$OpenBSD: tetris.6,v 1.8 1999/07/03 02:11:12 aaron Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -101,7 +101,6 @@ your score.
 .It Fl s
 Display the top scores.
 .El
-.Pp
 .Sh PLAY
 At the start of the game, a shape will appear at the top of the screen,
 falling one square at a time.
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index 2767f6afa42..4a2d19b7254 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ccdconfig.8,v 1.11 1998/12/15 01:20:28 aaron Exp $
+.\"	$OpenBSD: ccdconfig.8,v 1.12 1999/07/03 02:11:06 aaron Exp $
 .\"	$NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -140,15 +140,13 @@ argument is optional.
 # ccd           ileave  flags   component devices
 ccd0            16      none    /dev/sd2e /dev/sd3e
 .Ed
-.Pp
-.Sh EXAMPLE
+.Sh EXAMPLES
 The following command, executed from the command line, would configure ccd0
 with 4 components (/dev/sd2e, /dev/sd3e, /dev/sd4e, /dev/sd5e), and an
 interleave factor of 32 blocks.
 .Bd -unfilled -offset indent
 # ccdconfig ccd0 32 0 /dev/sd2e /dev/sd3e /dev/sd4e /dev/sd5e
 .Ed
-.Pp
 .Sh FILES
 .Bl -tag -width /etc/ccd.conf -compact
 .It Pa /etc/ccd.conf
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 6631082f1d9..958a744928e 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fdisk.8,v 1.24 1999/06/06 18:43:10 aaron Exp $
+.\"	$OpenBSD: fdisk.8,v 1.25 1999/07/03 02:11:07 aaron Exp $
 .\"
 .\" Copyright (c) 1997 Tobias Weingartner
 .\" All rights reserved.
@@ -226,7 +226,6 @@ it does write the modified block out.
 .It Em abort
 Quit program without saving current changes.
 .El
-.Pp
 .Sh NOTES
 The automatic calculation of starting cylinder etc. uses
 a set of figures that represent what the BIOS thinks is the
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 4b142caa27c..0b6ede74b09 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ifconfig.8,v 1.25 1999/07/02 20:11:46 aaron Exp $
+.\"	$OpenBSD: ifconfig.8,v 1.26 1999/07/03 02:11:07 aaron Exp $
 .\"	$NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $
 .\"     $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $
 .\"
@@ -361,7 +361,6 @@ followed by an interface name is specified, then the media information
 for that interface will be printed.
 .Pp
 Only the super-user may modify the configuration of a network interface.
-.Pp
 .Sh EXAMPLES
 .Bl -tag -width ifconfig
 .It Cm ifconfig fxp0 inet 192.168.1.10 netmask 255.255.255.0
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index 90d6d33c755..8dd6b7fe675 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.8,v 1.8 1999/06/04 02:45:22 aaron Exp $
+.\" $OpenBSD: isakmpd.8,v 1.9 1999/07/03 02:11:07 aaron Exp $
 .\" $EOM: isakmpd.8,v 1.13 1998/12/21 00:09:36 niklas Exp $
 .\"
 .\" Copyright (c) 1998 Niklas Hallqvist.  All rights reserved.
@@ -128,7 +128,6 @@ the file name as an argument to the
 .Fl R
 flag.
 .El
-.Pp
 .Sh BUGS
 The
 .Fl P
diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index dadb4c5f992..9c558171de4 100644
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.conf.5,v 1.18 1999/06/02 06:34:27 niklas Exp $
+.\" $OpenBSD: isakmpd.conf.5,v 1.19 1999/07/03 02:11:07 aaron Exp $
 .\" $EOM: isakmpd.conf.5,v 1.23 1999/06/02 06:26:41 niklas Exp $
 .\"
 .\" Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -648,7 +648,6 @@ CERT=			/etc/isakmpd_cert
 PRIVKEY=		/etc/isakmpd_key
 PUBKEY=			/etc/isakmpd_key.pub
 .Ed
-.Pp
 .Sh SEE ALSO
 .Xr ipsec 4 ,
 .Xr isakmpd 8
diff --git a/sbin/photurisd/photurisd.8 b/sbin/photurisd/photurisd.8
index bae2a499525..a26fbe7d59d 100644
--- a/sbin/photurisd/photurisd.8
+++ b/sbin/photurisd/photurisd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: photurisd.8,v 1.4 1999/06/04 02:45:25 aaron Exp $
+.\" $OpenBSD: photurisd.8,v 1.5 1999/07/03 02:11:08 aaron Exp $
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
 .\"
@@ -258,8 +258,7 @@ secrets are taken from the users secret file.
 .El
 .Pp
 Exchanges are separated by newlines.
-.Pp
-.Sh EXAMPLE
+.Sh EXAMPLES
 A sample
 .Pa photuris.startup
 entry:
@@ -269,7 +268,6 @@ dst=134.100.106.2 port=468 options=auth
 tsrc=134.100.104.0/255.255.255.255
 tdst=134.100.106.0/255.255.255.255
 .Ed
-.Pp
 .Sh SEE ALSO
 .Xr startkey 1 ,
 .Xr ipsec 4 ,
diff --git a/sbin/raidctl/raidctl.8 b/sbin/raidctl/raidctl.8
index 01fc1c80363..a7c8304e73d 100644
--- a/sbin/raidctl/raidctl.8
+++ b/sbin/raidctl/raidctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: raidctl.8,v 1.4 1999/06/04 02:45:25 aaron Exp $
+.\"	$OpenBSD: raidctl.8,v 1.5 1999/07/03 02:11:08 aaron Exp $
 .\"
 .\"     $NetBSD: raidctl.8,v 1.3 1999/02/04 14:50:31 oster Exp $
 .\"
@@ -529,14 +529,12 @@ correct will be catastrophic should a component ever fail -- it is
 better to use RAID 0 and get the additional space and speed, than it
 is to use parity, but not keep the parity correct.  At least with RAID
 0 there is no perception of increased data security.
-.Pp
 .Sh FILES
 .Bl -tag -width /dev/XXrXraidX -compact
 .It Pa /dev/{,r}raid*
 .Nm
 device special files
 .El
-.Pp
 .Sh SEE ALSO
 .Xr ccd 4 ,
 .Xr raid 4 ,
diff --git a/sbin/reboot/boot_sparc.8 b/sbin/reboot/boot_sparc.8
index 0e1654373e3..d1285ef8551 100644
--- a/sbin/reboot/boot_sparc.8
+++ b/sbin/reboot/boot_sparc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_sparc.8,v 1.8 1999/06/04 02:45:23 aaron Exp $
+.\"	$OpenBSD: boot_sparc.8,v 1.9 1999/07/03 02:11:07 aaron Exp $
 .\"	$NetBSD: boot_sparc.8,v 1.4 1995/04/25 11:37:25 pk Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -128,7 +128,6 @@ achieved by sending a
 If you do this accidentally you can continue whatever was in progress
 by typing
 .Dq go .
-.Pp
 .Sh FILES
 .Bl -tag -width /bsdxx -compact
 .It Pa /bsd
diff --git a/sbin/reboot/boot_sun3.8 b/sbin/reboot/boot_sun3.8
index 370d74589ec..911a8ecb73c 100644
--- a/sbin/reboot/boot_sun3.8
+++ b/sbin/reboot/boot_sun3.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_sun3.8,v 1.6 1998/11/11 22:20:00 aaron Exp $
+.\"	$OpenBSD: boot_sun3.8,v 1.7 1999/07/03 02:11:07 aaron Exp $
 .\"	$NetBSD: boot_sun3.8,v 1.1 1995/08/08 20:46:20 gwr Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -97,7 +97,6 @@ If you do this accidentally you can continue whatever was in progress
 by typing
 .Dq c
 followed by the return key.
-.Pp
 .Sh FILES
 .Bl -tag -width /usr/mdec/installboot -compact
 .It Pa /bsd
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 2c0eaedbb41..24076dddc2e 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: routed.8,v 1.24 1999/06/04 02:45:24 aaron Exp $
+.\"	$OpenBSD: routed.8,v 1.25 1999/07/03 02:11:07 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -584,7 +584,6 @@ Note that the netmask associated with point-to-point links (such as SLIP
 or PPP, with the IFF_POINTOPOINT flag) is used by
 .Nm
 to infer the netmask used by the remote system when RIPv1 is used.
-.Pp
 .Sh FILES
 .Bl -tag -width /etc/gateways -compact
 .It Pa /etc/gateways
diff --git a/sbin/scan_ffs/scan_ffs.8 b/sbin/scan_ffs/scan_ffs.8
index d47e1f2256d..837a67a8f12 100644
--- a/sbin/scan_ffs/scan_ffs.8
+++ b/sbin/scan_ffs/scan_ffs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scan_ffs.8,v 1.7 1999/05/23 14:11:21 aaron Exp $
+.\"	$OpenBSD: scan_ffs.8,v 1.8 1999/07/03 02:11:08 aaron Exp $
 .\"
 .\" Copyright (c) 1997 Niklas Hallqvist, Tobias Weingartner
 .\" All rights reserved.
@@ -134,7 +134,6 @@ Last but certainly not least, we wish you good luck.  The UFS/FFS filesystems
 are pretty sturdy.  I've seen them reconstructed after some pretty weird and
 awesome fumbles.  If you can't have backups, at least have funky tools to help
 you out of a jam when they happen.
-.Pp
 .Sh SEE ALSO
 .Xr disklabel 8
 .Sh BUGS
diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8
index 88e383567d0..d19bc88ea8b 100644
--- a/sbin/scsi/scsi.8
+++ b/sbin/scsi/scsi.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scsi.8,v 1.10 1999/06/04 02:45:24 aaron Exp $
+.\"	$OpenBSD: scsi.8,v 1.11 1999/07/03 02:11:08 aaron Exp $
 .\"	$FreeBSD: scsi.8,v 1.5 1995/05/05 20:41:58 dufault Exp $
 .\"
 .\" Written By Julian ELischer
@@ -244,7 +244,6 @@ drive (set AWRE and ARRE to 1 to enable bad block remapping):
 .Bd -literal -offset
 root# scsi -f /dev/rsd2c -m 1 -e -P 3
 .Ed
-.Pp
 .Sh ENVIRONMENT
 The
 .Ev SU_DEBUG_OUTPUT
diff --git a/share/man/man4/atalk.4 b/share/man/man4/atalk.4
index 5a0045adf53..9dc9ffeed3c 100644
--- a/share/man/man4/atalk.4
+++ b/share/man/man4/atalk.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atalk.4,v 1.2 1998/09/05 17:41:48 deraadt Exp $
+.\"	$OpenBSD: atalk.4,v 1.3 1999/07/03 02:11:12 aaron Exp $
 .\"
 .\" This file is derived from the atalk.4 man page in the Netatlk 1.4b2
 .\" distribution. That distribution is covered by the following copyright:
@@ -59,7 +59,6 @@ AppleTalk packets are encapsulated on the ethernet using the EtherTalk
 Link Access Protocol (ELAP).   Local network address resolution is
 handled using the AppleTalk Address Resolution Protocol (AARP).
 Neither of these protocols is exposed to user-mode applications.
-.Pp
 .Sh ADDRESSING
 AppleTalk addresses are three byte quantities, stored in network
 byte order. The include file
@@ -163,7 +162,6 @@ services are provided by a user library.
 and
 .Tn AFP
 services are provided by user programs and daemons.
-.Pp
 .Sh SEE ALSO
 .\" .BR ddp (4P),
 .\" .BR atp (3N),
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index 9ff80b4a002..7fd7fc6bc7d 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ccd.4,v 1.11 1999/06/05 13:18:31 aaron Exp $
+.\"	$OpenBSD: ccd.4,v 1.12 1999/07/03 02:11:12 aaron Exp $
 .\"	$NetBSD: ccd.4,v 1.5 1995/10/09 06:09:09 thorpej Exp $
 .\"
 .\" Copyright (c) 1994 Jason Downs.
@@ -115,7 +115,6 @@ fails, the entire
 file system will be lost.
 .Sh FILES
 /dev/{,r}ccd* - ccd device special files.
-.Pp
 .Sh HISTORY
 The concatenated disk driver was originally written at the University of
 Utah.
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index c4ae5af4589..65d40506897 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cd.4,v 1.3 1998/09/05 17:41:48 deraadt Exp $
+.\"	$OpenBSD: cd.4,v 1.4 1999/07/03 02:11:12 aaron Exp $
 .\"	$NetBSD: cd.4,v 1.3 1996/10/20 23:15:21 explorer Exp $
 .\"
 .\" Copyright (c) 1996
@@ -72,7 +72,6 @@ disk label
 structure, which will contain correct figures for the size of the 
 .Tn CD-ROM
 should that information be required.
-.Pp
 .Sh KERNEL CONFIGURATION
 Any number of
 .Tn CD-ROM
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index ab44136d5eb..8508f13cf28 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ch.4,v 1.3 1999/06/05 13:18:31 aaron Exp $
+.\"	$OpenBSD: ch.4,v 1.4 1999/07/03 02:11:12 aaron Exp $
 .\"	$FreeBSD$
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
@@ -59,8 +59,6 @@ It is also possible to specify what ch unit a device should
 come on line as; refer to
 .Xr scsi 4
 for details on kernel configuration.
-.Pp
-
 .Sh KERNEL CONFIGURATION
 In configuring, if an optional
 .Ar count
@@ -68,15 +66,12 @@ is given in the specification, that number of scsi media changers
 are configured; Most storage for them is allocated only when found
 so a large number of configured devices is cheap. (once the first
 has included the driver).
-
-.Pp
 .Sh IOCTLS
 The following 
 .Xr ioctl 2
 call applies to the changer. It is defined in
 the header file
 .Em sys/chio.h.
-
 .Bl -tag -width DIOCSDINFO
 CHIOOP	
 This appears to be a 'do-everything' call.
@@ -85,14 +80,15 @@ This appears to be a 'do-everything' call.
 The 
 .Nm
 driver was added to the system by
-   Stefan Grefen (grefen@goofy.zdv.uni-mainz.de)
+.Pp
+.Dl Stefan Grefen (grefen@goofy.zdv.uni-mainz.de)
+.Pp
 who apparently had such a device
 however It appears as though no-one I have heard of has ever used this
 driver. If you use it please let me know so I can test changes.
 Stefan appears to have suffered net.death (or at least net.disconnection).
 I (julian) have never used this device. If you do please re-write this
 man page and send it to me..
-
 .Sh FILES
 .Bl -tag -width /dev/ch[0-9] -compact
 .It Pa /dev/ch[0-9]
@@ -106,7 +102,7 @@ None.
 .Xr st 4
 .Sh DISCLAIMER
 These manpages were derived from the
-.Tn FreeBSD
+.Fx
 documentation of the generic scsi drivers.  Since naming and calling
 conventions may have diverged or suffered port specific changes, please
 review the appropriate header files and configuration file for your port.
diff --git a/share/man/man4/fpa.4 b/share/man/man4/fpa.4
index ebe0a157cf7..cad55411356 100644
--- a/share/man/man4/fpa.4
+++ b/share/man/man4/fpa.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fpa.4,v 1.5 1999/05/16 19:56:22 alex Exp $
+.\"	$OpenBSD: fpa.4,v 1.6 1999/07/03 02:11:12 aaron Exp $
 .\"	$NetBSD: fpa.4,v 1.2 1997/02/18 01:07:46 jonathan Exp $
 .\"
 .\" Copyright (c) 1995, Matt Thomas
@@ -41,7 +41,6 @@ Normally, the device driver will not enable the reception of SMT frames.
 However if the IFF_LINK1 flag is set, the device driver will enable the
 reception of SMT frames and pass them up to the Berkeley Packet Filter for 
 processing.
-.Pp
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr intro 4 ,
diff --git a/share/man/man4/fxp.4 b/share/man/man4/fxp.4
index bfb7e42264a..a936ea92da0 100644
--- a/share/man/man4/fxp.4
+++ b/share/man/man4/fxp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fxp.4,v 1.8 1999/06/05 13:18:32 aaron Exp $
+.\"	$OpenBSD: fxp.4,v 1.9 1999/07/03 02:11:12 aaron Exp $
 .\"
 .\" Copyright (c) 1997 David E. O'Brien
 .\"
@@ -91,7 +91,6 @@ Set 100Mbps operation, full duplex
 .Pp
 Note that 100baseTX media type is only available on the Pro/100B and i82558
 cards.
-.Pp
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "fxp%d: couldn't map memory"
diff --git a/share/man/man4/iso.4 b/share/man/man4/iso.4
index 85f60bbbacd..4fcf1e4f48b 100644
--- a/share/man/man4/iso.4
+++ b/share/man/man4/iso.4
@@ -148,8 +148,7 @@ with the network address first, then the transport selector, and so
 on.  Thus, if you had a network address of less than 20 bytes,
 the transport selector would encroach on space normally reserved
 for the network address.
-.Pp
-.Sh NETWORK ADDRESSING.
+.Sh NETWORK ADDRESSING
 .Tn ISO
 network addresses are limited to 20 bytes in length.
 .Tn ISO
diff --git a/share/man/man4/man4.alpha/le.4 b/share/man/man4/man4.alpha/le.4
index 5791af12dd3..a38dc718e98 100644
--- a/share/man/man4/man4.alpha/le.4
+++ b/share/man/man4/man4.alpha/le.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: le.4,v 1.2 1999/05/16 19:56:44 alex Exp $
+.\"     $OpenBSD: le.4,v 1.3 1999/07/03 02:11:12 aaron Exp $
 .\"
 .\" Copyright (c) 1998 The OpenBSD Project 
 .\" All rights reserved.
@@ -30,10 +30,8 @@ interface employs the address resolution protocol described in
 .Xr arp 4
 to dynamically map between Internet and Ethernet addresses on the local
 network.
-.Pp
 .Sh BUGS
 The PCI form of the Lance driver is untested.
-.Pp
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr inet 4 ,
diff --git a/share/man/man4/man4.amiga/ae.4 b/share/man/man4/man4.amiga/ae.4
index 7a635246e73..1fffdc63767 100644
--- a/share/man/man4/man4.amiga/ae.4
+++ b/share/man/man4/man4.amiga/ae.4
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: ae.4,v 1.4 1999/07/02 20:11:50 aaron Exp $
+.\"   $OpenBSD: ae.4,v 1.5 1999/07/03 02:11:13 aaron Exp $
 .\"	$NetBSD: ae.4,v 1.3 1995/10/07 18:09:11 chopps Exp $
 .\"
 .\" Copyright (c) 1995 Bernd Ernesti and Klaus Burkert. All rights reserved.
@@ -94,7 +94,6 @@ Use the BNC port.
 .It \ link0 \ link1
 Use the UTP port.
 .El
-.Pp
 .Sh HARDWARE
 The
 .Nm
@@ -103,10 +102,8 @@ interface supports the following Zorro II expansion cards:
 .It Em ARIADNE
 Village Tronic's ethernet card, manufacturer\ 2167, product\ 201
 .El
-.Pp
 .Sh NOTES
 Multicasting needs to be tested.
-.Pp
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/man4.amiga/bah.4 b/share/man/man4/man4.amiga/bah.4
index 0d59185bd89..a8d39056e78 100644
--- a/share/man/man4/man4.amiga/bah.4
+++ b/share/man/man4/man4.amiga/bah.4
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: bah.4,v 1.3 1999/05/16 19:56:46 alex Exp $
+.\"   $OpenBSD: bah.4,v 1.4 1999/07/03 02:11:13 aaron Exp $
 .\"	$NetBSD: bah.4,v 1.2 1995/06/06 23:41:37 cgd Exp $
 .\"
 .\" Copyright (c) 1995 Ignatios Souvatzis
@@ -75,7 +75,6 @@ is normally 1500.
 When switching between the two modes, do a 
 .Cd ifconfig interfacename down up
 to switch the mtu.
-.Pp
 .Sh HARDWARE
 The
 .Nm
diff --git a/share/man/man4/man4.amiga/qn.4 b/share/man/man4/man4.amiga/qn.4
index e9d6b15107c..d468f2470b3 100644
--- a/share/man/man4/man4.amiga/qn.4
+++ b/share/man/man4/man4.amiga/qn.4
@@ -67,7 +67,6 @@ interface employs the address resolution protocol described in
 .Xr arp 4
 to dynamically map between Internet and Ethernet addresses on the local
 network.
-.Pp
 .Sh HARDWARE
 The
 .Nm
@@ -76,12 +75,10 @@ interface supports the following Zorro II expansion cards:
 .It Em QuickNet
 Resource Management Force's ethernet card, manufacturer\ 2011, product\ 2
 .El
-.Pp
 .Sh NOTES
 Multicasting not done yet. If the driver happens to lock up, you may use
 .Xr ifconfig
 to force the driver down and up again. This usually helps.
-.Pp
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/man4.arc/le.4 b/share/man/man4/man4.arc/le.4
index f1189547d3f..e7607c6f898 100644
--- a/share/man/man4/man4.arc/le.4
+++ b/share/man/man4/man4.arc/le.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: le.4,v 1.2 1999/05/16 19:56:50 alex Exp $
+.\"     $OpenBSD: le.4,v 1.3 1999/07/03 02:11:13 aaron Exp $
 .\"
 .\" Copyright (c) 1998 The OpenBSD Project 
 .\" All rights reserved.
@@ -30,10 +30,8 @@ interface employs the address resolution protocol described in
 .Xr arp 4
 to dynamically map between Internet and Ethernet addresses on the local
 network.
-.Pp
 .Sh BUGS
 The PCI form of the Lance driver is untested.
-.Pp
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr inet 4 ,
diff --git a/share/man/man4/man4.atari/ms.4 b/share/man/man4/man4.atari/ms.4
index 756000652c4..971282165a3 100644
--- a/share/man/man4/man4.atari/ms.4
+++ b/share/man/man4/man4.atari/ms.4
@@ -41,7 +41,6 @@ mouse interface
 .Sh SYNOPSIS
 .Cd "pseudo-device mouse 1"
 .Sh DESCRIPTION
-
 The Atari mouse driver supports both the original Atari mouse and the third
 party 3-button mouse that has its middle button connected to the up-switch
 of the second joystick port. To accomodate X11 users with a standard mouse,
@@ -65,7 +64,6 @@ This ioctl allows you to get the actual status of the emulation mode.
 .It Sy Interface description
 The Atari mouse interface works on a minimal emulation of Sun's Firm_event
 structures. The primary reason for this is easy interfacing with X11.
-
 .Pp
 The movement and button events are read as structures of the form:
 .Bd -literal
@@ -75,7 +73,6 @@ typedef struct Firm_event {
 	int_16_t        value;    /* VKEY_{UP,DOWN} or locator delta */
 	struct timeval  time;     /* time stamp of the event         */
 }
-
 .Pp
 The values of 'id' concerning the mouse:
 .Bd -literal
@@ -85,21 +82,18 @@ The values of 'id' concerning the mouse:
 #define LOC_X_DELTA     0x7f80    /* mouse delta-X       */
 #define LOC_Y_DELTA     0x7f81    /* mouse delta-Y       */
 .Ed
-
 .Pp
 The values of 'value' concerning a button event:
 .Bd -literal
 #define VKEY_UP         0         /* a button went up   */
 #define VKEY_DOWN       1         /* a button went down */
 .Ed
-
-.Pp
 .Sh FILES
 .Bl -tag -width /dev/mouse0 -compact
 .It Pa /dev/mouse0
-The real mouse device
+real mouse device
 .It Pa /dev/mouse
-The currently active mouse device
+currently active mouse device
 .El
 .El
 .Sh BUGS
diff --git a/share/man/man4/man4.hp300/st.4 b/share/man/man4/man4.hp300/st.4
index afd2de19f39..a0b634ec2cf 100644
--- a/share/man/man4/man4.hp300/st.4
+++ b/share/man/man4/man4.hp300/st.4
@@ -34,13 +34,13 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)st.4	5.3 (Berkeley) 7/31/91
-.\"	$Id: st.4,v 1.2 1999/05/16 19:56:56 alex Exp $
+.\"	$Id: st.4,v 1.3 1999/07/03 02:11:13 aaron Exp $
 .\"
 .Dd July 31, 1991
 .Dt ST 4 hp300
 .Os
 .Sh NAME
-.Nm \&st
+.Nm st
 .Nd
 .Tn CCS SCSI
 tape driver
@@ -48,7 +48,7 @@ tape driver
 .Cd "tape st0 at scsi? slave ?"
 .Sh DESCRIPTION
 The
-.Nm \&st
+.Nm
 driver was written especially to support the Exabyte
 .Tn EXB-8200 8MM
 Cartridge 
@@ -62,7 +62,7 @@ Archive
 .Tn QIC-24
 tape drive.
 The
-.Nm \&st
+.Nm
 tape interface provides a standard tape drive interface 
 as described in
 .Xr mtio 4
@@ -156,7 +156,7 @@ nrst56	X	X	X	X
 .Re
 .Sh HISTORY
 The
-.Nm \&st
+.Nm
 driver
 .Ud
 .Sh BUGS
diff --git a/share/man/man4/man4.i386/bktr.4 b/share/man/man4/man4.i386/bktr.4
index 9e0bb0ca0e8..18c1cfc1893 100644
--- a/share/man/man4/man4.i386/bktr.4
+++ b/share/man/man4/man4.i386/bktr.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$OpenBSD: bktr.4,v 1.1 1998/10/10 06:48:22 downsj Exp $
+.\"	$OpenBSD: bktr.4,v 1.2 1999/07/03 02:11:13 aaron Exp $
 .\"	$FreeBSD: bktr.4,v 1.1 1998/03/09 10:56:22 jkh Exp $
 .\"
 .Dd January 28, 1998
@@ -8,13 +8,13 @@
 .Dt BKTR 4 i386
 .Os
 .Sh NAME
-.Nm brooktree
-.Nd video capture driver
+.Nm bktr
+.Nd brooktree video capture driver
 .Sh SYNOPSIS
 .Nm device bktr0
 .Sh DESCRIPTION
 The
-.Nm bktr
+.Nm
 driver provides support for PCI
 .Em video
 capture on low cost, high performance boards.  The driver is heavily based on
@@ -54,7 +54,6 @@ The following kernel parameters may be used to further configure the driver:
 specifies the number of contiguous pages to allocate when successfully
 probed.  The default number of pages allocated by the kernel is 216.
 This means that there are (216*4096) bytes available for use.
-.Pp
 .Sh AUTHOR
 This driver is based on the work of
 .An Jim Lowe Aq james@miller.cs.uwm.edu ,
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index a59bdbe83ec..a4786f5eaf0 100644
--- a/share/man/man4/mtio.4
+++ b/share/man/man4/mtio.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mtio.4,v 1.3 1999/05/16 19:56:31 alex Exp $
+.\"	$OpenBSD: mtio.4,v 1.4 1999/07/03 02:11:12 aaron Exp $
 .\"	$NetBSD: mtio.4,v 1.4 1996/03/03 17:13:54 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
@@ -39,9 +39,7 @@
 .Os
 .Sh NAME
 .Nm mtio
-.Nd
-.Tn OpenBSD
-magtape interface
+.Nd magtape interface
 .Sh DESCRIPTION
 This interface concerns devices which are typical tape block devices,
 see
@@ -179,7 +177,6 @@ struct	mtget	{
 #define	T_BADBPI	030		/* undefined selection */
 #endif
 .Ed
-.Pp
 .Sh FILES
 .Bl -tag -width /dev/rmt? -compact
 .It Pa /dev/mt?
@@ -196,7 +193,7 @@ struct	mtget	{
 .Xr ut 4
 .Sh HISTORY
 The
-.Nm mtio
+.Nm
 manual appeared in
 .Bx 4.2 .
 .Sh BUGS
diff --git a/share/man/man4/strip.4 b/share/man/man4/strip.4
index c4519975d13..4b647650957 100644
--- a/share/man/man4/strip.4
+++ b/share/man/man4/strip.4
@@ -30,7 +30,7 @@
 .Sh DESCRIPTION
 Configures
 .Ar count
-.Nm strip
+.Nm
 interfaces,   named
 .Sy st Ns Ar 0 ,
 .Sy st Ns Ar 1 ,
@@ -38,7 +38,7 @@ etc, into a kernel built from a config file containing the
 given entry.
 .Pp
 Each
-.Nm strip
+.Nm
 interface is a pseudo-device driver for the Metricom Ricochet radio,
 operating in peer-to-peer packet mode.
 .Pp
@@ -50,7 +50,7 @@ radio.   Packets arriving from the radio
 via the serial link are decapsulated and then passed up to the local
 host's networking stack.
 .Pp
-.Nm STRIP
+.Nm
 is an acronym for
 .Sy St Ns armode
 .Sy  R  Ns adio
@@ -58,11 +58,11 @@ is an acronym for
 .Pp
 In many ways,
 the
-.Nm strip
+.Nm
 driver is very much like the
 .Nm sl
 SLIP pseudo-device driver.  A
-.Nm strip
+.Nm
 device is attached to a tty line with
 .Xr slattach 8 .
 Once attached, the interface is configured via
@@ -70,19 +70,19 @@ Once attached, the interface is configured via
 The major difference between the
 .Xr sl 4
 SLIP pseudo-device driver and the
-.Nm strip
+.Nm
 driver is that SLIP works only between two hosts over
 a dedicated point-to-point connection. In contrast,
-.Nm strip
+.Nm
 sends
 packets to a frequency-hopping radio, which  can address packets to
 any peer Metricom radio. rather than just to a single host at the
 other end of a point-to-point line.  Thus,  one
-.Nm strip
+.Nm
 pseudo-device is usually sufficient for any kernel.
 .Pp
 In other respects, a
-.Nm strip
+.Nm
 interface is rather like an Ethernet interface.
 Packets are  individually  addressed, and subsequent packets can
 be sent independently to different MAC addresses.  However,
@@ -94,16 +94,16 @@ The interface flags
 and
 .Dv IFF_BROADCAST
 are not supported on
-.Nm strip
+.Nm
 interface.
 .Pp
 In other words,
-.Nm strip
+.Nm
 implements a multiple-access, non-broadcast device, accessed via
 an RS-232 serial line, using a proprietary packet framing scheme. 
 .Pp
 This version
-.Nm strip
+.Nm
 driver maps IP addresses to Metricom radio addresses using
 statically configured entries in the normal routing table. These entries
 map IP addresses of peer radios to the MAC-level addresses.
@@ -113,8 +113,7 @@ type code for use with STRIP. A future version of this driver will
 support 
 .Xr arp 4
 to obtain the IP address of reachable peer radios dynamically.
-.Pp
-.Sh Address configuration.
+.Sh ADDRESS CONFIGURATION
 This version of the STRIP driver requires static pre-configuration of
 the mapping from IP addresses to radio MAC addresses.
 The 
@@ -134,8 +133,7 @@ route add -host 10.11.12.13 -link 1:2:3:4:5:6:7:8
 .Pp
 Generalising from this example to other IP addresses and to other 8-digit MAC addresses
 should be clear.
-.Pp
-.Sh Radio configuration.
+.Sh RADIO CONFIGURATION
 The Metricom radios can auto-baud at speeds up to 38.4k baud.
 At higher speeds -- 57600 or 115200 -- the radio cannot autobaud.
 When running at  high speeds, the radio's serial port should be
@@ -148,7 +146,7 @@ will then save the current radio  state in non-volatile memory.
 .Pp
 Metricom radios can operate in either "modem-emulation" mode
 or in packet mode (Starmode). The
-.Nm strip
+.Nm
 driver automatically detects if the radio has fallen out of starmode,
 and resets it back into starmode, if the baud rate was set correctly
 by
@@ -166,7 +164,7 @@ by
 Currently is IP-only.  Encapsulations for AppleTalk and ARP have been defined,
 but are not yet implemented in this driver.
 .Pp
-.Nm Strip
+.Nm
 has not been widely tested on a variety of lower-level tty drivers.
 .P
 The detection and resetting of radios that crash out of Starmode does
@@ -174,16 +172,16 @@ not always work in this version of the driver.  One workaround
 is to kill the 
 .Xr slattach
 process, ifconfig the
-.Nm strip
+.Nm
 interface down, and then start a new slattach and rerun ifconfig.
 .Sh HISTORY
-.Nm Strip
+.Nm
 was originally developed  for the Linux kernel by Stuart
 Cheshire of  Stanford's Operating Systems and Networking group,
 as part of Mary Baker's  MosquitoNet 
 .Sy http://mosquitonet.stanford.edu/mosquitonet.html
 project.
 This
-.Nm strip
+.Nm
 driver was ported to BSD by Jonathan Stone at Stanford's Distributed
 Systems Group and first distributed with NetBSD 1.2.
diff --git a/share/man/man4/uk.4 b/share/man/man4/uk.4
index c33b8b2649a..ac02195d143 100644
--- a/share/man/man4/uk.4
+++ b/share/man/man4/uk.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uk.4,v 1.4 1999/05/16 19:56:41 alex Exp $
+.\"	$OpenBSD: uk.4,v 1.5 1999/07/03 02:11:12 aaron Exp $
 .\"	$NetBSD: uk.4,v 1.3 1996/10/20 23:15:26 explorer Exp $
 .\"
 .\" Copyright (c) 1996
@@ -43,13 +43,10 @@ driver.
 .Pp
 A scsi adapter must also be separately configured into the system
 before this driver makes sense.
-.Pp
 .Sh KERNEL CONFIGURATION
 If a count is given that number of
 .Nm 
 devices will be configured into the kernel.
-
-.Pp
 .Sh IOCTLS
 The 
 .Nm
@@ -58,8 +55,6 @@ generic
 .Xr scsi 4
 ioctls. These are described in
 .Em sys/scsiio.h.
-
-
 .Sh FILES
 .Bl -tag -width /dev/uk[0-255] -compact
 .It Pa /dev/uk[0-255]
diff --git a/share/man/man4/vnd.4 b/share/man/man4/vnd.4
index 2b943a23acb..bc436724d54 100644
--- a/share/man/man4/vnd.4
+++ b/share/man/man4/vnd.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vnd.4,v 1.9 1999/06/05 13:18:33 aaron Exp $
+.\"	$OpenBSD: vnd.4,v 1.10 1999/07/03 02:11:12 aaron Exp $
 .\"	$NetBSD: vnd.4,v 1.1 1995/12/30 18:10:48 thorpej Exp $
 .\"
 .\" Copyright (c) 1995 Jason R. Thorpe.
@@ -95,7 +95,6 @@ config   bsd   root on sd0a swap on sd0b and vnd0c dumps on sd0b
 .Ed
 .Sh FILES
 /dev/{,r}{,s}vnd* - vnd device special files.
-.Pp
 .Sh HISTORY
 The vnode disk driver was originally written at the University of
 Utah.  The svnd variant was first seen in
diff --git a/sys/arch/i386/isa/pcvt/Util/fed/fed.1 b/sys/arch/i386/isa/pcvt/Util/fed/fed.1
index b7f8b0f15c3..15a77c24f87 100644
--- a/sys/arch/i386/isa/pcvt/Util/fed/fed.1
+++ b/sys/arch/i386/isa/pcvt/Util/fed/fed.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fed.1,v 1.4 1999/05/16 19:57:50 alex Exp $
+.\"	$OpenBSD: fed.1,v 1.5 1999/07/03 02:11:11 aaron Exp $
 .\"
 .\" Copyright (c) 1992, 1995 Hellmuth Michaelis
 .\"
@@ -47,7 +47,6 @@ utility allows a user to edit or create EGA/VGA download fontfiles to be
 used by the
 .Nm pcvt
 device driver.
-.Pp
 .Sh BUGS
 No known bugs
 .Sh SEE ALSO
diff --git a/sys/arch/i386/isa/pcvt/Util/ispcvt/ispcvt.8 b/sys/arch/i386/isa/pcvt/Util/ispcvt/ispcvt.8
index 00e5a9ba1e9..451aa9ae649 100644
--- a/sys/arch/i386/isa/pcvt/Util/ispcvt/ispcvt.8
+++ b/sys/arch/i386/isa/pcvt/Util/ispcvt/ispcvt.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ispcvt.8,v 1.3 1999/01/13 07:26:04 niklas Exp $
+.\"	$OpenBSD: ispcvt.8,v 1.4 1999/07/03 02:11:11 aaron Exp $
 .\"
 .\" Copyright (c) 1992, 1995 Hellmuth Michaelis
 .\"
@@ -44,12 +44,12 @@
 .Op Fl v
 .Sh DESCRIPTION
 The
-.Nm ispcvt
+.Nm
 utility allows the user to check whether the current video driver compiled
 into the kernel is a pcvt driver. The major and minor release numbers of
 the driver are also checked.
 Furthermore
-.Nm ispcvt
+.Nm
 is also able to print out the values of all the
 .Dq Ar PCVT_XXXXXX
 compile time options, the driver in the current running kernel was
@@ -87,7 +87,6 @@ name & major number matched, release minor number mismatch
 .It Sy 5
 usage error
 .El
-.Pp
 .Sh BUGS
 No known bugs
 .Sh SEE ALSO
diff --git a/sys/arch/i386/isa/pcvt/Util/keycap/keycap.3 b/sys/arch/i386/isa/pcvt/Util/keycap/keycap.3
index b1f759e9ee4..0cbb518534d 100644
--- a/sys/arch/i386/isa/pcvt/Util/keycap/keycap.3
+++ b/sys/arch/i386/isa/pcvt/Util/keycap/keycap.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: keycap.3,v 1.5 1999/04/23 19:11:58 millert Exp $
+.\"	$OpenBSD: keycap.3,v 1.6 1999/07/03 02:11:11 aaron Exp $
 .\"
 .\"
 .\" Copyright (c) 1992,1993,1994 Hellmuth Michaelis
@@ -113,7 +113,6 @@ function
 returns
 .Dv NULL
 if the capability was not found.
-.Pp
 .Sh FILES
 .Bl -tag -width /usr/share/misc/keycap.pcvt -compact
 .It Pa /usr/share/misc/keycap.pcvt
diff --git a/sys/arch/i386/stand/installboot/installboot.8 b/sys/arch/i386/stand/installboot/installboot.8
index 7be1c77be7a..ebf51ade1d1 100644
--- a/sys/arch/i386/stand/installboot/installboot.8
+++ b/sys/arch/i386/stand/installboot/installboot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: installboot.8,v 1.18 1999/07/02 20:11:46 aaron Exp $
+.\"	$OpenBSD: installboot.8,v 1.19 1999/07/03 02:11:11 aaron Exp $
 .\"
 .\" Copyright (c) 1997 Michael Shalayeff
 .\" All rights reserved.
@@ -143,7 +143,6 @@ and
 you can use the boot block command:
 .Pp
 .Dl boot> machine diskinfo
-.Pp
 .Sh BUGS
 The disklabel
 .Va d_type
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_asm.1 b/sys/dev/microcode/aic7xxx/aic7xxx_asm.1
index ba7ce937dba..3dbeece1bb1 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx_asm.1
+++ b/sys/dev/microcode/aic7xxx/aic7xxx_asm.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: aic7xxx_asm.1,v 1.4 1996/11/28 23:27:59 niklas Exp $
+.\"	$OpenBSD: aic7xxx_asm.1,v 1.5 1999/07/03 02:11:12 aaron Exp $
 .\"
 .\" Copyright (c) 1994, 1995
 .\"	Justin T. Gibbs.  All rights reserved.
@@ -28,7 +28,7 @@
 .\"
 .Dd November 11, 1994
 .Dt AIC7XXX_ASM 1
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm aic7xxx_asm
 .Nd Assembler for the Adaptec aic7xxx family of asics
@@ -66,7 +66,6 @@ Print version information
 .It Fl o Ar file 
 Redirect assembler output to
 .Ar file
-.Pp
 .Sh AUTHOR
 This aic7770 assembler was written by 
 John Aycock (aycock@cpsc.ucalgary.ca)
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 220d246a01b..a4d43c37561 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: basename.1,v 1.6 1999/06/05 01:21:19 aaron Exp $
+.\"	$OpenBSD: basename.1,v 1.7 1999/07/03 02:11:08 aaron Exp $
 .\"	$NetBSD: basename.1,v 1.9 1995/03/25 18:17:45 glass Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -48,7 +48,7 @@
 .Ar string
 .Op Ar suffix
 .Sh DESCRIPTION
-.Nm basename
+.Nm
 deletes any prefix ending with the last slash
 .Pq Sq \&/
 character present in
@@ -58,7 +58,6 @@ and a
 if given.
 The resulting filename is written to the standard output.
 A non-existent suffix is ignored.
-.Pp
 .Sh EXAMPLES
 The following line sets the shell variable
 .Ev FOO
@@ -66,10 +65,9 @@ to
 .Pa ls .
 .Pp
 .Dl FOO=`basename /usr/bin/trail`
-.Pp
 .Sh DIAGNOSTICS
 The
-.Nm basename
+.Nm
 utility
 exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
@@ -78,6 +76,6 @@ exits 0 on success or >0 if an error occurred.
 .Xr sh 1
 .Sh STANDARDS
 The
-.Nm basename
-utility conform to
+.Nm
+utility conforms to
 .St -p1003.2-92 .
diff --git a/usr.bin/basename/dirname.1 b/usr.bin/basename/dirname.1
index 2d6ed16d1b7..deef8154cf9 100644
--- a/usr.bin/basename/dirname.1
+++ b/usr.bin/basename/dirname.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dirname.1,v 1.3 1999/06/05 01:21:19 aaron Exp $
+.\"	$OpenBSD: dirname.1,v 1.4 1999/07/03 02:11:08 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -46,7 +46,7 @@
 .Nm dirname
 .Ar string
 .Sh DESCRIPTION
-.Nm dirname
+.Nm
 deletes the filename portion, beginning
 with the last slash
 .Pq Sq \&/
@@ -60,10 +60,9 @@ to
 .Pa /usr/bin :
 .Pp
 .Dl FOO=`dirname /usr/bin/trail`
-.Pp
 .Sh DIAGNOSTICS
 The
-.Nm dirname
+.Nm
 utility
 exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
@@ -72,6 +71,6 @@ exits 0 on success or >0 if an error occurred.
 .Xr sh 1
 .Sh STANDARDS
 The
-.Nm dirname
-utility conform to
+.Nm
+utility conforms to
 .St -p1003.2-92 .
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 0dfa1b9372c..f0a70aee203 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cap_mkdb.1,v 1.9 1999/07/02 20:11:44 aaron Exp $
+.\"	$OpenBSD: cap_mkdb.1,v 1.10 1999/07/03 02:11:08 aaron Exp $
 .\"	$NetBSD: cap_mkdb.1,v 1.4 1995/03/26 03:59:36 glass Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -40,7 +40,6 @@
 .Sh NAME
 .Nm cap_mkdb
 .Nd create capability database
-.Pp
 .Sh SYNOPSIS
 .Nm cap_mkdb
 .Op Fl i
@@ -48,7 +47,6 @@
 .Op Fl f Ar outfile
 .Ar file1
 .Op Ar file2 ...
-.Pp
 .Sh DESCRIPTION
 .Nm
 builds a hashed database out of the
@@ -82,13 +80,12 @@ format.
 .It Fl v
 Print out the number of capability records in the database.
 .El
-.Pp
 .Sh FORMAT
 Each record is stored in the database using two different types of keys.
 .Pp
 The first type is a key which consists of the first capability of
 the record (not including the trailing colon
-.Pq Sq \&: )
+.Pq Ql \&: )
 with a data
 field consisting of a special byte followed by the rest of the record.
 The special byte is either a 0 or 1, where a 0 means that the record
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index c022c952ab4..3297695e5e0 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: locate.1,v 1.9 1999/06/05 01:21:31 aaron Exp $
+.\"	$OpenBSD: locate.1,v 1.10 1999/07/03 02:11:08 aaron Exp $
 .\"
 .\" Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" Copyright (c) 1990, 1993
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: locate.1,v 1.9 1999/06/05 01:21:31 aaron Exp $
+.\"	$Id: locate.1,v 1.10 1999/07/03 02:11:08 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
@@ -48,9 +48,9 @@
 .Op Fl d Ar database
 .Ar pattern Op Ar ...
 .Sh DESCRIPTION
-.Nm locate
+.Nm
 searches a database for all pathnames which match the specified
-.Ar pattern  .
+.Ar pattern .
 The database is recomputed periodically (usually weekly or daily),
 and contains the pathnames
 of all files which are publicly accessible.
@@ -242,10 +242,9 @@ The current
 implementation understands databases in host byte order or
 network byte order.  So a little-endian machine can't understand
 a locate database which was built on an big-endian machine.
-.Pp
 .Sh HISTORY
 The
-.Nm locate
+.Nm
 command appeared in
 .Bx 4.4 .
 Many new features were
diff --git a/usr.bin/newsyslog/newsyslog.8 b/usr.bin/newsyslog/newsyslog.8
index 564371cce49..4a88967f3f1 100644
--- a/usr.bin/newsyslog/newsyslog.8
+++ b/usr.bin/newsyslog/newsyslog.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newsyslog.8,v 1.14 1999/06/05 04:16:05 aaron Exp $
+.\"	$OpenBSD: newsyslog.8,v 1.15 1999/07/03 02:11:09 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -161,7 +161,6 @@ Specify a file containing the PID of a process to send a
 signal to instead of
 .Pa /var/run/syslog.pid .
 .El
-.Pp
 .Sh OPTIONS
 The following options can be used with
 .Nm newsyslog :
@@ -201,7 +200,6 @@ in flags are processed,
 and notifications sent if any have changed.  Without this option, monitored
 entries are not processed.
 .El
-.Pp
 .Sh FILES
 .Bl -tag -width /etc/newsyslog.conf
 .It Pa /etc/newsyslog.conf
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 7800e41ab21..488bab2dfc5 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: talk.1,v 1.6 1999/06/05 01:21:42 aaron Exp $
+.\"	$OpenBSD: talk.1,v 1.7 1999/07/03 02:11:09 aaron Exp $
 .\"	$NetBSD: talk.1,v 1.3 1994/12/09 02:14:23 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -106,7 +106,6 @@ and
 .Xr pr 1 ,
 disallow messages in order to
 prevent messy output.
-.Pp
 .Sh FILES
 .Bl -tag -width /var/run/utmp -compact
 .It Pa /etc/hosts
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index 81f1e700b28..58c6978b567 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vgrindefs.5,v 1.5 1999/05/23 14:11:06 aaron Exp $
+.\"	$OpenBSD: vgrindefs.5,v 1.6 1999/07/03 02:11:09 aaron Exp $
 .\"	$NetBSD: vgrindefs.5,v 1.3 1994/11/17 08:28:07 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -69,7 +69,6 @@ The following table names and describes each field:
 .It "oc	bool	present means upper and lower case are equivalent"
 .It "kw	str	a list of keywords separated by spaces"
 .El
-.Pp
 .Sh EXAMPLES
 The following entry, which describes the C language, is 
 typical of a language entry:
@@ -140,7 +139,7 @@ string delimiter in a string by escaping it.
 Unlike other regular expressions in the system,  these match words
 and not characters.  Hence something like "(tramp|steamer)flies?"
 would match "tramp", "steamer", "trampflies", or "steamerflies".
-.Sh KEYWORD  LIST
+.Sh KEYWORD LIST
 The keyword list is just a list of keywords in the language separated
 by spaces.  If the "oc" boolean is specified, indicating that upper
 and lower case are equivalent, then all the keywords should be 
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 8d609e1ad23..1e930e1ea65 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vmstat.8,v 1.13 1999/06/05 01:21:49 aaron Exp $
+.\"	$OpenBSD: vmstat.8,v 1.14 1999/07/03 02:11:09 aaron Exp $
 .\"	$NetBSD: vmstat.8,v 1.12 1996/05/10 23:19:30 thorpej Exp $
 .\"
 .\" Copyright (c) 1986, 1993
@@ -188,7 +188,6 @@ system time
 cpu idle
 .El
 .El
-.Pp
 .Sh EXAMPLES
 The command ``vmstat -w 5'' will print what the system is doing every five
 seconds; this is a good choice of printing interval since this is how often
@@ -202,7 +201,6 @@ default kernel namelist
 .It Pa /dev/mem
 default memory file
 .El
-.Pp
 .Sh SEE ALSO
 .Xr fstat 1 ,
 .Xr netstat 1 ,
@@ -211,7 +209,7 @@ default memory file
 .Xr systat 1 ,
 .Xr iostat 8 ,
 .Xr pstat 8
-.sp
+.Pp
 The sections starting with ``Interpreting system activity'' in
 .%T "Installing and Operating 4.3BSD" .
 .Sh BUGS
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 746a6fd849d..50b1f62b122 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yacc.1,v 1.4 1998/10/30 00:24:45 aaron Exp $
+.\"	$OpenBSD: yacc.1,v 1.5 1999/07/03 02:11:09 aaron Exp $
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -47,6 +47,7 @@ parser generator
 .Nm yacc
 .Op Fl dlrtv
 .Op Fl b Ar prefix
+.Op Fl o Ar output_file
 .Op Fl p Ar symbol_prefix
 .Ar filename
 .Sh DESCRIPTION
@@ -94,6 +95,10 @@ option is specified,
 .Nm yacc
 will not insert the #line directives.
 #line directives specified by the user will be retained.
+.It Fl o Ar output_file
+The
+.Fl o
+option specifies an explicit 
 .It Fl p Ar symbol_prefix
 The
 .Fl p
@@ -124,7 +129,6 @@ The
 option causes a human-readable description of the generated parser to
 be written to the file
 .Pa y.output .
-.Pp
 .Sh ENVIRONMENT
 The following environment variable is referenced by
 .Nm yacc :
diff --git a/usr.sbin/grfconfig/grfconfig.8 b/usr.sbin/grfconfig/grfconfig.8
index 37c7e7ff22c..d4f3e539bfa 100644
--- a/usr.sbin/grfconfig/grfconfig.8
+++ b/usr.sbin/grfconfig/grfconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: grfconfig.8,v 1.8 1999/06/05 22:16:48 aaron Exp $
+.\"	$OpenBSD: grfconfig.8,v 1.9 1999/07/03 02:11:09 aaron Exp $
 .\"	$NetBSD: grfconfig.8,v 1.4 1997/07/29 17:40:47 veego Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -197,7 +197,6 @@ Beginning with
  4   31000000 640 480  8  640 688 768 832 480 489 492 520 +hsync +vsync
 .Pp
 hbe and vbe are computed in the grf drivers.
-.Pp
 .Sh BUGS
 .Nm
 cannot set the modes for
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index ffd733a3e5a..1c1fadf5023 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_create.1,v 1.7 1999/06/05 22:17:49 aaron Exp $	
+.\"	$OpenBSD: pkg_create.1,v 1.8 1999/07/03 02:11:09 aaron Exp $	
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -210,7 +210,6 @@ is the name of the first directory named by a
 .Cm @cwd
 directive.
 .El
-.Pp
 .Sh PACKING LIST DETAILS
 The
 .Dq packing list
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index 9155dc176ce..0739a28d593 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_delete.1,v 1.5 1999/06/05 22:17:50 aaron Exp $
+.\"	$OpenBSD: pkg_delete.1,v 1.6 1999/07/03 02:11:10 aaron Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -93,7 +93,6 @@ the package.
 Force removal of the package, even if a dependency is recorded or the
 deinstall or require script fails.
 .El
-.Pp
 .Sh TECHNICAL DETAILS
 .Nm
 does pretty much what it says.  It examines installed package records in
diff --git a/usr.sbin/ppp/ppp/ppp.8 b/usr.sbin/ppp/ppp/ppp.8
index 0446ff62c91..61392c952ea 100644
--- a/usr.sbin/ppp/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp/ppp.8
@@ -1,4 +1,4 @@
-.\" $Id: ppp.8,v 1.53 1999/06/23 16:49:04 brian Exp $
+.\" $Id: ppp.8,v 1.54 1999/07/03 02:11:10 aaron Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os
@@ -1090,7 +1090,6 @@ and
 .Dq set nbns
 commands.  Refer to their descriptions below.
 .El
-.Pp
 .Sh RECEIVING INCOMING PPP CONNECTIONS (Method 2)
 This method differs in that we use
 .Nm ppp
@@ -1342,7 +1341,6 @@ from "tcp" to "udp".  When using UDP as a transport,
 .Nm
 will operate in synchronous mode.  This is another gain as the incoming
 data does not have to be rearranged into packets.
-.Pp
 .Sh PACKET ALIASING
 The
 .Fl alias
@@ -1683,7 +1681,6 @@ is established.
 192.244.177.2/0 means that I'll accept/permit any IP address but I'll
 try to insist that 192.244.177.2 be used first.
 .El
-.Pp
 .Sh CONNECTING WITH YOUR INTERNET SERVICE PROVIDER
 The following steps should be taken when connecting to your ISP:
 .Bl -enum
@@ -2056,7 +2053,6 @@ This signal, tells
 to close any existing server socket, dropping all existing diagnostic
 connections.
 .El
-.Pp
 .Sh MULTI-LINK PPP
 If you wish to use more than one physical link to connect to a
 .Em PPP
@@ -4512,7 +4508,6 @@ peer is detected,
 .Nm
 automatically enables Packet Mode and goes back into command mode.
 .El
-.Pp
 .Sh MORE DETAILS
 .Bl -bullet
 .It
@@ -4536,7 +4531,6 @@ http://www.FreeBSD.org/handbook/userppp.html
 .El
 .Pp
 .El
-.Pp
 .Sh FILES
 .Nm
 refers to four files:
@@ -4600,7 +4594,6 @@ to HEX to determine the actual file name.
 This socket is used to pass links between different instances of
 .Nm ppp .
 .El
-.Pp
 .Sh SEE ALSO
 .Xr at 1 ,
 .Xr ftp 1 ,
diff --git a/usr.sbin/ppp/pppctl/pppctl.8 b/usr.sbin/ppp/pppctl/pppctl.8
index f43ed42378b..2ee3f974ea2 100644
--- a/usr.sbin/ppp/pppctl/pppctl.8
+++ b/usr.sbin/ppp/pppctl/pppctl.8
@@ -1,4 +1,4 @@
-.\" $Id: pppctl.8,v 1.4 1999/05/23 14:11:35 aaron Exp $
+.\" $Id: pppctl.8,v 1.5 1999/07/03 02:11:10 aaron Exp $
 .Dd 26 June 1997
 .Os
 .Dt PPPCTL 8
@@ -96,7 +96,6 @@ daemon.  If this switch is not used,
 will prompt for a password once it has successfully connected to
 .Nm ppp .
 .El
-.Pp
 .Sh EXAMPLES
 If you run
 .Nm ppp
@@ -160,7 +159,6 @@ You can even make a generic script:
 #! /bin/sh
 exec pppctl /var/run/internet "$@"
 .Ed
-.Pp
 .Sh ENVIRONMENT
 The following environment variables are understood by
 .Nm
@@ -181,7 +179,6 @@ and
 commands in
 .Pa ~/.editrc .
 .El
-.Pp
 .Sh SEE ALSO
 .Xr ps 1 ,
 .Xr editline 3 ,
diff --git a/usr.sbin/rpc.bootparamd/rpc.bootparamd.8 b/usr.sbin/rpc.bootparamd/rpc.bootparamd.8
index dff83fcdcfa..23513b62fe2 100644
--- a/usr.sbin/rpc.bootparamd/rpc.bootparamd.8
+++ b/usr.sbin/rpc.bootparamd/rpc.bootparamd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rpc.bootparamd.8,v 1.10 1999/07/02 20:11:48 aaron Exp $
+.\" $OpenBSD: rpc.bootparamd.8,v 1.11 1999/07/03 02:11:10 aaron Exp $
 .\" @(#)bootparamd.8
 .Dd January 8, 1994
 .Dt BOOTPARAMD 8
@@ -47,7 +47,6 @@ This defaults to the machine running the server.
 Specify the file to read boot parameters from.  Defaults to
 .Pa /etc/bootparams .
 .El
-.Pp
 .Sh FILES
 .Bl -tag -width /etc/bootparams -compact
 .It Pa /etc/bootparams
diff --git a/usr.sbin/slstats/slstats.8 b/usr.sbin/slstats/slstats.8
index a49ad9c6c72..4f60d3a6fb1 100644
--- a/usr.sbin/slstats/slstats.8
+++ b/usr.sbin/slstats/slstats.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: slstats.8,v 1.4 1999/06/05 22:18:10 aaron Exp $
+.\"	$OpenBSD: slstats.8,v 1.5 1999/07/03 02:11:10 aaron Exp $
 .\"	$NetBSD: slstats.8,v 1.2.6.1 1996/06/07 01:42:24 thorpej Exp $
 .Dd July 5, 1993
 .Dt SLSTATS 8
@@ -97,6 +97,5 @@ option is specified.
 .El
 .Sh BUGS
 Should take an interface name and not a unit number.
-.Pp
 .Sh SEE ALSO
 .Xr sliplogin 1
diff --git a/usr.sbin/spray/spray.8 b/usr.sbin/spray/spray.8
index dcacd06f334..8b33fed6d2d 100644
--- a/usr.sbin/spray/spray.8
+++ b/usr.sbin/spray/spray.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spray.8,v 1.5 1999/06/05 22:18:11 aaron Exp $
+.\"	$OpenBSD: spray.8,v 1.6 1999/07/03 02:11:10 aaron Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -69,7 +69,6 @@ This command
 .Bf -emphasis
 can be very hard on a network and should be used with caution.
 .Ef
-.Pp
 .Sh SEE ALSO
 .Xr netstat 1 ,
 .Xr ifconfig 8 ,
diff --git a/usr.sbin/ypserv/revnetgroup/revnetgroup.8 b/usr.sbin/ypserv/revnetgroup/revnetgroup.8
index 7620b3a5644..3ef4ecc376e 100644
--- a/usr.sbin/ypserv/revnetgroup/revnetgroup.8
+++ b/usr.sbin/ypserv/revnetgroup/revnetgroup.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: revnetgroup.8,v 1.3 1999/05/16 19:58:19 alex Exp $
+.\"	$OpenBSD: revnetgroup.8,v 1.4 1999/07/03 02:11:11 aaron Exp $
 .\" Copyright (c) 1995
 .\"	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
 .\"
@@ -89,7 +89,6 @@ command prints its results on the standard output. It is usually called
 only by
 .Nm /var/yp/\<domain\>/Makefile
 when rebuilding the YP netgroup maps.
-.Pp
 .Sh OPTIONS
 The
 .Nm revnetgroup
diff --git a/usr.sbin/ypserv/stdethers/stdethers.8 b/usr.sbin/ypserv/stdethers/stdethers.8
index 6720d64c10f..7d166defe5b 100644
--- a/usr.sbin/ypserv/stdethers/stdethers.8
+++ b/usr.sbin/ypserv/stdethers/stdethers.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stdethers.8,v 1.5 1999/06/05 22:18:26 aaron Exp $
+.\"	$OpenBSD: stdethers.8,v 1.6 1999/07/03 02:11:11 aaron Exp $
 .\" Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -44,7 +44,6 @@ is used to get rid of unwanted information in
 or the standard input if no
 .Ar file
 argument is given. This utility is used by YP when creating YP maps.
-.Pp
 .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 e51f6ac1871..e709bfe44d5 100644
--- a/usr.sbin/ypserv/stdhosts/stdhosts.8
+++ b/usr.sbin/ypserv/stdhosts/stdhosts.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stdhosts.8,v 1.6 1999/06/05 22:18:27 aaron Exp $
+.\"	$OpenBSD: stdhosts.8,v 1.7 1999/07/03 02:11:11 aaron Exp $
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -44,7 +44,6 @@ is used to get rid of unwanted information from
 or the standard input if no
 .Ar file
 argument is given. This utility is used by YP when creating YP maps.
-.Pp
 .Sh SEE ALSO
 .Xr yp 8 ,
 .Xr ypserv 8