|
 |
4f94566 |
From d85784d471679c86cf9cc99da7a9a9604d809112 Mon Sep 17 00:00:00 2001
|
|
|
4f94566 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
4f94566 |
Date: Tue, 11 Mar 2014 05:23:39 +0100
|
|
|
4f94566 |
Subject: [PATCH] man: multiple sleep modes are to be separated by whitespace,
|
|
|
4f94566 |
not commas
|
|
|
4f94566 |
|
|
|
4f94566 |
As pointed out by Jason A. Donenfeld.
|
|
|
4f94566 |
|
|
|
4f94566 |
(cherry picked from commit 252094eb05c58270a0bc35b14ad30a126ddbb3bb)
|
|
|
4f94566 |
(cherry picked from commit 608b982e50ab0efa67c4b1762823d95fc881ac84)
|
|
|
4f94566 |
|
|
|
4f94566 |
Conflicts:
|
|
|
4f94566 |
man/systemd-sleep.conf.xml
|
|
|
4f94566 |
---
|
|
|
4f94566 |
man/systemd-sleep.conf.xml | 8 ++++----
|
|
|
4f94566 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
4f94566 |
|
|
|
4f94566 |
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
|
|
|
4f94566 |
index 4622205..04f3b06 100644
|
|
|
4f94566 |
--- a/man/systemd-sleep.conf.xml
|
|
|
4f94566 |
+++ b/man/systemd-sleep.conf.xml
|
|
|
4f94566 |
@@ -127,8 +127,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
4f94566 |
<citerefentry><refentrytitle>systemd-suspend.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
|
|
4f94566 |
<citerefentry><refentrytitle>systemd-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, or
|
|
|
4f94566 |
<citerefentry><refentrytitle>systemd-hybrid-sleep.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
|
|
|
4f94566 |
- More than one value can be specified by seperating
|
|
|
4f94566 |
- multiple values with commas. They will be tried
|
|
|
4f94566 |
+ More than one value can be specified by separating
|
|
|
4f94566 |
+ multiple values with whitespace. They will be tried
|
|
|
4f94566 |
in turn, until one is written without error. If
|
|
|
4f94566 |
neither suceeds, the operation will be aborted.
|
|
|
4f94566 |
</para></listitem>
|
|
|
4f94566 |
@@ -145,8 +145,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
4f94566 |
<citerefentry><refentrytitle>systemd-suspend.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
|
|
4f94566 |
<citerefentry><refentrytitle>systemd-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, or
|
|
|
4f94566 |
<citerefentry><refentrytitle>systemd-hybrid-sleep.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
|
|
|
4f94566 |
- More than one value can be specified by seperating
|
|
|
4f94566 |
- multiple values with commas. They will be tried
|
|
|
4f94566 |
+ More than one value can be specified by separating
|
|
|
4f94566 |
+ multiple values with whitespace. They will be tried
|
|
|
4f94566 |
in turn, until one is written without error. If
|
|
|
4f94566 |
neither suceeds, the operation will be aborted.
|
|
|
4f94566 |
</para></listitem>
|