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

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>