Merge from head@274682

3 files changed, 6 insertions, 6 deletions

diff --git a/usr.sbin/watchdogd/watchdog.8 b/usr.sbin/watchdogd/watchdog.8
index a82f6e310c29..9d041f539e16 100644
--- a/usr.sbin/watchdogd/watchdog.8
+++ b/usr.sbin/watchdogd/watchdog.8
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 2, 2006
+.Dd October 18, 2014
 .Dt WATCHDOG 8
 .Os
 .Sh NAME
@@ -50,7 +50,7 @@ The
 option
 specifies the desired timeout period in seconds, a value of
 zero will disable the watchdog.
-The default timeout is 16 seconds.
+The default timeout is 128 seconds.
 .Sh SEE ALSO
 .Xr watchdog 4 ,
 .Xr watchdogd 8 ,
diff --git a/usr.sbin/watchdogd/watchdogd.8 b/usr.sbin/watchdogd/watchdogd.8
index 1d76eeeaf8d4..e60f42db934b 100644
--- a/usr.sbin/watchdogd/watchdogd.8
+++ b/usr.sbin/watchdogd/watchdogd.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 27, 2013
+.Dd November 16, 2014
 .Dt WATCHDOGD 8
 .Os
 .Sh NAME
@@ -79,12 +79,12 @@ reboot if there are problems with the script.
 The
 .Fl s Ar sleep
 argument can be used to control the sleep period between each execution
-of the check and defaults to one second.
+of the check and defaults to 10 seconds.
 .Pp
 The
 .Fl t Ar timeout
 specifies the desired timeout period in seconds.
-The default timeout is 16 seconds.
+The default timeout is 128 seconds.
 .Pp
 One possible circumstance which will cause a watchdog timeout is an interrupt
 storm.
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c
index 5fd16f56964b..767aa8e6f690 100644
--- a/usr.sbin/watchdogd/watchdogd.c
+++ b/usr.sbin/watchdogd/watchdogd.c
@@ -87,7 +87,7 @@ static int is_dry_run = 0;  /* do not arm the watchdog, only
 static int do_timedog = 0;
 static int do_syslog = 1;
 static int fd = -1;
-static int nap = 1;
+static int nap = 10;
 static int carp_thresh_seconds = -1;
 static char *test_cmd = NULL;