X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-inhibit.xml;h=de2f264147e4d4888e721c8ee21685181eee2902;hp=e19892b3f10b47a27173e06e1efc9cbc9c95891e;hb=86198b2788e56fd05959c2dce670d1646bf99bcd;hpb=49f43d5f91a99b23f745726aa351d8f159774357

diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index e19892b3f..de2f26414 100644
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -101,28 +101,32 @@
                         <varlistentry>
                                 <term><option>--what=</option></term>
 
-                                <listitem><para>Takes a colon
-                                separated list of one or more
+                                <listitem><para>Takes a colon-separated
+                                list of one or more
                                 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,
-                                suspending/hibernating, resp. the
-                                automatic idle detection. If omitted
+                                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
-                                <literal>idle:sleep:shutdown</literal>,
-                                i.e. takes all possible
-                                locks.</para></listitem>
+                                <literal>idle:sleep:shutdown</literal>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 <term><option>--who=</option></term>
 
-                                <listitem><para>Takes a short human
-                                readable descriptive string for the
-                                program taking the lock. If not passed
+                                <listitem><para>Takes a short,
+                                human-readable descriptive string for the
+                                program taking the lock. If not passed,
                                 defaults to the command line
                                 string.</para></listitem>
                         </varlistentry>
@@ -130,8 +134,8 @@
                         <varlistentry>
                                 <term><option>--why=</option></term>
 
-                                <listitem><para>Takes a short human
-                                readable descriptive string for the
+                                <listitem><para>Takes a short,
+                                human-readable descriptive string for the
                                 reason for taking the lock. Defaults
                                 to "Unknown reason".</para></listitem>
                         </varlistentry>
@@ -151,10 +155,14 @@
                                 <literal>delay</literal> is used, the
                                 lock can only delay the requested
                                 operations for a limited time. If the
-                                time elapses the lock is ignored and
+                                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>