diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-07-08 16:23:45 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-07-08 16:23:45 +0100 |
| commit | 3aa295d25bda39afee12b015523f222ce7940079 (patch) | |
| tree | 8219b4d91f53e09d1f375547595d611065e45976 /doc | |
| parent | 8eefc0dad8fe2c01b0d90d36f1cea8de8ac4d514 (diff) | |
| parent | 89794a3d0b8659e2a143faeffc77877b45754c52 (diff) | |
| download | syslinux-3aa295d25bda39afee12b015523f222ce7940079.tar.gz | |
Merge tag 'syslinux-5.11-pre8' into firmwaresyslinux-6.02-pre1
syslinux-5.11-pre8
Conflicts:
NEWS
com32/lib/Makefile
core/conio.c
mk/devel.mk
mk/elf.mk
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/syslinux.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/syslinux.txt b/doc/syslinux.txt index 43e20777..fd7396e3 100644 --- a/doc/syslinux.txt +++ b/doc/syslinux.txt @@ -158,8 +158,9 @@ IPAPPEND bitmask The SYSAPPEND option was introduced in Syslinux 5.10; it is an enhancement of a previous option IPAPPEND which was only - available on PXELINUX. bitmask is interpretted as decimal format - unless prefixed with "0x" for hexidecimal. + available on PXELINUX. bitmask is interpreted as decimal format + unless prefixed with "0x" for hexadecimal or "0" (zero) for + octal. 1: indicates that an option of the following format should be generated and added to the kernel command line: |