Gentoo Archives: gentoo-doc-cvs

From: Joshua Saddler <nightmorph@××××××××××××.org>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] cvs commit: power-management-guide.xml
Date: Thu, 31 Jan 2008 23:38:09
Message-Id: E1JKiyr-0007vC-SW@stork.gentoo.org
1 nightmorph 08/01/31 23:38:05
2
3 Modified: power-management-guide.xml
4 Log:
5 bring it a little more up to date. punt outdated Xfree86 references. ibm_acpi is now known as thinkpad_acpi. for xorg.conf, DPMS is no longer a boolean variable, and screen blank settings have been moved to a different section.
6
7 Revision Changes Path
8 1.35 xml/htdocs/doc/en/power-management-guide.xml
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?rev=1.35&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?rev=1.35&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?r1=1.34&r2=1.35
13
14 Index: power-management-guide.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v
17 retrieving revision 1.34
18 retrieving revision 1.35
19 diff -u -r1.34 -r1.35
20 --- power-management-guide.xml 21 Jan 2008 12:15:56 -0000 1.34
21 +++ power-management-guide.xml 31 Jan 2008 23:38:05 -0000 1.35
22 @@ -1,6 +1,6 @@
23 <?xml version='1.0' encoding="UTF-8"?>
24 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
25 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v 1.34 2008/01/21 12:15:56 jkt Exp $ -->
26 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v 1.35 2008/01/31 23:38:05 nightmorph Exp $ -->
27 <guide link="/doc/en/power-management-guide.xml">
28 <title>Power Management Guide</title>
29
30 @@ -23,8 +23,8 @@
31 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
32 <license/>
33
34 -<version>1.38</version>
35 -<date>2008-01-21</date>
36 +<version>1.39</version>
37 +<date>2008-01-31</date>
38
39 <chapter>
40 <title>Introduction</title>
41 @@ -824,14 +824,12 @@
42 <path>/etc/X11/xorg.conf</path> similar to this:
43 </p>
44
45 -<pre caption="LCD suspend settings in X.org and XFree86">
46 -Section "ServerLayout"
47 - Identifier [...]
48 - [...]
49 - Option "BlankTime" "5" <comment># Blank the screen after 5 minutes (Fake)</comment>
50 - Option "StandbyTime" "10" <comment># Turn off screen after 10 minutes (DPMS)</comment>
51 - Option "SuspendTime" "20" <comment># Full suspend after 20 minutes</comment>
52 - Option "OffTime" "30" <comment># Turn off after half an hour</comment>
53 +<pre caption="LCD suspend settings in X.org">
54 +Section "ServerFlags"
55 + Option "blank time" "5" <comment># Blank the screen after 5 minutes (Fake)</comment>
56 + Option "standby time" "10" <comment># Turn off screen after 10 minutes (DPMS)</comment>
57 + Option "suspend time" "20" <comment># Full suspend after 20 minutes</comment>
58 + Option "off time" "30" <comment># Turn off after half an hour</comment>
59 [...]
60 EndSection
61
62 @@ -839,15 +837,11 @@
63
64 Section "Monitor"
65 Identifier [...]
66 - Option "DPMS" "true"
67 + Option "DPMS"
68 [...]
69 EndSection
70 </pre>
71
72 -<p>
73 -This is the same for XFree86 and <path>/etc/X11/XF86Config</path>.
74 -</p>
75 -
76 </body>
77 </section>
78 <section>
79 @@ -860,27 +854,27 @@
80 battery mode and place it in your <c>battery</c> runlevel. The following script
81 should work on most IBM Thinkpads and Toshiba laptops. You've got to enable the
82 appropriate option in your kernel (IBM Thinkpads only). For Toshiba laptops,
83 -install <c>sys-power/acpitool</c> and skip configuration of <c>ibm_acpi</c> as
84 -described below.
85 +install <c>sys-power/acpitool</c> and skip configuration of <c>thinkpad_acpi</c>
86 +(formerly called <c>ibm_acpi</c>) as described below.
87 </p>
88
89 <warn>
90 -Support for setting brightness is marked experimental in ibm-acpi. It accesses
91 +Support for setting brightness is marked experimental in thinkpad_acpi. It accesses
92 hardware directly and may cause severe harm to your system. Please read the
93 -<uri link="http://ibm-acpi.sourceforge.net/">ibm-acpi website</uri>
94 +<uri link="http://ibm-acpi.sourceforge.net/">thinkpad_acpi website</uri>
95 </warn>
96
97 <p>
98 -To be able to set the brightness level, the ibm_acpi module has to be loaded
99 +To be able to set the brightness level, the thinkpad_acpi module has to be loaded
100 with the experimental parameter.
101 </p>
102
103 -<pre caption="automatically loading the ibm_acpi module">
104 +<pre caption="automatically loading the thinkpad_acpi module">
105 <comment>(Please read the warnings above before doing this!)</comment>
106 -# <i>echo "options ibm_acpi experimental=1" >> /etc/modules.d/ibm_acpi</i>
107 +# <i>echo "options thinkpad_acpi experimental=1" >> /etc/modules.d/thinkpad_acpi</i>
108 # <i>/sbin/update-modules</i>
109 -# <i>echo ibm_acpi >> /etc/modules.autoload.d/kernel-2.6</i>
110 -# <i>modprobe ibm_acpi</i>
111 +# <i>echo thinkpad_acpi >> /etc/modules.autoload.d/kernel-2.6</i>
112 +# <i>modprobe thinkpad_acpi</i>
113 </pre>
114
115 <p>
116 @@ -892,7 +886,7 @@
117
118 <pre caption="/etc/conf.d/lcd-brightness">
119 <comment># See /proc/acpi/ibm/brightness for available values</comment>
120 -<comment># Please read /usr/src/linux/Documentation/ibm-acpi.txt</comment>
121 +<comment># Please read /usr/src/linux/Documentation/thinkpad-acpi.txt</comment>
122
123 <comment># brightness level in ac mode. Default is 7.</comment>
124 BRIGHTNESS_AC=7
125 @@ -924,7 +918,7 @@
126 eend $?
127 else
128 ewarn "Setting LCD brightness is not supported."
129 - ewarn "For IBM Thinkpads, check that ibm_acpi is loaded into the kernel"
130 + ewarn "For IBM Thinkpads, check that thinkpad_acpi is loaded into the kernel"
131 ewarn "For Toshiba laptops, you've got to install sys-power/acpitool"
132 fi
133 }
134
135
136
137 --
138 gentoo-doc-cvs@l.g.o mailing list