man: fix description of file order application

This commit is contained in:
Kay Sievers 2013-09-12 04:00:24 +02:00
parent ac4c8d6da8
commit 7b4977254c
Notes: Lennart Poettering 2013-10-04 17:11:46 +02:00
Backport: documentation
4 changed files with 18 additions and 16 deletions

View file

@ -89,9 +89,9 @@
configuration files installed from vendor configuration files installed from vendor
packages. All files are sorted by their filename in packages. All files are sorted by their filename in
alphabetical order, regardless in which of the alphabetical order, regardless in which of the
directories they reside, to guarantee that a specific directories they reside. If multiple files specify
configuration file takes precedence over another file the same binary type name, the entry in the file with
with an alphabetically later name.</para> the alphabetically latest name will be applied.</para>
<para>If the administrator wants to disable a <para>If the administrator wants to disable a
configuration file supplied by the vendor, the configuration file supplied by the vendor, the

View file

@ -90,10 +90,12 @@
configuration files installed by vendor packages. All configuration files installed by vendor packages. All
configuration files are sorted by their filename in configuration files are sorted by their filename in
alphabetical order, regardless in which of the alphabetical order, regardless in which of the
directories they reside, to guarantee that a specific directories they reside. If multiple files specify the
configuration file takes precedence over another file same variable name, the entry in the file with the
with an alphabetically earlier name, if both files alphabetically latest name will be applied. It is
contain the same variable setting.</para> recommended to prefix all filenames with a two-digit
number and a dash, to simplify the ordering of the
files.</para>
<para>If the administrator wants to disable a <para>If the administrator wants to disable a
configuration file supplied by the vendor, the configuration file supplied by the vendor, the

View file

@ -127,12 +127,11 @@
preset files installed by vendor packages. All preset preset files installed by vendor packages. All preset
files are sorted by their filename in alphabetical files are sorted by their filename in alphabetical
order, regardless in which of the directories they order, regardless in which of the directories they
reside, to guarantee that a specific preset file takes reside. If multiple files specify the same unit name,
precedence over another file with an alphabetically the entry in the file with the alphabetically earliest
earlier name, if both files contain lines that apply name will be applied. It is recommended to prefix all
to the same unit names. It is recommended to prefix filenames with a two-digit number and a dash, to simplify
all filenames with two-digit number, to simplify the ordering of the files.</para>
ordering.</para>
<para>If the administrator wants to disable a preset <para>If the administrator wants to disable a preset
file supplied by the vendor, the recommended way is to file supplied by the vendor, the recommended way is to

View file

@ -80,9 +80,10 @@
configuration files installed by vendor packages. All configuration files installed by vendor packages. All
configuration files are sorted by their filename in configuration files are sorted by their filename in
alphabetical order, regardless in which of the alphabetical order, regardless in which of the
directories they reside, to guarantee that a specific directories they reside. If multiple files specify the
configuration file takes precedence over another file same path, the entry in the file with the alphabetically
with an alphabetically later name.</para> earliest name will be applied, all all other conflicting
entries logged as errors.</para>
<para>If the administrator wants to disable a <para>If the administrator wants to disable a
configuration file supplied by the vendor the configuration file supplied by the vendor the