---

yaml --- r: 114720 b: refs/heads/master c: 1c82832 h: refs/heads/master v: v3
git-mirror · Oct 16, 2008 · e233b80 · e233b80
1 parent 136de62
commit e233b80
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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.