chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: introduce a macro to format message id
[elogind.git]
/
man
/
systemd-inhibit.xml
diff --git
a/man/systemd-inhibit.xml
b/man/systemd-inhibit.xml
index e19892b3f10b47a27173e06e1efc9cbc9c95891e..1218836cb284ebb9e292dbfad9e4d4bf8b588025 100644
(file)
--- a/
man/systemd-inhibit.xml
+++ b/
man/systemd-inhibit.xml
@@
-106,15
+106,18
@@
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 omitted
- defaults to
- <literal>idle:sleep:shutdown</literal>,
- i.e. takes all possible
- locks.</para></listitem>
+ suspending/hibernating, the automatic
+ idle detection, resp. the low-level
+ handling of the power/sleep key and
+ the lid switch. If omitted defaults to
+ <literal>idle:sleep:shutdown</literal>.</para></listitem>
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>
@@
-154,7
+157,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 or <literal>sleep</literal>
+ and
+ <literal>shutdown</literal>.</para></listitem>
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>