From: Franco Fichtner <franco@lastsummer.de>
Date: Mon, 22 Jul 2013 19:09:05 +0000 (+0200)
Subject: add .Mt to man pages in usr.sbin/
X-Git-Tag: v3.7.0~772
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/e65bc1c342b9f17e2b67586f899858297af5453f

add .Mt to man pages in usr.sbin/
---

diff --git a/usr.sbin/802_11/hostapd/hostapd.8 b/usr.sbin/802_11/hostapd/hostapd.8
index aba35571d3..1e35812de8 100644
--- a/usr.sbin/802_11/hostapd/hostapd.8
+++ b/usr.sbin/802_11/hostapd/hostapd.8
@@ -126,7 +126,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
 This manual page is derived from the
 .Pa README
 file included in the
diff --git a/usr.sbin/802_11/hostapd/hostapd.conf.5 b/usr.sbin/802_11/hostapd/hostapd.conf.5
index e4b4f2d530..9a1ef12708 100644
--- a/usr.sbin/802_11/hostapd/hostapd.conf.5
+++ b/usr.sbin/802_11/hostapd/hostapd.conf.5
@@ -207,4 +207,4 @@ and
 files in the
 .Nm hostapd
 distribution provided by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
diff --git a/usr.sbin/802_11/hostapd_cli/hostapd_cli.8 b/usr.sbin/802_11/hostapd_cli/hostapd_cli.8
index 03baa67ed9..bae10c7ea8 100644
--- a/usr.sbin/802_11/hostapd_cli/hostapd_cli.8
+++ b/usr.sbin/802_11/hostapd_cli/hostapd_cli.8
@@ -23,7 +23,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/wpa/hostapd_cli/hostapd_cli.8,v 1.2 2005/06/27 06:40:43 ru Exp $
-.\" $DragonFly: src/usr.sbin/802_11/hostapd_cli/hostapd_cli.8,v 1.1 2006/09/02 05:40:35 sephe Exp $
 .\"
 .Dd August 19, 2006
 .Dt HOSTAPD_CLI 8
@@ -105,7 +104,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq jkmaline@cc.hut.fi .
+.An Jouni Malinen Aq Mt jkmaline@cc.hut.fi .
 This manual page is derived from the
 .Pa README
 file included in the
diff --git a/usr.sbin/802_11/ndis_events/ndis_events.8 b/usr.sbin/802_11/ndis_events/ndis_events.8
index 1f0a927133..fb6708b6ea 100644
--- a/usr.sbin/802_11/ndis_events/ndis_events.8
+++ b/usr.sbin/802_11/ndis_events/ndis_events.8
@@ -132,4 +132,4 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/usr.sbin/802_11/wpa_cli/wpa_cli.8 b/usr.sbin/802_11/wpa_cli/wpa_cli.8
index c36652388a..67cb51e235 100644
--- a/usr.sbin/802_11/wpa_cli/wpa_cli.8
+++ b/usr.sbin/802_11/wpa_cli/wpa_cli.8
@@ -23,7 +23,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/wpa/wpa_cli/wpa_cli.8,v 1.2.2.1 2005/07/16 19:02:21 brueffer Exp $
-.\" $DragonFly: src/usr.sbin/802_11/wpa_cli/wpa_cli.8,v 1.1 2006/07/07 15:05:18 sephe Exp $
 .\"
 .Dd July 7, 2006
 .Dt WPA_CLI 8
@@ -215,7 +214,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq jkmaline@cc.hut.fi .
+.An Jouni Malinen Aq Mt jkmaline@cc.hut.fi .
 This manual page is derived from the
 .Pa README
 file included in the
diff --git a/usr.sbin/802_11/wpa_passphrase/wpa_passphrase.8 b/usr.sbin/802_11/wpa_passphrase/wpa_passphrase.8
index c0ea6d4524..04d4abf249 100644
--- a/usr.sbin/802_11/wpa_passphrase/wpa_passphrase.8
+++ b/usr.sbin/802_11/wpa_passphrase/wpa_passphrase.8
@@ -55,12 +55,11 @@ The
 utility first appeared in
 .Fx 6.3 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 utility was written by
-.An Jouni Malinen
-.Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
 .Pp
 This manual page was written by
-.An Henrik Brix Andersen
-.Aq henrik@brixandersen.dk .
+.An Henrik Brix Andersen Aq Mt henrik@brixandersen.dk .
diff --git a/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8 b/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8
index 9199f08833..37f67c7e36 100644
--- a/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8
+++ b/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8
@@ -176,7 +176,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
 This manual page is derived from the
 .Pa README
 file included in the
diff --git a/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.conf.5 b/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.conf.5
index 05d9cf5a53..86559b0b35 100644
--- a/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.conf.5
+++ b/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.conf.5
@@ -542,4 +542,4 @@ and
 files in the
 .Nm wpa_supplicant
 distribution provided by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.8 b/usr.sbin/acpi/acpiconf/acpiconf.8
index 871125eb44..832bb20942 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.8
+++ b/usr.sbin/acpi/acpiconf/acpiconf.8
@@ -87,6 +87,6 @@ utility appeared in
 The
 .Nm
 utility was written by
-.An Mitsuru Iwasaki Aq iwasaki@FreeBSD.org .
+.An Mitsuru Iwasaki Aq Mt iwasaki@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 .
diff --git a/usr.sbin/acpi/acpidb/acpidb.8 b/usr.sbin/acpi/acpidb/acpidb.8
index 5d3f1463fe..6270bde28f 100644
--- a/usr.sbin/acpi/acpidb/acpidb.8
+++ b/usr.sbin/acpi/acpidb/acpidb.8
@@ -26,7 +26,6 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/acpi/acpidb/acpidb.8,v 1.2 2004/06/06 17:49:57 ru Exp $
-.\" $DragonFly: src/usr.sbin/acpi/acpidb/acpidb.8,v 1.1 2004/07/05 00:22:43 dillon Exp $
 .\"
 .Dd August 7, 2003
 .Dt ACPIDB 8
@@ -162,7 +161,7 @@ It was imported for
 The
 .Nm
 utility was written by
-.An Mitsuru Iwasaki Aq iwasaki@FreeBSD.org
+.An Mitsuru Iwasaki Aq Mt iwasaki@FreeBSD.org
 and uses Intel ACPI-CA for the backend.
 This manual page was written by
 .An Nate Lawson .
diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8
index f66f15b221..9ddf2e7cde 100644
--- a/usr.sbin/acpi/acpidump/acpidump.8
+++ b/usr.sbin/acpi/acpidump/acpidump.8
@@ -28,7 +28,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/acpi/acpidump/acpidump.8,v 1.23 2005/02/14 16:32:32 njl Exp $
-.\" $DragonFly: src/usr.sbin/acpi/acpidump/acpidump.8,v 1.8 2007/01/10 11:54:45 hsu Exp $
 .\"
 .Dd February 14, 2005
 .Dt ACPIDUMP 8
@@ -175,20 +174,20 @@ and was rewritten to use
 for
 .Fx 5.2 .
 .Sh AUTHORS
-.An Doug Rabson Aq dfr@FreeBSD.org
-.An Mitsuru IWASAKI Aq iwasaki@FreeBSD.org
-.An Yasuo YOKOYAMA Aq yokoyama@jp.FreeBSD.org
-.An Nate Lawson Aq njl@FreeBSD.org
+.An Doug Rabson Aq Mt dfr@FreeBSD.org
+.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org
+.An Yasuo YOKOYAMA Aq Mt yokoyama@jp.FreeBSD.org
+.An Nate Lawson Aq Mt njl@FreeBSD.org
 .Pp
 .An -nosplit
 Some contributions made by
