Module Name:    src
Committed By:   wiz
Date:           Mon Jul  3 21:32:51 UTC 2017

Modified Files:
        src/lib/libarch/i386: i386_get_ldt.2 i386_vm86.2
        src/lib/libbluetooth: bluetooth.3 sdp_data.3
        src/lib/libc/gen: directory.3 err.3 getdevmajor.3 glob.3 randomid.3
            setmode.3 shquote.3 stringlist.3 sysctl.3 syslog.3 unvis.3
            wordexp.3
        src/lib/libc/hash/rmd160: rmd160.3
        src/lib/libc/hash/sha1: sha1.3
        src/lib/libc/hash/sha2: sha2.3
        src/lib/libc/inet: inet6_rthdr_space.3
        src/lib/libc/locale: mbrlen.3 nl_langinfo.3 wcwidth.3
        src/lib/libc/net: getaddrinfo.3 getifaddrs.3 getnameinfo.3
            inet6_rthdr_space.3 linkaddr.3 nsdispatch.3
        src/lib/libc/regex: re_format.7 regex.3
        src/lib/libc/rpc: bindresvport.3 rpc.3 rpc_clnt_create.3 rpc_soc.3
            rpc_svc_reg.3 rpcbind.3
        src/lib/libc/ssp: __builtin_object_size.3
        src/lib/libc/stdio: getdelim.3 printf.3
        src/lib/libc/stdlib: getopt.3 getopt_long.3 getsubopt.3 ptsname.3
            random.3 strtoi.3 strtol.3 strtou.3 strtoul.3
        src/lib/libc/string: strerror.3 strsep.3
        src/lib/libc/sys: bind.2 dup.2 intro.2 kqueue.2 modctl.2 read.2
            readlink.2 select.2 semctl.2 sigaltstack.2 timer_create.2 write.2
        src/lib/libc/time: time2posix.3 tzset.3 zdump.8
        src/lib/libc/yp: ypclnt.3
        src/lib/libcompat/regexp: regexp.3
        src/lib/libcurses: curses_addch.3 curses_color.3 curses_input.3
        src/lib/libedit: editline.3
        src/lib/libform: forms.3
        src/lib/libm/man: acos.3 asin.3 atan2.3 fenv.3 ieee_test.3 lgamma.3
            log.3 math.3
        src/lib/libmenu: menu_attributes.3 menu_cursor.3 menu_driver.3
            menu_format.3 menu_hook.3 menu_item_current.3 menu_item_name.3
            menu_item_new.3 menu_item_opts.3 menu_item_userptr.3
            menu_item_value.3 menu_item_visible.3 menu_items.3 menu_mark.3
            menu_new.3 menu_opts.3 menu_pattern.3 menu_post.3 menu_userptr.3
            menu_win.3 menus.3
        src/lib/libpam/modules/pam_krb5: pam_krb5.8
        src/lib/libpthread: pthread_schedparam.3
        src/lib/libpuffs: puffs.3 puffs_ops.3
        src/lib/librmt: rmtops.3
        src/lib/librt: aio_fsync.3 aio_read.3 aio_write.3 pset.3
        src/lib/libskey: skey.3
        src/lib/libusbhid: usbhid.3
        src/lib/libutil: getmntopts.3 pw_init.3
        src/lib/libwrap: hosts_access.5 hosts_options.5
        src/lib/libz: zlib.3

Log Message:
Remove workaround for ancient HTML generation code.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libarch/i386/i386_get_ldt.2 \
    src/lib/libarch/i386/i386_vm86.2
cvs rdiff -u -r1.8 -r1.9 src/lib/libbluetooth/bluetooth.3
cvs rdiff -u -r1.9 -r1.10 src/lib/libbluetooth/sdp_data.3
cvs rdiff -u -r1.40 -r1.41 src/lib/libc/gen/directory.3
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/gen/err.3 src/lib/libc/gen/setmode.3
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/gen/getdevmajor.3
cvs rdiff -u -r1.42 -r1.43 src/lib/libc/gen/glob.3
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/gen/randomid.3
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/gen/shquote.3
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/gen/stringlist.3
cvs rdiff -u -r1.202 -r1.203 src/lib/libc/gen/sysctl.3
cvs rdiff -u -r1.32 -r1.33 src/lib/libc/gen/syslog.3
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/gen/unvis.3
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/gen/wordexp.3
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/hash/rmd160/rmd160.3
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/hash/sha1/sha1.3
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/hash/sha2/sha2.3
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/inet/inet6_rthdr_space.3
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/locale/mbrlen.3
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/locale/nl_langinfo.3
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/locale/wcwidth.3
cvs rdiff -u -r1.58 -r1.59 src/lib/libc/net/getaddrinfo.3
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/net/getifaddrs.3
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/net/getnameinfo.3
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/net/inet6_rthdr_space.3
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/net/linkaddr.3
cvs rdiff -u -r1.33 -r1.34 src/lib/libc/net/nsdispatch.3
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/regex/re_format.7
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/regex/regex.3
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/rpc/bindresvport.3
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/rpc/rpc.3
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/rpc/rpc_clnt_create.3
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/rpc/rpc_soc.3
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/rpc/rpc_svc_reg.3
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/rpc/rpcbind.3
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/ssp/__builtin_object_size.3
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/stdio/getdelim.3
cvs rdiff -u -r1.66 -r1.67 src/lib/libc/stdio/printf.3
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/stdlib/getopt.3
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/stdlib/getopt_long.3
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/stdlib/getsubopt.3
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/stdlib/ptsname.3
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/stdlib/random.3
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/stdlib/strtoi.3 \
    src/lib/libc/stdlib/strtou.3
cvs rdiff -u -r1.39 -r1.40 src/lib/libc/stdlib/strtol.3
cvs rdiff -u -r1.36 -r1.37 src/lib/libc/stdlib/strtoul.3
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/string/strerror.3
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/string/strsep.3
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/sys/bind.2
cvs rdiff -u -r1.32 -r1.33 src/lib/libc/sys/dup.2 src/lib/libc/sys/readlink.2
cvs rdiff -u -r1.59 -r1.60 src/lib/libc/sys/intro.2
cvs rdiff -u -r1.45 -r1.46 src/lib/libc/sys/kqueue.2
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/sys/modctl.2 \
    src/lib/libc/sys/timer_create.2
cvs rdiff -u -r1.35 -r1.36 src/lib/libc/sys/read.2
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/sys/select.2
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/sys/semctl.2
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/sys/sigaltstack.2
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/sys/write.2
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/time/time2posix.3
cvs rdiff -u -r1.35 -r1.36 src/lib/libc/time/tzset.3
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/time/zdump.8
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/yp/ypclnt.3
cvs rdiff -u -r1.17 -r1.18 src/lib/libcompat/regexp/regexp.3
cvs rdiff -u -r1.8 -r1.9 src/lib/libcurses/curses_addch.3
cvs rdiff -u -r1.12 -r1.13 src/lib/libcurses/curses_color.3
cvs rdiff -u -r1.26 -r1.27 src/lib/libcurses/curses_input.3
cvs rdiff -u -r1.95 -r1.96 src/lib/libedit/editline.3
cvs rdiff -u -r1.16 -r1.17 src/lib/libform/forms.3
cvs rdiff -u -r1.17 -r1.18 src/lib/libm/man/acos.3 src/lib/libm/man/asin.3
cvs rdiff -u -r1.18 -r1.19 src/lib/libm/man/atan2.3
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/man/fenv.3
cvs rdiff -u -r1.13 -r1.14 src/lib/libm/man/ieee_test.3
cvs rdiff -u -r1.22 -r1.23 src/lib/libm/man/lgamma.3
cvs rdiff -u -r1.5 -r1.6 src/lib/libm/man/log.3
cvs rdiff -u -r1.26 -r1.27 src/lib/libm/man/math.3
cvs rdiff -u -r1.10 -r1.11 src/lib/libmenu/menu_attributes.3 \
    src/lib/libmenu/menu_items.3 src/lib/libmenu/menu_new.3 \
    src/lib/libmenu/menu_post.3 src/lib/libmenu/menu_win.3
cvs rdiff -u -r1.9 -r1.10 src/lib/libmenu/menu_cursor.3 \
    src/lib/libmenu/menu_format.3 src/lib/libmenu/menu_item_current.3 \
    src/lib/libmenu/menu_item_name.3 src/lib/libmenu/menu_mark.3
cvs rdiff -u -r1.8 -r1.9 src/lib/libmenu/menu_driver.3 \
    src/lib/libmenu/menu_hook.3 src/lib/libmenu/menu_item_new.3 \
    src/lib/libmenu/menu_item_opts.3 src/lib/libmenu/menu_opts.3 \
    src/lib/libmenu/menu_pattern.3 src/lib/libmenu/menu_userptr.3
cvs rdiff -u -r1.7 -r1.8 src/lib/libmenu/menu_item_userptr.3 \
    src/lib/libmenu/menu_item_visible.3
cvs rdiff -u -r1.11 -r1.12 src/lib/libmenu/menu_item_value.3
cvs rdiff -u -r1.15 -r1.16 src/lib/libmenu/menus.3
cvs rdiff -u -r1.11 -r1.12 src/lib/libpam/modules/pam_krb5/pam_krb5.8
cvs rdiff -u -r1.7 -r1.8 src/lib/libpthread/pthread_schedparam.3
cvs rdiff -u -r1.62 -r1.63 src/lib/libpuffs/puffs.3
cvs rdiff -u -r1.45 -r1.46 src/lib/libpuffs/puffs_ops.3
cvs rdiff -u -r1.14 -r1.15 src/lib/librmt/rmtops.3
cvs rdiff -u -r1.7 -r1.8 src/lib/librt/aio_fsync.3
cvs rdiff -u -r1.4 -r1.5 src/lib/librt/aio_read.3 src/lib/librt/aio_write.3
cvs rdiff -u -r1.12 -r1.13 src/lib/librt/pset.3
cvs rdiff -u -r1.10 -r1.11 src/lib/libskey/skey.3
cvs rdiff -u -r1.14 -r1.15 src/lib/libusbhid/usbhid.3
cvs rdiff -u -r1.13 -r1.14 src/lib/libutil/getmntopts.3
cvs rdiff -u -r1.15 -r1.16 src/lib/libutil/pw_init.3
cvs rdiff -u -r1.16 -r1.17 src/lib/libwrap/hosts_access.5
cvs rdiff -u -r1.8 -r1.9 src/lib/libwrap/hosts_options.5
cvs rdiff -u -r1.10 -r1.11 src/lib/libz/zlib.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libarch/i386/i386_get_ldt.2
diff -u src/lib/libarch/i386/i386_get_ldt.2:1.13 src/lib/libarch/i386/i386_get_ldt.2:1.14
--- src/lib/libarch/i386/i386_get_ldt.2:1.13	Thu Aug  7 16:42:00 2003
+++ src/lib/libarch/i386/i386_get_ldt.2	Mon Jul  3 21:32:48 2017
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fork.2	6.5 (Berkeley) 3/10/91
-.\"	$NetBSD: i386_get_ldt.2,v 1.13 2003/08/07 16:42:00 agc Exp $
+.\"	$NetBSD: i386_get_ldt.2,v 1.14 2017/07/03 21:32:48 wiz Exp $
 .\"
 .Dd September 20, 1993
 .Dt I386_GET_LDT 2 i386
@@ -63,7 +63,7 @@ will contain the descriptors to be set o
 The argument
 .Fa descs
 can be either segment_descriptor or gate_descriptor and are defined in
-.Fd \*[Lt]i386/segments.h\*[Gt] .
+.Fd <i386/segments.h> .
 These structures are defined by the architecture
 as disjoint bit-fields, so care must be taken in constructing them.
 .Sh RETURN VALUES
Index: src/lib/libarch/i386/i386_vm86.2
diff -u src/lib/libarch/i386/i386_vm86.2:1.13 src/lib/libarch/i386/i386_vm86.2:1.14
--- src/lib/libarch/i386/i386_vm86.2:1.13	Wed Apr 30 13:10:50 2008
+++ src/lib/libarch/i386/i386_vm86.2	Mon Jul  3 21:32:48 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: i386_vm86.2,v 1.13 2008/04/30 13:10:50 martin Exp $
+.\"	$NetBSD: i386_vm86.2,v 1.14 2017/07/03 21:32:48 wiz Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -52,14 +52,14 @@ will set the process into virtual 8086 m
 selectors specified by the context pointed to by
 .Ar vmcp .
 The processor registers are set from
-.Ar vmcp-\*[Gt]substr.regs ,
+.Ar vmcp->substr.regs ,
 and the emulated processor type from
-.Ar vmcp-\*[Gt]substr.ss_cpu_type .
+.Ar vmcp->substr.ss_cpu_type .
 .Pp
 The kernel keeps a pointer to the context, and uses the tables stored at
-.Ar vmcp-\*[Gt]int_byuser
+.Ar vmcp->int_byuser
 and
-.Ar vmcp-\*[Gt]int21_byuser
+.Ar vmcp->int21_byuser
 for fast virtual interrupt handling.
 If the
 .Ar n th
@@ -76,7 +76,7 @@ Since MS-DOS puts many DOS functions ont
 specially:  the
 .Ar k
 th bit in the
-.Ar vmcp-\*[Gt]int21_byuser
+.Ar vmcp->int21_byuser
 array is checked when INT
 .Ar 21
 is requested and the

Index: src/lib/libbluetooth/bluetooth.3
diff -u src/lib/libbluetooth/bluetooth.3:1.8 src/lib/libbluetooth/bluetooth.3:1.9
--- src/lib/libbluetooth/bluetooth.3:1.8	Sat Nov 28 07:47:30 2015
+++ src/lib/libbluetooth/bluetooth.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: bluetooth.3,v 1.8 2015/11/28 07:47:30 plunky Exp $
+.\" $NetBSD: bluetooth.3,v 1.9 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 2003 Maksim Yevmenkin <m_evmen...@yahoo.com>
 .\" All rights reserved.
@@ -199,14 +199,14 @@ const char *bdstr = "00:01:02:03:04:05";
 bdaddr_t bd;
 struct hostent *hp;
 
-if (!bt_aton(bdstr, \*[Am]bd))
+if (!bt_aton(bdstr, &bd))
 	errx(1, "can't parse BD_ADDR %s", bdstr);
 
