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

diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 854864cff..00a857b11 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -89,8 +89,8 @@
                 administrator, who may use this logic to override the
                 configuration files installed by vendor packages. All
                 configuration files are sorted by their filename in
-                lexicographic order, regardless in which of the
-                directories they reside. If multiple files specify the
+                lexicographic order, regardless of which of the
+                directories they reside in. 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
@@ -103,6 +103,16 @@
                 <filename>/dev/null</filename> in
                 <filename>/etc/sysctl.d/</filename> bearing the
                 same filename.</para>
+
+                <para>The settings configured with
+                <filename>sysctl.d</filename> files will be applied
+                early on boot. The network interface-specific options
+                will also be applied individually for each network
+                interface as it shows up in the system. (More
+                specifically, that is
+                <filename>net.ipv4.conf.*</filename>,
+                <filename>net.ipv6.conf.*</filename>,
+                <filename>net.ipv4.neigh.*</filename> and <filename>net.ipv6.neigh.*</filename>)</para>
         </refsect1>
 
         <refsect1>