diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/filesystems/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/filesystems/nfsroot.txt (renamed from Documentation/nfsroot.txt) | 0 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 6 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index fc8e7c7d182f..08a39cdb27f2 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX | |||
@@ -271,8 +271,6 @@ netlabel/ | |||
271 | - directory with information on the NetLabel subsystem. | 271 | - directory with information on the NetLabel subsystem. |
272 | networking/ | 272 | networking/ |
273 | - directory with info on various aspects of networking with Linux. | 273 | - directory with info on various aspects of networking with Linux. |
274 | nfsroot.txt | ||
275 | - short guide on setting up a diskless box with NFS root filesystem. | ||
276 | nmi_watchdog.txt | 274 | nmi_watchdog.txt |
277 | - info on NMI watchdog for SMP systems. | 275 | - info on NMI watchdog for SMP systems. |
278 | nommu-mmap.txt | 276 | nommu-mmap.txt |
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX index e731196410b3..2ec174c992f1 100644 --- a/Documentation/filesystems/00-INDEX +++ b/Documentation/filesystems/00-INDEX | |||
@@ -66,6 +66,8 @@ mandatory-locking.txt | |||
66 | - info on the Linux implementation of Sys V mandatory file locking. | 66 | - info on the Linux implementation of Sys V mandatory file locking. |
67 | ncpfs.txt | 67 | ncpfs.txt |
68 | - info on Novell Netware(tm) filesystem using NCP protocol. | 68 | - info on Novell Netware(tm) filesystem using NCP protocol. |
69 | nfsroot.txt | ||
70 | - short guide on setting up a diskless box with NFS root filesystem. | ||
69 | ntfs.txt | 71 | ntfs.txt |
70 | - info and mount options for the NTFS filesystem (Windows NT). | 72 | - info and mount options for the NTFS filesystem (Windows NT). |
71 | ocfs2.txt | 73 | ocfs2.txt |
diff --git a/Documentation/nfsroot.txt b/Documentation/filesystems/nfsroot.txt index 31b329172343..31b329172343 100644 --- a/Documentation/nfsroot.txt +++ b/Documentation/filesystems/nfsroot.txt | |||
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 508e2a2c9864..57709e472b9b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -845,7 +845,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
845 | arch/alpha/kernel/core_marvel.c. | 845 | arch/alpha/kernel/core_marvel.c. |
846 | 846 | ||
847 | ip= [IP_PNP] | 847 | ip= [IP_PNP] |
848 | See Documentation/nfsroot.txt. | 848 | See Documentation/filesystems/nfsroot.txt. |
849 | 849 | ||
850 | ip2= [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards | 850 | ip2= [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards |
851 | See comment before ip2_setup() in | 851 | See comment before ip2_setup() in |
@@ -1199,10 +1199,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1199 | file if at all. | 1199 | file if at all. |
1200 | 1200 | ||
1201 | nfsaddrs= [NFS] | 1201 | nfsaddrs= [NFS] |
1202 | See Documentation/nfsroot.txt. | 1202 | See Documentation/filesystems/nfsroot.txt. |
1203 | 1203 | ||
1204 | nfsroot= [NFS] nfs root filesystem for disk-less boxes. | 1204 | nfsroot= [NFS] nfs root filesystem for disk-less boxes. |
1205 | See Documentation/nfsroot.txt. | 1205 | See Documentation/filesystems/nfsroot.txt. |
1206 | 1206 | ||
1207 | nfs.callback_tcpport= | 1207 | nfs.callback_tcpport= |
1208 | [NFS] set the TCP port on which the NFSv4 callback | 1208 | [NFS] set the TCP port on which the NFSv4 callback |