no need to escape |, pointed out by jmc@

"it's worth killing, if just to stop it being copied all over the place"

7 files changed, 68 insertions, 68 deletions

diff --git a/usr.sbin/bgpd/bgpd.conf.5 b/usr.sbin/bgpd/bgpd.conf.5
index 16245704a9f..58e40feea65 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.113 2010/10/23 16:44:56 sthen Exp $
+.\" $OpenBSD: bgpd.conf.5,v 1.114 2011/04/30 07:52:33 sthen 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: October 23 2010 $
+.Dd $Mdocdate: April 30 2011 $
 .Dt BGPD.CONF 5
 .Os
 .Sh NAME
@@ -145,13 +145,13 @@ The default is 120 seconds.
 .It Xo
 .Ic dump
 .Op Ic rib Ar name
-.Pq Ic table Ns \&| Ns Ic table-mp
+.Pq Ic table Ns | Ns Ic table-mp
 .Ar file Op Ar timeout
 .Xc
 .It Xo
 .Ic dump
-.Pq Ic all Ns \&| Ns Ic updates
-.Pq Ic in Ns \&| Ns Ic out
+.Pq Ic all Ns | Ns Ic updates
+.Pq Ic in Ns | Ns Ic out
 .Ar file Op Ar timeout
 .Xc
 Dump the RIB, a.k.a. the
@@ -197,7 +197,7 @@ dump updates out "/tmp/updates-out-%H%M" 300
 .Pp
 .It Xo
 .Ic fib-update
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic no ,
@@ -244,12 +244,12 @@ Log received and sent updates.
 .Xc
 .It Xo
 .Ic network
-.Pq Ic inet Ns \&| Ns Ic inet6
+.Pq Ic inet Ns | Ns Ic inet6
 .Ic static Op Ic set ...\&
 .Xc
 .It Xo
 .Ic network
-.Pq Ic inet Ns \&| Ns Ic inet6
+.Pq Ic inet Ns | Ns Ic inet6
 .Ic connected Op Ic set ...\&
 .Xc
 Announce the specified network as belonging to our AS.
@@ -280,7 +280,7 @@ section.
 .Ic nexthop
 .Ic qualify
 .Ic via
-.Pq Ic bgp Ns \&| Ns Ic default
+.Pq Ic bgp Ns | Ns Ic default
 .Xc
 If set to
 .Ic bgp ,
@@ -297,7 +297,7 @@ daemons like
 .Ic rde
 .Ic med
 .Ic compare
-.Pq Ic always Ns \&| Ns Ic strict
+.Pq Ic always Ns | Ns Ic strict
 .Xc
 If set to
 .Ic always ,
@@ -339,7 +339,7 @@ are created automatically and used as default.
 .It Xo
 .Ic rde
 .Ic route-age
-.Pq Ic ignore Ns \&| Ns Ic evaluate
+.Pq Ic ignore Ns | Ns Ic evaluate
 .Xc
 If set to
 .Ic evaluate ,
@@ -352,7 +352,7 @@ The default is
 .Pp
 .It Xo
 .Ic route-collector
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic yes ,
@@ -391,7 +391,7 @@ By default /var/run/bgpd.sock is used and no restricted socket is created.
 .Pp
 .It Xo
 .Ic transparent-as
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic yes ,
@@ -450,7 +450,7 @@ for best compatibility with other implementations.
 .Pp
 .It Xo
 .Ic fib-update
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic no ,
@@ -599,8 +599,8 @@ The default for IBGP peers is
 .Pp
 .It Xo
 .Ic announce
