From 074ac263beb075e5a9ea6ffc3604c2bf726650a8 Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Sun, 25 Apr 1999 11:15:10 +0000
Subject: [PATCH] doc fixes

---
 ChangeLog     |  5 +++++
 README        |  2 +-
 docs/menu.lst | 37 +++++++++++++++++++++----------------
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 296ac3167..00279e2af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-04-25  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
+
+	* docs/menu.lst: Rewritten, so that it contains up-to-date
+	information and FAQish configuration examples.
+	
 1999-04-09  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
 
 	* shared_src/asm.S (get_diskinfo_floppy): Correct the number of heads
diff --git a/README b/README
index d985580b6..1143435d9 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ personal computer BIOSes:
   - can boot Multiboot-compliant kernels (such as GNU Mach), as well
     as standard Linux and BSD kernels
 
-See the file docs/NEWS for a description of recent changes to GRUB.
+See the file NEWS for a description of recent changes to GRUB.
 
 See the file INSTALL for instructions on how to build and install the
 GRUB data and program files.  See `docs/install.html' for details
diff --git a/docs/menu.lst b/docs/menu.lst
index c78821a31..8fe307681 100644
--- a/docs/menu.lst
+++ b/docs/menu.lst
@@ -2,8 +2,21 @@
 # Sample boot menu configuration file
 #
 
-# Timeout here...
-timeout = 30
+# Boot automatically after 30 secs.
+timeout= 30
+
+# By default, boot the first entry.
+default= 0
+
+# For booting the GNU HURD
+title=		GNU/HURD
+root=	(hd0,0)
+kernel=	/boot/gnumach root=hd0s1
+module=	/boot/serverboot
+
+# For booting Linux
+title=		GNU/Linux
+kernel=	(hd1,0)/vmlinuz root=/dev/hdb1
 
 # For booting Mach (getting kernel from floppy)
 title=		Utah Mach4 multiboot
@@ -17,12 +30,6 @@ title=		FreeBSD 2.2-SNAP
 root=	(hd0,2)
 kernel=	(fd0)/kernel
 
-# For booting the GNU HURD (getting kernel from floppy)
-title=		GNU HURD
-root=	(hd0,a)
-kernel=	/boot/kernel root=hd0a
-module= /boot/serverboot
-
 # For booting OS/2  (test, I have no OS/2 to test for!)
 title=		OS/2
 root=		(hd0,1)
@@ -30,15 +37,13 @@ makeactive
 chainloader=	/boot/chain.os2
 # This is similar to "chainload", but loads a specific file
 
-# For booting Windows NT 3.5 or DOS
-title=		Windows NT 3.5/DOS boot menu
+# For booting Windows NT 3.5 or Windows95
+title=		Windows NT 3.5/Windows 95 boot menu
 root=		(0x80,0)
 makeactive
 chainloader=	+1
 
-# For booting DOS from a Windows NT/DOS installation
-title=		DOS
-root=		(0x80,0)
-makeactive
-chainloader=	/bootsect.dos
-
+# For installing GRUB into the hard disk
+title=		Install GRUB into the hard disk
+root=		(hd0,0)
+install=	/boot/grub/stage1 d (hd0) /boot/grub/stage2 0x8000 p