Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / net / ipv4 / netfilter / Kconfig

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 46509fae9fd86750504efd465cda5b6da3042a5c..9aca9c55687cd6bfd6a96a63bb40d90b8d1f3ba1 100644 (file)
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -128,7 +128,7 @@ config IP_NF_MATCH_ADDRTYPE
          eg. UNICAST, LOCAL, BROADCAST, ...
        
          If you want to compile it as a module, say M here and read
-         <file:Documentation/modules.txt>.  If unsure, say `N'.
+         <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 # `filter', generic and specific targets
 config IP_NF_FILTER
@@ -230,7 +230,7 @@ config IP_NF_TARGET_NETMAP
          To compile it as a module, choose M here.  If unsure, say N.
 
 config IP_NF_TARGET_SAME
-       tristate "SAME target support"
+       tristate "SAME target support (OBSOLETE)"
        depends on NF_NAT
        help
          This option adds a `SAME' target, which works like the standard SNAT
@@ -371,7 +371,7 @@ config IP_NF_RAW
          and OUTPUT chains.
        
          If you want to compile it as a module, say M here and read
-         <file:Documentation/modules.txt>.  If unsure, say `N'.
+         <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 # ARP tables
 config IP_NF_ARPTABLES