Merge tag 'arc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[karo-tx-linux.git] / Documentation / networking / ipv6.txt

diff --git a/Documentation/networking/ipv6.txt b/Documentation/networking/ipv6.txt
index 9fd7e21296c8f500938e7bc272f3ef0528fc3917..6cd74fa55358bcfae3fa6a49805f0c62bc90470c 100644 (file)
--- a/Documentation/networking/ipv6.txt
+++ b/Documentation/networking/ipv6.txt
@@ -2,9 +2,9 @@
 Options for the ipv6 module are supplied as parameters at load time.
 
 Module options may be given as command line arguments to the insmod
 Options for the ipv6 module are supplied as parameters at load time.
 
 Module options may be given as command line arguments to the insmod

-or modprobe command, but are usually specified in either the
-/etc/modules.conf or /etc/modprobe.conf configuration file, or in a
-distro-specific configuration file.
+or modprobe command, but are usually specified in either
+/etc/modules.d/*.conf configuration files, or in a distro-specific
+configuration file.

 
 The available ipv6 module parameters are listed below.  If a parameter
 is not specified the default value is used.
 
 The available ipv6 module parameters are listed below.  If a parameter
 is not specified the default value is used.