Merge branch 'master' into chaindev

Conflicts:
	com32/Makefile
	com32/modules/chain.c

Note: add ReactOS' stuff introduced in old chain.c

Signed-off-by: Michal Soltys <soltys@ziu.info>

2 files changed, 19 insertions, 31 deletions

diff --git a/doc/isolinux.txt b/doc/isolinux.txt
index eca2a974..807c6311 100644
--- a/doc/isolinux.txt
+++ b/doc/isolinux.txt
@@ -100,34 +100,3 @@ The ISO 9660 filesystem is encapsulated in a partition (which starts
 at offset zero, which may confuse some systems.)  This makes it
 possible for the operating system, once booted, to use the remainder
 of the device for persistent storage by creating a second partition.
-
-
-      ++++ BOOTING DOS (OR OTHER SIMILAR OPERATING SYSTEMS) ++++
-
-WARNING: This feature depends on BIOS functionality which is
-apparently broken in a very large number of BIOSes.  Therefore, this
-may not work on any particular system.  No workaround is possible; if
-you find that it doesn't work please complain to your vendor and
-indicate that "BIOS INT 13h AX=4C00h fails."
-
-To boot DOS, or other real-mode operating systems (protected-mode
-operating systems may or may not work correctly), using ISOLINUX, you
-need to prepare a disk image (usually a floppy image, but a hard disk
-image can be used on *most* systems) with the relevant operating
-system.  This file should be included on the CD-ROM in the /isolinux
-directory, and have a .img extension.  The ".img" extension does not
-have to be specified on the command line, but has to be explicitly
-specified if used in a "kernel" statement in isolinux.cfg.
-
-For a floppy image, the size of the image should be exactly one of the
-following:
-
-	1,228,800 bytes		- For a 1200K floppy image
-	1,474,560 bytes		- For a 1440K floppy image
-	2,949,120 bytes		- For a 2880K floppy image
-
-Any other size is assumed to be a hard disk image.  In order to work
-on as many systems as possible, a hard disk image should have exactly
-one partition, marked active, that covers the entire size of the disk
-image file.  Even so, hard disk images are not supported on all
-BIOSes.
diff --git a/doc/menu.txt b/doc/menu.txt
index e2dd1e1c..620527e6 100644
--- a/doc/menu.txt
+++ b/doc/menu.txt
@@ -48,6 +48,25 @@ MENU HIDDEN
 	All that is displayed is a timeout message.
 
 
+MENU HIDDENKEY key[,key...] command...
+
+	If they key used to interrupt MENU HIDDEN is <key>, then
+	execute the specified command instead of displaying the menu.
+
+	Currently, the following key names are recognized:
+
+	Backspace, Tab, Enter, Esc, Space, F1..F12, Up, Down, Left,
+	Right, PgUp, PgDn, Home, End, Insert, Delete
+
+	... in addition to all single characters plus the syntax ^X
+	for Ctrl-X.  Note that single characters are treated as case
+	sensitive, so a different command can be bound to "A" than
+	"a".  One can bind the same command to multiple keys by giving
+	a comma-separated list of keys:
+
+	menu hiddenkey A,a key_a_command
+
+
 MENU CLEAR
 
 	Clear the screen when exiting the menu, instead of leaving the