diff --git a/share/man/man9/BUF_ISLOCKED.9 b/share/man/man9/BUF_ISLOCKED.9
index 5970388..2471db9 100644
--- a/share/man/man9/BUF_ISLOCKED.9
+++ b/share/man/man9/BUF_ISLOCKED.9
@@ -66,4 +66,4 @@ The lock is not held by anyone.
 .Xr lockmgr 9
 .Sh AUTHORS
 This manual page was written by
-.An Attilio Rao Aq attilio@FreeBSD.org .
+.An Attilio Rao Aq Mt attilio@FreeBSD.org .
diff --git a/share/man/man9/BUF_LOCK.9 b/share/man/man9/BUF_LOCK.9
index ca414ec..9676af8 100644
--- a/share/man/man9/BUF_LOCK.9
+++ b/share/man/man9/BUF_LOCK.9
@@ -72,4 +72,4 @@ information on non-zero return values.
 .Xr lockmgr 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/BUF_LOCKFREE.9 b/share/man/man9/BUF_LOCKFREE.9
index d356f0d..1226cea 100644
--- a/share/man/man9/BUF_LOCKFREE.9
+++ b/share/man/man9/BUF_LOCKFREE.9
@@ -60,4 +60,4 @@ The buffer whose lock is to be destroyed.
 .Xr lockdestroy 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/BUF_LOCKINIT.9 b/share/man/man9/BUF_LOCKINIT.9
index 286e7f8..98d3b2a 100644
--- a/share/man/man9/BUF_LOCKINIT.9
+++ b/share/man/man9/BUF_LOCKINIT.9
@@ -59,4 +59,4 @@ The buffer whose lock it to be initialized.
 .Xr lockmgr 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/BUF_RECURSED.9 b/share/man/man9/BUF_RECURSED.9
index 2e369ea..fccf83f 100644
--- a/share/man/man9/BUF_RECURSED.9
+++ b/share/man/man9/BUF_RECURSED.9
@@ -62,4 +62,4 @@ for details.
 .Xr lockmgr 9
 .Sh AUTHORS
 This manual page was written by
-.An Attilio Rao Aq attilio@FreeBSD.org .
+.An Attilio Rao Aq Mt attilio@FreeBSD.org .
diff --git a/share/man/man9/BUF_TIMELOCK.9 b/share/man/man9/BUF_TIMELOCK.9
index 31ca200..151e7f5 100644
--- a/share/man/man9/BUF_TIMELOCK.9
+++ b/share/man/man9/BUF_TIMELOCK.9
@@ -80,4 +80,4 @@ for details on non-zero return values.
 .Xr lockmgr 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/BUF_UNLOCK.9 b/share/man/man9/BUF_UNLOCK.9
index 0b6b0b3..e305a5d 100644
--- a/share/man/man9/BUF_UNLOCK.9
+++ b/share/man/man9/BUF_UNLOCK.9
@@ -61,4 +61,4 @@ The buffer must already be locked.
 .Xr lockmgr 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/BUS_CONFIG_INTR.9 b/share/man/man9/BUS_CONFIG_INTR.9
index a3b4c54..8a45b53 100644
--- a/share/man/man9/BUS_CONFIG_INTR.9
+++ b/share/man/man9/BUS_CONFIG_INTR.9
@@ -102,5 +102,4 @@ method first appeared in
 .\"
 .Sh AUTHORS
 This manual page was written by
-.An Marcel Moolenaar
-.Aq marcel@xcllnt.net .
+.An Marcel Moolenaar Aq Mt marcel@xcllnt.net .
diff --git a/share/man/man9/BUS_SETUP_INTR.9 b/share/man/man9/BUS_SETUP_INTR.9
index 8264a99..eab62e3 100644
--- a/share/man/man9/BUS_SETUP_INTR.9
+++ b/share/man/man9/BUS_SETUP_INTR.9
@@ -205,12 +205,10 @@ otherwise an appropriate error is returned.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Jeroen Ruigrok van der Werven
-.Aq asmodai@FreeBSD.org
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org
 based on the manual pages for
 .Fn BUS_CREATE_INTR
 and
 .Fn BUS_CONNECT_INTR
 written by
-.An Doug Rabson
-.Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/share/man/man9/CTASSERT.9 b/share/man/man9/CTASSERT.9
index 4885d42..6211c2e 100644
--- a/share/man/man9/CTASSERT.9
+++ b/share/man/man9/CTASSERT.9
@@ -66,5 +66,4 @@ structure is 16 bytes.
 .Xr KASSERT 9
 .Sh AUTHORS
 This manual page was written by
-.An Hiten M. Pandya
-.Aq hmp@FreeBSD.org .
+.An Hiten M. Pandya Aq Mt hmp@FreeBSD.org .
diff --git a/share/man/man9/DB_COMMAND.9 b/share/man/man9/DB_COMMAND.9
index 179f3f3..bf3faea 100644
--- a/share/man/man9/DB_COMMAND.9
+++ b/share/man/man9/DB_COMMAND.9
@@ -103,8 +103,8 @@ Calling my command with address 0x1000
 db>
 .Ef
 .Ed
-.Sh "SEE ALSO"
+.Sh SEE ALSO
 .Xr ddb 4
-.Sh AUTHOR
+.Sh AUTHORS
 This manual page was written by
-.An Guillaume Ballet Aq gballet@gmail.com .
+.An Guillaume Ballet Aq Mt gballet@gmail.com .
diff --git a/share/man/man9/DECLARE_GEOM_CLASS.9 b/share/man/man9/DECLARE_GEOM_CLASS.9
index 01f074d..a6dc969 100644
--- a/share/man/man9/DECLARE_GEOM_CLASS.9
+++ b/share/man/man9/DECLARE_GEOM_CLASS.9
@@ -176,4 +176,4 @@ DECLARE_GEOM_CLASS(example_class, g_example);
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/DECLARE_MODULE.9 b/share/man/man9/DECLARE_MODULE.9
index d33c18e..b5c8577 100644
--- a/share/man/man9/DECLARE_MODULE.9
+++ b/share/man/man9/DECLARE_MODULE.9
@@ -107,6 +107,6 @@ enumeration
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org ,
+.An Alexander Langer Aq Mt alex@FreeBSD.org ,
 inspired by the KLD Facility Programming Tutorial by
-.An Andrew Reiter Aq arr@watson.org .
+.An Andrew Reiter Aq Mt arr@watson.org .
diff --git a/share/man/man9/DEVICE_ATTACH.9 b/share/man/man9/DEVICE_ATTACH.9
index ccb9f27..12cce74 100644
--- a/share/man/man9/DEVICE_ATTACH.9
+++ b/share/man/man9/DEVICE_ATTACH.9
@@ -68,4 +68,4 @@ Zero is returned on success, otherwise an appropriate error is returned.
 .Xr DEVICE_SHUTDOWN 9
 .Sh AUTHORS
 This manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/share/man/man9/DEVICE_IDENTIFY.9 b/share/man/man9/DEVICE_IDENTIFY.9
index 4257407..6f0011a 100644
--- a/share/man/man9/DEVICE_IDENTIFY.9
+++ b/share/man/man9/DEVICE_IDENTIFY.9
@@ -91,4 +91,4 @@ foo_identify(driver_t *driver, device_t parent)
 .Xr DEVICE_SHUTDOWN 9
 .Sh AUTHORS
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/DEV_MODULE.9 b/share/man/man9/DEV_MODULE.9
index 28465b3..e28b245 100644
--- a/share/man/man9/DEV_MODULE.9
+++ b/share/man/man9/DEV_MODULE.9
@@ -102,4 +102,4 @@ DEV_MODULE(foo, foo_load, NULL);
 .Xr module 9
 .Sh AUTHORS
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/DRIVER_MODULE.9 b/share/man/man9/DRIVER_MODULE.9
index 274fdcc..af03ef9 100644
--- a/share/man/man9/DRIVER_MODULE.9
+++ b/share/man/man9/DRIVER_MODULE.9
@@ -147,4 +147,4 @@ for a specific pass level.
 .Xr SYSINIT 9
 .Sh AUTHORS
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/EVENTHANDLER.9 b/share/man/man9/EVENTHANDLER.9
index fc22d5e..711c6ef 100644
--- a/share/man/man9/EVENTHANDLER.9
+++ b/share/man/man9/EVENTHANDLER.9
@@ -334,4 +334,4 @@ facility first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Joseph Koshy Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/share/man/man9/KASSERT.9 b/share/man/man9/KASSERT.9
index 62c97c4..0c6898a 100644
--- a/share/man/man9/KASSERT.9
+++ b/share/man/man9/KASSERT.9
@@ -83,5 +83,4 @@ vput(vp)
 .Xr panic 9
 .Sh AUTHORS
 This manual page was written by
