From: Josh Boyer <jwboyer@redhat.com>
Date: Wed, 23 May 2012 18:31:07 +0000 (-0400)
Subject: doc: Don't reference /etc/modprobe.conf
X-Git-Tag: v9~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ef9f30c91f7945dab14430f3c2d6ce28debf9d8;p=thirdparty%2Fkmod.git

doc: Don't reference /etc/modprobe.conf

kmod doesn't read /etc/modprobe.conf at all, so don't mention it in the
modprobe man page.  Point users to modprobe.d(5) instead.
---

diff --git a/man/modprobe.xml b/man/modprobe.xml
index e98e44ee..0e101a8c 100644
--- a/man/modprobe.xml
+++ b/man/modprobe.xml
@@ -80,10 +80,10 @@
       <command>modprobe</command> looks in the module directory
       <filename>/lib/modules/`uname -r`</filename> for all
       the modules and other files, except for the optional
-      <filename>/etc/modprobe.conf</filename> configuration file and
+      configuration files in the
       <filename>/etc/modprobe.d</filename> directory
       (see <citerefentry>
-        <refentrytitle>modprobe.conf</refentrytitle><manvolnum>5</manvolnum>
+        <refentrytitle>modprobe.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>). <command>modprobe</command> will also use module
       options specified on the kernel command line in the form of
       &lt;module&gt;.&lt;option&gt; and blacklists in the form of