From e233b80d5b575861b671b8f65ac7fbc310ba6c2d Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 15 Oct 2008 22:01:46 -0700 Subject: [PATCH] --- yaml --- r: 114720 b: refs/heads/master c: 1c828320d2e063dd1ec84e873e6399bfc3d85d6f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/filesystems/nfsroot.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1fb5513090da..95e88a4d5197 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22b8ce94708f7cdf0b04965c6f7443dfd374c35c +refs/heads/master: 1c828320d2e063dd1ec84e873e6399bfc3d85d6f diff --git a/trunk/Documentation/filesystems/nfsroot.txt b/trunk/Documentation/filesystems/nfsroot.txt index 31b329172343..68baddf3c3e0 100644 --- a/trunk/Documentation/filesystems/nfsroot.txt +++ b/trunk/Documentation/filesystems/nfsroot.txt @@ -169,7 +169,7 @@ They depend on various facilities being available: 3.1) Booting from a floppy using syslinux When building kernels, an easy way to create a boot floppy that uses - syslinux is to use the zdisk or bzdisk make targets which use + syslinux is to use the zdisk or bzdisk make targets which use zimage and bzimage images respectively. Both targets accept the FDARGS parameter which can be used to set the kernel command line.