Update in preparation for 1.49 release.

2 files changed, 21 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 38b62852..f5bafb67 100644
--- a/NEWS
+++ b/NEWS
@@ -7,12 +7,21 @@ Changes in 1.49:
 	  had this modification.  SYSLINUX does still require that the
 	  low 512K is available; PXELINUX requires 384K.  Machines
 	  with a physical memory hole in the low 640K cannot boot
-	  Linux no matter what.)
+	  Linux no matter what.)  Depending what the reason is for the
+	  memory hole, a new kernel (2.4.0-test3 or later) may be
+	  required.
 	* SYSLINUX: Default installer binary now compiled against
 	  glibc 2.1.  If this is inappropriate for your system and you
 	  still want to use the offical version of SYSLINUX, please
 	  follow the instructions in "distrib.doc" to rebuild the
 	  installer.
+	* SYSLINUX: Linux installer program now supports -o <offset>
+	  option which does a loopback mount with the
+	  -o loop,offset=<> option.  Useful to run SYSLINUX on an
+	  individual partition of a whole-harddisk image.
+	* Include the source code to a Master Boot Record (MBR)
+	  functionally equivalent to the one installed DOS except it
+	  includes EBIOS support.  The MBR code is public domain.
 
 Changes in 1.48:
 	* PXELINUX: Workaround for PXE ROMs based on the Intel PXE PDK
diff --git a/syslinux.doc b/syslinux.doc
index d16c919b..400f717e 100644
--- a/syslinux.doc
+++ b/syslinux.doc
@@ -4,7 +4,7 @@
 
               A bootloader for Linux using MS-DOS floppies
 
-		Copyright (C) 1994-1999 H. Peter Anvin
+		Copyright (C) 1994-2000 H. Peter Anvin
 
 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
@@ -50,7 +50,7 @@ it, then execute the DOS command:
 
 or the Linux command:
 
-	syslinux [-s] /dev/fd0
+	syslinux [-s] [-o offset] /dev/fd0
 
 (or, again, whichever device is the correct one.)
 
@@ -64,6 +64,9 @@ which the -s option is required to make it boot reliably, please send
 as much info about your machine as you can, and include the failure
 mode.
 
+The -o option is used with a disk image file and specifies the byte
+offset of the filesystem image in the file.
+
 WARNING: There seems to be a bug in some recent experimental Linux
 	 kernels that causes floppy disk corruption when using the
 	 Linux syslinux installer.  This bug exists in kernels
@@ -251,8 +254,9 @@ boot floppy and look for additional drivers in a predetermined
 location.
 
 To bzImage and recent zImage kernels, SYSLINUX 1.30 and higher will
-identify using the ID byte 0x31.  The ID range 0x32-0x3f is reserved
-for future versions of SYSLINUX.
+identify using the ID byte 0x31.  PXELINUX identifies using the ID
+byte 0x32.  The ID range 0x33-0x3f is reserved for future versions of
+SYSLINUX.
 
 
    ++++ DISPLAY FILE FORMAT ++++
@@ -467,6 +471,9 @@ disk by running the command:
 
 Then use the FDISK command to mark the appropriate partition active.
 
+A simple MBR, roughly on par with the one installed by DOS (but
+unencumbered), is included in the SYSLINUX distribution
+
 
    ++++ KNOWN BUGS ++++