pam_systemd: do not set XDG_RUNTIME_DIR if the session's original user is not the...

[elogind.git] / man / sysctl.d.xml

diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 0ef5545163bd49c3ec16ebd2482b101df7ebd00b..854864cffcb86c695b70c1904a63775f587830f3 100644 (file)
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -77,7 +77,7 @@
                 entirely equivalent.</para>
 
                 <para>Each configuration file shall be named in the
                 entirely equivalent.</para>
 
                 <para>Each configuration file shall be named in the

-                style of <filename>&lt;program&gt;.conf</filename>.
+                style of <filename><replaceable>program</replaceable>.conf</filename>.

                 Files in <filename>/etc/</filename> override files
                 with the same name in <filename>/usr/lib/</filename>
                 and <filename>/run/</filename>.  Files in
                 Files in <filename>/etc/</filename> override files
                 with the same name in <filename>/usr/lib/</filename>
                 and <filename>/run/</filename>.  Files in


@@ -89,18 +89,20 @@
                 administrator, who may use this logic to override the
                 configuration files installed by vendor packages. All
                 configuration files are sorted by their filename in
                 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, if both files
-                contain the same variable setting.</para>
+                lexicographic order, regardless in which of the
+                directories they reside. If multiple files specify the
+                same variable name, the entry in the file with the
+                lexicographically 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
 
                 <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/sysctl.d/</filename> bearing the
                 recommended way is to place a symlink to
                 <filename>/dev/null</filename> in
                 <filename>/etc/sysctl.d/</filename> bearing the

-                same file name.</para>
+                same filename.</para>

         </refsect1>
 
         <refsect1>
         </refsect1>
 
         <refsect1>