X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsysctl.d.xml;h=240aa8113798e5a8cec96b2490abb5384fe23ff7;hp=8f336dc0dd6461696430e58a2ebd436c15c4319a;hb=8ab49c12dcab02d9d83e63a93676d4fc8f709516;hpb=c91faef3b3facfdf13282aee957af25dd555890b

diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 8f336dc0d..240aa8113 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -46,18 +46,18 @@
         </refnamediv>
 
         <refsynopsisdiv>
+                <para><filename>/usr/lib/sysctl.d/*.conf</filename></para>
                 <para><filename>/etc/sysctl.d/*.conf</filename></para>
+                <para><filename>/run/sysctl.d/*.conf</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
                 <title>Description</title>
 
-		<para><command>systemd</command> uses
-		<filename>/etc/sysctl.d/</filename> to configure
+		<para><command>systemd</command> uses configuration files
+		from the above directories to configure
 		<citerefentry><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-		kernel parameters to load during boot. Each
-		configuration file is named in the style of
-		<filename>/etc/sysctl.d/&lt;program&gt;.conf</filename>.</para>
+		kernel parameters to load during boot.</para>
         </refsect1>
 
         <refsect1>
@@ -71,6 +71,21 @@
                 <para>Note that both / and . are accepted as
                 separators in sysctl variable names.</para>
 
+                <para>Each configuration file is named in the style of
+                <filename>&lt;program&gt;.conf</filename>.
+                Files in <filename>/etc/</filename> overwrite
+                files with the same name in <filename>/usr/lib/</filename>.
+                Files in <filename>/run</filename> overwrite files with
+                the same name in <filename>/etc/</filename> and
+                <filename>/usr/lib/</filename>. Packages should install their
+                configuration files in <filename>/usr/lib/</filename>, files
+                in <filename>/etc/</filename> are reserved for the local
+                administration, which possibly decides to overwrite the
+                configurations installed from packages. All files are sorted
+                by filename in alphabetical order, regardless in which of the
+                directories they reside, to ensure that a specific
+                configuration file takes precedence over another file with
+                an alphabetically later name.</para>
         </refsect1>
 
         <refsect1>