-.An Chitoshi Ohsawa Aq ohsawa@catv1.ccn-net.ne.jp ,
-.An Takayasu IWANASHI Aq takayasu@wendy.a.perfect-liberty.or.jp ,
-.An Yoshihiko SARUMARU Aq mistral@imasy.or.jp ,
-.An Hiroki Sato Aq hrs@FreeBSD.org ,
-.An Michael Lucas Aq mwlucas@blackhelicopters.org
+.An Chitoshi Ohsawa Aq Mt ohsawa@catv1.ccn-net.ne.jp ,
+.An Takayasu IWANASHI Aq Mt takayasu@wendy.a.perfect-liberty.or.jp ,
+.An Yoshihiko SARUMARU Aq Mt mistral@imasy.or.jp ,
+.An Hiroki Sato Aq Mt hrs@FreeBSD.org ,
+.An Michael Lucas Aq Mt mwlucas@blackhelicopters.org
 and
-.An Michael Smith Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 The current implementation does not dump the BOOT structure or
 other miscellaneous tables.
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index fd95ec2c73..4a162cda72 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -451,11 +451,11 @@ command appeared in
 .Sh AUTHORS
 .An -nosplit
 This manual page and the original script, in Perl, was written by
-.An Wolfram Schneider Aq wosch@FreeBSD.org .
+.An Wolfram Schneider Aq Mt wosch@FreeBSD.org .
 The replacement script, written as a Bourne
 shell script with some enhancements, and the man page modification that
 came with it were done by
-.An Mike Makonnen Aq mtm@identd.net .
+.An Mike Makonnen Aq Mt mtm@identd.net .
 .Sh BUGS
 In order for
 .Nm
diff --git a/usr.sbin/adduser/adduser.conf.5 b/usr.sbin/adduser/adduser.conf.5
index 9dccac7182..c51967e42e 100644
--- a/usr.sbin/adduser/adduser.conf.5
+++ b/usr.sbin/adduser/adduser.conf.5
@@ -210,7 +210,7 @@ manual page first appeared in
 .Fx 5.3 .
 .Sh AUTHORS
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 .Sh BUGS
 The internal variables documented here may change without notice.
 Do not rely on them.
diff --git a/usr.sbin/ancontrol/ancontrol.8 b/usr.sbin/ancontrol/ancontrol.8
index 94517098bf..066ca1ad22 100644
--- a/usr.sbin/ancontrol/ancontrol.8
+++ b/usr.sbin/ancontrol/ancontrol.8
@@ -29,7 +29,6 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/ancontrol/ancontrol.8,v 1.3.2.17 2003/02/01 03:25:12 ambrisko Exp $
-.\" $DragonFly: src/usr.sbin/ancontrol/ancontrol.8,v 1.3 2006/02/17 19:40:10 swildner Exp $
 .\"
 .Dd September 10, 1999
 .Dt ANCONTROL 8
@@ -541,7 +540,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
 .Sh BUGS
 The statistics counters do not seem to show the amount of transmit
 and received frames as increasing.
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index 35f543f941..74915fbe15 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -7,11 +7,10 @@
 .\" these terms are retained. Under no circumstances is the author
 .\" responsible for the proper functioning of this software, nor does
 .\" the author assume any responsibility for damages incurred with its
+.\" use.
 .\"
 .\" $FreeBSD: src/usr.sbin/apm/apm.8,v 1.16.2.7 2003/05/07 17:42:02 tobez Exp $
-.\" $DragonFly: src/usr.sbin/apm/apm.8,v 1.5 2006/02/17 19:40:10 swildner Exp $
 .\"
-.\" use.
 .Dd November 1, 1994
 .Dt APM 8
 .Os
@@ -133,7 +132,7 @@ replaces all of its functionality.
 .Sh SEE ALSO
 .Xr apm 4
 .Sh AUTHORS
-.An Tatsumi Hosokawa Aq hosokawa@jp.FreeBSD.org
+.An Tatsumi Hosokawa Aq Mt hosokawa@jp.FreeBSD.org
 .Sh BUGS
 Some APM implementations do not support parameters needed by
 .Nm .
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index cbe485b4a8..2d2efcede8 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1999 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
 .\" Copyright (c) 1999 KOIE Hidetaka <koie@suri.co.jp>
-.\" Copyright (c) 1999 Yoshihiko SARUMARU Aq <mistral@imasy.or.jp>
+.\" Copyright (c) 1999 Yoshihiko SARUMARU <mistral@imasy.or.jp>
 .\" Copyright (c) 1999 Norihiro Kumagai <kuma@nk.rim.or.jp>
 .\" All rights reserved.
 .\"
@@ -27,7 +27,6 @@
 .\"
 .\"     @(#)apmd.8	1.1 (FreeBSD) 6/28/99
 .\" $FreeBSD: src/usr.sbin/apmd/apmd.8,v 1.7.2.7 2003/03/11 21:13:47 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/apmd/apmd.8,v 1.5 2008/05/09 20:31:04 swildner Exp $
 .\"
 .Dd June 28, 1999
 .Dt APMD 8
@@ -290,14 +289,15 @@ The
 utility appeared in
 .Fx 3.3 .
 .Sh AUTHORS
-.An Mitsuru IWASAKI Aq iwasaki@FreeBSD.org
-.An KOIE Hidetaka Aq koie@suri.co.jp
+.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org
+.An KOIE Hidetaka Aq Mt koie@suri.co.jp
 .Pp
+.An -nosplit
 Some contributions made by
-.An Warner Losh Aq imp@FreeBSD.org ,
-.An Hiroshi Yamashita Aq bluemoon@msj.biglobe.ne.jp ,
-.An Yoshihiko SARUMARU Aq mistral@imasy.or.jp ,
-.An Norihiro Kumagai Aq kuma@nk.rim.or.jp ,
-.An NAKAGAWA Yoshihisa Aq nakagawa@jp.FreeBSD.org ,
+.An Warner Losh Aq Mt imp@FreeBSD.org ,
+.An Hiroshi Yamashita Aq Mt bluemoon@msj.biglobe.ne.jp ,
+.An Yoshihiko SARUMARU Aq Mt mistral@imasy.or.jp ,
+.An Norihiro Kumagai Aq Mt kuma@nk.rim.or.jp ,
+.An NAKAGAWA Yoshihisa Aq Mt nakagawa@jp.FreeBSD.org ,
 and
-.An Nick Hilliard Aq nick@foobar.org .
+.An Nick Hilliard Aq Mt nick@foobar.org .
diff --git a/usr.sbin/asf/asf.8 b/usr.sbin/asf/asf.8
index 64cbf1c10f..45bec86154 100644
--- a/usr.sbin/asf/asf.8
+++ b/usr.sbin/asf/asf.8
@@ -104,7 +104,7 @@ The
 utility first appeared in
 .Fx 5.2 .
 .Sh AUTHORS
-.An Greg Lehey Aq grog@FreeBSD.org
+.An Greg Lehey Aq Mt grog@FreeBSD.org
 .Sh BUGS
 It should be possible to write to an
 .Ar outfile
