aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-05-28 15:43:05 +0200
committerBjörn-Egil Dahlberg <[email protected]>2015-05-28 15:43:05 +0200
commit6fe0fae81adf2f6a222dccb3222309e205c6ffdc (patch)
treea6d4e2c6cd7ec700f890dc47a5febeb03ff29498 /erts/doc/src
parent2925fbba49237ff6b6e2691f52c4afb2c0447e46 (diff)
parent09b461e9c851abfaf7e1d697232e3af3ddedce9f (diff)
downloadotp-6fe0fae81adf2f6a222dccb3222309e205c6ffdc.tar.gz
otp-6fe0fae81adf2f6a222dccb3222309e205c6ffdc.tar.bz2
otp-6fe0fae81adf2f6a222dccb3222309e205c6ffdc.zip
Merge branch 'richcarl/warnings-by-default/OTP-12781'
* richcarl/warnings-by-default/OTP-12781: stdlib: Use warning channel in test qlc_SUITE:otp_6964/1 stdlib: Fix testcase for qlc_SUITE kernel: Fix code_SUITE with respect to new logger default Map error logger warnings to warning messages by default
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/erl.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index ea94a4e82b..98d05dc7de 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -1322,13 +1322,14 @@
<item>
<p>Verbose.</p>
</item>
- <tag><c><![CDATA[+W w | i]]></c></tag>
+ <tag><c><![CDATA[+W w | i | e]]></c></tag>
<item>
<p>Sets the mapping of warning messages for <c><![CDATA[error_logger]]></c>.
Messages sent to the error logger using one of the warning
- routines can be mapped either to errors (default), warnings
- (<c><![CDATA[+W w]]></c>), or info reports (<c><![CDATA[+W i]]></c>). The current
- mapping can be retrieved using
+ routines can be mapped either to errors (<c><![CDATA[+W e]]></c>),
+ warnings (<c><![CDATA[+W w]]></c>), or info reports
+ (<c><![CDATA[+W i]]></c>). The default is warnings.
+ The current mapping can be retrieved using
<c><![CDATA[error_logger:warning_map/0]]></c>. See
<seealso marker="kernel:error_logger#warning_map/0">error_logger(3)</seealso>
for further information.</p>