From: Lucas Werkmeister <mail@lucaswerkmeister.de>
Date: Tue, 7 Feb 2017 23:58:02 +0000 (+0100)
Subject: man: document *.d/ drop-in file order (#5262)
X-Git-Tag: v233~149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8331eaabc7093a879914494e6b397f5a28f3cac9;p=thirdparty%2Fsystemd.git

man: document *.d/ drop-in file order (#5262)
---

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index dbb0dc7bd7a..eb00a2e88e5 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -203,7 +203,8 @@
     <filename>/run/systemd/system</filename> directories. Drop-in files in <filename>/etc</filename>
     take precedence over those in <filename>/run</filename> which in turn take precedence over those
     in <filename>/usr/lib</filename>. Drop-in files under any of these directories take precedence
-    over unit files wherever located.</para>
+    over unit files wherever located. Multiple drop-in files with different names are applied in
+    lexicographic order, regardless of which of the directories they reside in.</para>
 
     <!-- Note that we do not document .include here, as we consider it mostly obsolete, and want
          people to use .d/ drop-ins instead. -->
@@ -1343,7 +1344,7 @@ ExecStart=/usr/sbin/foo-daemon
       file <filename><replaceable>name</replaceable>.conf</filename>
       there that only changes the specific settings one is interested
       in. Note that multiple such drop-in files are read if
-      present.</para>
+      present, processed in lexicographic order of their filename.</para>
 
       <para>The advantage of the first method is that one easily
       overrides the complete unit, the vendor unit is not parsed at