nightmorph 08/01/31 23:38:05 Modified: power-management-guide.xml Log: 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.
Revision Changes Path 1.35 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.35&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?rev=1.35&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?r1=1.34&r2=1.35 Index: power-management-guide.xml =================================================================== RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- power-management-guide.xml 21 Jan 2008 12:15:56 -0000 1.34 +++ power-management-guide.xml 31 Jan 2008 23:38:05 -0000 1.35 @@ -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.34 2008/01/21 12:15:56 jkt Exp $ --> +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v 1.35 2008/01/31 23:38:05 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.38</version> -<date>2008-01-21</date> +<version>1.39</version> +<date>2008-01-31</date> <chapter> <title>Introduction</title> @@ -824,14 +824,12 @@ <path>/etc/X11/xorg.conf</path> similar to this: </p> -<pre caption="LCD suspend settings in X.org and XFree86"> -Section "ServerLayout" - Identifier [...] - [...] - Option "BlankTime" "5" <comment># Blank the screen after 5 minutes (Fake)</comment> - Option "StandbyTime" "10" <comment># Turn off screen after 10 minutes (DPMS)</comment> - Option "SuspendTime" "20" <comment># Full suspend after 20 minutes</comment> - Option "OffTime" "30" <comment># Turn off after half an hour</comment> +<pre caption="LCD suspend settings in X.org"> +Section "ServerFlags" + Option "blank time" "5" <comment># Blank the screen after 5 minutes (Fake)</comment> + Option "standby time" "10" <comment># Turn off screen after 10 minutes (DPMS)</comment> + Option "suspend time" "20" <comment># Full suspend after 20 minutes</comment> + Option "off time" "30" <comment># Turn off after half an hour</comment> [...] EndSection @@ -839,15 +837,11 @@ Section "Monitor" Identifier [...] - Option "DPMS" "true" + Option "DPMS" [...] EndSection </pre> -<p> -This is the same for XFree86 and <path>/etc/X11/XF86Config</path>. -</p> - </body> </section> <section> @@ -860,27 +854,27 @@ battery mode and place it in your <c>battery</c> runlevel. The following script should work on most IBM Thinkpads and Toshiba laptops. You've got to enable the appropriate option in your kernel (IBM Thinkpads only). For Toshiba laptops, -install <c>sys-power/acpitool</c> and skip configuration of <c>ibm_acpi</c> as -described below. +install <c>sys-power/acpitool</c> and skip configuration of <c>thinkpad_acpi</c> +(formerly called <c>ibm_acpi</c>) as described below. </p> <warn> -Support for setting brightness is marked experimental in ibm-acpi. It accesses +Support for setting brightness is marked experimental in thinkpad_acpi. It accesses hardware directly and may cause severe harm to your system. Please read the -<uri link="http://ibm-acpi.sourceforge.net/";>ibm-acpi website</uri> +<uri link="http://ibm-acpi.sourceforge.net/";>thinkpad_acpi website</uri> </warn> <p> -To be able to set the brightness level, the ibm_acpi module has to be loaded +To be able to set the brightness level, the thinkpad_acpi module has to be loaded with the experimental parameter. </p> -<pre caption="automatically loading the ibm_acpi module"> +<pre caption="automatically loading the thinkpad_acpi module"> <comment>(Please read the warnings above before doing this!)</comment> -# <i>echo "options ibm_acpi experimental=1" >> /etc/modules.d/ibm_acpi</i> +# <i>echo "options thinkpad_acpi experimental=1" >> /etc/modules.d/thinkpad_acpi</i> # <i>/sbin/update-modules</i> -# <i>echo ibm_acpi >> /etc/modules.autoload.d/kernel-2.6</i> -# <i>modprobe ibm_acpi</i> +# <i>echo thinkpad_acpi >> /etc/modules.autoload.d/kernel-2.6</i> +# <i>modprobe thinkpad_acpi</i> </pre> <p> @@ -892,7 +886,7 @@ <pre caption="/etc/conf.d/lcd-brightness"> <comment># See /proc/acpi/ibm/brightness for available values</comment> -<comment># Please read /usr/src/linux/Documentation/ibm-acpi.txt</comment> +<comment># Please read /usr/src/linux/Documentation/thinkpad-acpi.txt</comment> <comment># brightness level in ac mode. Default is 7.</comment> BRIGHTNESS_AC=7 @@ -924,7 +918,7 @@ eend $? else ewarn "Setting LCD brightness is not supported." - ewarn "For IBM Thinkpads, check that ibm_acpi is loaded into the kernel" + ewarn "For IBM Thinkpads, check that thinkpad_acpi is loaded into the kernel" ewarn "For Toshiba laptops, you've got to install sys-power/acpitool" fi } -- [email protected] mailing list