-.Pq Ic IPv4 Ns \&| Ns Ic IPv6
-.Pq Ic none Ns \&| Ns Ic unicast Ns \&| Ns Ic vpn
+.Pq Ic IPv4 Ns | Ns Ic IPv6
+.Pq Ic none Ns | Ns Ic unicast Ns | Ns Ic vpn
 .Xc
 For the given address family, control which subsequent address families
 (at the moment, only
@@ -616,7 +616,7 @@ announced and processed.
 .Pp
 .It Xo
 .Ic announce as-4byte
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic no ,
@@ -627,7 +627,7 @@ The default is
 .Pp
 .It Xo
 .Ic announce capabilities
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic no ,
@@ -638,7 +638,7 @@ The default is
 .Pp
 .It Xo
 .Ic announce refresh
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic no ,
@@ -648,7 +648,7 @@ The default is
 .Pp
 .It Xo
 .Ic announce restart
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic yes ,
@@ -714,8 +714,8 @@ Do not start the session when bgpd comes up but stay in
 .Pp
 .It Xo
 .Ic dump
-.Pq Ic all Ns \&| Ns Ic updates
-.Pq Ic in Ns \&| Ns Ic out
+.Pq Ic all Ns | Ns Ic updates
+.Pq Ic in Ns | Ns Ic out
 .Ar file Op Ar timeout
 .Xc
 Do a peer specific MRT dump.
@@ -730,7 +730,7 @@ section in
 .Pp
 .It Xo
 .Ic enforce neighbor-as
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic yes ,
@@ -757,8 +757,8 @@ Inherited from the global configuration if not given.
 .Pp
 .It Xo
 .Ic ipsec
-.Pq Ic ah Ns \&| Ns Ic esp
-.Pq Ic in Ns \&| Ns Ic out
+.Pq Ic ah Ns | Ns Ic esp
+.Pq Ic in Ns | Ns Ic out
 .Ic spi Ar spi-number authspec Op Ar encspec
 .Xc
 Enable IPsec with static keying.
@@ -793,7 +793,7 @@ Keys must be given in hexadecimal format.
 .Pp
 .It Xo
 .Ic ipsec
-.Pq Ic ah Ns \&| Ns Ic esp
+.Pq Ic ah Ns | Ns Ic esp
 .Ic ike
 .Xc
 Enable IPsec with dynamic keying.
@@ -898,8 +898,8 @@ These sets are rewritten into filter rules and can be viewed with
 .Pp
 .It Xo
 .Ic softreconfig
-.Pq Ic in Ns \&| Ns Ic out
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic in Ns | Ns Ic out
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 Turn soft reconfiguration on or off for the specified direction.
 If soft reconfiguration is turned on, filter changes will be applied on
@@ -926,7 +926,7 @@ tcp md5sig key deadbeef
 .Pp
 .It Xo
 .Ic transparent-as
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic yes ,
@@ -938,7 +938,7 @@ setting.
 .Pp
 .It Xo
 .Ic ttl-security
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 Enable or disable ttl-security.
 When enabled,
@@ -1112,7 +1112,7 @@ See also the
 section for further information about the encoding.
 .Pp
 .It Xo
-.Pq Ic from Ns \&| Ns Ic to
+.Pq Ic from Ns | Ns Ic to
 .Ar peer
 .Xc
 This rule applies only to
@@ -1140,7 +1140,7 @@ if enclosed in curly brackets:
 deny from { 128.251.16.1, 251.128.16.2, group hojo }
 .Ed
 .Pp
-.It Pq Ic inet Ns \&| Ns Ic inet6
+.It Pq Ic inet Ns | Ns Ic inet6
 This rule applies only to routes matching the stated address family.
 The address family needs to be set only in rules that use
 .Ic prefixlen
diff --git a/usr.sbin/dvmrpd/dvmrpd.conf.5 b/usr.sbin/dvmrpd/dvmrpd.conf.5
index a357f559cb5..df35f2b4ddd 100644
--- a/usr.sbin/dvmrpd/dvmrpd.conf.5
+++ b/usr.sbin/dvmrpd/dvmrpd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dvmrpd.conf.5,v 1.6 2008/01/31 20:00:08 jmc Exp $
+.\"	$OpenBSD: dvmrpd.conf.5,v 1.7 2011/04/30 07:52:33 sthen Exp $
 .\"
 .\" Copyright (c) 2005, 2006 Esben Norby <norby@openbsd.org>
 .\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
@@ -17,7 +17,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 31 2008 $
+.Dd $Mdocdate: April 30 2011 $
 .Dt DVMRPD.CONF 5
 .Os
 .Sh NAME
@@ -73,7 +73,7 @@ The only settings that can be set globally and not overruled are listed below.
 .Bl -tag -width Ds
 .It Xo
 .Ic mfc-update
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic yes ,
diff --git a/usr.sbin/ldpd/ldpd.conf.5 b/usr.sbin/ldpd/ldpd.conf.5
index 1da09bc756c..d5866a2eac9 100644
--- a/usr.sbin/ldpd/ldpd.conf.5
+++ b/usr.sbin/ldpd/ldpd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ldpd.conf.5,v 1.5 2010/09/01 13:54:54 claudio Exp $
+.\"	$OpenBSD: ldpd.conf.5,v 1.6 2011/04/30 07:52:33 sthen Exp $
 .\"
 .\" Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
 .\" Copyright (c) 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -18,7 +18,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: September 1 2010 $
+.Dd $Mdocdate: April 30 2011 $
 .Dt LDPD.CONF 5
 .Os
 .Sh NAME
@@ -67,7 +67,7 @@ Global settings concerns the main behaviour of the daemon.
 .Bl -tag -width Ds -compact
 .It Xo
 .Ic fib-update
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic no ,
@@ -101,7 +101,7 @@ The default value is 180; valid range is 1\-65535.
 .Pp
 .It Xo
 .Ic distribution
-.Pq Ic independent Ns \&| Ns Ic ordered
+.Pq Ic independent Ns | Ns Ic ordered
 .Xc
 Select the distribution mode.
 .Ic independent
@@ -113,7 +113,7 @@ to wait a mapping from nexthop before distributing it to peers.
 .Pp
 .It Xo
 .Ic retention
-.Pq Ic liberal Ns \&| Ns Ic conservative
+.Pq Ic liberal Ns | Ns Ic conservative
 .Xc
 Select the retention mode.
 .Ic conservative
@@ -124,7 +124,7 @@ from nexthops.
 .Pp
 .It Xo
 .Ic advertisement
-.Pq Ic unsolicited Ns \&| Ns Ic ondemand
+.Pq Ic unsolicited Ns | Ns Ic ondemand
 .Xc
 Select the advertisement mode.
 .Ic unsolicited
diff --git a/usr.sbin/ospf6d/ospf6d.conf.5 b/usr.sbin/ospf6d/ospf6d.conf.5
index b741553146c..fd2838464bd 100644
--- a/usr.sbin/ospf6d/ospf6d.conf.5
+++ b/usr.sbin/ospf6d/ospf6d.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospf6d.conf.5,v 1.7 2010/05/17 17:47:47 jmc Exp $
+.\"	$OpenBSD: ospf6d.conf.5,v 1.8 2011/04/30 07:52:33 sthen Exp $
 .\"
 .\" Copyright (c) 2005 Esben Norby <norby@openbsd.org>
 .\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
@@ -17,7 +17,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: May 17 2010 $
+.Dd $Mdocdate: April 30 2011 $
 .Dt OSPF6D.CONF 5
 .Os
 .Sh NAME
@@ -75,7 +75,7 @@ The only settings that can be set globally and not overruled are listed below.
 .Bl -tag -width Ds -compact
 .It Xo
 .Ic fib-update
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic \&no ,
@@ -95,7 +95,7 @@ option to ensure that no traffic tries to transit via this router.
 .Op Ic no
 .Ic redistribute
 .Sm off
-.Po Ic static Ns \&| Ns Ic connected Ns \&| Ns
+.Po Ic static Ns | Ns Ic connected Ns | Ns
 .Ic default Pc
 .Sm on
 .Op Ic set ...\&
@@ -183,7 +183,7 @@ The default value is 5 seconds; the valid range is 1\-5 seconds.
 .Pp
 .It Xo
 .Ic stub Ic router
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic yes ,
diff --git a/usr.sbin/ospfd/ospfd.conf.5 b/usr.sbin/ospfd/ospfd.conf.5
index bea93f09c8d..3e48681660e 100644
--- a/usr.sbin/ospfd/ospfd.conf.5
+++ b/usr.sbin/ospfd/ospfd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospfd.conf.5,v 1.44 2011/02/02 23:27:51 sthen Exp $
+.\"	$OpenBSD: ospfd.conf.5,v 1.45 2011/04/30 07:52:33 sthen Exp $
 .\"
 .\" Copyright (c) 2005 Esben Norby <norby@openbsd.org>
 .\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
@@ -17,7 +17,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: February 2 2011 $
+.Dd $Mdocdate: April 30 2011 $
 .Dt OSPFD.CONF 5
 .Os
 .Sh NAME
@@ -82,7 +82,7 @@ The only settings that can be set globally and not overruled are listed below.
 .Bl -tag -width Ds -compact
 .It Xo
 .Ic fib-update
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic \&no ,
@@ -108,7 +108,7 @@ Table 0 is the default table.
 .Op Ic no
 .Ic redistribute
 .Sm off
-.Po Ic static Ns \&| Ns Ic connected Ns \&| Ns
+.Po Ic static Ns | Ns Ic connected Ns | Ns
 .Ic default Pc
 .Sm on
 .Op Ic set ...
@@ -170,7 +170,7 @@ redistribute static set { metric 300 type 2 }
 .Pp
 .It Xo
 .Ic rfc1583compat
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic yes ,
@@ -189,7 +189,7 @@ AS-external OSPF LSAs.
 .Pp
 .It Xo
 .Ic spf-delay
-.Po Ar seconds Ns \&| Ns
+.Po Ar seconds Ns | Ns
 .Ic msec Ar milliseconds Pc
 .Xc
 Set the SPF delay.
@@ -199,7 +199,7 @@ The default value is 1 second; valid range is 10 milliseconds\-10 seconds.
 .Pp
 .It Xo
 .Ic spf-holdtime
-.Po Ar seconds Ns \&| Ns
+.Po Ar seconds Ns | Ns
 .Ic msec Ar milliseconds Pc
 .Xc
 Set the SPF holdtime.
@@ -209,7 +209,7 @@ The default value is 5 seconds; the valid range is 10 milliseconds\-5 seconds.
 .Pp
 .It Xo
 .Ic stub Ic router
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic yes ,
@@ -325,8 +325,8 @@ The default key-id is 1.
 While key-id 0 is valid, it is unavailable on various other implementations.
 .It Xo
 .Ic auth-type
-.Po Ic none Ns \&| Ns
-.Ic simple Ns \&| Ns Ic crypt Pc
+.Po Ic none Ns | Ns
+.Ic simple Ns | Ns Ic crypt Pc
 .Xc
 Set the authentication type.
 The default is
@@ -360,7 +360,7 @@ Set retransmit interval.
 The default value is 5 seconds; valid range is 5\-3600 seconds.
 .It Xo
 .Ic router-dead-time
-.Po Ar seconds Ns \&| Ns Ic minimal Pc
+.Po Ar seconds Ns | Ns Ic minimal Pc
 .Xc
 Set the router dead time, a.k.a. neighbor inactivity timer.
 The default value is 40 seconds; valid range is 2\-2147483647 seconds.
diff --git a/usr.sbin/relayd/relayd.conf.5 b/usr.sbin/relayd/relayd.conf.5
index 06521e22de9..1f2ae29d828 100644
--- a/usr.sbin/relayd/relayd.conf.5
+++ b/usr.sbin/relayd/relayd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: relayd.conf.5,v 1.119 2011/04/12 12:37:22 reyk Exp $
+.\"	$OpenBSD: relayd.conf.5,v 1.120 2011/04/30 07:52:33 sthen Exp $
 .\"
 .\" Copyright (c) 2006, 2007 Reyk Floeter <reyk@openbsd.org>
 .\" Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@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: April 12 2011 $
+.Dd $Mdocdate: April 30 2011 $
 .Dt RELAYD.CONF 5
 .Os
 .Sh NAME
@@ -127,7 +127,7 @@ Set the interval in seconds at which the hosts will be checked.
 The default interval is 10 seconds.
 .It Xo
 .Ic log
-.Pq Ic updates Ns \&| Ns Ic all
+.Pq Ic updates Ns | Ns Ic all
 .Xc
 Log state notifications after completed host checks.
 Either only log the
diff --git a/usr.sbin/ripd/ripd.conf.5 b/usr.sbin/ripd/ripd.conf.5
index 63ab1878f82..e584704e752 100644
--- a/usr.sbin/ripd/ripd.conf.5
+++ b/usr.sbin/ripd/ripd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ripd.conf.5,v 1.12 2010/01/02 19:44:53 schwarze Exp $
+.\"	$OpenBSD: ripd.conf.5,v 1.13 2011/04/30 07:52:33 sthen Exp $
 .\"
 .\" Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
 .\" Copyright (c) 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -18,7 +18,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 2 2010 $
+.Dd $Mdocdate: April 30 2011 $
 .Dt RIPD.CONF 5
 .Os
 .Sh NAME
@@ -68,7 +68,7 @@ Global settings concerns the main behaviour of the daemon.
 .Bl -tag -width Ds -compact
 .It Xo
 .Ic fib-update
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 If set to
 .Ic no ,
@@ -87,7 +87,7 @@ Table 0 is the default table.
 .Op Ic no
 .Ic redistribute
 .Sm off
-.Po Ic static Ns \&| Ns Ic connected Ns \&| Ns
+.Po Ic static Ns | Ns Ic connected Ns | Ns
 .Ic default Pc
 .Sm on
 .Xc
@@ -128,7 +128,7 @@ will force the route to be not announced.
 .It Xo
 .Ic split-horizon
 .Sm off
-.Po Ic simple Ns \&| Ns Ic poisoned Ns \&| Ns
+.Po Ic simple Ns | Ns Ic poisoned Ns | Ns
 .Ic none Pc
 .Sm on
 .Xc
@@ -145,7 +145,7 @@ The default is
 .Pp
 .It Xo
 .Ic triggered-updates
-.Pq Ic yes Ns \&| Ns Ic no
+.Pq Ic yes Ns | Ns Ic no
 .Xc
 Immediately trigger responses when a route changes.
 The default is
@@ -192,8 +192,8 @@ is 0\-255.
 The default key-id is 1.
 .It Xo
 .Ic auth-type
-.Po Ic none Ns \&| Ns
-.Ic simple Ns \&| Ns Ic crypt Pc
+.Po Ic none Ns | Ns
+.Ic simple Ns | Ns Ic crypt Pc
 .Xc
 Set the authentication type.
 The default is