doc: document warning improvements

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

2 files changed, 16 insertions, 2 deletions

diff --git a/doc/changes.src b/doc/changes.src
index ab43d604..b6c987c0 100644
--- a/doc/changes.src
+++ b/doc/changes.src
@@ -19,7 +19,13 @@ since 2007.
 
 \b If the MASM PTR keyword is encountered, issue a warning.  This is
    much more likely to indicate a MASM-ism encountered in NASM than it
-   is a valid label.  This warning can be suppressed with -w-ptr.
+   is a valid label.  This warning can be suppressed with \c{-w-ptr},
+   the \c{[warning]} directive (see \k{opt-w}) or by the macro
+   definition \c{%idefine ptr %??}.
+
+\b When an error or a warning comes from the expansion of a multi-line
+   macro, display the file and line numbers for the expanded macros.
+   Macros defined with \c{.nolist} do not get displayed.
 
 
 \S{cl-2.12.01} Version 2.12.01
diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src
index 55be9d97..f38a9ce3 100644
--- a/doc/nasmdoc.src
+++ b/doc/nasmdoc.src
@@ -963,13 +963,21 @@ Enabled by default.
 form of jmp instruction becomes jmp short form.
 Enabled by default.
 
+\b \i\c{zext-reloc} warns that a relocation has been zero-extended due
+to limitations in the output format.
+
+\b \i\c\{ptr} warns about keywords used in other assemblers that might
+indicate a mistake in the source code.  Currently only the MASM
+\c{PTR} keyword is recognized.
+
 \b \i\c{error} causes warnings to be treated as errors.  Disabled by
 default.
 
 \b \i\c{all} is an alias for \e{all} suppressible warning classes (not
 including \c{error}).  Thus, \c{-w+all} enables all available warnings.
 
-In addition, you can set warning classes across sections.
+In addition, you can control warnings in the source code itself, using
+the \i\c{[warning]} directive.
 Warning classes may be enabled with \i\c{[warning +warning-name]},
 disabled with \i\c{[warning -warning-name]} or reset to their
 original value with \i\c{[warning *warning-name]}. No "user form"