Don't use greater-equal/less-equal symbols where "<="/">=" are intended.

Also, clean up some usage of predefined strings (which are discouraged by
mandoc_char(7) for portability reasons) and improve spacing in
hostapd.conf(5).

ok schwarze@

3 files changed, 64 insertions, 64 deletions

diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index 4a09e31433a..d116ac2bde0 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pf.conf.5,v 1.543 2015/02/12 01:29:14 henning Exp $
+.\"	$OpenBSD: pf.conf.5,v 1.544 2015/02/16 16:21:25 bentley Exp $
 .\"
 .\" Copyright (c) 2002, Daniel Hartmeier
 .\" Copyright (c) 2003 - 2013 Henning Brauer <henning@openbsd.org>
@@ -28,7 +28,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 12 2015 $
+.Dd $Mdocdate: February 16 2015 $
 .Dt PF.CONF 5
 .Os
 .Sh NAME
@@ -384,17 +384,17 @@ Ports and ranges of ports are specified using these operators:
 .Bd -literal -offset indent
 =	(equal)
 !=	(unequal)
-\*(Lt	(less than)
-\*(Le	(less than or equal)
-\*(Gt	(greater than)
-\*(Ge	(greater than or equal)
+<	(less than)
+<=	(less than or equal)
+>	(greater than)
+>=	(greater than or equal)
 :	(range including boundaries)
-\*(Gt\*(Lt	(range excluding boundaries)
-\*(Lt\*(Gt	(except range)
+><	(range excluding boundaries)
+<>	(except range)
 .Ed
 .Pp
-.Sq \*(Gt\*(Lt ,
-.Sq \*(Lt\*(Gt
+.Sq >< ,
+.Sq <>
 and
 .Sq \&:
 are binary operators (they take two arguments).
@@ -402,15 +402,15 @@ For instance:
 .Bl -tag -width Ds
 .It port 2000:2004
 means
-.Sq all ports \*(Ge 2000 and \*(Le 2004 ,
+.Sq all ports \(>= 2000 and \(<= 2004 ,
 hence ports 2000, 2001, 2002, 2003, and 2004.
-.It port 2000 \*(Gt\*(Lt 2004
+.It port 2000 >< 2004
 means
-.Sq all ports \*(Gt 2000 and \*(Lt 2004 ,
+.Sq all ports > 2000 and < 2004 ,
 hence ports 2001, 2002, and 2003.
-.It port 2000 \*(Lt\*(Gt 2004
+.It port 2000 <> 2004
 means
-.Sq all ports \*(Lt 2000 or \*(Gt 2004 ,
+.Sq all ports < 2000 or > 2004 ,
 hence ports 1\(en1999 and 2005\(en65535.
 .El
 .Pp
@@ -427,9 +427,9 @@ as in the following examples:
 .Bd -literal -offset indent
 pass in all
 pass in from any to any
-pass in proto tcp from any port \*(Lt 1024 to any
+pass in proto tcp from any port < 1024 to any
 pass in proto tcp from any to any port 25
-pass in proto tcp from 10.0.0.0/8 port \*(Ge 1024 \e
+pass in proto tcp from 10.0.0.0/8 port >= 1024 \e
       to ! 10.1.2.3 port != ssh
 pass in proto tcp from any os "OpenBSD"
 pass in proto tcp from route "DTAG"
@@ -600,15 +600,15 @@ For example:
 .Bd -literal -offset indent -compact
 ips = "{ 1.2.3.4, 1.2.3.5 }"
 pass in proto tcp from any to $ips \e
-      port \*(Gt 1023 label "$dstaddr:$dstport"
+      port > 1023 label "$dstaddr:$dstport"
 .Ed
 .Pp
 Expands to:
 .Bd -literal -offset indent -compact
 pass in inet proto tcp from any to 1.2.3.4 \e
-      port \*(Gt 1023 label "1.2.3.4:\*(Gt1023"
+      port > 1023 label "1.2.3.4:>1023"
 pass in inet proto tcp from any to 1.2.3.5 \e
-      port \*(Gt 1023 label "1.2.3.5:\*(Gt1023"
+      port > 1023 label "1.2.3.5:>1023"
 .Ed
 .Pp
 The macro expansion for the
@@ -801,7 +801,7 @@ The following example allows only selected users to open outgoing
 connections:
 .Bd -literal -offset indent
 block out proto tcp all
-pass  out proto tcp from self user { \*(Lt 1000, dhartmei }
+pass  out proto tcp from self user { < 1000, dhartmei }
 .Ed
 .El
 .Ss Translation
@@ -1641,9 +1641,9 @@ which is initially empty.
 A filter rule is set up to block all traffic coming from addresses listed in
 either table:
 .Bd -literal -offset indent
-table \*(Ltprivate\*(Gt const { 10/8, 172.16/12, 192.168/16 }
-table \*(Ltbadhosts\*(Gt persist
-block on fxp0 from { \*(Ltprivate\*(Gt, \*(Ltbadhosts\*(Gt } to any
+table <private> const { 10/8, 172.16/12, 192.168/16 }
+table <badhosts> persist
+block on fxp0 from { <private>, <badhosts> } to any
 .Ed
 .Pp
 The private table cannot have its contents changed and the badhosts table
@@ -1656,8 +1656,8 @@ these hosts can be blocked by using the following:
 A table can also be initialized with an address list specified in one or more
 external files, using the following syntax:
 .Bd -literal -offset indent
-table \*(Ltspam\*(Gt persist file "/etc/spammers" file "/etc/openrelays"
-block on fxp0 from \*(Ltspam\*(Gt to any
+table <spam> persist file "/etc/spammers" file "/etc/openrelays"
+block on fxp0 from <spam> to any
 .Ed
 .Pp
 The files
@@ -2126,9 +2126,9 @@ table and have all states originating from it flushed.
 Any new packets arriving from this host will be dropped unconditionally
 by the block rule.
 .Bd -literal -offset indent
-block quick from \*(Ltbad_hosts\*(Gt
+block quick from <bad_hosts>
 pass in on $ext_if proto tcp to $webserver port www keep state \e
-      (max-src-conn-rate 100/10, overload \*(Ltbad_hosts\*(Gt flush global)
+      (max-src-conn-rate 100/10, overload <bad_hosts> flush global)
 .Ed
 .Sh TRAFFIC NORMALISATION
 Traffic normalisation is a broad umbrella term
@@ -2484,7 +2484,7 @@ In this example,
 we tag incoming packets as they are redirected to spamd(8).
 The tag is used to pass those packets through the packet filter.
 .Bd -literal -offset 4n
-match in on $ext_if inet proto tcp from \*(Ltspammers\*(Gt to port smtp \e
+match in on $ext_if inet proto tcp from <spammers> to port smtp \e
      tag SPAMD rdr-to 127.0.0.1 port spamd
 
 block in on $ext_if
@@ -2664,7 +2664,7 @@ scrubopt       = "no-df" | "min-ttl" number | "max-mss" number |
 antispoof-rule = "antispoof" [ "log" ] [ "quick" ]
                  "for" ifspec [ af ] [ "label" string ]
 
-table-rule     = "table" "\*(Lt" string "\*(Gt" [ tableopts ]
+table-rule     = "table" "<" string ">" [ tableopts ]
 tableopts      = tableopt [ tableopts ]
 tableopt       = "persist" | "const" | "counters" |
                  "file" string | "{" [ tableaddrs ] "}"
@@ -2720,7 +2720,7 @@ hosts          = "all" |
 ipspec         = "any" | host | "{" host-list "}"
 host           = [ "!" ] ( address [ "weight" number ] |
                  address [ "/" mask-bits ] [ "weight" number ] |
-                 "\*(Lt" string "\*(Gt" )
+                 "<" string ">" )
 redirhost      = address [ "/" mask-bits ]
 routehost      = host | host "@" interface-name |
                  "(" interface-name [ address [ "/" mask-bits ] ] ")"
@@ -2737,9 +2737,9 @@ os             = "os"  ( os-name | "{" os-list "}" )
 user           = "user" ( unary-op | binary-op | "{" op-list "}" )
 group          = "group" ( unary-op | binary-op | "{" op-list "}" )
 
-unary-op       = [ "=" | "!=" | "\*(Lt" | "\*(Le" | "\*(Gt" | "\*(Ge" ]
+unary-op       = [ "=" | "!=" | "<" | "<=" | ">" | ">=" ]
                  ( name | number )
-binary-op      = number ( "\*(Lt\*(Gt" | "\*(Gt\*(Lt" | ":" ) number
+binary-op      = number ( "<>" | "><" | ":" ) number
 op-list        = ( unary-op | binary-op ) [ [ "," ] op-list ]
 
 os-name        = operating-system-name
@@ -2764,7 +2764,7 @@ state-opt      = ( "max" number | "no-sync" | timeout | "sloppy" |
                  "max-src-nodes" number | "max-src-states" number |
                  "max-src-conn" number |
                  "max-src-conn-rate" number "/" number |
-                 "overload" "\*(Lt" string "\*(Gt" [ "flush" [ "global" ] ] |
+                 "overload" "<" string ">" [ "flush" [ "global" ] ] |
                  "if-bound" | "floating" )
 
 timeout-list   = timeout [ [ "," ] timeout-list ]
diff --git a/usr.sbin/hostapd/hostapd.conf.5 b/usr.sbin/hostapd/hostapd.conf.5
index ca1820902bf..de7de65c4e7 100644
--- a/usr.sbin/hostapd/hostapd.conf.5
+++ b/usr.sbin/hostapd/hostapd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hostapd.conf.5,v 1.43 2014/08/05 16:35:37 reyk Exp $
+.\" $OpenBSD: hostapd.conf.5,v 1.44 2015/02/16 16:21:25 bentley Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2006 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: August 5 2014 $
+.Dd $Mdocdate: February 16 2015 $
 .Dt HOSTAPD.CONF 5
 .Os
 .Sh NAME
@@ -125,8 +125,8 @@ The following configuration settings are understood:
 .Bl -tag -width Ds
 .It Xo
 .Ic set hostap interface
-.Ar interface \*(Ba\ \&
-.Pf { Ar interface0 , interface1 , ... No }
+.Ar interface |
+.Brq Ar interface0 , interface1 , ...
 .Xc
 Specify the wireless interface running in Host AP mode.
 This option could be omitted to use
@@ -149,8 +149,8 @@ Capture plain IEEE 802.11 frames.
 .El
 .It Xo
 .Ic set hostap hopper interface
-.Ar interface \*(Ba\ \&
-.Pf { Ar interface0 , interface1 , ... No }
+.Ar interface |
+.Brq Ar interface0 , interface1 , ...
 .Xc
 Enable a channel hopper on the selected wireless interface.
 Multiple hostap interfaces may be specified as a comma-separated list,
@@ -166,17 +166,17 @@ network because there is no authentication and an attacker could force
 disassociation of selected stations on all listening access points.
 .It Xo
 .Ic set iapp
-.Op Ic address \*(Ba\ route
+.Op Ic address | route
 .Ic roaming table
-.Aq Ar table
+.Pf < Ar table Ns >
 .Xc
 Specify a table used for
 .Em IP Roaming
 lookups of link layer address to IP address or subnet assignments.
 .It Xo
 .Ic set iapp handle subtype
-.Ar subtype \*(Ba\ \&
-.Pf { Ar subtype0 , subtype1 , ... No }
+.Ar subtype |
+.Brq Ar subtype0 , subtype1 , ...
 .Xc
 Specify the IAPP subtypes to use:
 .Pp
@@ -199,7 +199,7 @@ messages.
 This option is enabled by default.
 .It Xo
 .Op Ic not
-.Op Ic address \*(Ba\ route
+.Op Ic address |\ route
 .Ic roaming
 .Xc
 Enable dynamic roaming of IP addresses or routes.
@@ -397,7 +397,7 @@ Match the signal quality of the received frame.
 .It Xo
 .Ic freq
 .Op Ic operator
-.Ar value Ic ( GHz \*(Ba MHz )
+.Ar value Ic ( GHz | MHz )
 .Xc
 Match the transmit rate of the received frame.
 .It Xo
@@ -414,10 +414,10 @@ If omitted, the specified value will be checked if it is equal or not.
 .Bd -literal -offset indent
 =	(equal)
 !=	(not equal)
-\*(Lt	(less than)
-\*(Le	(less than or equal)
-\*(Gt	(greater than)
-\*(Ge	(greater than or equal)
+<	(less than)
+<=	(less than or equal)
+>	(greater than)
+>=	(greater than or equal)
 .Ed
 .Pp
 The
@@ -428,22 +428,22 @@ parameters specify the IEEE 802.11 address fields to match on.
 They can be specified in the following ways:
 .Bl -tag -width Ds
 .It Xo
-.Ic ( from \*(Ba to \*(Ba bssid ) Ic any
+.Ic ( from | to | bssid ) Ic any
 .Xc
 Allow all addresses for the specified address field.
 .It Xo
-.Ic ( from \*(Ba to \*(Ba bssid )
+.Ic ( from | to | bssid )
 .Op Ic not
-.Aq Ar table
+.Pf < Ar table Ns >
 .Xc
 Allow allow addresses from the given
-.Aq Ar table
+.Ar table
 (see
 .Sx Tables
 above)
 for the specified address field.
 .It Xo
-.Ic ( from \*(Ba to \*(Ba bssid )
+.Ic ( from | to | bssid )
 .Op Ic not
 .Ar lladdr
 .Xc
@@ -565,7 +565,7 @@ keyword:
 .Bd -filled -offset indent
 .Ic limit
 .Ar number
-.Ic sec \*(Ba usec
+.Ic sec | usec
 .Ed
 .Pp
 In some cases it is absolutely necessary to use limited matching
@@ -625,7 +625,7 @@ An association response frame.
 .It Ic subtype atim
 An announcement traffic indication message (ATIM frame).
 .It Xo
-.Ic subtype auth Op Ic open request \*(Ba response
+.Ic subtype auth Op Ic open request | response
 .Xc
 An authentication frame.
 .It Ic subtype probe request
diff --git a/usr.sbin/zic/zic.8 b/usr.sbin/zic/zic.8
index 62ea488d0a0..7e01722f4bf 100644
--- a/usr.sbin/zic/zic.8
+++ b/usr.sbin/zic/zic.8
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: zic.8,v 1.1 2015/02/09 12:37:47 tedu Exp $
-.Dd $Mdocdate: February 9 2015 $
+.\"	$OpenBSD: zic.8,v 1.2 2015/02/16 16:21:25 bentley Exp $
+.Dd $Mdocdate: February 16 2015 $
 .Dt ZIC 8
 .Os
 .Sh NAME
@@ -154,9 +154,9 @@ the fifth of the month
 the last Sunday in the month
 .It lastMon
 the last Monday in the month
-.It Sun\*(Ge8
+.It Sun>=8
 first Sunday on or after the eighth
-.It Sun\*(Le25
+.It Sun<=25
 last Sunday on or before the 25th
 .El
 .Pp
@@ -370,10 +370,10 @@ input, intended to illustrate many of its features.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Swiss	1940	only	-	Nov	2	0:00	1:00	S
 Rule	Swiss	1940	only	-	Dec	31	0:00	0	-
-Rule	Swiss	1941	1942	-	May	Sun\*(Ge1	2:00	1:00	S
-Rule	Swiss	1941	1942	-	Oct	Sun\*(Ge1	0:00	0
+Rule	Swiss	1941	1942	-	May	Sun>=1	2:00	1:00	S
+Rule	Swiss	1941	1942	-	Oct	Sun>=1	0:00	0
 
-Rule	EU	1977	1980	-	Apr	Sun\*(Ge1	1:00u	1:00	S
+Rule	EU	1977	1980	-	Apr	Sun>=1	1:00u	1:00	S
 Rule	EU	1977	only	-	Sep	lastSun	1:00u	0	-
 Rule	EU	1978	only	-	Oct	 1	1:00u	0	-
 Rule	EU	1979	1995	-	Sep	lastSun	1:00u	0	-