Merge head from 7/28

4 files changed, 7 insertions, 17 deletions

diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1
index d5cc614..3684b9f 100644
--- a/usr.sbin/ctm/ctm/ctm.1
+++ b/usr.sbin/ctm/ctm/ctm.1
@@ -316,10 +316,9 @@ The
 command appeared in
 .Fx 2.1 .
 .Sh AUTHORS
+.An -nosplit
 The CTM system has been designed and implemented by
-.An Poul-Henning Kamp
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 .Pp
-.An Joerg Wunsch
-.Aq joerg@FreeBSD.org
+.An Joerg Wunsch Aq Mt joerg@FreeBSD.org
 wrote this man-page.
diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5
index a51c93b..e48b09f 100644
--- a/usr.sbin/ctm/ctm/ctm.5
+++ b/usr.sbin/ctm/ctm/ctm.5
@@ -174,10 +174,9 @@ methods were hashed out.
 The CTM system has been made publicly available in
 .Fx 2.1 .
 .Sh AUTHORS
+.An -nosplit
 The CTM system has been designed and implemented by
-.An Poul-Henning Kamp
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 .Pp
-.An Joerg Wunsch
-.Aq joerg@FreeBSD.org
+.An Joerg Wunsch Aq Mt joerg@FreeBSD.org
 wrote this man-page.
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index 5476e49..232f646 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
@@ -507,4 +507,4 @@ Error messages should be self explanatory.
 .Xr ctm 5
 .\" .Sh HISTORY
 .Sh AUTHORS
-.An Stephen McKay Aq mckay@FreeBSD.org
+.An Stephen McKay Aq Mt mckay@FreeBSD.org
diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.gnats b/usr.sbin/ctm/mkCTM/ctm_conf.gnats
deleted file mode 100644
index c2223f0..0000000
--- a/usr.sbin/ctm/mkCTM/ctm_conf.gnats
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/local/bin/tclsh
-
-#set CTMfirst	1
-set CTMname	gnats
-set CTMref	/home/gnats
-set CTMdest	$CTMSW/../CTM-pub/$CTMname
-set CTMignore	{\\.lock$}
-set CTMmail	ctm-gnats@freebsd.org