summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-07-15 16:32:49 -0400
committerH. Peter Anvin <hpa@zytor.com>2009-07-15 16:32:49 -0400
commit67d520c7fa2d350295ffca7a74cf0e9b337d13e5 (patch)
treea5a64cd8d2aa889bd7e697dfe9317aeed2995b9f /doc
parentd46ac3c87d2d7565ff12b7ded4dfe77b376e499a (diff)
parentcc6ee1acf218c51f4565cbb8a5b868b5df31251b (diff)
downloadnasm-67d520c7fa2d350295ffca7a74cf0e9b337d13e5.tar.gz
nasm-67d520c7fa2d350295ffca7a74cf0e9b337d13e5.tar.bz2
nasm-67d520c7fa2d350295ffca7a74cf0e9b337d13e5.zip
Merge branch 'master' into new-preproc
Diffstat (limited to 'doc')
-rw-r--r--doc/changes.src3
-rw-r--r--doc/nasmdoc.src8
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/changes.src b/doc/changes.src
index 4a15ae7..df96ebc 100644
--- a/doc/changes.src
+++ b/doc/changes.src
@@ -37,6 +37,9 @@ since 2007.
\b Support for 64-bit Mach-O output, see \k{machofmt}.
+\b Fix assert failure on certain operations that involve high-bit
+ characters that don't form valid UTF-8 sequences.
+
\S{cl-2.06} Version 2.06
diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src
index 272d5b2..ac49561 100644
--- a/doc/nasmdoc.src
+++ b/doc/nasmdoc.src
@@ -4566,7 +4566,7 @@ given may be any power of two.\I{section alignment, in
bin}\I{segment alignment, in bin}\I{alignment, in bin sections}
-\S{multisec} \i\c{Multisection}\I{bin, multisection} support for the BIN format.
+\S{multisec} \i{Multisection}\I{bin, multisection} Support for the \c{bin} Format
The \c{bin} format allows the use of multiple sections, of arbitrary names,
besides the "known" \c{.text}, \c{.data}, and \c{.bss} names.
@@ -4609,7 +4609,7 @@ alignment has been specified.
\b NASM creates the \c{section.<secname>.start} for each section,
which may be used in your code.
-\S{map}\i{Map files}
+\S{map}\i{Map Files}
Map files can be generated in \c{-f bin} format by means of the \c{[map]}
option. Map types of \c{all} (default), \c{brief}, \c{sections}, \c{segments},
@@ -5755,7 +5755,7 @@ To avoid it, you should start module names with \I{$, prefix}\c{$}, like:
\c module $kernel.core
-\S{rdfglob} \c{rdf} Extensions to the \c{GLOBAL} directive\I{GLOBAL,
+\S{rdfglob} \c{rdf} Extensions to the \c{GLOBAL} Directive\I{GLOBAL,
rdf extensions to}
\c{RDOFF} global symbols can contain additional information needed by
@@ -5780,7 +5780,7 @@ or \i\c{object} to the directive:
\c global kernel_ticks:export data
-\S{rdfimpt} \c{rdf} Extensions to the \c{EXTERN} directive\I{EXTERN,
+\S{rdfimpt} \c{rdf} Extensions to the \c{EXTERN} Directive\I{EXTERN,
rdf extensions to}
By default the \c{EXTERN} directive in \c{RDOFF} declares a "pure external"