diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-02-04 11:05:39 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-02-04 14:32:28 +0100 |
commit | a7a1887869695f16a1114c355c13d731ed7be109 (patch) | |
tree | 82fc8b35d0d38c1401a126b8088441b0b222ec19 /man/standard-conf.xml | |
parent | 3d0112878f7d87c75fb0a988fb73613622169743 (diff) | |
download | systemd-a7a1887869695f16a1114c355c13d731ed7be109.tar.gz |
man: reword the description of "main conf file"
While not really "wrong", the text we had could use a little editing.
Fixes #18458.
Diffstat (limited to 'man/standard-conf.xml')
-rw-r--r-- | man/standard-conf.xml | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/man/standard-conf.xml b/man/standard-conf.xml index 69cd7b0c0f..edb7887b4f 100644 --- a/man/standard-conf.xml +++ b/man/standard-conf.xml @@ -41,33 +41,30 @@ <refsection id='main-conf'> <title>Configuration Directories and Precedence</title> - <para>The default configuration is defined during compilation, so a - configuration file is only needed when it is necessary to deviate - from those defaults. By default, the configuration file in - <filename>/etc/systemd/</filename> contains commented out entries - showing the defaults as a guide to the administrator. This file - can be edited to create local overrides. + <para>The default configuration is set during compilation, so configuration is only needed when it is + necessary to deviate from those defaults. Initially, the main configuration file in + <filename>/etc/systemd/</filename> contains commented out entries showing the defaults as a guide to the + administrator. Local overrides can be created by editing this file or by creating drop-ins, see below. </para> - <para>When packages need to customize the configuration, they can install configuration snippets in - <filename>/usr/lib/systemd/*.conf.d/</filename> or <filename>/usr/local/lib/systemd/*.conf.d/</filename>. - The main configuration file is read before any of the configuration directories, and has the lowest - precedence; entries in a file in any configuration directory override entries in the single configuration - file. Files in the <filename>*.conf.d/</filename> configuration subdirectories are sorted by their - filename in lexicographic order, regardless of in which of the subdirectories they reside. When multiple - files specify the same option, for options which accept just a single value, the entry in the file with - the lexicographically latest name takes precedence. For options which accept a list of values, entries - are collected as they occur in files sorted lexicographically.</para> + <para>In addition to the "main" configuration file, drop-in configuration snippets are read from + <filename>/usr/lib/systemd/*.conf.d/</filename>, <filename>/usr/local/lib/systemd/*.conf.d/</filename>, + and <filename>/etc/systemd/*.conf.d/</filename>. Those drop-ins have higher precedence and override the + main configuration file. Files in the <filename>*.conf.d/</filename> configuration subdirectories are + sorted by their filename in lexicographic order, regardless of in which of the subdirectories they + reside. When multiple files specify the same option, for options which accept just a single value, the + entry in the file sorted last takes precedence, and for options which accept a list of values, entries + are collected as they occur in the sorted files.</para> - <para>Files in <filename>/etc/</filename> are reserved for the local administrator, who may use this - logic to override the configuration files installed by vendor packages. It is recommended to prefix all - filenames in those subdirectories with a two-digit number and a dash, to simplify the ordering of the - files.</para> + <para>When packages need to customize the configuration, they can install drop-ins under + <filename>/usr/</filename>. Files in <filename>/etc/</filename> are reserved for the local administrator, + who may use this logic to override the configuration files installed by vendor packages. Drop-ins have to + be used to override package drop-ins, since the main configuration file has lower precedence. It is + recommended to prefix all filenames in those subdirectories with a two-digit number and a dash, to + simplify the ordering of the files.</para> - <para>To disable a configuration file supplied by the vendor, the - recommended way is to place a symlink to - <filename>/dev/null</filename> in the configuration directory in - <filename>/etc/</filename>, with the same filename as the vendor - configuration file.</para> + <para>To disable a configuration file supplied by the vendor, the recommended way is to place a symlink + to <filename>/dev/null</filename> in the configuration directory in <filename>/etc/</filename>, with the + same filename as the vendor configuration file.</para> </refsection> </refsection> |