Reduce usage of predefined strings in manpages.

Predefined strings are not very portable across troff implementations,
and they make the source much harder to read. Usually the intended
character can be written directly.

No output changes, except for two instances where the incorrect escape
was used in the first place.

tweaks + ok schwarze@

35 files changed, 189 insertions, 194 deletions

diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index 89ad8870719..c0e92de10e0 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: csh.1,v 1.74 2015/01/15 19:06:31 schwarze Exp $
+.\"	$OpenBSD: csh.1,v 1.75 2015/02/28 21:51:57 bentley Exp $
 .\"	$NetBSD: csh.1,v 1.10 1995/03/21 09:02:35 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)csh.1	8.2 (Berkeley) 1/21/94
 .\"
-.Dd $Mdocdate: January 15 2015 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt CSH 1
 .Os
 .Sh NAME
@@ -1364,7 +1364,7 @@ and
 commands.
 The following operators are available:
 .Bd -ragged -offset indent
-||  &&  | \*(ua  &  ==  !=  =~  !~  <=  >=
+||  &&  |  ^  &  ==  !=  =~  !~  <=  >=
 <  > <<  >>  +  \-  *  /  %  !  ~  (  )
 .Ed
 .Pp
diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3
index c2714e6799a..ae26b417ddb 100644
--- a/lib/libc/gen/scandir.3
+++ b/lib/libc/gen/scandir.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scandir.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
+.\"	$OpenBSD: scandir.3,v 1.14 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt SCANDIR 3
 .Os
 .Sh NAME
@@ -38,7 +38,12 @@
 .In sys/types.h
 .In dirent.h
 .Ft int
-.Fn scandir "const char *dirname" "struct dirent ***namelist" "int \*(lp*select\*(rp\*(lpconst struct dirent *\*(rp" "int \*(lp*compar\*(rp\*(lpconst struct dirent **, const struct dirent **\*(rp"
+.Fo scandir
+.Fa "const char *dirname"
+.Fa "struct dirent ***namelist"
+.Fa "int (*select)(const struct dirent *)"
+.Fa "int (*compar)(const struct dirent **, const struct dirent **)"
+.Fc
 .Ft int
 .Fn alphasort "const struct dirent **d1" "const struct dirent **d2"
 .Sh DESCRIPTION
diff --git a/lib/libc/regex/re_format.7 b/lib/libc/regex/re_format.7
index 0d8ce59a8b8..36f0942715f 100644
--- a/lib/libc/regex/re_format.7
+++ b/lib/libc/regex/re_format.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: re_format.7,v 1.20 2014/12/09 15:37:14 schwarze Exp $
+.\"	$OpenBSD: re_format.7,v 1.21 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
 .\"
@@ -35,7 +35,7 @@
 .\"
 .\"	@(#)re_format.7	8.3 (Berkeley) 3/20/94
 .\"
-.Dd $Mdocdate: December 9 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt RE_FORMAT 7
 .Os
 .Sh NAME
@@ -77,7 +77,7 @@ and then discusses differences between them and basic regular expressions.
 An ERE is one** or more non-empty**
 .Em branches ,
 separated by
-.Sq \*(Ba .
+.Sq | .
 It matches anything that matches one of the branches.
 .Pp
 A branch is one** or more
@@ -510,11 +510,11 @@ times.
 If the comma is also omitted, then it matches exactly
 .Ar n
 times.
-.It \*(Ba
+.It |
 Used to separate patterns.
 For example,
 the pattern
-.Sq cat\*(Badog
+.Sq cat|dog
 matches either
 .Sq cat
 or
@@ -524,7 +524,7 @@ or
 Basic regular expressions differ in several respects:
 .Bl -bullet -offset 3n
 .It
-.Sq \*(Ba ,
+.Sq | ,
 .Sq + ,
 and
 .Sq ?\&
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 10e4a2cd9db..76a260f78ea 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: printf.3,v 1.71 2015/01/13 14:02:30 schwarze Exp $
+.\"	$OpenBSD: printf.3,v 1.72 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: January 13 2015 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt PRINTF 3
 .Os
 .Sh NAME
@@ -451,7 +451,7 @@ The
 .Li double
 argument is rounded and converted in the style
 .Sm off
-.Pf [\-]d Cm \&. No ddd Cm e No \*(Pmdd
+.Pf [\-]d Cm \&. No ddd Cm e No \(+-dd
 .Sm on
 where there is one digit before the
 decimal-point character
@@ -542,7 +542,7 @@ The
 .Li double
 argument is rounded and converted to hexadecimal notation in the style
 .Sm off
-.Pf [\-]0xh Cm \&. No hhh Cm p No [\*(Pm]d
+.Pf [\-]0xh Cm \&. No hhh Cm p No [\(+-]d
 .Sm on
 where the number of digits after the hexadecimal-point character
 is equal to the precision specification.
diff --git a/lib/libc/stdio/tmpnam.3 b/lib/libc/stdio/tmpnam.3
index 29d151a683a..ab969a9a61f 100644
--- a/lib/libc/stdio/tmpnam.3
+++ b/lib/libc/stdio/tmpnam.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tmpnam.3,v 1.20 2015/01/13 14:02:30 schwarze Exp $
+.\"	$OpenBSD: tmpnam.3,v 1.21 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 13 2015 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt TMPFILE 3
 .Os
 .Sh NAME
@@ -60,7 +60,7 @@ reference to it is closed.
 Since
 .Xr mkstemp 3
 creates the file with mode
-.Dv S_IRUSR \*(Ba S_IWUSR ,
+.Dv S_IRUSR | S_IWUSR ,
 after the unlink,
 .Xr fchown 2
 and
diff --git a/lib/libc/sys/getrusage.2 b/lib/libc/sys/getrusage.2
index 6eaa1b3363e..aeaf5c9d124 100644
--- a/lib/libc/sys/getrusage.2
+++ b/lib/libc/sys/getrusage.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getrusage.2,v 1.16 2014/12/10 07:16:58 guenther Exp $
+.\"	$OpenBSD: getrusage.2,v 1.17 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)getrusage.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt GETRUSAGE 2
 .Os
 .Sh NAME
@@ -88,7 +88,9 @@ of the process(es).
 .It Fa ru_maxrss
 the maximum resident set size utilized (in kilobytes).
 .It Fa ru_ixrss
-an \*(lqintegral\*(rq value indicating the amount of memory used
+an
+.Dq integral
+value indicating the amount of memory used
 by the text segment
 that was also shared among other processes.
 This value is expressed in units of kilobytes * ticks-of-execution.
@@ -102,13 +104,16 @@ stack segment of a process (expressed in units of
 kilobytes * ticks-of-execution).
 .It Fa ru_minflt
 the number of page faults serviced without any I/O activity; here
-I/O activity is avoided by \*(lqreclaiming\*(rq a page frame from
+I/O activity is avoided by
+.Dq reclaiming
+a page frame from
 the list of pages awaiting reallocation.
 .It Fa ru_majflt
 the number of page faults serviced that required I/O activity.
 .It Fa ru_nswap
-the number of times a process was \*(lqswapped\*(rq out of main
-memory.
+the number of times a process was
+.Dq swapped
+out of main memory.
 .It Fa ru_inblock
 the number of times the file system had to perform input.
 .It Fa ru_oublock
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 10f48fe68a7..cb62cb4c5f6 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: socket.2,v 1.38 2014/08/31 01:42:36 guenther Exp $
+.\"	$OpenBSD: socket.2,v 1.39 2015/02/28 21:51:57 bentley Exp $
 .\"	$NetBSD: socket.2,v 1.5 1995/02/27 12:37:53 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)socket.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: August 31 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt SOCKET 2
 .Os
 .Sh NAME
@@ -114,7 +114,8 @@ Normally only a single protocol exists to support a particular
 socket type within a given protocol family.
 However, it is possible that many protocols may exist,
 in which case a particular protocol must be specified in this manner.
-The protocol number to use is particular to the \*(lqcommunication domain\*(rq
+The protocol number to use is particular to the
+.Dq communication domain
 in which communication is to take place; see
 .Xr protocols 5 .
 A value of 0 for
diff --git a/sbin/atactl/atactl.8 b/sbin/atactl/atactl.8
index 2075607361c..94b897518b4 100644
--- a/sbin/atactl/atactl.8
+++ b/sbin/atactl/atactl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atactl.8,v 1.45 2014/11/15 14:41:03 bentley Exp $
+.\"	$OpenBSD: atactl.8,v 1.46 2015/02/28 21:51:57 bentley Exp $
 .\"	$NetBSD: atactl.8,v 1.5 1999/02/24 18:49:14 jwise Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 15 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt ATACTL 8
 .Os
 .Sh NAME
@@ -243,12 +243,12 @@ even models, so don't rely on it.
 SMART must be enabled while executing this command or the device will return
 an error.
 .Pp
-.It Li secdisablepass Ar user \*(Ba master
+.It Li secdisablepass Ar user | master
 Disables the lock mode for the specified device with user or master password.
 This command won't change the master password.
 The master password will be reactivated when a user password is set.
 .Pp
-.It Li secerase Ar user \*(Ba master Oo
+.It Li secerase Ar user | master Oo
 .Ar enhanced
 .Oc
 Erases all user data and unlocks the specified device.
@@ -276,7 +276,7 @@ security system.
 After command completion any other commands that update the device lock mode
 will be aborted.
 .Pp
-.It Li secsetpass Ar user Ar high \*(Ba maximum
+.It Li secsetpass Ar user Ar high | maximum
 .It Li secsetpass Ar master
 Sets password and security level for the specified device.
 There are two passwords, user and master, and two security levels, high and
@@ -311,7 +311,7 @@ Execution of the
 .Li secerase
 command erases all user data on the device.
 .Pp
-.It Li secunlock Ar user \*(Ba master
+.It Li secunlock Ar user | master
 Unlocks the specified device with user or master password.
 The device will always unlock if a valid user password is received.
 If the security level was set to high during the last
@@ -343,7 +343,7 @@ Typically the
 driver performs this reset automatically, but this should still be
 used with caution.
 .Pp
-.It Li smartautosave Ar enable \*(Ba disable
+.It Li smartautosave Ar enable | disable
 Enables/disables attribute autosave feature on the specified device.
 .Pp
 .It Li smartdisable
diff --git a/sbin/bioctl/bioctl.8 b/sbin/bioctl/bioctl.8
index 5dc38e433f4..8cb965eaa25 100644
--- a/sbin/bioctl/bioctl.8
+++ b/sbin/bioctl/bioctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bioctl.8,v 1.93 2014/01/18 09:11:12 jsing Exp $
+.\"	$OpenBSD: bioctl.8,v 1.94 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Marco Peereboom
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 18 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt BIOCTL 8
 .Os
 .Sh NAME
@@ -36,7 +36,7 @@
 .Op Fl a Ar alarm-function
 .Op Fl b Ar channel:target[.lun]
 .Op Fl H Ar channel:target[.lun]
-.Op Fl R Ar device \*(Ba channel:target[.lun]
+.Op Fl R Ar device | channel:target[.lun]
 .Op Fl u Ar channel:target[.lun]
 .Ar device
 .Ek
@@ -48,9 +48,9 @@
 .Op Fl c Ar raidlevel
 .Op Fl k Ar keydisk
 .Op Fl l Ar special[,special,...]
-.Op Fl O Ar device \*(Ba channel:target[.lun]
+.Op Fl O Ar device | channel:target[.lun]
 .Op Fl p Ar passfile
-.Op Fl R Ar device \*(Ba channel:target[.lun]
+.Op Fl R Ar device | channel:target[.lun]
 .Op Fl r Ar rounds
 .Ar device
 .Ek
@@ -131,7 +131,7 @@ Enumerate the selected RAID devices.
 This is the default if no other option is given.
 .It Fl q
 Show vendor, product, revision, and serial number for the given disk.
-.It Fl R Ar device \*(Ba channel:target[.lun]
+.It Fl R Ar device | channel:target[.lun]
 Manually kick off a rebuild of a RAID volume, using
 .Ar device
 or
@@ -224,7 +224,7 @@ device list to create within the
 framework.
 Requires
 .Fl c .
-.It Fl O Ar device \*(Ba channel:target[.lun]
+.It Fl O Ar device | channel:target[.lun]
 Set the state of
 .Ar device
 or
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 24db88e1c8d..4adb090d2de 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.8,v 1.111 2014/07/16 13:46:30 deraadt Exp $
+.\"	$OpenBSD: disklabel.8,v 1.112 2015/02/28 21:51:57 bentley Exp $
 .\"	$NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: July 16 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt DISKLABEL 8
 .Os
 .Sh NAME
@@ -304,7 +304,7 @@ At prompts that request a size,
 may be entered to indicate the rest of the available space.
 The editor commands are as follows:
 .Bl -tag -width "p [unit] "
-.It Cm \&? \*(Ba h
+.It Cm \&? | h
 Display help message with all available commands.
 There is also
 .Pq simple
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index c54b893a8c4..8887a38172a 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ifconfig.8,v 1.251 2015/02/05 10:30:25 henning Exp $
+.\"	$OpenBSD: ifconfig.8,v 1.252 2015/02/28 21:51:57 bentley 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 $
 .\"
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ifconfig.8	8.4 (Berkeley) 6/1/94
 .\"
-.Dd $Mdocdate: February 5 2015 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -317,7 +317,7 @@ of this is to select the connector type for some Ethernet cards.
 Refer to the man page for the specific driver for more information.
 .It Fl link[0-2]
 Disable special processing at the link level with the specified interface.
-.It Cm lladdr Ar etheraddr Ns \*(Ba Ns Cm random
+.It Cm lladdr Ar etheraddr Ns | Ns Cm random
 Change the link layer address (MAC address) of the interface.
 This should be specified as six colon-separated hex values, or can
 be chosen randomly.
@@ -715,8 +715,8 @@ connected to a shared network segment,
 like a hub or a wireless network.
 .It Xo
 .Cm rule
-.Cm block Ns \*(Ba Ns Cm pass
-.Op Cm in \*(Ba out
+.Cm block Ns | Ns Cm pass
+.Op Cm in | out
 .Cm on Ar interface
 .Op Cm src Ar address
 .Op Cm dst Ar address
diff --git a/sbin/iked/iked.conf.5 b/sbin/iked/iked.conf.5
index 7faa2288948..2a113d4ab42 100644
--- a/sbin/iked/iked.conf.5
+++ b/sbin/iked/iked.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iked.conf.5,v 1.37 2015/01/15 11:54:31 sobrado Exp $
+.\" $OpenBSD: iked.conf.5,v 1.38 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org>
 .\" Copyright (c) 2004 Mathieu Sauve-Frankel  All rights reserved.
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 15 2015 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt IKED.CONF 5
 .Os
 .Sh NAME
@@ -599,7 +599,7 @@ Interface for IKE traffic and encapsulated IPsec traffic.
 IKE traffic on the external interface.
 .It proto udp port 4500
 IKE NAT-Traversal traffic on the external interface.
-.It proto ah \*(Ba esp
+.It proto ah | esp
 Encapsulated IPsec traffic
 on the external interface.
 .It enc0
diff --git a/sbin/ipsecctl/ipsec.conf.5 b/sbin/ipsecctl/ipsec.conf.5
index 412920381e3..2abe006b040 100644
--- a/sbin/ipsecctl/ipsec.conf.5
+++ b/sbin/ipsecctl/ipsec.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ipsec.conf.5,v 1.147 2015/01/10 15:03:50 sobrado Exp $
+.\"	$OpenBSD: ipsec.conf.5,v 1.148 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 2004 Mathieu Sauve-Frankel  All rights reserved.
 .\"
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 10 2015 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt IPSEC.CONF 5
 .Os
 .Sh NAME
@@ -473,7 +473,7 @@ Interface for ISAKMP traffic and encapsulated IPsec traffic.
 ISAKMP traffic on the external interface.
 .It proto udp port 4500
 ISAKMP NAT-Traversal traffic on the external interface.
-.It proto ah \*(Ba esp
+.It proto ah | esp
 Encapsulated IPsec traffic
 on the external interface.
 .It enc0
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 3f1c36fb6c8..eb02aab593d 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mknod.8,v 1.18 2010/03/27 09:10:02 jmc Exp $
+.\"	$OpenBSD: mknod.8,v 1.19 2015/02/28 21:51:57 bentley Exp $
 .\"	$NetBSD: mknod.8,v 1.9 1995/08/10 23:47:32 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: March 27 2010 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt MKNOD 8
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nm mknod
 .Op Fl m Ar mode
 .Ar name
-.Cm b\*(Bac
+.Cm b Ns | Ns Cm c
 .Ar major minor
 .Nm mknod
 .Op Fl m Ar mode
@@ -83,7 +83,7 @@ for a SCSI disk or a
 .Dq pty
 for pseudo-devices.
 FIFOs may be named arbitrarily by the user.
-.It Cm b \*(Ba c \*(Ba p
+.It Cm b | c | p
 Type of device or FIFO.
 If the device is a block type device such as a tape or disk drive which needs
 both cooked and raw special files,
diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8
index e021b36a7e3..7aa853a1680 100644
--- a/sbin/scsi/scsi.8
+++ b/sbin/scsi/scsi.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scsi.8,v 1.34 2012/09/04 05:36:26 jmc Exp $
+.\"	$OpenBSD: scsi.8,v 1.35 2015/02/28 21:51:57 bentley Exp $
 .\"	$FreeBSD: scsi.8,v 1.5 1995/05/05 20:41:58 dufault Exp $
 .\"
 .\" Written By Julian ELischer
@@ -40,7 +40,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 4 2012 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt SCSI 8
 .Os
 .Sh NAME
@@ -339,7 +339,7 @@ The
 command appeared in 386BSD 0.1.2.4/FreeBSD to support the new reprobe
 and user SCSI commands.
 .Sh BUGS
-.Ic scsi\ -f /dev/rsd0c -c \*q4 0 0 0 0 0\*q
+.Ic scsi\ -f /dev/rsd0c -c \(dq4 0 0 0 0 0\(dq
 permits anyone who can write to
 .Pa /dev/rsd0c
 to format the disk drive.
diff --git a/share/man/man7/eqn.7 b/share/man/man7/eqn.7
index 32e36213669..69788ceea4f 100644
--- a/share/man/man7/eqn.7
+++ b/share/man/man7/eqn.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: eqn.7,v 1.6 2015/01/29 00:33:14 schwarze Exp $
+.\"	$OpenBSD: eqn.7,v 1.7 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 29 2015 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt EQN 7
 .Os
 .Sh NAME
@@ -72,31 +72,31 @@ case-sensitive literals in the input:
 .Bd -literal -offset indent
 eqn     : box | eqn box
 box     : text
-        | \*q{\*q eqn \*q}\*q
-        | \*qdefine\*q text text
-        | \*qndefine\*q text text
-        | \*qtdefine\*q text text
-        | \*qgfont\*q text
-        | \*qgsize\*q text
-        | \*qset\*q text text
-        | \*qundef\*q text
-        | \*qsqrt\*q box
+        | \(dq{\(dq eqn \(dq}\(dq
+        | \(dqdefine\(dq text text
+        | \(dqndefine\(dq text text
+        | \(dqtdefine\(dq text text
+        | \(dqgfont\(dq text
+        | \(dqgsize\(dq text
+        | \(dqset\(dq text text
+        | \(dqundef\(dq text
+        | \(dqsqrt\(dq box
         | box pos box
         | box mark
-        | \*qmatrix\*q \*q{\*q [col \*q{\*q list \*q}\*q ]*
-        | pile \*q{\*q list \*q}\*q
+        | \(dqmatrix\(dq \(dq{\(dq [col \(dq{\(dq list \(dq}\(dq ]*
+        | pile \(dq{\(dq list \(dq}\(dq
         | font box
-        | \*qsize\*q text box
-        | \*qleft\*q text eqn [\*qright\*q text]
-col     : \*qlcol\*q | \*qrcol\*q | \*qccol\*q | \*qcol\*q
-text    : [^space\e\*q]+ | \e\*q.*\e\*q
-pile    : \*qlpile\*q | \*qcpile\*q | \*qrpile\*q | \*qpile\*q
-pos     : \*qover\*q | \*qsup\*q | \*qsub\*q | \*qto\*q | \*qfrom\*q
-mark	: \*qdot\*q | \*qdotdot\*q | \*qhat\*q | \*qtilde\*q | \*qvec\*q
-        | \*qdyad\*q | \*qbar\*q | \*qunder\*q
-font    : \*qroman\*q | \*qitalic\*q | \*qbold\*q | \*qfat\*q
+        | \(dqsize\(dq text box
+        | \(dqleft\(dq text eqn [\(dqright\(dq text]
+col     : \(dqlcol\(dq | \(dqrcol\(dq | \(dqccol\(dq | \(dqcol\(dq
+text    : [^space\e\(dq]+ | \e\(dq.*\e\(dq
+pile    : \(dqlpile\(dq | \(dqcpile\(dq | \(dqrpile\(dq | \(dqpile\(dq
+pos     : \(dqover\(dq | \(dqsup\(dq | \(dqsub\(dq | \(dqto\(dq | \(dqfrom\(dq
+mark	: \(dqdot\(dq | \(dqdotdot\(dq | \(dqhat\(dq | \(dqtilde\(dq | \(dqvec\(dq
+        | \(dqdyad\(dq | \(dqbar\(dq | \(dqunder\(dq
+font    : \(dqroman\(dq | \(dqitalic\(dq | \(dqbold\(dq | \(dqfat\(dq
 list    : eqn
-        | list \*qabove\*q eqn
+        | list \(dqabove\(dq eqn
 space   : [\e^~ \et]
 .Ed
 .Pp
@@ -434,7 +434,7 @@ implementation (including GNU troff).
 .Bl -dash -compact
 .It
 The text string
-.Sq \e\*q
+.Sq \e\(dq
 is interpreted as a literal quote in troff.
 In mandoc, this is interpreted as a comment.
 .It
diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1
index 14298e53afe..ff350ca8ff9 100644
--- a/usr.bin/cdio/cdio.1
+++ b/usr.bin/cdio/cdio.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cdio.1,v 1.60 2014/09/08 01:27:55 schwarze Exp $
+.\" $OpenBSD: cdio.1,v 1.61 2015/02/28 21:51:56 bentley Exp $
 .\"
 .\" Copyright (c) 1995 Serge V. Vakulenko
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 8 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt CDIO 1
 .Os
 .Sh NAME
@@ -267,13 +267,9 @@ Set the volume of the left channel to
 .Ar left_channel
 and the volume of the right channel to
 .Ar right_channel .
-Allowed values are in the range 0\-255.
+Allowed values are in the range 0\(en255.
 .It Xo Ic volume
-.Ic left \*(Ba
-.Ic right \*(Ba
-.Ic mono \*(Ba
-.Ic stereo \*(Ba
-.Ic mute
+.Ic left | right | mono | stereo | mute
 .Xc
 Respectively:
 play the left subtrack on both left and right channels;
diff --git a/usr.bin/cu/cu.1 b/usr.bin/cu/cu.1
index 057490effea..879b7f4a66e 100644
--- a/usr.bin/cu/cu.1
+++ b/usr.bin/cu/cu.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cu.1,v 1.12 2015/02/08 17:33:35 nicm Exp $
+.\"	$OpenBSD: cu.1,v 1.13 2015/02/28 21:51:56 bentley Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: February 8 2015 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt CU 1
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl l Ar line
-.Op Fl s Ar speed \*(Ba Fl Ar speed
+.Op Fl s Ar speed | Fl Ar speed
 .Nm
 .Op Ar host
 .Sh DESCRIPTION
@@ -69,7 +69,7 @@ Users in group
 are permitted to use
 .Xr cua 4
 devices by default.
-.It Fl s Ar speed \*(Ba Fl Ar speed
+.It Fl s Ar speed | Fl Ar speed
 Set the speed of the connection.
 The default is 9600.
 .El
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index d8e8312cfcd..132f52bc3bd 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: find.1,v 1.89 2014/12/03 19:39:57 jmc Exp $
+.\"	$OpenBSD: find.1,v 1.90 2015/02/28 21:51:56 bentley Exp $
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\"
 .\"	from: @(#)find.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: December 3 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt FIND 1
 .Os
 .Sh NAME
@@ -389,10 +389,7 @@ If the mode is symbolic, a starting value of zero is assumed and the
 mode sets or clears permissions without regard to the process's file mode
 creation mask.
 If the mode is octal, only bits 07777
-.Po
-.Dv S_ISUID \*(Ba S_ISGID \*(Ba S_ISTXT \*(Ba
-.Dv S_IRWXU \*(Ba S_IRWXG \*(Ba S_IRWXO
-.Pc
+.Pq Dv S_ISUID | S_ISGID | S_ISTXT | S_IRWXU | S_IRWXG | S_IRWXO
 of the file's mode bits participate
 in the comparison.
 If the mode is preceded by a dash
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index 818616d4957..1fb7f26b746 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fmt.1,v 1.25 2012/01/17 08:13:48 jmc Exp $
+.\" $OpenBSD: fmt.1,v 1.26 2015/02/28 21:51:56 bentley Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)fmt.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: January 17 2012 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt FMT 1
 .Os
 .Sh NAME
@@ -44,9 +44,7 @@
 .br
 .Oo
 .Ar goal
-.Oo Ar maximum Oc \*(Ba
-.Fl Ns Ar width \*(Ba
-.Fl w Ar width
+.Oo Ar maximum Oc | Fl Ns Ar width | Fl w Ar width
 .Oc
 .Op Ar
 .Sh DESCRIPTION
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index d9837585b64..b0b380a19d9 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.118 2015/02/07 13:35:00 espie Exp $
+.\"	$OpenBSD: make.1,v 1.119 2015/02/28 21:51:57 bentley Exp $
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd $Mdocdate: February 7 2015 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -995,7 +995,7 @@ are identical constructs.
 Files are included with either
 .Ql .include <file>
 or
-.Ql .include \*qfile\*q .
+.Ql .include Qq file .
 Variables between the angle brackets or double quotes are expanded
 to form the file name.
 If angle brackets are used, the included makefile is expected to be in
@@ -1514,13 +1514,13 @@ utility exits with one of the following values:
 Normal behavior.
 .It 1
 The target was not up-to date.
-.It \*(Gt1
+.It >1
 An error occurred.
 .El
 .Pp
 Otherwise, the
 .Nm
-utility exits with a value of 0 on success, and \*(Gt0 if an error occurred.
+utility exits with a value of 0 on success, and >0 if an error occurred.
 .Sh SEE ALSO
 .Xr ed 1 ,
 .Xr mkdep 1 ,
diff --git a/usr.bin/openssl/openssl.1 b/usr.bin/openssl/openssl.1
index 65b525fbc33..7edab79b0fd 100644
--- a/usr.bin/openssl/openssl.1
+++ b/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.12 2015/02/15 22:26:45 bentley Exp $
+.\" $OpenBSD: openssl.1,v 1.13 2015/02/28 21:51:56 bentley Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: February 15 2015 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -125,11 +125,11 @@
 .Op Ar command_args
 .Pp
 .Nm
-.Cm list-standard-commands \*(Ba
-.Cm list-message-digest-commands \*(Ba
-.Cm list-cipher-commands \*(Ba
-.Cm list-cipher-algorithms \*(Ba
-.Cm list-message-digest-algorithms \*(Ba
+.Cm list-standard-commands |
+.Cm list-message-digest-commands |
+.Cm list-cipher-commands |
+.Cm list-cipher-algorithms |
+.Cm list-message-digest-algorithms |
 .Cm list-public-key-algorithms
 .Pp
 .Nm
diff --git a/usr.bin/pkg-config/pkg-config.1 b/usr.bin/pkg-config/pkg-config.1
index 8d90c7361a6..256df36d84d 100644
--- a/usr.bin/pkg-config/pkg-config.1
+++ b/usr.bin/pkg-config/pkg-config.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg-config.1,v 1.30 2013/07/16 00:07:52 schwarze Exp $
+.\"	$OpenBSD: pkg-config.1,v 1.31 2015/02/28 21:51:56 bentley Exp $
 .\"
 .\"	Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\"	ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\"	OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt PKG-CONFIG 1
 .Os
 .Sh NAME
@@ -90,7 +90,7 @@ specified version.
 .It Cm --exists
 Return true if all the specified packages are installed.
 This is the default operation.
-.It Cm --help \*(Ba --usage
+.It Cm --help | --usage
 Print a help message and exit.
 .It Cm --libs
 Return all linker flags required to link against the package.
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index e8e9850b109..0f94c15c97f 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: printf.1,v 1.28 2014/10/22 21:00:05 schwarze Exp $
+.\"	$OpenBSD: printf.1,v 1.29 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	from: @(#)printf.1	5.11 (Berkeley) 7/24/91
 .\"
-.Dd $Mdocdate: October 22 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt PRINTF 1
 .Os
 .Sh NAME
@@ -251,7 +251,7 @@ The
 .Ar argument
 is printed in the style
 .Sm off
-.Pf [\-]d Cm \&. No ddd Cm e No \*(Pmdd
+.Pf [\-]d Cm \&. No ddd Cm e No \(+-dd
 .Sm on
 where there
 is one digit before the decimal point and the number after is equal to
@@ -300,7 +300,7 @@ The
 .Ar argument
 is printed in style
 .Sm off
-.Pf [\-]0xh Cm \&. No hhh Cm p No [\*(Pm]d
+.Pf [\-]0xh Cm \&. No hhh Cm p No [\(+-]d
 .Sm on
 where there is one digit before the hexadecimal point and the number
 after is equal to the precision specification for the argument.
diff --git a/usr.bin/sdiff/sdiff.1 b/usr.bin/sdiff/sdiff.1
index 9699ff77ec2..b301b4cf77c 100644
--- a/usr.bin/sdiff/sdiff.1
+++ b/usr.bin/sdiff/sdiff.1
@@ -1,9 +1,9 @@
-.\" $OpenBSD: sdiff.1,v 1.17 2013/07/16 00:07:52 schwarze Exp $
+.\" $OpenBSD: sdiff.1,v 1.18 2015/02/28 21:51:56 bentley Exp $
 .\"
 .\" Written by Raymond Lai <ray@cyth.net>.
 .\" Public domain.
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt SDIFF 1
 .Os
 .Sh NAME
@@ -22,11 +22,11 @@
 displays two files side by side,
 with any differences between the two highlighted as follows:
 new lines are marked with
-.Sq \*(Gt ;
+.Sq > ;
 deleted lines are marked with
-.Sq \*(Lt ;
+.Sq < ;
 and changed lines are marked with
-.Sq \*(Ba .
+.Sq | .
 .Pp
 .Nm
 can also be used to interactively merge two files,
diff --git a/usr.bin/skeyinfo/skeyinfo.1 b/usr.bin/skeyinfo/skeyinfo.1
index 47bc7f19734..e676caf5610 100644
--- a/usr.bin/skeyinfo/skeyinfo.1
+++ b/usr.bin/skeyinfo/skeyinfo.1
@@ -1,6 +1,6 @@
-.\" $OpenBSD: skeyinfo.1,v 1.10 2014/02/12 16:58:44 schwarze Exp $
+.\" $OpenBSD: skeyinfo.1,v 1.11 2015/02/28 21:51:56 bentley Exp $
 .\"
-.Dd $Mdocdate: February 12 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt SKEYINFO 1
 .Os
 .Sh NAME
@@ -26,7 +26,7 @@ Print the hash algorithm as well.
 directory containing user entries for S/Key
 .El
 .Sh EXAMPLES
-$ skey -n \*(Ltnumber of passwords to print\*(Gt `skeyinfo` \*(Ba lpr
+.Dl $ skey -n <number of passwords to print> `skeyinfo` | lpr
 .Pp
 This would print out a list of S/Key passwords for use over
 an untrusted network (perhaps for use at a conference).
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 8df5d371f70..df7679e54c2 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: split.1,v 1.21 2014/05/27 13:52:30 jmc Exp $
+.\"	$OpenBSD: split.1,v 1.22 2015/02/28 21:51:56 bentley Exp $
 .\"	$NetBSD: split.1,v 1.5 1994/12/21 08:20:35 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)split.1	8.3 (Berkeley) 4/16/94
 .\"
-.Dd $Mdocdate: May 27 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt SPLIT 1
 .Os
 .Sh NAME
@@ -43,10 +43,10 @@
 .Oo
 .Fl b
 .Sm off
-.Ar byte_count Op Cm k \*(Ba m
+.Ar byte_count Op Cm k | m
 .Sm on
-.No \*(Ba Fl l Ar line_count
-.No \*(Ba Fl p Ar pattern
+.No \&| Fl l Ar line_count
+.No \&| Fl p Ar pattern
 .Oc
 .Op Ar file Op Ar name
 .Sh DESCRIPTION
@@ -71,7 +71,7 @@ The default suffix length is 2.
 .Fl b
 .Sm off
 .Ar byte_count
-.Op Cm k \*(Ba m
+.Op Cm k | m
 .Sm on
 .Xc
 Create files
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 82f91acd00c..3d287fb5379 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: systat.1,v 1.99 2014/10/24 10:18:50 schwarze Exp $
+.\"	$OpenBSD: systat.1,v 1.100 2015/02/28 21:51:57 bentley Exp $
 .\"	$NetBSD: systat.1,v 1.6 1996/05/10 23:16:39 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
 .\"
-.Dd $Mdocdate: October 24 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt SYSTAT 1
 .Os
 .Sh NAME
@@ -186,26 +186,26 @@ Quit
 Reverse the selected ordering if supported by the view.
 .It Ic \&,
 Print numbers with thousand separators, where applicable.
-.It Ic ^A \*(Ba Aq Ic Home
+.It Ic ^A | Aq Ic Home
 Jump to the beginning of the current view.
-.It Ic ^B \*(Ba Aq Ic right arrow
+.It Ic ^B | Aq Ic right arrow
 Select the previous view.
-.It Ic ^E \*(Ba Aq Ic End
+.It Ic ^E | Aq Ic End
 Jump to the end of the current view.
-.It Ic ^F \*(Ba Aq Ic left arrow
+.It Ic ^F | Aq Ic left arrow
 Select the next view.
 .It Ic ^G
 Print the name of the current
 view being shown and the refresh interval.
 .It Ic ^L
 Refresh the screen.
-.It Ic ^N \*(Ba Aq Ic down arrow
+.It Ic ^N | Aq Ic down arrow
 Scroll current view down by one line.
-.It Ic ^P \*(Ba Aq Ic up arrow
+.It Ic ^P | Aq Ic up arrow
 Scroll current view up by one line.
-.It Ic ^V \*(Ba Aq Ic Page Down
+.It Ic ^V | Aq Ic Page Down
 Scroll current view down by one page.
-.It Ic Alt-V \*(Ba Aq Ic Page Up
+.It Ic Alt-V | Aq Ic Page Up
 Scroll current view up by one page.
 .It Ic ^Z
 Suspend
@@ -257,8 +257,8 @@ The
 column has the format
 .Sm off
 .Xo
-.Cm up \*(Ba dn
-.Bq : Cm U \*(Ba D .
+.Cm up | dn
+.Bq : Cm U | D .
 .Xc
 .Sm on
 .Sq up
@@ -329,7 +329,7 @@ Display network addresses numerically.
 .It Cm reset
 Reset matching mechanisms to the default.
 .\".It Cm show Oo
-.\".Ar protocols \*(Ba ports \*(Ba hosts
+.\".Ar protocols | ports | hosts
 .\".Oc
 .\"Show, on the command line, the currently selected protocols,
 .\"hosts, and ports.
@@ -338,7 +338,7 @@ Reset matching mechanisms to the default.
 .\"If an argument is supplied to
 .\".Cm show ,
 .\"then only the requested information will be displayed.
-.It Cm tcp \*(Ba udp
+.It Cm tcp | udp
 Display only network connections using the indicated protocol.
 .El
 .It Ic nfsclient
@@ -450,11 +450,11 @@ and swapped out but desiring to run
 Below the queue length listing is a numerical listing and
 a bar graph showing the amount of
 interrupt (shown as
-.Ql \*(Ba ) ,
+.Ql | ) ,
 system (shown as
 .Ql = ) ,
 user (shown as
-.Ql \*(Gt ) ,
+.Ql > ) ,
 nice (shown as
 .Ql - ) ,
 and idle time (shown as
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 470dc4bf9f6..af3579cde29 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tail.1,v 1.20 2014/06/03 19:27:31 guenther Exp $
+.\"	$OpenBSD: tail.1,v 1.21 2015/02/28 21:51:57 bentley Exp $
 .\"	$NetBSD: tail.1,v 1.4 1994/11/23 07:42:13 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)tail.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: June 3 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt TAIL 1
 .Os
 .Sh NAME
@@ -101,7 +101,7 @@ The
 option is ignored if there are no
 .Fa file
 arguments and the standard input is a pipe or a FIFO.
-.It Fl n Ar number \*(Ba Fl Ns Ar number
+.It Fl n Ar number | Fl Ns Ar number
 The location is
 .Ar number
 lines.
diff --git a/usr.bin/top/top.1 b/usr.bin/top/top.1
index 89be4dc2367..77cd7dd7b3b 100644
--- a/usr.bin/top/top.1
+++ b/usr.bin/top/top.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: top.1,v 1.64 2014/09/17 02:20:07 dlg Exp $
+.\"	$OpenBSD: top.1,v 1.65 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 17 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt TOP 1
 .Os
 .Sh NAME
@@ -265,7 +265,7 @@ are recognized, and a newline terminates the input.
 .Pp
 These commands are currently recognized (^L refers to control-L):
 .Bl -tag -width XxXXXX
-.It h \*(Ba \&?
+.It h | \&?
 Display a summary of the commands (help screen).
 .It ^L
 Redraw the screen.
@@ -310,7 +310,7 @@ in their command name.
 shows all processes.
 .It H
 Toggle the display of process threads.
-.It I \*(Ba i
+.It I | i
 Toggle the display of idle processes.
 .It Xo k
 .Op - Ns Ar sig
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 54861b59ec7..86b9b8291a2 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tr.1,v 1.24 2014/12/09 15:37:14 schwarze Exp $
+.\"	$OpenBSD: tr.1,v 1.25 2015/02/28 21:51:57 bentley Exp $
 .\"	$NetBSD: tr.1,v 1.5 1994/12/07 08:35:13 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)tr.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: December 9 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt TR 1
 .Os
 .Sh NAME
@@ -271,15 +271,15 @@ The following examples are shown as given to the shell:
 Create a list of the words in file1, one per line, where a word is taken to
 be a maximal string of letters.
 .Pp
-.Dl $ tr -cs \*q[:alpha:]\*q \*q\en\*q < file1
+.Dl $ tr -cs Qo [:alpha:] Qc Qo \en Qc < file1
 .Pp
 Translate the contents of file1 to upper-case.
 .Pp
-.Dl $ tr \*q[:lower:]\*q \*q[:upper:]\*q < file1
+.Dl $ tr Qo [:lower:] Qc Qo [:upper:] Qc < file1
 .Pp
 Strip out non-printable characters from file1.
 .Pp
-.Dl $ tr -cd \*q[:print:]\*q < file1
+.Dl $ tr -cd Qo [:print:] Qc < file1
 .Sh SEE ALSO
 .Xr sed 1
 .Sh STANDARDS
diff --git a/usr.bin/vi/docs/USD.doc/vi.man/vi.1 b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
index 9abe4f78a17..d7943f0d5c0 100644
--- a/usr.bin/vi/docs/USD.doc/vi.man/vi.1
+++ b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.1,v 1.56 2012/01/17 08:18:36 jmc Exp $
+.\"	$OpenBSD: vi.1,v 1.57 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -14,7 +14,7 @@
 .\"
 .\"     @(#)vi.1	8.51 (Berkeley) 10/10/96
 .\"
-.Dd $Mdocdate: January 17 2012 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt VI 1
 .Os
 .Sh NAME
@@ -2053,7 +2053,7 @@ The
 .Ar replace
 field may contain any of the following sequences:
 .Bl -tag -width Ds
-.It Sq \*(Am
+.It Sq &
 The text matched by
 .Ar pattern .
 .It Sq \(a~
@@ -2735,7 +2735,7 @@ The
 and
 .Nm vi
 utilities exit 0 on success,
-and \*(Gt0 if an error occurs.
+and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr ctags 1 ,
 .Xr re_format 7
diff --git a/usr.sbin/bgpd/bgpd.conf.5 b/usr.sbin/bgpd/bgpd.conf.5
index 7287b1d3d65..ae43851824e 100644
--- a/usr.sbin/bgpd/bgpd.conf.5
+++ b/usr.sbin/bgpd/bgpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpd.conf.5,v 1.132 2014/11/10 20:48:33 miod Exp $
+.\" $OpenBSD: bgpd.conf.5,v 1.133 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
 .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -16,7 +16,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: November 10 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt BGPD.CONF 5
 .Os
 .Sh NAME
@@ -579,8 +579,7 @@ There are several neighbor properties:
 .It Xo
 .Ic announce
 .Sm off
-.Po Ic all \*(Ba none \*(Ba
-.Ic self \*(Ba default-route Pc
+.Pq Ic all | none | self | default-route
 .Sm on
 .Xc
 If set to
@@ -1402,9 +1401,7 @@ otherwise it will be set to
 .It Xo
 .Ic origin
 .Sm off
-.Po Ic igp \*(Ba
-.Ic egp \*(Ba
-.Ic incomplete Pc
+.Pq Ic igp | egp | incomplete
 .Sm on
 .Xc
 Set the
@@ -1416,11 +1413,7 @@ or being an aggregated route.
 .It Xo
 .Ic nexthop
 .Sm off
-.Po Ar address \*(Ba
-.Ic blackhole \*(Ba
-.Ic reject \*(Ba
-.Ic self \*(Ba
-.Ic no-modify Pc
+.Pq Ar address | Ic blackhole | reject | self | no-modify
 .Sm on
 .Xc
 Set the
diff --git a/usr.sbin/ikectl/ikectl.8 b/usr.sbin/ikectl/ikectl.8
index 423e5ff1c90..278fc462b1e 100644
--- a/usr.sbin/ikectl/ikectl.8
+++ b/usr.sbin/ikectl/ikectl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ikectl.8,v 1.21 2013/07/16 11:13:33 schwarze Exp $
+.\" $OpenBSD: ikectl.8,v 1.22 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 2007-2013 Reyk Floeter <reyk@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt IKECTL 8
 .Os
 .Sh NAME
@@ -149,7 +149,7 @@ as the currently active CA or into the specified
 .It Xo
 .Cm ca Ar name Cm certificate Ar host
 .Cm create
-.Op Ic server \*(Ba client
+.Op Ic server | client
 .Xc
 Create a private key and certificate for
 .Ar host
diff --git a/usr.sbin/tcpdump/tcpdump.8 b/usr.sbin/tcpdump/tcpdump.8
index cbe04a58f14..fa1f194674d 100644
--- a/usr.sbin/tcpdump/tcpdump.8
+++ b/usr.sbin/tcpdump/tcpdump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpdump.8,v 1.83 2014/06/03 02:57:29 lteo Exp $
+.\"	$OpenBSD: tcpdump.8,v 1.84 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996
 .\"	The Regents of the University of California.  All rights reserved.
@@ -19,7 +19,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: June 3 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt TCPDUMP 8
 .Os
 .Sh NAME
@@ -203,7 +203,7 @@ but may truncate protocol information from name server and NFS packets
 Packets truncated because of a limited
 .Ar snaplen
 are indicated in the output with
-.Dq Op \*(Ba Ns Em proto ,
+.Dq Op | Ns Em proto ,
 where
 .Em proto
 is the name of the protocol level at which the truncation has occurred.
@@ -1485,7 +1485,7 @@ Other flag characters that might appear are
 .Em not
 set)
 and
-.Sq \*(Ba
+.Sq |
 .Pq truncated message, TC, set .
 If the question section doesn't contain exactly one entry,
 .Dq Bq Ar n Ns q