Merge with syslinux-3.32-pre7

Conflicts:

	keywords.inc

diff --cc NEWS
index 94d78be,48a4e13..aec278b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,14 -2,13 +2,19 @@@ Starting with 1.47, changes marked wit
  apply to that specific program only; other changes apply to all of
  them.
  
 +Changes in 3.40:
 +      * New keywords allow the type of file to be specified in the
 +        configuration file.
 +      * It is now supported to load a different configuration file
 +        with the CONFIG keyword.
 +
  Changes in 3.32:
        * MEMDISK: New "safeint" mode.
+       * MEMDISK: Be more compliant with the PnP BIOS spec.
+       * MEMDISK: Turn on EDD support by default.
+       * MEMDISK: Try to work on some machines on which it would not
+         work when there was no floppy drive in the system.
+       * Simple menu system: fix serial console support (broken in 3.30).
  
  Changes in 3.31:
        * The simple menu system (menu.c32 and vesamenu.c32) now

diff --cc bootsect.inc
Simple merge

diff --cc keywords
index 31a6085,39a871c..95c9379
--- 1/keywords
--- 2/keywords
+++ b/keywords
@@@ -1,6 -1,6 +1,7 @@@
  menu
+ text
  append
 +config
  default
  display
  font

diff --cc keywords.inc
index e15ea99,811d5bd..908fd4e
--- 1/keywords.inc
--- 2/keywords.inc
+++ b/keywords.inc
@@@ -42,49 -42,45 +42,52 @@@ keywd_size equ 8   ; Bytes per keywor
  
                align 4, db 0
  
+ %define FKeyN(n) (FKeyName+(((n)-1) << FILENAME_MAX_LG2))
+ 
  keywd_table:
-               keyword menu,      pc_comment
-               keyword append,    pc_append
-               keyword default,   pc_default
-               keyword display,   pc_filecmd,  get_msg_file
-               keyword font,      pc_filecmd,  loadfont
-               keyword implicit,  pc_setint16, AllowImplicit
-               keyword kbdmap,    pc_filecmd,  loadkeys
-               keyword kernel,    pc_kernel,   VK_KERNEL
-               keyword linux,     pc_kernel,   VK_LINUX
-               keyword boot,      pc_kernel,   VK_BOOT
-               keyword bss,       pc_kernel,   VK_BSS
-               keyword fdimage,   pc_kernel,   VK_FDIMAGE
-               keyword comboot,   pc_kernel,   VK_COMBOOT
-               keyword com32,     pc_kernel,   VK_COM32
-               keyword config,    pc_kernel,   VK_CONFIG
-               keyword label,     pc_label
-               keyword prompt,    pc_setint16, ForcePrompt
-               keyword say,       pc_say
-               keyword serial,    pc_serial
-               keyword console,   pc_setint16, DisplayCon
-               keyword timeout,   pc_timeout,  KbdTimeout
-               keyword totaltimeout, pc_timeout, TotalTimeout
-               keyword ontimeout, pc_ontimeout
-               keyword onerror,   pc_onerror
-               keyword allowoptions, pc_setint16, AllowOptions
-               keyword noescape,  pc_setint16, NoEscape
-               keyword f1,        pc_fkey,     FKeyName+(0<<FILENAME_MAX_LG2)
-               keyword f2,        pc_fkey,     FKeyName+(1<<FILENAME_MAX_LG2)
-               keyword f3,        pc_fkey,     FKeyName+(2<<FILENAME_MAX_LG2)
-               keyword f4,        pc_fkey,     FKeyName+(3<<FILENAME_MAX_LG2)
-               keyword f5,        pc_fkey,     FKeyName+(4<<FILENAME_MAX_LG2)
-               keyword f6,        pc_fkey,     FKeyName+(5<<FILENAME_MAX_LG2)
-               keyword f7,        pc_fkey,     FKeyName+(6<<FILENAME_MAX_LG2)
-               keyword f8,        pc_fkey,     FKeyName+(7<<FILENAME_MAX_LG2)
-               keyword f9,        pc_fkey,     FKeyName+(8<<FILENAME_MAX_LG2)
-               keyword f10,       pc_fkey,     FKeyName+(9<<FILENAME_MAX_LG2)
-               keyword f0,        pc_fkey,     FKeyName+(9<<FILENAME_MAX_LG2)
+               keyword menu,           pc_comment
+               keyword text,           pc_text
+               keyword append,         pc_append
+               keyword default,        pc_default
+               keyword display,        pc_filecmd,     get_msg_file
+               keyword font,           pc_filecmd,     loadfont
+               keyword implicit,       pc_setint16,    AllowImplicit
+               keyword kbdmap,         pc_filecmd,     loadkeys
 -              keyword kernel,         pc_kernel
++              keyword kernel,         pc_kernel,      VK_KERNEL
++              keyword linux,          pc_kernel,      VK_LINUX
++              keyword boot,           pc_kernel,      VK_BOOT
++              keyword bss,            pc_kernel,      VK_BSS
++              keyword fdimage,        pc_kernel,      VK_FDIMAGE
++              keyword comboot,        pc_kernel,      VK_COMBOOT
++              keyword com32,          pc_kernel,      VK_COM32
++              keyword config,         pc_kernel,      VK_CONFIG
+               keyword label,          pc_label
+               keyword prompt,         pc_setint16,    ForcePrompt
+               keyword say,            pc_say
+               keyword serial,         pc_serial
+               keyword console,        pc_setint16,    DisplayCon
+               keyword timeout,        pc_timeout,     KbdTimeout
+               keyword totaltimeout,   pc_timeout,     TotalTimeout
+               keyword ontimeout,      pc_ontimeout
+               keyword onerror,        pc_onerror
+               keyword allowoptions,   pc_setint16,    AllowOptions
+               keyword noescape,       pc_setint16,    NoEscape
+               keyword f1,             pc_fkey,        FKeyN(1)
+               keyword f2,             pc_fkey,        FKeyN(2)
+               keyword f3,             pc_fkey,        FKeyN(3)
+               keyword f4,             pc_fkey,        FKeyN(4)
+               keyword f5,             pc_fkey,        FKeyN(5)
+               keyword f6,             pc_fkey,        FKeyN(6)
+               keyword f7,             pc_fkey,        FKeyN(7)
+               keyword f8,             pc_fkey,        FKeyN(8)
+               keyword f9,             pc_fkey,        FKeyN(9)
+               keyword f10,            pc_fkey,        FKeyN(10)
+               keyword f0,             pc_fkey,        FKeyN(10)
  %if IS_PXELINUX
-               keyword ipappend,  pc_ipappend
+               keyword ipappend,       pc_ipappend
  %endif
  %if IS_PXELINUX || IS_ISOLINUX
-               keyword localboot, pc_localboot
+               keyword localboot,      pc_localboot
  %endif
  
  keywd_count   equ ($-keywd_table)/keywd_size

diff --cc parseconfig.inc
Simple merge