X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Ftmpfiles.d.xml;h=cdc87c91922905b9018ba308f0b5d5847a15e892;hb=6e1452d6f015ebca6801e497d12bc6c7c114386d;hp=025c8018d94b3dd3b97a46583ada85051bf95e52;hpb=6b4991cfde6c0a0b62e836ca75ae362779c474d4;p=elogind.git

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 025c8018d..cdc87c919 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -79,13 +79,14 @@
                 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 specific
-                configuration file takes precedence over another file
-                with an alphabetically later name.</para>
+                lexicographic order, regardless in which of the
+                directories they reside. If multiple files specify the
+                same path, the entry in the file with the lexicographically
+                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
+                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
@@ -237,10 +238,10 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
 
                         <para>The file access mode to use when
                         creating this file or directory. If omitted or
-                        when set to - the default is used: 0755 for
+                        when set to -, the default is used: 0755 for
                         directories, 0644 for all other file
-                        objects. For z, Z lines if omitted or when set
-                        to - the file access mode will not be
+                        objects. For z, Z lines, if omitted or when set
+                        to -, the file access mode will not be
                         modified. This parameter is ignored for x, r,
                         R, L lines.</para>
                 </refsect2>
@@ -251,8 +252,8 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                         <para>The user and group to use for this file
                         or directory. This may either be a numeric
                         user/group ID or a user or group name. If
-                        omitted or when set to - the default 0 (root)
-                        is used. For z, Z lines when omitted or when set to -
+                        omitted or when set to -, the default 0 (root)
+                        is used. For z, Z lines, when omitted or when set to -,
                         the file ownership will not be modified.
                         These parameters are ignored for x, r, R, L lines.</para>
                 </refsect2>
@@ -262,7 +263,7 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                         <para>The date field, when set, is used to
                         decide what files to delete when cleaning. If
                         a file or directory is older than the current
-                        time minus the age field it is deleted. The
+                        time minus the age field, it is deleted. The
                         field format is a series of integers each
                         followed by one of the following
                         postfixes for the respective time units:</para>
@@ -279,7 +280,7 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                                 <term><varname>us</varname></term></varlistentry>
                         </variablelist>
 
-                        <para>If multiple integers and units are specified the time
+                        <para>If multiple integers and units are specified, the time
                         values are summed up. If an integer is given without a unit,
                         s is assumed.
                         </para>
@@ -288,11 +289,11 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                         unconditionally.</para>
 
                         <para>The age field only applies to lines starting with
-                        d, D and x. If omitted or set to - no automatic clean-up
+                        d, D and x. If omitted or set to -, no automatic clean-up
                         is done.</para>
 
                         <para>If the age field starts with a tilde
-                        character (~) the clean-up is only applied to
+                        character (~), the clean-up is only applied to
                         files and directories one level inside the
                         directory specified, but not the files and
                         directories immediately inside it.</para>
@@ -322,6 +323,13 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                         <programlisting>d /var/run/screens  1777 root root 10d
 d /var/run/uscreens 0755 root root 10d12h</programlisting>
                 </example>
+                <example>
+                        <title>/etc/tmpfiles.d/abrt.conf example</title>
+                        <para><command>abrt</command> needs a directory created at boot with specific mode and ownership and its content should be preserved.</para>
+
+                        <programlisting>d /var/tmp/abrt 0755 abrt abrt
+x /var/tmp/abrt/*</programlisting>
+                </example>
         </refsect1>
 
         <refsect1>