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=cdd43d165097d5df3146680fc986e28afc710af6;hb=79ca888f5ad026b5b3844c05a80401905e64e2f0;hpb=9393a8774c1acd60deea40007061b9ffc783bf7e

diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index cdd43d165..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">
+<refentry id="modules-load.d" conditional='HAVE_KMOD'
+          xmlns:xi="http://www.w3.org/2001/XInclude">
 
         <refentryinfo>
                 <title>modules-load.d</title>
@@ -54,49 +55,30 @@
         <refsect1>
                 <title>Description</title>
 
-		<para><citerefentry><refentrytitle>systemd-modules-load.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-		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
-		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
-		themselves instead of static configuration like
-		this. In fact, most modern kernel modules are prepared
-		for automatic loading already.</para>
+                <para><citerefentry><refentrytitle>systemd-modules-load.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                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/<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
+                themselves instead of static configuration like
+                this. In fact, most modern kernel modules are prepared
+                for automatic loading already.</para>
         </refsect1>
 
         <refsect1>
-		<title>Configuration Format</title>
-
-		<para>The configuration files should simply contain a
-		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>
+                <title>Configuration Format</title>
+
+                <para>The configuration files should simply contain a
+                list of kernel module names to load, separated by
+                newlines. Empty lines and lines whose first
+                non-whitespace character is # or ; are ignored.</para>
         </refsect1>
 
+        <xi:include href="standard-conf.xml" xpointer="confd" />
+
         <refsect1>
                 <title>Example</title>
                 <example>