---

yaml
---
r: 54271
b: refs/heads/master
c: a7ee2e5
h: refs/heads/master
i:
  54269: 52ae0c4
  54267: 081fea4
  54263: 6d1d611
  54255: 2434e6a
  54239: e3528d2
  54207: 738a4eb
  54143: fd8ba0b
  54015: c905af7
  53759: 0a2949e
  53247: 2f024ad
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0ced9b229cfbc76b5db9837b4b256b602d56610
+refs/heads/master: a7ee2e5f5b4c9c72f4390c60ba7ea30306f47188

trunk/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 && (!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