4 files changed, 9 insertions, 9 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 283ee94224c6..2438f37f2ca1 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -333,7 +333,7 @@ config ACPI_CUSTOM_DSDT_FILE
         depends on !STANDALONE
         help
           This option supports a custom DSDT by linking it into the kernel.
-          See Documentation/acpi/dsdt-override.txt
+          See Documentation/admin-guide/acpi/dsdt-override.rst
 
           Enter the full path name to the file which includes the AmlCode
           or dsdt_aml_code declaration.
@@ -355,7 +355,7 @@ config ACPI_TABLE_UPGRADE
           This option provides functionality to upgrade arbitrary ACPI tables
           via initrd. No functional change if no ACPI tables are passed via
           initrd, therefore it's safe to say Y.
-          See Documentation/acpi/initrd_table_override.txt for details
+          See Documentation/admin-guide/acpi/initrd_table_override.rst for details
 
 config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD
         bool "Override ACPI tables from built-in initrd"
@@ -365,7 +365,7 @@ config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD
           This option provides functionality to override arbitrary ACPI tables
           from built-in uncompressed initrd.
 
-          See Documentation/acpi/initrd_table_override.txt for details
+          See Documentation/admin-guide/acpi/initrd_table_override.rst for details
 
 config ACPI_DEBUG
         bool "Debug Statements"
@@ -374,7 +374,7 @@ config ACPI_DEBUG
           output and increases the kernel size by around 50K.
 
           Use the acpi.debug_layer and acpi.debug_level kernel command-line
-          parameters documented in Documentation/acpi/debug.txt and
+          parameters documented in Documentation/firmware-guide/acpi/debug.rst and
           Documentation/admin-guide/kernel-parameters.rst to control the type and
           amount of debug output.
 
@@ -445,7 +445,7 @@ config ACPI_CUSTOM_METHOD
         help
           This debug facility allows ACPI AML methods to be inserted and/or
           replaced without rebooting the system. For details refer to:
-          Documentation/acpi/method-customizing.txt.
+          Documentation/firmware-guide/acpi/method-customizing.rst.
 
           NOTE: This option is security sensitive, because it allows arbitrary
           kernel memory to be written to by root (uid=0) users, allowing them
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index b17b79e612a3..ac6280ad43a1 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1075,7 +1075,7 @@ static int ftgmac100_mii_probe(struct ftgmac100 *priv, phy_interface_t intf)
         }
 
         /* Indicate that we support PAUSE frames (see comment in
-         * Documentation/networking/phy.txt)
+         * Documentation/networking/phy.rst)
          */
         phy_support_asym_pause(phydev);
 
diff --git a/drivers/staging/fieldbus/Documentation/fieldbus_dev.txt b/drivers/staging/fieldbus/Documentation/fieldbus_dev.txt
index 56af3f650fa3..89fb8e14676f 100644
--- a/drivers/staging/fieldbus/Documentation/fieldbus_dev.txt
+++ b/drivers/staging/fieldbus/Documentation/fieldbus_dev.txt
@@ -54,8 +54,8 @@ a limited few common behaviours and properties. This allows us to define
 a simple interface consisting of a character device and a set of sysfs files:
 
 See:
-Documentation/ABI/testing/sysfs-class-fieldbus-dev
-Documentation/ABI/testing/fieldbus-dev-cdev
+drivers/staging/fieldbus/Documentation/ABI/sysfs-class-fieldbus-dev
+drivers/staging/fieldbus/Documentation/ABI/fieldbus-dev-cdev
 
 Note that this simple interface does not provide a way to modify adapter
 configuration settings. It is therefore useful only for adapters that get their
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 1e3ed41ae1f3..69938dbae2d0 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -1694,7 +1694,7 @@ EXPORT_SYMBOL_GPL(vhost_dev_ioctl);
 
 /* TODO: This is really inefficient.  We need something like get_user()
  * (instruction directly accesses the data, with an exception table entry
- * returning -EFAULT). See Documentation/x86/exception-tables.txt.
+ * returning -EFAULT). See Documentation/x86/exception-tables.rst.
  */
 static int set_bit_to_user(int nr, void __user *addr)
 {