X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Ftmpfiles.d.xml;h=1b14d69a91dfceee88c0fdd74b50686f653f3cfa;hp=65716c305d835aee44980670b633a3ece3d456d0;hb=80877656a557231f8187f7bc371fd4cb3b70de5a;hpb=8d0e0ddda6501479eb69164687c83c1a7667b33a

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 65716c305..1b14d69a9 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -108,8 +108,8 @@
                 filename in lexicographic order, regardless of which
                 of the directories they reside in. 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 will be logged as
+                lexicographically earliest name will be applied.
+                All other conflicting entries will be logged as
                 errors. When two lines are prefix and suffix of each
                 other, then the prefix is always processed first, the
                 suffix later. Otherwise, the files/directories are
@@ -210,7 +210,12 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                                         device node is to be created,
                                         it will be removed and be
                                         replaced by the device
-                                        node.</para></listitem>
+                                        node. It is recommended to suffix this
+                                        entry with an exclamation mark to only
+                                        create static device nodes at boot,
+                                        as udev will not manage static device
+                                        nodes that are created at runtime.
+                                        </para></listitem>
                                 </varlistentry>
 
                                 <varlistentry>
@@ -224,7 +229,12 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                                         device node is to be created,
                                         it will be removed and be
                                         replaced by the device
-                                        node.</para></listitem>
+                                        node. It is recommended to suffix this
+                                        entry with an exclamation mark to only
+                                        create static device nodes at boot,
+                                        as udev will not manage static device
+                                        nodes that are created at runtime.
+                                        </para></listitem>
                                 </varlistentry>
 
                                 <varlistentry>
@@ -433,7 +443,7 @@ r! /tmp/.X[0-9]*-lock</programlisting>
                         be removed from the new access mode too, and
                         if all write bits are removed, they will be
                         removed from the new access mode too. In
-                        addition, the sticky/suid/gid bit is removed unless
+                        addition, the sticky/SUID/SGID bit is removed unless
                         applied to a directory. This
                         functionality is particularly useful in
                         conjunction with <varname>Z</varname>.</para>