Updated docs, and fixed embarrassing "LABEL" bug.

diff --git a/ldlinux.asm b/ldlinux.asm
index 5eca9ec..c05c5ea 100644 (file)
--- a/ldlinux.asm
+++ b/ldlinux.asm
@@ -114,8 +114,8 @@ CAN_USE_HEAP    equ 80h                 ; Boot loader reports heap size
 ;
 %define vk_power       7               ; log2(max number of vkernels)
 %define        max_vk          (1 << vk_power) ; Maximum number of vkernels
-%define vk_shift       (16-vk_power)
-
+%define vk_shift       (16-vk_power)   ; Number of bits to shift
+%define vk_size                (1 << vk_shift) ; Size of a vkernel buffer
 
                struc vkernel
 vk_vname:      resb 11                 ; Virtual name **MUST BE FIRST!**
@@ -124,11 +124,11 @@ vk_appendlen:     resw 1
                alignb 4
 vk_append:     resb max_cmd_len+1      ; Command line
                alignb 4
-vk_size:       equ $                   ; Should == 1 << vk_shift
+vk_end:                equ $                   ; Should be <= vk_size
                endstruc
 
-%if vk_size*max_vk > 65536
-%error Too many vkernels defined
+%if (vk_end > vk_size) || (vk_size*max_vk > 65536)
+%error "Too many vkernels defined, reduce vk_power"
 %endif
 
 ;

diff --git a/syslinux.doc b/syslinux.doc
index f02dcb1..20af2ed 100644 (file)
--- a/syslinux.doc
+++ b/syslinux.doc
@@ -1,6 +1,6 @@
                               SYSLINUX
-                            Version 1.35
-                           April 13, 1998
+                            Version 1.37
+                           April 20, 1998
 
               A bootloader for Linux using MS-DOS floppies
 
@@ -12,20 +12,25 @@ warranty, neither expressed nor implied, to the function of this
 program.  Please see the included file COPYING for details.
 
 SYSLINUX is a boot loader for the Linux operating system which
-operates off MS-DOS floppies.  It is intended to simplify first-time
-installation of Linux, and for creation of rescue- and other
-special-purpose boot floppies.  It is *not* intended to be used as a
-general purpose boot loader; once the operating system is installed I
-recommend LILO as the boot loader, except for people whose root
-filesystem is a UMSDOS filesystem (where a DOS defragmenter could
-wreck havoc with LILO's carefully set up block tables) -- for them I
-recommend Loadlin (which loads Linux from the DOS command line).
-
-SYSLINUX could, however, in conjunction with the UMSDOS filesystem,
-completely eliminate the need for distribution of raw diskette images
-for boot floppies.  A SYSLINUX floppy can be manipulated using standard
-MS-DOS (or any other OS that can access an MS-DOS filesystem) tools once
-it has been created.
+operates off an MS-DOS/Windows FAT filesystem.  It is intended to
+simplify first-time installation of Linux, and for creation of rescue-
+and other special-purpose boot disks.
+
+SYSLINUX can be used, when properly set up, completely eliminate the
+need for distribution of raw diskette images for boot floppies.  A
+SYSLINUX floppy can be manipulated using standard MS-DOS (or any other
+OS that can access an MS-DOS filesystem) tools once it has been
+created.
+
+   ++++ WHAT SYSLINUX IS NOT ++++
+
+SYSLINUX is *not* intended to be used as a general purpose boot
+loader, since it neither has the ability to boot another operating
+system (e.g. DOS/Windows), nor can it boot Linux from a non-FAT
+filesystem, such as ext2.  Since a native Linux implementation will
+typically use ext2, and a mixed DOS/Linux implementation probably
+wants to be able to boot either filesystem, another boot loader such
+as LILO or LOADLIN may be more appropriate.
 
    ++++ CREATING A BOOTABLE LINUX FLOPPY +++
 
@@ -100,7 +105,7 @@ LABEL label
         global section of the file (before the first LABEL command.)
         The default for "kernel" is the same as "label", and if no
         APPEND is given the default is to use the global entry (if any).
-        Up to 16 LABEL entries are permitted.
+        Up to 128 LABEL entries are permitted.
 
         Note that LILO uses the syntax:
         image = mykernel
@@ -292,7 +297,7 @@ that is bootable on the largest possible number of machines:
 A CD-ROM is so much faster than a floppy that the -s option shouldn't
 matter from a speed perspective.
 
-   ++++ BOOTING FROM A FAT FILESYSTEM PARTITION ++++
+   ++++ BOOTING FROM A FAT FILESYSTEM PARTITION ON A HARD DISK ++++
 
 SYSLINUX can boot from a FAT12 or FAT16 filesystem partition on a hard
 disk (FAT32, introduced in Windows 95 OSR-2, is not supported,

diff --git a/version b/version
index f55005a..c7fafb2 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-1.36
+1.37