X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fmodules-load.d.xml;h=4b578d714ce1f5996a3428c03447b3d68884b650;hp=ea4f524048c79cbfa07c42c8d16c2dc408c4e29b;hb=e45fc5e738b0b7700e8b4f3c4b25c58a49b44b27;hpb=56ba3c78ae35065064c4289a0c8e22a81256af20

diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index ea4f52404..4b578d714 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -19,7 +19,8 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="modules-load.d" conditional='HAVE_KMOD'>
+<refentry id="modules-load.d" conditional='HAVE_KMOD'
+          xmlns:xi="http://www.w3.org/2001/XInclude">
 
         <refentryinfo>
                 <title>modules-load.d</title>
@@ -58,7 +59,7 @@
                 reads files from the above directories which contain
                 kernel modules to load during boot in a static list.
                 Each configuration file is named in the style of
-                <filename>/etc/modules-load.d/&lt;program&gt;.conf</filename>. Note
+                <filename>/etc/modules-load.d/<replaceable>program</replaceable>.conf</filename>. Note
                 that it is usually a better idea to rely on the
                 automatic module loading by PCI IDs, USB IDs, DMI IDs
                 or similar triggers encoded in the kernel modules
@@ -74,29 +75,10 @@
                 list of kernel module names to load, separated by
                 newlines. Empty lines and lines whose first
                 non-whitespace character is # or ; are ignored.</para>
-
-                <para>Each configuration file shall be named in the
-                style of <filename>&lt;program&gt;.conf</filename>.
-                Files in <filename>/etc/</filename> override files
-                with the same name in <filename>/usr/lib/</filename>
-                and <filename>/run/</filename>. Files in
-                <filename>/run/</filename> override files with the
-                same name in <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
-                administrator, who may use this logic to override the
-                configuration files installed from vendor
-                packages.</para>
-
-                <para>If the administrator wants to disable a
-                configuration file supplied by the vendor the
-                recommended way is to place a symlink to
-                <filename>/dev/null</filename> in
-                <filename>/etc/modules-load.d/</filename> bearing the
-                same file name.</para>
         </refsect1>
 
+        <xi:include href="standard-conf.xml" xpointer="confd" />
+
         <refsect1>
                 <title>Example</title>
                 <example>