diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-07-03 12:40:12 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-07-03 12:40:12 +0100 |
| commit | 1db8853baddaaa8a0b7c6e399224136372f55b03 (patch) | |
| tree | c7b351d740b16c31319caf53503e89eab2026b83 | |
| parent | 6bdbba2ff6d6e6235ba59e083eebaa6baa42350f (diff) | |
| parent | 277ba6f363780a924d5ec129923bf54313256834 (diff) | |
| download | syslinux-1db8853baddaaa8a0b7c6e399224136372f55b03.tar.gz | |
Merge branch 'doc-for-mfleming' of git://github.com/geneC/syslinux into elflinksyslinux-5.11-pre6
Pull doc/ and txt/ spelling corrections from Gene Cumm,
* 'doc-for-mfleming' of git://github.com/geneC/syslinux:
doc/ & txt/: Spelling fix
| -rw-r--r-- | doc/syslinux.txt | 5 | ||||
| -rw-r--r-- | txt/syslinux.cfg.txt | 6 |
2 files changed, 6 insertions, 5 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: diff --git a/txt/syslinux.cfg.txt b/txt/syslinux.cfg.txt index f9e02b6b..a06fe050 100644 --- a/txt/syslinux.cfg.txt +++ b/txt/syslinux.cfg.txt @@ -128,9 +128,9 @@ section can be used to override a global *APPEND*. (*SYSAPPEND*: 5.10+; *IPAPPEND*: *PXELINUX* only) 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. The 'bitmask' is an OR (sum) of the -following integer options: +*PXELINUX*. 'bitmask' is interpreted as decimal format unless prefixed +with "0x" for hexadecimal or "0" (zero) for octal. The 'bitmask' is an +OR (sum) of the following integer options: ifndef::doctype-manpage[[horizontal]] *1*::: An option of the following format should be generated, based on |