11 files changed, 39 insertions, 37 deletions
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index a567ce258ed..cfa7f29fa00 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stty.1,v 1.19 2000/01/18 21:48:58 aaron Exp $
+.\"	$OpenBSD: stty.1,v 1.20 2000/03/06 21:46:56 aaron Exp $
 .\"	$NetBSD: stty.1,v 1.10 1995/09/07 06:57:14 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -504,8 +504,8 @@ The terminal size is recorded as having
 .Ar number
 rows.
 .It Cm dec
-Set modes suitable for users of Digital Equipment Corporation systems (
-.Dv ERASE ,
+Set modes suitable for users of Digital Equipment Corporation systems
+.Pf ( Dv ERASE ,
 .Dv KILL ,
 and
 .Dv INTR
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index 8bf8754eef0..8bc3e98236b 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getcap.3,v 1.17 2000/03/04 22:19:30 aaron Exp $
+.\"	$OpenBSD: getcap.3,v 1.18 2000/03/06 21:46:56 aaron Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -134,11 +134,11 @@ the current entry is removed from the database.
 must precede the database traversal.  It must be called before
 .Fn cgetent .
 If a sequential access is being performed (see below), it must be called
-before the first sequential access call (
-.Fn cgetfirst
+before the first sequential access call
+.Pf ( Fn cgetfirst
 or
-.Fn cgetnext
-), or be directly preceded by a
+.Fn cgetnext ) ,
+or be directly preceded by a
 .Fn cgetclose
 call.
 On success 0 is returned and \-1 on failure.
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index 3262a9e4b16..589f970102f 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: regex.3,v 1.11 1999/07/09 13:35:22 aaron Exp $
+.\"	$OpenBSD: regex.3,v 1.12 2000/03/06 21:46:56 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
 .\"
@@ -397,8 +397,8 @@ and if the error code came from
 it should have been the result from the most recent
 .Fn regcomp
 using that
-.Li regex_t . (
-.Fn regerror
+.Li regex_t .
+.Pf ( Fn regerror
 may be able to supply a more detailed message using information
 from the
 .Li regex_t . )
diff --git a/lib/libutil/getrawpartition.3 b/lib/libutil/getrawpartition.3
index 7c8a3bfd8e0..fc700a004fd 100644
--- a/lib/libutil/getrawpartition.3
+++ b/lib/libutil/getrawpartition.3
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: getrawpartition.3,v 1.3 1999/02/27 21:57:40 deraadt Exp $
+.\"   $OpenBSD: getrawpartition.3,v 1.4 2000/03/06 21:46:56 aaron Exp $
 .\"	$NetBSD: getrawpartition.3,v 1.1 1996/05/16 07:03:32 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -49,8 +49,8 @@ partition
 .Fn getrawpartition void
 .Sh DESCRIPTION
 .Fn getrawpartition
-returns the partition number (
-.Sq a
+returns the partition number
+.Pf ( Sq a
 == 0,
 .Sq b
 == 1, ...) of the
diff --git a/sbin/ipf/ipf.5 b/sbin/ipf/ipf.5
index f35f1f95d67..dbbd7125347 100644
--- a/sbin/ipf/ipf.5
+++ b/sbin/ipf/ipf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ipf.5,v 1.19 2000/02/19 21:46:46 aaron Exp $
+.\"	$OpenBSD: ipf.5,v 1.20 2000/03/06 21:46:55 aaron Exp $
 .Dd July 9, 1999
 .Dt IPF 5
 .Os
@@ -491,8 +491,8 @@ rule, rule processing isn't stopped until it has returned from processing
 the group.
 .Pp
 A rule may be both the head for a new group and a member of a non-default
-group (
-.Cm head
+group
+.Pf ( Cm head
 and
 .Cm group
 may be used together in a rule).
diff --git a/share/man/man4/man4.i386/pms.4 b/share/man/man4/man4.i386/pms.4
index ce48aeb03d3..6c1a7f9995f 100644
--- a/share/man/man4/man4.i386/pms.4
+++ b/share/man/man4/man4.i386/pms.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$OpenBSD: pms.4,v 1.6 1999/10/10 13:16:21 matthieu Exp $
+.\"	$OpenBSD: pms.4,v 1.7 2000/03/06 21:46:57 aaron Exp $
 .\"
 .\" Copyright (c) 1996, Jason Downs.
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -95,14 +95,14 @@ should be used in
 .Pa /etc/XF86Config
 with the 
 .Em PS/2
-protocol, or one of its variants (
-.Em IMPS/2
+protocol, or one of its variants
+.Pf ( Em IMPS/2
 for MS Intellimouse,
 .Em ThinkingMousePS/2
 for Kensington Thinking Mouse).
 .Pp
 .Sh FILES
-.Bl -tag -width Pa -compact
+.Bl -tag -width /dev/pms0 -compact
 .It Pa /dev/psm0
 PS/2 mouse device file, defaulting to raw mode
 .It Pa /dev/pms0
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index a4ad59ca799..dcf15ceb612 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.48 2000/03/02 13:44:33 aaron Exp $
+.\"	$OpenBSD: options.4,v 1.49 2000/03/06 21:46:57 aaron Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt
@@ -749,8 +749,8 @@ objects (i.e. BSS pages)).
 .It Cd option DEVPAGER
 Support for mmap()ing of devices.  (Specifically, this enables the
 virtual memory module responsible for handling page faults on mapped
-devices (
-.Dq cdev
+devices
+.Pf ( Dq cdev
 vnodes)).
 .Em MANDATORY
 -- the system cannot actually run without this
diff --git a/share/man/man4/raid.4 b/share/man/man4/raid.4
index 4a00e638d7b..66fa5e4957a 100644
--- a/share/man/man4/raid.4
+++ b/share/man/man4/raid.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: raid.4,v 1.9 2000/01/07 14:52:28 peter Exp $
+.\"	$OpenBSD: raid.4,v 1.10 2000/03/06 21:46:57 aaron Exp $
 .\"     $NetBSD: raid.4,v 1.8 1999/12/15 22:07:33 abs Exp $
 .\"
 .\"
@@ -211,8 +211,8 @@ pseudo-device   raid   4       # RAIDframe disk device
 .Pp
 to the kernel configuration file.  The
 .Sq count
-argument (
-.Sq 4 ,
+argument
+.Pf ( Sq 4 ,
 in this case), specifies the number of RAIDframe drivers to configure.
 At the time of this writing, 4 is the MAXIMUM of
 .Nm
diff --git a/share/man/man8/afterboot.8 b/share/man/man8/afterboot.8
index 0f96fc493de..3d8b2d52307 100644
--- a/share/man/man8/afterboot.8
+++ b/share/man/man8/afterboot.8
@@ -305,11 +305,13 @@ to
 and editing it and creating other maps as needed.
 Alternatively, you can get your maps with YP.
 .Sh INSTALLING SHARED CRYPTO LIBRARIES WITH RSA INCLUDED
-Two OpenBSD libraries (
-.Pa libssl
+Two
+.Ox
+libraries
+.Pf ( Pa libssl
 and 
-.Pa libcrypto
-, based on OpenSSL) implement many
+.Pa libcrypto ,
+based on OpenSSL) implement many
 cryptographic functions which are used by OpenBSD programs like 
 .Xr ssh 1 ,
 .Xr httpd 8 ,
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index 59375f8b5a0..b4a06cfce37 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: style.9,v 1.6 1999/09/14 06:21:23 pjanzen Exp $
+.\"	$OpenBSD: style.9,v 1.7 2000/03/06 21:46:56 aaron Exp $
 .\"
 .Dd August 19, 1999
 .Dt STYLE 9
@@ -285,8 +285,8 @@ have a NOTREACHED comment.
 
 .Ed
 .Pp
-Use space after keywords (
-.Li if ,
+Use space after keywords
+.Pf ( Li if ,
 .Li while ,
 .Li for ,
 .Li return ,
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index 882a1d6cc75..a8b25315ffc 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.7 1999/10/09 20:35:45 beck Exp $
+.\"	$OpenBSD: pkg_delete.1,v 1.8 2000/03/06 21:46:55 aaron Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -53,8 +53,8 @@ attacks from miscreants who create dangerous package files.
 .Pp
 You are advised to verify the competence and identity of those who
 provide installable package files.  For extra protection, examine all
-the package control files in the package record directory (
-.Pa /var/db/pkg/<pkg-name>/ ).
+the package control files in the package record directory
+.Pq Pa /var/db/pkg/<pkg-name>/ .
 Pay particular
 attention to any +INSTALL, +DEINSTALL, +REQUIRE or +MTREE_DIRS files,
 and inspect the +CONTENTS file for