X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsysctl.d.xml;h=854864cffcb86c695b70c1904a63775f587830f3;hp=aec584a14e1ed67d2208254c5dbd16894c29f7ee;hb=baae0358f349870544884e405e82e4be7d8add9f;hpb=0e25e94ea72ca3db70484014280ddb709840f952

diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index aec584a14..854864cff 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -55,7 +55,7 @@
                 <title>Description</title>
 
                 <para>At boot,
-                <citerefentry><refentrytitle>systemd-binfmt.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                <citerefentry><refentrytitle>systemd-sysctl.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 reads configuration files from the above directories
                 to configure
                 <citerefentry><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>
@@ -77,7 +77,7 @@
                 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
@@ -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
-                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 earlier 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
-                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
-                same file name.</para>
+                same filename.</para>
         </refsect1>
 
         <refsect1>