diff --git a/TODO b/TODO
index 0496c06089..01b5edcd22 100644
--- a/TODO
+++ b/TODO
@@ -25,6 +25,10 @@ Bugfixes:
Features:
+* logind: export a bool property that tells user whether a
+ suspend/shutdown is currently scheduled, i.e. where are between
+ PrepareForSuspend(true) and PrepareForSuspend(false)
+
* support debian's console-setup logic
* introduce Type=pid-file
diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index bea4724787..81ec9ef9ab 100644
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -71,6 +71,10 @@
to avoid system suspends while an optical disc is
being recorded, or similar operations that should not
be interrupted.
+
+ For more information see the Inhibitor
+ Lock Developer Documentation.
@@ -103,10 +107,14 @@
shutdown,
sleep,
idle, for
- inhibiting reboot/power-off/halt/kexec,
+ inhibiting
+ reboot/power-off/halt/kexec,
suspending/hibernating, resp. the
- automatic idle
- detection.
+ automatic idle detection. If ommitted
+ defaults to
+ idle:sleep:shutdown,
+ i.e. takes all possible
+ locks.
@@ -156,8 +164,6 @@
inhibition locks instead of acquiring
one.
-
-
@@ -168,6 +174,18 @@
Returns the exit status of the executed program.
+
+ Example
+
+ # systemd-inhibit wodim foobar.iso
+
+ This burns the ISO image
+ foobar.iso on a CD using
+ wodim1,
+ and inhibits system sleeping, shutdown and idle while
+ doing so.
+
+
See Also
diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml
index 05fcde3089..436c2772c3 100644
--- a/man/systemd-logind.service.xml
+++ b/man/systemd-logind.service.xml
@@ -109,9 +109,14 @@
See the
- developer documentation for information about
+ logind D-Bus API Documentation for information about
the APIs systemd-logind
provides.
+
+ For more information on the inhibition logic see
+ the Inhibitor
+ Lock Developer Documentation.