Merge branch 'syslinux-3.7x'

2 files changed, 9 insertions, 3 deletions

diff --git a/doc/menu.txt b/doc/menu.txt
index 72bc9dca..97e172fc 100644
--- a/doc/menu.txt
+++ b/doc/menu.txt
@@ -276,6 +276,7 @@ DEFAULT label
 
 
 MENU SAVE
+MENU NOSAVE
 
 	Remember the last entry selected and make that the default for
 	the next boot.  A password-protected menu entry is *not*
@@ -289,7 +290,12 @@ MENU SAVE
 	file gracefully.
 
 	The MENU SAVE information can be cleared with
-	"extlinux --reset-adv".
+	"extlinux --reset-adv <bootdir>".
+
+	A MENU SAVE or MENU NOSAVE at the top of a (sub)menu affects
+	all entries underneath that (sub)menu except those that in
+	turn have MENU SAVE or MENU NOSAVE declared.  This can be used
+	to only save certain entires when selected.
 
 
 INCLUDE filename [tagname]
diff --git a/doc/syslinux.txt b/doc/syslinux.txt
index 72f38d34..94141415 100644
--- a/doc/syslinux.txt
+++ b/doc/syslinux.txt
@@ -2,7 +2,7 @@
 
 		   A suite of bootloaders for Linux
 
-       Copyright 1994-2008 H. Peter Anvin - All Rights Reserved
+	 Copyright 1994-2009 H. Peter Anvin and contributors
 
 This program is provided under the terms of the GNU General Public
 License, version 2 or, at your option, any later version.  There is no
@@ -271,7 +271,7 @@ LABEL label
 	This is mostly useful for initramfs, which can be composed of
 	multiple separate cpio or cpio.gz archives.
 	Note: all files except the last one are zero-padded to a
-	4K page boundary.  This should not affect initramfs.)
+	4K page boundary.  This should not affect initramfs.
 
 IMPLICIT flag_val
         If flag_val is 0, do not load a kernel image unless it has been