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@

8 files changed, 35 insertions, 35 deletions

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.