diff options
author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.sbin/watchdogd | |
parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz |
Merge head from 7/28
Diffstat (limited to 'usr.sbin/watchdogd')
-rw-r--r-- | usr.sbin/watchdogd/watchdog.8 | 6 | ||||
-rw-r--r-- | usr.sbin/watchdogd/watchdogd.8 | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/watchdogd/watchdog.8 b/usr.sbin/watchdogd/watchdog.8 index 9ca9fe0..a82f6e3 100644 --- a/usr.sbin/watchdogd/watchdog.8 +++ b/usr.sbin/watchdogd/watchdog.8 @@ -65,9 +65,9 @@ utility appeared in The .Nm utility and manual page were written by -.An Sean Kelly Aq smkelly@FreeBSD.org +.An Sean Kelly Aq Mt smkelly@FreeBSD.org and -.An Poul-Henning Kamp Aq phk@FreeBSD.org . +.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org . .Pp Some contributions made by -.An Jeff Roberson Aq jeff@FreeBSD.org . +.An Jeff Roberson Aq Mt jeff@FreeBSD.org . diff --git a/usr.sbin/watchdogd/watchdogd.8 b/usr.sbin/watchdogd/watchdogd.8 index d50a964..1d76eee 100644 --- a/usr.sbin/watchdogd/watchdogd.8 +++ b/usr.sbin/watchdogd/watchdogd.8 @@ -302,12 +302,12 @@ utility appeared in The .Nm utility and manual page were written by -.An Sean Kelly Aq smkelly@FreeBSD.org +.An Sean Kelly Aq Mt smkelly@FreeBSD.org and -.An Poul-Henning Kamp Aq phk@FreeBSD.org . +.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org . .Pp Some contributions made by -.An Jeff Roberson Aq jeff@FreeBSD.org . +.An Jeff Roberson Aq Mt jeff@FreeBSD.org . .Pp The pretimeout and softtimeout action system was added by -.An Alfred Perlstein Aq alfred@freebsd.org . +.An Alfred Perlstein Aq Mt alfred@freebsd.org . |