diff options
author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
---|---|---|
committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
commit | ee7b0571c2c18bdec848ed2044223cc88db29bd8 (patch) | |
tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.sbin/watchdogd | |
parent | ffda191e301f128a62c152fde92b692548367fca (diff) | |
parent | 15fc2873832ea5b9b639e701bbbf2e73af8b6a88 (diff) | |
download | src-ee7b0571c2c18bdec848ed2044223cc88db29bd8.tar.gz src-ee7b0571c2c18bdec848ed2044223cc88db29bd8.zip |
Merge head from 7/28
Notes
Notes:
svn path=/projects/bmake/; revision=270164
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 9ca9fe0ef27f..a82f6e310c29 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 d50a964cb994..1d76eeeaf8d4 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 . |