naccyde / rpms / systemd

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