diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-10-24 14:41:00 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-10-24 14:41:00 +0100 |
| commit | a7115d314dda45324baccee6898a561ed253c8e1 (patch) | |
| tree | 02db40f456aa512205e06480611da3569692afef /doc/menu.txt | |
| parent | c5d8c3f1676afb21cc9f780b6161eaaab35730fc (diff) | |
| parent | 7307d60063ee4303da4de45f9d984fdc8df92146 (diff) | |
| download | syslinux-a7115d314dda45324baccee6898a561ed253c8e1.tar.gz | |
Merge branch 'master' into elflink
The following conflict is a result of the fact comapi_chainboot was
only stubbed out on the 'elflink' branch but was properly marked as
obsolete in 'master'.
Conflicts:
core/comboot.inc
Diffstat (limited to 'doc/menu.txt')
| -rw-r--r-- | doc/menu.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/menu.txt b/doc/menu.txt index 620527e6..8a999cd4 100644 --- a/doc/menu.txt +++ b/doc/menu.txt @@ -18,7 +18,7 @@ See menu/README for more information. +++ THE SIMPLE MENU SYSTEM +++ The simple menu system is a single module located at -com32/modules/vesamenu.c32 (graphical) or com32/modules/menu.c32 (text +com32/menu/vesamenu.c32 (graphical) or com32/menu/menu.c32 (text mode only). It uses the same configuration file as the regular Syslinux command line, and displays all the LABEL statements. |