diff --git a/man/systemd.link.xml b/man/systemd.link.xml index 34b56df937a..4650b8f852d 100644 --- a/man/systemd.link.xml +++ b/man/systemd.link.xml @@ -47,9 +47,9 @@ Along with the link file foo.link, a "drop-in" directory foo.link.d/ may exist. All files with the suffix .conf - 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. + 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. In addition to /etc/systemd/network, drop-in .d directories can be placed in /usr/lib/systemd/network or diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index d93ee8bb30c..11442f2b828 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -52,9 +52,9 @@ Along with the netdev file foo.netdev, a "drop-in" directory foo.netdev.d/ may exist. All files with the suffix .conf - 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. + 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. In addition to /etc/systemd/network, drop-in .d directories can be placed in /usr/lib/systemd/network or diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 64bd036e0c8..beddcbe6170 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -51,9 +51,10 @@ Along with the network file foo.network, a "drop-in" directory foo.network.d/ may exist. All files with the suffix - .conf 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. + .conf 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. In addition to /etc/systemd/network, drop-in .d directories can be placed in /usr/lib/systemd/network or diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index b7a5ec0362e..913cad05b4f 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -184,14 +184,16 @@ systemctl1. Along with a unit file foo.service, a "drop-in" directory - foo.service.d/ may exist. All files with the suffix .conf from this - directory will be parsed after the unit file itself is parsed. This is useful to alter or add configuration - settings for a unit, without having to modify unit files. Drop-in files must contain appropriate section - headers. For instantiated units, this logic will first look for the instance .d/ subdirectory - (e.g. foo@bar.service.d/) and read its .conf files, followed by the template - .d/ subdirectory (e.g. foo@.service.d/) and the .conf - files there. Moreover for unit names containing dashes (-), the set of directories generated by - repeatedly truncating the unit name after all dashes is searched too. Specifically, for a unit name + foo.service.d/ may exist. All files with the suffix + .conf from this directory will be merged in the alphanumeric order and parsed + after the main unit file itself has been parsed. This is useful to alter or add configuration + settings for a unit, without having to modify unit files. Each drop-in file must contain appropriate + section headers. For instantiated units, this logic will first look for the instance + .d/ subdirectory (e.g. foo@bar.service.d/) and read its + .conf files, followed by the template .d/ subdirectory (e.g. + foo@.service.d/) and the .conf files there. Moreover for unit + names containing dashes (-), the set of directories generated by repeatedly + truncating the unit name after all dashes is searched too. Specifically, for a unit name foo-bar-baz.service not only the regular drop-in directory foo-bar-baz.service.d/ is searched but also both foo-bar-.service.d/ and foo-.service.d/. This is useful for defining common drop-ins for a set of related units, whose