diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-09-21 15:44:14 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-09-21 15:44:14 +0200 |
| commit | 8e7fd6ade44ce5dde0867ba748c7978ed1206865 (patch) | |
| tree | ced70d8e4c3d4e14f70ac459277c9046bd26500c /man/logind.conf.xml | |
| parent | 636d30a0895f17eca8313d50f9b2fc1ec5e128da (diff) | |
logind: split up HandleSleepKey= into HandleSuspendKey= and HandleHibernateKey=
The kernel and X11 distuingish these two, and Thinkpad keys have both,
hence we really should distinguish them too.
Diffstat (limited to 'man/logind.conf.xml')
| -rw-r--r-- | man/logind.conf.xml | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/man/logind.conf.xml b/man/logind.conf.xml index ccfc4abce2..3d83d2c81c 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -198,7 +198,8 @@ <varlistentry> <term><varname>HandlePowerKey=</varname></term> - <term><varname>HandleSleepKey=</varname></term> + <term><varname>HandleSuspendKey=</varname></term> + <term><varname>HandleHibernateKey=</varname></term> <term><varname>HandleLidSwitch=</varname></term> <listitem><para>Controls whether @@ -222,15 +223,19 @@ events. <varname>HandlePowerKey=</varname> defaults to <literal>poweroff</literal>. - <varname>HandleSleepKey=</varname> and + <varname>HandleSuspendKey=</varname> + and <varname>HandleLidSwitch=</varname> - default to - <literal>suspend</literal>.</para></listitem> + default to <literal>suspend</literal>. + <varname>HandleHibernateKey=</varname> + defaults to + <literal>hibernate</literal>.</para></listitem> </varlistentry> <varlistentry> <term><varname>PowerKeyIgnoreInhibited=</varname></term> - <term><varname>SleepKeyIgnoreInhibited=</varname></term> + <term><varname>SuspendKeyIgnoreInhibited=</varname></term> + <term><varname>HibernateKeyIgnoreInhibited=</varname></term> <term><varname>LidSwitchIgnoreInhibited=</varname></term> <listitem><para>Controls whether @@ -244,9 +249,10 @@ respected, if <literal>on</literal> the requested operation is executed in any - case. <varname>PowerKeyIgnoreInhibited=</varname> + case. <varname>PowerKeyIgnoreInhibited=</varname>, + <varname>SuspendKeyIgnoreInhibited=</varname> and - <varname>SleepKeyIgnoreInhibited=</varname> + <varname>HibernateKeyIgnoreInhibited=</varname> defaults to <literal>off</literal>, <varname>LidSwitchIgnoreInhibited=</varname> defaults to |