aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-03-30 16:17:59 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-03-30 16:17:59 -0700
commit52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c (patch)
tree0ef759bffc55ed0f7811805440f58412e6ba3d8f /doc
parentd6fb0861c55f062797c8706f484bd47ae0f94568 (diff)
parentdcecb9f395f3ca0da3df774cb6102d885894bf84 (diff)
downloadsyslinux-52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c.tar.gz
syslinux-52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c.tar.xz
syslinux-52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c.zip
Merge branch 'master' into pathbased
Resolved Conflicts: com32/modules/Makefile core/comboot.inc core/cpuinit.inc core/idle.inc Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/comboot.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/comboot.txt b/doc/comboot.txt
index 0f64097a..f39d7243 100644
--- a/doc/comboot.txt
+++ b/doc/comboot.txt
@@ -262,6 +262,10 @@ AX=0001h [2.00] Get Version
This API call returns the Syslinux version and API
information.
+ Note: before version 3.86, the version string had a leading CR LF
+ and the copyright string had a leading space. The strings might
+ still contain trailing CR and/or LF.
+
AX=0002h [2.01] Write String