From cdbf5606c3e8ab73c4ecc125feed473aad0df18c Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Sun, 10 Jun 2012 18:26:11 +0200
Subject: [PATCH] man: systemd-tmpfiles - document proper config-file-stack
 order (cherry picked from commit
 6110885c2c4b7c576ac5819af5416ec54200d8e3)

---
 man/sysctl.d.xml         |    2 +-
 man/systemd-tmpfiles.xml |   17 ++++++++---------
 man/tmpfiles.d.xml       |   36 +++++++++++++++++++++---------------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index f6dd52f..9423971 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -81,7 +81,7 @@
                 Files in <filename>/etc/</filename> override files
                 with the same name in <filename>/usr/lib/</filename>
                 and <filename>/run/</filename>.  Files in
-                <filename>/run</filename> override files with the same
+                <filename>/run/</filename> override files with the same
                 name in <filename>/usr/lib/</filename>. Packages
                 should install their configuration files in
                 <filename>/usr/lib/</filename>. Files in
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index bbb80b2..218840e 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -59,14 +59,14 @@
 
                 <para><command>systemd-tmpfiles</command> creates,
                 deletes and cleans up volatile and temporary files and
-                directories, based on the configuration from
-                <filename>/etc/tmpfiles.d/</filename>. See
-                <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                for more details on these files.</para>
-
-                <para>If invoked with no arguments applies all
-                directives from all configuration files in
-                <filename>/etc/tmpfiles.d/*.conf</filename>. If one or
+                directories, based on the configuration file format and
+                location specified in <citerefentry>
+                        <refentrytitle>tmpfiles.d</refentrytitle>
+                        <manvolnum>5</manvolnum>
+                </citerefentry>.</para>
+
+                <para>If invoked with no arguments, it applies all
+                directives from all configuration files. If one or
                 more absolute file names are passed on the command
                 line only the directives in these files are
                 applied.</para>
@@ -145,7 +145,6 @@
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>tmpwatch</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 </para>
         </refsect1>
 
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index f70bf0e..0cf15ed 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -66,24 +66,30 @@
         <refsect1>
 		<title>Configuration Format</title>
 
-                <para>Each configuration file is named in the style of
-                <filename>&lt;program&gt;.conf</filename>.  Files in
-                <filename>/etc/</filename> override files with the
-                same name in <filename>/usr/lib/</filename>.  Files in
-                <filename>/run</filename> override files with the same
-                name in <filename>/etc/</filename> and
-                <filename>/usr/lib/</filename>. Packages should
-                install their configuration files in
-                <filename>/usr/lib/</filename>, files in
+                <para>Each configuration file shall be named in the
+                style of <filename>&lt;program&gt;.conf</filename>.
+                Files in <filename>/etc/</filename> override files
+                with the same name in <filename>/usr/lib/</filename>
+                and <filename>/run/</filename>.  Files in
+                <filename>/run/</filename> override files with the same
+                name in <filename>/usr/lib/</filename>. Packages
+                should install their configuration files in
+                <filename>/usr/lib/</filename>. Files in
                 <filename>/etc/</filename> are reserved for the local
-                administrator, who may choose to override the
-                configurations installed from packages. The list of
+                administrator, who may use this logic to override the
+                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
-                configuration file takes precedence over another
-                configuration file with an alphabetically later
-                name.</para>
+                directories they reside, to guarantee that a specific
+                configuration file takes precedence over another file
+                with an alphabetically later name</para>
+
+                <para>If the administrator wants to disable a
+                configuration file supplied by the vendor the
+                recommended way is to place a symlink to
+                <filename>/dev/null</filename> in
+                <filename>/etc/tmpfiles.d/</filename> bearing the
+                same file name.</para>
 
 		<para>The configuration format is one line per path
 		containing action, path, mode, ownership, age and argument