diff options
| author | Victor Lowther <victor.lowther@gmail.com> | 2009-12-05 11:51:33 -0600 |
|---|---|---|
| committer | Victor Lowther <victor.lowther@gmail.com> | 2009-12-05 11:51:33 -0600 |
| commit | c016155ca72c86bfefe397de4310f53566a1c246 (patch) | |
| tree | a3010d94ddf5a76f37169783fb9f2491a737ea3d /man/pm-action.xml | |
| parent | cc971769598b08e8a29b5319048c59c41a0b2f2f (diff) | |
Updated pm-action manpage to reflect recent changes.
We have --store-quirks-as-lkw instead of --store-quirks-as-fdi, and
the default kernel methods have a suspend-hybrid implementation that
has a 900 second delay between suspending and hibernating.
Diffstat (limited to 'man/pm-action.xml')
| -rw-r--r-- | man/pm-action.xml | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/man/pm-action.xml b/man/pm-action.xml index 2bde946..d4e1226 100644 --- a/man/pm-action.xml +++ b/man/pm-action.xml @@ -164,7 +164,7 @@ <refsect1 id="options"> <title>OPTIONS</title> <para> - On most hardware putting the video card in the suspend state and + On some hardware putting the video card in the suspend state and recovering from it needs some special quirk handling. With the --quirk-* options of the <command>pm-suspend</command> and <command>pm-suspend-hybrid</command> commands you can select which @@ -181,16 +181,6 @@ variablelist.term.break.after parameters to control the term elements. --> <varlistentry> - <term><option>--auto-quirks</option></term> - <listitem> - <para> - This option will try to grab the correct quirks for this system - from HAL. If HAL is not present on the system and this parameter - is passed, suspending or hibernating the system will fail. - </para> - </listitem> - </varlistentry> - <varlistentry> <term><option>--quirk-dpms-on</option></term> <listitem> <para> @@ -294,18 +284,19 @@ </listitem> </varlistentry> <varlistentry> - <term><option>--store-quirks-as-fdi</option></term> + <term><option>--store-quirks-as-lkw</option></term> <listitem> <para> - Save the quirks passed to <command>pm-suspend</command> or - <command>pm-suspend-hybrid</command> as an .fdi file that + Save the quirks the video adaptor required by + <command>pm-suspend</command> or + <command>pm-suspend-hybrid</command> as an .quirkdb file that is specific to this system. The file will be saved in - <filename>/etc/hal/fdi/information/99local-pm-utils-quirks.fdi</filename>. + <filename>/etc/pm/last_known_working.quirkdb</filename>. This parameter will only save the actual quirks that were - used to successfully suspend/resume a system -- if you are - running proprietary video drivers or kernel modesetting - video drivers, you will generate a potentially incorrect - .fdi file. + used to successfully suspend/resume a system, and will be + specific to the exact configuration of that sustem, including + the video hardware, video driver, and whether or not kernel + modesetting was used. </para> </listitem> </varlistentry> @@ -499,6 +490,16 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><envar>PM_HIBERNATE_DELAY [=900]</envar></term> + <listitem><para> + If you are using kernel suspend/resume and invoke + <command>pm-suspend-hybrid</command>, this environment variable + controls how many seconds the system will wait after going into + suspend before waking back up and hibernating. By default, this + is set to 900 seconds (15 minutes). + </para></listitem> + </varlistentry> </variablelist> </refsect1> |