[PATCH] Documentation: nfsroot.rst: Fix references to nfsroot.rst

[PATCH] Documentation: nfsroot.rst: Fix references to nfsroot.rst

[Niklas Söderlund]

When converting and moving nfsroot.txt to nfsroot.rst the references to
the old text file was not updated to match the change, fix this.

Fixes: f9a9349846f92b2d ("Documentation: nfsroot.txt: convert to ReST")
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
---
 Documentation/admin-guide/kernel-parameters.txt | 8 ++++----
 Documentation/filesystems/cifs/cifsroot.txt     | 2 +-
 fs/nfs/Kconfig                                  | 2 +-
 net/ipv4/Kconfig                                | 6 +++---
 net/ipv4/ipconfig.c                             | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index dbc22d68462751d2..afabc0bc4231b407 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1879,7 +1879,7 @@
 			No delay
 
 	ip=		[IP_PNP]
-			See Documentation/filesystems/nfs/nfsroot.txt.
+			See Documentation/admin-guide/nfs/nfsroot.rst.
 
 	ipcmni_extend	[KNL] Extend the maximum number of unique System V
 			IPC identifiers from 32,768 to 16,777,216.
@@ -2849,13 +2849,13 @@
 			Default value is 0.
 
 	nfsaddrs=	[NFS] Deprecated.  Use ip= instead.
-			See Documentation/filesystems/nfs/nfsroot.txt.
+			See Documentation/admin-guide/nfs/nfsroot.rst.
 
 	nfsroot=	[NFS] nfs root filesystem for disk-less boxes.
-			See Documentation/filesystems/nfs/nfsroot.txt.
+			See Documentation/admin-guide/nfs/nfsroot.rst.
 
 	nfsrootdebug	[NFS] enable nfsroot debugging messages.
-			See Documentation/filesystems/nfs/nfsroot.txt.
+			See Documentation/admin-guide/nfs/nfsroot.rst.
 
 	nfs.callback_nr_threads=
 			[NFSv4] set the total number of threads that the
diff --git a/Documentation/filesystems/cifs/cifsroot.txt b/Documentation/filesystems/cifs/cifsroot.txt
index 0fa1a2c36a4053ea..947b7ec6ce9e0f9d 100644
--- a/Documentation/filesystems/cifs/cifsroot.txt
+++ b/Documentation/filesystems/cifs/cifsroot.txt
@@ -13,7 +13,7 @@ network by utilizing SMB or CIFS protocol.
 
 In order to mount, the network stack will also need to be set up by
 using 'ip=' config option. For more details, see
-Documentation/filesystems/nfs/nfsroot.txt.
+Documentation/admin-guide/nfs/nfsroot.rst.
 
 A CIFS root mount currently requires the use of SMB1+UNIX Extensions
 which is only supported by the Samba server. SMB1 is the older
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index 40b6c5ac46c0cc17..88e1763e02f35668 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -164,7 +164,7 @@ config ROOT_NFS
 	  If you want your system to mount its root file system via NFS,
 	  choose Y here.  This is common practice for managing systems
 	  without local permanent storage.  For details, read
-	  <file:Documentation/filesystems/nfs/nfsroot.txt>.
+	  <file:Documentation/admin-guide/nfs/nfsroot.rst>.
 
 	  Most people say N here.
 
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index f96bd489b362ab7a..fb1dc8d02f6d4490 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -129,7 +129,7 @@ config IP_PNP_DHCP
 
 	  If unsure, say Y. Note that if you want to use DHCP, a DHCP server
 	  must be operating on your network.  Read
-	  <file:Documentation/filesystems/nfs/nfsroot.txt> for details.
+	  <file:Documentation/admin-guide/nfs/nfsroot.rst> for details.
 
 config IP_PNP_BOOTP
 	bool "IP: BOOTP support"
@@ -144,7 +144,7 @@ config IP_PNP_BOOTP
 	  does BOOTP itself, providing all necessary information on the kernel
 	  command line, you can say N here. If unsure, say Y. Note that if you
 	  want to use BOOTP, a BOOTP server must be operating on your network.
-	  Read <file:Documentation/filesystems/nfs/nfsroot.txt> for details.
+	  Read <file:Documentation/admin-guide/nfs/nfsroot.rst> for details.
 
 config IP_PNP_RARP
 	bool "IP: RARP support"
@@ -157,7 +157,7 @@ config IP_PNP_RARP
 	  older protocol which is being obsoleted by BOOTP and DHCP), say Y
 	  here. Note that if you want to use RARP, a RARP server must be
 	  operating on your network. Read
-	  <file:Documentation/filesystems/nfs/nfsroot.txt> for details.
+	  <file:Documentation/admin-guide/nfs/nfsroot.rst> for details.
 
 config NET_IPIP
 	tristate "IP: tunneling"
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 4438f6b123352cbb..561f15b5a944ecae 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1621,7 +1621,7 @@ late_initcall(ip_auto_config);
 
 /*
  *  Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel
- *  command line parameter.  See Documentation/filesystems/nfs/nfsroot.txt.
+ *  command line parameter.  See Documentation/admin-guide/nfs/nfsroot.rst.
  */
 static int __init ic_proto_name(char *name)
 {
-- 
2.25.0

Re: [PATCH] Documentation: nfsroot.rst: Fix references to nfsroot.rst

[Geert Uytterhoeven]

On Wed, Feb 12, 2020 at 7:15 PM Niklas Söderlund
<niklas.soderlund+renesas@ragnatech.se> wrote:
> When converting and moving nfsroot.txt to nfsroot.rst the references to
> the old text file was not updated to match the change, fix this.
>
> Fixes: f9a9349846f92b2d ("Documentation: nfsroot.txt: convert to ReST")
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] Documentation: nfsroot.rst: Fix references to nfsroot.rst

[Jonathan Corbet]

On Wed, 12 Feb 2020 19:13:32 +0100
Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> wrote:

> When converting and moving nfsroot.txt to nfsroot.rst the references to
> the old text file was not updated to match the change, fix this.
> 
> Fixes: f9a9349846f92b2d ("Documentation: nfsroot.txt: convert to ReST")
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> ---
>  Documentation/admin-guide/kernel-parameters.txt | 8 ++++----
>  Documentation/filesystems/cifs/cifsroot.txt     | 2 +-
>  fs/nfs/Kconfig                                  | 2 +-
>  net/ipv4/Kconfig                                | 6 +++---
>  net/ipv4/ipconfig.c                             | 2 +-
>  5 files changed, 10 insertions(+), 10 deletions(-)

OK, so this is a mix of documentation, net, and filesystem tweaks.  I'll
happily pick it up, unless somebody else would rather carry it...?

Thanks,

jon

Re: [PATCH] Documentation: nfsroot.rst: Fix references to nfsroot.rst

[Jonathan Corbet]

On Wed, 12 Feb 2020 19:30:37 +0100
Geert Uytterhoeven <geert@linux-m68k.org> wrote:

> On Wed, Feb 12, 2020 at 7:15 PM Niklas Söderlund
> <niklas.soderlund+renesas@ragnatech.se> wrote:
> > When converting and moving nfsroot.txt to nfsroot.rst the references to
> > the old text file was not updated to match the change, fix this.
> >
> > Fixes: f9a9349846f92b2d ("Documentation: nfsroot.txt: convert to ReST")
> > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>  
> 
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Applied, thanks.

jon