diff --git a/usr.sbin/atm/atmarpd/atmarpd.8 b/usr.sbin/atm/atmarpd/atmarpd.8
index e83df24ff3..d9b158b81e 100644
--- a/usr.sbin/atm/atmarpd/atmarpd.8
+++ b/usr.sbin/atm/atmarpd/atmarpd.8
@@ -23,8 +23,6 @@
 .\" notice must be reproduced on all copies.
 .\"
 .\" @(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarpd.8,v 1.3.2.3 2003/03/11 21:13:48 trhodes Exp $
-.\" @(#) $DragonFly: src/usr.sbin/atm/atmarpd/atmarpd.8,v 1.3 2006/02/17 19:40:11 swildner Exp $
-.\"
 .\"
 .Dd August 4, 1998
 .Dt ATMARPD 8
@@ -170,4 +168,4 @@ Results are unpredictable if multiple instantiations of
 are run simultaneously for a given network interface.
 .Pp
 Please report any bugs to
-.Aq harp\-bugs@magic.net .
+.Aq Mt harp-bugs@magic.net .
diff --git a/usr.sbin/atm/scspd/scspd.8 b/usr.sbin/atm/scspd/scspd.8
index 98af9a20b3..4bbe694264 100644
--- a/usr.sbin/atm/scspd/scspd.8
+++ b/usr.sbin/atm/scspd/scspd.8
@@ -23,8 +23,6 @@
 .\" notice must be reproduced on all copies.
 .\"
 .\" @(#) $FreeBSD: src/usr.sbin/atm/scspd/scspd.8,v 1.2.2.3 2003/03/11 21:13:48 trhodes Exp $
-.\" @(#) $DragonFly: src/usr.sbin/atm/scspd/scspd.8,v 1.3 2006/02/17 19:40:11 swildner Exp $
-.\"
 .\"
 .Dd August 21, 1998
 .Dt SCSPD 8
@@ -631,4 +629,4 @@ instability while previously-synchronized cache entries time out and are
 refreshed.
 .Pp
 Please report any bugs to
-.Aq harp\-bugs@magic.net .
+.Aq Mt harp-bugs@magic.net .
diff --git a/usr.sbin/battd/battd.8 b/usr.sbin/battd/battd.8
index df1ec0a429..0af65f6331 100644
--- a/usr.sbin/battd/battd.8
+++ b/usr.sbin/battd/battd.8
@@ -30,7 +30,6 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $DragonFly: src/usr.sbin/battd/battd.8,v 1.13 2008/02/22 04:30:34 swildner Exp $
 .Dd April 6, 2009
 .Dt BATTD 8
 .Os
@@ -138,8 +137,8 @@ The
 command first appeared in
 .Dx 1.1 .
 .Sh AUTHORS
-.An Liam J. Foy Aq liamfoy@dragonflybsd.org
+.An Liam J. Foy Aq Mt liamfoy@dragonflybsd.org
 .Pp
 Man page contributions by:
-.An Maxime Labelle Aq mlabelle@vt220.com
-.An Sarunas Vancevicius Aq svan@redbrick.dcu.ie
+.An Maxime Labelle Aq Mt mlabelle@vt220.com
+.An Sarunas Vancevicius Aq Mt svan@redbrick.dcu.ie
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8
index e39b95117e..1b0ec75802 100644
--- a/usr.sbin/boot0cfg/boot0cfg.8
+++ b/usr.sbin/boot0cfg/boot0cfg.8
@@ -23,7 +23,6 @@
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/boot0cfg/boot0cfg.8,v 1.5.2.6 2003/03/12 22:08:13 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/boot0cfg/boot0cfg.8,v 1.4 2008/03/24 23:04:19 swildner Exp $
 .\"
 .Dd June 20, 2009
 .Dt BOOT0CFG 8
@@ -176,7 +175,7 @@ to install the default MBR:
 .Xr boot 8 ,
 .Xr fdisk 8
 .Sh AUTHORS
-.An Robert Nordier Aq rnordier@FreeBSD.org .
+.An Robert Nordier Aq Mt rnordier@FreeBSD.org .
 .Sh BUGS
 Use of the
 .Sq packet
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.8 b/usr.sbin/bootparamd/bootparamd/bootparamd.8
index e480e3aa69..3db8d60fa2 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.8
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.8
@@ -69,7 +69,7 @@ The alias address must of course be free for use.
 .Xr diskless 8
 .Sh AUTHORS
 Written by
-.An Klas Heggemann Aq klas@nada.kth.se .
+.An Klas Heggemann Aq Mt klas@nada.kth.se .
 .Sh BUGS
 You may find the
 .Xr syslog 3
diff --git a/usr.sbin/bthcid/bthcid.8 b/usr.sbin/bthcid/bthcid.8
index 210df29ade..5d7ab12d9f 100644
--- a/usr.sbin/bthcid/bthcid.8
+++ b/usr.sbin/bthcid/bthcid.8
@@ -158,7 +158,7 @@ with its present name and extended to support PIN clients by
 .An Iain Hibbert
 under the sponsorship of Itronix, Inc.
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .An Iain Hibbert
 .Sh BUGS
 The only way to make the
diff --git a/usr.sbin/bthcid/bthcid.conf.5 b/usr.sbin/bthcid/bthcid.conf.5
index e4fc4a5218..d03ddc68dd 100644
--- a/usr.sbin/bthcid/bthcid.conf.5
+++ b/usr.sbin/bthcid/bthcid.conf.5
@@ -24,7 +24,6 @@
 .\"
 .\" $Id: hcsecd.conf.5,v 1.1 2003/05/26 22:49:23 max Exp $
 .\" $FreeBSD: src/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5,v 1.2 2004/06/13 18:03:40 ru Exp $
-.\" $DragonFly: src/usr.sbin/bthcid/bthcid.conf.5,v 1.1 2008/01/30 14:10:19 hasso Exp $
 .\"
 .Dd May 26, 2003
 .Dt BTHCID.CONF 5
