[gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en: power-management-guide.xml

[Joshua Saddler (nightmorph)]

nightmorph    09/05/14 15:01:19

  Modified:             power-management-guide.xml
  Log:
  Updated kernel info for bug 269808, thanks to fauli@g.o for the patch

Revision  Changes    Path
1.39                 xml/htdocs/doc/en/power-management-guide.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?r1=1.38&r2=1.39

Index: power-management-guide.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- power-management-guide.xml	28 Sep 2008 20:29:25 -0000	1.38
+++ power-management-guide.xml	14 May 2009 15:01:19 -0000	1.39
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v 1.38 2008/09/28 20:29:25 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v 1.39 2009/05/14 15:01:19 nightmorph Exp $ -->
 <guide link="/doc/en/power-management-guide.xml">
 <title>Power Management Guide</title>
 
@@ -23,8 +23,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.41</version>
-<date>2008-09-28</date>
+<version>1.42</version>
+<date>2009-05-14</date>
 
 <chapter>
 <title>Introduction</title>
@@ -160,14 +160,12 @@
 </p>
 
 <pre caption="Minimum kernel setup for Power Management (Kernel 2.6)">
-Power Management Options ---&gt;
-  [*] Power Management Support
+Power management and ACPI options ---&gt;
+[*] Power Management Support
   [ ] Software Suspend
 
   ACPI( Advanced Configuration and Power Interface ) Support ---&gt;
-    [*] ACPI Support
-    [ ]   Sleep States
-    [ ]     /proc/acpi/sleep (deprecated)
+    [ ]   Deprecated /proc/acpi/ files
     [*]   AC Adapter
     [*]   Battery
     &lt;M&gt;   Button
@@ -1326,10 +1324,10 @@
 
 <p>
 There are two different implementations for S4. The original one is swsusp,
-then there is the newer tuxonice (former suspend2) with a nicer interface
+then there is the newer tuxonice (formerly suspend2) with a nicer interface
 (including fbsplash support). A <uri
-link="http://tuxonice.net/features.html#compare"> feature comparison</uri> is
-available at the <uri link="http://www.tuxonice.net">tuxonice Homepage</uri>.
+link="http://tuxonice.net/features.html#compare">feature comparison</uri> is
+available at the <uri link="http://www.tuxonice.net">tuxonice homepage</uri>.
 There used to be Suspend-to-Disk (pmdisk), a fork of swsusp, but it has been
 merged back.
 </p>
@@ -1337,7 +1335,7 @@
 <p>
 TuxOnIce is not included in the mainline kernel yet, therefore you either have
 to patch your kernel sources with the patches provided by <uri
-link="http://tuxonice.net">tuxonice.net</uri> or use
+link="http://www.tuxonice.net">tuxonice.net</uri> or use
 <c>sys-kernel/tuxonice-sources</c>.
 </p>
 
@@ -1346,22 +1344,21 @@
 </p>
 
 <pre caption="Kernel configuration for the various suspend types">
-Power Management Options ---&gt;
+Power Management and ACPI options ---&gt;
   <comment>(hibernate with swsusp)</comment>
-  [*] Software Suspend
+  [*] Hibernation (aka 'suspend to disk')
       <comment>(replace /dev/SWAP with your swap partition)</comment>
       (/dev/SWAP)      Default resume partition
 
   <comment>(hibernate with TuxOnIce)</comment>
   Enhanced Hibernation (TuxOnIce)
-    --- Image Storage (you need at least one writer)
-    [*]     File Writer
-    [*]    Swap Writer
+    --- Image Storage (you need at least one allocator)
+    [*]    File Allocator
+    [*]    Swap Allocator
     ---   General Options
-    [*]    LZF image compression
-    <comment>(replace /dev/SWAP with your swap partition)</comment>
-    (swap:/dev/SWAP)   Default resume device name
+    [*]    Compression support
     [ ]     Allow Keep Image Mode
+    [*]     Replace swsusp by default
 </pre>
 
 <p>
@@ -1420,13 +1417,13 @@
 </pre>
 
 <p>
-Now edit <path>/etc/hibernate/suspend2.conf</path>, enable the <c>TuxOnIce</c>
+Now edit <path>/etc/hibernate/tuxonice.conf</path>, enable the <c>TuxOnIce</c>
 options you need. Do not enable the <c>fbsplash</c> options in
 <c>common.conf</c> just yet.
 </p>
 
 <pre caption="Hibernating with TuxOnIce">
-# <i>nano -w /etc/hibernate/suspend2.conf</i>
+# <i>nano -w /etc/hibernate/tuxonice.conf</i>
 <comment>(Make sure you have a backup of your data)</comment>
 # <i>hibernate</i>
 </pre>
@@ -1450,7 +1447,7 @@
 </p>
 
 <pre caption="Using the livecd-2005.1 theme during hibernation">
-# <i>ln -sfn /etc/splash/livecd-2005.1 /etc/splash/suspend2</i>
+# <i>ln -sfn /etc/splash/livecd-2005.1 /etc/splash/tuxonice</i>
 </pre>
 
 <p>