From 4943c1c94ba751c98763f4232b4350481b22c90a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 5 May 2012 00:46:31 +0200
Subject: logind: use "sleep" as generic term for "suspend", "hibernate", and
 later on "hybrid suspend"

---
 man/logind.conf.xml     | 11 ++++++-----
 man/systemd-inhibit.xml |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'man')

diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index deca1cdd7f..166038b383 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -151,11 +151,12 @@
                                 <term><varname>InhibitDelayMaxSec=</varname></term>
 
                                 <listitem><para>Specifies the maximum
-                                time a suspend or reboot is delayed
-                                due to an inhibitor lock of type
-                                <literal>delay</literal> being taken
-                                before it is ignored and the operation
-                                executed anyway. Defaults to
+                                time a system shutdown or sleep
+                                request is delayed due to an inhibitor
+                                lock of type <literal>delay</literal>
+                                being taken before it is ignored and
+                                the operation executed
+                                anyway. Defaults to
                                 5s.</para></listitem>
 
                         </varlistentry>
diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index 34095902c2..c71a954428 100644
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -60,14 +60,14 @@
                 <title>Description</title>
 
                 <para><command>systemd-inhibit</command> may be used
-                to execute a program with a shutdown, suspend or idle
+                to execute a program with a shutdown, sleep or idle
                 inhibitor lock taken. The lock will be acquired before
                 the specified command line is executed and released
                 afterwards.</para>
 
                 <para>Inhibitor locks may be used to block or delay
-                suspend and shutdown requests from the user, as well
-                as automatic idle handling of the OS. This may be used
+                system sleep and shutdown requests from the user, as well
+                as automatic idle handling of the OS. This is useful
                 to avoid system suspends while an optical disc is
                 being recorded, or similar operations that should not
                 be interrupted.</para>
@@ -101,7 +101,7 @@
                                 separated list of one or more
                                 operations to inhibit:
                                 <literal>shutdown</literal>,
-                                <literal>suspend</literal>,
+                                <literal>sleep</literal>,
                                 <literal>idle</literal>, for
                                 inhibiting reboot/power-off/halt/kexec,
                                 suspending/hibernating, resp. the
-- 
cgit v1.2.3-54-g00ecf