Merge branch 'linux-2.6'

1 files changed, 8 insertions, 3 deletions

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 5001c652028c..495b7d4dd330 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -78,17 +78,22 @@ config PM_SYSFS_DEPRECATED
           are likely to be bus or driver specific.
 
 config SOFTWARE_SUSPEND
-        bool "Software Suspend"
+        bool "Software Suspend (Hibernation)"
         depends on PM && SWAP && (((X86 || PPC64_SWSUSP) && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP))
         ---help---
-          Enable the suspend to disk (STD) functionality.
+          Enable the suspend to disk (STD) functionality, which is usually
+          called "hibernation" in user interfaces.  STD checkpoints the
+          system and powers it off; and restores that checkpoint on reboot.
 
           You can suspend your machine with 'echo disk > /sys/power/state'.
           Alternatively, you can use the additional userland tools available
           from <http://suspend.sf.net>.
 
           In principle it does not require ACPI or APM, although for example
-          ACPI will be used if available.
+          ACPI will be used for the final steps when it is available.  One
+          of the reasons to use software suspend is that the firmware hooks
+          for suspend states like suspend-to-RAM (STR) often don't work very
+          well with Linux.
 
           It creates an image which is saved in your active swap. Upon the next
           boot, pass the 'resume=/dev/swappartition' argument to the kernel to