13 files changed, 23 insertions, 22 deletions

diff --git a/arch/arm/mach-ixp2000/Kconfig b/arch/arm/mach-ixp2000/Kconfig
index 86f53f8ccbf5..08d2707f6ca8 100644
--- a/arch/arm/mach-ixp2000/Kconfig
+++ b/arch/arm/mach-ixp2000/Kconfig
@@ -14,7 +14,7 @@ config ARCH_ENP2611
         help
           Say 'Y' here if you want your kernel to support the Radisys
           ENP2611 PCI network processing card. For more information on
-          this card, see <file:Documentation/arm/ENP2611>.
+          this card, see <file:Documentation/arm/IXP2000>.
 
 config ARCH_IXDP2400
         bool "Support Intel IXDP2400"
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index e2e9f57abe2e..ff6a8712bd6d 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -1,6 +1,6 @@
 #
 # For a description of the syntax of this configuration file,
-# see Documentation/kbuild/config-language.txt.
+# see Documentation/kbuild/kconfig-language.txt.
 #
 
 mainmenu "uClinux/h8300 (w/o MMU) Kernel Configuration"
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 4ec716d8c1a6..1330061020ab 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -513,7 +513,7 @@ config ZFCPDUMP
         default n
         help
           Select this option if you want to build an zfcpdump enabled kernel.
-          Refer to "Documentation/s390/zfcpdump.txt" for more details on this.
+          Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.
 
 endmenu
 
diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index ba204bac49df..6884d5a518ad 100644
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -1,6 +1,6 @@
 #
 # For a description of the syntax of this configuration file,
-# see Documentation/kbuild/config-language.txt.
+# see Documentation/kbuild/kconfig-language.txt.
 #
 
 mainmenu "Linux/SH64 Kernel Configuration"
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 85ffbb491490..d3cb3d6af4c8 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -1,5 +1,5 @@
 # For a description of the syntax of this configuration file,
-# see Documentation/kbuild/config-language.txt.
+# see Documentation/kbuild/kconfig-language.txt.
 
 mainmenu "Linux/Xtensa Kernel Configuration"
 
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 25cfc6c32509..8d52a26c248a 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -96,8 +96,8 @@ config IWL4965
 
           If you want to compile the driver as a module ( = code which can be
           inserted in and remvoed from the running kernel whenever you want),
-          say M here and read <file:Documentation/modules.txt>.  The module
-          will be called iwl4965.ko.
+          say M here and read <file:Documentation/kbuild/modules.txt>.  The
+          module will be called iwl4965.ko.
 
 config IWL3945
         tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"
@@ -124,5 +124,5 @@ config IWL3945
 
           If you want to compile the driver as a module ( = code which can be
           inserted in and remvoed from the running kernel whenever you want),
-          say M here and read <file:Documentation/modules.txt>.  The module
-          will be called iwl3945.ko.
+          say M here and read <file:Documentation/kbuild/modules.txt>.  The
+          module will be called iwl3945.ko.
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index a5763c6e9362..86cf10efb0c1 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -172,12 +172,12 @@ config CHR_DEV_SCH
           don't need this for those tiny 6-slot cdrom changers.  Media
           changers are listed as "Type: Medium Changer" in /proc/scsi/scsi.
           If you have such hardware and want to use it with linux, say Y
-          here.  Check <file:Documentation/scsi-changer.txt> for details.
+          here.  Check <file:Documentation/scsi/scsi-changer.txt> for details.
         
           If you want to compile this as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want),
           say M here and read <file:Documentation/kbuild/modules.txt> and
-          <file:Documentation/scsi.txt>. The module will be called ch.o.
+          <file:Documentation/scsi/scsi.txt>. The module will be called ch.o.
           If unsure, say N.
         
 
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 61717fa1afb9..cc4b60f899ca 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1509,7 +1509,7 @@ config FB_VOODOO1
 
           WARNING: Do not use any application that uses the 3D engine
           (namely glide) while using this driver.
-          Please read the <file:Documentation/fb/README-sstfb.txt> for supported
+          Please read the <file:Documentation/fb/sstfb.txt> for supported
           options and other important info  support.
 
 config FB_VT8623
@@ -1807,7 +1807,7 @@ config FB_SM501
           This driver is also available as a module ( = code which can be
           inserted and removed from the running kernel whenever you want). The
           module will be called sm501fb. If you want to compile it as a module,
-          say M here and read <file:Documentation/modules.txt>.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
 
           If unsure, say N.
 
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 6854fd6b9714..9adbb4f90479 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -17,7 +17,8 @@ config W1_CON
         bool "Userspace communication over connector"
         default y
         --- help ---
-          This allows to communicate with userspace using connector [Documentation/connector].
+          This allows to communicate with userspace using connector. For more
+          information see <file:Documentation/connector/connector.txt>.
           There are three types of messages between w1 core and userspace:
           1. Events. They are generated each time new master or slave device found
                 either due to automatic or requested search.
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 81db48f07ca1..2792bc1a7269 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -15,8 +15,8 @@ menuconfig WATCHDOG
           implementation entirely in software (which can sometimes fail to
           reboot the machine) and a driver for hardware watchdog boards, which
           are more robust and can also keep track of the temperature inside
-          your computer. For details, read <file:Documentation/watchdog/watchdog.txt>
-          in the kernel source.
+          your computer. For details, read
+          <file:Documentation/watchdog/watchdog-api.txt> in the kernel source.
 
           The watchdog is usually used together with the watchdog daemon
           which is available from
diff --git a/fs/Kconfig b/fs/Kconfig
index cc28a69246a7..c75c95406497 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -504,7 +504,7 @@ config INOTIFY
           including multiple file events, one-shot support, and unmount
           notification.
 
-          For more information, see Documentation/filesystems/inotify.txt
+          For more information, see <file:Documentation/filesystems/inotify.txt>
 
           If unsure, say Y.
 
@@ -518,7 +518,7 @@ config INOTIFY_USER
           directories via a single open fd.  Events are read from the file
           descriptor, which is also select()- and poll()-able.
 
-          For more information, see Documentation/filesystems/inotify.txt
+          For more information, see <file:Documentation/filesystems/inotify.txt>
 
           If unsure, say Y.
 
@@ -1089,7 +1089,7 @@ config ECRYPT_FS
         depends on EXPERIMENTAL && KEYS && CRYPTO && NET
         help
           Encrypted filesystem that operates on the VFS layer.  See
-          <file:Documentation/ecryptfs.txt> to learn more about
+          <file:Documentation/filesystems/ecryptfs.txt> to learn more about
           eCryptfs.  Userspace components are required and can be
           obtained from <http://ecryptfs.sf.net>.
 
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index fa97947c6ae1..9aca9c55687c 100644
--- 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
@@ -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
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index d7a600a5720a..21a9fcc03796 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -363,7 +363,7 @@ config NETFILTER_XT_TARGET_TRACE
           the tables, chains, rules.
 
           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'.
 
 config NETFILTER_XT_TARGET_SECMARK
         tristate '"SECMARK" target support'