dcavalca / rpms / systemd

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