[systemd-commits] man/binfmt.d.xml man/sysctl.d.xml man/systemd.preset.xml man/tmpfiles.d.xml

[Kay Sievers]

 man/binfmt.d.xml       |    6 +++---
 man/sysctl.d.xml       |   10 ++++++----
 man/systemd.preset.xml |   11 +++++------
 man/tmpfiles.d.xml     |    7 ++++---
 4 files changed, 18 insertions(+), 16 deletions(-)

New commits:
commit 7b4977254cdc1203b44211e00cdb3a0c318cfcf2
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Sep 12 04:00:24 2013 +0200

    man: fix description of file order application

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index f4f4195..165a8a9 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 ce5c34f..155427c 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 1ba9272..8af7d40 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 58ac995..2872cc0 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