Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6] / Documentation / watchdog / watchdog-api.txt

diff --git a/Documentation/watchdog/watchdog-api.txt b/Documentation/watchdog/watchdog-api.txt
index 12ad3b87b86d109e071390597bcb2fe0f254cd84..7e8ae83e9847bcdaad064cb1eaa2c0e609da4b66 100644 (file)
--- a/Documentation/watchdog/watchdog-api.txt
+++ b/Documentation/watchdog/watchdog-api.txt
@@ -45,7 +45,7 @@ daemon and it crashes the system will not reboot.  Because of this,
 some of the drivers support the configuration option "Disable watchdog
 shutdown on close", CONFIG_WATCHDOG_NOWAYOUT.  If it is set to Y when
 compiling the kernel, there is no way of disabling the watchdog once
-it has been started.  So, if the watchdog dameon crashes, the system
+it has been started.  So, if the watchdog daemon crashes, the system
 will reboot after the timeout has passed.
 
 Some other drivers will not disable the watchdog, unless a specific
@@ -258,13 +258,13 @@ booke_wdt.c -- PowerPC BookE Watchdog Timer
        Timeout default varies according to frequency, supports
        SETTIMEOUT
 
-       Watchdog can not be turned off, CONFIG_WATCHDOG_NOWAYOUT
+       Watchdog cannot be turned off, CONFIG_WATCHDOG_NOWAYOUT
        does not make sense
 
        GETSUPPORT returns the watchdog_info struct, and
        GETSTATUS returns the supported options. GETBOOTSTATUS
        returns a 1 if the last reset was caused by the
-       watchdog and a 0 otherwise. This watchdog can not be
+       watchdog and a 0 otherwise. This watchdog cannot be
        disabled once it has been started. The wdt_period kernel
        parameter selects which bit of the time base changing
        from 0->1 will trigger the watchdog exception. Changing