-if ((hp = bt_gethostbyaddr((const char *)\*[Am]bd,
+if ((hp = bt_gethostbyaddr((const char *)&bd,
     sizeof(bd), AF_BLUETOOTH)) == NULL)
 	errx(1, "no name associated with %s", bdstr);
 
-printf("name associated with %s is %s\en", bdstr, hp-\*[Gt]h_name);
+printf("name associated with %s is %s\en", bdstr, hp->h_name);
 .Ed
 .Sh DIAGNOSTICS
 Error return status from

Index: src/lib/libbluetooth/sdp_data.3
diff -u src/lib/libbluetooth/sdp_data.3:1.9 src/lib/libbluetooth/sdp_data.3:1.10
--- src/lib/libbluetooth/sdp_data.3:1.9	Tue Mar 31 09:26:45 2015
+++ src/lib/libbluetooth/sdp_data.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: sdp_data.3,v 1.9 2015/03/31 09:26:45 plunky Exp $
+.\" $NetBSD: sdp_data.3,v 1.10 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -313,16 +313,16 @@ examining various attribute values:
 
 	/* rsp contains remote response */
 
-	while (sdp_get_attr(\*[Am]rsp, \*[Am]attr, \*[Am]val)) {
+	while (sdp_get_attr(&rsp, &attr, &val)) {
 		switch(attr) {
 		case SDP_ATTR_SERVICE_RECORD_HANDLE:
-			sdp_get_uint(\*[Am]val, \*[Am]handle);
+			sdp_get_uint(&val, &handle);
 			printf("ServiceRecordHandle: 0x%08x\\n", handle);
 			break;
 
 		case SDP_ATTR_PROFILE_DESCRIPTOR_LIST:
 			printf("ProfileDescriptorList:\\n");
-			sdp_data_print(\*[Am]val, 0);
+			sdp_data_print(&val, 0);
 			break;
 
 		default:
@@ -343,19 +343,19 @@ of known and unknown length.
 
 	seq.next = buf;
 	seq.end = buf + sizeof(buf);
-	sdp_put_seq(\*[Am]seq, -1);
+	sdp_put_seq(&seq, -1);
 
-	sdp_put_seq(\*[Am]seq, 6);
-	sdp_put_uuid16(\*[Am]seq, SDP_UUID_PROTOCOL_L2CAP);
-	sdp_put_uint16(\*[Am]seq, psm);
+	sdp_put_seq(&seq, 6);
+	sdp_put_uuid16(&seq, SDP_UUID_PROTOCOL_L2CAP);
+	sdp_put_uint16(&seq, psm);
 
-	sdp_put_seq(\*[Am]seq, 5);
-	sdp_put_uuid16(\*[Am]seq, SDP_UUID_PROTOCOL_RFCOMM);
-	sdp_put_uint8(\*[Am]seq, channel);
+	sdp_put_seq(&seq, 5);
+	sdp_put_uuid16(&seq, SDP_UUID_PROTOCOL_RFCOMM);
+	sdp_put_uint8(&seq, channel);
 
 	seq.end = seq.next;
 	seq.next = buf;
-	sdp_set_seq(\*[Am]seq, -1);
+	sdp_set_seq(&seq, -1);
 .Ed
 .Pp
 Note that although

Index: src/lib/libc/gen/directory.3
diff -u src/lib/libc/gen/directory.3:1.40 src/lib/libc/gen/directory.3:1.41
--- src/lib/libc/gen/directory.3:1.40	Fri Jan 22 09:32:50 2016
+++ src/lib/libc/gen/directory.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: directory.3,v 1.40 2016/01/22 09:32:50 pgoyette Exp $
+.\"	$NetBSD: directory.3,v 1.41 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -269,8 +269,8 @@ len = strlen(name);
 dirp = opendir(".");
 if (dirp != NULL) {
 	while ((dp = readdir(dirp)) != NULL)
-		if (dp-\*[Gt]d_namlen == len \*[Am]\*[Am]
-		    !strcmp(dp-\*[Gt]d_name, name)) {
+		if (dp->d_namlen == len &&
+		    !strcmp(dp->d_name, name)) {
 			(void)closedir(dirp);
 			return (FOUND);
 		}

Index: src/lib/libc/gen/err.3
diff -u src/lib/libc/gen/err.3:1.21 src/lib/libc/gen/err.3:1.22
--- src/lib/libc/gen/err.3:1.21	Thu Jan 16 17:21:38 2014
+++ src/lib/libc/gen/err.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: err.3,v 1.21 2014/01/16 17:21:38 christos Exp $
+.\" $NetBSD: err.3,v 1.22 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -150,7 +150,7 @@ if ((fd = open(file_name, O_RDONLY, 0)) 
 .Pp
 Display an error message and terminate with status indicating failure:
 .Bd -literal -offset indent
-if (tm.tm_hour \*[Lt] START_TIME)
+if (tm.tm_hour < START_TIME)
 	errx(EXIT_FAILURE, "too early, wait until %s",
 	    start_time_string);
 .Ed
Index: src/lib/libc/gen/setmode.3
diff -u src/lib/libc/gen/setmode.3:1.21 src/lib/libc/gen/setmode.3:1.22
--- src/lib/libc/gen/setmode.3:1.21	Sun Jan 11 02:46:27 2009
+++ src/lib/libc/gen/setmode.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: setmode.3,v 1.21 2009/01/11 02:46:27 christos Exp $
+.\"	$NetBSD: setmode.3,v 1.22 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -100,7 +100,7 @@ const char *file = "myscript.sh";
 struct stat st;
 mode_t newmode;
 
-stat(file, \*[Am]st);
+stat(file, &st);
 newmode = getmode(setmode("a+x"), st.st_mode);
 chmod(file, newmode);
 .Ed

Index: src/lib/libc/gen/getdevmajor.3
diff -u src/lib/libc/gen/getdevmajor.3:1.5 src/lib/libc/gen/getdevmajor.3:1.6
--- src/lib/libc/gen/getdevmajor.3:1.5	Tue Mar 24 22:34:54 2009
+++ src/lib/libc/gen/getdevmajor.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getdevmajor.3,v 1.5 2009/03/24 22:34:54 drochner Exp $
+.\"	$NetBSD: getdevmajor.3,v 1.6 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -67,8 +67,8 @@ To retrieve the major number for
 .Xr pty 4
 slave devices (aka pts devices):
 .Bd -literal -offset indent
-#include \*[Lt]stdlib.h\*[Gt]
-#include \*[Lt]sys/stat.h\*[Gt]
+#include <stdlib.h>
+#include <sys/stat.h>
 .sp
 devmajor_t pts;
 pts = getdevmajor("pts", S_IFCHR);
@@ -78,8 +78,8 @@ To retrieve the major numbers for the bl
 .Xr wd 4
 devices:
 .Bd -literal -offset indent
-#include \*[Lt]stdlib.h\*[Gt]
-#include \*[Lt]sys/stat.h\*[Gt]
+#include <stdlib.h>
+#include <sys/stat.h>
 .sp
 devmajor_t c, b;
 c = getdevmajor("wd", S_IFCHR);

Index: src/lib/libc/gen/glob.3
diff -u src/lib/libc/gen/glob.3:1.42 src/lib/libc/gen/glob.3:1.43
--- src/lib/libc/gen/glob.3:1.42	Thu Dec 27 21:17:47 2012
+++ src/lib/libc/gen/glob.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: glob.3,v 1.42 2012/12/27 21:17:47 christos Exp $
+.\"	$NetBSD: glob.3,v 1.43 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -448,9 +448,9 @@ Portable applications should use the
 constant instead.
 .Pp
 The arguments
-.Fa pglob\-\*[Gt]gl_pathc
+.Fa pglob\->gl_pathc
 and
-.Fa pglob\-\*[Gt]gl_pathv
+.Fa pglob\->gl_pathv
 are still set as specified above.
 .Sh ENVIRONMENT
 .Bl -tag -width HOME -compact
@@ -467,8 +467,8 @@ following code:
 glob_t g;
 
 g.gl_offs = 2;
-glob("*.c", GLOB_DOOFFS, NULL, \*[Am]g);
-glob("*.h", GLOB_DOOFFS | GLOB_APPEND, NULL, \*[Am]g);
+glob("*.c", GLOB_DOOFFS, NULL, &g);
+glob("*.h", GLOB_DOOFFS | GLOB_APPEND, NULL, &g);
 g.gl_pathv[0] = "ls";
 g.gl_pathv[1] = "-l";
 execvp("ls", g.gl_pathv);

Index: src/lib/libc/gen/randomid.3
diff -u src/lib/libc/gen/randomid.3:1.7 src/lib/libc/gen/randomid.3:1.8
--- src/lib/libc/gen/randomid.3:1.7	Thu Jan  5 19:45:29 2006
+++ src/lib/libc/gen/randomid.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: randomid.3,v 1.7 2006/01/05 19:45:29 rpaulo Exp $
+.\"	$NetBSD: randomid.3,v 1.8 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (C) 2006 The NetBSD Foundation
 .\" All rights reserved.
@@ -113,9 +113,9 @@ It must not be shared among multiple dat
 .\"
 .Sh EXAMPLES
 .Bd -literal -offset indent
-#include \*[Lt]stdio.h\*[Gt]
-#include \*[Lt]sys/types.h\*[Gt]
-#include \*[Lt]randomid.h\*[Gt]
+#include <stdio.h>
+#include <sys/types.h>
+#include <randomid.h>
 
 uint32_t
 genid(void)

Index: src/lib/libc/gen/shquote.3
diff -u src/lib/libc/gen/shquote.3:1.9 src/lib/libc/gen/shquote.3:1.10
--- src/lib/libc/gen/shquote.3:1.9	Sun Sep  7 08:55:46 2008
+++ src/lib/libc/gen/shquote.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: shquote.3,v 1.9 2008/09/07 08:55:46 apb Exp $
+.\" $NetBSD: shquote.3,v 1.10 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 2001 Christopher G. Demetriou
 .\" All rights reserved.
@@ -156,7 +156,7 @@ int argc;
  * Size buffer to hold the command string, and allocate it.
  * Buffer of length one given to snprintf() for portability.
  */
-cmdlen = snprintf(\*[Am]c, 1, "${PROG-%s} ", PROG_DEFAULT);
+cmdlen = snprintf(&c, 1, "${PROG-%s} ", PROG_DEFAULT);
 qlen = shquotev(argc, argv, NULL, 0);
 if (qlen == (size_t)-1) {
 	\&...
@@ -194,8 +194,8 @@ int argc, i;
  * Size buffer to hold the command string, and allocate it.
  * Buffer of length one given to snprintf() for portability.
  */
-cmdlen = snprintf(\*[Am]c, 1, "${PROG-%s} ", PROG_DEFAULT);
-for (i = 0; i \*[Lt] argc; i++) {
+cmdlen = snprintf(&c, 1, "${PROG-%s} ", PROG_DEFAULT);
+for (i = 0; i < argc; i++) {
 	qlen = shquote(argv[i], NULL, 0);
 	if (qlen == (size_t)-1) {
 		\&...
@@ -211,7 +211,7 @@ if (cmd == NULL) {
 len = snprintf(cmd, cmdlen, "${PROG-%s} ", PROG_DEFAULT);
 
 /* Quote all of the arguments when copying them. */
-for (i = 0; i \*[Lt] argc; i++) {
+for (i = 0; i < argc; i++) {
 	qlen = shquote(argv[i], cmd + len, cmdlen - len);
 	if (qlen == (size_t)-1) {
 		/* Should not ever happen. */

Index: src/lib/libc/gen/stringlist.3
diff -u src/lib/libc/gen/stringlist.3:1.15 src/lib/libc/gen/stringlist.3:1.16
--- src/lib/libc/gen/stringlist.3:1.15	Thu May  6 09:46:49 2010
+++ src/lib/libc/gen/stringlist.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: stringlist.3,v 1.15 2010/05/06 09:46:49 jruoho Exp $
+.\"	$NetBSD: stringlist.3,v 1.16 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -95,22 +95,22 @@ in case of failure.
 Releases memory occupied by
 .Ar sl
 and the
-.Ar sl-\*[Gt]sl_str
+.Ar sl->sl_str
 array.
 If
 .Ar freeall
 is non-zero, then each of the items within
-.Ar sl-\*[Gt]sl_str
+.Ar sl->sl_str
 is released as well.
 .It Fn sl_add
 Add
 .Ar item
 to
-.Ar sl-\*[Gt]sl_str
+.Ar sl->sl_str
 at
-.Ar sl-\*[Gt]sl_cur ,
+.Ar sl->sl_cur ,
 extending the size of
-.Ar sl-\*[Gt]sl_str .
+.Ar sl->sl_str .
 Returns zero upon success, \-1 upon failure.
 .It Fn sl_find
 Find

Index: src/lib/libc/gen/sysctl.3
diff -u src/lib/libc/gen/sysctl.3:1.202 src/lib/libc/gen/sysctl.3:1.203
--- src/lib/libc/gen/sysctl.3:1.202	Fri Jun 13 22:05:15 2014
+++ src/lib/libc/gen/sysctl.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sysctl.3,v 1.202 2014/06/13 22:05:15 wiz Exp $
+.\"	$NetBSD: sysctl.3,v 1.203 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -240,7 +240,7 @@ size_t len;
 mib[0] = CTL_KERN;
 mib[1] = KERN_MAXPROC;
 len = sizeof(maxproc);
-sysctl(mib, 2, \*[Am]maxproc, \*[Am]len, NULL, 0);
+sysctl(mib, 2, &maxproc, &len, NULL, 0);
 .Ed
 .sp
 To retrieve the standard search path for the system utilities -
@@ -252,9 +252,9 @@ char *p;
 .sp
 mib[0] = CTL_USER;
 mib[1] = USER_CS_PATH;
-sysctl(mib, 2, NULL, \*[Am]len, NULL, 0);
+sysctl(mib, 2, NULL, &len, NULL, 0);
 p = malloc(len);
-sysctl(mib, 2, p, \*[Am]len, NULL, 0);
+sysctl(mib, 2, p, &len, NULL, 0);
 .Ed
 .Pp
 The
@@ -339,10 +339,10 @@ size_t len;
 .sp
 mib[0] = CTL_VFS;
 mib[1] = CTL_QUERY;
-memset(\*[Am]query, 0, sizeof(query));
+memset(&query, 0, sizeof(query));
 query.sysctl_flags = SYSCTL_VERSION;
 len = sizeof(vfs);
-sysctl(mib, 2, \*[Am]vfs[0], \*[Am]len, \*[Am]query, sizeof(query));
+sysctl(mib, 2, &vfs[0], &len, &query, sizeof(query));
 .Ed
 .Pp
 Note that a reference to an empty node with
@@ -446,21 +446,21 @@ size_t len;
 .sp
 mib[0] = CTL_CREATE;		/* create at top-level */
 len = sizeof(node);
-memset(\*[Am]node, 0, len);
+memset(&node, 0, len);
 node.sysctl_flags = SYSCTL_VERSION|CTLFLAG_READWRITE|CTLTYPE_NODE;
 snprintf(node.sysctl_name, sizeof(node.sysctl_name), "local");
 node.sysctl_num = CTL_CREATE;	/* request dynamic MIB number */
-sysctl(\*[Am]mib[0], 1, \*[Am]node, \*[Am]len, \*[Am]node, len);
+sysctl(&mib[0], 1, &node, &len, &node, len);
 .sp
 mib[0] = node.sysctl_num;	/* use new MIB number */
 mib[1] = CTL_CREATESYM;		/* create at second level */
 len = sizeof(node);
-memset(\*[Am]node, 0, len);
+memset(&node, 0, len);
 node.sysctl_flags = SYSCTL_VERSION|CTLFLAG_READWRITE|CTLTYPE_INT;
 snprintf(node.sysctl_name, sizeof(node.sysctl_name), "audiodebug");
 node.sysctl_num = CTL_CREATE;
 node.sysctl_data = "audiodebug"; /* kernel symbol to be used */
-sysctl(\*[Am]mib[0], 2, NULL, NULL, \*[Am]node, len);
+sysctl(&mib[0], 2, NULL, NULL, &node, len);
 .Ed
 .Pp
 The process for deleting nodes is similar, but less data needs to
@@ -490,17 +490,17 @@ above example:
 int mib[2];
 .sp
 len = sizeof(node);
-memset(\*[Am]node, 0, len);
+memset(&node, 0, len);
 node.sysctl_flags = SYSCTL_VERSION;
 .sp
 mib[0] = 3214;			/* assumed number for "local" */
 mib[1] = CTL_DESTROY;
 node.sysctl_num = 3215;		/* assumed number for "audiodebug" */
-sysctl(\*[Am]mib[0], 2, NULL, NULL, \*[Am]node, len);
+sysctl(&mib[0], 2, NULL, NULL, &node, len);
 .sp
 mib[0] = CTL_DESTROY;
 node.sysctl_num = 3214;		/* now deleting "local" */
-sysctl(\*[Am]mib[0], 1, NULL, NULL, \*[Am]node, len);
+sysctl(&mib[0], 1, NULL, NULL, &node, len);
 .Ed
 .Pp
 Descriptions of each of the nodes can also be retrieved, if they are
@@ -546,23 +546,23 @@ size_t len;
 /* retrieve kern-level descriptions */
 mib[0] = CTL_KERN;
 mib[1] = CTL_DESCRIBE;
-d = (struct sysctldesc *)\*[Am]buf[0];
+d = (struct sysctldesc *)&buf[0];
 len = sizeof(buf);
-sysctl(mib, 2, d, \*[Am]len, NULL, 0);
-while ((caddr_t)d \*[Lt] (caddr_t)\*[Am]buf[len]) {
-	printf("node %d: %.*s\\n", d-\*[Gt]descr_num, d-\*[Gt]descr_len,
-	    d-\*[Gt]descr_str);
+sysctl(mib, 2, d, &len, NULL, 0);
+while ((caddr_t)d < (caddr_t)&buf[len]) {
+	printf("node %d: %.*s\\n", d->descr_num, d->descr_len,
+	    d->descr_str);
 	d = NEXT_DESCR(d);
 }
 .sp
 /* retrieve description for kern.securelevel */
-memset(\*[Am]desc, 0, sizeof(desc));
+memset(&desc, 0, sizeof(desc));
 desc.sysctl_flags = SYSCTL_VERSION;
 desc.sysctl_num = KERN_SECURELEVEL;
-d = (struct sysctldesc *)\*[Am]buf[0];
+d = (struct sysctldesc *)&buf[0];
 len = sizeof(buf);
-sysctl(mib, 2, d, \*[Am]len, \*[Am]desc, sizeof(desc));
-printf("kern.securelevel: %.*s\\n", d-\*[Gt]descr_len, d-\*[Gt]descr_str);
+sysctl(mib, 2, d, &len, &desc, sizeof(desc));
+printf("kern.securelevel: %.*s\\n", d->descr_len, d->descr_str);
 .Ed
 .Pp
 Descriptions can also be set as follows, subject to the following rules:
@@ -586,11 +586,11 @@ int mib[2];
 /* presuming the given top-level node was just added... */
 mib[0] = 3214; /* mib numbers taken from previous examples */
 mib[1] = CTL_DESCRIBE;
-memset(\*[Am]desc, 0, sizeof(desc));
+memset(&desc, 0, sizeof(desc));
 desc.sysctl_flags = SYSCTL_VERSION;
 desc.sysctl_num = 3215;
 desc.sysctl_desc = "audio debug control knob";
-sysctl(mib, 2, NULL, NULL, \*[Am]desc, sizeof(desc));
+sysctl(mib, 2, NULL, NULL, &desc, sizeof(desc));
 .Ed
 .Pp
 Upon successfully setting a description, the new description will be
@@ -642,7 +642,7 @@ Otherwise \-1 is returned and
 .Va errno
 is set appropriately.
 .Sh FILES
-.Bl -tag -width \*[Lt]netinet6/udp6Xvar.h\*[Gt] -compact
+.Bl -tag -width <netinet6/udp6Xvar.h> -compact
 .It Aq Pa sys/sysctl.h
 definitions for top level identifiers, second level kernel and hardware
 identifiers, and user level identifiers

Index: src/lib/libc/gen/syslog.3
diff -u src/lib/libc/gen/syslog.3:1.32 src/lib/libc/gen/syslog.3:1.33
--- src/lib/libc/gen/syslog.3:1.32	Thu Mar 23 12:31:57 2017
+++ src/lib/libc/gen/syslog.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: syslog.3,v 1.32 2017/03/23 12:31:57 wiz Exp $
+.\"	$NetBSD: syslog.3,v 1.33 2017/07/03 21:32:49 wiz Exp $
 .\"	$OpenBSD: syslog.3,v 1.25 2005/07/22 03:16:58 jaredy Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -463,7 +463,7 @@ For the multithread-safe functions:
 .Bd -literal -offset indent
 struct syslog_data sdata = SYSLOG_DATA_INIT;
 
-syslog_r(LOG_INFO|LOG_LOCAL2, \*[Am]sdata, "foobar error: %m");
+syslog_r(LOG_INFO|LOG_LOCAL2, &sdata, "foobar error: %m");
 .Ed
 .Sh SEE ALSO
 .Xr logger 1 ,

Index: src/lib/libc/gen/unvis.3
diff -u src/lib/libc/gen/unvis.3:1.27 src/lib/libc/gen/unvis.3:1.28
--- src/lib/libc/gen/unvis.3:1.27	Sat Dec 15 07:34:36 2012
+++ src/lib/libc/gen/unvis.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: unvis.3,v 1.27 2012/12/15 07:34:36 wiz Exp $
+.\"	$NetBSD: unvis.3,v 1.28 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -183,7 +183,7 @@ char out;
 
 while ((ch = getchar()) != EOF) {
 again:
-	switch(unvis(\*[Am]out, ch, \*[Am]state, 0)) {
+	switch(unvis(&out, ch, &state, 0)) {
 	case 0:
 	case UNVIS_NOCHAR:
 		break;
@@ -197,7 +197,7 @@ again:
 		errx(EXIT_FAILURE, "Bad character sequence!");
 	}
 }
-if (unvis(\*[Am]out, '\e0', \*[Am]state, UNVIS_END) == UNVIS_VALID)
+if (unvis(&out, '\e0', &state, UNVIS_END) == UNVIS_VALID)
 	(void)putchar(out);
 .Ed
 .Sh ERRORS

Index: src/lib/libc/gen/wordexp.3
diff -u src/lib/libc/gen/wordexp.3:1.2 src/lib/libc/gen/wordexp.3:1.3
--- src/lib/libc/gen/wordexp.3:1.2	Mon Apr 24 20:27:34 2006
+++ src/lib/libc/gen/wordexp.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: wordexp.3,v 1.2 2006/04/24 20:27:34 jld Exp $
+.\"	$NetBSD: wordexp.3,v 1.3 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 2002 Tim J. Robbins
 .\" All rights reserved.
@@ -139,10 +139,10 @@ The
 argument contains one of the following unquoted characters:
 .Aq newline ,
 .Ql | ,
-.Ql \*[Am] ,
+.Ql & ,
 .Ql \&; ,
-.Ql \*[Lt] ,
-.Ql \*[Gt] ,
+.Ql < ,
+.Ql > ,
 .Ql \&( ,
 .Ql \&) ,
 .Ql { ,
@@ -186,8 +186,8 @@ and
 .Bd -literal -offset indent
 wordexp_t we;
 
-wordexp("${EDITOR:-vi} *.c /etc/motd", \*[Am]we, 0);
-execvp(we-\*[Gt]we_wordv[0], we-\*[Gt]we_wordv);
+wordexp("${EDITOR:-vi} *.c /etc/motd", &we, 0);
+execvp(we->we_wordv[0], we->we_wordv);
 .Ed
 .Sh DIAGNOSTICS
 Diagnostic messages from the shell are written to the standard error output

Index: src/lib/libc/hash/rmd160/rmd160.3
diff -u src/lib/libc/hash/rmd160/rmd160.3:1.3 src/lib/libc/hash/rmd160/rmd160.3:1.4
--- src/lib/libc/hash/rmd160/rmd160.3:1.3	Mon Apr  5 21:26:30 2010
+++ src/lib/libc/hash/rmd160/rmd160.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rmd160.3,v 1.3 2010/04/05 21:26:30 joerg Exp $
+.\"	$NetBSD: rmd160.3,v 1.4 2017/07/03 21:32:49 wiz Exp $
 .\"	$OpenBSD: rmd160.3,v 1.12 2000/04/18 03:01:29 aaron Exp $
 .\"
 .\" Copyright (c) 1997 Todd C. Miller <todd.mil...@courtesan.com>
@@ -165,13 +165,13 @@ int n;
 
 buf = "abc";
 n = strlen(buf);
-RMD160Init(\*[Am]rmd);
-RMD160Update(\*[Am]rmd, (u_char *)buf, n);
-RMD160Final(results, \*[Am]rmd);
+RMD160Init(&rmd);
+RMD160Update(&rmd, (u_char *)buf, n);
+RMD160Final(results, &rmd);
 
 /* Print the digest as one long hex value */
 printf("0x");
-for (n = 0; n \*[Lt] 20; n++)
+for (n = 0; n < 20; n++)
 	printf("%02x", results[n]);
 putchar('\en');
 .Ed

Index: src/lib/libc/hash/sha1/sha1.3
diff -u src/lib/libc/hash/sha1/sha1.3:1.6 src/lib/libc/hash/sha1/sha1.3:1.7
--- src/lib/libc/hash/sha1/sha1.3:1.6	Mon Apr  5 21:27:01 2010
+++ src/lib/libc/hash/sha1/sha1.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sha1.3,v 1.6 2010/04/05 21:27:01 joerg Exp $
+.\"	$NetBSD: sha1.3,v 1.7 2017/07/03 21:32:49 wiz Exp $
 .\"	$OpenBSD: sha1.3,v 1.9 1998/03/07 22:18:12 millert Exp $
 .\"
 .\" Copyright (c) 1997, 2004 Todd C. Miller <todd.mil...@courtesan.com>
@@ -151,13 +151,13 @@ int n;
 
 buf = "abc";
 n = strlen(buf);
-SHA1Init(\*[Am]sha);
-SHA1Update(\*[Am]sha, (uint8_t *)buf, n);
-SHA1Final(results, \*[Am]sha);
+SHA1Init(&sha);
+SHA1Update(&sha, (uint8_t *)buf, n);
+SHA1Final(results, &sha);
 
 /* Print the digest as one long hex value */
 printf("0x");
-for (n = 0; n \*[Lt] 20; n++)
+for (n = 0; n < 20; n++)
 	printf("%02x", results[n]);
 putchar('\en');
 .Ed

Index: src/lib/libc/hash/sha2/sha2.3
diff -u src/lib/libc/hash/sha2/sha2.3:1.5 src/lib/libc/hash/sha2/sha2.3:1.6
--- src/lib/libc/hash/sha2/sha2.3:1.5	Tue May 26 08:04:12 2009
+++ src/lib/libc/hash/sha2/sha2.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: sha2.3,v 1.5 2009/05/26 08:04:12 joerg Exp $
+.\" $NetBSD: sha2.3,v 1.6 2017/07/03 21:32:49 wiz Exp $
 .\"	$OpenBSD: sha2.3,v 1.11 2004/06/22 01:57:29 jfb Exp $
 .\"
 .\" Copyright (c) 2003, 2004 Todd C. Miller <todd.mil...@courtesan.com>
@@ -250,13 +250,13 @@ int n;
 
 buf = "abc";
 n = strlen(buf);
-SHA256_Init(\*[Am]ctx);
-SHA256_Update(\*[Am]ctx, (uint8_t *)buf, n);
-SHA256_Final(results, \*[Am]ctx);
+SHA256_Init(&ctx);
+SHA256_Update(&ctx, (uint8_t *)buf, n);
+SHA256_Final(results, &ctx);
 
 /* Print the digest as one long hex value */
 printf("0x");
-for (n = 0; n \*[Lt] SHA256_DIGEST_LENGTH; n++)
+for (n = 0; n < SHA256_DIGEST_LENGTH; n++)
 	printf("%02x", results[n]);
 putchar('\en');
 .Ed

Index: src/lib/libc/inet/inet6_rthdr_space.3
diff -u src/lib/libc/inet/inet6_rthdr_space.3:1.2 src/lib/libc/inet/inet6_rthdr_space.3:1.3
--- src/lib/libc/inet/inet6_rthdr_space.3:1.2	Mon Mar 22 19:30:54 2010
+++ src/lib/libc/inet/inet6_rthdr_space.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: inet6_rthdr_space.3,v 1.2 2010/03/22 19:30:54 joerg Exp $
+.\"	$NetBSD: inet6_rthdr_space.3,v 1.3 2017/07/03 21:32:49 wiz Exp $
 .\"	$KAME: inet6_rthdr_space.3,v 1.8 2000/05/17 14:30:15 itojun Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
@@ -73,7 +73,7 @@ return #bytes required for ancillary dat
 .It Fn inet6_rthdr_init
 initialize ancillary data for Routing header
 .It Fn inet6_rthdr_add
-add IPv6 address \*[Am] flags to Routing header
+add IPv6 address & flags to Routing header
 .It Fn inet6_rthdr_lasthop
 specify the flags for the final hop
 .El

Index: src/lib/libc/locale/mbrlen.3
diff -u src/lib/libc/locale/mbrlen.3:1.9 src/lib/libc/locale/mbrlen.3:1.10
--- src/lib/libc/locale/mbrlen.3:1.9	Thu Feb 28 19:36:51 2008
+++ src/lib/libc/locale/mbrlen.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: mbrlen.3,v 1.9 2008/02/28 19:36:51 tnozaki Exp $
+.\" $NetBSD: mbrlen.3,v 1.10 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c)2002 Citrus Project,
 .\" All rights reserved.
@@ -55,7 +55,7 @@ is equivalent to the following call (exc
 .Fa ps
 is evaluated only once):
 .Bd -literal -offset indent
-mbrtowc(NULL, s, n, (ps != NULL) ? ps : \*[Am]internal);
+mbrtowc(NULL, s, n, (ps != NULL) ? ps : &internal);
 .Ed
 .Pp
 Here,

Index: src/lib/libc/locale/nl_langinfo.3
diff -u src/lib/libc/locale/nl_langinfo.3:1.20 src/lib/libc/locale/nl_langinfo.3:1.21
--- src/lib/libc/locale/nl_langinfo.3:1.20	Thu Apr 14 05:50:49 2011
+++ src/lib/libc/locale/nl_langinfo.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: nl_langinfo.3,v 1.20 2011/04/14 05:50:49 jruoho Exp $
+.\"	$NetBSD: nl_langinfo.3,v 1.21 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Written by J.T. Conklin <j...@netbsd.org>.
 .\" Public domain.
@@ -97,9 +97,9 @@ The following example uses
 to obtain the date and time format for the current locale:
 .Pp
 .Bd -literal -offset indent
-#include \*[Lt]time.h\*[Gt]
-#include \*[Lt]langinfo.h\*[Gt]
-#include \*[Lt]locale.h\*[Gt]
+#include <time.h>
+#include <langinfo.h>
+#include <locale.h>
 
 int main(void)
 {
@@ -109,7 +109,7 @@ int main(void)
 	char *ptr;
 
 	t = time(NULL);
-	tm = localtime(\*[Am]t);
+	tm = localtime(&t);
 	(void)setlocale(LC_ALL, "");
 	ptr = nl_langinfo(D_T_FMT);
 	strftime(datestring, sizeof(datestring), ptr, tm);
@@ -123,8 +123,8 @@ int main(void)
 .\" to obtain the setting of the currency symbol for the current locale:
 .\" .Pp
 .\" .Bd
-.\" 	#include \*[Lt]langinfo.h\*[Gt]
-.\" 	#include \*[Lt]locale.h\*[Gt]
+.\" 	#include <langinfo.h>
+.\" 	#include <locale.h>
 .\" 	int main(void)
 .\" 	{
 .\" 		char *ptr;

Index: src/lib/libc/locale/wcwidth.3
diff -u src/lib/libc/locale/wcwidth.3:1.3 src/lib/libc/locale/wcwidth.3:1.4
--- src/lib/libc/locale/wcwidth.3:1.3	Sat Oct 14 07:51:01 2006
+++ src/lib/libc/locale/wcwidth.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: wcwidth.3,v 1.3 2006/10/14 07:51:01 wiz Exp $
+.\" $NetBSD: wcwidth.3,v 1.4 2017/07/03 21:32:49 wiz Exp $
 .\" FreeBSD: src/lib/libc/locale/wcwidth.3,v 1.6 2004/08/17 04:56:03 trhodes Exp
 .\"
 .\" Copyright (c) 2002 Tim J. Robbins
@@ -68,14 +68,14 @@ int column, w;
 column = 0;
 while ((ch = getwchar()) != WEOF) {
 	w = wcwidth(ch);
-	if (w \*[Gt] 0 \*[Am]\*[Am] column + w \*[Gt]= 20) {
+	if (w > 0 && column + w >= 20) {
 		putwchar(L'\en');
 		column = 0;
 	}
 	putwchar(ch);
 	if (ch == L'\en')
 		column = 0;
-	else if (w \*[Gt] 0)
+	else if (w > 0)
 		column += w;
 }
 .Ed

Index: src/lib/libc/net/getaddrinfo.3
diff -u src/lib/libc/net/getaddrinfo.3:1.58 src/lib/libc/net/getaddrinfo.3:1.59
--- src/lib/libc/net/getaddrinfo.3:1.58	Sun Dec 13 14:54:17 2015
+++ src/lib/libc/net/getaddrinfo.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getaddrinfo.3,v 1.58 2015/12/13 14:54:17 christos Exp $
+.\"	$NetBSD: getaddrinfo.3,v 1.59 2017/07/03 21:32:49 wiz Exp $
 .\"	$KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $
 .\"	$OpenBSD: getaddrinfo.3,v 1.35 2004/12/21 03:40:31 jaredy Exp $
 .\"
@@ -364,24 +364,24 @@ int error;
 int s;
 const char *cause = NULL;
 
-memset(\*[Am]hints, 0, sizeof(hints));
+memset(&hints, 0, sizeof(hints));
 hints.ai_family = AF_UNSPEC;
 hints.ai_socktype = SOCK_STREAM;
-error = getaddrinfo("www.kame.net", "http", \*[Am]hints, \*[Am]res0);
+error = getaddrinfo("www.kame.net", "http", &hints, &res0);
 if (error) {
 	errx(1, "%s", gai_strerror(error));
 	/*NOTREACHED*/
 }
 s = -1;
-for (res = res0; res; res = res-\*[Gt]ai_next) {
-	s = socket(res-\*[Gt]ai_family, res-\*[Gt]ai_socktype,
-	    res-\*[Gt]ai_protocol);
-	if (s \*[Lt] 0) {
+for (res = res0; res; res = res->ai_next) {
+	s = socket(res->ai_family, res->ai_socktype,
+	    res->ai_protocol);
+	if (s < 0) {
 		cause = "socket";
 		continue;
 	}
 
-	if (connect(s, res-\*[Gt]ai_addr, res-\*[Gt]ai_addrlen) \*[Lt] 0) {
+	if (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
 		cause = "connect";
 		close(s);
 		s = -1;
@@ -390,7 +390,7 @@ for (res = res0; res; res = res-\*[Gt]ai
 
 	break;	/* okay we got one */
 }
-if (s \*[Lt] 0) {
+if (s < 0) {
 	err(1, "%s", cause);
 	/*NOTREACHED*/
 }
@@ -407,25 +407,25 @@ int s[MAXSOCK];
 int nsock;
 const char *cause = NULL;
 
-memset(\*[Am]hints, 0, sizeof(hints));
+memset(&hints, 0, sizeof(hints));
 hints.ai_family = AF_UNSPEC;
 hints.ai_socktype = SOCK_STREAM;
 hints.ai_flags = AI_PASSIVE;
-error = getaddrinfo(NULL, "http", \*[Am]hints, \*[Am]res0);
+error = getaddrinfo(NULL, "http", &hints, &res0);
 if (error) {
 	errx(1, "%s", gai_strerror(error));
 	/*NOTREACHED*/
 }
 nsock = 0;
-for (res = res0; res \*[Am]\*[Am] nsock \*[Lt] MAXSOCK; res = res-\*[Gt]ai_next) {
-	s[nsock] = socket(res-\*[Gt]ai_family, res-\*[Gt]ai_socktype,
-	    res-\*[Gt]ai_protocol);
-	if (s[nsock] \*[Lt] 0) {
+for (res = res0; res && nsock < MAXSOCK; res = res->ai_next) {
+	s[nsock] = socket(res->ai_family, res->ai_socktype,
+	    res->ai_protocol);
+	if (s[nsock] < 0) {
 		cause = "socket";
 		continue;
 	}
 
-	if (bind(s[nsock], res-\*[Gt]ai_addr, res-\*[Gt]ai_addrlen) \*[Lt] 0) {
+	if (bind(s[nsock], res->ai_addr, res->ai_addrlen) < 0) {
 		cause = "bind";
 		close(s[nsock]);
 		continue;

Index: src/lib/libc/net/getifaddrs.3
diff -u src/lib/libc/net/getifaddrs.3:1.17 src/lib/libc/net/getifaddrs.3:1.18
--- src/lib/libc/net/getifaddrs.3:1.17	Wed Sep 21 10:53:24 2016
+++ src/lib/libc/net/getifaddrs.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getifaddrs.3,v 1.17 2016/09/21 10:53:24 roy Exp $
+.\"	$NetBSD: getifaddrs.3,v 1.18 2017/07/03 21:32:49 wiz Exp $
 .\"	BSDI	getifaddrs.3,v 2.5 2000/02/23 14:51:59 dab Exp
 .\"
 .\" Copyright (c) 1995, 1999
@@ -142,20 +142,20 @@ is set to indicate the error.
 The following example program prints a list of all addresses configured
 on the system.
 .Bd -literal -offset indent
-#include \*[Lt]sys/types.h\*[Gt]
-#include \*[Lt]sys/socket.h\*[Gt]
-#include \*[Lt]stdio.h\*[Gt]
-#include \*[Lt]ifaddrs.h\*[Gt]
-#include \*[Lt]util.h\*[Gt]
-#include \*[Lt]err.h\*[Gt]
-#include \*[Lt]stdlib.h\*[Gt]
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <stdio.h>
+#include <ifaddrs.h>
+#include <util.h>
+#include <err.h>
+#include <stdlib.h>
 
 int
 main(int argc, char *argv[])
 {
 	struct ifaddrs *ifa, *a;
 
-	if (getifaddrs(\*[Am]ifa) == -1)
+	if (getifaddrs(&ifa) == -1)
 		err(EXIT_FAILURE, "getifaddrs");
 
 	for (a = ifa; a; a = a->ifa_next) {

Index: src/lib/libc/net/getnameinfo.3
diff -u src/lib/libc/net/getnameinfo.3:1.41 src/lib/libc/net/getnameinfo.3:1.42
--- src/lib/libc/net/getnameinfo.3:1.41	Sun Aug 18 10:40:06 2013
+++ src/lib/libc/net/getnameinfo.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getnameinfo.3,v 1.41 2013/08/18 10:40:06 wiz Exp $
+.\"	$NetBSD: getnameinfo.3,v 1.42 2017/07/03 21:32:49 wiz Exp $
 .\"	$KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $
 .\"	$OpenBSD: getnameinfo.3,v 1.36 2004/12/21 09:48:20 jmc Exp $
 .\"
@@ -143,7 +143,7 @@ Observe that there is no hardcoded refer
 struct sockaddr *sa;	/* input */
 char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
 
-if (getnameinfo(sa, sa-\*[Gt]sa_len, hbuf, sizeof(hbuf), sbuf,
+if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), sbuf,
     sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
 	errx(1, "could not get numeric hostname");
 	/*NOTREACHED*/
@@ -156,7 +156,7 @@ The following version checks if the sock
 struct sockaddr *sa;	/* input */
 char hbuf[NI_MAXHOST];
 
-if (getnameinfo(sa, sa-\*[Gt]sa_len, hbuf, sizeof(hbuf), NULL, 0,
+if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), NULL, 0,
     NI_NAMEREQD)) {
 	errx(1, "could not resolve hostname");
 	/*NOTREACHED*/
@@ -247,10 +247,10 @@ int error;
 error = getnameinfo(sa, salen, addr, sizeof(addr),
     NULL, 0, NI_NAMEREQD);
 if (error == 0) {
-	memset(\*[Am]hints, 0, sizeof(hints));
+	memset(&hints, 0, sizeof(hints));
 	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
 	hints.ai_flags = AI_NUMERICHOST;
-	if (getaddrinfo(addr, "0", \*[Am]hints, \*[Am]res) == 0) {
+	if (getaddrinfo(addr, "0", &hints, &res) == 0) {
 		/* malicious PTR record */
 		freeaddrinfo(res);
 		printf("bogus PTR record\en");

Index: src/lib/libc/net/inet6_rthdr_space.3
diff -u src/lib/libc/net/inet6_rthdr_space.3:1.16 src/lib/libc/net/inet6_rthdr_space.3:1.17
--- src/lib/libc/net/inet6_rthdr_space.3:1.16	Mon Mar 22 19:30:54 2010
+++ src/lib/libc/net/inet6_rthdr_space.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: inet6_rthdr_space.3,v 1.16 2010/03/22 19:30:54 joerg Exp $
+.\"	$NetBSD: inet6_rthdr_space.3,v 1.17 2017/07/03 21:32:49 wiz Exp $
 .\"	$KAME: inet6_rthdr_space.3,v 1.8 2000/05/17 14:30:15 itojun Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
@@ -73,7 +73,7 @@ return #bytes required for ancillary dat
 .It Fn inet6_rthdr_init
 initialize ancillary data for Routing header
 .It Fn inet6_rthdr_add
-add IPv6 address \*[Am] flags to Routing header
+add IPv6 address & flags to Routing header
 .It Fn inet6_rthdr_lasthop
 specify the flags for the final hop
 .El

Index: src/lib/libc/net/linkaddr.3
diff -u src/lib/libc/net/linkaddr.3:1.12 src/lib/libc/net/linkaddr.3:1.13
--- src/lib/libc/net/linkaddr.3:1.12	Wed Dec  7 03:48:05 2016
+++ src/lib/libc/net/linkaddr.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: linkaddr.3,v 1.12 2016/12/07 03:48:05 pgoyette Exp $
+.\"	$NetBSD: linkaddr.3,v 1.13 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -64,7 +64,7 @@ This facility is experimental and is sti
 .Pp
 Prior to a call to
 .Fn link_addr ,
-.Fa sdl-\*[Gt]sdl_len
+.Fa sdl->sdl_len
 must be initialized to the size of the link-level socket structure,
 typically
 .Fa sizeof(struct sockaddr_dl) .

Index: src/lib/libc/net/nsdispatch.3
diff -u src/lib/libc/net/nsdispatch.3:1.33 src/lib/libc/net/nsdispatch.3:1.34
--- src/lib/libc/net/nsdispatch.3:1.33	Sun Jan  4 21:38:58 2015
+++ src/lib/libc/net/nsdispatch.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: nsdispatch.3,v 1.33 2015/01/04 21:38:58 wiz Exp $
+.\"	$NetBSD: nsdispatch.3,v 1.34 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999, 2004, 2005, 2008
 .\" The NetBSD Foundation, Inc.
@@ -232,7 +232,7 @@ path using the following naming conventi
 .Bl -item -offset indent
 .It
 .Bd -literal
-nss_\*[Lt]source\*[Gt].so.\*[Lt]version\*[Gt]
+nss_<source>.so.<version>
 .Ed
 .Bl -tag -width XversionX
 .It Aq source

Index: src/lib/libc/regex/re_format.7
diff -u src/lib/libc/regex/re_format.7:1.11 src/lib/libc/regex/re_format.7:1.12
--- src/lib/libc/regex/re_format.7:1.11	Sat Aug 22 14:04:54 2015
+++ src/lib/libc/regex/re_format.7	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: re_format.7,v 1.11 2015/08/22 14:04:54 wiz Exp $
+.\"	$NetBSD: re_format.7,v 1.12 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -215,7 +215,7 @@ A locale may provide others.
 A character class may not be used as an endpoint of a range.
 .Pp
 There are two special cases(*) of bracket expressions:
-the bracket expressions `[[:\*[Lt]:]]' and `[[:\*[Gt]:]]' match
+the bracket expressions `[[:<:]]' and `[[:>:]]' match
 the null string at the beginning and end of a word respectively.
 A word is defined as a sequence of word characters
 which is neither preceded nor followed by word characters.

Index: src/lib/libc/regex/regex.3
diff -u src/lib/libc/regex/regex.3:1.24 src/lib/libc/regex/regex.3:1.25
--- src/lib/libc/regex/regex.3:1.24	Thu Jan 14 22:06:42 2016
+++ src/lib/libc/regex/regex.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: regex.3,v 1.24 2016/01/14 22:06:42 christos Exp $
+.\"	$NetBSD: regex.3,v 1.25 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -341,8 +341,8 @@ Unused entries in the array\(emcorrespon
 did not participate in the match at all, or to subexpressions that do not
 exist in the RE (that is,
 .Fa i
-\*[Gt]
-.Fa preg-\*[Gt]re_nsub )
+>
+.Fa preg->re_nsub )
 \(emhave both
 .Fa rm_so
 and

Index: src/lib/libc/rpc/bindresvport.3
diff -u src/lib/libc/rpc/bindresvport.3:1.13 src/lib/libc/rpc/bindresvport.3:1.14
--- src/lib/libc/rpc/bindresvport.3:1.13	Sat Jan 27 07:58:47 2007
+++ src/lib/libc/rpc/bindresvport.3	Mon Jul  3 21:32:49 2017
@@ -1,5 +1,5 @@
 .\"	@(#)bindresvport.3n	2.2 88/08/02 4.0 RPCSRC; from 1.7 88/03/14 SMI
-.\"	$NetBSD: bindresvport.3,v 1.13 2007/01/27 07:58:47 cbiere Exp $
+.\"	$NetBSD: bindresvport.3,v 1.14 2017/07/03 21:32:49 wiz Exp $
 .\"
 .Dd January 27, 2007
 .Dt BINDRESVPORT 3
@@ -36,18 +36,18 @@ is a pointer to a
 .Ft "struct sockaddr_in"
 then the appropriate fields in the structure should be defined.
 Note that
-.Fa sin-\*[Gt]sin_family
+.Fa sin->sin_family
 must be initialized to the address family of the socket, passed by
 .Fa sd .
 If
-.Fa sin-\*[Gt]sin_port
+.Fa sin->sin_port
 is
 .Sq 0
 then a port (in the range 600-1023) will be
 chosen, and if
 .Xr bind 2
 is successful, the
-.Fa sin-\*[Gt]sin_port
+.Fa sin->sin_port
 will be updated to contain the allocated port.
 .Pp
 If

Index: src/lib/libc/rpc/rpc.3
diff -u src/lib/libc/rpc/rpc.3:1.24 src/lib/libc/rpc/rpc.3:1.25
--- src/lib/libc/rpc/rpc.3:1.24	Sun May 13 15:47:38 2012
+++ src/lib/libc/rpc/rpc.3	Mon Jul  3 21:32:49 2017
@@ -1,6 +1,6 @@
 .\" @(#)rpc.3n 1.31 93/08/31 SMI; from SVr4
 .\" Copyright 1989 AT&T
-.\"	$NetBSD: rpc.3,v 1.24 2012/05/13 15:47:38 wiz Exp $
+.\"	$NetBSD: rpc.3,v 1.25 2017/07/03 21:32:49 wiz Exp $
 .Dd May 7, 1993
 .Dt RPC 3
 .Os
@@ -146,7 +146,7 @@ typedef struct {
     struct    opaque_auth    ah_verf;
     struct auth_ops {
         void    (*ah_nextverf)(\|);
-        int    (*ah_marshal)(\|);    /* nextverf \*[Am] serialize */
+        int    (*ah_marshal)(\|);    /* nextverf & serialize */
         int    (*ah_validate)(\|);    /* validate verifier */
         int    (*ah_refresh)(\|);    /* refresh credentials */
         void    (*ah_destroy)(\|);    /* destroy this structure */
@@ -281,7 +281,7 @@ typedef struct {
 } XDR;
 
 /*
- * The netbuf structure. This structure is defined in \*[Lt]xti.h\*[Gt] on SysV
+ * The netbuf structure. This structure is defined in <xti.h> on SysV
  * systems, but NetBSD does not use XTI.
  *
  * Usually, buf will point to a struct sockaddr, and len and maxlen

Index: src/lib/libc/rpc/rpc_clnt_create.3
diff -u src/lib/libc/rpc/rpc_clnt_create.3:1.12 src/lib/libc/rpc/rpc_clnt_create.3:1.13
--- src/lib/libc/rpc/rpc_clnt_create.3:1.12	Tue May 17 03:35:39 2011
+++ src/lib/libc/rpc/rpc_clnt_create.3	Mon Jul  3 21:32:49 2017
@@ -2,7 +2,7 @@
 .\" Copyright 1989 AT&T
 .\" @(#)rpc_clnt_create 1.5 89/07/24 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpc_clnt_create.3,v 1.12 2011/05/17 03:35:39 enami Exp $
+.\"	$NetBSD: rpc_clnt_create.3,v 1.13 2017/07/03 21:32:49 wiz Exp $
 .Dd May 23, 2009
 .Dt RPC_CLNT_CREATE 3
 .Os
@@ -228,7 +228,7 @@ was set using
 .Fn clnt_control ,
 the file descriptor will be closed.
 The caller should call
-.Fn auth_destroy "clnt-\*[Gt]cl_auth"
+.Fn auth_destroy "clnt->cl_auth"
 (before calling
 .Fn clnt_destroy )
 to destroy the associated

Index: src/lib/libc/rpc/rpc_soc.3
diff -u src/lib/libc/rpc/rpc_soc.3:1.16 src/lib/libc/rpc/rpc_soc.3:1.17
--- src/lib/libc/rpc/rpc_soc.3:1.16	Thu Dec 29 22:07:12 2016
+++ src/lib/libc/rpc/rpc_soc.3	Mon Jul  3 21:32:49 2017
@@ -1,5 +1,5 @@
 .\"	@(#)rpc.3n	2.4 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
-.\"	$NetBSD: rpc_soc.3,v 1.16 2016/12/29 22:07:12 wiz Exp $
+.\"	$NetBSD: rpc_soc.3,v 1.17 2017/07/03 21:32:49 wiz Exp $
 .\" Converted to mdoc by Thomas Klausner <w...@netbsd.org>
 .\"
 .Dd December 29, 2016
@@ -537,7 +537,7 @@ the client uses TCP/IP as a transport.
 The remote program is located at Internet address
 .Fa *addr .
 If
-.Fa addr-\*[Gt]sin_port
+.Fa addr->sin_port
 is zero, then it is set to the actual port that the remote
 program is listening on (the remote
 .Xr rpcbind 8
@@ -569,7 +569,7 @@ the client uses UDP/IP as a transport.
 The remote program is located at Internet address
 .Fa addr .
 If
-.Fa addr-\*[Gt]sin_port
+.Fa addr->sin_port
 is zero, then it is set to actual port that the remote
 program is listening on (the remote
 .Xr rpcbind 8
@@ -600,7 +600,7 @@ the client uses UDP/IP as a transport.
 The remote program is located at Internet address
 .Fa addr .
 If
-.Fa addr-\*[Gt]sin_port
+.Fa addr->sin_port
 is zero, then it is set to actual port that the remote
 program is listening on (the remote
 .Xr rpcbind 8
@@ -844,7 +844,7 @@ is non-zero, then a mapping of the tripl
 .Fa versnum ,
 .Fa protocol ]
 to
-.Fa xprt-\*[Gt]xp_port
+.Fa xprt->xp_port
 is established with the local
 .Xr rpcbind 8
 service (generally
@@ -945,9 +945,9 @@ in which case a new socket is created.
 If the socket is not bound to a local TCP
 port, then this routine binds it to an arbitrary port.
 Upon completion,
-.Fa xprt-\*[Gt]xp_sock
+.Fa xprt->xp_sock
 is the transport's socket descriptor, and
-.Fa xprt-\*[Gt]xp_port
+.Fa xprt->xp_port
 is the transport's port number.
 This routine returns
 .Dv NULL
@@ -975,9 +975,9 @@ in which case a new socket is created.
 If the socket is not bound to a local UDP
 port, then this routine binds it to an arbitrary port.
 Upon completion,
-.Fa xprt-\*[Gt]xp_sock
+.Fa xprt->xp_sock
 is the transport's socket descriptor, and
-.Fa xprt-\*[Gt]xp_port
+.Fa xprt->xp_port
 is the transport's port number.
 This routine returns
 .Dv NULL

Index: src/lib/libc/rpc/rpc_svc_reg.3
diff -u src/lib/libc/rpc/rpc_svc_reg.3:1.10 src/lib/libc/rpc/rpc_svc_reg.3:1.11
--- src/lib/libc/rpc/rpc_svc_reg.3:1.10	Mon Mar  4 17:29:03 2013
+++ src/lib/libc/rpc/rpc_svc_reg.3	Mon Jul  3 21:32:49 2017
@@ -2,7 +2,7 @@
 .\" Copyright 1989 AT&T
 .\" @(#)rpc_svc_call 1.6 89/07/20 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpc_svc_reg.3,v 1.10 2013/03/04 17:29:03 christos Exp $
+.\"	$NetBSD: rpc_svc_reg.3,v 1.11 2017/07/03 21:32:49 wiz Exp $
 .Dd May 3, 1993
 .Dt RPC_SVC_REG 3
 .Os
@@ -100,9 +100,9 @@ then a mapping of the triple
 [
 .Fa prognum ,
 .Fa versnum ,
-.Fa netconf-\*[Gt]nc_netid ]
+.Fa netconf->nc_netid ]
 to
-.Fa xprt-\*[Gt]xp_ltaddr
+.Fa xprt->xp_ltaddr
 is established with the local rpcbind
 service.
 .Pp

Index: src/lib/libc/rpc/rpcbind.3
diff -u src/lib/libc/rpc/rpcbind.3:1.11 src/lib/libc/rpc/rpcbind.3:1.12
--- src/lib/libc/rpc/rpcbind.3:1.11	Sat Apr 11 16:07:20 2009
+++ src/lib/libc/rpc/rpcbind.3	Mon Jul  3 21:32:49 2017
@@ -1,7 +1,7 @@
 .\" @(#)rpcbind.3n 1.25 93/05/07 SMI; from SVr4
 .\" Copyright 1989 AT&T
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpcbind.3,v 1.11 2009/04/11 16:07:20 joerg Exp $
+.\"	$NetBSD: rpcbind.3,v 1.12 2017/07/03 21:32:49 wiz Exp $
 .Dd December 4, 2005
 .Dt RPCBIND 3
 .Os
@@ -141,7 +141,7 @@ service, which establishes a mapping bet
 [
 .Fa prognum ,
 .Fa versnum ,
-.Fa netconf-\*[Gt]nc_netid ]
+.Fa netconf->nc_netid ]
 and
 .Fa svcaddr
 on the machine's rpcbind
@@ -169,7 +169,7 @@ service, which destroys the mapping betw
 [
 .Fa prognum ,
 .Fa versnum ,
-.Fa netconf-\*[Gt]nc_netid ]
+.Fa netconf->nc_netid ]
 and the address on the machine's rpcbind
 service.
 If

Index: src/lib/libc/ssp/__builtin_object_size.3
diff -u src/lib/libc/ssp/__builtin_object_size.3:1.10 src/lib/libc/ssp/__builtin_object_size.3:1.11
--- src/lib/libc/ssp/__builtin_object_size.3:1.10	Thu Jul 19 06:44:12 2012
+++ src/lib/libc/ssp/__builtin_object_size.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: __builtin_object_size.3,v 1.10 2012/07/19 06:44:12 wiz Exp $
+.\"	$NetBSD: __builtin_object_size.3,v 1.11 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 2007 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -72,10 +72,10 @@ knows that they can be pointed to by
 .Fa ptr
 when
 .Fa type
-.Dv \*[Am] 2 == 0 ,
+.Dv & 2 == 0 ,
 and the minimum size when
 .Fa type
-.Dv \*[Am] 2 != 0 .
+.Dv & 2 != 0 .
 .Sh SEE ALSO
 .Xr gcc 1 ,
 .Xr __builtin_return_address 3 ,

Index: src/lib/libc/stdio/getdelim.3
diff -u src/lib/libc/stdio/getdelim.3:1.14 src/lib/libc/stdio/getdelim.3:1.15
--- src/lib/libc/stdio/getdelim.3:1.14	Tue Sep 16 08:52:02 2014
+++ src/lib/libc/stdio/getdelim.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"     $NetBSD: getdelim.3,v 1.14 2014/09/16 08:52:02 wiz Exp $
+.\"     $NetBSD: getdelim.3,v 1.15 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -112,7 +112,7 @@ char *line = NULL;
 size_t linesize = 0;
 ssize_t linelen;
 
-while ((linelen = getline(\*[Am]line, \*[Am]linesize, fp)) != -1)
+while ((linelen = getline(&line, &linesize, fp)) != -1)
 	fwrite(line, linelen, 1, stdout);
 
 if (ferror(fp))

Index: src/lib/libc/stdio/printf.3
diff -u src/lib/libc/stdio/printf.3:1.66 src/lib/libc/stdio/printf.3:1.67
--- src/lib/libc/stdio/printf.3:1.66	Tue Feb 21 18:47:40 2017
+++ src/lib/libc/stdio/printf.3	Mon Jul  3 21:32:49 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: printf.3,v 1.66 2017/02/21 18:47:40 abhinav Exp $
+.\"	$NetBSD: printf.3,v 1.67 2017/07/03 21:32:49 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -757,7 +757,7 @@ and
 .Fa month
 are pointers to strings:
 .Bd -literal -offset indent
-#include \*[Lt]stdio.h\*[Gt]
+#include <stdio.h>
 fprintf(stdout, "%s, %s %d, %.2d:%.2d\en",
 	weekday, month, day, hour, min);
 .Ed
@@ -765,16 +765,16 @@ fprintf(stdout, "%s, %s %d, %.2d:%.2d\en
 To print \*(Pi
 to five decimal places:
 .Bd -literal -offset indent
-#include \*[Lt]math.h\*[Gt]
-#include \*[Lt]stdio.h\*[Gt]
+#include <math.h>
+#include <stdio.h>
 fprintf(stdout, "pi = %.5f\en", 4 * atan(1.0));
 .Ed
 .Pp
 To allocate a 128 byte string and print into it:
 .Bd -literal -offset indent
-#include \*[Lt]stdio.h\*[Gt]
-#include \*[Lt]stdlib.h\*[Gt]
-#include \*[Lt]stdarg.h\*[Gt]
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
 char *newfmt(const char *fmt, ...)
 {
 	char *p;

Index: src/lib/libc/stdlib/getopt.3
diff -u src/lib/libc/stdlib/getopt.3:1.34 src/lib/libc/stdlib/getopt.3:1.35
--- src/lib/libc/stdlib/getopt.3:1.34	Thu Jun  5 22:09:50 2014
+++ src/lib/libc/stdlib/getopt.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getopt.3,v 1.34 2014/06/05 22:09:50 wiz Exp $
+.\"	$NetBSD: getopt.3,v 1.35 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -181,7 +181,7 @@ while ((ch = getopt(argc, argv, "bf:")) 
 		bflag = 1;
 		break;
 	case 'f':
-		if ((fd = open(optarg, O_RDONLY, 0)) \*[Lt] 0) {
+		if ((fd = open(optarg, O_RDONLY, 0)) < 0) {
 			(void)fprintf(stderr,
 			    "myname: %s: %s\en", optarg, strerror(errno));
 			exit(1);
@@ -300,7 +300,7 @@ while ((ch = getopt(argc, argv, "0123456
 	case '0': case '1': case '2': case '3': case '4':
 	case '5': case '6': case '7': case '8': case '9':
 		p = argv[optind - 1];
-		if (p[0] == '-' \*[Am]\*[Am] p[1] == ch \*[Am]\*[Am] !p[2])
+		if (p[0] == '-' && p[1] == ch && !p[2])
 			length = ch - '0';
 		else
 			length = strtol(argv[optind] + 1, NULL, 10);

Index: src/lib/libc/stdlib/getopt_long.3
diff -u src/lib/libc/stdlib/getopt_long.3:1.18 src/lib/libc/stdlib/getopt_long.3:1.19
--- src/lib/libc/stdlib/getopt_long.3:1.18	Mon Jul  2 17:56:17 2007
+++ src/lib/libc/stdlib/getopt_long.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getopt_long.3,v 1.18 2007/07/02 17:56:17 ginsbach Exp $
+.\"	$NetBSD: getopt_long.3,v 1.19 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -169,7 +169,7 @@ int daggerset;
 static struct option longopts[] = {
 	{ "buffy",	no_argument,		0, 		'b' },
 	{ "fluoride",	required_argument,	0, 	       	'f' },
-	{ "daggerset",	no_argument,		\*[Am]daggerset,	1 },
+	{ "daggerset",	no_argument,		&daggerset,	1 },
 	{ NULL,		0,			NULL, 		0 }
 };
 
@@ -180,7 +180,7 @@ while ((ch = getopt_long(argc, argv, "bf
 		bflag = 1;
 		break;
 	case 'f':
-		if ((fd = open(optarg, O_RDONLY, 0)) \*[Lt] 0) {
+		if ((fd = open(optarg, O_RDONLY, 0)) < 0) {
 			(void)fprintf(stderr,
 			    "myname: %s: %s\en", optarg, strerror(errno));
 			exit(1);

Index: src/lib/libc/stdlib/getsubopt.3
diff -u src/lib/libc/stdlib/getsubopt.3:1.14 src/lib/libc/stdlib/getsubopt.3:1.15
--- src/lib/libc/stdlib/getsubopt.3:1.14	Tue Nov 17 15:02:08 2009
+++ src/lib/libc/stdlib/getsubopt.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getsubopt.3,v 1.14 2009/11/17 15:02:08 wiz Exp $
+.\"	$NetBSD: getsubopt.3,v 1.15 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -115,7 +115,7 @@ while ((ch = getopt(argc, argv, "ab:")) 
 	case 'b':
 		options = optarg;
 		while (*options) {
-			switch(getsubopt(\*[Am]options, tokens, \*[Am]value)) {
+			switch(getsubopt(&options, tokens, &value)) {
 			case ONE:
 				/* process ``one'' sub option */
 				break;

Index: src/lib/libc/stdlib/ptsname.3
diff -u src/lib/libc/stdlib/ptsname.3:1.9 src/lib/libc/stdlib/ptsname.3:1.10
--- src/lib/libc/stdlib/ptsname.3:1.9	Fri Jan 10 09:43:15 2014
+++ src/lib/libc/stdlib/ptsname.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: ptsname.3,v 1.9 2014/01/10 09:43:15 wiz Exp $
+.\" $NetBSD: ptsname.3,v 1.10 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -137,7 +137,7 @@ The
 function is equivalent to:
 .Bd -literal
 	struct ptmget pm;
-	return ioctl(masterfd, TIOCPTSNAME, \*[Am]pm) == -1 ? NULL : pm.sn;
+	return ioctl(masterfd, TIOCPTSNAME, &pm) == -1 ? NULL : pm.sn;
 .Ed
 .Pp
 Both the

Index: src/lib/libc/stdlib/random.3
diff -u src/lib/libc/stdlib/random.3:1.21 src/lib/libc/stdlib/random.3:1.22
--- src/lib/libc/stdlib/random.3:1.21	Thu Jun 12 18:46:12 2014
+++ src/lib/libc/stdlib/random.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: random.3,v 1.21 2014/06/12 18:46:12 christos Exp $
+.\"	$NetBSD: random.3,v 1.22 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -85,7 +85,7 @@ All the bits generated by
 .Fn random
 are usable.
 For example,
-.Sq Li random()\*[Am]01
+.Sq Li random()&01
 will produce a random binary value.
 .Pp
 Like

Index: src/lib/libc/stdlib/strtoi.3
diff -u src/lib/libc/stdlib/strtoi.3:1.6 src/lib/libc/stdlib/strtoi.3:1.7
--- src/lib/libc/stdlib/strtoi.3:1.6	Fri Nov 13 16:00:32 2015
+++ src/lib/libc/stdlib/strtoi.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: strtoi.3,v 1.6 2015/11/13 16:00:32 christos Exp $
+.\"	$NetBSD: strtoi.3,v 1.7 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -198,7 +198,7 @@ points to the first unconverted characte
 The given string was out of range; the value converted has been clamped;
 or the range given was invalid, i.e.
 .Fa lo
-\*[Gt]
+>
 .Fa hi .
 .El
 .Sh SEE ALSO
Index: src/lib/libc/stdlib/strtou.3
diff -u src/lib/libc/stdlib/strtou.3:1.6 src/lib/libc/stdlib/strtou.3:1.7
--- src/lib/libc/stdlib/strtou.3:1.6	Fri Nov 13 16:00:32 2015
+++ src/lib/libc/stdlib/strtou.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: strtou.3,v 1.6 2015/11/13 16:00:32 christos Exp $
+.\"	$NetBSD: strtou.3,v 1.7 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -198,7 +198,7 @@ points to the first unconverted characte
 The given string was out of range; the value converted has been clamped; or
 the range given was invalid, i.e.
 .Fa lo
-\*[Gt]
+>
 .Fa hi .
 .El
 .Sh SEE ALSO

Index: src/lib/libc/stdlib/strtol.3
diff -u src/lib/libc/stdlib/strtol.3:1.39 src/lib/libc/stdlib/strtol.3:1.40
--- src/lib/libc/stdlib/strtol.3:1.39	Fri Nov  4 20:19:58 2016
+++ src/lib/libc/stdlib/strtol.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: strtol.3,v 1.39 2016/11/04 20:19:58 riastradh Exp $
+.\"	$NetBSD: strtol.3,v 1.40 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -224,7 +224,7 @@ long lval;
 \&...
 
 errno = 0;
-lval = strtol(buf, \*[Am]ep, 10);
+lval = strtol(buf, &ep, 10);
 if (ep == buf)
 	goto not_a_number;
 if (*ep != '\e0')
@@ -265,7 +265,7 @@ long lval;
 \&...
 
 errno = 0;
-lval = strtol(buf, \*[Am]ep, 10);
+lval = strtol(buf, &ep, 10);
 if (ep == buf)
 	goto not_a_number;
 if (*ep != '\e0')

Index: src/lib/libc/stdlib/strtoul.3
diff -u src/lib/libc/stdlib/strtoul.3:1.36 src/lib/libc/stdlib/strtoul.3:1.37
--- src/lib/libc/stdlib/strtoul.3:1.36	Sat Nov  5 20:57:31 2016
+++ src/lib/libc/stdlib/strtoul.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: strtoul.3,v 1.36 2016/11/05 20:57:31 riastradh Exp $
+.\"	$NetBSD: strtoul.3,v 1.37 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -226,7 +226,7 @@ unsigned long ulval;
 \&...
 
 errno = 0;
-ulval = strtoul(buf, \*[Am]ep, 10);
+ulval = strtoul(buf, &ep, 10);
 if (ep == buf)
 	goto not_a_number;
 if (*ep != '\e0')

Index: src/lib/libc/string/strerror.3
diff -u src/lib/libc/string/strerror.3:1.18 src/lib/libc/string/strerror.3:1.19
--- src/lib/libc/string/strerror.3:1.18	Sat May  9 19:01:53 2015
+++ src/lib/libc/string/strerror.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: strerror.3,v 1.18 2015/05/09 19:01:53 dholland Exp $
+.\" $NetBSD: strerror.3,v 1.19 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -121,9 +121,9 @@ and
 returns
 .Er EINVAL .
 Error numbers recognized by this implementation fall in
-the range 0 \*[Lt]
+the range 0 <
 .Fa errnum
-\*[Lt]
+<
 .Fa sys_nerr .
 .Pp
 If insufficient storage is provided in

Index: src/lib/libc/string/strsep.3
diff -u src/lib/libc/string/strsep.3:1.19 src/lib/libc/string/strsep.3:1.20
--- src/lib/libc/string/strsep.3:1.19	Mon Oct 16 08:48:45 2006
+++ src/lib/libc/string/strsep.3	Mon Jul  3 21:32:50 2017
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)strsep.3	8.1 (Berkeley) 6/9/93
-.\"	$NetBSD: strsep.3,v 1.19 2006/10/16 08:48:45 wiz Exp $
+.\"	$NetBSD: strsep.3,v 1.20 2017/07/03 21:32:50 wiz Exp $
 .\"
 .Dd August 12, 2006
 .Dt STRSEP 3
@@ -94,8 +94,8 @@ argument vector:
 .Bd -literal -offset indent
 char **ap, *argv[10], *inputstring;
 
-for (ap = argv; ap \*[Lt] \*[Am]argv[9] \*[Am]\*[Am]
-    (*ap = strsep(\*[Am]inputstring, " \et")) != NULL;) {
+for (ap = argv; ap < &argv[9] &&
+    (*ap = strsep(&inputstring, " \et")) != NULL;) {
 	if (**ap != '\e0')
 		ap++;
 }

Index: src/lib/libc/sys/bind.2
diff -u src/lib/libc/sys/bind.2:1.29 src/lib/libc/sys/bind.2:1.30
--- src/lib/libc/sys/bind.2:1.29	Sun Apr  5 20:41:05 2015
+++ src/lib/libc/sys/bind.2	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: bind.2,v 1.29 2015/04/05 20:41:05 wiz Exp $
+.\"	$NetBSD: bind.2,v 1.30 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -97,7 +97,7 @@ address space.
 .It Bq Er EINVAL
 The socket is already bound to an address; or
 the family of the socket and that requested in
-.Fa name-\*[Gt]sa_family
+.Fa name->sa_family
 are not equivalent.
 .It Bq Er ENOTSOCK
 .Fa s

Index: src/lib/libc/sys/dup.2
diff -u src/lib/libc/sys/dup.2:1.32 src/lib/libc/sys/dup.2:1.33
--- src/lib/libc/sys/dup.2:1.32	Tue Feb 21 18:01:38 2017
+++ src/lib/libc/sys/dup.2	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: dup.2,v 1.32 2017/02/21 18:01:38 abhinav Exp $
+.\"	$NetBSD: dup.2,v 1.33 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -177,7 +177,7 @@ input or standard output of a subprocess
 That is done approximately as follows (error handling omitted for
 clarity):
 .Bd -literal -offset indent
-#include \*[Lt]unistd.h\*[Gt]
+#include <unistd.h>
 
 int fds[2];
 pid_t pid;
Index: src/lib/libc/sys/readlink.2
diff -u src/lib/libc/sys/readlink.2:1.32 src/lib/libc/sys/readlink.2:1.33
--- src/lib/libc/sys/readlink.2:1.32	Mon Jul 29 11:49:31 2013
+++ src/lib/libc/sys/readlink.2	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: readlink.2,v 1.32 2013/07/29 11:49:31 wiz Exp $
+.\"	$NetBSD: readlink.2,v 1.33 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -95,8 +95,8 @@ which reads the contents of a symbolic l
 .Pa /symbolic/link
 and stores them as null-terminated string:
 .Bd -literal -offset indent
-#include \*[Lt]limits.h\*[Gt]
-#include \*[Lt]unistd.h\*[Gt]
+#include <limits.h>
+#include <unistd.h>
 
 char buf[PATH_MAX];
 ssize_t len;

Index: src/lib/libc/sys/intro.2
diff -u src/lib/libc/sys/intro.2:1.59 src/lib/libc/sys/intro.2:1.60
--- src/lib/libc/sys/intro.2:1.59	Sun May 14 12:30:37 2017
+++ src/lib/libc/sys/intro.2	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: intro.2,v 1.59 2017/05/14 12:30:37 wiz Exp $
+.\"	$NetBSD: intro.2,v 1.60 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1983, 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -209,8 +209,8 @@ Maximum number of file descriptors allow
 has been reached and a request for an open cannot be satisfied
 until at least one has been closed.
 .It Er 24 EMFILE Em "Too many open files" .
-\*[Lt]As released, the limit on the number of
-open files per process is 64.\*[Gt]
+<As released, the limit on the number of
+open files per process is 64.>
 The
 .Xr getrlimit 2
 call with the

Index: src/lib/libc/sys/kqueue.2
diff -u src/lib/libc/sys/kqueue.2:1.45 src/lib/libc/sys/kqueue.2:1.46
--- src/lib/libc/sys/kqueue.2:1.45	Wed Jun  7 20:54:59 2017
+++ src/lib/libc/sys/kqueue.2	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kqueue.2,v 1.45 2017/06/07 20:54:59 kamil Exp $
+.\"	$NetBSD: kqueue.2,v 1.46 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 2000 Jonathan Lemon
 .\" All rights reserved.
@@ -52,7 +52,7 @@
 .Fn kqueue1 "int flags"
 .Ft int
 .Fn kevent "int kq" "const struct kevent *changelist" "size_t nchanges" "struct kevent *eventlist" "size_t nevents" "const struct timespec *timeout"
-.Fn EV_SET "\*[Am]kev" ident filter flags fflags data udata
+.Fn EV_SET "&kev" ident filter flags fflags data udata
 .Sh DESCRIPTION
 .Fn kqueue
 provides a generic method of notifying the user when an event
@@ -523,14 +523,14 @@ The following example program monitors a
 argument) and prints information about some common events it receives
 notifications for:
 .Bd -literal -offset indent
-#include \*[Lt]sys/types.h\*[Gt]
-#include \*[Lt]sys/event.h\*[Gt]
-#include \*[Lt]sys/time.h\*[Gt]
-#include \*[Lt]stdio.h\*[Gt]
-#include \*[Lt]unistd.h\*[Gt]
-#include \*[Lt]stdlib.h\*[Gt]
-#include \*[Lt]fcntl.h\*[Gt]
-#include \*[Lt]err.h\*[Gt]
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/time.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <err.h>
 
 int
 main(int argc, char *argv[])
@@ -545,44 +545,44 @@ main(int argc, char *argv[])
         if ((kq = kqueue()) == -1)
                 err(1, "Cannot create kqueue");
 
-        EV_SET(\*[Am]ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
+        EV_SET(&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
             NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_LINK|
             NOTE_RENAME|NOTE_REVOKE, 0, 0);
-        if (kevent(kq, \*[Am]ev, 1, NULL, 0, \*[Am]tout) == -1)
+        if (kevent(kq, &ev, 1, NULL, 0, &tout) == -1)
                 err(1, "kevent");
         for (;;) {
-                nev = kevent(kq, NULL, 0, \*[Am]ev, 1, \*[Am]tout);
+                nev = kevent(kq, NULL, 0, &ev, 1, &tout);
                 if (nev == -1)
                         err(1, "kevent");
                 if (nev == 0)
                         continue;
-                if (ev.fflags \*[Am] NOTE_DELETE) {
+                if (ev.fflags & NOTE_DELETE) {
                         printf("deleted ");
-                        ev.fflags \*[Am]= ~NOTE_DELETE;
+                        ev.fflags &= ~NOTE_DELETE;
                 }
-                if (ev.fflags \*[Am] NOTE_WRITE) {
+                if (ev.fflags & NOTE_WRITE) {
                         printf("written ");
-                        ev.fflags \*[Am]= ~NOTE_WRITE;
+                        ev.fflags &= ~NOTE_WRITE;
                 }
-                if (ev.fflags \*[Am] NOTE_EXTEND) {
+                if (ev.fflags & NOTE_EXTEND) {
                         printf("extended ");
-                        ev.fflags \*[Am]= ~NOTE_EXTEND;
+                        ev.fflags &= ~NOTE_EXTEND;
                 }
-                if (ev.fflags \*[Am] NOTE_ATTRIB) {
+                if (ev.fflags & NOTE_ATTRIB) {
                         printf("chmod/chown/utimes ");
-                        ev.fflags \*[Am]= ~NOTE_ATTRIB;
+                        ev.fflags &= ~NOTE_ATTRIB;
                 }
-                if (ev.fflags \*[Am] NOTE_LINK) {
+                if (ev.fflags & NOTE_LINK) {
                         printf("hardlinked ");
-                        ev.fflags \*[Am]= ~NOTE_LINK;
+                        ev.fflags &= ~NOTE_LINK;
                 }
-                if (ev.fflags \*[Am] NOTE_RENAME) {
+                if (ev.fflags & NOTE_RENAME) {
                         printf("renamed ");
-                        ev.fflags \*[Am]= ~NOTE_RENAME;
+                        ev.fflags &= ~NOTE_RENAME;
                 }
-                if (ev.fflags \*[Am] NOTE_REVOKE) {
+                if (ev.fflags & NOTE_REVOKE) {
                         printf("revoked ");
-                        ev.fflags \*[Am]= ~NOTE_REVOKE;
+                        ev.fflags &= ~NOTE_REVOKE;
                 }
                 printf("\\n");
                 if (ev.fflags)

Index: src/lib/libc/sys/modctl.2
diff -u src/lib/libc/sys/modctl.2:1.12 src/lib/libc/sys/modctl.2:1.13
--- src/lib/libc/sys/modctl.2:1.12	Wed Nov  4 04:31:53 2015
+++ src/lib/libc/sys/modctl.2	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: modctl.2,v 1.12 2015/11/04 04:31:53 pgoyette Exp $
+.\"	$NetBSD: modctl.2,v 1.13 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -252,7 +252,7 @@ and
 is not
 .Dv 0 .
 The kernel is unable to internalize the plist.
-Or, there is a problem with the module or \*[Lt]module\*[Gt].plist.
+Or, there is a problem with the module or <module>.plist.
 .It Bq Er EMLINK
 The argument
 .Fa operation
Index: src/lib/libc/sys/timer_create.2
diff -u src/lib/libc/sys/timer_create.2:1.12 src/lib/libc/sys/timer_create.2:1.13
--- src/lib/libc/sys/timer_create.2:1.12	Tue Nov  6 21:16:21 2012
+++ src/lib/libc/sys/timer_create.2	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: timer_create.2,v 1.12 2012/11/06 21:16:21 uwe Exp $
+.\"	$NetBSD: timer_create.2,v 1.13 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -69,11 +69,11 @@ If the
 argument is
 .Dv NULL ,
 then
-.Fa evp-\*[Gt]sigev_notify
+.Fa evp->sigev_notify
 defaults to
 .Dv SIGEV_SIGNAL
 and
-.Fa evp-\*[Gt]sigev_value
+.Fa evp->sigev_value
 is set to
 .Ar timerid .
 Refer to

Index: src/lib/libc/sys/read.2
diff -u src/lib/libc/sys/read.2:1.35 src/lib/libc/sys/read.2:1.36
--- src/lib/libc/sys/read.2:1.35	Sun Jul 14 14:29:09 2013
+++ src/lib/libc/sys/read.2	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: read.2,v 1.35 2013/07/14 14:29:09 njoly Exp $
+.\"	$NetBSD: read.2,v 1.36 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -255,7 +255,7 @@ function call appeared in
 Error checks should explicitly test for \-1.
 Code such as
 .Bd -literal
-	while ((nr = read(fd, buf, sizeof(buf))) \*[Gt] 0)
+	while ((nr = read(fd, buf, sizeof(buf))) > 0)
 .Ed
 .Pp
 is not maximally portable, as some platforms allow for
@@ -269,5 +269,5 @@ and
 may appear as a negative number distinct from \-1.
 Proper loops should use
 .Bd -literal
-	while ((nr = read(fd, buf, sizeof(buf))) != -1 \*[Am]\*[Am] nr != 0)
+	while ((nr = read(fd, buf, sizeof(buf))) != -1 && nr != 0)
 .Ed

Index: src/lib/libc/sys/select.2
diff -u src/lib/libc/sys/select.2:1.41 src/lib/libc/sys/select.2:1.42
--- src/lib/libc/sys/select.2:1.41	Thu Nov 28 03:45:31 2013
+++ src/lib/libc/sys/select.2	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: select.2,v 1.41 2013/11/28 03:45:31 khorben Exp $
+.\"	$NetBSD: select.2,v 1.42 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -162,14 +162,14 @@ including one due to an interrupted call
 the descriptor sets will be unmodified.
 .Sh EXAMPLES
 .Bd -literal
-#include \*[Lt]stdio.h\*[Gt]
-#include \*[Lt]stdlib.h\*[Gt]
-#include \*[Lt]unistd.h\*[Gt]
-#include \*[Lt]string.h\*[Gt]
-#include \*[Lt]err.h\*[Gt]
-#include \*[Lt]errno.h\*[Gt]
-#include \*[Lt]sys/types.h\*[Gt]
-#include \*[Lt]sys/time.h\*[Gt]
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <err.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/time.h>
 
 int
 main(int argc, char **argv)
@@ -186,16 +186,16 @@ main(int argc, char **argv)
 	timeout.tv_usec = 0;
 
 	/* Initialize the read set to null */
-	FD_ZERO(\*[Am]read_set);
+	FD_ZERO(&read_set);
 
 	/* Add file descriptor 1 to read_set */
-	FD_SET(fd, \*[Am]read_set);
+	FD_SET(fd, &read_set);
 
 	/*
 	 * Check if data is ready to be read on
 	 * file descriptor 1, give up after 10 seconds.
 	 */
-	ret = select(fd + 1, \*[Am]read_set, NULL, NULL, \*[Am]timeout);
+	ret = select(fd + 1, &read_set, NULL, NULL, &timeout);
 
 	/*
 	 * Returned value is the number of file
@@ -218,11 +218,11 @@ main(int argc, char **argv)
 		 * only descriptors ready for I/O are set. These can
 		 * be tested using FD_ISSET
 		 */
-		for (i = 0; i \*[Lt]= fd; i++) {
-			if (FD_ISSET(i, \*[Am]read_set)) {
+		for (i = 0; i <= fd; i++) {
+			if (FD_ISSET(i, &read_set)) {
 				printf("Data on file descriptor %d\en", i);
 				/* Remove the file descriptor from the set */
-				FD_CLR(fd, \*[Am]read_set);
+				FD_CLR(fd, &read_set);
 			}
 		}
 		break;
@@ -322,7 +322,7 @@ userland libraries:
 		return (-1);
 	}
 	FD_SET(fd, fdsr);
-	n = select(max+1, fdsr, NULL, NULL, \*[Am]tv);
+	n = select(max+1, fdsr, NULL, NULL, &tv);
 	...
 	free(fdsr);
 .Ed

Index: src/lib/libc/sys/semctl.2
diff -u src/lib/libc/sys/semctl.2:1.20 src/lib/libc/sys/semctl.2:1.21
--- src/lib/libc/sys/semctl.2:1.20	Mon Mar 22 19:30:55 2010
+++ src/lib/libc/sys/semctl.2	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: semctl.2,v 1.20 2010/03/22 19:30:55 joerg Exp $
+.\"	$NetBSD: semctl.2,v 1.21 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
 .\" All rights reserved.
@@ -57,7 +57,7 @@ If required, it is a union of the follow
 .Bd -literal
     int     val;            /* value for SETVAL */
     struct  semid_ds *buf;  /* buffer for IPC_{STAT,SET} */
-    u_short *array;         /* array for GETALL \*[Am] SETALL */
+    u_short *array;         /* array for GETALL & SETALL */
 .Ed
 .Pp
 The

Index: src/lib/libc/sys/sigaltstack.2
diff -u src/lib/libc/sys/sigaltstack.2:1.24 src/lib/libc/sys/sigaltstack.2:1.25
--- src/lib/libc/sys/sigaltstack.2:1.24	Sat Sep 27 12:11:13 2014
+++ src/lib/libc/sys/sigaltstack.2	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sigaltstack.2,v 1.24 2014/09/27 12:11:13 njoly Exp $
+.\"	$NetBSD: sigaltstack.2,v 1.25 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -110,7 +110,7 @@ if ((sigstk.ss_sp = malloc(SIGSTKSZ)) ==
 	/* error return */
 sigstk.ss_size = SIGSTKSZ;
 sigstk.ss_flags = 0;
-if (sigaltstack(\*[Am]sigstk,0) \*[Lt] 0)
+if (sigaltstack(&sigstk,0) < 0)
 	perror("sigaltstack");
 .Ed
 .Pp

Index: src/lib/libc/sys/write.2
diff -u src/lib/libc/sys/write.2:1.34 src/lib/libc/sys/write.2:1.35
--- src/lib/libc/sys/write.2:1.34	Sun Apr 23 06:46:04 2017
+++ src/lib/libc/sys/write.2	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: write.2,v 1.34 2017/04/23 06:46:04 abhinav Exp $
+.\"	$NetBSD: write.2,v 1.35 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -269,7 +269,7 @@ function call appeared in
 Error checks should explicitly test for \-1.
 Code such as
 .Bd -literal
-	while ((nr = write(fd, buf, sizeof(buf))) \*[Gt] 0)
+	while ((nr = write(fd, buf, sizeof(buf))) > 0)
 .Ed
 .Pp
 is not maximally portable, as some platforms allow for
@@ -283,5 +283,5 @@ and
 may appear as a negative number distinct from \-1.
 Proper loops should use
 .Bd -literal
-	while ((nr = write(fd, buf, sizeof(buf))) != -1 \*[Am]\*[Am] nr != 0)
+	while ((nr = write(fd, buf, sizeof(buf))) != -1 && nr != 0)
 .Ed

Index: src/lib/libc/time/time2posix.3
diff -u src/lib/libc/time/time2posix.3:1.19 src/lib/libc/time/time2posix.3:1.20
--- src/lib/libc/time/time2posix.3:1.19	Tue Oct  7 21:51:03 2014
+++ src/lib/libc/time/time2posix.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: time2posix.3,v 1.19 2014/10/07 21:51:03 christos Exp $
+.\"	$NetBSD: time2posix.3,v 1.20 2017/07/03 21:32:50 wiz Exp $
 .Dd October 6, 2014
 .Dt TIME2POSIX 3
 .Os
@@ -129,7 +129,7 @@ A leap second deletion would look like..
 .It ??/07/01	00:00:00	A+1	B+2	A+1
 .It ??/07/01	00:00:01	A+2	B+3	A+2
 .El
-[Note: posix2time(B+1) =\*[Gt] A+0 or A+1]
+[Note: posix2time(B+1) => A+0 or A+1]
 .Pp
 If leap-second support is not enabled, local
 .Va time_t Ns 's

Index: src/lib/libc/time/tzset.3
diff -u src/lib/libc/time/tzset.3:1.35 src/lib/libc/time/tzset.3:1.36
--- src/lib/libc/time/tzset.3:1.35	Fri Oct  7 15:29:42 2016
+++ src/lib/libc/time/tzset.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: tzset.3,v 1.35 2016/10/07 15:29:42 christos Exp $
+.\"	$NetBSD: tzset.3,v 1.36 2017/07/03 21:32:50 wiz Exp $
 .Dd October 6, 2016
 .Dt TZSET 3
 .Os
@@ -187,11 +187,11 @@ Upper- and lowercase letters are explici
 Any characters except a leading colon (:), digits, comma (,), minus (-),
 plus (+), and NUL bytes are allowed.
 Alternatively, a designation can be surrounded by angle brackets
-.Dv \*[Lt]
+.Dv <
 and
-.Dv \*[Gt] ;
+.Dv > ;
 in this case, the designation can contain any characters other than
-.Dv \*[Gt]
+.Dv >
 and 
 .Dv NUL .
 .It Cm offset

Index: src/lib/libc/time/zdump.8
diff -u src/lib/libc/time/zdump.8:1.16 src/lib/libc/time/zdump.8:1.17
--- src/lib/libc/time/zdump.8:1.16	Sat Mar 11 18:23:14 2017
+++ src/lib/libc/time/zdump.8	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: zdump.8,v 1.16 2017/03/11 18:23:14 christos Exp $
+.\"	$NetBSD: zdump.8,v 1.17 2017/07/03 21:32:50 wiz Exp $
 .Dd March 11, 2017
 .Dt ZDUMP 8
 .Os
@@ -109,7 +109,7 @@ Dates are in
 format and times are in 24-hour
 .Dv hhmmss
 format where
-.Dv hh \*[Lt] 24 .
+.Dv hh < 24 .
 Times are in local time immediately after the transition.
 A time interval description consists of a UT offset in signed
 .Dv \&+- hh : mm : ss

Index: src/lib/libc/yp/ypclnt.3
diff -u src/lib/libc/yp/ypclnt.3:1.27 src/lib/libc/yp/ypclnt.3:1.28
--- src/lib/libc/yp/ypclnt.3:1.27	Fri Feb  3 21:03:05 2017
+++ src/lib/libc/yp/ypclnt.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ypclnt.3,v 1.27 2017/02/03 21:03:05 abhinav Exp $
+.\"	$NetBSD: ypclnt.3,v 1.28 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -323,7 +323,7 @@ in the map, then they will not be termin
 function, either.
 .It Fa indata
 This is the contents of the
-.Pa incallback-\*[Gt]data
+.Pa incallback->data
 element of the callback structure.
 It is provided as a means to share state between the
 .Pa foreach

Index: src/lib/libcompat/regexp/regexp.3
diff -u src/lib/libcompat/regexp/regexp.3:1.17 src/lib/libcompat/regexp/regexp.3:1.18
--- src/lib/libcompat/regexp/regexp.3:1.17	Tue Aug 11 18:15:41 2015
+++ src/lib/libcompat/regexp/regexp.3	Mon Jul  3 21:32:50 2017
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)regexp.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: regexp.3,v 1.17 2015/08/11 18:15:41 dholland Exp $
+.\"	$NetBSD: regexp.3,v 1.18 2017/07/03 21:32:50 wiz Exp $
 .\"
 .Dd June 4, 1993
 .Dt REGEXP 3
@@ -139,7 +139,7 @@ most recent
 .Fn regexec
 performed using
 .Fa prog .
-Each instance of `\*[Am]' in
+Each instance of `&' in
 .Fa source
 is replaced by the substring
 indicated by
@@ -155,12 +155,12 @@ the substring indicated by
 .Em startp Ns Bq Em n
 and
 .Em endp Ns Bq Em n .
-To get a literal `\*[Am]' or
+To get a literal `&' or
 .Sq \e Ns Em n
 into
 .Fa dest ,
 prefix it with `\e';
-to get a literal `\e' preceding `\*[Am]' or
+to get a literal `\e' preceding `&' or
 .Sq \e Ns Em n ,
 prefix it with
 another `\e'.

Index: src/lib/libcurses/curses_addch.3
diff -u src/lib/libcurses/curses_addch.3:1.8 src/lib/libcurses/curses_addch.3:1.9
--- src/lib/libcurses/curses_addch.3:1.8	Sun Jul 15 21:37:55 2007
+++ src/lib/libcurses/curses_addch.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: curses_addch.3,v 1.8 2007/07/15 21:37:55 wiz Exp $
+.\"	$NetBSD: curses_addch.3,v 1.9 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 2002
 .\"	Brett Lymn (bl...@netbsd.org, brett_l...@yahoo.com.au)
@@ -98,8 +98,8 @@ Where the terminal does not support a sp
 (non-graphics) character is displayed instead.
 .Bl -column -offset indent ".Sy System V Name" ".Sy Default"
 .It Sy "Name" Ta Sy "Default" Ta Sy "Description"
-.It ACS_RARROW Ta \*[Gt] Ta "Arrow pointing right"
-.It ACS_LARROW Ta \*[Lt] Ta "Arrow pointing left"
+.It ACS_RARROW Ta > Ta "Arrow pointing right"
+.It ACS_LARROW Ta < Ta "Arrow pointing left"
 .It ACS_UARROW Ta ^ Ta "Arrow pointing up"
 .It ACS_DARROW Ta v Ta "Arrow pointing down"
 .It ACS_BLOCK Ta # Ta "Solid square block"
@@ -132,8 +132,8 @@ compatible, characters are also supporte
 .It Sy "Name" Ta Sy "Default" Ta Sy "Description"
 .It ACS_S3 Ta - Ta "Scan line 3"
 .It ACS_S7 Ta - Ta "Scan line 7"
-.It ACS_LEQUAL Ta \*[Lt] Ta "Less than or equal to"
-.It ACS_GEQUAL Ta \*[Gt] Ta "Greater than or equal to"
+.It ACS_LEQUAL Ta < Ta "Less than or equal to"
+.It ACS_GEQUAL Ta > Ta "Greater than or equal to"
 .It ACS_PI Ta * Ta "Pi symbol"
 .It ACS_NEQUAL Ta ! Ta "Not equal to"
 .It ACS_STERLING Ta f Ta "Sterling symbol"

Index: src/lib/libcurses/curses_color.3
diff -u src/lib/libcurses/curses_color.3:1.12 src/lib/libcurses/curses_color.3:1.13
--- src/lib/libcurses/curses_color.3:1.12	Wed Jul 22 16:57:14 2009
+++ src/lib/libcurses/curses_color.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: curses_color.3,v 1.12 2009/07/22 16:57:14 roy Exp $
+.\"	$NetBSD: curses_color.3,v 1.13 2017/07/03 21:32:50 wiz Exp $
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
@@ -100,7 +100,7 @@ blue, magenta, cyan and white) that are 
 (such as
 .Dv COLOR_BLACK )
 defined in
-.Em \*[Lt]curses.h\*[Gt] .
+.Em <curses.h> .
 .Fn start_color
 also initializes the global external variables
 .Va COLORS

Index: src/lib/libcurses/curses_input.3
diff -u src/lib/libcurses/curses_input.3:1.26 src/lib/libcurses/curses_input.3:1.27
--- src/lib/libcurses/curses_input.3:1.26	Sun Jan  8 13:49:05 2017
+++ src/lib/libcurses/curses_input.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: curses_input.3,v 1.26 2017/01/08 13:49:05 wiz Exp $
+.\"	$NetBSD: curses_input.3,v 1.27 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 2002
 .\"	Brett Lymn (bl...@netbsd.org, brett_l...@yahoo.com.au)
@@ -450,16 +450,16 @@ has been called on a window, then it may
 .It \&%h Ta KEY_SREPLACE Ta Shift Replace
 .It \&%i Ta KEY_SRIGHT Ta Shift Right Arrow
 .It \&%j Ta KEY_SRSUME Ta Shift Resume
-.It \&\*[Am]0 Ta KEY_SCANCEL Ta Shift Cancel
-.It \&\*[Am]1 Ta KEY_REFERENCE Ta Reference
-.It \&\*[Am]2 Ta KEY_REFRESH Ta Refresh
-.It \&\*[Am]3 Ta KEY_REPLACE Ta Replace
-.It \&\*[Am]4 Ta KEY_RESTART Ta Restart
-.It \&\*[Am]5 Ta KEY_RESUME Ta Resume
-.It \&\*[Am]6 Ta KEY_SAVE Ta Save
-.It \&\*[Am]7 Ta KEY_SUSPEND Ta Suspend
-.It \&\*[Am]8 Ta KEY_UNDO Ta Undo
-.It \&\*[Am]9 Ta KEY_SBEG Ta Shift Begin
+.It \&&0 Ta KEY_SCANCEL Ta Shift Cancel
+.It \&&1 Ta KEY_REFERENCE Ta Reference
+.It \&&2 Ta KEY_REFRESH Ta Refresh
+.It \&&3 Ta KEY_REPLACE Ta Replace
+.It \&&4 Ta KEY_RESTART Ta Restart
+.It \&&5 Ta KEY_RESUME Ta Resume
+.It \&&6 Ta KEY_SAVE Ta Save
+.It \&&7 Ta KEY_SUSPEND Ta Suspend
+.It \&&8 Ta KEY_UNDO Ta Undo
+.It \&&9 Ta KEY_SBEG Ta Shift Begin
 .It \&*0 Ta KEY_SFIND Ta Shift Find
 .It \&*1 Ta KEY_SCOMMAND Ta Shift Command
 .It \&*2 Ta KEY_SCOPY Ta Shift Copy

Index: src/lib/libedit/editline.3
diff -u src/lib/libedit/editline.3:1.95 src/lib/libedit/editline.3:1.96
--- src/lib/libedit/editline.3:1.95	Tue Jun 27 23:22:20 2017
+++ src/lib/libedit/editline.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: editline.3,v 1.95 2017/06/27 23:22:20 christos Exp $
+.\"	$NetBSD: editline.3,v 1.96 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1997-2014 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -860,7 +860,7 @@ The caller is responsible for free'ing t
 .El
 .Pp
 .Fn history
-returns \*[Gt]= 0 if the operation
+returns >= 0 if the operation
 .Fa op
 succeeds.
 Otherwise, \-1 is returned and

Index: src/lib/libform/forms.3
diff -u src/lib/libform/forms.3:1.16 src/lib/libform/forms.3:1.17
--- src/lib/libform/forms.3:1.16	Wed Nov 24 12:09:13 2004
+++ src/lib/libform/forms.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: forms.3,v 1.16 2004/11/24 12:09:13 wiz Exp $
+.\"	$NetBSD: forms.3,v 1.17 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 2001
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -184,18 +184,18 @@ request passed to it.
 .Xr menus 3
 .Sh NOTES
 This implementation of the forms library does depart in behavior
-subtly from the original AT\*[Am]T implementation.
+subtly from the original AT&T implementation.
 Some of the more notable departures are:
 .Pp
 .Bl -tag -width "The TAB character" -compact
 .It field wrapping
 For multi-line fields the data will be wrapped as it is entered, this
-does not happen in the AT\*[Am]T implementation.
+does not happen in the AT&T implementation.
 .It buffer 0
 In this implementation, the contents of buffer 0 are always current
 regardless of whether the field has been validated or not.
 .It circular fields
-In the AT\*[Am]T implementation fields are circular on a page, that is, a
+In the AT&T implementation fields are circular on a page, that is, a
 next field from the last field will go to the first field on the
 current page.
 In this implementation a next field request on the last
@@ -203,11 +203,11 @@ field of a page will result in the forms
 cursor on the first field of the next page.
 If the field is the last
 field in the form then going to the next field will be denied, in the
-AT\*[Am]T it would result in the cursor being placed on the first field of
+AT&T it would result in the cursor being placed on the first field of
 the first page.
 .It buffer returns
 In this implementation only the data entered by the user in the form
-field will be returned, unlike the AT\*[Am]T library which would return the
+field will be returned, unlike the AT&T library which would return the
 contents of the field padded to the size of the field with the pad
 character.
 .It The TAB character
@@ -216,7 +216,7 @@ implementations.
 In ncurses attempting to set a field contents with a
 string containing a TAB will result in an error and will not allow a
 TAB to be entered into a field.
-The AT\*[Am]T library statically
+The AT&T library statically
 converts tabs to the equivalent number of spaces when the field buffer
 is set but the form driver will not allow a TAB to be inserted into
 the field buffer.

Index: src/lib/libm/man/acos.3
diff -u src/lib/libm/man/acos.3:1.17 src/lib/libm/man/acos.3:1.18
--- src/lib/libm/man/acos.3:1.17	Tue Jan 29 02:54:30 2013
+++ src/lib/libm/man/acos.3	Mon Jul  3 21:32:50 2017
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)acos.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: acos.3,v 1.17 2013/01/29 02:54:30 matt Exp $
+.\"	$NetBSD: acos.3,v 1.18 2017/07/03 21:32:50 wiz Exp $
 .\"
 .Dd January 29, 2013
 .Dt ACOS 3
@@ -57,7 +57,7 @@ functions compute the principal value of
 in the range
 .Bq 0 , \*(Pi .
 .Sh RETURN VALUES
-If |x|\*[Gt]1,
+If |x|>1,
 .Fn acos "x" ,
 .Fn acosf "x" ,
 and
Index: src/lib/libm/man/asin.3
diff -u src/lib/libm/man/asin.3:1.17 src/lib/libm/man/asin.3:1.18
--- src/lib/libm/man/asin.3:1.17	Tue Jan 29 02:54:30 2013
+++ src/lib/libm/man/asin.3	Mon Jul  3 21:32:50 2017
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)asin.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: asin.3,v 1.17 2013/01/29 02:54:30 matt Exp $
+.\"	$NetBSD: asin.3,v 1.18 2017/07/03 21:32:50 wiz Exp $
 .\"
 .Dd January 29, 2013
 .Dt ASIN 3
@@ -60,7 +60,7 @@ in the range
 .Ek
 .Sh RETURN VALUES
 .\" POSIX_MODE
-If |x|\*[Gt]1,
+If |x|>1,
 .Fn asin "x" ,
 .Fn asinf "x" ,
 and

Index: src/lib/libm/man/atan2.3
diff -u src/lib/libm/man/atan2.3:1.18 src/lib/libm/man/atan2.3:1.19
--- src/lib/libm/man/atan2.3:1.18	Fri Apr 26 18:18:22 2013
+++ src/lib/libm/man/atan2.3	Mon Jul  3 21:32:50 2017
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atan2.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: atan2.3,v 1.18 2013/04/26 18:18:22 njoly Exp $
+.\"	$NetBSD: atan2.3,v 1.19 2017/07/03 21:32:50 wiz Exp $
 .\"
 .Dd January 29, 2013
 .Dt ATAN2 3
@@ -82,12 +82,12 @@ On the
 .Fn atan y/x Ta
 if
 .Ar x
-\*[Gt] 0,
+> 0,
 .It Ta sign( Ns Ar y Ns )*(\*(Pi -
 .Fn atan "\*(Bay/x\*(Ba" ) Ta
 if
 .Ar x
-\*[Lt] 0,
+< 0,
 .It Ta
 .No 0 Ta
 if x = y = 0, or
@@ -101,7 +101,7 @@ if
 .Sh NOTES
 The function
 .Fn atan2
-defines "if x \*[Gt] 0,"
+defines "if x > 0,"
 .Fn atan2 0 0
 = 0 on a
 .Tn VAX

Index: src/lib/libm/man/fenv.3
diff -u src/lib/libm/man/fenv.3:1.2 src/lib/libm/man/fenv.3:1.3
--- src/lib/libm/man/fenv.3:1.2	Wed Aug  4 18:58:28 2010
+++ src/lib/libm/man/fenv.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: fenv.3,v 1.2 2010/08/04 18:58:28 wiz Exp $
+.\"	$NetBSD: fenv.3,v 1.3 2017/07/03 21:32:50 wiz Exp $
 .\" Copyright (c) 2004 David Schultz <d...@freebsd.org>
 .\" All rights reserved.
 .\"
@@ -208,18 +208,18 @@ double sqrt(double n) {
 	double x = 1.0;
 	fenv_t env;
 
-	if (isnan(n) || n \*[Lt] 0.0) {
+	if (isnan(n) || n < 0.0) {
 		feraiseexcept(FE_INVALID);
 		return (NAN);
 	}
 	if (isinf(n) || n == 0.0)
 		return (n);
-	feholdexcept(\*[Am]env);
-	while (fabs((x * x) - n) \*[Gt] DBL_EPSILON * 2 * x)
+	feholdexcept(&env);
+	while (fabs((x * x) - n) > DBL_EPSILON * 2 * x)
 		x = (x / 2) + (n / (2 * x));
 	if (x * x == n)
 		feclearexcept(FE_INEXACT);
-	feupdateenv(\*[Am]env);
+	feupdateenv(&env);
 	return (x);
 }
 .Ed

Index: src/lib/libm/man/ieee_test.3
diff -u src/lib/libm/man/ieee_test.3:1.13 src/lib/libm/man/ieee_test.3:1.14
--- src/lib/libm/man/ieee_test.3:1.13	Wed Feb  1 15:49:02 2017
+++ src/lib/libm/man/ieee_test.3	Mon Jul  3 21:32:50 2017
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\"	$NetBSD: ieee_test.3,v 1.13 2017/02/01 15:49:02 abhinav Exp $
+.\"	$NetBSD: ieee_test.3,v 1.14 2017/07/03 21:32:50 wiz Exp $
 .\"
 .Dd August 3, 2011
 .Dt IEEE_TEST 3
@@ -87,7 +87,7 @@ where
 .Fa sig No \(** 2** Ns Fa n
 with 1 \*[Le]
 .Fa sig
-\*[Lt] 2.
+< 2.
 .Fn significand x
 is not defined when
 .Fa x

Index: src/lib/libm/man/lgamma.3
diff -u src/lib/libm/man/lgamma.3:1.22 src/lib/libm/man/lgamma.3:1.23
--- src/lib/libm/man/lgamma.3:1.22	Sat May  5 17:54:13 2012
+++ src/lib/libm/man/lgamma.3	Mon Jul  3 21:32:50 2017
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)lgamma.3	6.6 (Berkeley) 12/3/92
-.\"	$NetBSD: lgamma.3,v 1.22 2012/05/05 17:54:13 christos Exp $
+.\"	$NetBSD: lgamma.3,v 1.23 2017/07/03 21:32:50 wiz Exp $
 .\"
 .Dd May 4, 2012
 .Dt LGAMMA 3
@@ -75,9 +75,9 @@
 .if t \{\
 returns ln\||\(*G(x)| where
 .Bd -unfilled -offset indent
-\(*G(x) = \(is\d\s8\z0\s10\u\u\s8\(if\s10\d t\u\s8x\-1\s10\d e\u\s8\-t\s10\d dt	for x \*[Gt] 0 and
+\(*G(x) = \(is\d\s8\z0\s10\u\u\s8\(if\s10\d t\u\s8x\-1\s10\d e\u\s8\-t\s10\d dt	for x > 0 and
 .br
-\(*G(x) = \(*p/(\(*G(1\-x)\|sin(\(*px))	for x \*[Lt] 1.
+\(*G(x) = \(*p/(\(*G(1\-x)\|sin(\(*px))	for x < 1.
 .Ed
 .\}
 .if n \

Index: src/lib/libm/man/log.3
diff -u src/lib/libm/man/log.3:1.5 src/lib/libm/man/log.3:1.6
--- src/lib/libm/man/log.3:1.5	Wed Feb  1 14:51:29 2017
+++ src/lib/libm/man/log.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: log.3,v 1.5 2017/02/01 14:51:29 abhinav Exp $
+.\" $NetBSD: log.3,v 1.6 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 2011 Jukka Ruohonen <jruoho...@iki.fi>
 .\" All rights reserved.
@@ -153,11 +153,11 @@ by
 .Fn log
 unless
 .Fa x
-\*[Gt] 0, by
+> 0, by
 .Fn log1p
 unless
 .Fa x
-\*[Gt] \-1.
+> \-1.
 .Sh SEE ALSO
 .Xr exp 3 ,
 .Xr ilogb 3 ,

Index: src/lib/libm/man/math.3
diff -u src/lib/libm/man/math.3:1.26 src/lib/libm/man/math.3:1.27
--- src/lib/libm/man/math.3:1.26	Sat Nov 10 15:59:58 2012
+++ src/lib/libm/man/math.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: math.3,v 1.26 2012/11/10 15:59:58 njoly Exp $
+.\"	$NetBSD: math.3,v 1.27 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1985 Regents of the University of California.
 .\" All rights reserved.
@@ -134,7 +134,7 @@ in which incidents like
 the following had been reported:
 .Bd -literal -offset indent
 sqrt(\-1.0) = 0.0 and log(\-1.0) = \-1.7e38.
-cos(1.0e\-11) \*[Gt] cos(0.0) \*[Gt] 1.0.
+cos(1.0e\-11) > cos(0.0) > 1.0.
 pow(x,1.0) \(!= x when x = 2.0, 3.0, 4.0, ..., 9.0.
 pow(\-1.0,1.0e10) trapped on Integer Overflow.
 sqrt(1.0e30) and sqrt(1.0e\-30) were very slow.
@@ -166,7 +166,7 @@ If x and x' are consecutive positive D_f
 numbers (they differ by 1
 .Dv ULP ) ,
 then
-.Dl 1.3e\-17 \*[Lt] 0.5**56 \*[Lt] (x'\-x)/x \*[Le] 0.5**55 \*[Lt] 2.8e\-17.
+.Dl 1.3e\-17 < 0.5**56 < (x'\-x)/x \*[Le] 0.5**55 < 2.8e\-17.
 .It Range :
 .Bl -column "Underflow thresholdX" "2.0**127X"
 .It Overflow threshold	= 2.0**127	= 1.7e38.
@@ -180,7 +180,7 @@ Underflow is customarily flushed quietly
 It is possible to have x
 \(!=
 y and yet x\-y = 0 because of underflow.
-Similarly x \*[Gt] y \*[Gt] 0 cannot prevent either x\(**y = 0
+Similarly x > y > 0 cannot prevent either x\(**y = 0
 or y/x = 0 from happening without warning.
 .It Zero is represented ambiguously :
 Although 2**55 different representations of zero are accepted by
@@ -254,7 +254,7 @@ produced by a host of manufacturers, amo
 .Bl -column "Intel i8070, i80287XX"
 .It Intel i8087, i80287	National Semiconductor  32081
 .It 68881	Weitek WTL-1032, ... , -1165
-.It Zilog Z8070	Western Electric (AT\*[Am]T) WE32106.
+.It Zilog Z8070	Western Electric (AT&T) WE32106.
 .El
 Other implementations range from software, done thoroughly
 in the Apple Macintosh, through VLSI in the Hewlett\-Packard
@@ -310,7 +310,7 @@ If x and x' are consecutive positive Dou
 numbers (they differ by 1
 .Dv ULP ) ,
 then
-.Dl 1.1e\-16 \*[Lt] 0.5**53 \*[Lt] (x'\-x)/x \*[Le] 0.5**52 \*[Lt] 2.3e\-16.
+.Dl 1.1e\-16 < 0.5**53 < (x'\-x)/x \*[Le] 0.5**52 < 2.3e\-16.
 .It Range :
 .Bl -column "Underflow thresholdX" "2.0**1024X"
 .It Overflow threshold	= 2.0**1024	= 1.8e308
@@ -328,7 +328,7 @@ with like signs; but x\-x yields +0 for 
 finite x.
 The only operations that reveal zero's
 sign are division by zero and copysign(x,\(+-0).
-In particular, comparison (x \*[Gt] y, x \*[Ge] y, etc.)
+In particular, comparison (x > y, x \*[Ge] y, etc.)
 cannot be affected by the sign of zero; but if
 finite x = y then \*(If
 \&= 1/(x\-y)
@@ -359,7 +359,7 @@ propagate through subsequent arithmetic 
 If x
 \(!=
 x then x is \*(Na; every other predicate
-(x \*[Gt] y, x = y, x \*[Lt] y, ...) is FALSE if \*(Na is involved.
+(x > y, x = y, x < y, ...) is FALSE if \*(Na is involved.
 .Pp
 .Em NOTE :
 Trichotomy is violated by \*(Na.

Index: src/lib/libmenu/menu_attributes.3
diff -u src/lib/libmenu/menu_attributes.3:1.10 src/lib/libmenu/menu_attributes.3:1.11
--- src/lib/libmenu/menu_attributes.3:1.10	Wed Apr 16 13:35:10 2003
+++ src/lib/libmenu/menu_attributes.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_attributes.3,v 1.10 2003/04/16 13:35:10 wiz Exp $
+.\"	$NetBSD: menu_attributes.3,v 1.11 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -128,8 +128,8 @@ The menu driver could not process the re
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_items.3
diff -u src/lib/libmenu/menu_items.3:1.10 src/lib/libmenu/menu_items.3:1.11
--- src/lib/libmenu/menu_items.3:1.10	Sat Jun 30 09:25:55 2012
+++ src/lib/libmenu/menu_items.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_items.3,v 1.10 2012/06/30 09:25:55 jdf Exp $
+.\"	$NetBSD: menu_items.3,v 1.11 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -83,8 +83,8 @@ An item was already connected to a menu.
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_new.3
diff -u src/lib/libmenu/menu_new.3:1.10 src/lib/libmenu/menu_new.3:1.11
--- src/lib/libmenu/menu_new.3:1.10	Sat Jun 30 09:25:55 2012
+++ src/lib/libmenu/menu_new.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_new.3,v 1.10 2012/06/30 09:25:55 jdf Exp $
+.\"	$NetBSD: menu_new.3,v 1.11 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -78,8 +78,8 @@ The menu is already posted.
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_post.3
diff -u src/lib/libmenu/menu_post.3:1.10 src/lib/libmenu/menu_post.3:1.11
--- src/lib/libmenu/menu_post.3:1.10	Sat Oct 24 11:17:13 2009
+++ src/lib/libmenu/menu_post.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_post.3,v 1.10 2009/10/24 11:17:13 reed Exp $
+.\"	$NetBSD: menu_post.3,v 1.11 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -91,8 +91,8 @@ The item is not connected to a menu.
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_win.3
diff -u src/lib/libmenu/menu_win.3:1.10 src/lib/libmenu/menu_win.3:1.11
--- src/lib/libmenu/menu_win.3:1.10	Wed Apr 16 13:35:11 2003
+++ src/lib/libmenu/menu_win.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_win.3,v 1.10 2003/04/16 13:35:11 wiz Exp $
+.\"	$NetBSD: menu_win.3,v 1.11 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -108,8 +108,8 @@ The menu driver could not process the re
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .

Index: src/lib/libmenu/menu_cursor.3
diff -u src/lib/libmenu/menu_cursor.3:1.9 src/lib/libmenu/menu_cursor.3:1.10
--- src/lib/libmenu/menu_cursor.3:1.9	Wed Apr 16 13:35:10 2003
+++ src/lib/libmenu/menu_cursor.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_cursor.3,v 1.9 2003/04/16 13:35:10 wiz Exp $
+.\"	$NetBSD: menu_cursor.3,v 1.10 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -84,8 +84,8 @@ The menu driver could not process the re
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_format.3
diff -u src/lib/libmenu/menu_format.3:1.9 src/lib/libmenu/menu_format.3:1.10
--- src/lib/libmenu/menu_format.3:1.9	Wed Apr 16 13:35:10 2003
+++ src/lib/libmenu/menu_format.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_format.3,v 1.9 2003/04/16 13:35:10 wiz Exp $
+.\"	$NetBSD: menu_format.3,v 1.10 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -70,8 +70,8 @@ The menu is already posted.
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_item_current.3
diff -u src/lib/libmenu/menu_item_current.3:1.9 src/lib/libmenu/menu_item_current.3:1.10
--- src/lib/libmenu/menu_item_current.3:1.9	Wed Apr 16 13:35:10 2003
+++ src/lib/libmenu/menu_item_current.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_item_current.3,v 1.9 2003/04/16 13:35:10 wiz Exp $
+.\"	$NetBSD: menu_item_current.3,v 1.10 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -94,8 +94,8 @@ The item is not connected to a menu.
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_item_name.3
diff -u src/lib/libmenu/menu_item_name.3:1.9 src/lib/libmenu/menu_item_name.3:1.10
--- src/lib/libmenu/menu_item_name.3:1.9	Wed Apr 16 13:35:10 2003
+++ src/lib/libmenu/menu_item_name.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_item_name.3,v 1.9 2003/04/16 13:35:10 wiz Exp $
+.\"	$NetBSD: menu_item_name.3,v 1.10 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -64,8 +64,8 @@ functions return NULL if the item pointe
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_mark.3
diff -u src/lib/libmenu/menu_mark.3:1.9 src/lib/libmenu/menu_mark.3:1.10
--- src/lib/libmenu/menu_mark.3:1.9	Wed Apr 16 13:35:11 2003
+++ src/lib/libmenu/menu_mark.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_mark.3,v 1.9 2003/04/16 13:35:11 wiz Exp $
+.\"	$NetBSD: menu_mark.3,v 1.10 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -105,8 +105,8 @@ The menu driver could not process the re
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .

Index: src/lib/libmenu/menu_driver.3
diff -u src/lib/libmenu/menu_driver.3:1.8 src/lib/libmenu/menu_driver.3:1.9
--- src/lib/libmenu/menu_driver.3:1.8	Wed Apr 16 13:35:10 2003
+++ src/lib/libmenu/menu_driver.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_driver.3,v 1.8 2003/04/16 13:35:10 wiz Exp $
+.\"	$NetBSD: menu_driver.3,v 1.9 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -129,8 +129,8 @@ The menu driver could not process the re
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_hook.3
diff -u src/lib/libmenu/menu_hook.3:1.8 src/lib/libmenu/menu_hook.3:1.9
--- src/lib/libmenu/menu_hook.3:1.8	Wed Apr 16 13:35:10 2003
+++ src/lib/libmenu/menu_hook.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_hook.3,v 1.8 2003/04/16 13:35:10 wiz Exp $
+.\"	$NetBSD: menu_hook.3,v 1.9 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -96,8 +96,8 @@ function.
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_item_new.3
diff -u src/lib/libmenu/menu_item_new.3:1.8 src/lib/libmenu/menu_item_new.3:1.9
--- src/lib/libmenu/menu_item_new.3:1.8	Wed Apr 16 13:35:10 2003
+++ src/lib/libmenu/menu_item_new.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_item_new.3,v 1.8 2003/04/16 13:35:10 wiz Exp $
+.\"	$NetBSD: menu_item_new.3,v 1.9 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -72,8 +72,8 @@ One or more of the arguments passed to t
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_item_opts.3
diff -u src/lib/libmenu/menu_item_opts.3:1.8 src/lib/libmenu/menu_item_opts.3:1.9
--- src/lib/libmenu/menu_item_opts.3:1.8	Wed Apr 16 13:35:11 2003
+++ src/lib/libmenu/menu_item_opts.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_item_opts.3,v 1.8 2003/04/16 13:35:11 wiz Exp $
+.\"	$NetBSD: menu_item_opts.3,v 1.9 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -75,8 +75,8 @@ There was a system error during the call
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_opts.3
diff -u src/lib/libmenu/menu_opts.3:1.8 src/lib/libmenu/menu_opts.3:1.9
--- src/lib/libmenu/menu_opts.3:1.8	Wed Apr 16 13:35:11 2003
+++ src/lib/libmenu/menu_opts.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_opts.3,v 1.8 2003/04/16 13:35:11 wiz Exp $
+.\"	$NetBSD: menu_opts.3,v 1.9 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -81,8 +81,8 @@ The menu is already posted.
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_pattern.3
diff -u src/lib/libmenu/menu_pattern.3:1.8 src/lib/libmenu/menu_pattern.3:1.9
--- src/lib/libmenu/menu_pattern.3:1.8	Wed Apr 16 13:35:11 2003
+++ src/lib/libmenu/menu_pattern.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_pattern.3,v 1.8 2003/04/16 13:35:11 wiz Exp $
+.\"	$NetBSD: menu_pattern.3,v 1.9 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -70,8 +70,8 @@ The character search failed to find a ma
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_userptr.3
diff -u src/lib/libmenu/menu_userptr.3:1.8 src/lib/libmenu/menu_userptr.3:1.9
--- src/lib/libmenu/menu_userptr.3:1.8	Wed Apr 16 13:35:11 2003
+++ src/lib/libmenu/menu_userptr.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_userptr.3,v 1.8 2003/04/16 13:35:11 wiz Exp $
+.\"	$NetBSD: menu_userptr.3,v 1.9 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -66,8 +66,8 @@ There was a system error during the call
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .

Index: src/lib/libmenu/menu_item_userptr.3
diff -u src/lib/libmenu/menu_item_userptr.3:1.7 src/lib/libmenu/menu_item_userptr.3:1.8
--- src/lib/libmenu/menu_item_userptr.3:1.7	Wed Apr 16 13:35:11 2003
+++ src/lib/libmenu/menu_item_userptr.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_item_userptr.3,v 1.7 2003/04/16 13:35:11 wiz Exp $
+.\"	$NetBSD: menu_item_userptr.3,v 1.8 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -65,8 +65,8 @@ There was a system error during the call
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
Index: src/lib/libmenu/menu_item_visible.3
diff -u src/lib/libmenu/menu_item_visible.3:1.7 src/lib/libmenu/menu_item_visible.3:1.8
--- src/lib/libmenu/menu_item_visible.3:1.7	Wed Apr 16 13:35:11 2003
+++ src/lib/libmenu/menu_item_visible.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_item_visible.3,v 1.7 2003/04/16 13:35:11 wiz Exp $
+.\"	$NetBSD: menu_item_visible.3,v 1.8 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -60,8 +60,8 @@ The item is not connected to a menu.
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .

Index: src/lib/libmenu/menu_item_value.3
diff -u src/lib/libmenu/menu_item_value.3:1.11 src/lib/libmenu/menu_item_value.3:1.12
--- src/lib/libmenu/menu_item_value.3:1.11	Wed Apr 16 13:35:11 2003
+++ src/lib/libmenu/menu_item_value.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menu_item_value.3,v 1.11 2003/04/16 13:35:11 wiz Exp $ .\"
+.\"	$NetBSD: menu_item_value.3,v 1.12 2017/07/03 21:32:50 wiz Exp $ .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
 .\"
@@ -93,11 +93,11 @@ A system error occurred whilst processin
 .Xr menus 3
 .Sh NOTES
 The header
-.Pa \*[Lt]menu.h\*[Gt]
+.Pa <menu.h>
 automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
+.Pa <curses.h>
 and
-.Pa \*[Lt]eti.h\*[Gt] .
+.Pa <eti.h> .
 .Pp
 The function
 .Fn item_selected

Index: src/lib/libmenu/menus.3
diff -u src/lib/libmenu/menus.3:1.15 src/lib/libmenu/menus.3:1.16
--- src/lib/libmenu/menus.3:1.15	Wed Apr 16 13:35:12 2003
+++ src/lib/libmenu/menus.3	Mon Jul  3 21:32:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: menus.3,v 1.15 2003/04/16 13:35:12 wiz Exp $
+.\"	$NetBSD: menus.3,v 1.16 2017/07/03 21:32:50 wiz Exp $
 .\"
 .\" Copyright (c) 1999
 .\"	Brett Lymn - bl...@baea.com.au, brett_l...@yahoo.com.au
@@ -264,7 +264,7 @@ The menu driver could not process the re
 .Xr menu_win 3
 .Sh NOTES
 This implementation of the menus library does depart in behaviour
-subtly from the original AT \*[Am] T implementation.
+subtly from the original AT & T implementation.
 Some of the more notable departures are:
 .Pp
 .Bl -tag -width "item marking" -compact

Index: src/lib/libpam/modules/pam_krb5/pam_krb5.8
diff -u src/lib/libpam/modules/pam_krb5/pam_krb5.8:1.11 src/lib/libpam/modules/pam_krb5/pam_krb5.8:1.12
--- src/lib/libpam/modules/pam_krb5/pam_krb5.8:1.11	Tue Dec  2 22:52:06 2008
+++ src/lib/libpam/modules/pam_krb5/pam_krb5.8	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam_krb5.8,v 1.11 2008/12/02 22:52:06 reed Exp $
+.\" $NetBSD: pam_krb5.8,v 1.12 2017/07/03 21:32:51 wiz Exp $
 .\" $FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.8,v 1.6 2001/11/24 23:41:32 dd Exp $
 .\"
 .\" Copyright (c) Frank Cusack, 1999-2001. All rights reserved.
@@ -77,7 +77,7 @@ ticket for the local host.
 .Pp
 When prompting for the current password, the authentication
 module will use the prompt
-.Dq Li "Password for \*[Lt]principal\*[Gt]:" .
+.Dq Li "Password for <principal>:" .
 .Pp
 The
 .Fn pam_sm_setcred

Index: src/lib/libpthread/pthread_schedparam.3
diff -u src/lib/libpthread/pthread_schedparam.3:1.7 src/lib/libpthread/pthread_schedparam.3:1.8
--- src/lib/libpthread/pthread_schedparam.3:1.7	Fri Jul  9 08:51:28 2010
+++ src/lib/libpthread/pthread_schedparam.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: pthread_schedparam.3,v 1.7 2010/07/09 08:51:28 jruoho Exp $
+.\" $NetBSD: pthread_schedparam.3,v 1.8 2017/07/03 21:32:51 wiz Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -82,7 +82,7 @@ The system default.
 .El
 .Pp
 The thread priority (accessed via
-.Va param-\*[Gt]sched_priority )
+.Va param->sched_priority )
 must be at least
 .Dv PTHREAD_MIN_PRIORITY
 and no more than

Index: src/lib/libpuffs/puffs.3
diff -u src/lib/libpuffs/puffs.3:1.62 src/lib/libpuffs/puffs.3:1.63
--- src/lib/libpuffs/puffs.3:1.62	Mon Apr 11 00:47:19 2016
+++ src/lib/libpuffs/puffs.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: puffs.3,v 1.62 2016/04/11 00:47:19 christos Exp $
+.\"	$NetBSD: puffs.3,v 1.63 2017/07/03 21:32:51 wiz Exp $
 .\"
 .\" Copyright (c) 2006, 2007, 2008 Antti Kantee.  All rights reserved.
 .\"
@@ -209,7 +209,7 @@ This flag affects only the parameter
 .Fn puffs_node_lookup .
 If this flag is not given, only the next pathname component under
 lookup is found from
-.Ar pcn-\*[Gt]pcn_name .
+.Ar pcn->pcn_name .
 If this flag is given, the full path the kernel was
 asked to resolve can be found from there.
 .It Dv PUFFS_FLAG_BUILDPATH

Index: src/lib/libpuffs/puffs_ops.3
diff -u src/lib/libpuffs/puffs_ops.3:1.45 src/lib/libpuffs/puffs_ops.3:1.46
--- src/lib/libpuffs/puffs_ops.3:1.45	Mon Aug 29 01:13:56 2016
+++ src/lib/libpuffs/puffs_ops.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: puffs_ops.3,v 1.45 2016/08/29 01:13:56 tnn Exp $
+.\"	$NetBSD: puffs_ops.3,v 1.46 2017/07/03 21:32:51 wiz Exp $
 .\"
 .\" Copyright (c) 2007 Antti Kantee.  All rights reserved.
 .\"
@@ -434,7 +434,7 @@ can be called to specify the new node at
 time to live, and cached name time to live.
 .Pp
 The type of operation is found from
-.Va pcn-\*[Gt]pcn_nameiop :
+.Va pcn->pcn_nameiop :
 .Bl -tag -width XNAMEI_LOOKUPX
 .It Dv NAMEI_LOOKUP
 Normal lookup operation.
@@ -451,7 +451,7 @@ up using
 The final component from a pathname lookup usually requires special
 treatment.
 It can be identified by looking at the
-.Va pcn-\*[Gt]pcn_flags
+.Va pcn->pcn_flags
 fields for the flag
 .Dv PUFFSLOOKUP_ISLASTCN .
 For example, in most cases the lookup operation will want to check if
@@ -472,21 +472,21 @@ error code, for example
 .Pp
 Usually a null-terminated string for the next pathname component is
 provided in
-.Ar pcn-\*[Gt]pcn_name .
+.Ar pcn->pcn_name .
 In case the file system is using the option
 .Dv PUFFS_KFLAG_LOOKUP_FULLPNBUF ,
 the remainder of the complete pathname under lookup is found in
 the same location.
-.Ar pcn-\*[Gt]pcn_namelen
+.Ar pcn->pcn_namelen
 always specifies the length of the next component.
 If operating with a full path, the file system is allowed to consume
 more than the next component's length in node lookup.
 This is done by setting
-.Ar pcn-\*[Gt]pcn_consume
+.Ar pcn->pcn_consume
 to indicate the amount of
 .Em extra
 characters in addition to
-.Ar pcn-\*[Gt]pcn_namelen
+.Ar pcn->pcn_namelen
 processed.
 .It Fn puffs_node_create "pu" "opc" "pni" "pcn" "va"
 .It Fn puffs_node_mkdir "pu" "opc" "pni" "pcn" "va"
@@ -504,7 +504,7 @@ The only difference between these three 
 file, directory and device special file, respectively.
 .Pp
 In case of mknod, the device identifier can be found in
-.Fa va-\*[Gt]va_rdev .
+.Fa va->va_rdev .
 .It Fn puffs_node_open "pu" "opc" "mode" "pcr"
 .It Fn puffs_node_open2 "pu" "opc" "mode" "pcr" "oflags"
 Open the node denoted by the cookie

Index: src/lib/librmt/rmtops.3
diff -u src/lib/librmt/rmtops.3:1.14 src/lib/librmt/rmtops.3:1.15
--- src/lib/librmt/rmtops.3:1.14	Mon Mar 22 22:00:37 2010
+++ src/lib/librmt/rmtops.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rmtops.3,v 1.14 2010/03/22 22:00:37 joerg Exp $
+.\"	$NetBSD: rmtops.3,v 1.15 2017/07/03 21:32:51 wiz Exp $
 .\"
 .Dd October 16, 2001
 .Dt RMTOPS 3
@@ -107,7 +107,7 @@ routines taking care of differentiating 
 This file should be included
 .Em before
 including the file
-.Pa \*[Lt]sys/stat.h\*[Gt] ,
+.Pa <sys/stat.h> ,
 since it redefines the identifier ``stat'' which is used to declare
 objects of type
 .Em "struct stat" .
@@ -162,7 +162,7 @@ Fred Fish redid them into a general purp
 .Pp
 Arnold Robbins added the ability to specify a user name on the remote
 system, the
-.Pa \*[Lt]rmt.h\*[Gt]
+.Pa <rmt.h>
 include file, this man page, cleaned up the library a little, and made
 the appropriate changes for
 .Bx 4.3 .

Index: src/lib/librt/aio_fsync.3
diff -u src/lib/librt/aio_fsync.3:1.7 src/lib/librt/aio_fsync.3:1.8
--- src/lib/librt/aio_fsync.3:1.7	Wed Sep 15 07:28:46 2010
+++ src/lib/librt/aio_fsync.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: aio_fsync.3,v 1.7 2010/09/15 07:28:46 yamt Exp $
+.\" $NetBSD: aio_fsync.3,v 1.8 2017/07/03 21:32:51 wiz Exp $
 .\"
 .\" Copyright (c) 2007 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -41,7 +41,7 @@ The
 .Fn aio_fsync
 system call allows the calling process to force all modified data
 associated with the file descriptor
-.Fa aiocbp-\*[Gt]aio_fildes
+.Fa aiocbp->aio_fildes
 to be flushed to the stable storage device.
 The call returns immediately after the synchronization request has been
 enqueued to the descriptor; the synchronization may or may not have
@@ -73,7 +73,7 @@ If
 is defined, and the descriptor supports it, then the enqueued
 operation is submitted at a priority equal to that of the calling
 process minus
-.Fa aiocbp-\*[Gt]aio_reqprio .
+.Fa aiocbp->aio_reqprio .
 .Pp
 The
 .Fa aiocbp
@@ -111,7 +111,7 @@ returned in
 .Bl -tag -width Er
 .It Bq Er EBADF
 The
-.Fa aiocbp-\*[Gt]aio_fildes
+.Fa aiocbp->aio_fildes
 is invalid for writing.
 .It Bq Er EINVAL
 This implementation does not support synchronized I/O for this file,

Index: src/lib/librt/aio_read.3
diff -u src/lib/librt/aio_read.3:1.4 src/lib/librt/aio_read.3:1.5
--- src/lib/librt/aio_read.3:1.4	Mon May 17 19:22:31 2010
+++ src/lib/librt/aio_read.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: aio_read.3,v 1.4 2010/05/17 19:22:31 jruoho Exp $
+.\" $NetBSD: aio_read.3,v 1.5 2017/07/03 21:32:51 wiz Exp $
 .\"
 .\" Copyright (c) 1998 Terry Lambert
 .\" All rights reserved.
@@ -42,13 +42,13 @@
 The
 .Fn aio_read
 system call allows the calling process to read
-.Fa aiocbp-\*[Gt]aio_nbytes
+.Fa aiocbp->aio_nbytes
 from the descriptor
-.Fa aiocbp-\*[Gt]aio_fildes
+.Fa aiocbp->aio_fildes
 beginning at the offset
-.Fa aiocbp-\*[Gt]aio_offset
+.Fa aiocbp->aio_offset
 into the buffer pointed to by
-.Fa aiocbp-\*[Gt]aio_buf .
+.Fa aiocbp->aio_buf .
 The call returns immediately after the read request has
 been enqueued to the descriptor; the read may or may not have
 completed at the time the call returns.
@@ -58,10 +58,10 @@ If
 is defined, and the descriptor supports it,
 then the enqueued operation is submitted at a priority equal to that
 of the calling process minus
-.Fa aiocbp-\*[Gt]aio_reqprio .
+.Fa aiocbp->aio_reqprio .
 .Pp
 The
-.Fa aiocbp-\*[Gt]aio_lio_opcode
+.Fa aiocbp->aio_lio_opcode
 argument
 is ignored by the
 .Fn aio_read
@@ -80,14 +80,14 @@ If the request could not be enqueued (ge
 then the call returns without having enqueued the request.
 .Pp
 If the request is successfully enqueued, the value of
-.Fa aiocbp-\*[Gt]aio_offset
+.Fa aiocbp->aio_offset
 can be modified during the request as context, so this value must
 not be referenced after the request is enqueued.
 .Sh RESTRICTIONS
 The Asynchronous I/O Control Block structure pointed to by
 .Fa aiocbp
 and the buffer that the
-.Fa aiocbp-\*[Gt]aio_buf
+.Fa aiocbp->aio_buf
 member of that structure references must remain valid until the
 operation has completed.
 For this reason, use of auto (stack) variables
@@ -104,9 +104,9 @@ buffer contents after the request has be
 request has completed, are not allowed.
 .Pp
 If the file offset in
-.Fa aiocbp-\*[Gt]aio_offset
+.Fa aiocbp->aio_offset
 is past the offset maximum for
-.Fa aiocbp-\*[Gt]aio_fildes ,
+.Fa aiocbp->aio_fildes ,
 no I/O will occur.
 .Sh RETURN VALUES
 .Rv -std aio_read
@@ -140,24 +140,24 @@ returned in
 .Bl -tag -width Er
 .It Bq Er EBADF
 The
-.Fa aiocbp-\*[Gt]aio_fildes
+.Fa aiocbp->aio_fildes
 argument
 is invalid.
 .It Bq Er EINVAL
 The offset
-.Fa aiocbp-\*[Gt]aio_offset
+.Fa aiocbp->aio_offset
 is not valid, the priority specified by
-.Fa aiocbp-\*[Gt]aio_reqprio
+.Fa aiocbp->aio_reqprio
 is not a valid priority, or the number of bytes specified by
-.Fa aiocbp-\*[Gt]aio_nbytes
+.Fa aiocbp->aio_nbytes
 is not valid.
 .It Bq Er EOVERFLOW
 The file is a regular file,
-.Fa aiocbp-\*[Gt]aio_nbytes
+.Fa aiocbp->aio_nbytes
 is greater than zero, the starting offset in
-.Fa aiocbp-\*[Gt]aio_offset
+.Fa aiocbp->aio_offset
 is before the end of the file, but is at or beyond the
-.Fa aiocbp-\*[Gt]aio_fildes
+.Fa aiocbp->aio_fildes
 offset maximum.
 .El
 .Pp
@@ -174,7 +174,7 @@ system call, or one of:
 .Bl -tag -width Er
 .It Bq Er EBADF
 The
-.Fa aiocbp-\*[Gt]aio_fildes
+.Fa aiocbp->aio_fildes
 argument
 is invalid for reading.
 .It Bq Er ECANCELED
@@ -182,7 +182,7 @@ The request was explicitly cancelled via
 .Fn aio_cancel .
 .It Bq Er EINVAL
 The offset
-.Fa aiocbp-\*[Gt]aio_offset
+.Fa aiocbp->aio_offset
 would be invalid.
 .El
 .Sh SEE ALSO
Index: src/lib/librt/aio_write.3
diff -u src/lib/librt/aio_write.3:1.4 src/lib/librt/aio_write.3:1.5
--- src/lib/librt/aio_write.3:1.4	Mon May 17 19:22:31 2010
+++ src/lib/librt/aio_write.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: aio_write.3,v 1.4 2010/05/17 19:22:31 jruoho Exp $
+.\" $NetBSD: aio_write.3,v 1.5 2017/07/03 21:32:51 wiz Exp $
 .\"
 .\" Copyright (c) 1999 Softweyr LLC.
 .\" All rights reserved.
@@ -42,11 +42,11 @@
 The
 .Fn aio_write
 system call allows the calling process to write
-.Fa aiocbp-\*[Gt]aio_nbytes
+.Fa aiocbp->aio_nbytes
 from the buffer pointed to by
-.Fa aiocbp-\*[Gt]aio_buf
+.Fa aiocbp->aio_buf
 to the descriptor
-.Fa aiocbp-\*[Gt]aio_fildes .
+.Fa aiocbp->aio_fildes .
 The call returns immediately after the write request has been enqueued
 to the descriptor; the write may or may not have completed at the time
 the call returns.
@@ -57,7 +57,7 @@ request.
 If
 .Dv O_APPEND
 is set for
-.Fa aiocbp-\*[Gt]aio_fildes ,
+.Fa aiocbp->aio_fildes ,
 .Fn aio_write
 operations append to the file in the same order as the calls were
 made.
@@ -65,14 +65,14 @@ If
 .Dv O_APPEND
 is not set for the file descriptor, the write operation will occur at
 the absolute position from the beginning of the file plus
-.Fa aiocbp-\*[Gt]aio_offset .
+.Fa aiocbp->aio_offset .
 .Pp
 If
 .Dv _POSIX_PRIORITIZED_IO
 is defined, and the descriptor supports it, then the enqueued
 operation is submitted at a priority equal to that of the calling
 process minus
-.Fa aiocbp-\*[Gt]aio_reqprio .
+.Fa aiocbp->aio_reqprio .
 .Pp
 The
 .Fa aiocbp
@@ -84,14 +84,14 @@ in order to determine return or error st
 while it is in progress.
 .Pp
 If the request is successfully enqueued, the value of
-.Fa aiocbp-\*[Gt]aio_offset
+.Fa aiocbp->aio_offset
 can be modified during the request as context, so this value must not
 be referenced after the request is enqueued.
 .Sh RESTRICTIONS
 The Asynchronous I/O Control Block structure pointed to by
 .Fa aiocbp
 and the buffer that the
-.Fa aiocbp-\*[Gt]aio_buf
+.Fa aiocbp->aio_buf
 member of that structure references must remain valid until the
 operation has completed.
 For this reason, use of auto (stack) variables
@@ -108,9 +108,9 @@ buffer contents after the request has be
 request has completed, are not allowed.
 .Pp
 If the file offset in
-.Fa aiocbp-\*[Gt]aio_offset
+.Fa aiocbp->aio_offset
 is past the offset maximum for
-.Fa aiocbp-\*[Gt]aio_fildes ,
+.Fa aiocbp->aio_fildes ,
 no I/O will occur.
 .Sh RETURN VALUES
 .Rv -std aio_write
@@ -142,16 +142,16 @@ returned in
 .Bl -tag -width Er
 .It Bq Er EBADF
 The
-.Fa aiocbp-\*[Gt]aio_fildes
+.Fa aiocbp->aio_fildes
 argument
 is invalid, or is not opened for writing.
 .It Bq Er EINVAL
 The offset
-.Fa aiocbp-\*[Gt]aio_offset
+.Fa aiocbp->aio_offset
 is not valid, the priority specified by
-.Fa aiocbp-\*[Gt]aio_reqprio
+.Fa aiocbp->aio_reqprio
 is not a valid priority, or the number of bytes specified by
-.Fa aiocbp-\*[Gt]aio_nbytes
+.Fa aiocbp->aio_nbytes
 is not valid.
 .El
 .Pp
@@ -168,7 +168,7 @@ system call, or one of:
 .Bl -tag -width Er
 .It Bq Er EBADF
 The
-.Fa aiocbp-\*[Gt]aio_fildes
+.Fa aiocbp->aio_fildes
 argument
 is invalid for writing.
 .It Bq Er ECANCELED
@@ -176,7 +176,7 @@ The request was explicitly canceled via 
 .Fn aio_cancel .
 .It Bq Er EINVAL
 The offset
-.Fa aiocbp-\*[Gt]aio_offset
+.Fa aiocbp->aio_offset
 would be invalid.
 .El
 .Sh SEE ALSO

Index: src/lib/librt/pset.3
diff -u src/lib/librt/pset.3:1.12 src/lib/librt/pset.3:1.13
--- src/lib/librt/pset.3:1.12	Thu May  6 10:49:53 2010
+++ src/lib/librt/pset.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pset.3,v 1.12 2010/05/06 10:49:53 jruoho Exp $
+.\"	$NetBSD: pset.3,v 1.13 2017/07/03 21:32:51 wiz Exp $
 .\"
 .\" Copyright (c) 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -180,15 +180,15 @@ for current process:
 	psetid_t psid;
 	cpuid_t ci = 0;
 
-	if (pset_create(\*[Am]psid) \*[Lt] 0)
+	if (pset_create(&psid) < 0)
 		err(EXIT_FAILURE, "pset_create");
 
 	/* Assign CPU 0 to the processor-set */
-	if (pset_assign(psid, ci, NULL) \*[Lt] 0)
+	if (pset_assign(psid, ci, NULL) < 0)
 		err(EXIT_FAILURE, "pset_assign");
 
 	/* Bind the current process to the processor-set */
-	if (pset_bind(psid, P_PID, P_MYID, NULL) \*[Lt] 0)
+	if (pset_bind(psid, P_PID, P_MYID, NULL) < 0)
 		err(EXIT_FAILURE, "pset_bind");
 
 	/*
@@ -196,7 +196,7 @@ for current process:
 	 */
 	perform_work();
 
-	if (pset_destroy(psid) \*[Lt] 0)
+	if (pset_destroy(psid) < 0)
 		err(EXIT_FAILURE, "pset_destroy");
 .Ed
 .Sh ERRORS

Index: src/lib/libskey/skey.3
diff -u src/lib/libskey/skey.3:1.10 src/lib/libskey/skey.3:1.11
--- src/lib/libskey/skey.3:1.10	Mon Oct  8 18:15:10 2012
+++ src/lib/libskey/skey.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\"     $NetBSD: skey.3,v 1.10 2012/10/08 18:15:10 njoly Exp $
+.\"     $NetBSD: skey.3,v 1.11 2017/07/03 21:32:51 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -227,7 +227,7 @@ Returns a pointer to a static buffer in
 .It Fn etob "out" "e"
 Convert English to binary.
 Returns 0 if the word is not in the database, 1 if all good words and
-parity is valid, \-1 if badly formed input (i.e. \*[Gt] 4 char word)
+parity is valid, \-1 if badly formed input (i.e. > 4 char word)
 and -2 if words are valid but parity is wrong.
 .It Fn put8 "out" "s"
 Display 8 bytes

Index: src/lib/libusbhid/usbhid.3
diff -u src/lib/libusbhid/usbhid.3:1.14 src/lib/libusbhid/usbhid.3:1.15
--- src/lib/libusbhid/usbhid.3:1.14	Thu Mar 15 19:04:47 2012
+++ src/lib/libusbhid/usbhid.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: usbhid.3,v 1.14 2012/03/15 19:04:47 njoly Exp $
+.\"	$NetBSD: usbhid.3,v 1.15 2017/07/03 21:32:51 wiz Exp $
 .\"
 .\" Copyright (c) 1999, 2001 Lennart Augustsson <augus...@netbsd.org>
 .\" All rights reserved.
@@ -118,7 +118,7 @@ To parse the report descriptor the
 function should be called with a report descriptor and a set that
 describes which items that are interesting.
 The set is obtained by or-ing together values
-.Fa "(1 \*[Lt]\*[Lt] k)"
+.Fa "(1 << k)"
 where
 .Fa k
 is an item of type

Index: src/lib/libutil/getmntopts.3
diff -u src/lib/libutil/getmntopts.3:1.13 src/lib/libutil/getmntopts.3:1.14
--- src/lib/libutil/getmntopts.3:1.13	Thu Mar 30 19:41:41 2017
+++ src/lib/libutil/getmntopts.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getmntopts.3,v 1.13 2017/03/30 19:41:41 abhinav Exp $
+.\"	$NetBSD: getmntopts.3,v 1.14 2017/07/03 21:32:51 wiz Exp $
 .\"
 .\" Copyright (c) 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -229,7 +229,7 @@ flag, would also have an
 entry.
 This can be declared and used as follows:
 .Bd -literal -offset indent
-#include \*[Lt]mntopts.h\*[Gt]
+#include <mntopts.h>
 
 static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
@@ -245,7 +245,7 @@ mntflags = mntaltflags = 0;
 
 \&...
 
-mp = getmntopts(options, mopts, \*[Am]mntflags, \*[Am]mntaltflags);
+mp = getmntopts(options, mopts, &mntflags, &mntaltflags);
 
 if (mp == NULL)
 	err(EXIT_FAILURE, "getmntopts");

Index: src/lib/libutil/pw_init.3
diff -u src/lib/libutil/pw_init.3:1.15 src/lib/libutil/pw_init.3:1.16
--- src/lib/libutil/pw_init.3:1.15	Wed May  5 22:05:31 2010
+++ src/lib/libutil/pw_init.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pw_init.3,v 1.15 2010/05/05 22:05:31 wiz Exp $
+.\"	$NetBSD: pw_init.3,v 1.16 2017/07/03 21:32:51 wiz Exp $
 .\"
 .\" Copyright (c) 1995
 .\"	The Regents of the University of California.  All rights reserved.
@@ -108,7 +108,7 @@ function reads a passwd file from
 .Fa ffd
 and writes it to
 .Fa tfd ,
-updating the entry corresponding to pw-\*[Gt]pw_name with the information
+updating the entry corresponding to pw->pw_name with the information
 in
 .Fa pw .
 If

Index: src/lib/libwrap/hosts_access.5
diff -u src/lib/libwrap/hosts_access.5:1.16 src/lib/libwrap/hosts_access.5:1.17
--- src/lib/libwrap/hosts_access.5:1.16	Thu Dec 18 20:16:52 2008
+++ src/lib/libwrap/hosts_access.5	Mon Jul  3 21:32:51 2017
@@ -363,7 +363,7 @@ in.tftpd: LOCAL, .my.domain
 .in +3
 .nf
 in.tftpd: ALL: spawn (/some/where/safe_finger -l @%h | \\
-	/usr/ucb/mail -s %d-%h root) \*[Am]
+	/usr/ucb/mail -s %d-%h root) &
 .fi
 .PP
 (The safe_finger command can be gotten from the tcp_wrappers package and
@@ -388,7 +388,7 @@ The result is an excellent early-warning
 An error is reported when a syntax error is found in a host access
 control rule; when the length of an access control rule exceeds the
 capacity of an internal buffer; when an access control rule is not
-terminated by a newline character; when the result of %\*[Lt]letter\*[Gt]
+terminated by a newline character; when the result of %<letter>
 expansion would overflow an internal buffer; when a system call fails
 that shouldn\'t.
 All problems are reported via the syslog daemon.
@@ -421,4 +421,4 @@ Eindhoven University of Technology
 Den Dolech 2, P.O. Box 513,
 5600 MB Eindhoven, The Netherlands
 .\" @(#) hosts_access.5 1.20 95/01/30 19:51:46
-.\"	$NetBSD: hosts_access.5,v 1.16 2008/12/18 20:16:52 christos Exp $
+.\"	$NetBSD: hosts_access.5,v 1.17 2017/07/03 21:32:51 wiz Exp $

Index: src/lib/libwrap/hosts_options.5
diff -u src/lib/libwrap/hosts_options.5:1.8 src/lib/libwrap/hosts_options.5:1.9
--- src/lib/libwrap/hosts_options.5:1.8	Tue Oct  1 19:38:46 2002
+++ src/lib/libwrap/hosts_options.5	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hosts_options.5,v 1.8 2002/10/01 19:38:46 wiz Exp $
+.\"	$NetBSD: hosts_options.5,v 1.9 2017/07/03 21:32:51 wiz Exp $
 .\"
 .TH HOSTS_OPTIONS 5
 .SH NAME
@@ -22,7 +22,7 @@ Any ":" characters within options should
 An option is of the form "keyword" or "keyword value".
 Options are processed in the specified order.
 Some options are subjected to
-%\*[Lt]letter\*[Gt] substitutions.
+%<letter> substitutions.
 For the sake of backwards compatibility with
 earlier versions, an "=" is permitted between keyword and value.
 .SH LOGGING
@@ -62,7 +62,7 @@ Notice the leading dot on the domain nam
 .SH RUNNING OTHER COMMANDS
 .IP "spawn shell_command"
 Execute, in a child process, the specified shell command, after
-performing the %\*[Lt]letter\*[Gt] expansions described in the hosts_access(5)
+performing the %<letter> expansions described in the hosts_access(5)
 manual page.
 The command is executed with stdin, stdout and stderr
 connected to the null device, so that it won\'t mess up the
@@ -71,7 +71,7 @@ Example:
 .sp
 .nf
 .ti +3
-spawn (/some/where/safe_finger -l @%h | /usr/ucb/mail root) \*[Am]
+spawn (/some/where/safe_finger -l @%h | /usr/ucb/mail root) &
 .fi
 .sp
 executes, in a background child process, the shell command "safe_finger
@@ -85,7 +85,7 @@ package; it is a wrapper around the regu
 the data sent by the remote host.
 .IP "twist shell_command"
 Replace the current process by an instance of the specified shell
-command, after performing the %\*[Lt]letter\*[Gt] expansions described in the
+command, after performing the %<letter> expansions described in the
 hosts_access(5) manual page.
 Stdin, stdout and stderr are connected to the client process.
 This option must appear at the end of a rule.
@@ -140,7 +140,7 @@ Look for a file in `/some/directory' wit
 process (for example in.telnetd for the telnet service), and copy its
 contents to the client.
 Newline characters are replaced by carriage-return newline,
-and %\*[Lt]letter\*[Gt] sequences are expanded (see
+and %<letter> sequences are expanded (see
 the hosts_access(5) manual page).
 .sp
 The tcp wrappers source code distribution provides a sample makefile
@@ -153,7 +153,7 @@ Change the nice value of the process (de
 Specify a positive value to spend more CPU resources on other processes.
 .IP "setenv name value"
 Place a (name, value) pair into the process environment.
-The value is subjected to %\*[Lt]letter\*[Gt] expansions and
+The value is subjected to %<letter> expansions and
 may contain whitespace (but leading and trailing blanks are stripped off).
 .sp
 Warning: many network daemons reset their environment before spawning a

Index: src/lib/libz/zlib.3
diff -u src/lib/libz/zlib.3:1.10 src/lib/libz/zlib.3:1.11
--- src/lib/libz/zlib.3:1.10	Tue Mar 18 18:20:38 2014
+++ src/lib/libz/zlib.3	Mon Jul  3 21:32:51 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: zlib.3,v 1.10 2014/03/18 18:20:38 riastradh Exp $
+.\"	$NetBSD: zlib.3,v 1.11 2017/07/03 21:32:51 wiz Exp $
 .\"	$OpenBSD: zlib.3,v 1.1 2003/09/25 09:12:09 jmc Exp $
 .\"
 .\"  Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
@@ -380,7 +380,7 @@ does not return
 then it must be called again as described above.
 .Pp
 .Fn deflate
-sets strm-\*[Gt]adler to the Adler-32 checksum of all input read so far
+sets strm->adler to the Adler-32 checksum of all input read so far
 (that is,
 .Fa total_in
 bytes).
@@ -601,10 +601,10 @@ If a preset dictionary is needed at this
 .Fn inflateSetDictionary
 below),
 .Fn inflate
-sets strm-\*[Gt]adler to the Adler-32 checksum of the dictionary
+sets strm->adler to the Adler-32 checksum of the dictionary
 chosen by the compressor and returns
 .Dv Z_NEED_DICT ;
-otherwise it sets strm-\*[Gt]adler to the Adler-32 checksum of all output produced
+otherwise it sets strm->adler to the Adler-32 checksum of all output produced
 so far
 (that is,
 .Fa total_out
@@ -798,7 +798,7 @@ or
 Thus the strings most likely to be useful should be
 put at the end of the dictionary, not at the front.
 .Pp
-Upon return of this function, strm-\*[Gt]adler is set to the Adler-32 value
+Upon return of this function, strm->adler is set to the Adler-32 value
 of the dictionary; the decompressor may later use this value to determine
 which dictionary has been used by the compressor.
 (The Adler-32 value applies to the whole dictionary even if only a subset
@@ -891,7 +891,7 @@ Before the call to
 the stream state must be set as for a call to
 .Fn deflate ,
 since the currently available input may have to be compressed and flushed.
-In particular, strm-\*[Gt]avail_out must be non-zero.
+In particular, strm->avail_out must be non-zero.
 .Pp
 .Fn deflateParams
 returns
@@ -900,7 +900,7 @@ if successful,
 .Dv Z_STREAM_ERROR
 if the source stream state was inconsistent or if a parameter was invalid, or
 .Dv Z_BUF_ERROR
-if strm-\*[Gt]avail_out was zero.
+if strm->avail_out was zero.
 .It Fa int Fn inflateInit2 "z_streamp strm" "int windowBits" ;
 .Pp
 This is another version of
@@ -1599,7 +1599,7 @@ in a single step).
 #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
 
 #define zlib_version zlibVersion()
-/* for compatibility with versions \*[Lt] 1.0.2 */
+/* for compatibility with versions < 1.0.2 */
 .Ed
 .Sh VARIOUS HACKS
 deflateInit and inflateInit are macros to allow checking the

Reply via email to