|
 |
84b277 |
From ccbe3369a69af38dbf8fdf3a0a1b27ba534506ea Mon Sep 17 00:00:00 2001
|
|
|
84b277 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
84b277 |
Date: Tue, 11 Mar 2014 05:23:39 +0100
|
|
|
84b277 |
Subject: [PATCH] man: multiple sleep modes are to be separated by whitespace,
|
|
|
84b277 |
not commas
|
|
|
84b277 |
|
|
|
84b277 |
As pointed out by Jason A. Donenfeld.
|
|
|
84b277 |
|
|
|
84b277 |
Conflicts:
|
|
|
84b277 |
man/systemd-sleep.conf.xml
|
|
|
84b277 |
|
|
|
84b277 |
(cherry-picked from 252094eb05c58270a0bc35b14ad30a126ddbb3bb)
|
|
|
84b277 |
|
|
|
84b277 |
Resolves: #1147524
|
|
|
84b277 |
---
|
|
|
84b277 |
man/systemd-sleep.conf.xml | 18 ++++++++----------
|
|
|
84b277 |
1 file changed, 8 insertions(+), 10 deletions(-)
|
|
|
84b277 |
|
|
|
84b277 |
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
|
|
|
84b277 |
index dc4b0da..d0ea6d8 100644
|
|
|
84b277 |
--- a/man/systemd-sleep.conf.xml
|
|
|
84b277 |
+++ b/man/systemd-sleep.conf.xml
|
|
|
84b277 |
@@ -127,10 +127,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
84b277 |
<citerefentry><refentrytitle>systemd-suspend.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
|
|
84b277 |
<citerefentry><refentrytitle>systemd-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, or
|
|
|
84b277 |
<citerefentry><refentrytitle>systemd-hybrid-sleep.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
|
|
|
84b277 |
- More than one value can be specified by seperating
|
|
|
84b277 |
- multiple values with commas. They will be tried
|
|
|
84b277 |
+ More than one value can be specified by separating
|
|
|
84b277 |
+ multiple values with whitespace. They will be tried
|
|
|
84b277 |
in turn, until one is written without error. If
|
|
|
84b277 |
- neither suceeds, the operation will be aborted.
|
|
|
84b277 |
+ neither succeeds, the operation will be aborted.
|
|
|
84b277 |
</para></listitem>
|
|
|
84b277 |
</varlistentry>
|
|
|
84b277 |
|
|
|
84b277 |
@@ -145,10 +145,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
84b277 |
<citerefentry><refentrytitle>systemd-suspend.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
|
|
84b277 |
<citerefentry><refentrytitle>systemd-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, or
|
|
|
84b277 |
<citerefentry><refentrytitle>systemd-hybrid-sleep.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
|
|
|
84b277 |
- More than one value can be specified by seperating
|
|
|
84b277 |
- multiple values with commas. They will be tried
|
|
|
84b277 |
+ More than one value can be specified by separating
|
|
|
84b277 |
+ multiple values with whitespace. They will be tried
|
|
|
84b277 |
in turn, until one is written without error. If
|
|
|
84b277 |
- neither suceeds, the operation will be aborted.
|
|
|
84b277 |
+ neither succeeds, the operation will be aborted.
|
|
|
84b277 |
</para></listitem>
|
|
|
84b277 |
</varlistentry>
|
|
|
84b277 |
</variablelist>
|
|
|
84b277 |
@@ -160,10 +160,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
84b277 |
<para>Example: to exploit the <quote>freeze</quote> mode added
|
|
|
84b277 |
in Linux 3.9, one can use <command>systemctl suspend</command>
|
|
|
84b277 |
with
|
|
|
84b277 |
- <programlisting>
|
|
|
84b277 |
-[Sleep]
|
|
|
84b277 |
-SuspendState=freeze
|
|
|
84b277 |
- </programlisting></para>
|
|
|
84b277 |
+ <programlisting>[Sleep]
|
|
|
84b277 |
+SuspendState=freeze</programlisting></para>
|
|
|
84b277 |
</refsect1>
|
|
|
84b277 |
|
|
|
84b277 |
<refsect1>
|