naccyde / rpms / systemd

Forked from rpms/systemd a year ago
Clone
923a60
From 682a699e71147673f8de5fa12dbec8f2a4c28d9c Mon Sep 17 00:00:00 2001
923a60
From: David Herrmann <dh.herrmann@gmail.com>
923a60
Date: Thu, 12 Mar 2015 12:46:46 +0100
923a60
Subject: [PATCH] man: split paragraph
923a60
923a60
Explicitly put the "multiple EnvironmentFile=" description into its own
923a60
paragraph to make it much easier to find.
923a60
923a60
(cherry picked from commit f407824d751a9cb31abfdf0343fe179e0efef259)
923a60
---
923a60
 man/systemd.exec.xml | 4 +++-
923a60
 1 file changed, 3 insertions(+), 1 deletion(-)
923a60
923a60
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
923a60
index 11b160e58f..fdb1578641 100644
923a60
--- a/man/systemd.exec.xml
923a60
+++ b/man/systemd.exec.xml
923a60
@@ -283,7 +283,9 @@
923a60
         shortly before the process is executed (more specifically,
923a60
         after all processes from a previous unit state terminated.
923a60
         This means you can generate these files in one unit state, and
923a60
-        read it with this option in the next). Settings from these
923a60
+        read it with this option in the next).</para>
923a60
+
923a60
+        <para>Settings from these
923a60
         files override settings made with
923a60
         <varname>Environment=</varname>. If the same variable is set
923a60
         twice from these files, the files will be read in the order