summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2013-09-12 04:00:24 +0200
committerKay Sievers <kay@vrfy.org>2013-09-12 04:01:20 +0200
commit7b4977254cdc1203b44211e00cdb3a0c318cfcf2 (patch)
treeb5e24ea79f215e09402d31529a16b63a9fab0aad
parentac4c8d6da8b5ebc35f02c9c6cb7595be7b134a05 (diff)
man: fix description of file order application
-rw-r--r--man/binfmt.d.xml6
-rw-r--r--man/sysctl.d.xml10
-rw-r--r--man/systemd.preset.xml11
-rw-r--r--man/tmpfiles.d.xml7
4 files changed, 18 insertions, 16 deletions
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index f4f4195b04..165a8a97b1 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -89,9 +89,9 @@
configuration files installed from vendor
packages. All files are sorted by their filename in
alphabetical order, regardless in which of the
- directories they reside, to guarantee that a specific
- configuration file takes precedence over another file
- with an alphabetically later name.</para>
+ directories they reside. If multiple files specify
+ the same binary type name, the entry in the file with
+ the alphabetically latest name will be applied.</para>
<para>If the administrator wants to disable a
configuration file supplied by the vendor, the
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index ce5c34f9a2..155427cecf 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -90,10 +90,12 @@
configuration files installed by vendor packages. All
configuration files are sorted by their filename in
alphabetical order, regardless in which of the
- directories they reside, to guarantee that a specific
- configuration file takes precedence over another file
- with an alphabetically earlier name, if both files
- contain the same variable setting.</para>
+ directories they reside. If multiple files specify the
+ same variable name, the entry in the file with the
+ alphabetically latest name will be applied. It is
+ 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
configuration file supplied by the vendor, the
diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
index 1ba9272398..8af7d4058d 100644
--- a/man/systemd.preset.xml
+++ b/man/systemd.preset.xml
@@ -127,12 +127,11 @@
preset files installed by vendor packages. All preset
files are sorted by their filename in alphabetical
order, regardless in which of the directories they
- reside, to guarantee that a specific preset file takes
- precedence over another file with an alphabetically
- earlier name, if both files contain lines that apply
- to the same unit names. It is recommended to prefix
- all filenames with two-digit number, to simplify
- ordering.</para>
+ reside. If multiple files specify the same unit name,
+ the entry in the file with the alphabetically earliest
+ name will be applied. It is 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 preset
file supplied by the vendor, the recommended way is to
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 58ac995a18..2872cc0add 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -80,9 +80,10 @@
configuration files installed by vendor packages. All
configuration files are sorted by their filename in
alphabetical order, regardless in which of the
- directories they reside, to guarantee that a specific
- configuration file takes precedence over another file
- with an alphabetically later name.</para>
+ directories they reside. If multiple files specify the
+ same path, the entry in the file with the alphabetically
+ earliest name will be applied, all all other conflicting
+ entries logged as errors.</para>
<para>If the administrator wants to disable a
configuration file supplied by the vendor the