[patch] power-management-guide.xml.patch

power-management-guide.xml.patch (text/plain), 5.39 KB, created by Jan Kundrát (RETIRED) on 2005-09-16 10:25:01 UTC

Index: doc/en/power-management-guide.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v
retrieving revision 1.14
diff -u -b -B -r1.14 power-management-guide.xml
--- doc/en/power-management-guide.xml	10 Jun 2005 18:45:21 -0000	1.14
+++ doc/en/power-management-guide.xml	16 Sep 2005 17:24:13 -0000
@@ -17,8 +17,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.0 -->
 <license/>
 
-<version>1.24</version>
-<date>2005-06-10</date>
+<version>1.25</version>
+<date>2005-09-16</date>
 
 <chapter>
 <title>Introduction</title>
@@ -142,7 +142,6 @@
 Power Management Options ---&gt;
   [*] Power Management Support
   [ ] Software Suspend
-  [ ] Suspend-to-Disk Support
 
   ACPI( Advanced Configuration and Power Interface ) Support ---&gt;
     [*] ACPI Support
@@ -169,9 +168,9 @@
 </pre>
 
 <p>
-Decide yourself whether you want to enable Software Suspend, Suspend-to-Disk and
-Sleep States (see below). If you own an ASUS, Medion or Toshiba laptop, enable
-the appropriate section.
+Decide yourself whether you want to enable Software Suspend and Sleep States
+(see below). If you own an ASUS, Medion or Toshiba laptop, enable the
+appropriate section.
 </p>
 
 <p>
@@ -1051,22 +1050,22 @@
 
 <warn>
 Altough sleep state support is improving much, it's still rather experimental.
-At last I got swsusp2 and suspend to RAM to work, but be warned: This will very
+At last I got suspend2 and suspend to RAM to work, but be warned: This will very
 likely not work but damage your data/system.
 </warn>
 
 <p>
 There are currently three implementations for S4. The original one is swsusp,
-then there is swsusp2 which has the nicest interface (including bootsplash
-support), but requires manual kernel patching. Last not least we have
-Suspend-to-Disk, a fork of swsusp.
+then there is suspend2 which has the nicest interface (including bootsplash
+support), but requires manual kernel patching. We used to have Suspend-to-Disk
+(pmdisk), a fork of swsusp, but it has been merged back.
 </p>
 
 <p>
 If this confused you, have a look at a <uri
 link="http://softwaresuspend.berlios.de/features.html#compare">feature
 comparison</uri>. If you still are confused and don't know which one to choose,
-first give swsusp2 a try, it looks most promising.
+first give suspend2 a try, it looks most promising.
 </p>
 
 <p>
@@ -1082,19 +1081,16 @@
        [*]   Sleep States
 
   <comment>(hibernate with swsusp)</comment>
-  [*] Software Suspend (EXPERIMENTAL)
+  [*]   Software Suspend
+  (/dev/"your-swap-here") Default resume partition
   
-  <comment>(hibernate with swsusp2)</comment>
+  <comment>(hibernate with suspend2)</comment>
   Software Suspend 2
     --- Image Storage (you need at least one writer)
     [*]    Swap Writer
     --- Page Transformers
     [*]    LZF image compression
     (/dev/"your-swap-here")    Default resume device name
-
-  <comment>(hibernate with Suspend-to-Disk)</comment>
-  [*] Suspend-to-Disk Suport
-  (/dev/"your-swap-here") Default resume partition
 </pre>
 
 <p>
@@ -1103,8 +1099,7 @@
 for 2.6 to find out what is supported. The latter gives me <c>standby mem
 disk</c>. For swsusp, the kernel parameter <c>resume=/dev/"your-swap-here"</c>
 has to be appended. If booting is not possible due to a broken image, use
-<c>noresume</c> for swsusp, <c>pmdisk=off</c> for Suspend-to-Disk and
-<c>noresume2</c> for swsusp2.
+<c>noresume</c> for swsusp and <c>noresume2</c> for suspend2.
 </p>
 
 <p>
@@ -1120,13 +1115,15 @@
 # <i>echo -n standby &gt; /sys/power/state</i> <comment>(standby)</comment>
 # <i>echo -n mem &gt; /sys/power/state</i>     <comment>(sleep)</comment>
 
-<comment>(swsusp)</comment>
-# <i>echo 4 &gt; /proc/acpi/sleep</i>          <comment>(hibernate)</comment>
-
-<comment>(Suspend-to-Disk)</comment>
-# <i>echo -n disk &gt; /sys/power/state</i>    <comment>(hibernate)</comment>
+<comment>(Hibernation with swsusp:)</comment>
+# <i>echo shutdown > /sys/power/disk; echo disk > /sys/power/state</i>
+<comment>(If you feel ACPI works pretty well on your system, you might try
+to hibernate via this instead of previous command:)</comment>
+# <i>echo platform > /sys/power/disk; echo disk > /sys/power/state</i>
+<comment>(For details, please consult
+/usr/src/linux/Documentation/power/swsusp.txt)</comment>
 
-<comment>(swsusp2)</comment>
+<comment>(suspend2)</comment>
 # <i>/usr/sbin/hibernate</i>                   <comment>(hibernate, see below)</comment>
 </pre>
 
@@ -1143,13 +1140,12 @@
 </p>
 
 <p>
-While the above should be sufficient to get swsusp and Suspend-to-Disk running
-(I didn't say working), swsusp2 needs special care. 
-The first thing to do is patching the kernel with the patches provided at <uri
-link="http://softwaresuspend.berlios.de/">
-http://softwaresuspend.berlios.de/</uri>. Additionally you've got to emerge
-<c>hibernate-script</c>. Once it is installed, configure
-<path>/etc/hibernate/hibernate.conf</path> and try whether it works:
+While the above should be sufficient to get swsusp running (I didn't say
+working), suspend2 needs special care. The first thing to do is patching the
+kernel with the patches provided at <uri
+link="http://softwaresuspend.berlios.de/">http://softwaresuspend.berlios.de/</uri>.
+Additionally you've got to emerge <c>hibernate-script</c>. Once it is installed,
+configure <path>/etc/hibernate/hibernate.conf</path> and try whether it works:
 </p>
 
 <pre caption="Configure hibernation">