summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-05-23 14:31:07 -0400
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2012-05-23 18:03:35 -0300
commit7ef9f30c91f7945dab14430f3c2d6ce28debf9d8 (patch)
tree6f5a13a1402724885484f284f9c7dd9a5283ea20 /man
parentaf9080d9f92272a8331b28b875b4f745bd0043c1 (diff)
downloadkmod-7ef9f30c91f7945dab14430f3c2d6ce28debf9d8.tar.gz
kmod-7ef9f30c91f7945dab14430f3c2d6ce28debf9d8.tar.bz2
kmod-7ef9f30c91f7945dab14430f3c2d6ce28debf9d8.zip
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.
Diffstat (limited to 'man')
-rw-r--r--man/modprobe.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/man/modprobe.xml b/man/modprobe.xml
index e98e44e..0e101a8 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