hwdb: update pci data

[elogind.git] / man / systemd-inhibit.xml

diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index 81ec9ef9ab599a8e2e6d078e7dc486eb801a42ce..6f63c8c73e5d0e145fa0a509f3b391ce6d99e101 100644 (file)
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -106,15 +106,19 @@
                                 operations to inhibit:
                                 <literal>shutdown</literal>,
                                 <literal>sleep</literal>,
                                 operations to inhibit:
                                 <literal>shutdown</literal>,
                                 <literal>sleep</literal>,

-                                <literal>idle</literal>, for
-                                inhibiting
+                                <literal>idle</literal>,
+                                <literal>handle-power-key</literal>,
+                                <literal>handle-suspend-key</literal>,
+                                <literal>handle-hibernate-key</literal>,
+                                <literal>handle-lid-switch</literal>,
+                                for inhibiting

                                 reboot/power-off/halt/kexec,
                                 reboot/power-off/halt/kexec,

-                                suspending/hibernating, resp. the
-                                automatic idle detection. If ommitted
+                                suspending/hibernating, the automatic
+                                idle detection, or the low-level
+                                handling of the power/sleep key and
+                                the lid switch, respectively. If omitted,

                                 defaults to
                                 defaults to

-                                <literal>idle:sleep:shutdown</literal>,
-                                i.e. takes all possible
-                                locks.</para></listitem>
+                                <literal>idle:sleep:shutdown</literal>.</para></listitem>

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


@@ -154,7 +158,11 @@
                                 time elapses the lock is ignored and
                                 the operation executed. The time limit
                                 may be specified in
                                 time elapses the lock is ignored and
                                 the operation executed. The time limit
                                 may be specified in

-                                <citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
+                                <citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Note
+                                that <literal>delay</literal> is only
+                                available for <literal>sleep</literal>
+                                and
+                                <literal>shutdown</literal>.</para></listitem>

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