summaryrefslogtreecommitdiffstats
path: root/man/systemd.link.xml
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2021-05-20 08:55:06 +0200
committerLennart Poettering <lennart@poettering.net>2021-05-20 21:20:51 +0200
commite6655fbe40a9774c8250c1ae8e1c1677aadb98a6 (patch)
treef37712f10cd587c43480ed1d52c31c0b51e7c54d /man/systemd.link.xml
parentMerge pull request #19669 from mrc0mmand/ci-mkosi-arch (diff)
downloadsystemd-e6655fbe40a9774c8250c1ae8e1c1677aadb98a6.tar.xz
systemd-e6655fbe40a9774c8250c1ae8e1c1677aadb98a6.zip
man: mention that drop-in files are merged in alphanumeric order
This addresses the request in https://github.com/systemd/systemd/issues/19467#issuecomment-829332877.
Diffstat (limited to 'man/systemd.link.xml')
-rw-r--r--man/systemd.link.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 34b56df937..4650b8f852 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -47,9 +47,9 @@
<para>Along with the link file <filename>foo.link</filename>, a "drop-in" directory
<filename>foo.link.d/</filename> may exist. All files with the suffix <literal>.conf</literal>
- from this directory will be parsed after the file itself is parsed. This is useful to alter or add
- configuration settings, without having to modify the main configuration file. Each drop-in file
- must have appropriate section headers.</para>
+ from this directory will be merged in the alphanumeric order and parsed after the main file itself
+ has been parsed. This is useful to alter or add configuration settings, without having to modify
+ the main configuration file. Each drop-in file must have appropriate section headers.</para>
<para>In addition to <filename>/etc/systemd/network</filename>, drop-in <literal>.d</literal>
directories can be placed in <filename>/usr/lib/systemd/network</filename> or