-.An Jonathan M. Bresler
-.Aq jmb@FreeBSD.org .
+.An Jonathan M. Bresler Aq Mt jmb@FreeBSD.org .
diff --git a/share/man/man9/LOCK_PROFILING.9 b/share/man/man9/LOCK_PROFILING.9
index d64b328..2b77778 100644
--- a/share/man/man9/LOCK_PROFILING.9
+++ b/share/man/man9/LOCK_PROFILING.9
@@ -134,16 +134,16 @@ Generalized lock profiling support appeared in
 The
 .Nm MUTEX_PROFILING
 code was written by
-.An Eivind Eklund Aq eivind@FreeBSD.org ,
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org
+.An Eivind Eklund Aq Mt eivind@FreeBSD.org ,
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org
 and
-.An Robert Watson Aq rwatson@FreeBSD.org .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
 The
 .Nm
 code was written by
-.An Kip Macy Aq kmacy@FreeBSD.org .
+.An Kip Macy Aq Mt kmacy@FreeBSD.org .
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
 .Sh NOTES
 The
 .Dv LOCK_PROFILING
diff --git a/share/man/man9/MODULE_DEPEND.9 b/share/man/man9/MODULE_DEPEND.9
index c0a8fdd..b8e3104 100644
--- a/share/man/man9/MODULE_DEPEND.9
+++ b/share/man/man9/MODULE_DEPEND.9
@@ -77,4 +77,4 @@ MODULE_DEPEND(foo, bar, 1, 3, 4);
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/MODULE_VERSION.9 b/share/man/man9/MODULE_VERSION.9
index 2f284b8..e791ded 100644
--- a/share/man/man9/MODULE_VERSION.9
+++ b/share/man/man9/MODULE_VERSION.9
@@ -56,4 +56,4 @@ MODULE_VERSION(foo, 1);
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/SDT.9 b/share/man/man9/SDT.9
index 1f821cf..91bf4b1 100644
--- a/share/man/man9/SDT.9
+++ b/share/man/man9/SDT.9
@@ -278,9 +278,9 @@ SDT_PROBE_DEFINE1_XLATE(ip, , , receive, "struct icmp *",
 DTrace and the
 .Nm
 framework were originally ported to FreeBSD from Solaris by
-.An John Birrell Aq jb@FreeBSD.org .
+.An John Birrell Aq Mt jb@FreeBSD.org .
 This manual page was written by
-.An Mark Johnston Aq markj@FreeBSD.org .
+.An Mark Johnston Aq Mt markj@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man9/SYSCALL_MODULE.9 b/share/man/man9/SYSCALL_MODULE.9
index 973adeb..b803bce 100644
--- a/share/man/man9/SYSCALL_MODULE.9
+++ b/share/man/man9/SYSCALL_MODULE.9
@@ -81,4 +81,4 @@ A minimal example for a syscall module can be found in
 .Pa /usr/share/examples/kld/syscall/module/syscall.c
 .Sh AUTHORS
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/SYSINIT.9 b/share/man/man9/SYSINIT.9
index 1837d25..28701f2 100644
--- a/share/man/man9/SYSINIT.9
+++ b/share/man/man9/SYSINIT.9
@@ -157,7 +157,7 @@ framework first appeared in
 The
 .Nm
 framework was written by
-.An Terrence Lambert Aq terry@FreeBSD.org .
+.An Terrence Lambert Aq Mt terry@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Hiten Pandya Aq hmp@FreeBSD.org .
+.An Hiten Pandya Aq Mt hmp@FreeBSD.org .
diff --git a/share/man/man9/VFS_SET.9 b/share/man/man9/VFS_SET.9
index 25acc86..c35935e 100644
--- a/share/man/man9/VFS_SET.9
+++ b/share/man/man9/VFS_SET.9
@@ -108,4 +108,4 @@ VFS_SET(myfs_vfsops, myfs, 0);
 .Xr vfs_modevent 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/alq.9 b/share/man/man9/alq.9
index 65c2d07..b8b0c23 100644
--- a/share/man/man9/alq.9
+++ b/share/man/man9/alq.9
@@ -431,11 +431,11 @@ Asynchronous Logging Queues (ALQ) facility first appeared in
 The
 .Nm
 facility was written by
-.An Jeffrey Roberson Aq jeff@FreeBSD.org
+.An Jeffrey Roberson Aq Mt jeff@FreeBSD.org
 and extended by
-.An Lawrence Stewart Aq lstewart@freebsd.org .
+.An Lawrence Stewart Aq Mt lstewart@freebsd.org .
 .Pp
 This manual page was written by
-.An Hiten Pandya Aq hmp@FreeBSD.org
+.An Hiten Pandya Aq Mt hmp@FreeBSD.org
 and revised by
-.An Lawrence Stewart Aq lstewart@freebsd.org .
+.An Lawrence Stewart Aq Mt lstewart@freebsd.org .
diff --git a/share/man/man9/bus_activate_resource.9 b/share/man/man9/bus_activate_resource.9
index eb5b3e8..12d202c 100644
--- a/share/man/man9/bus_activate_resource.9
+++ b/share/man/man9/bus_activate_resource.9
@@ -90,4 +90,4 @@ Zero is returned on success, otherwise an error is returned.
 .Xr driver 9
 .Sh AUTHORS
 This manual page was written by
-.An Warner Losh Aq imp@FreeBSD.org .
+.An Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/share/man/man9/bus_alloc_resource.9 b/share/man/man9/bus_alloc_resource.9
index 388a7f3..78959a0 100644
--- a/share/man/man9/bus_alloc_resource.9
+++ b/share/man/man9/bus_alloc_resource.9
@@ -178,6 +178,6 @@ should be saved in the softc of the device after these calls.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Alexander Langer Aq alex@big.endian.de
+.An Alexander Langer Aq Mt alex@big.endian.de
 with parts by
-.An Warner Losh Aq imp@FreeBSD.org .
+.An Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/share/man/man9/bus_child_present.9 b/share/man/man9/bus_child_present.9
index 12577ad..4ba967a 100644
--- a/share/man/man9/bus_child_present.9
+++ b/share/man/man9/bus_child_present.9
@@ -84,4 +84,4 @@ if (bus_child_present(dev))
 .Xr driver 9
 .Sh AUTHORS
 This manual page was written by
-.An Warner Losh Aq imp@FreeBSD.org .
+.An Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/share/man/man9/bus_release_resource.9 b/share/man/man9/bus_release_resource.9
index 35e70d9..731eda3 100644
--- a/share/man/man9/bus_release_resource.9
+++ b/share/man/man9/bus_release_resource.9
@@ -103,4 +103,4 @@ The kernel will panic, if it cannot release the resource.
 .Xr driver 9
 .Sh AUTHORS
 This manual page was written by
-.An Alexander Langer Aq alex@big.endian.de .
+.An Alexander Langer Aq Mt alex@big.endian.de .
diff --git a/share/man/man9/bus_set_resource.9 b/share/man/man9/bus_set_resource.9
index cda47b6..2eb24bf 100644
--- a/share/man/man9/bus_set_resource.9
+++ b/share/man/man9/bus_set_resource.9
@@ -93,4 +93,4 @@ Zero is returned on success, otherwise an error is returned.
 .Xr driver 9
 .Sh AUTHORS
 This manual page was written by
-.An Warner Losh Aq imp@FreeBSD.org .
+.An Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/share/man/man9/cd.9 b/share/man/man9/cd.9
index 4ed2d52..364a605 100644
--- a/share/man/man9/cd.9
+++ b/share/man/man9/cd.9
@@ -116,8 +116,8 @@ manual page first appeared in
 .An -nosplit
 This
 manual page was written by
-.An John-Mark Gurney Aq jmg@FreeBSD.org .
+.An John-Mark Gurney Aq Mt jmg@FreeBSD.org .
 It was updated for CAM and
 .Fx 3.0
 by
-.An Kenneth Merry Aq ken@FreeBSD.org .
+.An Kenneth Merry Aq Mt ken@FreeBSD.org .
diff --git a/share/man/man9/config_intrhook.9 b/share/man/man9/config_intrhook.9
index 083a2a2..60bf9d8 100644
--- a/share/man/man9/config_intrhook.9
+++ b/share/man/man9/config_intrhook.9
@@ -100,6 +100,6 @@ with the CAM subsystem, but are available for any driver to use.
 .Sh AUTHORS
 .An -nosplit
 The functions were written by
-.An Justin Gibbs Aq gibbs@FreeBSD.org .
+.An Justin Gibbs Aq Mt gibbs@FreeBSD.org .
 This manual page was written by
-.An M. Warner Losh Aq imp@FreeBSD.org .
+.An M. Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/share/man/man9/crypto.9 b/share/man/man9/crypto.9
index c9a9996..8ed30d9 100644
--- a/share/man/man9/crypto.9
+++ b/share/man/man9/crypto.9
@@ -648,7 +648,7 @@ most of the framework code
 The cryptographic framework first appeared in
 .Ox 2.7
 and was written by
-.An "Angelos D. Keromytis" Aq angelos@openbsd.org .
+.An Angelos D. Keromytis Aq Mt angelos@openbsd.org .
 .Sh BUGS
 The framework currently assumes that all the algorithms in a
 .Fn crypto_newsession
diff --git a/share/man/man9/devstat.9 b/share/man/man9/devstat.9
index 7ed7ec1..ad13934 100644
--- a/share/man/man9/devstat.9
+++ b/share/man/man9/devstat.9
@@ -431,7 +431,7 @@ The
 statistics system appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.org
+.An Kenneth Merry Aq Mt ken@FreeBSD.org
 .Sh BUGS
 There may be a need for
 .Fn spl
diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9
index 0c63e08..14ae52b 100644
--- a/share/man/man9/domain.9
+++ b/share/man/man9/domain.9
@@ -240,4 +240,4 @@ types if the domain has a default raw protocol.
 .Xr socket 2
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/eventtimers.9 b/share/man/man9/eventtimers.9
index 0c28d76..09cd8b3 100644
--- a/share/man/man9/eventtimers.9
+++ b/share/man/man9/eventtimers.9
@@ -250,4 +250,4 @@ timer hardware access.
 .Sh SEE ALSO
 .Xr eventtimers 4
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/share/man/man9/fail.9 b/share/man/man9/fail.9
index 6a3d815..8dbba1b 100644
--- a/share/man/man9/fail.9
+++ b/share/man/man9/fail.9
@@ -191,7 +191,7 @@ Return 5 once, when pid 1234 executes the fail point.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Zach Loafman Aq zml@FreeBSD.org .
+.An Zach Loafman Aq Mt zml@FreeBSD.org .
 .Sh CAVEATS
 It is easy to shoot yourself in the foot by setting fail points too
 aggressively or setting too many in combination.
diff --git a/share/man/man9/firmware.9 b/share/man/man9/firmware.9
index 4811921..f8c8b32 100644
--- a/share/man/man9/firmware.9
+++ b/share/man/man9/firmware.9
@@ -269,4 +269,4 @@ system was introduced in
 .Fx 6.1 .
 .Sh AUTHORS
 This manual page was written by
-.An Max Laier Aq mlaier@FreeBSD.org .
+.An Max Laier Aq Mt mlaier@FreeBSD.org .
diff --git a/share/man/man9/g_access.9 b/share/man/man9/g_access.9
index 95ad1da..fcfc869 100644
--- a/share/man/man9/g_access.9
+++ b/share/man/man9/g_access.9
@@ -162,4 +162,4 @@ Any other error that can be returned by the provider's access method.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_attach.9 b/share/man/man9/g_attach.9
index 4bf7d9c..c5cdf5a 100644
--- a/share/man/man9/g_attach.9
+++ b/share/man/man9/g_attach.9
@@ -138,4 +138,4 @@ The operation creates a topology loop.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_bio.9 b/share/man/man9/g_bio.9
index e7351b8..e3ac64e 100644
--- a/share/man/man9/g_bio.9
+++ b/share/man/man9/g_bio.9
@@ -274,4 +274,4 @@ example_start(struct bio *bp)
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_consumer.9 b/share/man/man9/g_consumer.9
index e30fb80..1cdcacd 100644
--- a/share/man/man9/g_consumer.9
+++ b/share/man/man9/g_consumer.9
@@ -134,4 +134,4 @@ some_function(struct g_geom *mygeom, struct g_provider *pp)
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_data.9 b/share/man/man9/g_data.9
index f5cd696..724854e 100644
--- a/share/man/man9/g_data.9
+++ b/share/man/man9/g_data.9
@@ -119,4 +119,4 @@ An I/O error occurred while reading from or writing to the consumer.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_event.9 b/share/man/man9/g_event.9
index 380caa8..0bdd0ab6 100644
--- a/share/man/man9/g_event.9
+++ b/share/man/man9/g_event.9
@@ -186,4 +186,4 @@ and there was insufficient memory.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_geom.9 b/share/man/man9/g_geom.9
index 2f4599d..2b4aac8 100644
--- a/share/man/man9/g_geom.9
+++ b/share/man/man9/g_geom.9
@@ -203,4 +203,4 @@ destroy_example_geom(struct g_geom *gp)
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_provider.9 b/share/man/man9/g_provider.9
index 05e4add..b22ae0b 100644
--- a/share/man/man9/g_provider.9
+++ b/share/man/man9/g_provider.9
@@ -142,4 +142,4 @@ create_example_provider(struct g_geom *gp)
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_provider_by_name.9 b/share/man/man9/g_provider_by_name.9
index 58da421..56dd303 100644
--- a/share/man/man9/g_provider_by_name.9
+++ b/share/man/man9/g_provider_by_name.9
@@ -74,4 +74,4 @@ if there is no such provider.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_wither_geom.9 b/share/man/man9/g_wither_geom.9
index 8ced949..337d962 100644
--- a/share/man/man9/g_wither_geom.9
+++ b/share/man/man9/g_wither_geom.9
@@ -83,4 +83,4 @@ The topology lock has to be held.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/get_cyclecount.9 b/share/man/man9/get_cyclecount.9
index eabaeb1..afdb5d2 100644
--- a/share/man/man9/get_cyclecount.9
+++ b/share/man/man9/get_cyclecount.9
@@ -92,4 +92,4 @@ function first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Mark Murray Aq markm@FreeBSD.org .
+.An Mark Murray Aq Mt markm@FreeBSD.org .
diff --git a/share/man/man9/getnewvnode.9 b/share/man/man9/getnewvnode.9
index 2e81212..57ecc98 100644
--- a/share/man/man9/getnewvnode.9
+++ b/share/man/man9/getnewvnode.9
@@ -66,4 +66,4 @@ returns 0 on success.
 There are currently no failure conditions - that do not result in a panic.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9
index 0d3629a..84d57e6 100644
--- a/share/man/man9/groupmember.9
+++ b/share/man/man9/groupmember.9
@@ -57,4 +57,4 @@ If the
 is found, 1 is returned; otherwise, 0 is returned.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/hhook.9 b/share/man/man9/hhook.9
index ca6b494..f572fd2 100644
--- a/share/man/man9/hhook.9
+++ b/share/man/man9/hhook.9
@@ -374,9 +374,9 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 framework was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
 .Pp
 This manual page was written by
-.An David Hayes Aq david.hayes@ieee.org
+.An David Hayes Aq Mt david.hayes@ieee.org
 and
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man9/ieee80211_radiotap.9 b/share/man/man9/ieee80211_radiotap.9
index cea2eb4e..3a67007 100644
--- a/share/man/man9/ieee80211_radiotap.9
+++ b/share/man/man9/ieee80211_radiotap.9
@@ -297,6 +297,6 @@ definitions first appeared in
 .Sh AUTHORS
 .An -nosplit
 The original version of this manual page was written by
-.An Bruce M. Simpson Aq bms@FreeBSD.org
+.An Bruce M. Simpson Aq Mt bms@FreeBSD.org
 and
-.An Darron Broad Aq darron@kewl.org .
+.An Darron Broad Aq Mt darron@kewl.org .
diff --git a/share/man/man9/insmntque.9 b/share/man/man9/insmntque.9
index e2bf0d5..ae94d90 100644
--- a/share/man/man9/insmntque.9
+++ b/share/man/man9/insmntque.9
@@ -92,4 +92,4 @@ even if the file system is being unmounted.
 .Xr vgone 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/kernel_mount.9 b/share/man/man9/kernel_mount.9
index 4164e5b..10fb353 100644
--- a/share/man/man9/kernel_mount.9
+++ b/share/man/man9/kernel_mount.9
@@ -206,6 +206,6 @@ appeared in
 The
 .Fn kernel_mount
 family of functions and API was developed by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man9/khelp.9 b/share/man/man9/khelp.9
index 2f3f0e1..667bccc 100644
--- a/share/man/man9/khelp.9
+++ b/share/man/man9/khelp.9
@@ -430,9 +430,9 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 framework was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
 .Pp
 This manual page was written by
-.An David Hayes Aq david.hayes@ieee.org
+.An David Hayes Aq Mt david.hayes@ieee.org
 and
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man9/kqueue.9 b/share/man/man9/kqueue.9
index 29ae5f7..28aadee 100644
--- a/share/man/man9/kqueue.9
+++ b/share/man/man9/kqueue.9
@@ -463,4 +463,4 @@ by
 .Sh AUTHORS
 This
 manual page was written by
-.An John-Mark Gurney Aq jmg@FreeBSD.org .
+.An John-Mark Gurney Aq Mt jmg@FreeBSD.org .
diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9
index cb77686..22fa2f7 100644
--- a/share/man/man9/lock.9
+++ b/share/man/man9/lock.9
@@ -397,4 +397,4 @@ will be the result of trying.
 .Xr VOP_PRINT 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/mbchain.9 b/share/man/man9/mbchain.9
index 4e05e7a..3603ba1 100644
--- a/share/man/man9/mbchain.9
+++ b/share/man/man9/mbchain.9
@@ -219,4 +219,4 @@ mb_done(mbp);
 .Xr mdchain 9
 .Sh AUTHORS
 This manual page was written by
-.An Boris Popov Aq bp@FreeBSD.org .
+.An Boris Popov Aq Mt bp@FreeBSD.org .
diff --git a/share/man/man9/mbpool.9 b/share/man/man9/mbpool.9
index 600c371..e9cd7a2 100644
--- a/share/man/man9/mbpool.9
+++ b/share/man/man9/mbpool.9
@@ -255,7 +255,7 @@ the number of buffers on the free list.
 .Sh SEE ALSO
 .Xr mbuf 9
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
 .Sh CAVEATS
 The function
 .Fn mbp_sync
diff --git a/share/man/man9/mbuf_tags.9 b/share/man/man9/mbuf_tags.9
index cab22a0..c812a3f 100644
--- a/share/man/man9/mbuf_tags.9
+++ b/share/man/man9/mbuf_tags.9
@@ -283,4 +283,4 @@ Inlined functions are defined in
 The packet tags first appeared in
 .Ox 2.9
 and were written by
-.An Angelos D. Keromytis Aq angelos@openbsd.org .
+.An Angelos D. Keromytis Aq Mt angelos@openbsd.org .
diff --git a/share/man/man9/mdchain.9 b/share/man/man9/mdchain.9
index 5b0bf4a..ed25c1e 100644
--- a/share/man/man9/mdchain.9
+++ b/share/man/man9/mdchain.9
@@ -208,4 +208,4 @@ mb_done(mdp);
 .Xr mbuf 9
 .Sh AUTHORS
 This manual page was written by
-.An Boris Popov Aq bp@FreeBSD.org .
+.An Boris Popov Aq Mt bp@FreeBSD.org .
diff --git a/share/man/man9/memguard.9 b/share/man/man9/memguard.9
index 9ce773a..42678c0 100644
--- a/share/man/man9/memguard.9
+++ b/share/man/man9/memguard.9
@@ -196,13 +196,13 @@ first appeared in
 .An -nosplit
 .Nm
 was originally written by
-.An Bosko Milekic Aq bmilekic@FreeBSD.org .
+.An Bosko Milekic Aq Mt bmilekic@FreeBSD.org .
 This manual page was originally written by
-.An Christian Brueffer Aq brueffer@FreeBSD.org .
+.An Christian Brueffer Aq Mt brueffer@FreeBSD.org .
 Additions have been made by
-.An Matthew Fleming Aq mdf@FreeBSD.org
+.An Matthew Fleming Aq Mt mdf@FreeBSD.org
 and
-.An Gleb Smirnoff Aq glebius@FreeBSD.org
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org
 to both the implementation and the documentation.
 .Sh BUGS
 It is not possible to guard allocations that really expect themselves to be
diff --git a/share/man/man9/microtime.9 b/share/man/man9/microtime.9
index 3288578..f5ea65d 100644
--- a/share/man/man9/microtime.9
+++ b/share/man/man9/microtime.9
@@ -118,4 +118,4 @@ but have existed in other incarnations since
 .Bx 4.4 .
 .Sh AUTHORS
 This manual page was written by
-.An Kelly Yancey Aq kbyanc@posi.net .
+.An Kelly Yancey Aq Mt kbyanc@posi.net .
diff --git a/share/man/man9/microuptime.9 b/share/man/man9/microuptime.9
index 5a9a71b..048143d 100644
--- a/share/man/man9/microuptime.9
+++ b/share/man/man9/microuptime.9
@@ -120,4 +120,4 @@ execution time.
 .Xr tvtohz 9
 .Sh AUTHORS
 This manual page was written by
-.An Kelly Yancey Aq kbyanc@posi.net .
+.An Kelly Yancey Aq Mt kbyanc@posi.net .
diff --git a/share/man/man9/mod_cc.9 b/share/man/man9/mod_cc.9
index d753a3c..12bc9be 100644
--- a/share/man/man9/mod_cc.9
+++ b/share/man/man9/mod_cc.9
@@ -322,12 +322,12 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 framework was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org ,
-.An James Healy Aq jimmy@deefa.com
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org ,
+.An James Healy Aq Mt jimmy@deefa.com
 and
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
 .Pp
 This manual page was written by
-.An David Hayes Aq david.hayes@ieee.org
+.An David Hayes Aq Mt david.hayes@ieee.org
 and
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man9/module.9 b/share/man/man9/module.9
index bd072a9..274b3b4 100644
--- a/share/man/man9/module.9
+++ b/share/man/man9/module.9
@@ -118,4 +118,4 @@ DECLARE_MODULE(foo, mod_data, SI_SUB_EXEC, SI_ORDER_ANY);
 .Pa /usr/share/examples/kld
 .Sh AUTHORS
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9
index 95c20a3..0bd827f 100644
--- a/share/man/man9/namei.9
+++ b/share/man/man9/namei.9
@@ -347,9 +347,9 @@ An attempt is made to modify a file or directory on a read-only file system.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Eivind Eklund Aq eivind@FreeBSD.org
+.An Eivind Eklund Aq Mt eivind@FreeBSD.org
 and later significantly revised by
-.An Hiten M. Pandya Aq hmp@FreeBSD.org .
+.An Hiten M. Pandya Aq Mt hmp@FreeBSD.org .
 .Sh BUGS
 The
 .Dv LOCKPARENT
diff --git a/share/man/man9/osd.9 b/share/man/man9/osd.9
index ba9c632..e8260fe 100644
--- a/share/man/man9/osd.9
+++ b/share/man/man9/osd.9
@@ -384,7 +384,7 @@ Object Specific Data (OSD) facility first appeared in
 The
 .Nm
 facility was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man9/pbuf.9 b/share/man/man9/pbuf.9
index 4329ac9..6cf6d39 100644
--- a/share/man/man9/pbuf.9
+++ b/share/man/man9/pbuf.9
@@ -129,4 +129,4 @@ In the case of
 can also be returned indicating that there are no buffers available.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9
index 28bae85..411c11a 100644
--- a/share/man/man9/pci.9
+++ b/share/man/man9/pci.9
@@ -695,10 +695,11 @@ space on the target architecture.
 .%O ISBN 0-201-30974-2
 .Re
 .Sh AUTHORS
+.An -nosplit
 This manual page was written by
-.An Bruce M Simpson Aq bms@FreeBSD.org
+.An Bruce M Simpson Aq Mt bms@FreeBSD.org
 and
-.An John Baldwin Aq jhb@FreeBSD.org .
+.An John Baldwin Aq Mt jhb@FreeBSD.org .
 .Sh BUGS
 The kernel PCI code has a number of references to
 .Dq "slot numbers" .
diff --git a/share/man/man9/pfind.9 b/share/man/man9/pfind.9
index dfd15b8..5a3f5ca 100644
--- a/share/man/man9/pfind.9
+++ b/share/man/man9/pfind.9
@@ -85,4 +85,4 @@ on failure.
 .Xr pgfind 9
 .Sh AUTHORS
 This manual page was written by
-.An Evan Sarmiento Aq kaworu@sektor7.ath.cx .
+.An Evan Sarmiento Aq Mt kaworu@sektor7.ath.cx .
diff --git a/share/man/man9/pgfind.9 b/share/man/man9/pgfind.9
index a304987..5a2cf28 100644
--- a/share/man/man9/pgfind.9
+++ b/share/man/man9/pgfind.9
@@ -62,4 +62,4 @@ structure on successful completion.
 .Xr pfind 9
 .Sh AUTHORS
 This manual page was written by
-.An Evan Sarmiento Aq kaworu@sektor7.ath.cx .
+.An Evan Sarmiento Aq Mt kaworu@sektor7.ath.cx .
diff --git a/share/man/man9/pmap.9 b/share/man/man9/pmap.9
index aa6d4a3..2c04f50 100644
--- a/share/man/man9/pmap.9
+++ b/share/man/man9/pmap.9
@@ -127,4 +127,4 @@ operation.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_activate.9 b/share/man/man9/pmap_activate.9
index 840d8a1..8d9f050 100644
--- a/share/man/man9/pmap_activate.9
+++ b/share/man/man9/pmap_activate.9
@@ -48,4 +48,4 @@ accessed.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_change_wiring.9 b/share/man/man9/pmap_change_wiring.9
index f3952f8..4fd09f2 100644
--- a/share/man/man9/pmap_change_wiring.9
+++ b/share/man/man9/pmap_change_wiring.9
@@ -65,4 +65,4 @@ function.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_clear_modify.9 b/share/man/man9/pmap_clear_modify.9
index 002300b..45bf45c 100644
--- a/share/man/man9/pmap_clear_modify.9
+++ b/share/man/man9/pmap_clear_modify.9
@@ -60,4 +60,4 @@ bit on the physical page
 .Xr pmap_ts_referenced 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_copy.9 b/share/man/man9/pmap_copy.9
index 1541fa5..4899b6d 100644
--- a/share/man/man9/pmap_copy.9
+++ b/share/man/man9/pmap_copy.9
@@ -81,4 +81,4 @@ routine only operates upon a single page.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_enter.9 b/share/man/man9/pmap_enter.9
index 2e52453..69e0650 100644
--- a/share/man/man9/pmap_enter.9
+++ b/share/man/man9/pmap_enter.9
@@ -65,4 +65,4 @@ specification to make the requested entry at the time it is called.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_extract.9 b/share/man/man9/pmap_extract.9
index 0622b65..d2154eb 100644
--- a/share/man/man9/pmap_extract.9
+++ b/share/man/man9/pmap_extract.9
@@ -90,6 +90,6 @@ be returned.
 The
 .Fn pmap_extract_and_hold
 function was implemented by
-.An Alan L. Cox Aq alc@imimic.com .
+.An Alan L. Cox Aq Mt alc@imimic.com .
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_growkernel.9 b/share/man/man9/pmap_growkernel.9
index f038fb5..1385ddc 100644
--- a/share/man/man9/pmap_growkernel.9
+++ b/share/man/man9/pmap_growkernel.9
@@ -48,4 +48,4 @@ It will allocate more page entries if required.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_init.9 b/share/man/man9/pmap_init.9
index 1a8d74c..b377208 100644
--- a/share/man/man9/pmap_init.9
+++ b/share/man/man9/pmap_init.9
@@ -62,4 +62,4 @@ excessive numbers of PV entries.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_is_modified.9 b/share/man/man9/pmap_is_modified.9
index 591a985..99bb498 100644
--- a/share/man/man9/pmap_is_modified.9
+++ b/share/man/man9/pmap_is_modified.9
@@ -68,4 +68,4 @@ bits set on the page.
 .Xr pmap_clear_reference 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_is_prefaultable.9 b/share/man/man9/pmap_is_prefaultable.9
index c6f2870..9c3a749 100644
--- a/share/man/man9/pmap_is_prefaultable.9
+++ b/share/man/man9/pmap_is_prefaultable.9
@@ -54,4 +54,4 @@ This is a helper function which is called by
 .Xr vm_fault_prefault 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_map.9 b/share/man/man9/pmap_map.9
index 2c472fe..f813a21 100644
--- a/share/man/man9/pmap_map.9
+++ b/share/man/man9/pmap_map.9
@@ -77,4 +77,4 @@ is returned.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_mincore.9 b/share/man/man9/pmap_mincore.9
index d0e45ea..383387c 100644
--- a/share/man/man9/pmap_mincore.9
+++ b/share/man/man9/pmap_mincore.9
@@ -71,4 +71,4 @@ return
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_object_init_pt.9 b/share/man/man9/pmap_object_init_pt.9
index 90ae75f..f87c8a9 100644
--- a/share/man/man9/pmap_object_init_pt.9
+++ b/share/man/man9/pmap_object_init_pt.9
@@ -70,4 +70,4 @@ startup, and immediately following a call to
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_page_exists_quick.9 b/share/man/man9/pmap_page_exists_quick.9
index 8db2580..cc377ab 100644
--- a/share/man/man9/pmap_page_exists_quick.9
+++ b/share/man/man9/pmap_page_exists_quick.9
@@ -63,4 +63,4 @@ is one of the first 16 PVs linked from the page
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_page_init.9 b/share/man/man9/pmap_page_init.9
index 65f72ec..d6787e3 100644
--- a/share/man/man9/pmap_page_init.9
+++ b/share/man/man9/pmap_page_init.9
@@ -48,4 +48,4 @@ queue management lists.
 .Xr pmap_pinit 9
 .Sh AUTHORS
 This manual page was written by
-.An Hiten Pandya Aq hmp@FreeBSD.org .
+.An Hiten Pandya Aq Mt hmp@FreeBSD.org .
diff --git a/share/man/man9/pmap_page_protect.9 b/share/man/man9/pmap_page_protect.9
index f77d57d..b7af077 100644
--- a/share/man/man9/pmap_page_protect.9
+++ b/share/man/man9/pmap_page_protect.9
@@ -64,4 +64,4 @@ and
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_pinit.9 b/share/man/man9/pmap_pinit.9
index d521729..f001e74 100644
--- a/share/man/man9/pmap_pinit.9
+++ b/share/man/man9/pmap_pinit.9
@@ -64,4 +64,4 @@ until further notice.
 .Xr pmap_growkernel 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_qenter.9 b/share/man/man9/pmap_qenter.9
index b148b69..a5a94d4 100644
--- a/share/man/man9/pmap_qenter.9
+++ b/share/man/man9/pmap_qenter.9
@@ -76,4 +76,4 @@ function is intended to remove such temporary mappings.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_release.9 b/share/man/man9/pmap_release.9
index ef29641..b328bd8 100644
--- a/share/man/man9/pmap_release.9
+++ b/share/man/man9/pmap_release.9
@@ -55,4 +55,4 @@ no longer contains any valid mappings.
 .Xr pmap_pinit 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_remove.9 b/share/man/man9/pmap_remove.9
index 12664dc..4426f0d 100644
--- a/share/man/man9/pmap_remove.9
+++ b/share/man/man9/pmap_remove.9
@@ -81,4 +81,4 @@ more quickly than would be the case for calling
 .Fn pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_resident_count.9 b/share/man/man9/pmap_resident_count.9
index bf39548..343dc7c 100644
--- a/share/man/man9/pmap_resident_count.9
+++ b/share/man/man9/pmap_resident_count.9
@@ -71,4 +71,4 @@ which are currently wired into in main memory.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_zero_page.9 b/share/man/man9/pmap_zero_page.9
index 541eef0..519e76b 100644
--- a/share/man/man9/pmap_zero_page.9
+++ b/share/man/man9/pmap_zero_page.9
@@ -69,4 +69,4 @@ This function is required to be implemented for each architecture supported by
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pseudofs.9 b/share/man/man9/pseudofs.9
index 5d39496..98ccc6c 100644
--- a/share/man/man9/pseudofs.9
+++ b/share/man/man9/pseudofs.9
@@ -67,4 +67,4 @@ module appeared in
 The
 .Nm
 module and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/share/man/man9/redzone.9 b/share/man/man9/redzone.9
index 98723c7..6328236 100644
--- a/share/man/man9/redzone.9
+++ b/share/man/man9/redzone.9
@@ -114,7 +114,7 @@ Free backtrace:
 first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
 .Sh BUGS
 Currently,
 .Nm
diff --git a/share/man/man9/resource_int_value.9 b/share/man/man9/resource_int_value.9
index e828535..710e97e 100644
--- a/share/man/man9/resource_int_value.9
+++ b/share/man/man9/resource_int_value.9
@@ -76,4 +76,4 @@ Inappropriate resource type.
 .Xr driver 9
 .Sh AUTHORS
 This manual page was written by
-.An Warner Losh Aq imp@FreeBSD.org .
+.An Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/share/man/man9/rman.9 b/share/man/man9/rman.9
index d9a2092..6503e7b 100644
--- a/share/man/man9/rman.9
+++ b/share/man/man9/rman.9
@@ -469,4 +469,4 @@ function returns a pointer to the device which reserved the resource
 .Xr mutex 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/sbuf.9 b/share/man/man9/sbuf.9
index d8acbaf..495726c 100644
--- a/share/man/man9/sbuf.9
+++ b/share/man/man9/sbuf.9
@@ -551,15 +551,15 @@ family of functions first appeared in
 The
 .Nm
 family of functions was designed by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
 and implemented by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
 Additional improvements were suggested by
-.An Justin T. Gibbs Aq gibbs@FreeBSD.org .
+.An Justin T. Gibbs Aq Mt gibbs@FreeBSD.org .
 Auto-extend support added by
-.An Kelly Yancey Aq kbyanc@FreeBSD.org .
+.An Kelly Yancey Aq Mt kbyanc@FreeBSD.org .
 Drain functionality added by
-.An Matthew Fleming Aq mdf@FreeBSD.org .
+.An Matthew Fleming Aq Mt mdf@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/share/man/man9/selrecord.9 b/share/man/man9/selrecord.9
index f7a0113..aafbe4b 100644
--- a/share/man/man9/selrecord.9
+++ b/share/man/man9/selrecord.9
@@ -121,6 +121,6 @@ but consumers should not generally rely on this feature.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Chad David Aq davidc@FreeBSD.org
+.An Chad David Aq Mt davidc@FreeBSD.org
 and
-.An Alfred Perlstein Aq alfred@FreeBSD.org .
+.An Alfred Perlstein Aq Mt alfred@FreeBSD.org .
diff --git a/share/man/man9/signal.9 b/share/man/man9/signal.9
index c61ceb6..a2e54fe 100644
--- a/share/man/man9/signal.9
+++ b/share/man/man9/signal.9
@@ -435,4 +435,4 @@ returns either a valid signal number or zero.
 .Xr psignal 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@FreeBSD.org .
+.An Chad David Aq Mt davidc@FreeBSD.org .
diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9
index e0225ee..bd421ea 100644
--- a/share/man/man9/sleep.9
+++ b/share/man/man9/sleep.9
@@ -383,4 +383,4 @@ function appeared in
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An J\(:org Wunsch Aq joerg@FreeBSD.org .
+.An J\(:org Wunsch Aq Mt joerg@FreeBSD.org .
diff --git a/share/man/man9/sysctl_add_oid.9 b/share/man/man9/sysctl_add_oid.9
index bffc6db..5f67552b0 100644
--- a/share/man/man9/sysctl_add_oid.9
+++ b/share/man/man9/sysctl_add_oid.9
@@ -527,7 +527,7 @@ newtree.newint
 These functions first appeared in
 .Fx 4.2 .
 .Sh AUTHORS
-.An Andrzej Bialecki Aq abial@FreeBSD.org
+.An Andrzej Bialecki Aq Mt abial@FreeBSD.org
 .Sh BUGS
 Sharing nodes between many code sections
 causes interdependencies that sometimes may lock the resources.
diff --git a/share/man/man9/sysctl_ctx_init.9 b/share/man/man9/sysctl_ctx_init.9
index cbca5c6..b3c0d3b 100644
--- a/share/man/man9/sysctl_ctx_init.9
+++ b/share/man/man9/sysctl_ctx_init.9
@@ -233,7 +233,7 @@ and then proceeds to free the older entries (in this case the nodes).
 These functions first appeared in
 .Fx 4.2 .
 .Sh AUTHORS
-.An Andrzej Bialecki Aq abial@FreeBSD.org
+.An Andrzej Bialecki Aq Mt abial@FreeBSD.org
 .Sh BUGS
 The current removal algorithm is somewhat heavy.
 In the worst case,
diff --git a/share/man/man9/tvtohz.9 b/share/man/man9/tvtohz.9
index 672aaf9..cf07d60 100644
--- a/share/man/man9/tvtohz.9
+++ b/share/man/man9/tvtohz.9
@@ -55,4 +55,4 @@ function first appeared in
 .Fx 3.0
 .Sh AUTHORS
 This manual page was written by
-.An Kelly Yancey Aq kbyanc@posi.net .
+.An Kelly Yancey Aq Mt kbyanc@posi.net .
diff --git a/share/man/man9/ucred.9 b/share/man/man9/ucred.9
index a44e0d7..e8b26d6 100644
--- a/share/man/man9/ucred.9
+++ b/share/man/man9/ucred.9
@@ -233,4 +233,4 @@ accepts a target process, not a target thread, for access control purposes.
 .Xr uihold 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/uidinfo.9 b/share/man/man9/uidinfo.9
index 8a3d708..4dc93d2 100644
--- a/share/man/man9/uidinfo.9
+++ b/share/man/man9/uidinfo.9
@@ -106,4 +106,4 @@ returns a pointer to an initialized
 structure, and should not fail.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/usbdi.9 b/share/man/man9/usbdi.9
index 03cc305..00c1cd9 100644
--- a/share/man/man9/usbdi.9
+++ b/share/man/man9/usbdi.9
@@ -638,4 +638,4 @@ module has been inspired by the NetBSD USB stack initially written by
 Lennart Augustsson. The
 .Nm usb
 module was written by
-.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
+.An Hans Petter Selasky Aq Mt hselasky@FreeBSD.org .
diff --git a/share/man/man9/utopia.9 b/share/man/man9/utopia.9
index a7d02c1..99be5fa 100644
--- a/share/man/man9/utopia.9
+++ b/share/man/man9/utopia.9
@@ -350,4 +350,4 @@ Update the statistics with counters read from the chip.
 .Sh SEE ALSO
 .Xr utopia 4
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man9/vaccess_acl_nfs4.9 b/share/man/man9/vaccess_acl_nfs4.9
index 27b4cfa..c729361 100644
--- a/share/man/man9/vaccess_acl_nfs4.9
+++ b/share/man/man9/vaccess_acl_nfs4.9
@@ -123,7 +123,7 @@ appropriate privileges or to the owner of a file or other resource.
 Current implementation of
 .Fn vaccess_acl_nfs4
 was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
 .Sh BUGS
 This manual page should include a full description of the NFSv4 ACL
 evaluation algorithm, or cross reference another page that does.
diff --git a/share/man/man9/vflush.9 b/share/man/man9/vflush.9
index 94485f9..280088f 100644
--- a/share/man/man9/vflush.9
+++ b/share/man/man9/vflush.9
@@ -78,4 +78,4 @@ will be returned.
 .Xr vrele 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_busy.9 b/share/man/man9/vfs_busy.9
index 30fe79b..8b9ba86 100644
--- a/share/man/man9/vfs_busy.9
+++ b/share/man/man9/vfs_busy.9
@@ -88,4 +88,4 @@ is set).
 .Xr vfs_unbusy 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_getnewfsid.9 b/share/man/man9/vfs_getnewfsid.9
index b6f1238..f43800c 100644
--- a/share/man/man9/vfs_getnewfsid.9
+++ b/share/man/man9/vfs_getnewfsid.9
@@ -74,4 +74,4 @@ xxx_mount(struct mount *mp, char *path, caddr_t data,
 .Xr vfs_getvfs 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_getopt.9 b/share/man/man9/vfs_getopt.9
index 09db47c..1675fef 100644
--- a/share/man/man9/vfs_getopt.9
+++ b/share/man/man9/vfs_getopt.9
@@ -240,6 +240,6 @@ if the option was not found.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Chad David Aq davidc@FreeBSD.org
+.An Chad David Aq Mt davidc@FreeBSD.org
 and
-.An Ruslan Ermilov Aq ru@FreeBSD.org .
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org .
diff --git a/share/man/man9/vfs_getvfs.9 b/share/man/man9/vfs_getvfs.9
index c563adc..93df89f 100644
--- a/share/man/man9/vfs_getvfs.9
+++ b/share/man/man9/vfs_getvfs.9
@@ -74,4 +74,4 @@ if ((mp = vfs_getvfs(&fhp->fh_fsid)) == NULL) {
 .Xr vfs_getnewfsid 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_mountedfrom.9 b/share/man/man9/vfs_mountedfrom.9
index 10ad328..d0d7542 100644
--- a/share/man/man9/vfs_mountedfrom.9
+++ b/share/man/man9/vfs_mountedfrom.9
@@ -52,4 +52,4 @@ is the device that contains the file system, but in the case of a pseudo
 file system it could be a descriptive name like "devfs" or "procfs".
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_rootmountalloc.9 b/share/man/man9/vfs_rootmountalloc.9
index ecad73e..6453849 100644
--- a/share/man/man9/vfs_rootmountalloc.9
+++ b/share/man/man9/vfs_rootmountalloc.9
@@ -63,4 +63,4 @@ or invalid.
 .Xr vfsconf 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_timestamp.9 b/share/man/man9/vfs_timestamp.9
index 455d6f6..0103779 100644
--- a/share/man/man9/vfs_timestamp.9
+++ b/share/man/man9/vfs_timestamp.9
@@ -60,4 +60,4 @@ seconds and nanoseconds, maximum precision.
 .El
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_unbusy.9 b/share/man/man9/vfs_unbusy.9
index 5d0b4e5..13cea5e 100644
--- a/share/man/man9/vfs_unbusy.9
+++ b/share/man/man9/vfs_unbusy.9
@@ -55,4 +55,4 @@ The mount point to unbusy.
 .Xr vfs_busy 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfsconf.9 b/share/man/man9/vfsconf.9
index 83a6621..7e129c0 100644
--- a/share/man/man9/vfsconf.9
+++ b/share/man/man9/vfsconf.9
@@ -148,4 +148,4 @@ whatever the case.
 .Xr VFS_SET 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vgone.9 b/share/man/man9/vgone.9
index 12715e1..dc10cda 100644
--- a/share/man/man9/vgone.9
+++ b/share/man/man9/vgone.9
@@ -60,4 +60,4 @@ exclusively locked.
 .Xr vnode 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vhold.9 b/share/man/man9/vhold.9
index cb1f35d..503ce29 100644
--- a/share/man/man9/vhold.9
+++ b/share/man/man9/vhold.9
@@ -80,4 +80,4 @@ expect the interlock to already be held.
 .Xr vnode 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vinvalbuf.9 b/share/man/man9/vinvalbuf.9
index f3e627a..260eb6f 100644
--- a/share/man/man9/vinvalbuf.9
+++ b/share/man/man9/vinvalbuf.9
@@ -114,4 +114,4 @@ set in
 .Xr VOP_FSYNC 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_fault_prefault.9 b/share/man/man9/vm_fault_prefault.9
index dcc7e7a..39138e8 100644
--- a/share/man/man9/vm_fault_prefault.9
+++ b/share/man/man9/vm_fault_prefault.9
@@ -69,4 +69,4 @@ helper function to determine if a page may be prefaulted into physical memory.
 .Xr pmap_is_prefaultable 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map.9 b/share/man/man9/vm_map.9
index f45be0b..a5ba60a 100644
--- a/share/man/man9/vm_map.9
+++ b/share/man/man9/vm_map.9
@@ -347,4 +347,4 @@ is backed by a
 .Xr vm_map_wire 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_check_protection.9 b/share/man/man9/vm_map_check_protection.9
index abaf6d0..1d47524 100644
--- a/share/man/man9/vm_map_check_protection.9
+++ b/share/man/man9/vm_map_check_protection.9
@@ -67,4 +67,4 @@ or if any other error occurred, the value FALSE is returned.
 .Xr vm_map_protect 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_create.9 b/share/man/man9/vm_map_create.9
index 0574f39..11ba8ac 100644
--- a/share/man/man9/vm_map_create.9
+++ b/share/man/man9/vm_map_create.9
@@ -63,4 +63,4 @@ Otherwise, it returns
 .Xr vm_map_init 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_delete.9 b/share/man/man9/vm_map_delete.9
index e884f36..8eea565 100644
--- a/share/man/man9/vm_map_delete.9
+++ b/share/man/man9/vm_map_delete.9
@@ -65,4 +65,4 @@ function always returns
 .Xr vm_map_remove 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_entry_resize_free.9 b/share/man/man9/vm_map_entry_resize_free.9
index eaaec65..9e70a8d7 100644
--- a/share/man/man9/vm_map_entry_resize_free.9
+++ b/share/man/man9/vm_map_entry_resize_free.9
@@ -240,5 +240,4 @@ tree-based free space algorithm was added in
 .Fx 5.3 .
 .Sh AUTHORS
 The tree-based free space algorithm and this manual page were written by
-.An Mark W. Krentel
-.Aq krentel@dreamscape.com .
+.An Mark W. Krentel Aq Mt krentel@dreamscape.com .
diff --git a/share/man/man9/vm_map_find.9 b/share/man/man9/vm_map_find.9
index 106854e..031be99 100644
--- a/share/man/man9/vm_map_find.9
+++ b/share/man/man9/vm_map_find.9
@@ -158,4 +158,4 @@ will be returned.
 .Xr vm_map_lock 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_findspace.9 b/share/man/man9/vm_map_findspace.9
index a12e789..29d465b 100644
--- a/share/man/man9/vm_map_findspace.9
+++ b/share/man/man9/vm_map_findspace.9
@@ -75,4 +75,4 @@ otherwise, the value 1 is returned.
 .Xr vm_map_lock 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_inherit.9 b/share/man/man9/vm_map_inherit.9
index fb5a9d5..f8416c7 100644
--- a/share/man/man9/vm_map_inherit.9
+++ b/share/man/man9/vm_map_inherit.9
@@ -82,4 +82,4 @@ will be returned.
 .Xr fork 2
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_init.9 b/share/man/man9/vm_map_init.9
index c65f611..25b8aeb 100644
--- a/share/man/man9/vm_map_init.9
+++ b/share/man/man9/vm_map_init.9
@@ -56,4 +56,4 @@ It is called during early system initialization.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_insert.9 b/share/man/man9/vm_map_insert.9
index 8f3b52e..20e062b 100644
--- a/share/man/man9/vm_map_insert.9
+++ b/share/man/man9/vm_map_insert.9
@@ -90,4 +90,4 @@ overlaps the end of the map.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_lock.9 b/share/man/man9/vm_map_lock.9
index 7095709..0f26412 100644
--- a/share/man/man9/vm_map_lock.9
+++ b/share/man/man9/vm_map_lock.9
@@ -110,4 +110,4 @@ Currently, all of the locking macros implement their locks as sleep locks.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_lookup.9 b/share/man/man9/vm_map_lookup.9
index 759b5f6..a28613f 100644
--- a/share/man/man9/vm_map_lookup.9
+++ b/share/man/man9/vm_map_lookup.9
@@ -85,4 +85,4 @@ arguments appropriately for the hypothetical page fault.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_madvise.9 b/share/man/man9/vm_map_madvise.9
index 97ba604..dc283eb 100644
--- a/share/man/man9/vm_map_madvise.9
+++ b/share/man/man9/vm_map_madvise.9
@@ -74,4 +74,4 @@ is returned.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_max.9 b/share/man/man9/vm_map_max.9
index e694983..92d574d 100644
--- a/share/man/man9/vm_map_max.9
+++ b/share/man/man9/vm_map_max.9
@@ -63,4 +63,4 @@ returns a pointer to the physical map associated with the virtual map
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_protect.9 b/share/man/man9/vm_map_protect.9
index 8976781..c4b5a73 100644
--- a/share/man/man9/vm_map_protect.9
+++ b/share/man/man9/vm_map_protect.9
@@ -90,4 +90,4 @@ is returned.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_remove.9 b/share/man/man9/vm_map_remove.9
index 53da533..79c6782 100644
--- a/share/man/man9/vm_map_remove.9
+++ b/share/man/man9/vm_map_remove.9
@@ -66,4 +66,4 @@ always returns
 .Xr vm_map_delete 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_simplify_entry.9 b/share/man/man9/vm_map_simplify_entry.9
index 8bb5484..3c7a1f8 100644
--- a/share/man/man9/vm_map_simplify_entry.9
+++ b/share/man/man9/vm_map_simplify_entry.9
@@ -58,4 +58,4 @@ possibly extended.
 .Xr vm_map_remove 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_stack.9 b/share/man/man9/vm_map_stack.9
index e237c06..4036efb 100644
--- a/share/man/man9/vm_map_stack.9
+++ b/share/man/man9/vm_map_stack.9
@@ -129,4 +129,4 @@ function previously located in the file
 .Xr vm_map_insert 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_submap.9 b/share/man/man9/vm_map_submap.9
index 704151a..6f29d6b 100644
--- a/share/man/man9/vm_map_submap.9
+++ b/share/man/man9/vm_map_submap.9
@@ -92,4 +92,4 @@ backing object was specified.
 .Xr vm_map_find 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_sync.9 b/share/man/man9/vm_map_sync.9
index 0ee1219..dd487df 100644
--- a/share/man/man9/vm_map_sync.9
+++ b/share/man/man9/vm_map_sync.9
@@ -78,4 +78,4 @@ or if an entry could not be found for the given start address.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_wire.9 b/share/man/man9/vm_map_wire.9
index 12bb3f6..f112f34 100644
--- a/share/man/man9/vm_map_wire.9
+++ b/share/man/man9/vm_map_wire.9
@@ -111,4 +111,4 @@ is returned.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_page_aflag.9 b/share/man/man9/vm_page_aflag.9
index 4500bd2..0d0bdeb 100644
--- a/share/man/man9/vm_page_aflag.9
+++ b/share/man/man9/vm_page_aflag.9
@@ -97,4 +97,4 @@ and
 bits are only valid for the managed pages.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_alloc.9 b/share/man/man9/vm_page_alloc.9
index 3109a3f..082574f 100644
--- a/share/man/man9/vm_page_alloc.9
+++ b/share/man/man9/vm_page_alloc.9
@@ -136,4 +136,4 @@ unless
 is set.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_bits.9 b/share/man/man9/vm_page_bits.9
index 79d5685..43b54dc 100644
--- a/share/man/man9/vm_page_bits.9
+++ b/share/man/man9/vm_page_bits.9
@@ -164,4 +164,4 @@ clears all of the dirty bits in a page.
 None of these functions are allowed to block.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_cache.9 b/share/man/man9/vm_page_cache.9
index 0379e8c..58bf43c 100644
--- a/share/man/man9/vm_page_cache.9
+++ b/share/man/man9/vm_page_cache.9
@@ -48,4 +48,4 @@ to the cache queue will fail.
 If the page is dirty the system will panic.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_deactivate.9 b/share/man/man9/vm_page_deactivate.9
index 30bb7fa..fff5ea9 100644
--- a/share/man/man9/vm_page_deactivate.9
+++ b/share/man/man9/vm_page_deactivate.9
@@ -47,4 +47,4 @@ unmanaged and is not wired.
 .Xr vm_page_wire 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_dontneed.9 b/share/man/man9/vm_page_dontneed.9
index 99baa33..b30df14 100644
--- a/share/man/man9/vm_page_dontneed.9
+++ b/share/man/man9/vm_page_dontneed.9
@@ -56,4 +56,4 @@ ones from the queues as their pages are released.
 .Xr vm_page_deactivate 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_free.9 b/share/man/man9/vm_page_free.9
index a78e577..7df970c 100644
--- a/share/man/man9/vm_page_free.9
+++ b/share/man/man9/vm_page_free.9
@@ -95,4 +95,4 @@ returns 1 if it is able to free the page; otherwise, 0 is returned.
 .Xr vm_page_wire 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_grab.9 b/share/man/man9/vm_page_grab.9
index ff9aae9..d19289a 100644
--- a/share/man/man9/vm_page_grab.9
+++ b/share/man/man9/vm_page_grab.9
@@ -81,4 +81,4 @@ always returns the page.
 .Xr vm_page_alloc 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_hold.9 b/share/man/man9/vm_page_hold.9
index 183fa40..971d6c2 100644
--- a/share/man/man9/vm_page_hold.9
+++ b/share/man/man9/vm_page_hold.9
@@ -72,4 +72,4 @@ page daemon.
 .Xr vm_page_wire 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_insert.9 b/share/man/man9/vm_page_insert.9
index 53f1eba..ce2c6ae 100644
--- a/share/man/man9/vm_page_insert.9
+++ b/share/man/man9/vm_page_insert.9
@@ -93,4 +93,4 @@ For example, if the page size is 4096 bytes, and the address
 in the object is 81944, the page index is 20.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_lookup.9 b/share/man/man9/vm_page_lookup.9
index 7f8cd5e..a268617 100644
--- a/share/man/man9/vm_page_lookup.9
+++ b/share/man/man9/vm_page_lookup.9
@@ -60,4 +60,4 @@ is returned if successful; otherwise,
 is returned.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_rename.9 b/share/man/man9/vm_page_rename.9
index bb8591f..64f6409 100644
--- a/share/man/man9/vm_page_rename.9
+++ b/share/man/man9/vm_page_rename.9
@@ -69,4 +69,4 @@ at which the new page should be inserted.
 .El
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_wire.9 b/share/man/man9/vm_page_wire.9
index f988dd9..4722f71 100644
--- a/share/man/man9/vm_page_wire.9
+++ b/share/man/man9/vm_page_wire.9
@@ -64,4 +64,4 @@ is set) then the page is left on
 .Dv PQ_NONE .
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_set_page_size.9 b/share/man/man9/vm_set_page_size.9
index 7f211d1..09afaba 100644
--- a/share/man/man9/vm_set_page_size.9
+++ b/share/man/man9/vm_set_page_size.9
@@ -59,4 +59,4 @@ is not a power of two, the system will panic.
 must be called prior to any page size dependent functions.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vn_fullpath.9 b/share/man/man9/vn_fullpath.9
index eff2105..50c35c9 100644
--- a/share/man/man9/vn_fullpath.9
+++ b/share/man/man9/vn_fullpath.9
@@ -122,4 +122,4 @@ otherwise, an error number is returned.
 .Xr free 9
 .Sh AUTHORS
 This manual page was written by
-.An Robert Watson Aq rwatson@FreeBSD.org .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
diff --git a/share/man/man9/vn_isdisk.9 b/share/man/man9/vn_isdisk.9
index 5909634..76cdf96 100644
--- a/share/man/man9/vn_isdisk.9
+++ b/share/man/man9/vn_isdisk.9
@@ -70,4 +70,4 @@ is returned and
 will contain the error number.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/watchdog.9 b/share/man/man9/watchdog.9
index 2df9fd6..e43e739 100644
--- a/share/man/man9/watchdog.9
+++ b/share/man/man9/watchdog.9
@@ -78,4 +78,4 @@ behaviour is recommended.
 The
 .Nm
 facility and this manual page was written
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
diff --git a/share/man/man9/zero_copy.9 b/share/man/man9/zero_copy.9
index 27498ff..aa11e8c 100644
--- a/share/man/man9/zero_copy.9
+++ b/share/man/man9/zero_copy.9
@@ -164,8 +164,8 @@ been in existence in patch form since at least mid-1999.
 .Sh AUTHORS
 .An -nosplit
 The zero copy sockets code was originally written by
-.An Andrew Gallatin Aq gallatin@FreeBSD.org
+.An Andrew Gallatin Aq Mt gallatin@FreeBSD.org
 and substantially modified and updated by
-.An Kenneth Merry Aq ken@FreeBSD.org .
+.An Kenneth Merry Aq Mt ken@FreeBSD.org .
 .Sh BUGS
 The COW based send mechanism is not safe and may result in kernel crashes.
diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9
index d0af88e..ed5939b 100644
--- a/share/man/man9/zone.9
+++ b/share/man/man9/zone.9
@@ -366,10 +366,10 @@ to function as a slab allocator.
 The zone allocator was written by
 .An John S. Dyson .
 The zone allocator was rewritten in large parts by
-.An Jeff Roberson Aq jeff@FreeBSD.org
+.An Jeff Roberson Aq Mt jeff@FreeBSD.org
 to function as a slab allocator.
 .Pp
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
 Changes for UMA by
-.An Jeroen Ruigrok van der Werven Aq asmodai@FreeBSD.org .
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org .