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