@@ -129,4 +128,4 @@ device {
 .Sh SEE ALSO
 .Xr bthcid 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/usr.sbin/btxld/btxld.8 b/usr.sbin/btxld/btxld.8
index df2cf839b2..9167fbe079 100644
--- a/usr.sbin/btxld/btxld.8
+++ b/usr.sbin/btxld/btxld.8
@@ -23,7 +23,6 @@
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/btxld/btxld.8,v 1.2.2.2 2001/08/16 15:55:41 ru Exp $
-.\" $DragonFly: src/usr.sbin/btxld/btxld.8,v 1.3 2006/02/17 19:40:12 swildner Exp $
 .\"
 .Dd September 12, 1998
 .Dt BTXLD 8
@@ -95,4 +94,4 @@ combined .text and .data segments of the client image.
 .Xr ld 1 ,
 .Xr boot 8
 .Sh AUTHORS
-.An Robert Nordier Aq rnordier@FreeBSD.org .
+.An Robert Nordier Aq Mt rnordier@FreeBSD.org .
diff --git a/usr.sbin/burncd/burncd.8 b/usr.sbin/burncd/burncd.8
index 89d9a0aeb0..f85cb50408 100644
--- a/usr.sbin/burncd/burncd.8
+++ b/usr.sbin/burncd/burncd.8
@@ -179,8 +179,7 @@ utility appeared in
 The
 .Nm
 utility and this manpage was contributed by
-.An S\(/oren Schmidt ,
-Denmark
-.Aq sos@FreeBSD.org .
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org ,
+Denmark.
 .Sh BUGS
 Probably, please report when found.
diff --git a/usr.sbin/chkgrp/chkgrp.8 b/usr.sbin/chkgrp/chkgrp.8
index 6cdf992d83..26fff74a23 100644
--- a/usr.sbin/chkgrp/chkgrp.8
+++ b/usr.sbin/chkgrp/chkgrp.8
@@ -25,7 +25,6 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/chkgrp/chkgrp.8,v 1.7.2.3 2001/08/16 15:55:42 ru Exp $
-.\" $DragonFly: src/usr.sbin/chkgrp/chkgrp.8,v 1.5 2006/11/11 18:50:04 swildner Exp $
 .\"
 .Dd May 5, 1998
 .Dt CHKGRP 8
@@ -79,9 +78,9 @@ utility appeared in
 The
 .Nm
 utility and this manual page were written by
-.An Dag-Erling Co\(:idan Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Co\(:idan Sm\(/orgrav Aq Mt des@FreeBSD.org .
 .Pp
 Further functionality was added by
-.An Liam J. Foy Aq liamfoy@dragonflybsd.org .
+.An Liam J. Foy Aq Mt liamfoy@dragonflybsd.org .
 .Sh BUGS
 Should check the range of the group ID.
diff --git a/usr.sbin/cron/cron/cron.8 b/usr.sbin/cron/cron/cron.8
index 7306cf8aec..44fc502666 100644
--- a/usr.sbin/cron/cron/cron.8
+++ b/usr.sbin/cron/cron/cron.8
@@ -16,7 +16,6 @@
 .\" */
 .\"
 .\" $FreeBSD: src/usr.sbin/cron/cron/cron.8,v 1.25 2007/06/17 17:25:53 yar Exp $
-.\" $DragonFly: src/usr.sbin/cron/cron/cron.8,v 1.5 2008/01/08 20:30:57 swildner Exp $
 .\"
 .Dd June 17, 2007
 .Dt CRON 8
@@ -199,4 +198,4 @@ Directory for personal crontab files
 .Xr crontab 5 ,
 .Xr pam.conf 5
 .Sh AUTHORS
-.An Paul Vixie Aq paul@vix.com
+.An Paul Vixie Aq Mt paul@vix.com
diff --git a/usr.sbin/cron/crontab/crontab.1 b/usr.sbin/cron/crontab/crontab.1
index ecef31ce95..1dda0a6744 100644
--- a/usr.sbin/cron/crontab/crontab.1
+++ b/usr.sbin/cron/crontab/crontab.1
@@ -16,7 +16,6 @@
 .\" */
 .\"
 .\" $FreeBSD: src/usr.sbin/cron/crontab/crontab.1,v 1.7.2.4 2002/06/21 16:40:09 charnier Exp $
-.\" $DragonFly: src/usr.sbin/cron/crontab/crontab.1,v 1.3 2006/02/17 19:40:13 swildner Exp $
 .\"
 .Dd December 29, 1993
 .Dt CRONTAB 1
@@ -123,4 +122,4 @@ This new command syntax
 differs from previous versions of Vixie Cron, as well as from the classic
 SVR3 syntax.
 .Sh AUTHORS
-.An Paul Vixie Aq paul@vix.com
+.An Paul Vixie Aq Mt paul@vix.com
diff --git a/usr.sbin/cron/crontab/crontab.5 b/usr.sbin/cron/crontab/crontab.5
index d85f1a5f8b..ee07fb743c 100644
--- a/usr.sbin/cron/crontab/crontab.5
+++ b/usr.sbin/cron/crontab/crontab.5
@@ -16,7 +16,6 @@
 .\" */
 .\"
 .\" $FreeBSD: src/usr.sbin/cron/crontab/crontab.5,v 1.12.2.8 2002/12/29 16:35:41 schweikh Exp $
-.\" $DragonFly: src/usr.sbin/cron/crontab/crontab.5,v 1.2 2003/06/17 04:29:53 dillon Exp $
 .\"
 .Dd January 24, 1994
 .Dt CRONTAB 5
@@ -262,7 +261,7 @@ All of the
 commands that can appear in place of the first five fields
 are extensions.
 .Sh AUTHORS
-.An Paul Vixie Aq paul@vix.com
+.An Paul Vixie Aq Mt paul@vix.com
 .Sh BUGS
 If you're in one of the 70-odd countries that observe Daylight
 Savings Time, jobs scheduled during the rollback or advance will be
diff --git a/usr.sbin/dconschat/dconschat.8 b/usr.sbin/dconschat/dconschat.8
index b0bc71e4bf..6e423cb8fb 100644
--- a/usr.sbin/dconschat/dconschat.8
+++ b/usr.sbin/dconschat/dconschat.8
@@ -23,8 +23,6 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/dconschat/dconschat.8,v 1.5 2004/06/13 18:03:42 ru Exp $
-.\" $DragonFly: src/usr.sbin/dconschat/dconschat.8,v 1.4 2008/09/02 11:50:46 matthias Exp $
-.\"
 .\"
 .Dd September 2, 2008
 .Dt DCONSCHAT 8
@@ -309,7 +307,7 @@ console remote {
 .Xr eui64 5 ,
 .Xr fwcontrol 8
 .Sh AUTHORS
-.An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org
+.An Hidetoshi Shimokawa Aq Mt simokawa@FreeBSD.org
 .Sh BUGS
 This utility is
 .Ud
diff --git a/usr.sbin/devinfo/devinfo.8 b/usr.sbin/devinfo/devinfo.8
index 5ab2b58c3a..6ce9f79047 100644
--- a/usr.sbin/devinfo/devinfo.8
+++ b/usr.sbin/devinfo/devinfo.8
@@ -72,4 +72,4 @@ Without this flag, only those devices that have attached are reported.
 .Xr devclass 9 ,
 .Xr device 9
 .Sh AUTHORS
-.An Mike Smith Aq msmith@FreeBSD.org
+.An Mike Smith Aq Mt msmith@FreeBSD.org
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index 28d223509c..504e286bd2 100644
--- a/usr.sbin/fdwrite/fdwrite.1
+++ b/usr.sbin/fdwrite/fdwrite.1
@@ -101,7 +101,7 @@ Some of the code was taken from
 .Xr fdformat 1 .
 .Sh AUTHORS
 The program has been contributed by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 .Sh BUGS
 Diagnostics are less than complete at present.
 .Pp
diff --git a/usr.sbin/fwcontrol/fwcontrol.8 b/usr.sbin/fwcontrol/fwcontrol.8
index 03f878b01c..062318be93 100644
--- a/usr.sbin/fwcontrol/fwcontrol.8
+++ b/usr.sbin/fwcontrol/fwcontrol.8
@@ -125,6 +125,6 @@ The
 utility first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org
+.An Hidetoshi Shimokawa Aq Mt simokawa@FreeBSD.org
 .Sh BUGS
 This utility is still under development and provided for debug purpose.
diff --git a/usr.sbin/hotplugd/hotplugd.8 b/usr.sbin/hotplugd/hotplugd.8
index b7f72c639d..77e0b25caa 100644
--- a/usr.sbin/hotplugd/hotplugd.8
+++ b/usr.sbin/hotplugd/hotplugd.8
@@ -123,4 +123,4 @@ in
 The
 .Nm
 program was written by
-.An Alexander Yurchenko Aq grange@openbsd.org .
+.An Alexander Yurchenko Aq Mt grange@openbsd.org .
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 74101d4d40..a93041bdbb 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -26,7 +26,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/iostat/iostat.8,v 1.11.2.9 2002/12/29 16:35:41 schweikh Exp $
-.\" $DragonFly: src/usr.sbin/iostat/iostat.8,v 1.4 2005/09/01 19:08:38 swildner Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -399,4 +398,4 @@ This version of
 first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.org
+.An Kenneth Merry Aq Mt ken@FreeBSD.org
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index a548f73268..f554ff5477 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -12,7 +12,6 @@
 .\"
 .\"     @(#)kbdcontrol.1
 .\" $FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.18.2.9 2001/08/16 15:56:00 ru Exp $
-.\" $DragonFly: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.4 2006/02/17 19:40:16 swildner Exp $
 .\"
 .Dd September 12, 2009
 .Dt KBDCONTROL 1
@@ -266,6 +265,6 @@ To switch back to the default keyboard, use this command.
 .Xr kbdmap 5 ,
 .Xr rc.conf 5
 .Sh AUTHORS
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
 .Sh BUGS
 Report when found.
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index 52d60540f0..57c981e721 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -131,12 +131,10 @@ commands appeared in
 .Fx 2.1 .
 .Sh AUTHORS
 .An -nosplit
-.An Wolfram Schneider
-.Aq wosch@FreeBSD.org
+.An Wolfram Schneider Aq Mt wosch@FreeBSD.org
 wrote the original Perl version.
 The current version was rewritten in C by
-.An Jonathan Belson
-.Aq jon@witchspace.com
+.An Jonathan Belson Aq Mt jon@witchspace.com
 for
 .Fx 5.0 .
 .Sh BUGS
diff --git a/usr.sbin/kgzip/kgzip.8 b/usr.sbin/kgzip/kgzip.8
index 655e93ea2c..4c42d5020e 100644
--- a/usr.sbin/kgzip/kgzip.8
+++ b/usr.sbin/kgzip/kgzip.8
@@ -23,7 +23,6 @@
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/kgzip/kgzip.8,v 1.3.2.3 2001/08/16 15:56:02 ru Exp $
-.\" $DragonFly: src/usr.sbin/kgzip/kgzip.8,v 1.3 2006/02/17 19:40:16 swildner Exp $
 .\"
 .Dd July 19, 1999
 .Dt KGZIP 8
@@ -131,7 +130,7 @@ The default loader
 .Xr boot 8 ,
 .Xr loader 8
 .Sh AUTHORS
-.An Robert Nordier Aq rnordier@FreeBSD.org .
+.An Robert Nordier Aq Mt rnordier@FreeBSD.org .
 .Sh BUGS
 As symbols are lost, the usefulness of this utility for compressing
 kernels is limited to situations where
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.8 b/usr.sbin/lpr/chkprintcap/chkprintcap.8
index dfd3e690f9..14e27f3730 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.8
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.8
@@ -26,7 +26,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/lpr/chkprintcap/chkprintcap.8,v 1.3.2.4 2002/09/01 00:37:35 gad Exp $
-.\" $DragonFly: src/usr.sbin/lpr/chkprintcap/chkprintcap.8,v 1.2 2003/06/17 04:29:55 dillon Exp $
 .Dd November 30, 1997
 .Dt CHKPRINTCAP 8
 .Os
@@ -88,7 +87,7 @@ capability in the database (default 1, which corresponds to user
 The
 .Nm
 utility was written by
-.An Garrett A. Wollman Aq wollman@lcs.mit.edu .
+.An Garrett A. Wollman Aq Mt wollman@lcs.mit.edu .
 .Sh BUGS
 Not enough sanity-checking is done.  At a minimum, the ownership and
 mode of the spool directories should also be checked.  Other
diff --git a/usr.sbin/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8
index f6caea13f2..1e55cbe2b5 100644
--- a/usr.sbin/mailwrapper/mailwrapper.8
+++ b/usr.sbin/mailwrapper/mailwrapper.8
@@ -1,6 +1,5 @@
 .\"	$NetBSD: mailwrapper.8,v 1.11 2002/02/08 01:38:50 ross Exp $
 .\" $FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.8,v 1.12 2004/07/02 23:12:48 ru Exp $
-.\" $DragonFly: src/usr.sbin/mailwrapper/mailwrapper.8,v 1.3 2005/07/04 13:33:02 corecode Exp $
 .\"
 .\" Copyright (c) 1998
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -162,7 +161,7 @@ utility first appeared in
 and then
 .Fx 4.0 .
 .Sh AUTHORS
-.An Perry E. Metzger Aq perry@piermont.com
+.An Perry E. Metzger Aq Mt perry@piermont.com
 .Sh BUGS
 The entire reason this program exists is a crock.
 Instead, a command
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 5569fa405d..1459f0d7eb 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -23,7 +23,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.5.2.12 2003/03/02 02:45:01 dougb Exp $
-.\" $DragonFly: src/usr.sbin/mergemaster/mergemaster.8,v 1.5 2008/05/02 02:05:08 swildner Exp $
 .\"
 .Dd February 5, 2001
 .Dt MERGEMASTER 8
@@ -376,7 +375,7 @@ temporary root environment comes from Nik Clayton's
 make world tutorial which is referenced above.
 .Sh AUTHORS
 This manual page and the script itself were written by
-.An Douglas Barton Aq DougB@FreeBSD.org .
+.An Douglas Barton Aq Mt DougB@FreeBSD.org .
 .Sh BUGS
 There are no known bugs.
 Please report any problems,
diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8
index 2600c84097..7c4b760b42 100644
--- a/usr.sbin/mixer/mixer.8
+++ b/usr.sbin/mixer/mixer.8
@@ -26,7 +26,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.10.2.7 2003/03/11 21:13:51 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/mixer/mixer.8,v 1.6 2008/05/02 02:05:08 swildner Exp $
 .\"
 .Dd January 9, 1997
 .Dt MIXER 8
@@ -167,11 +166,11 @@ utility first appeared in
 .Sh AUTHORS
 .An -nosplit
 Original source by
-.An Craig Metz Aq cmetz@thor.tjhsst.edu
+.An Craig Metz Aq Mt cmetz@thor.tjhsst.edu
 and
 .An Hannu Savolainen .
 Mostly rewritten by
-.An John-Mark Gurney Aq jmg@FreeBSD.org .
+.An John-Mark Gurney Aq Mt jmg@FreeBSD.org .
 This
 manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org .
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org .
diff --git a/usr.sbin/mlxcontrol/mlxcontrol.8 b/usr.sbin/mlxcontrol/mlxcontrol.8
index 9b8b8b216b..1d5e35f66d 100644
--- a/usr.sbin/mlxcontrol/mlxcontrol.8
+++ b/usr.sbin/mlxcontrol/mlxcontrol.8
@@ -139,8 +139,7 @@ Print usage information for
 The
 .Nm
 utility was written by
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 The
 .Ar config
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index 8225f3fcd3..9ac571b0e0 100644
--- a/usr.sbin/moused/moused.8
+++ b/usr.sbin/moused/moused.8
@@ -695,8 +695,8 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Michael Smith Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 This manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org .
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org .
 The command and manual page have since been updated by
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
diff --git a/usr.sbin/mptable/mptable.1 b/usr.sbin/mptable/mptable.1
index 25e73a87e0..0feb7e9821 100644
--- a/usr.sbin/mptable/mptable.1
+++ b/usr.sbin/mptable/mptable.1
@@ -70,4 +70,4 @@ The
 command first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Steve Passe Aq fsmp@FreeBSD.org
+.An Steve Passe Aq Mt fsmp@FreeBSD.org
diff --git a/usr.sbin/ndiscvt/ndiscvt.8 b/usr.sbin/ndiscvt/ndiscvt.8
index f5c39c1827..4ab8a0149e 100644
--- a/usr.sbin/ndiscvt/ndiscvt.8
+++ b/usr.sbin/ndiscvt/ndiscvt.8
@@ -273,11 +273,11 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
 The
 .Xr lex 1
 and
 .Xr yacc 1
-.Pa INF
+.Pa .INF
 file parser was written by
-.An Matthew Dodd Aq mdodd@FreeBSD.org .
+.An Matthew Dodd Aq Mt mdodd@FreeBSD.org .
diff --git a/usr.sbin/ndiscvt/ndisgen.8 b/usr.sbin/ndiscvt/ndisgen.8
index 493d0e2f20..55b7c20df5 100644
--- a/usr.sbin/ndiscvt/ndisgen.8
+++ b/usr.sbin/ndiscvt/ndisgen.8
@@ -83,4 +83,4 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/usr.sbin/ngctl/ngctl.8 b/usr.sbin/ngctl/ngctl.8
index 5c421a93ab..9e75998f58 100644
--- a/usr.sbin/ngctl/ngctl.8
+++ b/usr.sbin/ngctl/ngctl.8
@@ -31,7 +31,6 @@
 .\" OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.5.2.7 2003/03/11 22:31:29 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/ngctl/ngctl.8,v 1.2 2003/06/17 04:29:57 dillon Exp $
 .\" $Whistle: ngctl.8,v 1.6 1999/01/20 03:19:44 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -137,4 +136,4 @@ a version of
 .Fx 2.2
 customized for the Whistle InterJet.
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@whistle.com
+.An Archie Cobbs Aq Mt archie@whistle.com
diff --git a/usr.sbin/nghook/nghook.8 b/usr.sbin/nghook/nghook.8
index 5e9ecd1552..827aadb6e7 100644
--- a/usr.sbin/nghook/nghook.8
+++ b/usr.sbin/nghook/nghook.8
@@ -31,7 +31,6 @@
 .\" OF SUCH DAMAGE.
 .\"
 .\"  $FreeBSD: src/usr.sbin/nghook/nghook.8,v 1.3.2.4 2001/08/16 15:56:11 ru Exp $
-.\"  $DragonFly: src/usr.sbin/nghook/nghook.8,v 1.4 2008/05/02 02:05:08 swildner Exp $
 .\" $Whistle: nghook.8,v 1.4 1999/01/20 03:19:45 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -86,7 +85,7 @@ in a version of
 .Fx 2.2
 customized for the Whistle InterJet.
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@whistle.com
+.An Archie Cobbs Aq Mt archie@whistle.com
 .Sh BUGS
 Although all input is read in unbuffered mode,
 there's no way to control the packetization of the input.
diff --git a/usr.sbin/nscd/nscd.8 b/usr.sbin/nscd/nscd.8
index 176c09b997..7d383d0fab 100644
--- a/usr.sbin/nscd/nscd.8
+++ b/usr.sbin/nscd/nscd.8
@@ -159,7 +159,7 @@ The default configuration file.
 .Xr nscd.conf 5 ,
 .Xr nsswitch.conf 5
 .Sh AUTHORS
-.An Michael Bushkov Aq bushman@freebsd.org
+.An Michael Bushkov Aq Mt bushman@freebsd.org
 .Sh BUGS
 Please send bug reports and suggestions to
-.Aq bushman@freebsd.org .
+.Aq Mt bushman@freebsd.org .
diff --git a/usr.sbin/nscd/nscd.conf.5 b/usr.sbin/nscd/nscd.conf.5
index e82b63f581..ec4bd3c565 100644
--- a/usr.sbin/nscd/nscd.conf.5
+++ b/usr.sbin/nscd/nscd.conf.5
@@ -141,8 +141,7 @@ symbol at the beginning of the line for comments.
 .Sh SEE ALSO
 .Xr nscd 8
 .Sh AUTHORS
-.An Michael Bushkov
-.Aq bushman@freebsd.org
+.An Michael Bushkov Aq Mt bushman@freebsd.org
 .Sh BUGS
 Please send bug reports and suggestions to
-.Aq bushman@freebsd.org .
+.Aq Mt bushman@freebsd.org .
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 4fb94ca13e..72dc884a75 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/usr.sbin/periodic/periodic.8
@@ -239,8 +239,8 @@ The
 utility first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Paul Traina Aq pst@FreeBSD.org
-.An Brian Somers Aq brian@Awfulhak.org
+.An Paul Traina Aq Mt pst@FreeBSD.org
+.An Brian Somers Aq Mt brian@Awfulhak.org
 .Sh BUGS
 Since one specifies information about a directory using shell
 variables containing the string,
diff --git a/usr.sbin/pflogd/pflogd.8 b/usr.sbin/pflogd/pflogd.8
index db8a080316..92748d2b0d 100644
--- a/usr.sbin/pflogd/pflogd.8
+++ b/usr.sbin/pflogd/pflogd.8
@@ -227,4 +227,4 @@ command appeared in
 .Sh AUTHORS
 .Nm
 was written by
-.An Can Erkin Acar Aq canacar@openbsd.org .
+.An Can Erkin Acar Aq Mt canacar@openbsd.org .
diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4
index 58532ed768..f758243c76 100644
--- a/usr.sbin/ppp/ppp.8.m4
+++ b/usr.sbin/ppp/ppp.8.m4
@@ -5858,14 +5858,14 @@ ifdef({LOCALRAD},{},{.Xr libradius 3 ,
 .Xr vipw 8
 .Sh HISTORY
 This program was originally written by
-.An Toshiharu OHNO Aq tony-o@iij.ad.jp ,
+.An Toshiharu OHNO Aq Mt tony-o@iij.ad.jp ,
 and was submitted to
 .Fx 2.0.5
 by
-.An Atsushi Murai Aq amurai@spec.co.jp .
+.An Atsushi Murai Aq Mt amurai@spec.co.jp .
 .Pp
 It was substantially modified during 1997 by
-.An Brian Somers Aq brian@Awfulhak.org ,
+.An Brian Somers Aq Mt brian@Awfulhak.org ,
 and was ported to
 .Ox
 in November that year
diff --git a/usr.sbin/procctl/procctl.8 b/usr.sbin/procctl/procctl.8
index 453afe4c27..5cb2386483 100644
--- a/usr.sbin/procctl/procctl.8
+++ b/usr.sbin/procctl/procctl.8
@@ -1,5 +1,4 @@
 .\" $FreeBSD: src/usr.sbin/procctl/procctl.8,v 1.7.2.3 2003/03/11 22:31:31 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/procctl/procctl.8,v 1.5 2005/08/01 01:49:18 swildner Exp $
 .Dd December 6, 2004
 .Dt PROCCTL 8
 .Os
@@ -42,4 +41,4 @@ for
 .Fx .
 .Pp
 Some contributions made by
-.An Liam J. Foy Aq liamfoy@sepulcrum.org
+.An Liam J. Foy Aq Mt liamfoy@sepulcrum.org
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index 9ea3ab0337..7ea284b44e 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -15,7 +15,6 @@
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .\" $FreeBSD: src/usr.sbin/rarpd/rarpd.8,v 1.22 2005/02/09 18:04:41 ru Exp $
-.\" $DragonFly: src/usr.sbin/rarpd/rarpd.8,v 1.2 2003/06/17 04:30:02 dillon Exp $
 .\"
 .Dd November 16, 2001
 .Dt RARPD 8
@@ -130,9 +129,9 @@ Enable verbose syslogging.
 .Re
 .Sh AUTHORS
 .An -nosplit
-.An Craig Leres Aq leres@ee.lbl.gov
+.An Craig Leres Aq Mt leres@ee.lbl.gov
 and
-.An Steven McCanne Aq mccanne@ee.lbl.gov .
+.An Steven McCanne Aq Mt mccanne@ee.lbl.gov .
 Lawrence Berkeley Laboratory, University of California, Berkeley, CA.
 .Sh BUGS
 The
diff --git a/usr.sbin/resident/resident.8 b/usr.sbin/resident/resident.8
index d0e85e1965..84678d9f44 100644
--- a/usr.sbin/resident/resident.8
+++ b/usr.sbin/resident/resident.8
@@ -1,5 +1,3 @@
-.\" $DragonFly: src/usr.sbin/resident/resident.8,v 1.5 2007/05/12 07:21:51 swildner Exp $
-.\"
 .Dd May 21, 2003
 .Dt RESIDENT 8
 .Os
@@ -59,4 +57,4 @@ Delete all registrations in the kernel.
 The
 .Nm
 program, its kernel supplement and this manual page was written by
-.An Matthew Dillon Aq dillon@backplane.com .
+.An Matthew Dillon Aq Mt dillon@backplane.com .
diff --git a/usr.sbin/rpc.umntall/rpc.umntall.8 b/usr.sbin/rpc.umntall/rpc.umntall.8
index 1a0b50ef72..a773a995b5 100644
--- a/usr.sbin/rpc.umntall/rpc.umntall.8
+++ b/usr.sbin/rpc.umntall/rpc.umntall.8
@@ -24,7 +24,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/rpc.umntall/rpc.umntall.8,v 1.12 2005/02/13 22:25:32 ru Exp $
-.\" $DragonFly: src/usr.sbin/rpc.umntall/rpc.umntall.8,v 1.6 2008/11/26 15:27:24 swildner Exp $
 .\"
 .Dd November 17, 1999
 .Dt RPC.UMNTALL 8
@@ -124,4 +123,4 @@ The
 utility first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Martin Blapp Aq mb@imp.ch
+.An Martin Blapp Aq Mt mb@imp.ch
diff --git a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
index 89d30ff30c..f55ce52f1d 100644
--- a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
+++ b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
@@ -29,7 +29,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8,v 1.25 2005/02/13 23:45:53 ru Exp $
-.\" $DragonFly: src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8,v 1.4 2006/02/17 19:40:24 swildner Exp $
 .\"
 .Dd February 8, 1996
 .Dt RPC.YPPASSWDD 8
@@ -336,7 +335,7 @@ The template password file(s) for non-default domains
 .Xr ypserv 8 ,
 .Xr ypxfr 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
 .Sh BUGS
 As listed in the yppasswd.x protocol definition, the YPPASSWDPROC_UPDATE
 procedure takes two arguments: a V7-style passwd structure containing
diff --git a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8 b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
index 149586da48..8326ad6cd6 100644
--- a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
+++ b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
@@ -29,7 +29,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8,v 1.9.2.3 2003/03/11 22:31:32 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8,v 1.7 2008/11/23 21:55:52 swildner Exp $
 .\"
 .Dd June 2, 1996
 .Dt RPC.YPXFRD 8
@@ -137,7 +136,7 @@ The NIS maps for a particular NIS domain.
 .Xr ypserv 8 ,
 .Xr ypxfr 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
 .Sh BUGS
 The
 .Dx
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index 8c4efcedd3..70248c6ca4 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -29,7 +29,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/rtprio/rtprio.1,v 1.19.2.4 2002/06/21 16:42:31 charnier Exp $
-.\" $DragonFly: src/usr.sbin/rtprio/rtprio.1,v 1.4 2006/02/17 19:40:25 swildner Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
@@ -182,10 +181,9 @@ utility appeared in
 but is similar to the HP-UX version.
 .Sh AUTHORS
 .An -nosplit
-.An Henrik Vestergaard Draboel Aq hvd@terry.ping.dk
+.An Henrik Vestergaard Draboel Aq Mt hvd@terry.ping.dk
 is the original author.
-This
-implementation was substantially rewritten by
+This implementation was substantially rewritten by
 .An David Greenman .
 .Sh CAVEATS
 You can lock yourself out of the system by placing a cpu-heavy
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index be988c54fa..9e59801220 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -28,7 +28,6 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/sa/sa.8,v 1.11.2.4 2003/03/11 22:31:33 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/sa/sa.8,v 1.4 2007/12/17 18:13:10 swildner Exp $
 .\"
 .Dd February 25, 1994
 .Dt SA 8
@@ -212,7 +211,7 @@ per-user accounting summary database
 .Xr ac 8 ,
 .Xr accton 8
 .Sh AUTHORS
-.An Chris G. Demetriou Aq cgd@postgres.berkeley.edu
+.An Chris G. Demetriou Aq Mt cgd@postgres.berkeley.edu
 .Sh CAVEATS
 While the behavior of the options in this version of
 .Nm
diff --git a/usr.sbin/sdpd/sdpd.8 b/usr.sbin/sdpd/sdpd.8
index 2db345e0e4..d00b42bf89 100644
--- a/usr.sbin/sdpd/sdpd.8
+++ b/usr.sbin/sdpd/sdpd.8
@@ -1,5 +1,4 @@
 .\" $NetBSD: sdpd.8,v 1.3 2007/03/18 15:53:55 plunky Exp $
-.\" $DragonFly: src/usr.sbin/sdpd/sdpd.8,v 1.1 2008/01/06 21:51:30 hasso Exp $
 .\"
 .\" Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
 .\" All rights reserved.
@@ -158,7 +157,7 @@ under the sponsorship of
 It was imported into
 .Dx 1.11 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Most likely.
 Please report if found.
diff --git a/usr.sbin/sicontrol/sicontrol.8 b/usr.sbin/sicontrol/sicontrol.8
index 3baa9a7a80..ac1a3b59c3 100644
--- a/usr.sbin/sicontrol/sicontrol.8
+++ b/usr.sbin/sicontrol/sicontrol.8
@@ -1,5 +1,4 @@
 .\" $FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.11.2.6 2003/03/12 22:08:15 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/sicontrol/sicontrol.8,v 1.2 2003/06/17 04:30:03 dillon Exp $
 .\"
 .Dd September 26, 1995
 .Dt SICONTROL 8
@@ -101,10 +100,10 @@ The
 utility is loosely based on a utility called
 .Nm siconfig
 which was written by
-.An Andy Rutter Aq andy@acronym.co.uk
+.An Andy Rutter Aq Mt andy@acronym.co.uk
 .Pp
 Specialix International do not support this device driver in any way.
 .Sh AUTHORS
-.An Peter Wemm Aq peter@FreeBSD.org
+.An Peter Wemm Aq Mt peter@FreeBSD.org
 .Sh BUGS
 Bound to be many... :-)
diff --git a/usr.sbin/stlstats/stlstats.8 b/usr.sbin/stlstats/stlstats.8
index 10e3aa5f5f..103ff154a1 100644
--- a/usr.sbin/stlstats/stlstats.8
+++ b/usr.sbin/stlstats/stlstats.8
@@ -139,4 +139,4 @@ driver control device used for statistics collection
 .Xr stl 4
 .Sh HISTORY
 This program was originally developed by
-.An Greg Ungerer Aq gerg@stallion.com .
+.An Greg Ungerer Aq Mt gerg@stallion.com .
diff --git a/usr.sbin/usbd/usbd.8 b/usr.sbin/usbd/usbd.8
index a35a937160..5d8f046ce1 100644
--- a/usr.sbin/usbd/usbd.8
+++ b/usr.sbin/usbd/usbd.8
@@ -33,7 +33,6 @@
 .\"
 .\" $NetBSD: usbd.8,v 1.2 1998/07/13 11:01:50 augustss Exp $
 .\" $FreeBSD: src/usr.sbin/usbd/usbd.8,v 1.20 2003/05/04 22:13:00 murray Exp $
-.\" $DragonFly: src/usr.sbin/usbd/usbd.8,v 1.4 2006/07/02 16:24:02 swildner Exp $
 .\"
 .Dd July 2, 2006
 .Dt USBD 8
@@ -135,11 +134,11 @@ utility appeared in
 The
 .Nm
 driver was written by
-.An Lennart Augustsson Aq augustss@carlstedt.se
+.An Lennart Augustsson Aq Mt augustss@carlstedt.se
 for the
 .Nx
 project.
 The event queue handling in
 .Nm
 was added by
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
diff --git a/usr.sbin/usbd/usbd.conf.5 b/usr.sbin/usbd/usbd.conf.5
index d360ca7073..cc86d4f905 100644
--- a/usr.sbin/usbd/usbd.conf.5
+++ b/usr.sbin/usbd/usbd.conf.5
@@ -24,7 +24,6 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/usbd/usbd.conf.5,v 1.13 2003/01/30 22:38:54 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/usbd/usbd.conf.5,v 1.5 2006/02/17 19:40:29 swildner Exp $
 .\"
 .\" Many parts of this manual have been snarfed from the pccard.conf (5) man
 .\" page, copyright by Andrew McRae.
@@ -158,7 +157,7 @@ To start up moused for a newly attached mouse:
 .Xr usbdevs 8
 .Sh AUTHORS
 This manual page was written by
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
 .Sh BUGS
 It is currently not possible to use a selection criterion more than once.
 For example, it is not possible to specify more than one vendor ID.
diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1
index d4631119bb..3d2fdd9473 100644
--- a/usr.sbin/vidcontrol/vidcontrol.1
+++ b/usr.sbin/vidcontrol/vidcontrol.1
@@ -506,5 +506,5 @@ and
 categories of the
 .Em "Ports Collection" .
 .Sh AUTHORS
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
 .An Sascha Wildner
diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index d891850574..048f487c90 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -1,6 +1,5 @@
 .\"
 .\" $FreeBSD: src/usr.sbin/watch/watch.8,v 1.18.2.4 2003/03/11 22:31:34 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/watch/watch.8,v 1.3 2006/02/17 19:40:29 swildner Exp $
 .\"
 .Dd November 24, 2001
 .Dt WATCH 8
@@ -111,7 +110,7 @@ The
 utility first appeared in
 .Fx 2.1 .
 .Sh AUTHORS
-.An Ugen J.S. Antsilevich Aq ugen@NetVision.net.il
+.An Ugen J.S. Antsilevich Aq Mt ugen@NetVision.net.il
 .Sh BUGS
 No terminal emulation is performed.
 All user output is reproduced as-is.
diff --git a/usr.sbin/watchdogd/watchdogd.8 b/usr.sbin/watchdogd/watchdogd.8
index 2368487a54..aadadab0f7 100644
--- a/usr.sbin/watchdogd/watchdogd.8
+++ b/usr.sbin/watchdogd/watchdogd.8
@@ -92,4 +92,4 @@ first appeared in
 .Sh AUTHORS
 .Nm
 was written by
-.An Marc Balmer Aq mbalmer@openbsd.org .
+.An Marc Balmer Aq Mt mbalmer@openbsd.org .
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.8 b/usr.sbin/yp_mkdb/yp_mkdb.8
index 4aac3274fa..e962f4ef26 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.8
+++ b/usr.sbin/yp_mkdb/yp_mkdb.8
@@ -29,7 +29,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.8,v 1.12.2.4 2003/03/11 22:31:35 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/yp_mkdb/yp_mkdb.8,v 1.3 2004/03/11 12:29:00 hmp Exp $
 .\"
 .Dd March 12, 1996
 .Dt YP_MKDB 8
@@ -207,4 +206,4 @@ to build the NIS databases
 .Xr db 3 ,
 .Xr ypserv 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index 942df6da08..0755fe9243 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.8
@@ -26,7 +26,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/ypbind/ypbind.8,v 1.23 2005/02/13 22:25:33 ru Exp $
-.\" $DragonFly: src/usr.sbin/ypbind/ypbind.8,v 1.2 2003/06/17 04:30:04 dillon Exp $
 .\"
 .Dd April 9, 1995
 .Dt YPBIND 8
@@ -200,4 +199,4 @@ ypbind startup options are specified
 .Xr ypserv 8 ,
 .Xr ypset 8
 .Sh AUTHORS
-.An Theo de Raadt Aq deraadt@fsa.ca
+.An Theo de Raadt Aq Mt deraadt@fsa.ca
diff --git a/usr.sbin/yppush/yppush.8 b/usr.sbin/yppush/yppush.8
index d0de216106..722668a52e 100644
--- a/usr.sbin/yppush/yppush.8
+++ b/usr.sbin/yppush/yppush.8
@@ -26,7 +26,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/yppush/yppush.8,v 1.18 2005/01/18 20:02:45 ru Exp $
-.\" $DragonFly: src/usr.sbin/yppush/yppush.8,v 1.4 2006/02/17 19:40:30 swildner Exp $
 .\"
 .Dd February 5, 1995
 .Dt YPPUSH 8
@@ -172,7 +171,7 @@ a particular NIS domain
 .Xr ypserv 8 ,
 .Xr ypxfr 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
 .Sh BUGS
 The mechanism for transferring NIS maps in NIS v1 is different
 than that in NIS version 2.
diff --git a/usr.sbin/ypserv/ypinit.8 b/usr.sbin/ypserv/ypinit.8
index 19a6cf863b..64f3327e7d 100644
--- a/usr.sbin/ypserv/ypinit.8
+++ b/usr.sbin/ypserv/ypinit.8
@@ -29,7 +29,6 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/ypserv/ypinit.8,v 1.17 2006/06/08 14:49:38 maxim Exp $
-.\" $DragonFly: src/usr.sbin/ypserv/ypinit.8,v 1.3 2007/05/13 22:25:42 swildner Exp $
 .\"
 .Dd November 10, 1997
 .Dt YPINIT 8
@@ -192,8 +191,8 @@ It first appeared in
 .Sh AUTHORS
 .An -nosplit
 The original script was written by
-.An Mats O Jansson Aq moj@stacken.kth.se .
+.An Mats O Jansson Aq Mt moj@stacken.kth.se .
 It was modified for
 .Fx
 by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index e8c3beaf3c..d3f3a091a0 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -29,7 +29,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.42 2008/02/03 17:39:37 matteo Exp $
-.\" $DragonFly: src/usr.sbin/ypserv/ypserv.8,v 1.8 2007/12/16 02:55:38 thomas Exp $
 .\"
 .Dd February 3, 2008
 .Dt YPSERV 8
@@ -453,4 +452,4 @@ This version of
 first appeared in
 .Fx 2.2 .
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu