daandemeyer / rpms / systemd

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