X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Ftmpfiles.d.xml;h=7f4c45c9600c13cdd877e685976104bac307fa46;hb=af65c248040108830a02860a395f44a186f08495;hp=868b57e93517feab6b74c6d2f6ea8629a24f2269;hpb=522d4a495af3a615526fccdf038d2d68f41a73c8;p=elogind.git

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 868b57e93..7f4c45c96 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -47,32 +47,47 @@
         </refnamediv>
 
         <refsynopsisdiv>
+                <para><filename>/usr/lib/tmpfiles.d/*.conf</filename></para>
                 <para><filename>/etc/tmpfiles.d/*.conf</filename></para>
+                <para><filename>/run/tmpfiles.d/*.conf</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
                 <title>Description</title>
 
 		<para><command>systemd-tmpfiles</command> uses the
-		configuration files in
-		<filename>/etc/tmpfiles.d/</filename> to describe the
+		configuration files from the above directories to describe the
 		creation, cleaning and removal of volatile and
 		temporary files and directories which usually reside
-		in directories such as <filename>/var/run</filename>
-		or <filename>/tmp</filename>. Each configuration file
-		is named in the style of
-		<filename>/etc/tmpfiles.d/&lt;program&gt;.conf</filename>.</para>
+		in directories such as <filename>/run</filename>
+		or <filename>/tmp</filename>.</para>
         </refsect1>
 
         <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> overwrite
+                files with the same name in <filename>/usr/lib/</filename>.
+                Files in <filename>/run</filename> overwrite 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 <filename>/etc/</filename> are reserved for the local
+                administration, which possibly decides to overwrite the
+                configurations installed from packages. All files are sorted
+                by filename in alphabetical order, regardless in which of the
+                directories they reside, to ensure that a specific
+                configuration file takes precedence over another file with
+                an alphabetically later name.</para>
+
 		<para>The configuration format is one line per path
 		containing action, mode, ownership and age
 		fields:</para>
 
                 <programlisting>Type Path          Mode UID  GID  Age
-d    /var/run/user 0755 root root 10d</programlisting>
+d    /run/user 0755 root root 10d</programlisting>
 
                 <refsect2>
                         <title>Type</title>
@@ -97,6 +112,11 @@ d    /var/run/user 0755 root root 10d</programlisting>
                                         <listitem><para>Create or empty a directory</para></listitem>
                                 </varlistentry>
 
+                                <varlistentry>
+                                        <term><varname>p</varname></term>
+                                        <listitem><para>Create a named pipe (FIFO) if it doesn't exist yet</para></listitem>
+                                </varlistentry>
+
                                 <varlistentry>
                                         <term><varname>x</varname></term>
                                         <listitem><para>Ignore a path
@@ -181,10 +201,12 @@ d    /var/run/user 0755 root root 10d</programlisting>
                                 <term><varname>us</varname></term></varlistentry>
                         </variablelist>
 
-                        <para>If multiple integers and units are specified the time values are summed up.</para>
-
-                        <para>The age field only applies to lines starting with d, D and x. If omitted or set to - no automatic clean-up is done.</para>
+                        <para>If multiple integers and units are specified the time
+                        values are summed up.</para>
 
+                        <para>The age field only applies to lines starting with
+                        d, D and x. If omitted or set to - no automatic clean-up
+                        is done.</para>
                 </refsect2>
 
         </refsect1>