Merge branch 'master' into chaindev

Conflicts:
	com32/modules/chain.c

3 files changed, 33 insertions, 12 deletions

diff --git a/doc/memdisk.txt b/doc/memdisk.txt
index fecf2dcb..0d6293d6 100644
--- a/doc/memdisk.txt
+++ b/doc/memdisk.txt
@@ -141,6 +141,12 @@ h) Some systems without a floppy drive have been known to have
    nopass	Hide all real drives of the same type (floppy or hard disk)
    nopassany    Hide all real drives (floppy and hard disk)
 
+i) The following standard Linux option will mark memory as reserved.
+   Please note that the Syslinux core already loads MEMDISK and its
+   initrd below this point:
+
+   mem=size	Mark available memory above this point as Reserved.
+
 
 Some interesting things to note:
 
diff --git a/doc/pxelinux.txt b/doc/pxelinux.txt
index 47aea903..69c1a645 100644
--- a/doc/pxelinux.txt
+++ b/doc/pxelinux.txt
@@ -99,6 +99,20 @@ boot, if you have such a setup.  MTFTP server setup is beyond the
 scope of this document.
 
 
+    ++++ gPXE-ENHANCED VARIANTS ++++
+
+gPXE can be used to enhance PXELINUX's functionality to also include
+HTTP transfers, greatly increasing load speed and allowing for standard
+HTTP scripts to present PXELINUX's configuration file.  pxelinux.0 is
+the plain variant.  gpxelinux.0 (included as of 3.70) is gPXE's
+undionly.kkpxe, pxelinux.0 and a script to run pxelinux.0.  gpxelinuxk.0
+(included as of 4.04) is gPXE's undionly.kpxe, pxelinux.0 and a script
+to run pxelinux.0.  gpxelinuxk.0 should only be used with systems that
+are incompatible with gpxelinux.0 as it prevents certain functionality
+from working (LOCALBOOT with a type not equal to -1) and is incompatible
+with certain hardware, PXE stacks and network setups.
+
+
     ++++ SETTING UP THE TFTP SERVER ++++
 
 PXELINUX currently requires that the boot server has a TFTP server
diff --git a/doc/syslinux.txt b/doc/syslinux.txt
index 5b27a6eb..07d5df9a 100644
--- a/doc/syslinux.txt
+++ b/doc/syslinux.txt
@@ -2,7 +2,7 @@
 
 		   A suite of bootloaders for Linux
 
-	 Copyright 1994-2010 H. Peter Anvin and contributors
+	 Copyright 1994-2011 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
@@ -233,21 +233,25 @@ LABEL label
 	filetype, regardless of the filename.
 
 	CONFIG means restart the boot loader using a different
-	configuration file.
+	configuration file.  The configuration file is read, the
+	working directory is changed (if specified via an APPEND), then
+	the configuration file is parsed.
 
     APPEND -
         Append nothing.  APPEND with a single hyphen as argument in a
         LABEL section can be used to override a global APPEND.
 
-    LOCALBOOT type			[ISOLINUX, PXELINUX]
-	On PXELINUX, specifying "LOCALBOOT 0" instead of a "KERNEL"
-	option means invoking this particular label will cause a local
-	disk boot instead of booting a kernel.
+    LOCALBOOT type
+	Attempt a different local boot method.  The special value -1
+	causes the boot loader to report failure to the BIOS, which, on
+	recent BIOSes, should mean that the next boot device in the
+	boot sequence should be activated.  Values other than those
+	documented may produce undesired results.
 
-	The argument 0 means perform a normal boot.  The argument 4
+	On PXELINUX, "type" 0 means perform a normal boot.  "type" 4
 	will perform a local boot with the Universal Network Driver
 	Interface (UNDI) driver still resident in memory.  Finally,
-	the argument 5 will perform a local boot with the entire PXE
+	"type" 5 will perform a local boot with the entire PXE
 	stack, including the UNDI driver, still resident in memory.
 	All other values are undefined.  If you don't know what the
 	UNDI or PXE stacks are, don't worry -- you don't want them,
@@ -255,10 +259,7 @@ LABEL label
 
 	On ISOLINUX, the "type" specifies the local drive number to
 	boot from; 0x00 is the primary floppy drive and 0x80 is the
-	primary hard drive.  The special value -1 causes ISOLINUX to
-	report failure to the BIOS, which, on recent BIOSes, should
-	mean that the next boot device in the boot sequence should be
-	activated.
+	primary hard drive.
 
     INITRD initrd_file
 	Starting with version 3.71, an initrd can be specified in a