man: add references to the new inhibitor lock documentation

diff --git a/TODO b/TODO
index 0496c0608919e444cde258fd69c64437f10e0179..01b5edcd220ebd9a78cfbba41b42153b01e734e7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -25,6 +25,10 @@ Bugfixes:
 
 Features:
 
 
 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
 * support debian's console-setup logic
 
 * introduce Type=pid-file

diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index bea4724787eefd400d92ea4fd89042a099e79222..81ec9ef9ab599a8e2e6d078e7dc486eb801a42ce 100644 (file)
--- 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.</para>
                 to avoid system suspends while an optical disc is
                 being recorded, or similar operations that should not
                 be interrupted.</para>

+
+                <para>For more information see the <ulink
+                url="http://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor
+                Lock Developer Documentation</ulink>.</para>

         </refsect1>
 
         <refsect1>
         </refsect1>
 
         <refsect1>


@@ -103,10 +107,14 @@
                                 <literal>shutdown</literal>,
                                 <literal>sleep</literal>,
                                 <literal>idle</literal>, for
                                 <literal>shutdown</literal>,
                                 <literal>sleep</literal>,
                                 <literal>idle</literal>, for

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

                                 suspending/hibernating, resp. the
                                 suspending/hibernating, resp. the

-                                automatic idle
-                                detection.</para></listitem>
+                                automatic idle detection. If ommitted
+                                defaults to
+                                <literal>idle:sleep:shutdown</literal>,
+                                i.e. takes all possible
+                                locks.</para></listitem>

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


@@ -156,8 +164,6 @@
                                 inhibition locks instead of acquiring
                                 one.</para></listitem>
                         </varlistentry>
                                 inhibition locks instead of acquiring
                                 one.</para></listitem>
                         </varlistentry>

-
-

                 </variablelist>
 
         </refsect1>
                 </variablelist>
 
         </refsect1>


@@ -168,6 +174,18 @@
                 <para>Returns the exit status of the executed program.</para>
         </refsect1>
 
                 <para>Returns the exit status of the executed program.</para>
         </refsect1>
 

+        <refsect1>
+                <title>Example</title>
+
+                <programlisting># systemd-inhibit wodim foobar.iso</programlisting>
+
+                <para>This burns the ISO image
+                <filename>foobar.iso</filename> on a CD using
+                <citerefentry><refentrytitle>wodim</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                and inhibits system sleeping, shutdown and idle while
+                doing so.</para>
+        </refsect1>
+

         <refsect1>
                 <title>See Also</title>
                 <para>
         <refsect1>
                 <title>See Also</title>
                 <para>

diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml
index 05fcde3089e3285180b600012b89568f6c14f687..436c2772c33e28862af4628b57cc3e0cfce989a7 100644 (file)
--- a/man/systemd-logind.service.xml
+++ b/man/systemd-logind.service.xml
@@ -109,9 +109,14 @@
 
                 <para>See the <ulink
                 url="http://www.freedesktop.org/wiki/Software/systemd/logind">
 
                 <para>See the <ulink
                 url="http://www.freedesktop.org/wiki/Software/systemd/logind">

-                developer documentation</ulink> for information about
+                logind D-Bus API Documentation</ulink> for information about

                 the APIs <filename>systemd-logind</filename>
                 provides.</para>
                 the APIs <filename>systemd-logind</filename>
                 provides.</para>

+
+                <para>For more information on the inhibition logic see
+                the <ulink
+                url="http://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor
+                Lock Developer Documentation</ulink>.</para>

         </refsect1>
 
         <refsect1>
         </refsect1>
 
         <refsect1>