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@

3 files changed, 12 insertions, 19 deletions

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