I don't normally use my middle name, so remove it from attributions in

man pages (though not from copyright notices).  While I'm here, add email
addresses where appropriate.

10 files changed, 15 insertions, 15 deletions

diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index 48241ff..118d754 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -615,7 +615,7 @@ library first appeared in
 The
 .Nm fetch
 library was mostly written by
-.An Dag-Erling Co\(:idan Sm\(/orgrav Aq des@FreeBSD.org
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org
 with numerous suggestions from
 .An Jordan K. Hubbard Aq jkh@FreeBSD.org ,
 .An Eugene Skepner Aq eu@qub.com
@@ -630,7 +630,7 @@ and
 .An Jordan K. Hubbard Aq jkh@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Dag-Erling Co\(:idan Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
 .Sh BUGS
 Some parts of the library are not yet implemented.
 The most notable
diff --git a/share/man/man9/mac.9 b/share/man/man9/mac.9
index da2741f..b4512e1 100644
--- a/share/man/man9/mac.9
+++ b/share/man/man9/mac.9
@@ -213,7 +213,7 @@ Sub-contracted staff include:
 .An Poul-Henning Kamp ,
 .An Jonathan Lemon ,
 .An Kirk McKusick ,
-.An Dag-Erling Smorgrav .
+.An Dag-Erling Sm\(/orgrav .
 .Pp
 Additional contributors include:
 .An Chris Faulhaber ,
diff --git a/share/man/man9/sbuf.9 b/share/man/man9/sbuf.9
index e9b695a..d14298b 100644
--- a/share/man/man9/sbuf.9
+++ b/share/man/man9/sbuf.9
@@ -356,11 +356,11 @@ The
 family of functions was designed by
 .An Poul-Henning Kamp Aq phk@FreeBSD.org
 and implemented by
-.An Dag-Erling Co\(:idan Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
 Additional improvements were suggested by
 .An Justin T. Gibbs Aq gibbs@FreeBSD.org .
 Auto-extend support added by
 .An Kelly Yancey Aq kbyanc@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Dag-Erling Co\(:idan Sm\(/orgrav .
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9
index 0a085d6..d6e9d72 100644
--- a/share/man/man9/zone.9
+++ b/share/man/man9/zone.9
@@ -210,6 +210,6 @@ The zone allocator was rewritten in large parts by
 to function as a slab allocator.
 .Pp
 This manual page was written by
-.An Dag-Erling Co\(:idan Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
 Changes for UMA by
 .An Jeroen Ruigrok van der Werven Aq asmodai@FreeBSD.org .
diff --git a/tools/tools/tinderbox/tbmaster.1 b/tools/tools/tinderbox/tbmaster.1
index 9994a67..1dbcb09 100644
--- a/tools/tools/tinderbox/tbmaster.1
+++ b/tools/tools/tinderbox/tbmaster.1
@@ -242,6 +242,6 @@ would expand to
 .Sh AUTHORS
 .Nm
 was written by
-.An Dag-Erling Smørgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
 .Sh BUGS
 - part of a complete breakfast!
diff --git a/tools/tools/tinderbox/tinderbox.1 b/tools/tools/tinderbox/tinderbox.1
index c354460..4b34506 100644
--- a/tools/tools/tinderbox/tinderbox.1
+++ b/tools/tools/tinderbox/tinderbox.1
@@ -295,6 +295,6 @@ if a patch was specified.
 .Sh AUTHORS
 .Nm
 was written by
-.An Dag-Erling Smørgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
 .Sh BUGS
 are crunchy and nutritious.
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index 88ad159..62ba13c 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -338,15 +338,15 @@ This implementation first appeared in
 The original implementation of
 .Nm
 was done by
-.An Jean-Marc Zucconi .
+.An Jean-Marc Zucconi Aq jmz@FreeBSD.org .
 It was extensively re-worked for
 .Fx 2.2
 by
-.An Garrett Wollman ,
+.An Garrett Wollman Aq wollman@FreeBSD.org ,
 and later completely rewritten to use the
 .Xr fetch 3
 library by
-.An Dag-Erling Sm\(/orgrav .
+.An Dag-Erling Co\(:idan Sm\(/orgrav Aq des@FreeBSD.org .
 .Sh NOTES
 The
 .Fl b
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.8 b/usr.sbin/acpi/acpiconf/acpiconf.8
index b3d8bd3..2dd779c 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.8
+++ b/usr.sbin/acpi/acpiconf/acpiconf.8
@@ -58,7 +58,7 @@ Enters the specified sleep mode.
 Recognized types are
 .Cm 1
 (only the CPU clock is stopped),
-.Cm 2 
+.Cm 2
 (not implemented on most systems but similar to S1),
 .Cm 3
 (the CPU context is lost and memory context is preserved),
@@ -93,4 +93,4 @@ The
 utility was written by
 .An Mitsuru Iwasaki Aq iwasaki@FreeBSD.org .
 This manual page was written by
-.An Dag-Erling Co\(:idan Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
diff --git a/usr.sbin/chkgrp/chkgrp.8 b/usr.sbin/chkgrp/chkgrp.8
index 6d4bf41..e7a1606 100644
--- a/usr.sbin/chkgrp/chkgrp.8
+++ b/usr.sbin/chkgrp/chkgrp.8
@@ -78,7 +78,7 @@ 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 Sm\(/orgrav Aq des@FreeBSD.org .
 .Sh BUGS
 Should check fields more thoroughly for allowed/disallowed
 characters, and the range of the group ID.
diff --git a/usr.sbin/kldxref/kldxref.8 b/usr.sbin/kldxref/kldxref.8
index 5f4cf6f..b0c3b8c 100644
--- a/usr.sbin/kldxref/kldxref.8
+++ b/usr.sbin/kldxref/kldxref.8
@@ -92,4 +92,4 @@ utility was implemented by
 This manual page was written by
 .An Boris Popov Aq bp@FreeBSD.org
 and
-.An Dag-Erling Co\(:idan Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .