update TODO

[elogind.git] / man / logind.conf.xml

diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index f037da259b1ab30ab54c1a1665d4efdff7bcfe0e..d37fcba585ee302b780e0ff10d44b166981c4a71 100644 (file)
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -224,6 +224,7 @@
                                 <term><varname>HandleSuspendKey=</varname></term>
                                 <term><varname>HandleHibernateKey=</varname></term>
                                 <term><varname>HandleLidSwitch=</varname></term>
                                 <term><varname>HandleSuspendKey=</varname></term>
                                 <term><varname>HandleHibernateKey=</varname></term>
                                 <term><varname>HandleLidSwitch=</varname></term>

+                                <term><varname>HandleLidSwitchDocked=</varname></term>

 
                                 <listitem><para>Controls whether
                                 logind shall handle the system power
 
                                 <listitem><para>Controls whether
                                 logind shall handle the system power


@@ -255,13 +256,18 @@
                                 and
                                 <varname>HandleLidSwitch=</varname>
                                 default to <literal>suspend</literal>.
                                 and
                                 <varname>HandleLidSwitch=</varname>
                                 default to <literal>suspend</literal>.

+                                <varname>HandleLidSwitchDocked=</varname>
+                                defaults to <literal>ignore</literal>.

                                 <varname>HandleHibernateKey=</varname>
                                 defaults to
                                 <varname>HandleHibernateKey=</varname>
                                 defaults to

-                                <literal>hibernate</literal>. Note
-                                that the lid switch is ignored if the
-                                system is inserted in a docking
-                                station, or if more than one display
-                                is connected.</para></listitem>
+                                <literal>hibernate</literal>. If the
+                                system is inserted in a docking station,
+                                or if more than one display is connected,
+                                the action specified by
+                                <varname>HandleLidSwitchDocked=</varname>
+                                occurs; otherwise the
+                                <varname>HandleLidSwitch=</varname>
+                                action occurs.</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>


@@ -275,17 +281,17 @@
                                 sleep keys and the lid switch are
                                 subject to inhibitor locks. These
                                 settings take boolean arguments. If
                                 sleep keys and the lid switch are
                                 subject to inhibitor locks. These
                                 settings take boolean arguments. If

-                                <literal>off</literal>, the inhibitor
+                                <literal>no</literal>, the inhibitor

                                 locks taken by applications in order
                                 to block the requested operation are
                                 locks taken by applications in order
                                 to block the requested operation are

-                                respected. If <literal>on</literal>,
+                                respected. If <literal>yes</literal>,

                                 the requested operation is executed in
                                 any
                                 case. <varname>PowerKeyIgnoreInhibited=</varname>,
                                 <varname>SuspendKeyIgnoreInhibited=</varname>
                                 and
                                 <varname>HibernateKeyIgnoreInhibited=</varname>
                                 the requested operation is executed in
                                 any
                                 case. <varname>PowerKeyIgnoreInhibited=</varname>,
                                 <varname>SuspendKeyIgnoreInhibited=</varname>
                                 and
                                 <varname>HibernateKeyIgnoreInhibited=</varname>

-                                default to <literal>off</literal>.
+                                default to <literal>no</literal>.

                                 <varname>LidSwitchIgnoreInhibited=</varname>
                                 defaults to
                                 <literal>yes</literal>. This means
                                 <varname>LidSwitchIgnoreInhibited=</varname>
                                 defaults to
                                 <literal>yes</literal>. This means


@@ -326,7 +332,7 @@
                                 when the user fully logs out. Takes a
                                 boolean argument. If enabled, the user
                                 may not consume IPC resources after
                                 when the user fully logs out. Takes a
                                 boolean argument. If enabled, the user
                                 may not consume IPC resources after

-                                the last of his sessions
+                                the last of the user's sessions

                                 terminated. This covers System V
                                 semaphores, shared memory and message
                                 queues, as well as POSIX shared memory
                                 terminated. This covers System V
                                 semaphores, shared memory and message
                                 queues, as well as POSIX shared memory