]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Documentation: move nfsroot.txt to filesystems/
authorJ. Bruce Fields <bfields@citi.umich.edu>
Mon, 7 Apr 2008 19:59:03 +0000 (15:59 -0400)
committerJonathan Corbet <corbet@lwn.net>
Fri, 11 Apr 2008 19:18:01 +0000 (13:18 -0600)
Documentation/ is a little large, and filesystems/ seems an obvious
place for this file.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Documentation/00-INDEX
Documentation/filesystems/00-INDEX
Documentation/filesystems/nfsroot.txt [moved from Documentation/nfsroot.txt with 100% similarity]
Documentation/kernel-parameters.txt
fs/Kconfig
net/ipv4/Kconfig
net/ipv4/ipconfig.c

index fc8e7c7d182f5cbcc179fc5dec2575912ce46653..08a39cdb27f293a60fbb2de8221e0c5213703df0 100644 (file)
@@ -271,8 +271,6 @@ netlabel/
        - directory with information on the NetLabel subsystem.
 networking/
        - directory with info on various aspects of networking with Linux.
-nfsroot.txt
-       - short guide on setting up a diskless box with NFS root filesystem.
 nmi_watchdog.txt
        - info on NMI watchdog for SMP systems.
 nommu-mmap.txt
index e731196410b379de29c05ebfbe9d21d5d6fc2122..2ec174c992f16664c32a936b310652d17799909e 100644 (file)
@@ -66,6 +66,8 @@ mandatory-locking.txt
        - info on the Linux implementation of Sys V mandatory file locking.
 ncpfs.txt
        - info on Novell Netware(tm) filesystem using NCP protocol.
+nfsroot.txt
+       - short guide on setting up a diskless box with NFS root filesystem.
 ntfs.txt
        - info and mount options for the NTFS filesystem (Windows NT).
 ocfs2.txt
index 508e2a2c98644ad6c4ee70e59a33191af9af541e..57709e472b9bb56a5c77d514aad458f1f8a68aa1 100644 (file)
@@ -845,7 +845,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        arch/alpha/kernel/core_marvel.c.
 
        ip=             [IP_PNP]
-                       See Documentation/nfsroot.txt.
+                       See Documentation/filesystems/nfsroot.txt.
 
        ip2=            [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards
                        See comment before ip2_setup() in
@@ -1199,10 +1199,10 @@ and is between 256 and 4096 characters. It is defined in the file
                        file if at all.
 
        nfsaddrs=       [NFS]
-                       See Documentation/nfsroot.txt.
+                       See Documentation/filesystems/nfsroot.txt.
 
        nfsroot=        [NFS] nfs root filesystem for disk-less boxes.
-                       See Documentation/nfsroot.txt.
+                       See Documentation/filesystems/nfsroot.txt.
 
        nfs.callback_tcpport=
                        [NFS] set the TCP port on which the NFSv4 callback
index d7312825592bd33e84cff35805a5430aebfb4220..c509123bea49175bc2a823f838798d07f58689d9 100644 (file)
@@ -1744,10 +1744,10 @@ config ROOT_NFS
          If you want your Linux box to mount its whole root file system (the
          one containing the directory /) from some other computer over the
          net via NFS (presumably because your box doesn't have a hard disk),
-         say Y. Read <file:Documentation/nfsroot.txt> for details. It is
-         likely that in this case, you also want to say Y to "Kernel level IP
-         autoconfiguration" so that your box can discover its network address
-         at boot time.
+         say Y. Read <file:Documentation/filesystems/nfsroot.txt> for
+         details. It is likely that in this case, you also want to say Y to
+         "Kernel level IP autoconfiguration" so that your box can discover
+         its network address at boot time.
 
          Most people say N here.
 
index 9c7e5ffb223dfcc10f3873a48ce99d6f87fe5386..4670683b4688d67b9cd99ae165cfb8c86d5217a8 100644 (file)
@@ -160,7 +160,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/nfsroot.txt> for details.
+         <file:Documentation/filesystems/nfsroot.txt> for details.
 
 config IP_PNP_BOOTP
        bool "IP: BOOTP support"
@@ -175,7 +175,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/nfsroot.txt> for details.
+         Read <file:Documentation/filesystems/nfsroot.txt> for details.
 
 config IP_PNP_RARP
        bool "IP: RARP support"
@@ -187,8 +187,8 @@ config IP_PNP_RARP
          discovered automatically at boot time using the RARP protocol (an
          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/nfsroot.txt> for
-         details.
+         operating on your network. Read
+         <file:Documentation/filesystems/nfsroot.txt> for details.
 
 # not yet ready..
 #   bool '    IP: ARP support' CONFIG_IP_PNP_ARP               
index 7c992fbbc2c3ae512ccb705ede7c1f012b2d5302..4824fe8996bf75a8a2c93b01ae573b7098525335 100644 (file)
@@ -1411,7 +1411,7 @@ late_initcall(ip_auto_config);
 
 /*
  *  Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel
- *  command line parameter.  See Documentation/nfsroot.txt.
+ *  command line parameter.  See Documentation/filesystems/nfsroot.txt.
  */
 static int __init ic_proto_name(char *name)
 {