Merge branch 'siri/logger-fix'

* siri/logger-fix:
  Update documentation of logger and error_logger
  Change type name logger:log() to logger:log_event()
  Update preloaded
  Update primary bootstrap
  Rename module logger_simple to logger_simple_h
  Change env var logger_log_progress to logger_progress_reports
  Remove HandlerId from handler callback functions and add it to Config
  Change handler id for sasl handler from sasl_h to sasl
  Change Compare parameter to logger_filters:domain/2
  Update Logger documentation
  Rename reset_module_level to unset_module_level
  Allow chars_limit to limit strings
  Add logger:update_formatter_config/2,3
  Set legacy_header=true for kernel's default handler only
  Improve documentation of logger and error_logger
  Use system_time instead of monotonic_time as timestamp in logger

46 files changed, 1985 insertions, 1265 deletions

diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
index 7ecc2e4298..3957c0f4a5 100644
--- a/lib/common_test/doc/src/ct_hooks_chapter.xml
+++ b/lib/common_test/doc/src/ct_hooks_chapter.xml
@@ -501,12 +501,13 @@
        <tag><c>cth_log_redirect</c></tag>
        <item>
        <p>Built-in</p>
-       <p>Captures all <c>error_logger</c> and SASL logging
-	events and prints them to the current test case log. If an event cannot be 
-	associated with a test case, it is printed in the <c>Common Test</c> framework log. 
+       <p>Captures all log events that would normally be printed by the default
+        logger handler, and prints them to the current test case log.
+	If an event cannot be associated with a test case, it is printed in
+	the <c>Common Test</c> framework log.
 	This happens for test cases running in parallel and events occuring
 	in-between test cases. You can configure the level of
-	<seealso marker="sasl:sasl_app">SASL</seealso> events report
+	<seealso marker="sasl:sasl_app">SASL</seealso> reports
 	using the normal SASL mechanisms.</p>
        </item>
        <tag><c>cth_surefire</c></tag>
diff --git a/lib/kernel/doc/src/error_logger.xml b/lib/kernel/doc/src/error_logger.xml
index c9fe9484e4..f418aa5bbe 100644
--- a/lib/kernel/doc/src/error_logger.xml
+++ b/lib/kernel/doc/src/error_logger.xml
@@ -33,44 +33,35 @@
   <description>
 
     <note>
-      <p>In OTP-21, a new API for logging was added to Erlang/OTP. The
+      <p>In Erlang/OTP 21.0, a new API for logging was added. The
 	old <c>error_logger</c> module can still be used by legacy
-	code, but new code should use the new API instead.</p>
+	code, but log events are redirected to the new Logger API. New
+	code should use the Logger API directly.</p>
+      <p><c>error_logger</c> is no longer started by default, but is
+	automatically started when an event handler is added
+	with <c>error_logger:add_report_handler/1,2</c>. The <c>error_logger</c>
+	module is then also added as a handler to the new logger.</p>
       <p>See  <seealso marker="logger"><c>logger(3)</c></seealso> and
 	the <seealso marker="logger_chapter">Logging</seealso> chapter
-	in the user's guide for more information.</p>
+	in the User's Guide for more information.</p>
     </note>
 
     <p>The Erlang <em>error logger</em> is an event manager (see
       <seealso marker="doc/design_principles:des_princ">OTP Design Principles</seealso> and
       <seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>),
-      registered as <c>error_logger</c>. Errors, warnings, and info events
-      are sent to the error logger from the Erlang runtime system and
-      the different Erlang/OTP applications. The events are, by default,
-      logged to the terminal. Notice that an event from a process <c>P</c> is
-      logged at the node of the group leader of <c>P</c>. This means
-      that log output is directed to the node from which a process was
-      created, which not necessarily is the same node as where it is
-      executing.</p>
-    <p>Initially, <c>error_logger</c> has only a primitive event
-      handler, which buffers and prints the raw event messages. During
-      system startup, the Kernel application replaces this with a
-      <em>standard event handler</em>, by default one that writes
-      nicely formatted output to the terminal. Kernel can also be
-      configured so that events are logged to a file instead, or not logged at all,
-      see <seealso marker="kernel_app"><c>kernel(6)</c></seealso>.</p>
-    <p>Also the SASL application, if started, adds its own event
-      handler, which by default writes supervisor, crash, and progress
-      reports to the terminal. See
-      <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso>.</p>
-    <p>It is recommended that user-defined applications report
-      errors through the error logger to get uniform reports.
-      User-defined event handlers can be added to handle application-specific
-      events, see
-      <seealso marker="#add_report_handler/1"><c>add_report_handler/1,2</c></seealso>.
-      Also, a useful event handler is provided in STDLIB for multi-file
-      logging of events, see
-      <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>.</p>
+      registered as <c>error_logger</c>.</p>
+    <p>Error logger is no longer started by default, but is
+      automatically started when an event handler is added
+      with <seealso marker="#add_report_handler/1">
+	<c>add_report_handler/1,2</c></seealso>. The <c>error_logger</c>
+      module is then also added as a handler to the new logger,
+      causing log events to be forwarded from logger to error logger,
+      and consequently to all installed error logger event
+      handlers.</p>
+    <p>User-defined event handlers can be added to handle application-specific
+      events.</p>
+    <p>Existing event handlers provided by STDLIB and SASL are still
+      available, but are no longer used by OTP.</p>
     <p>Warning events were introduced in Erlang/OTP R9C and are enabled
       by default as from Erlang/OTP 18.0. To retain backwards compatibility
       with existing user-defined event handlers, the warning events can be
@@ -99,6 +90,9 @@
           The function returns <c>ok</c> if successful.</p>
         <p>The event handler must be able to handle the events in this module, see
           section <seealso marker="#events">Events</seealso>.</p>
+	<p>The first time this function is called,
+	  <c>error_logger</c> is added as a Logger handler, and
+	  the <c>error_logger</c> process is started.</p>
       </desc>
     </func>
     <func>
@@ -108,37 +102,40 @@
         <p>Deletes an event handler from the error logger by calling
           <c>gen_event:delete_handler(error_logger, <anno>Handler</anno>, [])</c>,
           see <seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>.</p>
+	<p>If no more event handlers exist after the deletion,
+	  <c>error_logger</c> is removed as a Logger handler, and
+	  the <c>error_logger</c> process is stopped.</p>
       </desc>
     </func>
     <func>
       <name name="error_msg" arity="1"/>
       <name name="error_msg" arity="2"/>
       <name name="format" arity="2"/>
-      <fsummary>Send a standard error event to the error logger.</fsummary>
+      <fsummary>Log a standard error event.</fsummary>
       <desc>
-        <p>Sends a standard error event to the error logger.
-          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments
-	  are the same as the arguments of
+        <p>Log a standard error event. The <c><anno>Format</anno></c>
+          and <c><anno>Data</anno></c> arguments are the same as the
+          arguments of
 	  <seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
-	  in STDLIB.
-	  The event is handled by the standard event handler.</p>
+	  in STDLIB.</p>
+        <p>Error logger forwards the event to Logger, including
+          metadata that allows backwards compatibility with legacy
+          error logger event handlers.</p>
+	<p>The event is handled by the default Logger handler.</p>
+	<p>These functions are kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_ERROR</c></seealso> macro or
+	  <seealso marker="logger#error-1"><c>logger:error/1,2,3</c></seealso>
+	  instead.</p>
 	<p><em>Example:</em></p>
         <pre>
-1> <input>error_logger:error_msg("An error occurred in ~p~n", [a_module]).</input>
-
-=ERROR REPORT==== 11-Aug-2005::14:03:19 ===
+1> <input>error_logger:error_msg("An error occurred in ~p", [a_module]).</input>
+=ERROR REPORT==== 22-May-2018::11:18:43.376917 ===
 An error occurred in a_module
 ok</pre>
         <warning>
-          <p>If called with bad arguments, this function can crash
-            the standard event handler, meaning no further events are
-            logged. When in doubt, use
-	  <seealso marker="#error_report/1"><c>error_report/1</c></seealso>
-	  instead.</p>
-        </warning>
-        <warning>
           <p>If the Unicode translation modifier (<c>t</c>) is used in
-            the format string, all error handlers must ensure that the
+            the format string, all event handlers must ensure that the
             formatted output is correctly encoded for the I/O
             device.</p>
         </warning>
@@ -146,36 +143,51 @@ ok</pre>
     </func>
     <func>
       <name name="error_report" arity="1"/>
-      <fsummary>Send a standard error report event to the error logger.</fsummary>
+      <fsummary>Log a standard error event.</fsummary>
       <desc>
-        <p>Sends a standard error report event to the error logger.
-          The event is handled by the standard event handler.</p>
+        <p>Log a standard error event. Error logger forwards the event
+          to Logger, including metadata that allows backwards
+          compatibility with legacy error logger event handlers.</p>
+	<p>The event is handled by the default Logger handler.</p>
+	<p>This functions is kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_ERROR</c></seealso> macro or
+	  <seealso marker="logger#error-1"><c>logger:error/1,2,3</c></seealso>
+	  instead.</p>
 	<p><em>Example:</em></p>
         <pre>
 2> <input>error_logger:error_report([{tag1,data1},a_term,{tag2,data}]).</input>
-
-=ERROR REPORT==== 11-Aug-2005::13:45:41 ===
+=ERROR REPORT==== 22-May-2018::11:24:23.699306 ===
     tag1: data1
     a_term
     tag2: data
 ok
 3> <input>error_logger:error_report("Serious error in my module").</input>
-
-=ERROR REPORT==== 11-Aug-2005::13:45:49 ===
+=ERROR REPORT==== 22-May-2018::11:24:45.972445 ===
 Serious error in my module
 ok</pre>
       </desc>
     </func>
     <func>
       <name name="error_report" arity="2"/>
-      <fsummary>Send a user-defined error report event to the error logger.</fsummary>
+      <fsummary>Log a user-defined error event.</fsummary>
       <desc>
-        <p>Sends a user-defined error report event to the error logger.
-          An event handler to handle the event is supposed to have been
-          added. The event is ignored by the standard event handler.</p>
+        <p>Log a user-defined error event. Error logger forwards the
+          event to Logger, including metadata that allows backwards
+          compatibility with legacy error logger event handlers.</p>
+	<p>Error logger also adds a <c>domain</c> field with
+          value <c>[<anno>Type</anno>]</c> to this event's metadata,
+          causing the filters of the default Logger handler to discard
+          the event. A different Logger handler, or an error logger
+          event handler, must be added to handle this event.</p>
         <p>It is recommended that <c><anno>Report</anno></c> follows the same
           structure as for
 	<seealso marker="#error_report/1"><c>error_report/1</c></seealso>.</p>
+	<p>This functions is kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_ERROR</c></seealso> macro or
+	  <seealso marker="logger#error-1"><c>logger:error/1,2,3</c></seealso>
+	  instead.</p>
       </desc>
     </func>
     <func>
@@ -192,37 +204,40 @@ ok</pre>
 	    is <seealso marker="kernel_app#deprecated-configuration-parameters">
 	    deprecated</seealso> since
 	    the <seealso marker="logger">Logger API</seealso> was
-	    introduced in OTP-21. The variable, and this function, are
-	    kept for backwards compatibility since they still might be
-	    used by legacy report handlers.</p>
+	    introduced in Erlang/OTP 21.0. The variable, and this
+	    function, are kept for backwards compatibility since they
+	    still might be used by legacy report handlers.</p>
 	</note>
       </desc>
     </func>
     <func>
       <name name="info_msg" arity="1"/>
       <name name="info_msg" arity="2"/>
-      <fsummary>Send a standard information event to the error logger.</fsummary>
+      <fsummary>Log a standard information event.</fsummary>
       <desc>
-        <p>Sends a standard information event to the error logger.
-          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments
-	  are the same as the arguments of
+        <p>Log a standard information event. The <c><anno>Format</anno></c>
+          and <c><anno>Data</anno></c> arguments are the same as the
+          arguments of
 	  <seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
-	  in STDLIB. The event is handled by the standard event handler.</p>
+	  in STDLIB.</p>
+        <p>Error logger forwards the event to Logger, including
+          metadata that allows backwards compatibility with legacy
+          error logger event handlers.</p>
+	<p>The event is handled by the default Logger handler.</p>
+	<p>These functions are kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_INFO</c></seealso> macro or
+	  <seealso marker="logger#info-1"><c>logger:info/1,2,3</c></seealso>
+	  instead.</p>
 	<p><em>Example:</em></p>
         <pre>
-1> <input>error_logger:info_msg("Something happened in ~p~n", [a_module]).</input>
-
-=INFO REPORT==== 11-Aug-2005::14:06:15 ===
+1> <input>error_logger:info_msg("Something happened in ~p", [a_module]).</input>
+=INFO REPORT==== 22-May-2018::12:03:32.612462 ===
 Something happened in a_module
 ok</pre>
         <warning>
-          <p>If called with bad arguments, this function can crash
-            the standard event handler, meaning no further events are
-            logged. When in doubt, use <c>info_report/1</c> instead.</p>
-        </warning>
-        <warning>
           <p>If the Unicode translation modifier (<c>t</c>) is used in
-            the format string, all error handlers must ensure that the
+            the format string, all event handlers must ensure that the
             formatted output is correctly encoded for the I/O
             device.</p>
         </warning>
@@ -230,37 +245,52 @@ ok</pre>
     </func>
     <func>
       <name name="info_report" arity="1"/>
-      <fsummary>Send a standard information report event to the error logger.</fsummary>
+      <fsummary>Log a standard information event.</fsummary>
       <desc>
-        <p>Sends a standard information report event to the error
-          logger. The event is handled by the standard event handler.</p>
+        <p>Log a standard information event. Error logger forwards the
+          event to Logger, including metadata that allows backwards
+          compatibility with legacy error logger event handlers.</p>
+	<p>The event is handled by the default Logger handler.</p>
+	<p>This functions is kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_INFO</c></seealso> macro or
+	  <seealso marker="logger#info-1"><c>logger:info/1,2,3</c></seealso>
+	  instead.</p>
 	<p><em>Example:</em></p>
         <pre>
 2> <input>error_logger:info_report([{tag1,data1},a_term,{tag2,data}]).</input>
-
-=INFO REPORT==== 11-Aug-2005::13:55:09 ===
+=INFO REPORT==== 22-May-2018::12:06:35.994440 ===
     tag1: data1
     a_term
     tag2: data
 ok
 3> <input>error_logger:info_report("Something strange happened").</input>
-
-=INFO REPORT==== 11-Aug-2005::13:55:36 ===
+=INFO REPORT==== 22-May-2018::12:06:49.066872 ===
 Something strange happened
 ok</pre>
       </desc>
     </func>
     <func>
       <name name="info_report" arity="2"/>
-      <fsummary>Send a user-defined information report event to the error logger.</fsummary>
+      <fsummary>Log a user-defined information event.</fsummary>
       <desc>
-        <p>Sends a user-defined information report event to the error
-          logger. An event handler to handle the event is supposed to
-          have been added. The event is ignored by the standard event
-          handler.</p>
+        <p>Log a user-defined information event. Error logger forwards
+          the event to Logger, including metadata that allows
+          backwards compatibility with legacy error logger event
+          handlers.</p>
+	<p>Error logger also adds a <c>domain</c> field with
+          value <c>[<anno>Type</anno>]</c> to this event's metadata,
+          causing the filters of the default Logger handler to discard
+          the event. A different Logger handler, or an error logger
+          event handler, must be added to handle this event.</p>
         <p>It is recommended that <c><anno>Report</anno></c> follows the same
           structure as for
 	<seealso marker="#info_report/1"><c>info_report/1</c></seealso>.</p>
+	<p>This functions is kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_INFO</c></seealso> macro or
+	  <seealso marker="logger#info-1"><c>logger:info/1,2,3</c></seealso>
+	  instead.</p>
       </desc>
     </func>
     <func>
@@ -359,24 +389,27 @@ ok</pre>
     <func>
       <name name="warning_msg" arity="1"/>
       <name name="warning_msg" arity="2"/>
-      <fsummary>Send a standard warning event to the error logger.</fsummary>
+      <fsummary>Log a standard warning event.</fsummary>
       <desc>
-        <p>Sends a standard warning event to the error logger.
-          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments
-	  are the same as the arguments of
+        <p>Log a standard warning event. The <c><anno>Format</anno></c>
+          and <c><anno>Data</anno></c> arguments are the same as the
+          arguments of
 	  <seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
-	  in STDLIB.
-	  The event is handled by the standard event handler. It is tagged
-	  as an error, warning, or info, see
+	  in STDLIB.</p>
+        <p>Error logger forwards the event to Logger, including
+          metadata that allows backwards compatibility with legacy
+          error logger event handlers.</p>
+	<p>The event is handled by the default Logger handler. The log
+	  level can be changed to error or info, see
           <seealso marker="#warning_map/0"><c>warning_map/0</c></seealso>.</p>
-        <warning>
-          <p>If called with bad arguments, this function can crash
-            the standard event handler, meaning no further events are
-            logged. When in doubt, use <c>warning_report/1</c> instead.</p>
-        </warning>
+	<p>These functions are kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_WARNING</c></seealso> macro or
+	  <seealso marker="logger#warning-1"><c>logger:warning/1,2,3</c></seealso>
+	  instead.</p>
         <warning>
           <p>If the Unicode translation modifier (<c>t</c>) is used in
-            the format string, all error handlers must ensure that the
+            the format string, all event handlers must ensure that the
             formatted output is correctly encoded for the I/O
             device.</p>
         </warning>
@@ -384,24 +417,43 @@ ok</pre>
     </func>
     <func>
       <name name="warning_report" arity="1"/>
-      <fsummary>Send a standard warning report event to the error logger.</fsummary>
+      <fsummary>Log a standard warning event.</fsummary>
       <desc>
-        <p>Sends a standard warning report event to the error logger.
-          The event is handled by the standard event handler. It is
-          tagged as an error, warning, or info, see
+        <p>Log a standard warning event. Error logger forwards the event
+          to Logger, including metadata that allows backwards
+          compatibility with legacy error logger event handlers.</p>
+	<p>The event is handled by the default Logger handler. The log
+	  level can be changed to error or info, see
           <seealso marker="#warning_map/0"><c>warning_map/0</c></seealso>.</p>
+	<p>This functions is kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_WARNING</c></seealso> macro or
+	  <seealso marker="logger#warning-1"><c>logger:warning/1,2,3</c></seealso>
+	  instead.</p>
       </desc>
     </func>
     <func>
       <name name="warning_report" arity="2"/>
-      <fsummary>Send a user-defined warning report event to the error logger.</fsummary>
+      <fsummary>Log a user-defined warning event.</fsummary>
       <desc>
-        <p>Sends a user-defined warning report event to the error
-          logger. An event handler to handle the event is supposed to
-          have been added. The event is ignored by the standard event
-          handler. It is tagged as an error, warning, or info,
-          depending on the value of
+        <p>Log a user-defined warning event. Error logger forwards the
+          event to Logger, including metadata that allows backwards
+          compatibility with legacy error logger event handlers.</p>
+	<p>Error logger also adds a <c>domain</c> field with
+          value <c>[<anno>Type</anno>]</c> to this event's metadata,
+          causing the filters of the default Logger handler to discard
+          the event. A different Logger handler, or an error logger
+          event handler, must be added to handle this event.</p>
+	<p>The log level can be changed to error or info, see
           <seealso marker="#warning_map/0"><c>warning_map/0</c></seealso>.</p>
+        <p>It is recommended that <c><anno>Report</anno></c> follows the same
+          structure as for
+	<seealso marker="#warning_report/1"><c>warning_report/1</c></seealso>.</p>
+	<p>This functions is kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_WARNING</c></seealso> macro or
+	  <seealso marker="logger#warning-1"><c>logger:warning/1,2,3</c></seealso>
+	  instead.</p>
       </desc>
     </func>
   </funcs>
@@ -465,8 +517,9 @@ ok</pre>
   <section>
     <title>See Also</title>
     <p><seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>,
-       <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>
-       <seealso marker="kernel_app"><c>kernel(6)</c></seealso>
+       <seealso marker="kernel:logger"><c>logger(3)</c></seealso>,
+       <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>,
+       <seealso marker="kernel_app"><c>kernel(6)</c></seealso>,
        <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso></p>
   </section>
 </erlref>
diff --git a/lib/kernel/doc/src/introduction_chapter.xml b/lib/kernel/doc/src/introduction_chapter.xml
index 6e6990ddda..2eadc70abf 100644
--- a/lib/kernel/doc/src/introduction_chapter.xml
+++ b/lib/kernel/doc/src/introduction_chapter.xml
@@ -46,7 +46,6 @@
       <item>Start, stop, supervision, configuration, and distribution of applications</item>
       <item>Code loading</item>
       <item>Logging</item>
-      <item>Error logging</item>
       <item>Global name service</item>
       <item>Supervision of Erlang/OTP</item>
       <item>Communication with sockets</item>
diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index 7cd05dab14..e2a6d30249 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -42,7 +42,6 @@
       <item>Start, stop, supervision, configuration, and distribution of applications</item>
       <item>Code loading</item>
       <item>Logging</item>
-      <item>Error logging</item>
       <item>Global name service</item>
       <item>Supervision of Erlang/OTP</item>
       <item>Communication with sockets</item>
@@ -193,10 +192,10 @@
 	  will not log any progress-, crash-, or supervisor reports.
           If the SASL application is started,
 	  these log events will be sent to a second handler instance
-	  named <c>sasl_h</c>, according to values of the SASL
-	  environment variables <c>sasl_error_logger</c>
+	  named <c>sasl</c>, according to values of the SASL
+	  configuration parameter <c>sasl_error_logger</c>
 	  and <c>sasl_errlog_type</c>, see
-	  <seealso marker="sasl:sasl_app#configuration">SASL(6)
+	  <seealso marker="sasl:sasl_app#deprecated_error_logger_config">sasl(6)
 	</seealso></p>
 	<p>The default value is <c>false</c>.</p>
 	<p>See chapter <seealso marker="logger_chapter#compatibility">Backwards
@@ -205,17 +204,17 @@
         <note><p>This configuration option only effects the <c>default</c>
           and <c>sasl</c> handler. Any other handlers are uneffected.</p></note>
       </item>
-      <tag><marker id="logger_log_progress"/>
-	<c>logger_log_progress = boolean()</c></tag>
+      <tag><marker id="logger_progress_reports"/>
+	<c>logger_progress_reports = stop | log</c></tag>
       <item>
 	<p>If <c>logger_sasl_compatible = false</c>,
-	  then <c>logger_log_progress</c> specifies if progress
+	  then <c>logger_progress_reports</c> specifies if progress
 	  reports from <c>supervisor</c>
 	  and <c>application_controller</c> shall be logged by the
           default logger.</p>
 	<p>If <c>logger_sasl_compatible = true</c>,
-	  then <c>logger_log_progress</c> is ignored.</p>
-        <p>The default value is <c>false</c></p>
+	  then <c>logger_progress_reports</c> is ignored.</p>
+        <p>The default value is <c>stop</c></p>
         <note><p>This configuration option only effects the <c>default</c>
           and <c>sasl</c> handler. Any other handlers are uneffected.</p></note>
       </item>
@@ -271,7 +270,7 @@
       <tag><c>inet_parse_error_log = silent</c></tag>
       <item>
         <p>If set, no
-          <c>error_logger</c> messages are generated when erroneous
+          <c>logger</c> messages are generated when erroneous
           lines are found and skipped in the various Inet configuration
           files.</p>
       </item>
@@ -482,13 +481,13 @@ MaxT = TickTime + TickTime / 4</code>
 
   <section>
     <title>Deprecated Configuration Parameters</title>
-    <p>In OTP-21, a new API for logging was added to Erlang/OTP. The
+    <p>In Erlang/OTP 21.0, a new API for logging was added. The
       old <c>error_logger</c> event manager, and event handlers
-      running on this manager, will still work, but they are not used
+      running on this manager, still work, but they are no longer used
       by default.</p>
-    <p>The following application environment variables can still be
-      set, but they will only be used if the corresponding new logger
-      variables are not set.</p>
+    <p>The following application configuration parameters can still be
+      set, but they are only used if the corresponding configuration
+      parameters for Logger are not set.</p>
     <taglist>
       <tag><c>error_logger</c></tag>
       <item>Replaced by setting the type of the default
@@ -519,12 +518,12 @@ erl -kernel logger '[{handler,default,logger_std_h,#{formatter=>{logger_formatte
       <seealso marker="disk_log"><c>disk_log(3)</c></seealso>,
       <seealso marker="erl_boot_server"><c>erl_boot_server(3)</c></seealso>,
       <seealso marker="erl_ddll"><c>erl_ddll(3)</c></seealso>,
-      <seealso marker="error_logger"><c>error_logger(3)</c></seealso>,
       <seealso marker="file"><c>file(3)</c></seealso>,
       <seealso marker="global"><c>global(3)</c></seealso>,
       <seealso marker="global_group"><c>global_group(3)</c></seealso>,
       <seealso marker="heart"><c>heart(3)</c></seealso>,
       <seealso marker="inet"><c>inet(3)</c></seealso>,
+      <seealso marker="logger"><c>logger(3)</c></seealso>,
       <seealso marker="net_kernel"><c>net_kernel(3)</c></seealso>,
       <seealso marker="os"><c>os(3)</c></seealso>,
       <seealso marker="pg2"><c>pg2(3)</c></seealso>,
diff --git a/lib/kernel/doc/src/logger.xml b/lib/kernel/doc/src/logger.xml
index 2ee1059df8..911eb158da 100644
--- a/lib/kernel/doc/src/logger.xml
+++ b/lib/kernel/doc/src/logger.xml
@@ -33,23 +33,24 @@
     <file>logger.xml</file>
   </header>
   <module>logger</module>
-  <modulesummary>API module for the logger.</modulesummary>
+  <modulesummary>API module for logging in Erlang/OTP.</modulesummary>
 
   <description>
     <p>
-      This module is the main logger API. It contains functions that allow
-      application to use a single log API and the system to manage those log
-      events independently. To log events the logger
-      <seealso marker="#macros">macros</seealso> should be used. For instance,
-      to log a new error log event:</p>
+      This module is the main API for logging in Erlang/OTP. It
+      contains functions that allow applications to use a single log
+      API and the system to manage those log events independently. Use
+      the <seealso marker="#emergency-1">API functions</seealso> or the log
+      <seealso marker="#macros">macros</seealso> to log events. For instance,
+      to log a new error event:</p>
       <code>
 ?LOG_ERROR("error happened because: ~p",[Reason]). %% With macro
 logger:error("error happened because: ~p",[Reason]). %% Without macro
       </code>
-      <p>This log event will then be sent to the configured log handlers which
-      by default means that it will be printed to the console. If you want
+      <p>This log event is then sent to the configured log handlers which
+      by default means that it is be printed to the console. If you want
       your systems logs to be printed to a file instead of the console you
-      have to configure the default handler to do so. The simplest way is
+      must configure the default handler to do so. The simplest way is
       to include the following in your <seealso marker="config"><c>sys.config</c></seealso>.</p>
       <code>
 [{kernel,
@@ -63,7 +64,7 @@ logger:error("error happened because: ~p",[Reason]). %% Without macro
     <list type="bulleted">
       <item>how to use the API,
         see <seealso marker="logger_chapter">the User's Guide</seealso>.</item>
-      <item>how to configure logger,
+      <item>how to configure Logger,
         see the <seealso marker="logger_chapter#configuration">Configuration</seealso>
         section in the User's Guide.</item>
       <item>the convinience macros in logger.hrl,
@@ -86,7 +87,7 @@ logger:error("error happened because: ~p",[Reason]). %% Without macro
       </desc>
     </datatype>
     <datatype>
-      <name name="log"/>
+      <name name="log_event"/>
       <desc>
 	<p></p>
       </desc>
@@ -111,7 +112,7 @@ logger:error("error happened because: ~p",[Reason]). %% Without macro
 	<list>
 	  <item><c>pid  => self()</c></item>
 	  <item><c>gl   => group_leader()</c></item>
-	  <item><c>time => erlang:monotonic_time(microsecond)</c></item>
+	  <item><c>time => erlang:system_time(microsecond)</c></item>
 	</list>
 	<p>When a log macro is used, Logger also inserts location
 	  information:</p>
@@ -129,8 +130,31 @@ logger:error("error happened because: ~p",[Reason]). %% Without macro
 	    <c>update_process_metadata/1</c></seealso>.</p>
 	<p>Logger merges all the metadata maps before forwarding the
 	  log event to the handlers. If the same keys occur, values
-	  from the log call overwrites process metadata, which in turn
-	  overwrites values set by Logger.</p>
+	  from the log call overwrite process metadata, which in turn
+	  overwrite values set by Logger.</p>
+	<p>The following custom metadata keys have special meaning:</p>
+	<taglist>
+	  <tag><c>domain</c></tag>
+	  <item>
+	    <p>The value associated with this key is used by filters
+	      for grouping log events originating from, for example,
+	      specific functional
+	      areas. See <seealso marker="logger_filters#domain-2">
+		<c>logger_filters:domain/2</c></seealso>
+	      for a description of how this field can be used.</p>
+	  </item>
+	  <tag><c>report_cb</c></tag>
+	  <item>
+	    <p>If the log message is specified as
+	      a <seealso marker="#type-report"><c>report()</c></seealso>,
+	      the <c>report_cb</c> key can be associated with a fun
+	      (report callback) that converts the report to a format
+	      string and arguments. See
+	      section <seealso marker="logger_chapter#log_message">Log
+	      Message</seealso> in the User's Guide for more
+	      information about report callbacks.</p>
+	  </item>
+	</taglist>
       </desc>
     </datatype>
     <datatype>
@@ -144,7 +168,7 @@ logger:error("error happened because: ~p",[Reason]). %% Without macro
 	  <item><c>filters => []</c></item>
 	  <item><c>formatter => {logger_formatter,DefaultFormatterConfig</c>}</item>
 	</list>
-	<p>See the <seealso marker="logger_formatter#configuration">
+	<p>See the <seealso marker="logger_formatter#type-config">
 	    <c>logger_formatter(3)</c></seealso> manual page for
 	  information about the default configuration for this
 	  formatter.</p>
@@ -165,7 +189,8 @@ logger:error("error happened because: ~p",[Reason]). %% Without macro
     <datatype>
       <name name="filter"/>
       <desc>
-	<p>A filter which can be installed for logger or for a handler.</p>
+	<p>A filter which can be installed for the logger part of
+	  Logger, or for a handler.</p>
       </desc>
     </datatype>
     <datatype>
@@ -184,8 +209,17 @@ logger:error("error happened because: ~p",[Reason]). %% Without macro
       <name name="timestamp"/>
       <desc>
 	<p>A timestamp produced
-	  with <seealso marker="erts:erlang#monotonic_time-1">
-	    <c>erlang:monotonic_time(microsecond)</c></seealso>.</p>
+	  with <seealso marker="erts:erlang#system_time-1">
+	    <c>erlang:system_time(microsecond)</c></seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="formatter_config"/>
+      <desc>
+	<p>Configuration data for the
+	formatter. See <seealso marker="logger_formatter">
+	    <c>logger_formatter(3)</c></seealso>
+	  for an example of a formatter implementation.</p>
       </desc>
     </datatype>
   </datatypes>
@@ -213,9 +247,9 @@ logger:error("error happened because: ~p",[Reason]). %% Without macro
       <item><c>?LOG_DEBUG(FunOrFormat,Args[,Metadata])</c></item>
     </list>
 
-    <p>All macros expand to a call to logger, where <c>Level</c> is
-      taken from the macro name, and location data is added. See the
-      description of
+    <p>All macros expand to a call to Logger, where <c>Level</c> is
+      taken from the macro name, and location data is added to the
+      metadata. See the description of
       the <seealso marker="#type-metadata"><c>metadata()</c></seealso>
       type for more information about the location data.</p>
 
@@ -335,23 +369,26 @@ logger:error("error happened because: ~p",[Reason]). %% Without macro
 
     <func>
       <name name="get_logger_config" arity="0"/>
-      <fsummary>Lookup the current configuration for logger.</fsummary>
+      <fsummary>Look up the current configuration for the logger part
+	of Logger.</fsummary>
       <desc>
-        <p>Lookup the current configuration for logger.</p>
+        <p>Look up the current configuration for the logger part of
+          Logger.</p>
       </desc>
     </func>
 
     <func>
       <name name="get_handler_config" arity="1"/>
-      <fsummary>Lookup the current configuration for the given handler.</fsummary>
+      <fsummary>Look up the current configuration for the given
+	handler.</fsummary>
       <desc>
-        <p>Lookup the current configuration for the given handler.</p>
+        <p>Look up the current configuration for the given handler.</p>
       </desc>
     </func>
 
     <func>
       <name name="i" arity="0"/>
-      <fsummary>Get all logger configurations</fsummary>
+      <fsummary>Get all Logger configurations</fsummary>
       <desc>
         <p>Same as <seealso marker="#i/1"><c>logger:i(term)</c></seealso></p>
       </desc>
@@ -361,28 +398,28 @@ logger:error("error happened because: ~p",[Reason]). %% Without macro
       <name name="i" arity="1" clause_i="1"/>
       <name name="i" arity="1" clause_i="2"/>
       <name name="i" arity="1" clause_i="3"/>
-      <fsummary>Get all logger configurations</fsummary>
+      <fsummary>Get all Logger configurations</fsummary>
       <desc>
-        <p>Display or return all current logger configuration.</p>
+        <p>Display or return all current Logger configurations.</p>
         <taglist>
           <tag><c><anno>Action</anno> = string</c></tag>
           <item>
-	    <p>Return the pretty printed current logger configuration
+	    <p>Return the pretty printed current Logger configuration
               as iodata.</p>
 	  </item>
           <tag><c><anno>Action</anno> = term</c></tag>
           <item>
-	    <p>Return the current logger configuration as a term. The
-              format of this term may change inbetween releases. For a
+	    <p>Return the current Logger configuration as a term. The
+              format of this term may change between releases. For a
               stable format use <seealso marker="#get_handler_config/1">
 	      <c>logger:get_handler_config/1</c></seealso>
               and <seealso marker="#get_logger_config/0">
-	      <c>logger:get_logger_config/0</c></seealso>.
-              The same as calling <c>logger:i()</c>.</p>
+	      <c>logger:get_logger_config/0</c></seealso>.</p>
+            <p>The same as calling <c>logger:i()</c>.</p>
 	  </item>
 	  <tag><c><anno>Action</anno> = print</c></tag>
           <item>
-	    <p>Pretty print all the current logger configuration to
+	    <p>Pretty print all the current Logger configuration to
               standard out. Example:</p>
             <code><![CDATA[1> logger:i(print).
 Current logger configuration:
@@ -407,10 +444,10 @@ Current logger configuration:
           Config: stop
         Id: domain
           Fun:    fun logger_filters:domain/2
-          Config: {log,prefix_of,[beam,erlang,otp,sasl]}
+          Config: {log,super,[beam,erlang,otp,sasl]}
         Id: no_domain
           Fun:    fun logger_filters:domain/2
-          Config: {log,no_domain,[]}
+          Config: {log,undefined,[]}
       Handler Config:
         logger_std_h: #{type => standard_io}
   Level set per module:
@@ -423,21 +460,21 @@ Current logger configuration:
 
     <func>
       <name name="add_logger_filter" arity="2"/>
-      <fsummary>Add a filter to the logger.</fsummary>
+      <fsummary>Add a filter to the logger part of Logger.</fsummary>
       <desc>
-        <p>Add a filter to the logger.</p>
+        <p>Add a filter to the logger part of Logger.</p>
 	<p>The filter fun is called with the log event as the first
 	  parameter, and the specified <c>filter_args()</c> as the
 	  second parameter.</p>
 	<p>The return value of the fun specifies if a log event is to
 	  be discarded or forwarded to the handlers:</p>
 	<taglist>
-	  <tag><c>log()</c></tag>
+	  <tag><c>log_event()</c></tag>
 	  <item>
 	    <p>The filter <em>passed</em>. The next logger filter, if
 	      any, is applied. If no more logger filters exist, the
-	      log event is forwarded to the handler part of the
-	      logger, where handler filters are applied.</p>
+	      log event is forwarded to the handler part of Logger,
+	      where handler filters are applied.</p>
 	  </item>
 	  <tag><c>stop</c></tag>
 	  <item>
@@ -449,13 +486,13 @@ Current logger configuration:
 	    <p>The filter has no knowledge of the log event. The next
 	      logger filter, if any, is applied. If no more logger
 	      filters exist, the value of the <c>filter_default</c>
-	      configuration parameter for the logger specifies if the
-	      log event shall be discarded or forwarded to the handler
-	      part.</p>
+	      configuration parameter for the logger part specifies if
+	      the log event shall be discarded or forwarded to the
+	      handler part.</p>
 	  </item>
 	</taglist>
-	<p>See section <seealso marker="logger_chapter#Filter">
-	    Filter</seealso> in the User's Guide for more information
+	<p>See section <seealso marker="logger_chapter#filters">
+	    Filters</seealso> in the User's Guide for more information
 	    about filters.</p>
 	<p>Some built-in filters exist. These are defined
 	  in <seealso marker="logger_filters"><c>logger_filters</c></seealso>.</p>
@@ -473,7 +510,7 @@ Current logger configuration:
 	<p>The return value of the fun specifies if a log event is to
 	  be discarded or forwarded to the handler callback:</p>
 	<taglist>
-	  <tag><c>log()</c></tag>
+	  <tag><c>log_event()</c></tag>
 	  <item>
 	    <p>The filter <em>passed</em>. The next handler filter, if
 	      any, is applied. If no more filters exist for this
@@ -496,7 +533,7 @@ Current logger configuration:
 	  </item>
 	</taglist>
 	<p>See
-	  section <seealso marker="logger_chapter#Filter">Filter</seealso>
+	  section <seealso marker="logger_chapter#filters">Filters</seealso>
 	  in the User's Guide for more information about filters.</p>
 	<p>Some built-in filters exist. These are defined in
 	  <seealso marker="logger_filters"><c>logger_filters</c></seealso>.</p>
@@ -505,10 +542,10 @@ Current logger configuration:
 
     <func>
       <name name="remove_logger_filter" arity="1"/>
-      <fsummary>Remove a filter from the logger.</fsummary>
+      <fsummary>Remove a filter from the logger part of Logger.</fsummary>
       <desc>
         <p>Remove the filter identified
-          by <c><anno>FilterId</anno></c> from the logger.</p>
+          by <c><anno>FilterId</anno></c> from the logger part of Logger.</p>
       </desc>
     </func>
 
@@ -548,21 +585,21 @@ Current logger configuration:
         <p>Set the log level for the
           specified <c><anno>Module</anno></c>.</p>
 	<p>The log level for a module overrides the global log level
-	  of the logger for log event originating from the module in
+	  of Logger for log events originating from the module in
 	  question. Notice, however, that it does not override the
 	  level configuration for any handler.</p>
-	<p>For example: Assume that the global log level for the
-	  logger is <c>info</c>, and there is one handler, <c>h1</c>,
-	  with level <c>info</c> and one handler, <c>h2</c>, with
+	<p>For example: Assume that the global log level for Logger
+	  is <c>info</c>, and there is one handler, <c>h1</c>, with
+	  level <c>info</c> and one handler, <c>h2</c>, with
 	  level <c>debug</c>.</p>
 	<p>With this configuration, no debug messages will be logged,
 	  since they are all stopped by the global log level.</p>
-	<p>If the level for <c>mymodule</c> is set now set
+	<p>If the level for <c>mymodule</c> is now set
 	  to <c>debug</c>, then debug events from this module will be
 	  logged by the handler <c>h2</c>, but not by
 	  handler <c>h1</c>.</p>
 	<p>Debug events from other modules are still not logged.</p>
-        <p>To change the global log level for the logger, use
+        <p>To change the global log level for Logger, use
           <seealso marker="#set_logger_config/2">
 	    <c>logger:set_logger_config(level,Level)</c></seealso>.</p>
         <p>To change the log level for a handler, use
@@ -572,15 +609,16 @@ Current logger configuration:
 	  <p>The originating module for a log event is only detected
 	    if <c>mfa=>{Module,Function,Arity}</c> exists in the
 	    metadata. When log macros are used, this association is
-	    automatically added to all log events. If the logger API
+	    automatically added to all log events. If an API function
 	    is called directly, without using a macro, the logging
-	    client must explicitly add this information.</p>
+	    client must explicitly add this information if module
+	    levels shall have any effect.</p>
 	</note>
       </desc>
     </func>
 
     <func>
-      <name name="reset_module_level" arity="1"/>
+      <name name="unset_module_level" arity="1"/>
       <fsummary>Remove a module specific log setting.</fsummary>
       <desc>
         <p>Remove a module specific log setting. After this, the
@@ -590,10 +628,11 @@ Current logger configuration:
 
     <func>
       <name name="add_handlers" arity="1" clause_i="1"/>
-      <fsummary>Setup logger handlers from the applications configuration parameters.</fsummary>
+      <fsummary>Set up log handlers from the application's
+	configuration parameters.</fsummary>
       <desc>
         <p>Reads the application configuration parameter <c>logger</c> and
-          calls <c>logger:add_handlers/1</c> with it contents.</p>
+          calls <c>logger:add_handlers/1</c> with its contents.</p>
       </desc>
     </func>
 
@@ -602,11 +641,12 @@ Current logger configuration:
       <fsummary>Setup logger handlers.</fsummary>
       <type name="config_handler"/>
       <desc>
-        <p>This function should be used by custom logger handlers to make
+        <p>This function should be used by custom Logger handlers to make
         configuration consistent no matter which handler the system uses.
-        Normal usage to to add a call to <c>logger:add_handlers/1</c>
-        just after the processes that the handler needs are started
-        and pass the applications logger config as an argument. Eg.</p>
+        Normal usage is to add a call to <c>logger:add_handlers/1</c>
+        just after the processes that the handler needs are started,
+        and pass the application's <c>logger</c> configuration as the argument.
+	For example:</p>
         <code>
 -behaviour(application).
 start(_, []) ->
@@ -616,19 +656,20 @@ start(_, []) ->
             {ok, Pid, []};
         Error -> Error
      end.</code>
-       <p>This will read the <c>logger</c> configuration parameter from
-         the handler application and start the configured handlers. The contents
-         of the configuration use the same rules as the
+       <p>This reads the <c>logger</c> configuration parameter from
+         the <c>my_all</c> application and starts the configured
+         handlers. The contents of the configuration use the same
+         rules as the
          <seealso marker="logger_chapter#handler-configuration">logger handler configuration</seealso>.
        </p>
-       <p>If the handler is meant to replace the default handler the kernels
-         default handlers have to be disabled before the new handler is added.
-         A <c>sys.config</c> file that disables the kernel handler and adds
-         a custom handler could looks like this:</p>
+       <p>If the handler is meant to replace the default handler, the Kernel's
+         default handler have to be disabled before the new handler is added.
+         A <c>sys.config</c> file that disables the Kernel handler and adds
+         a custom handler could look like this:</p>
          <code>
 [{kernel,
   [{logger,
-    %% Disable the default kernel handler
+    %% Disable the default Kernel handler
     [{handler,default,undefined}]}]},
  {my_app,
   [{logger,
@@ -640,10 +681,10 @@ start(_, []) ->
 
     <func>
       <name name="set_logger_config" arity="1"/>
-      <fsummary>Set configuration data for the logger.</fsummary>
+      <fsummary>Set configuration data for the logger part of Logger.</fsummary>
       <desc>
-        <p>Set configuration data for the logger. This overwrites the
-          current logger configuration.</p>
+        <p>Set configuration data for the logger part of Logger. This
+          overwrites the current logger configuration.</p>
 	<p>To modify the existing configuration,
 	  use <seealso marker="#update_logger_config-1">
 	    <c>update_logger_config/1</c></seealso>, or, if a more
@@ -658,21 +699,25 @@ start(_, []) ->
 
     <func>
       <name name="set_logger_config" arity="2"/>
-      <fsummary>Add or update configuration data for the logger.</fsummary>
+      <fsummary>Add or update configuration data for the logger part
+	of Logger.</fsummary>
       <desc>
-        <p>Add or update configuration data for the logger. If the
-          given <c><anno>Key</anno></c> already exists, its associated
-          value will be changed to <c><anno>Value</anno></c>. If it
-          does not exist, it will be added.</p>
+        <p>Add or update configuration data for the logger part of
+          Logger. If the given <c><anno>Key</anno></c> already exists,
+          its associated value will be changed
+          to <c><anno>Value</anno></c>. If it does not exist, it will
+          be added.</p>
       </desc>
     </func>
 
     <func>
       <name name="update_logger_config" arity="1"/>
-      <fsummary>Update configuration data for the logger.</fsummary>
+      <fsummary>Update configuration data for the logger part of
+	Logger.</fsummary>
       <desc>
-        <p>Update configuration data for the logger. This function
-          behaves as if it was implemented as follows:</p>
+        <p>Update configuration data for the logger part of
+          Logger. This function behaves as if it was implemented as
+          follows:</p>
 	<code type="erl">
 {ok,Old} = logger:get_logger_config(),
 logger:set_logger_config(maps:merge(Old,Config)).
@@ -697,7 +742,7 @@ logger:set_logger_config(maps:merge(Old,Config)).
 	  </seealso>, then do the merge before writing the new
 	  configuration back with this function.</p>
 	<p>If a key is removed compared to the current configuration,
-	  and the key is know by Logger, the default value is used. If
+	  and the key is known by Logger, the default value is used. If
 	  it is a custom key, then it is up to the handler
 	  implementation if the value is removed or a default value is
 	  inserted.</p>
@@ -734,6 +779,31 @@ logger:set_handler_config(HandlerId,maps:merge(Old,Config)).
     </func>
 
     <func>
+      <name name="update_formatter_config" arity="2"/>
+      <fsummary>Update the formatter configuration for the specified handler.</fsummary>
+      <desc>
+        <p>Update the formatter configuration for the specified handler.</p>
+	<p>The new configuration is merged with the existing formatter
+	  configuration.</p>
+	<p>To overwrite the existing configuration without any merge,
+	  use <seealso marker="#set_handler_config-3">
+	    <c>set_handler_config(HandlerId,formatter,
+	      {FormatterModule,FormatterConfig})</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="update_formatter_config" arity="3"/>
+      <fsummary>Update the formatter configuration for the specified handler.</fsummary>
+      <desc>
+        <p>Update the formatter configuration for the specified handler.</p>
+	<p>This is equivalent
+	  to <br/><seealso marker="#update_formatter_config-2">
+	    <c>update_formatter_config(<anno>HandlerId</anno>,#{<anno>Key</anno>=><anno>Value</anno>})</c></seealso></p>
+      </desc>
+    </func>
+
+    <func>
       <name name="compare_levels" arity="2"/>
       <fsummary>Compare the severity of two log levels.</fsummary>
       <desc>
@@ -826,18 +896,17 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(),Meta)).
   </funcs>
 
   <section>
-    <title>Callback Functions</title>
+    <marker id="handler_callback_functions"/>
+    <title>Handler Callback Functions</title>
     <p>The following functions are to be exported from a handler
       callback module.</p>
   </section>
 
   <funcs>
     <func>
-      <name>Module:adding_handler(HandlerId,Config1) -> {ok,Config2} | {error,Reason}</name>
+      <name>HModule:adding_handler(Config1) -> {ok,Config2} | {error,Reason}</name>
       <fsummary>An instance of this handler is about to be added.</fsummary>
       <type>
-	<v>HandlerId =
-	  <seealso marker="#type-handler_id">handler_id()</seealso></v>
 	<v>Config1 = Config2 =
 	  <seealso marker="#type-config">config()</seealso></v>
 	<v>Reason = term()</v>
@@ -846,7 +915,9 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(),Meta)).
 	<p>This callback function is optional.</p>
 	<p>The function is called when an new handler is about to be
 	  added, and the purpose is to verify the configuration and
-	  initiate all resourced needed by the handler.</p>
+	  initiate all resources needed by the handler.</p>
+	<p>The handler identity is associated with the <c>id</c> key
+	  in <c>Config1</c>.</p>
 	<p>If everything succeeds, the callback function can add
 	  possible default values or internal state values to the
 	  configuration, and return the adjusted map
@@ -857,28 +928,9 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(),Meta)).
     </func>
 
     <func>
-      <name>Module:removing_handler(HandlerId,Config) -> ok</name>
-      <fsummary>The given handler is about to be removed.</fsummary>
-      <type>
-	<v>HandlerId =
-	  <seealso marker="#type-handler_id">handler_id()</seealso></v>
-	<v>Config =
-	  <seealso marker="#type-config">config()</seealso></v>
-      </type>
-      <desc>
-	<p>This callback function is optional.</p>
-	<p>The function is called when a handler is about to be
-	  removed, and the purpose is to release all resources used by
-	  the handler. The return value is ignored by Logger.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>Module:changing_config(HandlerId,Config1,Config2) -> {ok,Config3} | {error,Reason}</name>
+      <name>HModule:changing_config(Config1,Config2) -> {ok,Config3} | {error,Reason}</name>
       <fsummary>The configuration for this handler is about to change.</fsummary>
       <type>
-	<v>HandlerId =
-	  <seealso marker="#type-handler_id">handler_id()</seealso></v>
 	<v>Config1 = Config2 = Config3 =
 	  <seealso marker="#type-config">config()</seealso></v>
 	<v>Reason = term()</v>
@@ -890,12 +942,108 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(),Meta)).
 	  the new configuration.</p>
 	<p><c>Config1</c> is the existing configuration
 	  and <c>Config2</c> is the new configuration.</p>
+	<p>The handler identity is associated with the <c>id</c> key
+	  in <c>Config1</c>.</p>
 	<p>If everything succeeds, the callback function must return a
 	  possibly adjusted configuration in <c>{ok,Config3}</c>.</p>
 	<p>If the configuration is faulty, the callback function must
 	  return <c>{error,Reason}</c>.</p>
       </desc>
     </func>
+
+    <func>
+      <name>HModule:log(LogEvent,Config) -> void()</name>
+      <fsummary>Log the given log event.</fsummary>
+      <type>
+	<v>LogEvent =
+	  <seealso marker="#type-log_event">log_event()</seealso></v>
+	<v>Config =
+	  <seealso marker="#type-config">config()</seealso></v>
+      </type>
+      <desc>
+	<p>This callback function is mandatory.</p>
+	<p>The function is called when all global filters and all
+	  handler filters for the handler in question have passed for
+	  the given log event.</p>
+	<p>The handler identity is associated with the <c>id</c> key
+	  in <c>Config</c>.</p>
+	<p>The handler must log the event.</p>
+	<p>The return value from this function is ignored by
+	  Logger.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>HModule:removing_handler(Config) -> ok</name>
+      <fsummary>The given handler is about to be removed.</fsummary>
+      <type>
+	<v>Config =
+	  <seealso marker="#type-config">config()</seealso></v>
+      </type>
+      <desc>
+	<p>This callback function is optional.</p>
+	<p>The function is called when a handler is about to be
+	  removed, and the purpose is to release all resources used by
+	  the handler.</p>
+	<p>The handler identity is associated with the <c>id</c> key
+	  in <c>Config</c>.</p>
+	<p>The return value is ignored by Logger.</p>
+      </desc>
+    </func>
+
+  </funcs>
+
+  <section>
+    <marker id="formatter_callback_functions"/>
+    <title>Formatter Callback Functions</title>
+    <p>The following functions are to be exported from a formatter
+      callback module.</p>
+  </section>
+
+  <funcs>
+    <func>
+      <name>FModule:check_config(FConfig) -> ok | {error,term()}</name>
+      <fsummary>Validate the given formatter configuration.</fsummary>
+      <type>
+	<v>FConfig =
+	  <seealso marker="#type-formatter_config">formatter_config()</seealso></v>
+      </type>
+      <desc>
+	<p>This callback function is optional.</p>
+	<p>The function is called by a Logger when formatter
+	  configuration is set or modified. The formatter must
+	  validate the given configuration and return <c>ok</c> if it
+	  is correct, and <c>{error,term()}</c> if it is faulty.</p>
+	<p>See <seealso marker="logger_formatter">
+	    <c>logger_formatter(3)</c></seealso>
+	  for an example implementation. <c>logger_formatter</c> is the
+	  default formatter used by Logger.</p>
+      </desc>
+    </func>
+    <func>
+      <name>FModule:format(LogEvent,FConfig) -> FormattedLogEntry</name>
+      <fsummary>Format the given log event.</fsummary>
+      <type>
+	<v>LogEvent =
+	  <seealso marker="#type-log_event">log_event()</seealso></v>
+	<v>FConfig =
+	  <seealso marker="#type-formatter_config">formatter_config()</seealso></v>
+	<v>FormattedLogEntry =
+	  <seealso marker="unicode#type-chardata">unicode:chardata()</seealso></v>
+      </type>
+      <desc>
+	<p>This callback function is mandatory.</p>
+	<p>The function can be called by a log handler to convert a
+	  log event term to a printable string. The returned value
+	  can, for example, be printed as a log entry to the console
+	  or a file using <seealso marker="stdlib:io#put_chars-1">
+	    <c>io:put_chars/1,2</c></seealso>.</p>
+	<p>See <seealso marker="logger_formatter">
+	    <c>logger_formatter(3)</c></seealso>
+	  for an example implementation. <c>logger_formatter</c> is the
+	  default formatter used by Logger.</p>
+      </desc>
+    </func>
   </funcs>
 </erlref>
 
diff --git a/lib/kernel/doc/src/logger_arch.png b/lib/kernel/doc/src/logger_arch.png
index 727609a6ef..901122193a 100644
--- a/lib/kernel/doc/src/logger_arch.png
+++ b/lib/kernel/doc/src/logger_arch.png
diff --git a/lib/kernel/doc/src/logger_chapter.xml b/lib/kernel/doc/src/logger_chapter.xml
index 4232429589..a3eec7bd4b 100644
--- a/lib/kernel/doc/src/logger_chapter.xml
+++ b/lib/kernel/doc/src/logger_chapter.xml
@@ -30,219 +30,403 @@
     <file>logger_chapter.xml</file>
   </header>
 
+  <p>Erlang/OTP 21.0 provides a new standard API for logging
+    through <c>Logger</c>, which is part of the Kernel
+    application. Logger consists of the API for issuing log events,
+    and a customizable backend where log handlers, filters and
+    formatters can be plugged in.</p>
+  <p>By default, the Kernel application installs one log handler at
+    system start. This handler is named <c>default</c>. It receives
+    and processes standard log events produced by the Erlang runtime
+    system, standard behaviours and different Erlang/OTP
+    applications. The log events are by default written to the
+    terminal.</p>
+  <p>You can also configure the system so that the default handler
+    prints log events to a single file, or to a set of wrap logs
+    via <seealso marker="disk_log"><c>disk_log</c></seealso>.</p>
+  <p>By confiugration, you can aslo modify or disable the default
+    handler, replace it by a custom handler, and install additional
+    handlers.</p>
+
   <section>
     <title>Overview</title>
-    <p>Erlang/OTP provides a standard API for logging. The backend of
-      this API can be used as is, or it can be customized to suite
-      specific needs.</p>
-    <p>It consists of two parts - the <em>logger</em> part and the
-      <em>handler</em> part. The logger will forward log events to one
-      or more handler(s).</p>
+    <p>A <em>log event</em> consists of a <em>log level</em>, the
+      <em>message</em> to be logged, and <em>metadata</em>.</p>
+    <p>The Logger backend forwards log events from the API, first
+      through a set of <em>global filters</em>, then through a set
+      of <em>handler filters</em> for each log handler.</p>
+    <p>Each filter set consists of a <em>log level check</em>,
+      followed by zero or more <em>filter functions</em>.</p>
+    <p>The following figure show a conseptual overview of Logger. The
+      figure shows two log handlers, but any number of handlers can be
+      installed.</p>
 
     <image file="logger_arch.png">
-      <icaption>Conceptual overview</icaption>
+      <icaption>Conceptual Overview</icaption>
     </image>
 
-    <p><em>Filters</em> can be added to the logger and to each
-      handler. The filters decide if an event is to be forwarded or
-      not, and they can also modify all parts of the log event.</p>
-
-    <p>A <em>formatter</em> can be set for each handler. The formatter
-      does the final formatting of the log event, including the log
-      message itself, and possibly a timestamp, header and other
-      metadata.</p>
-
-    <p>In accordance with the Syslog protocol, RFC-5424, eight
-      severity levels can be specified:</p>
-
-    <table align="left">
-      <row>
-	<cell><strong>Level</strong></cell>
-	<cell align="center"><strong>Integer</strong></cell>
-	<cell><strong>Description</strong></cell>
-      </row>
-      <row>
-	<cell>emergency</cell>
-	<cell align="center">0</cell>
-	<cell>system is unusable</cell>
-      </row>
-      <row>
-	<cell>alert</cell>
-	<cell align="center">1</cell>
-	<cell>action must be taken immediately</cell>
-      </row>
-      <row>
-	<cell>critical</cell>
-	<cell align="center">2</cell>
-	<cell>critical contidions</cell>
-      </row>
-      <row>
-	<cell>error</cell>
-	<cell align="center">3</cell>
-	<cell>error conditions</cell>
-      </row>
-      <row>
-	<cell>warning</cell>
-	<cell align="center">4</cell>
-	<cell>warning conditions</cell>
-      </row>
-      <row>
-	<cell>notice</cell>
-	<cell align="center">5</cell>
-	<cell>normal but significant conditions</cell>
-      </row>
-      <row>
-	<cell>info</cell>
-	<cell align="center">6</cell>
-	<cell>informational messages</cell>
-      </row>
-      <row>
-	<cell>debug</cell>
-	<cell align="center">7</cell>
-	<cell>debug-level messages</cell>
-      </row>
-      <tcaption>Severity levels</tcaption>
-    </table>
-
-    <p>A log event is allowed by Logger if the integer value of
-      its <c>Level</c> is less than or equal to the currently
-      configured log level. The log level can be configured globally,
-      or to allow more verbose logging from a specific part of the
-      system, per module.</p>
-
+    <p>Log levels are expressed as atoms. Internally in Logger, the
+      atoms are mapped to integer values, and a log event passes the
+      log level check if the integer value of its log level is less
+      than or equal to the currently configured log level. That is,
+      the check pases if the event is equally or more severe than the
+      configured level. See section <seealso marker="#log_level">Log
+      Level</seealso> for a listing and description of all log
+      levels.</p>
+    <p>The global log level can be overridden by a log level
+      configured per module. This is to, for instance, allow more
+      verbose logging from a specific part of the system.</p>
+    <p>Filter functions can be used for more sophisticated filtering
+      than the log level check provides. A filter function can stop or
+      pass a log event, based on any of the event's contents. It can
+      also modify all parts of the log event. See see
+      section <seealso marker="#filters">Filters</seealso> for more
+      details.</p>
+    <p>If a log event passes through all global filters and all
+      handler filters for a specific handler, Logger forwards the event
+      to the handler callback. The handler formats and prints the
+      event to its destination. See
+      section <seealso marker="#handlers">Handlers</seealso> for
+      more details.</p>
+    <p>Everything up to and including the call to the handler
+      callbacks is executed on the client process, that is, the
+      process where the log event was issued. It is up to the handler
+      implementation if other processes are involved or not.</p>
+    <p>The handlers are called in sequence, and the order is not
+      defined.</p>
+  </section>
+  <section>
+    <title>Logger API</title>
+    <p>The API for logging consists of a set
+      of <seealso marker="logger#macros">macros</seealso>, and a set
+      of functions on the form <c>logger:Level/1,2,3</c>, which are
+      all shortcuts
+      for <seealso marker="logger#log-2">
+	<c>logger:log(Level,Arg1[,Arg2[,Arg3]])</c></seealso>.</p>
+    <p>The difference between using the macros and the exported
+      functions is that macros add location (originator) information
+      to the metadata, and performs lazy evaluation by wrapping the
+      logger call in a case statement, so it is only evaluated if the
+      log level of the event passes the global log level check.</p>
     <section>
-      <title>Customizable parts</title>
-
+      <marker id="log_level"/>
+      <title>Log Level</title>
+      <p>The log level indicates the severity of a event. In
+	accordance with the Syslog protocol, RFC-5424, eight log
+	levels can be specified. The following table lists all
+	possible log levels by name (atom), integer value, and
+	description:</p>
+
+      <table align="left">
+	<row>
+	  <cell><strong>Level</strong></cell>
+	  <cell align="center"><strong>Integer</strong></cell>
+	  <cell><strong>Description</strong></cell>
+	</row>
+	<row>
+	  <cell>emergency</cell>
+	  <cell align="center">0</cell>
+	  <cell>system is unusable</cell>
+	</row>
+	<row>
+	  <cell>alert</cell>
+	  <cell align="center">1</cell>
+	  <cell>action must be taken immediately</cell>
+	</row>
+	<row>
+	  <cell>critical</cell>
+	  <cell align="center">2</cell>
+	  <cell>critical contidions</cell>
+	</row>
+	<row>
+	  <cell>error</cell>
+	  <cell align="center">3</cell>
+	  <cell>error conditions</cell>
+	</row>
+	<row>
+	  <cell>warning</cell>
+	  <cell align="center">4</cell>
+	  <cell>warning conditions</cell>
+	</row>
+	<row>
+	  <cell>notice</cell>
+	  <cell align="center">5</cell>
+	  <cell>normal but significant conditions</cell>
+	</row>
+	<row>
+	  <cell>info</cell>
+	  <cell align="center">6</cell>
+	  <cell>informational messages</cell>
+	</row>
+	<row>
+	  <cell>debug</cell>
+	  <cell align="center">7</cell>
+	  <cell>debug-level messages</cell>
+	</row>
+	<tcaption>Log Levels</tcaption>
+      </table>
+      <p>Notice that the integer value is only used internally in
+	Logger. In the API, you must always use the atom. To compare
+	the severity of two log levels,
+	use <seealso marker="logger#compare_levels-2">
+	  <c>logger:compare_levels/2</c></seealso>.</p>
+    </section>
+    <section>
+      <marker id="log_message"/>
+      <title>Log Message</title>
+      <p>The log message contains the information to be logged. The
+	message can consist of a format string and arguments (given as
+	two separate parameters in the Logger API), a string or a
+	report. The latter, which is either a map or a key-value list,
+	can be accompanied by a report callback specified in the log
+	event's <seealso marker="#metadata">metadata</seealso>. The
+	report callback is a convenience function that
+	the <seealso marker="#formatters">formatter</seealso> can use
+	to convert the report to a format string and arguments. The
+	formatter can also use its own conversion function, if no
+	callback is provided, or if a customized formatting is
+	desired.</p>
+      <p>Example, format string and arguments:</p>
+      <code>logger:error("The file does not exist: ~ts",[Filename])</code>
+      <p>Example, string:</p>
+      <code>logger:notice("Something strange happened!")</code>
+      <p>Example, report, and metadata with report callback:</p>
+      <code>
+logger:debug(#{got => connection_request, id => Id, state => State},
+             #{report_cb => fun(R) -> {"~p",[R]} end})</code>
+      <p>The log message can also be provided through a fun for lazy
+	evaluation. The fun is only evaluated if the global log level
+	check passes, and is therefore recommended if it is expensive
+	to generate the message. The lazy fun must return a string, a
+	report, or a tuple with format string and arguments.</p>
+    </section>
+    <section>
+      <title>Metadata</title>
+      <p>Metadata contains additional data associated with a log
+	message. Logger inserts some metadata fields by default, and
+	the client can add custom metadata in two different ways:</p>
       <taglist>
-	<tag><marker id="Handler"/>Handler</tag>
+	<tag>Set process metadata</tag>
 	<item>
-	  <p>A handler is defined as a module exporting the following
-	    function:</p>
-
-	  <code>log(Log, Config) -> ok</code>
-
-	  <p>A handler is called by the logger backend after filtering on
-	    logger level and on handler level for the handler which is
-	    about to be called. The function call is done on the client
-	    process, and it is up to the handler implementation if other
-	    processes are to be involved or not.</p>
-
-	  <p>Multiple instances of the same handler can be
-	    added. Configuration is per instance.</p>
-
+	  <p>Process metadata is set and updated
+	    with <seealso marker="logger#set_process_metadata-1">
+	      <c>logger:set_process_metadata/1</c></seealso>
+	    and <seealso marker="logger#update_process_metadata-1">
+	      <c>logger:update_process metadata/1</c></seealso>,
+	    respectively. This metadata applies to the process on
+	    which these calls are made, and Logger adds the metadata
+	    to all log events issued on that process.</p>
 	</item>
-
-	<tag><marker id="Filter"/>Filter</tag>
-	<item>
-	  <p>Filters can be set on the logger or on a handler. Logger
-	    filters are applied first, and if passed, the handler filters
-	    for each handler are applied. The handler callback is only
-	    called if all handler filters for the handler in question also
-	    pass.</p>
-
-	  <p>A filter is specified as:</p>
-
-	  <code>{fun((Log,Extra) -> Log | stop | ignore), Extra}</code>
-
-	  <p>The configuration parameter <c>filter_default</c>
-	    specifies the behavior if all filters return <c>ignore</c>.
-	    <c>filter_default</c> is by default set to <c>log</c>.</p>
-
-	  <p>The <c>Extra</c> parameter may contain any data that the
-	    filter needs.</p>
-	</item>
-
-	<tag><marker id="Formatter"/>Formatter</tag>
+	<tag>Add metadata to a specifc log event</tag>
 	<item>
-	  <p>A formatter is defined as a module exporting the following
-	    function:</p>
-
-	  <code>format(Log,Extra) -> unicode:chardata()</code>
-
-	  <p>The formatter callback is called by each handler, and the
-	    returned string can be printed to the handler's destination
-	    (stdout, file, ...).</p>
+	  <p>Metadata associated with one specifc log event is given
+	    as the last parameter to the log macro or Logger API
+	    function when the event is issued. For example:</p>
+	  <code>?LOG_ERROR("Connection closed",#{context => server})</code>
 	</item>
-
       </taglist>
+      <p>See the description of
+	the <seealso marker="logger#type-metadata">
+	  <c>logger:metadata()</c></seealso> type for information
+	about which default keys Logger inserts, and how the different
+	metadata maps are merged.</p>
     </section>
+  </section>
+  <section>
+    <marker id="filter"/>
+    <title>Filters</title>
+    <p>Filters can be global, or attached to a specific
+      handler. Logger calls the global filters first, and if they all
+      pass, it calls the handler filters for each handler. Logger
+      calls the handler callback only if all filters attached to the
+      handler in question also pass.</p>
+    <p>A filter is defined as:</p>
+    <pre>{FilterFun, Extra}</pre>
+    <p>where <c>FilterFun</c> is a function of arity 2,
+      and <c>Extra</c> is any term. When applying the filter, Logger
+      calls the function with the log event as the first argument,
+      and the value of <c>Extra</c> as the second
+      argument. See <seealso marker="logger#type-filter">
+	<c>logger:filter()</c></seealso> for type definitions.</p>
+    <p>The filter function can return <c>stop</c>, <c>ignore</c> or
+      the (possibly modified) log event.</p>
+    <p>If <c>stop</c> is returned, the log event is immediately
+      discarded. If the filter is global, no handler filters or
+      callbacks are called. If it is a handler filter, the
+      corresponding handler callback is not called, but the log event
+      is forwarded to filters attached to the next handler, if
+      any.</p>
+    <p>If the log event is returned, the next filter function is
+      called with the returned value as the first argument. That is,
+      if a filter function modifies the log event, the next filter
+      function receives the modified event. The value returned from
+      the last filter function is the value that the handler callback
+      receives.</p>
+    <p>If the filter function returns <c>ignore</c>, it means that it
+      did not recognize the log event, and thus leaves to other
+      filters to decide the event's destiny.</p>
+    <p>The configuration
+      option <seealso marker="#filter_default"><c>filter_default</c></seealso>
+      specifies the behaviour if all filter functions
+      return <c>ignore</c>, or if no filters
+      exist. <c>filter_default</c> is by default set to <c>log</c>,
+      meaning that if all existing filters ignore a log event, Logger
+      forwards the event to the handler
+      callback. If <c>filter_default</c> is set to <c>stop</c>, Logger
+      discards such events.</p>
+    <p>Global filters are added
+      with <seealso marker="logger#add_logger_filter-2">
+	<c>logger:add_logger_filter/2</c></seealso>
+      and removed
+      with <seealso marker="logger#remove_logger_filter-1">
+	<c>logger:remove_logger_filter/1</c></seealso>. They can also
+      be added at system start via the Kernel configuration
+      parameter <seealso marker="#logger"><c>logger</c></seealso>.</p>
+    <p>Handler filters are added
+      with <seealso marker="logger#add_handler_filter-3">
+	<c>logger:add_handler_filter/3</c></seealso>
+      and removed
+      with <seealso marker="logger#remove_handler_filter-2">
+	<c>logger:remove_handler_filter/2</c></seealso>. They can also
+      be specified directly in the configuration when adding a handler
+      with <seealso marker="logger#add_handler/3">
+	<c>logger:add_handler/3</c></seealso>
+      or via the Kernel configuration
+      parameter <seealso marker="#logger"><c>logger</c></seealso>.</p>
+
+    <p>To see which filters are currently installed in the system,
+      use <seealso marker="logger#i-0"><c>logger:i/0</c></seealso>,
+      or <seealso marker="logger#get_logger_config-0">
+	<c>logger:get_logger_config/0</c></seealso>
+      and <seealso marker="logger#get_handler_config-1">
+	<c>logger:get_handler_config/1</c></seealso>. Filters are
+	listed in the order they are applied, that is, the first
+	filter in the list is applied first, and so on.</p>
+
+    <p>For convenience, the following built-in filters exist:</p>
 
-    <section>
-      <title>Built-in handlers</title>
-
-      <taglist>
-	<tag><c>logger_std_h</c></tag>
+    <taglist>
+	<tag><seealso marker="logger_filters#domain-2">
+	    <c>logger_filters:domain/2</c></seealso></tag>
 	<item>
-	  <p>This is the default handler used by OTP. Multiple instances
-	    can be started, and each instance will write log events to a
-	    given destination, console or file. Filters can be used for
-	    selecting which event to send to which handler instance.</p>
+	  <p>Provides a way of filtering log events based on a
+	  <c>domain</c> field in <c>Metadata</c>.</p>
 	</item>
-
-	<tag><c>logger_disk_log_h</c></tag>
+	<tag><seealso marker="logger_filters#level-2">
+	  <c>logger_filters:level/2</c></seealso></tag>
 	<item>
-	  <p>This handler behaves much like logger_std_h, except it uses
-	    <seealso marker="disk_log"><c>disk_log</c></seealso> as its
-	    destination.</p>
+	  <p>Provides a way of filtering log events based on the log
+	    level.</p>
 	</item>
-
-	<tag><marker id="ErrorLoggerManager"/><c>error_logger</c></tag>
+	<tag><seealso marker="logger_filters#progress-2">
+	    <c>logger_filters:progress/2</c></seealso></tag>
 	<item>
-	  <p>This handler is to be used for backwards compatibility
-	    only. It is not started by default, but will be automatically
-	    started the first time an event handler is added
-	    with <seealso marker="error_logger#add_report_handler-1">
-	      <c>error_logger:add_report_handler/1,2</c></seealso>.</p>
-
-	  <p>No built-in event handlers exist.</p>
+	  <p>Stops or allows progress reports from <c>supervisor</c>
+	    and <c>application_controller</c>.</p>
 	</item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>Built-in filters</title>
-
-      <taglist>
-	<tag><c>logger_filters:domain/2</c></tag>
+	<tag><seealso marker="logger_filters#remote_gl-2">
+	    <c>logger_filters:remote_gl/2</c></seealso></tag>
 	<item>
-	  <p>This filter provides a way of filtering log events based on a
-	    <c>domain</c> field <c>Metadata</c>. See 
-	    <seealso marker="logger_filters#domain-2">
-	    <c>logger_filters:domain/2</c></seealso></p>
+	  <p>Stops or allows log events originating from a process
+	    that has its group leader on a remote node.</p>
 	</item>
+    </taglist>
+  </section>
 
-	<tag><c>logger_filters:level/2</c></tag>
-	<item>
-	  <p>This filter provides a way of filtering log events based
-	    on the log level. See <seealso marker="logger_filters#level-2">
-	    <c>logger_filters:level/2</c></seealso></p>
-	</item>
+  <section>
+    <marker id="handlers"/>
+    <title>Handlers</title>
+    <p>A handler is defined as a module exporting at least the
+      following function:</p>
+
+    <pre><seealso marker="logger#HModule:log-2">log(LogEvent, Config) -> void()</seealso></pre>
+
+    <p>This function is called when a log event has passed through all
+      global filters, and all handler filters attached to the handler
+      in question. The function call is executed on the client
+      process, and it is up to the handler implementation if other
+      processes are involved or not.</p>
+
+    <p>Logger allows adding multiple instances of a handler
+      callback. That is, if a callback module implementation allows
+      it, you can add multiple handler instances using the same
+      callback module. The different instances are identified by
+      unique handler identities.</p>
+
+    <p>In addition to the mandatory callback function <c>log/2</c>, a
+      handler module can export the optional callback
+      functions <c>adding_handler/1</c>, <c>changing_config/2</c>
+      and <c>removing_handler/1</c>. See
+      section <seealso marker="logger#handler_callback_functions">Handler
+      Callback Functions</seealso> in the logger(3) manual for more
+      information about these function.</p>
+
+    <p>The following built-in handlers exist:</p>
 
-	<tag><c>logger_filters:progress/2</c></tag>
-	<item>
-	  <p>This filter matches all progress reports
-	    from <c>supervisor</c> and <c>application_controller</c>.
-	    See <seealso marker="logger_filters#progress/2">
-	    <c>logger_filters:progress/2</c></seealso></p>
-	</item>
+    <taglist>
+      <tag><c>logger_std_h</c></tag>
+      <item>
+	<p>This is the default handler used by OTP. Multiple instances
+	  can be started, and each instance will write log events to a
+	  given destination, terminal or file.</p>
+      </item>
 
-	<tag><c>logger_filters:remote_gl/2</c></tag>
-	<item>
-	  <p>This filter matches all events originating from a process
-	    that has its group leader on a remote node.
-	    See <seealso marker="logger_filters#remote_gl/2">
-	    <c>logger_filters:remote_gl/2</c></seealso></p>
-	</item>
-      </taglist>
-    </section>
+      <tag><c>logger_disk_log_h</c></tag>
+      <item>
+	<p>This handler behaves much like <c>logger_std_h</c>, except it uses
+	  <seealso marker="disk_log"><c>disk_log</c></seealso> as its
+	  destination.</p>
+      </item>
 
-    <section>
-      <title>Default formatter</title>
+      <tag><marker id="ErrorLoggerManager"/><c>error_logger</c></tag>
+      <item>
+	<p>This handler is provided for backwards compatibility
+	  only. It is not started by default, but will be
+	  automatically started the first time an <c>error_logger</c>
+	  event handler is added
+	  with <seealso marker="error_logger#add_report_handler-1">
+	    <c>error_logger:add_report_handler/1,2</c></seealso>.</p>
+
+	<p>The old <c>error_logger</c> event handlers in STDLIB and
+	  SASL still exist, but they are not added by Erlang/OTP 21.0
+	  or later.</p>
+      </item>
+    </taglist>
+  </section>
 
-      <p>The default formatter is <c>logger_formatter</c>.
-	See <seealso marker="logger_formatter#format-2">
-	  <c>logger_formatter:format/2</c></seealso>.</p>
-    </section>
+  <section>
+    <marker id="formatters"/>
+    <title>Formatters</title>
+    <p>A formatter can be used by the handler implementation to do the
+      final formatting of a log event, before printing to the
+      handler's destination. The handler callback receives the
+      formatter information as part of the handler configuration,
+      which is passed as the second argument
+      to <seealso marker="logger#HModule:log-2">
+	<c>HModule:log/2</c></seealso>.</p>
+    <p>The formatter information consits of a formatter
+      module, <c>FModule</c> and its
+      configuration, <c>FConfig</c>. <c>FModule</c> must export the
+      following function, which can be called by the handler:</p>
+    <pre><seealso marker="logger#FModule:format-2">format(LogEvent,FConfig)
+	-> FormattedLogEntry</seealso></pre>
+    <p>The formatter information for a handler is set as a part of its
+      configuration when the handler is added. It can also be changed
+      during runtime
+      with <seealso marker="logger#set_handler_config-3">
+	<c>logger:set_handler_config(HandlerId,formatter,{FModule,FConfig})</c>
+      </seealso>, which overwrites the current formatter information,
+      or with <seealso marker="logger#update_formatter_config-2">
+	<c>logger:update_formatter_config/2,3</c></seealso>, which
+	only modifies the formatter configuration.</p>
+    <p>If the formatter module exports the optional callback
+      function <seealso marker="logger#FModule:check_config-1">
+	<c>check_config(FConfig)</c></seealso>, Logger calls this
+      function when the formatter information is set or modified, to
+      verify the validity of the formatter configuration.</p>
+    <p>If no formatter information is specified for a handler, Logger
+      uses <seealso marker="logger_formatter">
+	<c>logger_formatter(3)</c></seealso> as default.</p>
   </section>
 
   <section>
@@ -250,52 +434,58 @@
 
     <p>Logger can be configured either when the system starts through
       <seealso marker="config">configuration parameters</seealso>,
-      or at run-time by using the <seealso marker="logger">logger</seealso>
+      or at run-time by using the <seealso marker="logger">logger(3)</seealso>
       API. The recommended approach is to do the initial configuration in
       the <c>sys.config</c> file and then use the API when some configuration
-      has to be changed at run-time, such as the logging level.</p>
+      has to be changed at runtime, such as the log level.</p>
 
     <section>
-      <title>Application configuration parameters</title>
+      <title>Kernel Configuration Parameters</title>
       <p>Logger is best configured by using the configuration parameters
-      of kernel. There are three possible configuration parameters:
+      of Kernel. There are four possible configuration parameters:
       <seealso marker="#logger"><c>logger</c></seealso>,
       <seealso marker="kernel_app#logger_level"><c>logger_level</c></seealso>,
       <seealso marker="kernel_app#logger_sasl_compatible"><c>logger_sasl_compatible</c></seealso> and
-      <seealso marker="kernel_app#logger_log_progress"><c>logger_log_progress</c></seealso>.
-      logger_level, logger_sasl_compatible and logger_log_progress are described in the
+      <seealso marker="kernel_app#logger_progress_reports"><c>logger_progress_reports</c></seealso>.
+      <c>logger_level</c>, <c>logger_sasl_compatible</c> and <c>logger_progress_reports</c> are described in the
       <seealso marker="kernel_app#configuration">Kernel Configuration</seealso>,
       while <c>logger</c> is described below.</p>
-      <section>
+
         <marker id="logger"/>
-        <title>logger</title>
-        <p>The <c>logger</c> application configuration parameter is used to configure
-          three different logger aspects; handlers, logger filters and module levels.
+        <p><em>logger</em></p>
+        <p>The application configuration parameter <c>logger</c> is used to configure
+          three different Logger aspects; handlers, logger filters and module levels.
           The configuration is a list containing tagged tuples that look like this:</p>
         <taglist>
           <tag><c>DisableHandler = {handler,default,undefined}</c></tag>
-          <item>Disable the default handler. This will allow another application
+          <item>
+	    <p>Disable the default handler. This allows another application
             to add its own default handler. See <seealso marker="logger#add_handlers/1">
-            <c>logger:add_handlers/1</c></seealso> for more details.</item>
+            <c>logger:add_handlers/1</c></seealso> for more details.</p>
+	    <p>Only one entry of this option is allowed.</p></item>
           <tag><c>AddHandler = {handler,HandlerId,Module,HandlerConfig}</c></tag>
-          <item>Add a handler as if <seealso marker="logger:add_handler/3">
-            <c>logger:add_handler(HandlerId,Module,HandlerConfig)</c></seealso> had been
-            called.</item>
-          <tag><c>Filters = {filters, FilterDefault, [Filter]}</c><br/>
+          <item>
+	    <p>Add a handler as if <seealso marker="logger:add_handler/3">
+            <c>logger:add_handler(HandlerId,Module,HandlerConfig)</c></seealso> is
+            called.</p>
+	    <p>It is allowed to have multiple entries of this option.</p></item>
+          <tag><c>Filters = {filters, default, [Filter]}</c><br/>
           <c>FilterDefault = log | stop</c><br/>
           <c>Filter = {FilterId, {FilterFun, FilterConfig}}</c></tag>
-          <item>Add the specified <seealso marker="logger#add_logger_filter/2">
-          logger filters</seealso>. Only one entry is allowed of this option.</item>
-          <tag><c>ModuleLevel</c></tag>
-          <item><c>{module_level, Level, [Module]}</c>,
-            this option configures the <seealso marker="logger#set_module_level/2">
-            module log level</seealso> to be used. It is possible to have multiple
-            <c>module_level</c> entries.</item>
+          <item>
+	    <p>Add the specified <seealso marker="logger#add_logger_filter/2">
+            logger filters</seealso>.</p>
+	    <p>Only one entry of this option is allowed.</p></item>
+          <tag><c>ModuleLevel = {module_level, Level, [Module]}</c></tag>
+          <item>
+	    <p>This option configures <seealso marker="logger#set_module_level/2">
+            module log level</seealso>.</p>
+	    <p>It is allowed to have multiple entries of this option.</p></item>
         </taglist>
         <p>Examples:</p>
         <list>
           <item>
-          <p>Output logs into a the file &quot;logs/erlang.log&quot;</p>
+          <p>Output logs into the file &quot;logs/erlang.log&quot;</p>
             <code>
 [{kernel,
   [{logger,
@@ -338,153 +528,175 @@
             </code>
           </item>
         </list>
-      </section>
     </section>
 
     <section>
-      <title>Logger configuration</title>
+      <title>Global Logger Configuration</title>
 
       <taglist>
-	<tag><c>level</c></tag>
+	<tag><c>level = </c><seealso marker="logger#type-level">
+	    <c>logger:level()</c></seealso></tag>
 	<item>
-	  <p>Specifies the severity level to log.</p>
+	  <p>Specifies the global log level to log.</p>
+	  <p>See section <seealso marker="#log_level">Log
+	      Level</seealso> for a listing and description of
+	      possible log levels.</p>
+	  <p>The initial value of this option is set by the Kernel
+	    configuration
+	    parameter <seealso marker="kernel_app#logger_level">
+	      <c>logger_level</c></seealso>. It can be changed during
+	      runtime
+	      with <seealso marker="logger#set_logger_config-2">
+	      <c>logger:set_logger_config(level,NewLevel)</c></seealso>.</p>
 	</item>
-	<tag><c>filters</c></tag>
+	<tag><c>filters = [{</c><seealso marker="logger#type-filter_id">
+	    <c>logger:filter_id()</c></seealso><c>,</c>
+	  <seealso marker="logger#type-filter">
+	    <c>logger:filter()</c></seealso><c>}]</c></tag>
 	<item>
-	  <p>Logger filters are added or removed with
+	  <p>Global filters are added and removed with
 	    <seealso marker="logger#add_logger_filter-2">
 	      <c>logger:add_logger_filter/2</c></seealso> and
 	    <seealso marker="logger#remove_logger_filter-1">
 	      <c>logger:remove_logger_filter/1</c></seealso>,
 	    respectively.</p>
-	  <p>See <seealso marker="#Filter">Filter</seealso> for more
-	    information.</p>
-	  <p>By default, no filters exist.</p>
+	  <p>See section <seealso marker="#filters">Filters</seealso>
+	    for more information.</p>
+	  <p>Default is <c>[]</c>, that is, no filters exist.</p>
 	</item>
-	<tag><c>filter_default = log | stop</c></tag>
+	<tag><marker id="filter_default"/><c>filter_default = log | stop</c></tag>
 	<item>
 	  <p>Specifies what to do with an event if all filters
-	    return <c>ignore</c>.</p>
+	    return <c>ignore</c>, or if no filters exist.</p>
+	  <p>See section <seealso marker="#filters">Filters</seealso>
+	    for more information about how this option is used.</p>
 	  <p>Default is <c>log</c>.</p>
 	</item>
-	<tag><c>handlers</c></tag>
-	<item>
-	  <p>Handlers are added or removed with
-	    <seealso marker="logger#add_handler-3">
-	      <c>logger:add_handler/3</c></seealso> and
-	    <seealso marker="logger#remove_handler-1">
-	      <c>logger:remove_handler/1</c></seealso>,
-	    respectively.</p>
-	  <p>See <seealso marker="#Handler">Handler</seealso> for more
-	    information.</p>
-	</item>
       </taglist>
     </section>
 
     <section>
       <marker id="handler_configuration"/>
-      <title>Handler configuration</title>
+      <title>Handler Configuration</title>
       <taglist>
-	<tag><c>level</c></tag>
+	<tag><c>level = </c><seealso marker="logger#type-level">
+	    <c>logger:level()</c></seealso></tag>
 	<item>
-	  <p>Specifies the severity level to log.</p>
+	  <p>Specifies the log level which the handler logs.</p>
+	  <p>See section <seealso marker="#log_level">Log
+	      Level</seealso> for a listing and description of
+	      possible log levels.</p>
+	  <p>The log level can be specified when adding the handler,
+	    or changed during runtime with, for
+	    instance, <seealso marker="logger#set_handler_config/3">
+	      <c>logger:set_handler_config/3</c></seealso>.</p>
+	  <p>Default is <c>info</c>.</p>
 	</item>
-	<tag><c>filters</c></tag>
+	<tag><c>filters = [{</c><seealso marker="logger#type-filter_id">
+	    <c>logger:filter_id()</c></seealso><c>,</c>
+	  <seealso marker="logger#type-filter">
+	    <c>logger:filter()</c></seealso><c>}]</c></tag>
 	<item>
 	  <p>Handler filters can be specified when adding the handler,
-	    or added or removed later with
+	    or added or removed during runtime with
 	    <seealso marker="logger#add_handler_filter-3">
 	      <c>logger:add_handler_filter/3</c></seealso> and
 	    <seealso marker="logger#remove_handler_filter-2">
 	      <c>logger:remove_handler_filter/2</c></seealso>,
 	    respectively.</p>
-	  <p>See <seealso marker="#Filter">Filter</seealso> for more
+	  <p>See <seealso marker="#filters">Filters</seealso> for more
 	    information.</p>
-	  <p>By default, no filters exist.</p>
+	  <p>Default is <c>[]</c>, that is, no filters exist.</p>
 	</item>
-	<tag><c>filter_default = log | stop</c></tag>
+	<tag><marker id="filter_default"/><c>filter_default = log | stop</c></tag>
 	<item>
 	  <p>Specifies what to do with an event if all filters
-	    return <c>ignore</c>.</p>
+	    return <c>ignore</c>, or if no filters exist.</p>
+	  <p>See section <seealso marker="#filters">Filters</seealso>
+	    for more information about how this option is used.</p>
 	  <p>Default is <c>log</c>.</p>
 	</item>
-	<tag><c>formatter = {Module::module(),Extra::term()}</c></tag>
+	<tag><c>formatter = {module(),</c><seealso marker="logger#type-formatter_config">
+	    <c>logger:formatter_config()</c></seealso><c>}</c></tag>
 	<item>
-	  <p>See <seealso marker="#Formatter">Formatter</seealso> for more
+	  <p>The formatter which the handler can use for converting
+	    the log event term to a printable string.</p>
+	  <p>See <seealso marker="#formatters">Formatters</seealso> for more
 	    information.</p>
-	  <p>The default module is <seealso marker="logger_formatter">
-	      <c>logger_formatter</c></seealso>, and <c>Extra</c> is
-	      it's configuration map.</p>
+	  <p>Default
+	    is <c>{logger_formatter,DefaultFormatterConfig}</c>, see
+	    the <seealso marker="logger_formatter">
+	      <c>logger_formatter(3)</c></seealso>
+	    manual for information about this formatter and its
+	    default configuration.</p>
 	</item>
-        <tag>HandlerConfig, <c>term() = term()</c></tag>
+        <tag><c>HandlerConfig, atom() = term()</c></tag>
         <item>
-          Any keys not listed above are considered to be handler specific
-          configuration. The configuration of the Kernel handlers can be found in
-          <seealso marker="logger_std_h"><c>logger_std_h</c></seealso> and
-          <seealso marker="logger_disk_log_h"><c>logger_disk_log_h</c></seealso>.
+          <p>Any keys not listed above are considered to be handler
+            specific configuration. The configuration of the Kernel
+            handlers can be found in
+            the <seealso marker="logger_std_h"><c>logger_std_h(3)</c></seealso>
+            and
+            <seealso marker="logger_disk_log_h"><c>logger_disk_log_h(3)</c>
+	    </seealso> manual pages.</p>
         </item>
       </taglist>
 
-      <p>Note that <c>level</c> and <c>filters</c> are obeyed by
+      <p>Notice that <c>level</c> and <c>filters</c> are obeyed by
 	Logger itself before forwarding the log events to each
-	handler, while <c>formatter</c> is left to the handler
-	implementation. All Logger's built-in handlers will call the
-	given formatter before printing.</p>
+	handler, while <c>formatter</c> and all handle specific
+	options are left to the handler implementation.</p>
+      <p>All Logger's built-in handlers will call the given formatter
+	before printing.</p>
     </section>
 
   </section>
 
   <section>
     <marker id="compatibility"/>
-    <title>Backwards compatibility with error_logger</title>
-    <p>Logger provides backwards compatibility with the old
+    <title>Backwards Compatibility with error_logger</title>
+    <p>Logger provides backwards compatibility with
       <c>error_logger</c> in the following ways:</p>
 
     <taglist>
-      <tag>Legacy event handlers</tag>
-      <item>
-	<p>To use event handlers written for <c>error_logger</c>, just
-	  add your event handler with</p>
-	<code>
-error_logger:add_report_handler/1,2.
-	</code>
-	<p>This will automatically start the <c>error_logger</c>
-	  event manager, and add <c>error_logger</c> as a
-	  handler to <c>logger</c>, with configuration</p>
-<code>
-#{level=>info,
-  filter_default=>log,
-  filters=>[]}.
-</code>
-	<p>Note that this handler will ignore events that do not
-	  originate from the old <c>error_logger</c> API, or from
-	  within OTP. This means that if your code uses the logger API
-	  for logging, then your log events will be discarded by this
-	  handler.</p>
-	<p>Also note that <c>error_logger</c> is not overload
-	  protected.</p>
-      </item>
-      <tag>Logger API</tag>
+      <tag>API for Logging</tag>
       <item>
-	<p>The old <c>error_logger</c> API still exists, but should
-	  only be used by legacy code. It will be removed in a later
+	<p>The <c>error_logger</c> API still exists, but should only
+	  be used by legacy code. It will be removed in a later
 	  release.</p>
+	<p>Calls
+	  to <seealso marker="error_logger#error_report-1">
+	    <c>error_logger:error_report/1,2</c></seealso>,
+	  <seealso marker="error_logger#error_msg-1">
+	    <c>error_logger:error_msg/1,2</c></seealso>, and
+	  corresponding functions for warning and info messages, are
+	  all forwarded to Logger as calls
+	  to <seealso marker="logger#log-3">
+	    <c>logger:log(Level,Report,Metadata)</c></seealso>.</p>
+	<p><c>Level = error | warning | info</c> and is taken
+	  from the function name. <c>Report</c> contains the actual
+	  log message, and <c>Metadata</c> contains additional
+	  information which can be used for creating backwards
+	  compatible events for legacy <c>error_logger</c> event
+	  handlers, see
+	  section <seealso marker="#legacy_event_handlers">Legacy
+	  Event Handlers</seealso>.</p>
       </item>
-      <tag>Output format</tag>
+      <tag>Output Format</tag>
       <item>
 	<p>To get log events on the same format as produced
 	  by <c>error_logger_tty_h</c> and <c>error_logger_file_h</c>,
 	  use the default formatter, <c>logger_formatter</c>, with
-	  configuration parameter <c>legacy_header=>true</c>. This is
+	  configuration parameter <c>legacy_header => true</c>. This is
 	  also the default.</p>
       </item>
-      <tag>Default format of log events from OTP</tag>
+      <tag>Default Format of Log Events from OTP</tag>
       <item>
 	<p>By default, all log events originating from within OTP,
 	  except the former so called "SASL reports", look the same as
 	  before.</p>
       </item>
-      <tag>SASL reports</tag>
+      <tag><marker id="sasl_reports"/>SASL Reports</tag>
       <item>
 	<p>By SASL reports we mean supervisor reports, crash reports
 	  and progress reports.</p>
@@ -494,96 +706,134 @@ error_logger:add_report_handler/1,2.
 	  named <c>sasl_report_tty_h</c>
 	  and <c>sasl_report_file_h</c>.</p>
 	<p>The destination of these log events were configured by
-	  environment variables for the SASL application.</p>
+	  <seealso marker="sasl:sasl_app#deprecated_error_logger_config">SASL
+	  configuration parameters</seealso>.</p>
 	<p>Due to the specific event handlers, the output format
 	  slightly differed from other log events.</p>
-	<p>As of OTP-21, the concept of SASL reports is removed,
-	  meaning that the default behavior is as follows:</p>
+	<p>As of Erlang/OTP 21.0, the concept of SASL reports is
+	  removed, meaning that the default behaviour is as
+	  follows:</p>
 	<list>
-	  <item>Supervisor reports, crash reports and progress reports
+	  <item>Supervisor reports, crash reports, and progress reports
 	    are no longer connected to the SASL application.</item>
 	  <item>Supervisor reports and crash reports are logged by
 	    default.</item>
 	  <item>Progress reports are not logged by default, but can be
-	    enabled with the kernel environment
-	    variable <c>logger_log_progress</c>.</item>
+	    enabled with the Kernel configuration
+	    parameter <seealso marker="kernel_app#logger_progress_reports">
+	    <c>logger_progress_reports</c></seealso>.</item>
 	  <item>The output format is the same for all log
 	    events.</item>
 	</list>
-	<p>If the old behavior is preferred, the kernel environment
-	  variable <c>logger_sasl_compatible</c> can be set
-	  to <c>true</c>. The old SASL environment variables can then
-	  be used as before, and the SASL reports will only be printed
-	  if the SASL application is running - through a second log
-	  handler named <c>sasl_h</c>.</p>
+	<p>If the old behaviour is preferred, the Kernel configuation
+	  parameter <seealso marker="kernel_app:logger_sasl_compatible">
+	    <c>logger_sasl_compatible</c></seealso> can be set
+	  to <c>true</c>. The
+	  <seealso marker="sasl:sasl_app#deprecated_error_logger_config">SASL
+	  configuration parameters</seealso> can then be used as
+	  before, and the SASL reports will only be printed if the
+	  SASL application is running, through a second log handler
+	  named <c>sasl</c>.</p>
 	<p>All SASL reports have a metadata
-	  field <c>domain=>[beam,erlang,otp,sasl]</c>, which can be
+	  field <c>domain => [beam,erlang,otp,sasl]</c>, which can be
 	  used, for example, by filters to stop or allow the
-	  events.</p>
+	  log events.</p>
+	<p>See the <seealso marker="sasl:error_logging">SASL User's
+	  Guide</seealso> for more information about the old SASL
+	  error logging functionality.</p>
+      </item>
+      <tag><marker id="legacy_event_handlers"/>Legacy Event Handlers</tag>
+      <item>
+	<p>To use event handlers written for <c>error_logger</c>, just
+	  add your event handler with</p>
+	<code>
+error_logger:add_report_handler/1,2.
+	</code>
+	<p>This will automatically start the <c>error_logger</c>
+	  event manager, and add <c>error_logger</c> as a
+	  handler to <c>logger</c>, with configuration</p>
+<code>
+#{level => info,
+  filter_default => log,
+  filters => []}.
+</code>
+	<p>Notice that this handler will ignore events that do not
+	  originate from the <c>error_logger</c> API, or from within
+	  OTP. This means that if your code uses the Logger API for
+	  logging, then your log events will be discarded by this
+	  handler.</p>
+	<p>Also notice that <c>error_logger</c> is not overload
+	  protected.</p>
       </item>
     </taglist>
   </section>
 
 
   <section>
-    <title>Error handling</title>
+    <title>Error Handling</title>
     <p>Log data is expected to be either a format string and
-      arguments, a string (unicode:chardata), or a report (map or
+      arguments, a string
+      (<seealso marker="stdlib:unicode#type-chardata">
+	<c>unicode:chardata()</c></seealso>), or a report (map or
       key-value list) which can be converted to a format string and
-      arguments by the handler. A default report callback should be
-      included in the log event's metadata, which can be used for
-      converting the report to a format string and arguments. The
-      handler might also do a custom conversion if the default format
-      is not desired.</p>
-    <p><c>logger</c> does, to a certain extent, check its input data
+      arguments by the handler. If a report is given, a default report
+      callback can be included in the log event's metadata. The
+      handler can use this callback for converting the report to a
+      format string and arguments. If the format obtained by the
+      provided callback is not desired, or if there is no provided
+      callback, the handler must do a custom conversion.</p>
+    <p>Logger does, to a certain extent, check its input data
       before forwarding a log event to the handlers, but it does not
       evaluate conversion funs or check the validity of format strings
       and arguments. This means that any filter or handler must be
       careful when formatting the data of a log event, making sure
       that it does not crash due to bad input data or faulty
       callbacks.</p>
-    <p>If a filter or handler still crashes, logger will remove the
-      filter or handler in question from the configuration, and then
-      print a short error message on the console. A debug event
-      containing the crash reason and other details is also issued,
-      and can be seen if a handler is installed which logs on debug
-      level.</p>
+    <p>If a filter or handler still crashes, Logger will remove the
+      filter or handler in question from the configuration, and print
+      a short error message to the terminal. A debug event containing
+      the crash reason and other details is also issued, and can be
+      seen if a handler logging debug events is installed.</p>
   </section>
 
   <section>
     <title>Example: add a handler to log debug events to file</title>
-    <p>When starting an erlang node, the default behavior is that all
+    <p>When starting an Erlang node, the default behaviour is that all
       log events with level info and above are logged to the
-      console. In order to also log debug events, you can either
+      terminal. In order to also log debug events, you can either
       change the global log level to <c>debug</c> or add a separate
       handler to take care of this. In this example we will add a new
       handler which prints the debug events to a separate file.</p>
-    <p>First, we add an instance of logger_std_h with
+    <p>First, we add an instance of <c>logger_std_h</c> with
       type <c>{file,File}</c>, and we set the handler's level
       to <c>debug</c>:</p>
     <pre>
-1> <input>Config = #{level=>debug,logger_std_h=>#{type=>{file,"./debug.log"}}}.</input>
+1> <input>Config = #{level => debug, logger_std_h => #{type => {file,"./debug.log"}}}.</input>
 #{logger_std_h => #{type => {file,"./debug.log"}},
   level => debug}
 2> <input>logger:add_handler(debug_handler,logger_std_h,Config).</input>
 ok</pre>
     <p>By default, the handler receives all events
-      (<c>filter_defalt=log</c>), so we need to add a filter to stop
-      all non-debug events:</p>
+      (<c>filter_default=log</c>, see
+      section <seealso marker="#filters">Filters</seealso> for more
+      details), so we need to add a filter to stop all non-debug
+      events. The built-in
+      filter <seealso marker="logger_filters#level-2">
+	<c>logger_filters:level/2</c></seealso>
+      is used for this:</p>
     <pre>
-3> <input>Fun = fun(#{level:=debug}=Log,_) -> Log; (_,_) -> stop end.</input>
-#Fun&lt;erl_eval.12.98642416>
-4> <input>logger:add_handler_filter(debug_handler,allow_debug,{Fun,[]}).</input>
+3> <input>logger:add_handler_filter(debug_handler,stop_non_debug,
+                             {fun logger_filters:level/2,{stop,neq,debug}}).</input>
 ok</pre>
-    <p>And finally, we need to make sure that the logger itself allows
+    <p>And finally, we need to make sure that Logger itself allows
       debug events. This can either be done by setting the global
-      logger level:</p>
+      log level:</p>
     <pre>
-5> <input>logger:set_logger_config(level,debug).</input>
+4> <input>logger:set_logger_config(level,debug).</input>
 ok</pre>
     <p>Or by allowing debug events from one or a few modules only:</p>
     <pre>
-6> <input>logger:set_module_level(mymodule,debug).</input>
+5> <input>logger:set_module_level(mymodule,debug).</input>
 ok</pre>
 
   </section>
@@ -592,107 +842,112 @@ ok</pre>
     <title>Example: implement a handler</title>
     <p>The only requirement that a handler MUST fulfill is to export
       the following function:</p>
-    <code>log(logger:log(),logger:config()) ->ok</code>
-    <p>It may also implement the following callbacks:</p>
+    <code>log(logger:log_event(),logger:config()) -> ok</code>
+    <p>It can optionally also implement the following callbacks:</p>
     <code>
-adding_handler(logger:handler_id(),logger:config()) -> {ok,logger:config()} | {error,term()}
-removing_handler(logger:handler_id(),logger:config()) -> ok
-changing_config(logger:handler_id(),logger:config(),logger:config()) -> {ok,logger:config()} | {error,term()}
+adding_handler(logger:config()) -> {ok,logger:config()} | {error,term()}
+removing_handler(logger:config()) -> ok
+changing_config(logger:config(),logger:config()) -> {ok,logger:config()} | {error,term()}
     </code>
-    <p>When logger:add_handler(Id,Module,Config) is called, logger
-      will first call Module:adding_handler(Id,Config), and if it
-      returns {ok,NewConfig} the NewConfig is written to the
-      configuration database. After this, the handler may receive log
-      events as calls to Module:log/2.</p>
+    <p>When <c>logger:add_handler(Id,Module,Config)</c> is called,
+      Logger first calls <c>HModule:adding_handler(Config)</c>. If
+      this function returns <c>{ok,NewConfig}</c>, Logger
+      writes <c>NewConfig</c> to the configuration database, and
+      the <c>logger:add_handler/3</c> call returns. After this, the
+      handler is installed and must be ready to receive log events as
+      calls to <c>HModule:log/2</c>.</p>
     <p>A handler can be removed by calling
-      logger:remove_handler(Id). logger will call
-      Module:removing_handler(Id,Config), and then remove the handler's
-      configuration from the configuration database.</p>
-    <p>When logger:set_handler_config is called, logger calls
-      Module:changing_config(Id,OldConfig,NewConfig). If this function
-      returns ok, the NewConfig is written to the configuration
-      database.</p>
-
-    <p>A simple handler which prints to the console could be
-      implemented as follows:</p>
+      <c>logger:remove_handler(Id)</c>. Logger calls
+      <c>HModule:removing_handler(Config)</c>, and removes the
+      handler's configuration from the configuration database.</p>
+    <p>When <c>logger:set_handler_config/2,3</c>
+      or <c>logger:update_handler_config/2</c> is called, Logger
+      calls <c>HModule:changing_config(OldConfig,NewConfig)</c>. If
+      this function returns <c>{ok,NewConfig}</c>, Logger
+      writes <c>NewConfig</c> to the configuration database.</p>
+
+    <p>A simple handler that prints to the terminal can be implemented
+      as follows:</p>
     <code>
 -module(myhandler).
 -export([log/2]).
 
-log(Log,#{formatter:={FModule,FConfig}) ->
-    io:put_chars(FModule:format(Log,FConfig)).
+log(LogEvent,#{formatter:={FModule,FConfig}) ->
+    io:put_chars(FModule:format(LogEvent,FConfig)).
     </code>
 
     <p>A simple handler which prints to file could be implemented like
       this:</p>
     <code>
 -module(myhandler).
--export([adding_handler/2, removing_handler/2, log/2]).
+-export([adding_handler/1, removing_handler/1, log/2]).
 -export([init/1, handle_call/3, handle_cast/2, terminate/2]).
 
-adding_handler(Id,Config) ->
+adding_handler(Config) ->
     {ok,Fd} = file:open(File,[append,{encoding,utf8}]),
-    {ok,Config#{myhandler_fd=>Fd}}.
+    {ok,Config#{myhandler_fd => Fd}}.
 
-removing_handler(Id,#{myhandler_fd:=Fd}) ->
+removing_handler(#{myhandler_fd:=Fd}) ->
     _ = file:close(Fd),
     ok.
 
-log(Log,#{myhandler_fd:=Fd,formatter:={FModule,FConfig}}) ->
-    io:put_chars(Fd,FModule:format(Log,FConfig)).
+log(LogEvent,#{myhandler_fd:=Fd,formatter:={FModule,FConfig}}) ->
+    io:put_chars(Fd,FModule:format(LogEvent,FConfig)).
     </code>
 
     <note><p>The above handlers do not have any overload
       protection, and all log events are printed directly from the
       client process.</p></note>
 
-    <p>For examples of overload protection, please refer to the
-      implementation
-      of <seealso marker="logger_std_h"><c>logger_std_h</c></seealso>
-      and <seealso marker="logger_disk_log_h"><c>logger_disk_log_h</c>
+    <p>For information and examples of overload protection, please
+      refer to
+      section <seealso marker="#overload_protection">Protecting the
+      Handler from Overload</seealso>, and the implementation
+      of <seealso marker="logger_std_h"><c>logger_std_h(3)</c></seealso>
+      and <seealso marker="logger_disk_log_h"><c>logger_disk_log_h(3)</c>
       </seealso>.</p>
 
     <p>Below is a simpler example of a handler which logs through one
       single process.</p>
     <code>
 -module(myhandler).
--export([adding_handler/2, removing_handler/2, log/2]).
+-export([adding_handler/1, removing_handler/1, log/2]).
 -export([init/1, handle_call/3, handle_cast/2, terminate/2]).
 
-adding_handler(Id,Config) ->
+adding_handler(Config) ->
     {ok,Pid} = gen_server:start(?MODULE,Config),
-    {ok,Config#{myhandler_pid=>Pid}}.
+    {ok,Config#{myhandler_pid => Pid}}.
 
-removing_handler(Id,#{myhandler_pid:=Pid}) ->
+removing_handler(#{myhandler_pid:=Pid}) ->
     gen_server:stop(Pid).
 
-log(Log,#{myhandler_pid:=Pid} = Config) ->
-    gen_server:cast(Pid,{log,Log,Config}).
+log(LogEvent,#{myhandler_pid:=Pid} = Config) ->
+    gen_server:cast(Pid,{log,LogEvent,Config}).
 
 init(#{myhandler_file:=File}) ->
     {ok,Fd} = file:open(File,[append,{encoding,utf8}]),
-    {ok,#{file=>File,fd=>Fd}}.
+    {ok,#{file => File, fd => Fd}}.
 
 handle_call(_,_,State) ->
     {reply,{error,bad_request},State}.
 
-handle_cast({log,Log,Config},#{fd:=Fd} = State) ->
-    do_log(Fd,Log,Config),
+handle_cast({log,LogEvent,Config},#{fd:=Fd} = State) ->
+    do_log(Fd,LogEvent,Config),
     {noreply,State}.
 
 terminate(Reason,#{fd:=Fd}) ->
     _ = file:close(Fd),
     ok.
 
-do_log(Fd,Log,#{formatter:={FModule,FConfig}}) ->
-    String = FModule:format(Log,FConfig),
+do_log(Fd,LogEvent,#{formatter:={FModule,FConfig}}) ->
+    String = FModule:format(LogEvent,FConfig),
     io:put_chars(Fd,String).
     </code>
   </section>
 
   <section>
     <marker id="overload_protection"/>
-    <title>Protecting the handler from overload</title>
+    <title>Protecting the Handler from Overload</title>
     <p>In order for the built-in handlers to survive, and stay responsive,
     during periods of high load (i.e. when huge numbers of incoming
     log requests must be handled), a mechanism for overload protection
@@ -703,7 +958,7 @@ do_log(Fd,Log,#{formatter:={FModule,FConfig}}) ->
     as follows:</p>
     
     <section>
-      <title>Message queue length</title>
+      <title>Message Queue Length</title>
       <p>The handler process keeps track of the length of its message
       queue and reacts in different ways depending on the current status.
       The purpose is to keep the handler in, or (as quickly as possible),
@@ -720,7 +975,7 @@ do_log(Fd,Log,#{formatter:={FModule,FConfig}}) ->
 	  and as long as the length of the message queue is lower, all log
 	  requests are handled asynchronously. This simply means that the
 	  process sending the log request (by calling a log function in the
-	  logger API) does not wait for a response from the handler but
+	  Logger API) does not wait for a response from the handler but
 	  continues executing immediately after the request (i.e. it will not
 	  be affected by the time it takes the handler to print to the log
 	  device). If the message queue grows larger than this value, however,
@@ -798,14 +1053,14 @@ logger:add_handler(my_standard_h, logger_std_h,
     </section>
 
     <section>
-      <title>Controlling bursts of log requests</title>
+      <title>Controlling Bursts of Log Requests</title>
       <p>A potential problem with large bursts of log requests, is that log files
       may get full or wrapped too quickly (in the latter case overwriting
       previously logged data that could be of great importance). For this reason,
       both built-in handlers offer the possibility to set a maximum level of how
       many requests to process with a certain time frame. With this burst control
       feature enabled, the handler will take care of bursts of log requests
-      without choking log files, or the console, with massive amounts of
+      without choking log files, or the terminal, with massive amounts of
       printouts. These are the configuration parameters:</p>
       
       <taglist>
@@ -839,7 +1094,7 @@ logger:add_handler(my_disk_log_h, logger_disk_log_h,
     </section>
 
     <section>
-      <title>Terminating a large handler</title>
+      <title>Terminating a Large Handler</title>
       <p>A handler process may grow large even if it can manage peaks of high load
       without crashing. The overload protection mechanism includes user configurable
       levels for a maximum allowed message queue length and maximum allowed memory
@@ -876,7 +1131,14 @@ logger:add_handler(my_disk_log_h, logger_disk_log_h,
 
   <section>
     <title>See Also</title>
-    <p><seealso marker="error_logger"><c>error_logger(3)</c></seealso>,
-    <seealso marker="sasl:sasl_app"><c>SASL(6)</c></seealso></p>
+    <p>
+      <seealso marker="disk_log"><c>disk_log(3)</c></seealso>,
+      <seealso marker="error_logger"><c>error_logger(3)</c></seealso>,
+      <seealso marker="logger"><c>logger(3)</c></seealso>,
+      <seealso marker="logger_disk_log_h"><c>logger_disk_log_h(3)</c></seealso>,
+      <seealso marker="logger_filters"><c>logger_filters(3)</c></seealso>,
+      <seealso marker="logger_formatter"><c>logger_formatter(3)</c></seealso>,
+      <seealso marker="logger_std_h"><c>logger_std_h(3)</c></seealso>,
+        <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso></p>
   </section>
 </chapter>
diff --git a/lib/kernel/doc/src/logger_disk_log_h.xml b/lib/kernel/doc/src/logger_disk_log_h.xml
index 440ae28e5d..20b49b8ca0 100644
--- a/lib/kernel/doc/src/logger_disk_log_h.xml
+++ b/lib/kernel/doc/src/logger_disk_log_h.xml
@@ -33,21 +33,21 @@
     <file>logger_disk_log_h.xml</file>
   </header>
   <module>logger_disk_log_h</module>
-  <modulesummary>A disk_log based handler for the Logger
-  application.</modulesummary>
+  <modulesummary>A disk_log based handler for the Logger.</modulesummary>
 
   <description>
-    <p>This is a handler for the Logger application that offers circular
-    (wrapped) logs by using the disk_log application. Multiple instances
-    of this handler can be added to logger, and each instance will print to
+    <p>This is a handler for Logger that offers circular
+    (wrapped) logs by using <seealso marker="disk_log"><c>disk_log</c></seealso>. 
+    Multiple instances
+    of this handler can be added to Logger, and each instance prints to
     its own disk_log file, created with the name and settings specified in
     the handler configuration.</p>
     <p>The default standard handler,
     <seealso marker="logger_std_h"><c>logger_std_h</c></seealso>, can be
-    replaced by a disk_log handler at startup of the kernel application.
+    replaced by a disk_log handler at startup of the Kernel application.
     See an example of this below.</p>
     <p>The handler has an overload protection mechanism that will keep the handler
-    process and the kernel application alive during a high load of log 
+    process and the Kernel application alive during a high load of log 
     requests. How this feature works, and how to modify the configuration,
     is described in the
     <seealso marker="logger_chapter#overload_protection"><c>User's Guide</c>
@@ -121,7 +121,7 @@ logger:add_handler(my_disk_log_h, logger_disk_log_h,
                               #{filesync_repeat_interval => 1000}}).
     </code>
     <p>In order to use the disk_log handler instead of the default standard
-    handler when starting en Erlang node, change the Kernel default logger to
+    handler when starting an Erlang node, change the Kernel default logger to
     use disk_log. Example:</p>
     <code type="none">
 erl -kernel logger '[{handler,default,logger_disk_log_h,
@@ -141,6 +141,12 @@ erl -kernel logger '[{handler,default,logger_disk_log_h,
 
   </funcs>
 
+  <section>
+    <title>See Also</title>
+    <p><seealso marker="logger"><c>logger(3)</c></seealso></p>
+    <p><seealso marker="logger_std_h"><c>logger_std_h(3)</c></seealso></p>
+    <p><seealso marker="disk_log"><c>disk_log(3)</c></seealso></p>
+  </section>
 </erlref>
 
 
diff --git a/lib/kernel/doc/src/logger_filters.xml b/lib/kernel/doc/src/logger_filters.xml
index 1bbae8be21..f92181ea3f 100644
--- a/lib/kernel/doc/src/logger_filters.xml
+++ b/lib/kernel/doc/src/logger_filters.xml
@@ -52,61 +52,100 @@
   <funcs>
     <func>
       <name name="domain" arity="2"/>
-      <fsummary>Filter log events based on the domain field in metadata.</fsummary>
+      <fsummary>Filter log events based on the domain field in
+	metadata.</fsummary>
       <desc>
-	  <p>This filter provides a way of filtering log events based on a
-	    <c>domain</c> field <c>Metadata</c>.</p>
-
-	  <p>The <c><anno>Extra</anno></c> parameter is specified when
-	    adding the filter
-	    via <seealso marker="logger#add_logger_filter-2">
-	      <c>logger:add_logger_filter/2</c></seealso>
-	    or <seealso marker="logger#add_handler_filter-3">
-	      <c>logger:add_handler_filter/3</c></seealso>.</p>
-
-	  <p>The filter compares the value of the <c>domain</c> field
-	    in the log event's metadata (<c>Domain</c>)
-	    to <c><anno>MatchDomain</anno></c> as follows:</p>
-
-	  <taglist>
-	    <tag><c><anno>Compare</anno> = starts_with</c></tag>
-	    <item><p>The filter matches if <c>MatchDomain</c> is a prefix
-	      of <c>Domain</c>.</p></item>
-	    <tag><c><anno>Compare</anno> = prefix_of</c></tag>
-	    <item><p>The filter matches if <c>Domain</c> is a prefix
-	      of <c>MatchDomain</c>.</p></item>
-	    <tag><c><anno>Compare</anno> = equals</c></tag>
-	    <item><p>The filter matches if <c>Domain</c> is equal
-	      to <c>MatchDomain</c>.</p></item>
-	    <tag><c><anno>Compare</anno> = differs</c></tag>
-	    <item><p>The filter matches if <c>Domain</c> differs
-	      from <c>MatchDomain</c>, or if there is no domain field
-	      in metadata.</p></item>
-	    <tag><c><anno>Compare</anno> = no_domain</c></tag>
-	    <item><p>The filter matches if there is no domain field in
-	      metadata. In this case <c><anno>MatchDomain</anno></c> shall
-	      be <c>[]</c>.</p></item>
-	  </taglist>
-
-          <p>If the filter matches and <c><anno>Action</anno> =
-            log</c>, the log event is allowed. If the filter matches
-            and <c><anno>Action</anno> = stop</c>, the log event is
-            stopped.</p>
-
-	  <p>If the filter does not match, it returns <c>ignore</c>,
-	    meaning that other filters, or the value of the
-	    configuration parameter <c>filter_default</c>, will decide
-	    if the event is allowed or not.</p>
-
-	  <p>Log events that do not contain any domain field, will
-	    only match when <c><anno>Compare</anno> = no_domain</c>.</p>
-
-	  <p>Example: stop all events with
-	    domain <c>[beam,erlang,otp,sasl|_]</c></p>
-
-	  <code>
+	<p>This filter provides a way of filtering log events based on a
+	  <c>domain</c> field in <c>Metadata</c>. This field is
+	  optional, and the purpose of using it is to group log events
+	  from, for example, a specific functional area. This allows
+	  filtering or other specialized treatment in a Logger
+	  handler.</p>
+
+	<p>A domain field must be a list of atoms, creating smaller
+	  and more specialized domains as the list grows longer. The
+	  biggest domain is <c>[]</c>, which comprices all
+	  possible domains.</p>
+
+	<p>For example, consider the following domains:</p>
+	<pre>
+D1 = [beam,erlang,otp]
+D2 = [beam,erlang,otp,sasl]</pre>
+
+	<p><c>D1</c> is the biggest of the two, and is said to be a
+	  super-domain of <c>D2</c>. <c>D2</c> is a
+	  sub-domain <c>D1</c>. Both <c>D1</c> and <c>D2</c> are
+	  sub-domains of <c>[]</c></p>
+
+	<p>The above domains are used for logs originating from
+	  Erlang/OTP. D1 specifies that the log event comes from
+	  Erlang/OTP in general, and D2 indicates that the log event
+	  is a so
+	  called <seealso marker="logger_chapter#sasl_reports">SASL
+	  report</seealso>.</p>
+
+	<p>The <c><anno>Extra</anno></c> parameter to
+	  the <c>domain/2</c> function is specified when adding the
+	  filter via <seealso marker="logger#add_logger_filter-2">
+	    <c>logger:add_logger_filter/2</c></seealso>
+	  or <seealso marker="logger#add_handler_filter-3">
+	    <c>logger:add_handler_filter/3</c></seealso>.</p>
+
+	<p>The filter compares the value of the <c>domain</c> field
+	  in the log event's metadata (<c>Domain</c>)
+	  to <c><anno>MatchDomain</anno></c> as follows:</p>
+
+	<taglist>
+	  <tag><c><anno>Compare</anno> = sub</c></tag>
+	  <item>
+	    <p>The filter matches if <c>Domain</c> is equal to or
+	      a sub-domain of <c>MatchDomain</c>, that is,
+	      if <c>MatchDomain</c> is a prefix of <c>Domain</c>.</p>
+	  </item>
+	  <tag><c><anno>Compare</anno> = super</c></tag>
+	  <item>
+	    <p>The filter matches if <c>Domain</c> is equal to or a
+	      super-domain of <c>MatchDomain</c>, that is,
+	      if <c>Domain</c> is a prefix of <c>MatchDomain</c>.</p>
+	  </item>
+	  <tag><c><anno>Compare</anno> = equal</c></tag>
+	  <item>
+	    <p>The filter matches if <c>Domain</c> is equal
+	      to <c>MatchDomain</c>.</p>
+	  </item>
+	  <tag><c><anno>Compare</anno> = not_equal</c></tag>
+	  <item>
+	    <p>The filter matches if <c>Domain</c> is not equal
+	      to <c>MatchDomain</c>, or if there is no domain field in
+	      metadata.</p>
+	  </item>
+	  <tag><c><anno>Compare</anno> = undefined</c></tag>
+	  <item><p>The filter matches if there is no domain field in
+	      metadata. In this case <c><anno>MatchDomain</anno></c>
+	      must be set to <c>[]</c>.</p>
+	  </item>
+	</taglist>
+
+        <p>If the filter matches and <c><anno>Action</anno> = log</c>,
+          the log event is allowed. If the filter matches
+          and <c><anno>Action</anno> = stop</c>, the log event is
+          stopped.</p>
+
+	<p>If the filter does not match, it returns <c>ignore</c>,
+	  meaning that other filters, or the value of the
+	  configuration parameter <c>filter_default</c>, decide if the
+	  event is allowed or not.</p>
+
+	<p>Log events that do not contain any domain field, match only
+	  when <c><anno>Compare</anno> = undefined</c>
+	  or <c><anno>Compare</anno> = not_equal</c>.</p>
+
+	<p>Example: stop all events with
+	  domain <c>[beam,erlang,otp,sasl|_]</c></p>
+
+	<code>
 logger:set_handler_config(h1,filter_default,log). % this is the default
-Filter = {fun logger_filters:domain/2,{stop,starts_with,[beam,erlang,otp,sasl]}}.
+Filter = {fun logger_filters:domain/2,{stop,sub,[beam,erlang,otp,sasl]}}.
 logger:add_handler_filter(h1,no_sasl,Filter).
 ok</code>
       </desc>
diff --git a/lib/kernel/doc/src/logger_formatter.xml b/lib/kernel/doc/src/logger_formatter.xml
index 370d61d338..02f89b26be 100644
--- a/lib/kernel/doc/src/logger_formatter.xml
+++ b/lib/kernel/doc/src/logger_formatter.xml
@@ -39,102 +39,157 @@
     <p>Each log handler has a configured formatter specified as a
       module and a configuration term. The purpose of the formatter is
       to translate the log events to a final printable string
-      (<c>unicode:chardata()</c>) which can be written to the output
+      (<seealso marker="stdlib:unicode#type-chardata"><c>unicode:chardata()</c>
+      </seealso>) which can be written to the output
       device of the handler.</p>
     <p><c>logger_formatter</c> is the default formatter used by
       Logger.</p>
   </description>
 
-  <section>
-    <title>Configuration</title>
-    <p>The configuration term for <c>logger_formatter</c> is a map,
-      and the following keys can be set as configuration
-      parameters:</p>
-    <taglist>
-      <tag><c>chars_limit = pos_integer() | unlimited</c></tag>
-      <item>
-	<p>A positive integer representing the value of the option
-	  with the same name to be used when calling
-	  <seealso marker="stdlib:io_lib#format-3">io_lib:format/3</seealso>.
-	  This value limits the total number of characters printed
-	  for each log event. Notice that this is a soft limit. For a
-	  hard truncation limit, see option <c>max_size</c>.</p>
-	<p>Default is <c>unlimited</c>.</p>
-	<note>
-	  <p><c>chars_limit</c> has no effect on log messages on
-	    string form. These are expected to be short, but can still
-	    be truncated by the <c>max_size</c> parameter.</p>
-	</note>
-      </item>
-      <tag><marker id="depth"/><c>depth = pos_integer() | unlimited</c></tag>
-      <item>
-	<p>A positive integer representing the maximum depth to
-	  which terms shall be printed by this formatter. Format
-	  strings passed to this formatter are rewritten. The format
-	  controls ~p and ~w are replaced with ~P and ~W,
-	  respectively, and the value is used as the depth
-	  parameter. For details, see
-	  <seealso marker="stdlib:io#format-2">io:format/2,3</seealso>
-	  in STDLIB.</p>
-	<p>Default is <c>unlimited</c>.</p>
-	<note>
-	  <p><c>depth</c> has no effect on log messages on string
-	    form. These are expected to be short, but can still be
-	    truncated by the <c>max_size</c> parameter.</p>
-	</note>
-      </item>
-      <tag><c>max_size = pos_integer() | unlimited</c></tag>
-      <item>
-	<p>A positive integer representing the absolute maximum size a
-	  string returned from this formatter can have. If the
-	  formatted string is longer, after possibly being limited
-	  by <c>chars_limit</c> or <c>depth</c>, it is truncated.</p>
-	<p>Default is <c>unlimited</c>.</p>
-      </item>
-      <tag><c>single_line = boolean()</c></tag>
-      <item>
-	<p>If set to <c>true</c>, all newlines in the message are
-	  replaced with <c>", "</c>, and whitespaces following
-	  directly after newlines are removed. Note that newlines
-	  added by the <c>template</c> parameter are not replaced.</p>
-	<p>Default is <c>true</c>.</p>
-      </item>
-      <tag><c>legacy_header = boolen()</c></tag>
-      <item>
-	<p>If set to <c>true</c> a header field is added to
-	  logger_formatter's part of <c>Metadata</c>. The value of
-	  this field is a string similar to the header created by the
-	  old <c>error_logger</c> event handlers. It can be included
-	  in the log event by adding the
-	  tuple <c>{logger_formatter,header}</c> to the template. See
-	  section <seealso marker="#default_templates">Default
-	  Templates</seealso> for more information.</p>
-	<p>Default is <c>false</c>.</p>
-      </item>
-      <tag><c>report_cb = fun((</c><seealso marker="logger#type-report"><c>logger:report()</c></seealso><c>) -> {</c><seealso marker="stdlib:io#type-format"><c>io:format()</c></seealso><c>,[term()]})</c></tag>
-      <item>
-	<p>A report callback is used by the formatter to transform log
-	  messages on report form to a format string and
-	  arguments. The report callback can be specified in the
-	  metadata for the log event. If no report callback exist in
-	  metadata, <c>logger_formatter</c> will
-	  use <seealso marker="logger#format_report-1">
-	    <c>logger:format_report/1</c></seealso> as default
-	  callback.</p>
-	<p>If this configuration parameter is set, it replaces both
-	  the default report callback, and any report callback found
-	  in metadata. That is, all reports are converted by this
-	  configured function.</p>
-	<p>The value must be a function with arity 1,
-	  returning <c>{Format,Args}</c>, and it will be called with a
-	  report as only argument.</p>
-      </item>
-      <tag><c>template = </c><seealso marker="#type-template"><c>template()</c></seealso></tag>
-      <item>
+
+  <datatypes>
+    <datatype>
+      <name name="config"/>
+      <desc>
+	<p>The configuration term for <c>logger_formatter</c> is a
+	  <seealso marker="stdlib:maps">map</seealso>, and the
+	  following keys can be set as configuration parameters:</p>
+	<taglist>
+	  <tag><c>chars_limit = pos_integer() | unlimited</c></tag>
+	  <item>
+	    <p>A positive integer representing the value of the option
+	      with the same name to be used when calling
+	      <seealso marker="stdlib:io_lib#format-3">
+		<c>io_lib:format/3</c></seealso>.
+	      This value limits the total number of characters printed
+	      for each log event. Notice that this is a soft limit. For a
+	      hard truncation limit, see option <c>max_size</c>.</p>
+	    <p>Defaults to <c>unlimited</c>.</p>
+	    <note>
+	      <p><c>chars_limit</c> has no effect on log messages on
+		string form. These are expected to be short, but can
+		still be truncated by the <c>max_size</c>
+		parameter.</p>
+	    </note>
+	  </item>
+	  <tag><marker id="depth"/><c>depth = pos_integer() | unlimited</c></tag>
+	  <item>
+	    <p>A positive integer representing the maximum depth to
+	      which terms shall be printed by this formatter. Format
+	      strings passed to this formatter are rewritten. The
+	      format controls ~p and ~w are replaced with ~P and ~W,
+	      respectively, and the value is used as the depth
+	      parameter. For details, see
+	      <seealso marker="stdlib:io#format-2">io:format/2,3</seealso>
+	      in STDLIB.</p>
+	    <p>Defaults to <c>unlimited</c>.</p>
+	    <note>
+	      <p><c>depth</c> has no effect on log messages on string
+		form. These are expected to be short, but can still be
+		truncated by the <c>max_size</c> parameter.</p>
+	    </note>
+	  </item>
+	  <tag><c>legacy_header = boolean()</c></tag>
+	  <item>
+	    <p>If set to <c>true</c> a header field is added to
+	      logger_formatter's part of <c>Metadata</c>. The value of
+	      this field is a string similar to the header created by
+	      the old <c>error_logger</c> event handlers. It can be
+	      included in the log event by adding the
+	      tuple <c>{logger_formatter,header}</c> to the
+	      template. See the description of
+	      the <seealso marker="#type-template"><c>template()</c></seealso>
+	      type for more information.</p>
+	    <p>Defaults to <c>false</c>.</p>
+	  </item>
+	  <tag><c>max_size = pos_integer() | unlimited</c></tag>
+	  <item>
+	    <p>A positive integer representing the absolute maximum size a
+	      string returned from this formatter can have. If the
+	      formatted string is longer, after possibly being limited
+	      by <c>chars_limit</c> or <c>depth</c>, it is truncated.</p>
+	    <p>Defaults to <c>unlimited</c>.</p>
+	  </item>
+	  <tag><c>report_cb = fun((</c><seealso marker="logger#type-report"><c>logger:report()</c></seealso><c>) -> {</c><seealso marker="stdlib:io#type-format"><c>io:format()</c></seealso><c>,[term()]})</c></tag>
+	  <item>
+	    <p>A report callback is used by the formatter to transform
+	      log messages on report form to a format string and
+	      arguments. The report callback can be specified in the
+	      metadata for the log event. If no report callback exist
+	      in metadata, <c>logger_formatter</c> will
+	      use <seealso marker="logger#format_report-1">
+		<c>logger:format_report/1</c></seealso> as default
+	      callback.</p>
+	    <p>If this configuration parameter is set, it replaces
+	      both the default report callback, and any report
+	      callback found in metadata. That is, all reports are
+	      converted by this configured function.</p>
+	    <p>The value must be a function with arity 1,
+	      returning <c>{Format,Args}</c>, and it will be called
+	      with a report as only argument.</p>
+	  </item>
+	  <tag><c>single_line = boolean()</c></tag>
+	  <item>
+	    <p>If set to <c>true</c>, all newlines in the message are
+	      replaced with <c>", "</c>, and whitespaces following
+	      directly after newlines are removed. Note that newlines
+	      added by the <c>template</c> parameter are not replaced.</p>
+	    <p>Defaults to <c>true</c>.</p>
+	  </item>
+	  <tag><c>template = </c><seealso marker="#type-template"><c>template()</c></seealso></tag>
+	  <item>
+	    <p>The template describes how the formatted string is
+	      composed by combining different data values from the log
+	      event. See the description of
+	      the <seealso marker="#type-template"><c>template()</c></seealso>
+	      type for more information about this.</p>
+	  </item>
+	  <tag><c>time_designator = byte()</c></tag>
+	  <item>
+	    <p>Timestamps are formatted according to RFC3339, and the
+	      time designator is the character used as date and time
+	      separator.</p>
+	    <p>Defaults to <c>$T</c>.</p>
+	    <p>The value of this parameter is used as
+	      the <c>time_designator</c> option
+	      to <seealso marker="stdlib:calendar#system_time_to_rfc3339-2">
+		<c>calendar:system_time_to_rcf3339/2</c></seealso>.</p>
+	  </item>
+	  <tag><c>time_offset = integer() | [byte()]</c></tag>
+	  <item>
+	    <p>The time offset, either a string or an integer, to be
+	      used when formatting the timestamp.</p>
+	    <p>An empty string is interpreted as local time. The
+	      values <c>"Z"</c>, <c>"z"</c> or <c>0</c> are
+	      interpreted as Universal Coordinated Time (UTC).</p>
+	    <p>Strings, other than <c>"Z"</c>, <c>"z"</c>,
+	      or <c>""</c>, must be on the form <c>±[hh]:[mm]</c>, for
+	      example <c>"-02:00"</c> or <c>"+00:00"</c>.</p>
+	    <p>Integers must be in microseconds, meaning that the
+	      offset <c>7200000000</c> is equivalent
+	      to <c>"+02:00"</c>.</p>
+	    <p>Defaults to an empty string, meaning that timestamps
+	      are displayed in local time. However, for backwards
+	      compatibility, if the SASL configuration
+	      parameter <seealso marker="sasl:sasl_app#utc_log">
+		<c>utc_log</c></seealso><c>=true</c>, the default is
+	      changed to <c>"Z"</c>, meaning that timestamps are displayed
+	      in UTC.</p>
+	    <p>The value of this parameter is used as
+	      the <c>offset</c> option
+	      to <seealso marker="stdlib:calendar#system_time_to_rfc3339-2">
+		<c>calendar:system_time_to_rcf3339/2</c></seealso>.</p>
+	  </item>
+	</taglist>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="template"/>
+      <desc>
 	<p>The template is a list of atoms, tuples and strings. The
 	  atoms <c>level</c> or <c>msg</c>, are treated as
 	  placeholders for the severity level and the log message,
-	  repectively. Other atoms or tuples are interpreted as
+	  respectively. Other atoms or tuples are interpreted as
 	  placeholders for metadata, where atoms are expected to match
 	  top level keys, and tuples represent paths to sub keys when
 	  the metadata is a nested map. For example the
@@ -152,107 +207,85 @@
         <p>Strings in the template are printed literally.</p>
 	<p>The default template differs depending on the values
 	  of <c>legacy_header</c>
-	  and <c>single_line</c>. See <seealso marker="#default_templates">Default
-	  Templates</seealso> for more information</p>
-      </item>
-      <tag><c>time_designator = byte()</c></tag>
-      <item>
-	<p>Timestamps are formatted according to RFC3339, and the time
-	  designator is the character used as date and time
-	  separator.</p>
-	<p>Default is <c>$T</c>.</p>
-	<p>The value of this parameter is used as
-	  the <c>time_designator</c> option
-	  to <seealso marker="stdlib:calendar#system_time_to_rfc3339-2">
-	    <c>calendar:system_time_to_rcf3339/2</c></seealso>.</p>
-      </item>
-      <tag><c>time_offset = integer() | [byte()]</c></tag>
-      <item>
-	<p>The time offset, either a string or an integer, to be
-	  used when formatting the timestamp.</p>
-	<p>An empty string is interpreted as local time. The
-	  values <c>"Z"</c>, <c>"z"</c> or <c>0</c> are interpreted as
-	  Universal Coordinated Time (UTC).</p>
-	<p>Strings, other than <c>"Z"</c>, <c>"z"</c>, or <c>""</c>,
-	  must be on the form <c>±[hh]:[mm]</c>, for
-	  example <c>"-02:00"</c> or <c>"+00:00"</c>.</p>
-	<p>Integers must be in microseconds, meaning that the
-	  offset <c>7200000000</c> is equivalent
-	  to <c>"+02:00"</c>.</p>
-	<p>The default value is an empty string, meaning that
-	  timestamps are displayed in local time. However, for
-	  backwards compatibility, if the SASL environment
-	  variable <seealso marker="sasl:sasl_app#utc_log">
-	    <c>utc_log</c></seealso><c>=true</c>, the default is
-	  changed to <c>"Z"</c>, meaning that timestamps are displayed
-	  in UTC.</p>
-	<p>The value of this parameter is used as the <c>offset</c>
-	  option to <seealso marker="stdlib:calendar#system_time_to_rfc3339-2">
-	    <c>calendar:system_time_to_rcf3339/2</c></seealso>.</p>
-      </item>
-    </taglist>
-  </section>
+	  and <c>single_line</c>:</p>
 
-  <section>
-    <marker id="default_templates"/>
-    <title>Default templates</title>
+	<p>The default value for the <c>template</c> configuration
+	  parameter depends on the value of the <c>single_line</c>
+	  and <c>legacy_header</c> configuration parameters as
+	  follows.</p>
 
-    <p>The default value for the <c>template</c> configuration
-      parameter depends on the value of <c>single_line</c>
-      and <c>legacy_header</c> as follows.</p>
-
-    <p>The log event used in the examples is:</p>
-    <code>
+	<p>The log event used in the examples is:</p>
+	<code>
 ?LOG_ERROR("name: ~p~nexit_reason: ~p",[my_name,"It crashed"])</code>
 
-    <taglist>
-      <tag><c>legacy_header=true</c></tag>
-      <item>
-	<p>Default template: <c>[{logger_formatter,header},"\n",msg,"\n"]</c></p>
+	<taglist>
+	  <tag><c>legacy_header=true, single_line=false</c></tag>
+	  <item>
+	    <p>Default
+	    template: <c>[{logger_formatter,header},"\n",msg,"\n"]</c></p>
 
-	<p>Example log entry:</p>
-	<code type="none">
-2018-05-16T11:55:50.448382+02:00 error:
+	    <p>Example log entry:</p>
+	    <code type="none">
+=ERROR REPORT==== 17-May-2018::18:30:19.453447 ===
 name: my_name
 exit_reason: "It crashed"</code>
 
-	<p>Notice that all eight levels might occur in the heading,
-	  not only <c>ERROR</c>, <c>WARNING</c> or <c>INFO</c> as the
-	  old <c>error_logger</c> produced. And microseconds are
-	  added at the end of the timestamp.</p>
-      </item>
+	    <p>Notice that all eight levels can occur in the heading,
+	      not only <c>ERROR</c>, <c>WARNING</c> or <c>INFO</c> as the
+	      old <c>error_logger</c> produced. And microseconds are
+	      added at the end of the timestamp.</p>
+	  </item>
+
+	  <tag><c>legacy_header=true, single_line=true</c></tag>
+	  <item>
+	    <p>Default
+	    template: <c>[{logger_formatter,header},"\n",msg,"\n"]</c></p>
 
-      <tag><c>single_line=true</c></tag>
-      <item>
-	<p>Default template: <c>[time," ",level,": ",msg,"\n"]</c></p>
+	    <p>Notice that the template is here the same as
+	      for <c>single_line=false</c>, but the resulting log entry
+	      differs in that there is only one line after the
+	      heading:</p>
+	    <code type="none">
+=ERROR REPORT==== 17-May-2018::18:31:06.952665 ===
+name: my_name, exit_reason: "It crashed"</code>
+	  </item>
 
-	<p>Example log entry:</p>
-	<code type="none">2018-05-16T11:55:50.448382+02:00 error: name: my_name, exit_reason: "It crashed"</code>
-      </item>
+	  <tag><c>legacy_header=false, single_line=true</c></tag>
+	  <item>
+	    <p>Default template: <c>[time," ",level,": ",msg,"\n"]</c></p>
 
-      <tag><c>legacy_header=false, single_line=false</c></tag>
-      <item>
-	<p>Default template: <c>[time," ",level,":\n",msg,"\n"]</c></p>
+	    <p>Example log entry:</p>
+	    <code type="none">
+2018-05-17T18:31:31.152864+02:00 error: name: my_name, exit_reason: "It crashed"</code>
+	  </item>
 
-	<p>Example log entry:</p>
-	<code type="none">
-2018-05-16T11:55:50.448382+02:00 error:
+	  <tag><c>legacy_header=false, single_line=false</c></tag>
+	  <item>
+	    <p>Default template: <c>[time," ",level,":\n",msg,"\n"]</c></p>
+
+	    <p>Example log entry:</p>
+	    <code type="none">
+2018-05-17T18:32:20.105422+02:00 error:
 name: my_name
 exit_reason: "It crashed"</code>
-      </item>
-    </taglist>
-  </section>
-
-  <datatypes>
-    <datatype>
-      <name name="template"/>
-      <desc>
+	  </item>
+	</taglist>
       </desc>
     </datatype>
   </datatypes>
 
   <funcs>
     <func>
+      <name name="check_config" arity="1"/>
+      <fsummary>Validates the given formatter configuration.</fsummary>
+      <desc>
+	<p>This callback function is called by Logger when the
+	  formatter configuration for a handler is set or modified. It
+	  returns <c>ok</c> if the configuration is valid,
+	  and <c>{error,term()}</c> if it is faulty.</p>
+      </desc>
+    </func>
+    <func>
       <name name="format" arity="2"/>
       <fsummary>Formats the given message.</fsummary>
       <desc>
@@ -274,7 +307,6 @@ exit_reason: "It crashed"</code>
 	</list>
       </desc>
     </func>
-
   </funcs>
 
 </erlref>
diff --git a/lib/kernel/doc/src/logger_std_h.xml b/lib/kernel/doc/src/logger_std_h.xml
index bf23d874c8..a4f2848037 100644
--- a/lib/kernel/doc/src/logger_std_h.xml
+++ b/lib/kernel/doc/src/logger_std_h.xml
@@ -33,17 +33,17 @@
     <file>logger_std_h.xml</file>
   </header>
   <module>logger_std_h</module>
-  <modulesummary>Default handler for the Logger application.</modulesummary>
+  <modulesummary>Default handler for Logger.</modulesummary>
 
   <description>
-    <p>This is the default handler for the Logger
-      application. Multiple instances of this handler can be added to
-      logger, and each instance will print logs to <c>standard_io</c>,
+    <p>This is the default handler for Logger.
+      Multiple instances of this handler can be added to
+      Logger, and each instance will print logs to <c>standard_io</c>,
       <c>standard_error</c> or to file. The default instance that starts
-      with kernel is named <c>default</c> - which is the name to be used
+      with Kernel is named <c>default</c> - which is the name to be used
       for reconfiguration.</p>
     <p>The handler has an overload protection mechanism that will keep the handler
-      process and the kernel application alive during a high load of log 
+      process and the Kernel application alive during a high load of log 
       requests. How this feature works, and how to modify the configuration,
       is described in the
       <seealso marker="logger_chapter#overload_protection"><c>User's Guide</c>
@@ -104,7 +104,7 @@ logger:add_handler(my_standard_h, logger_std_h,
                                 filesync_repeat_interval => 1000}}).
     </code>
     <p>In order to configure the default handler (that starts initially with
-    the kernel application) to log to file instead of <c>standard_io</c>,
+    the Kernel application) to log to file instead of <c>standard_io</c>,
     change the Kernel default logger to use a file. Example:</p>
     <code type="none">
 erl -kernel logger '[{handler,default,logger_std_h,
@@ -127,6 +127,11 @@ erl -kernel logger '[{handler,default,logger_std_h,
 
   </funcs>
 
+  <section>
+    <title>See Also</title>
+    <p><seealso marker="logger"><c>logger(3)</c></seealso></p>
+    <p><seealso marker="logger_disk_log_h"><c>logger_disk_log_h(3)</c></seealso></p>
+  </section>
 </erlref>
 
 
diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
index eeb8c6ab2f..f265fdd272 100644
--- a/lib/kernel/src/Makefile
+++ b/lib/kernel/src/Makefile
@@ -118,7 +118,7 @@ MODULES = \
 	logger_filters \
         logger_formatter \
         logger_server \
-        logger_simple \
+        logger_simple_h \
         logger_sup \
 	net \
 	net_adm \
@@ -279,7 +279,7 @@ $(EBIN)/logger_disk_log_h.beam: logger_h_common.hrl logger_internal.hrl ../inclu
 $(EBIN)/logger_filters.beam: logger_internal.hrl ../include/logger.hrl
 $(EBIN)/logger_formatter.beam: logger_internal.hrl ../include/logger.hrl
 $(EBIN)/logger_server.beam: logger_internal.hrl ../include/logger.hrl
-$(EBIN)/logger_simple.beam: logger_internal.hrl ../include/logger.hrl
+$(EBIN)/logger_simple_h.beam: logger_internal.hrl ../include/logger.hrl
 $(EBIN)/logger_std_h.beam: logger_h_common.hrl logger_internal.hrl ../include/logger.hrl ../include/file.hrl
 $(EBIN)/logger_h_common.beam: logger_h_common.hrl logger_internal.hrl ../include/logger.hrl
 $(EBIN)/net_kernel.beam: ../include/net_address.hrl
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index bbfa2a995d..1a7677295b 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -1437,7 +1437,7 @@ error_msg(Format, Args) ->
     logger ! {log,error,Format,Args,
               #{pid=>self(),
                 gl=>group_leader(),
-                time=>erlang:monotonic_time(microsecond),
+                time=>erlang:system_time(microsecond),
                 error_logger=>#{tag=>error}}},
     ok.
 
@@ -1446,7 +1446,7 @@ info_msg(Format, Args) ->
     logger ! {log,info,Format,Args,
               #{pid=>self(),
                 gl=>group_leader(),
-                time=>erlang:monotonic_time(microsecond),
+                time=>erlang:system_time(microsecond),
                 error_logger=>#{tag=>info_msg}}},
     ok.
 
diff --git a/lib/kernel/src/error_logger.erl b/lib/kernel/src/error_logger.erl
index 6c3b308308..b3957d0c7e 100644
--- a/lib/kernel/src/error_logger.erl
+++ b/lib/kernel/src/error_logger.erl
@@ -32,7 +32,7 @@
          which_report_handlers/0]).
 
 %% logger callbacks
--export([adding_handler/2, removing_handler/2, log/2]).
+-export([adding_handler/1, removing_handler/1, log/2]).
 
 -export([get_format_depth/0, limit_term/1]).
 
@@ -101,9 +101,9 @@ stop() ->
 
 %%%-----------------------------------------------------------------
 %%% Callbacks for logger
--spec adding_handler(logger:handler_id(),logger:config()) ->
+-spec adding_handler(logger:config()) ->
                             {ok,logger:config()} | {error,term()}.
-adding_handler(?MODULE,Config) ->
+adding_handler(#{id:=?MODULE}=Config) ->
     case start() of
         ok ->
             {ok,Config};
@@ -111,12 +111,12 @@ adding_handler(?MODULE,Config) ->
             Error
     end.
 
--spec removing_handler(logger:handler_id(),logger:config()) -> ok.
-removing_handler(?MODULE,_Config) ->
+-spec removing_handler(logger:config()) -> ok.
+removing_handler(#{id:=?MODULE}) ->
     stop(),
     ok.
 
--spec log(logger:log(),logger:config()) -> ok.
+-spec log(logger:log_event(),logger:config()) -> ok.
 log(#{level:=Level,msg:=Msg,meta:=Meta},_Config) ->
     do_log(Level,Msg,Meta).
 
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 23ac5b3444..d873178f55 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -68,7 +68,7 @@
              logger_formatter,
              logger_h_common,
              logger_server,
-             logger_simple,
+             logger_simple_h,
              logger_std_h,
              logger_sup,
 	     net,
@@ -142,7 +142,7 @@
   {applications, []},
   {env, [{logger_level, info},
          {logger_sasl_compatible, false},
-         {logger_log_progress, false}
+         {logger_progress_reports, stop}
         ]},
   {mod, {kernel, []}},
   {runtime_dependencies, ["erts-10.0", "stdlib-3.5", "sasl-3.0"]}
diff --git a/lib/kernel/src/logger.erl b/lib/kernel/src/logger.erl
index a839f97e62..3beb3102fa 100644
--- a/lib/kernel/src/logger.erl
+++ b/lib/kernel/src/logger.erl
@@ -37,10 +37,11 @@
 -export([add_handler/3, remove_handler/1,
          add_logger_filter/2, add_handler_filter/3,
          remove_logger_filter/1, remove_handler_filter/2,
-         set_module_level/2, reset_module_level/1,
+         set_module_level/2, unset_module_level/1,
          set_logger_config/1, set_logger_config/2,
          set_handler_config/2, set_handler_config/3,
          update_logger_config/1, update_handler_config/2,
+         update_formatter_config/2, update_formatter_config/3,
          get_logger_config/0, get_handler_config/1,
          add_handlers/1]).
 
@@ -63,11 +64,11 @@
 
 %%%-----------------------------------------------------------------
 %%% Types
--type log() :: #{level:=level(),
-                 msg:={io:format(),[term()]} |
-                      {report,report()} |
-                      {string,unicode:chardata()},
-                 meta:=metadata()}.
+-type log_event() :: #{level:=level(),
+                       msg:={io:format(),[term()]} |
+                            {report,report()} |
+                            {string,unicode:chardata()},
+                       meta:=metadata()}.
 -type level() :: emergency | alert | critical | error |
                  warning | notice | info | debug.
 -type report() :: map() | [{atom(),term()}].
@@ -80,26 +81,32 @@
                       mfa    => {module(),atom(),non_neg_integer()},
                       file   => file:filename(),
                       line   => non_neg_integer(),
-                      term() => term()}.
+                      domain => [atom()],
+                      report_cb => fun((report()) -> {io:format(),[term()]}),
+                      atom() => term()}.
 -type location() :: #{mfa  := {module(),atom(),non_neg_integer()},
                       file := file:filename(),
                       line := non_neg_integer()}.
 -type handler_id() :: atom().
 -type filter_id() :: atom().
--type filter() :: {fun((log(),filter_arg()) -> filter_return()),filter_arg()}.
+-type filter() :: {fun((log_event(),filter_arg()) ->
+                              filter_return()),filter_arg()}.
 -type filter_arg() :: term().
--type filter_return() :: stop | ignore | log().
--type config() :: #{level => level(),
+-type filter_return() :: stop | ignore | log_event().
+-type config() :: #{id => handler_id(),
+                    level => level(),
                     filter_default => log | stop,
                     filters => [{filter_id(),filter()}],
-                    formatter => {module(),term()},
-                    term() => term()}.
+                    formatter => {module(),formatter_config()},
+                    atom() => term()}.
 -type timestamp() :: integer().
+-type formatter_config() :: #{atom() => term()}.
 
 -type config_handler() :: {handler, handler_id(), module(), config()}.
 
--export_type([log/0,level/0,report/0,msg_fun/0,metadata/0,config/0,handler_id/0,
-              filter_id/0,filter/0,filter_arg/0,filter_return/0, config_handler/0]).
+-export_type([log_event/0,level/0,report/0,msg_fun/0,metadata/0,config/0,
+              handler_id/0,filter_id/0,filter/0,filter_arg/0,filter_return/0,
+              config_handler/0,formatter_config/0]).
 
 %%%-----------------------------------------------------------------
 %%% API
@@ -386,16 +393,31 @@ get_logger_config() ->
 get_handler_config(HandlerId) ->
     logger_config:get(?LOGGER_TABLE,HandlerId).
 
+-spec update_formatter_config(HandlerId,FormatterConfig) ->
+                                     ok | {error,term()} when
+      HandlerId :: config(),
+      FormatterConfig :: formatter_config().
+update_formatter_config(HandlerId,FormatterConfig) ->
+    logger_server:update_formatter_config(HandlerId,FormatterConfig).
+
+-spec update_formatter_config(HandlerId,Key,Value) ->
+                                     ok | {error,term()} when
+      HandlerId :: config(),
+      Key :: atom(),
+      Value :: term().
+update_formatter_config(HandlerId,Key,Value) ->
+    logger_server:update_formatter_config(HandlerId,#{Key=>Value}).
+
 -spec set_module_level(Module,Level) -> ok | {error,term()} when
       Module :: module(),
       Level :: level().
 set_module_level(Module,Level) ->
     logger_server:set_module_level(Module,Level).
 
--spec reset_module_level(Module) -> ok | {error,term()} when
+-spec unset_module_level(Module) -> ok | {error,term()} when
       Module :: module().
-reset_module_level(Module) ->
-    logger_server:reset_module_level(Module).
+unset_module_level(Module) ->
+    logger_server:unset_module_level(Module).
 
 %%%-----------------------------------------------------------------
 %%% Misc
@@ -542,10 +564,10 @@ internal_init_logger() ->
               end || Module <- Modules]
              || {module_level, Level, Modules} <- get_logger_env()],
 
-        case logger:set_handler_config(logger_simple,filters,
+        case logger:set_handler_config(simple,filters,
                                        get_default_handler_filters()) of
             ok -> ok;
-            {error,{not_found,logger_simple}} -> ok
+            {error,{not_found,simple}} -> ok
         end,
 
         init_kernel_handlers()
@@ -561,7 +583,7 @@ init_kernel_handlers() ->
     try
         case get_logger_type() of
             {ok,silent} ->
-                ok = logger:remove_handler(logger_simple);
+                ok = logger:remove_handler(simple);
             {ok,false} ->
                 ok;
             {ok,Type} ->
@@ -602,9 +624,9 @@ add_handlers(HandlerConfig) ->
         %% If a default handler was added we try to remove the simple_logger
         %% If the simple logger exists it will replay its log events
         %% to the handler(s) added in the fold above.
-        _ = [case logger:remove_handler(logger_simple) of
+        _ = [case logger:remove_handler(simple) of
                  ok -> ok;
-                 {error,{not_found,logger_simple}} -> ok
+                 {error,{not_found,simple}} -> ok
              end || DefaultAdded],
         ok
     catch throw:Reason ->
@@ -677,7 +699,8 @@ init_default_config(Type) when Type==standard_io;
                                 Type==standard_error;
                                 element(1,Type)==file ->
     Env = get_logger_env(),
-    DefaultConfig = #{logger_std_h=>#{type=>Type}},
+    DefaultFormatter = #{formatter=>{?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}},
+    DefaultConfig = DefaultFormatter#{logger_std_h=>#{type=>Type}},
     NewLoggerEnv =
         case lists:keyfind(default, 2, Env) of
             {handler, default, Module, Config} ->
@@ -687,6 +710,13 @@ init_default_config(Type) when Type==standard_io;
                           %% if not configured by user AND the default
                           %% handler is still the logger_std_h.
                           {handler, default, Module, maps:merge(DefaultConfig,Config)};
+                     ({handler, default, logger_disk_log_h, _}) ->
+                          %% Add default formatter. The point of this
+                          %% is to get the expected formatter config
+                          %% for the default handler, since this
+                          %% differs from the default values that
+                          %% logger_formatter itself adds.
+                          {handler, default, logger_disk_log_h, maps:merge(DefaultFormatter,Config)};
                      (Other) ->
                           Other
                   end, Env);
@@ -704,10 +734,10 @@ get_default_handler_filters() ->
             ?DEFAULT_HANDLER_FILTERS([beam,erlang,otp]);
         false ->
             Extra =
-                case application:get_env(kernel, logger_log_progress, false) of
-                    true ->
+                case application:get_env(kernel, logger_progress_reports, stop) of
+                    log ->
                         [];
-                    false ->
+                    stop ->
                         [{stop_progress,
                           {fun logger_filters:progress/2,stop}}]
                 end,
@@ -833,7 +863,7 @@ proc_meta() ->
 
 default(pid) -> self();
 default(gl) -> group_leader();
-default(time) -> erlang:monotonic_time(microsecond).
+default(time) -> erlang:system_time(microsecond).
 
 %% Remove everything upto and including this module from the stacktrace
 filter_stacktrace(Module,[{Module,_,_,_}|_]) ->
diff --git a/lib/kernel/src/logger_backend.erl b/lib/kernel/src/logger_backend.erl
index d9f5aa6faf..b3cf7d67dd 100644
--- a/lib/kernel/src/logger_backend.erl
+++ b/lib/kernel/src/logger_backend.erl
@@ -58,7 +58,7 @@ call_handlers(#{level:=Level}=Log,[Id|Handlers],Tid) ->
                                        debug,
                                        [{logger,removed_failing_handler},
                                         {handler,{Id,Module}},
-                                        {log,Log1},
+                                        {log_event,Log1},
                                         {config,Config1},
                                         {reason,{C,R,filter_stacktrace(S)}}]);
                                 {error,{not_found,_}} ->
@@ -122,7 +122,7 @@ handle_filter_failed({Id,_}=Filter,Owner,Log,Reason) ->
                           [{logger,removed_failing_filter},
                            {filter,Filter},
                            {owner,Owner},
-                           {log,Log},
+                           {log_event,Log},
                            {reason,Reason}]);
         _ ->
             ok
diff --git a/lib/kernel/src/logger_config.erl b/lib/kernel/src/logger_config.erl
index 40dc1b1e1b..1d35c2e068 100644
--- a/lib/kernel/src/logger_config.erl
+++ b/lib/kernel/src/logger_config.erl
@@ -24,7 +24,7 @@
          allow/2,allow/3,
          get/2, get/3, get/1,
          create/3, create/4, set/3,
-         set_module_level/3,reset_module_level/2,
+         set_module_level/3,unset_module_level/2,
          cache_module_level/2,
          level_to_int/1]).
 
@@ -109,7 +109,7 @@ set_module_level(Tid,Module,Level) ->
     ets:insert(Tid,{Module,level_to_int(Level)}),
     ok.
 
-reset_module_level(Tid,Module) ->
+unset_module_level(Tid,Module) ->
     ets:delete(Tid,Module), % should possibley overwrite instead of delete?
     ok.
 
diff --git a/lib/kernel/src/logger_disk_log_h.erl b/lib/kernel/src/logger_disk_log_h.erl
index 57c54ce27e..773aa75bc6 100644
--- a/lib/kernel/src/logger_disk_log_h.erl
+++ b/lib/kernel/src/logger_disk_log_h.erl
@@ -34,8 +34,8 @@
 
 %% logger callbacks
 -export([log/2,
-         adding_handler/2, removing_handler/2,
-         changing_config/3, swap_buffer/2]).
+         adding_handler/1, removing_handler/1,
+         changing_config/2, swap_buffer/2]).
 
 %%%===================================================================
 %%% API
@@ -108,8 +108,8 @@ reset(Name) ->
 
 %%%-----------------------------------------------------------------
 %%% Handler being added
-adding_handler(Name, Config) ->
-    case check_config(adding, Name, Config) of
+adding_handler(#{id:=Name}=Config) ->
+    case check_config(adding, Config) of
         {ok, Config1} ->
             %% create initial handler state by merging defaults with config
             HConfig = maps:get(?MODULE, Config1, #{}),
@@ -136,10 +136,9 @@ adding_handler(Name, Config) ->
 
 %%%-----------------------------------------------------------------
 %%% Updating handler config
-changing_config(Name,
-                OldConfig=#{id:=Id, disk_log_opts:=DLOpts},
-                NewConfig=#{id:=Id, disk_log_opts:=DLOpts}) ->
-    case check_config(changing, Name, NewConfig) of
+changing_config(OldConfig=#{id:=Name, disk_log_opts:=DLOpts},
+                NewConfig=#{id:=Name, disk_log_opts:=DLOpts}) ->
+    case check_config(changing, NewConfig) of
         Result = {ok,NewConfig1} ->
             try gen_server:call(Name, {change_config,OldConfig,NewConfig1},
                                 ?DEFAULT_CALL_TIMEOUT) of
@@ -151,12 +150,10 @@ changing_config(Name,
         Error ->
             Error
     end;
-changing_config(_Name, OldConfig, NewConfig) ->
+changing_config(OldConfig, NewConfig) ->
     {error,{illegal_config_change,OldConfig,NewConfig}}.
 
-check_config(adding, Name, Config0) ->
-    %% Merge in defaults on top level
-    Config = maps:merge(#{id => Name}, Config0),
+check_config(adding, #{id:=Name}=Config) ->
     %% Merge in defaults on handler level
     LogOpts0 = maps:get(disk_log_opts, Config, #{}),
     LogOpts = merge_default_logopts(Name, LogOpts0),
@@ -173,7 +170,7 @@ check_config(adding, Name, Config0) ->
         Error ->
             Error
     end;
-check_config(changing, _Name, Config) ->
+check_config(changing, Config) ->
     MyConfig = maps:get(?MODULE, Config, #{}),
     case check_my_config(maps:to_list(MyConfig)) of
         ok    -> {ok,Config};
@@ -223,7 +220,7 @@ check_my_config([]) ->
 
 %%%-----------------------------------------------------------------
 %%% Handler being removed
-removing_handler(Name, _Config) ->
+removing_handler(#{id:=Name}) ->
     stop(Name).
 
 %%%-----------------------------------------------------------------
@@ -238,15 +235,15 @@ swap_buffer(Name,Buffer) ->
 
 %%%-----------------------------------------------------------------
 %%% Log a string or report
--spec log(Log, Config) -> ok | dropped when
-      Log :: logger:log(),
+-spec log(LogEvent, Config) -> ok | dropped when
+      LogEvent :: logger:log_event(),
       Config :: logger:config().
 
-log(Log,Config=#{id:=Name}) ->
+log(LogEvent,Config=#{id:=Name}) ->
     %% if the handler has crashed, we must drop this request
     %% and hope the handler restarts so we can try again
     true = is_pid(whereis(Name)),
-    Bin = logger_h_common:log_to_binary(Log,Config),
+    Bin = logger_h_common:log_to_binary(LogEvent,Config),
     logger_h_common:call_cast_or_drop(Name, Bin).
 
 
diff --git a/lib/kernel/src/logger_filters.erl b/lib/kernel/src/logger_filters.erl
index 592ff28cc2..7359b3b4b7 100644
--- a/lib/kernel/src/logger_filters.erl
+++ b/lib/kernel/src/logger_filters.erl
@@ -27,31 +27,31 @@
 -include("logger_internal.hrl").
 -define(IS_ACTION(A), (A==log orelse A==stop)).
 
--spec domain(Log,Extra) -> logger:filter_return() when
-      Log :: logger:log(),
+-spec domain(LogEvent,Extra) -> logger:filter_return() when
+      LogEvent :: logger:log_event(),
       Extra :: {Action,Compare,MatchDomain},
       Action :: log | stop,
-      Compare :: prefix_of | starts_with | equals | no_domain,
+      Compare :: super | sub | equal | not_equal | undefined,
       MatchDomain :: list(atom()).
-domain(#{meta:=Meta}=Log,{Action,Compare,MatchDomain})
+domain(#{meta:=Meta}=LogEvent,{Action,Compare,MatchDomain})
   when ?IS_ACTION(Action) andalso
-       (Compare==prefix_of orelse
-        Compare==starts_with orelse
-        Compare==equals orelse
-        Compare==differs orelse
-        Compare==no_domain) andalso
+       (Compare==super orelse
+        Compare==sub orelse
+        Compare==equal orelse
+        Compare==not_equal orelse
+        Compare==undefined) andalso
        is_list(MatchDomain) ->
-    filter_domain(Compare,Meta,MatchDomain,on_match(Action,Log));
-domain(Log,Extra) ->
-    erlang:error(badarg,[Log,Extra]).
+    filter_domain(Compare,Meta,MatchDomain,on_match(Action,LogEvent));
+domain(LogEvent,Extra) ->
+    erlang:error(badarg,[LogEvent,Extra]).
 
--spec level(Log,Extra) -> logger:filter_return() when
-      Log :: logger:log(),
+-spec level(LogEvent,Extra) -> logger:filter_return() when
+      LogEvent :: logger:log_event(),
       Extra :: {Action,Operator,MatchLevel},
       Action :: log | stop,
       Operator :: neq | eq | lt | gt | lteq | gteq,
       MatchLevel :: logger:level().
-level(#{level:=L1}=Log,{Action,Op,L2})
+level(#{level:=L1}=LogEvent,{Action,Op,L2})
   when ?IS_ACTION(Action) andalso 
        (Op==neq orelse
         Op==eq orelse
@@ -60,40 +60,40 @@ level(#{level:=L1}=Log,{Action,Op,L2})
         Op==lteq orelse
         Op==gteq) andalso
        ?IS_LEVEL(L2) ->
-    filter_level(Op,L1,L2,on_match(Action,Log));
-level(Log,Extra) ->
-    erlang:error(badarg,[Log,Extra]).
+    filter_level(Op,L1,L2,on_match(Action,LogEvent));
+level(LogEvent,Extra) ->
+    erlang:error(badarg,[LogEvent,Extra]).
 
--spec progress(Log,Extra) -> logger:filter_return() when
-      Log :: logger:log(),
+-spec progress(LogEvent,Extra) -> logger:filter_return() when
+      LogEvent :: logger:log_event(),
       Extra :: log | stop.
-progress(Log,Action) when ?IS_ACTION(Action) ->
-    filter_progress(Log,on_match(Action,Log));
-progress(Log,Action) ->
-    erlang:error(badarg,[Log,Action]).
+progress(LogEvent,Action) when ?IS_ACTION(Action) ->
+    filter_progress(LogEvent,on_match(Action,LogEvent));
+progress(LogEvent,Action) ->
+    erlang:error(badarg,[LogEvent,Action]).
 
--spec remote_gl(Log,Extra) -> logger:filter_return() when
-      Log :: logger:log(),
+-spec remote_gl(LogEvent,Extra) -> logger:filter_return() when
+      LogEvent :: logger:log_event(),
       Extra :: log | stop.
-remote_gl(Log,Action) when ?IS_ACTION(Action) ->
-    filter_remote_gl(Log,on_match(Action,Log));
-remote_gl(Log,Action) ->
-    erlang:error(badarg,[Log,Action]).
+remote_gl(LogEvent,Action) when ?IS_ACTION(Action) ->
+    filter_remote_gl(LogEvent,on_match(Action,LogEvent));
+remote_gl(LogEvent,Action) ->
+    erlang:error(badarg,[LogEvent,Action]).
 
 %%%-----------------------------------------------------------------
 %%% Internal
-filter_domain(prefix_of,#{domain:=Domain},MatchDomain,OnMatch) ->
+filter_domain(super,#{domain:=Domain},MatchDomain,OnMatch) ->
     is_prefix(Domain,MatchDomain,OnMatch);
-filter_domain(starts_with,#{domain:=Domain},MatchDomain,OnMatch) ->
+filter_domain(sub,#{domain:=Domain},MatchDomain,OnMatch) ->
     is_prefix(MatchDomain,Domain,OnMatch);
-filter_domain(equals,#{domain:=Domain},Domain,OnMatch) ->
+filter_domain(equal,#{domain:=Domain},Domain,OnMatch) ->
     OnMatch;
-filter_domain(differs,#{domain:=Domain},MatchDomain,OnMatch)
+filter_domain(not_equal,#{domain:=Domain},MatchDomain,OnMatch)
   when Domain=/=MatchDomain ->
     OnMatch;
-filter_domain(Action,Meta,_,OnMatch) ->
+filter_domain(Compare,Meta,_,OnMatch) ->
     case maps:is_key(domain,Meta) of
-        false when Action==no_domain; Action==differs -> OnMatch;
+        false when Compare==undefined; Compare==not_equal -> OnMatch;
         _ -> ignore
     end.
 
@@ -123,5 +123,5 @@ filter_remote_gl(#{meta:=#{gl:=GL}},OnMatch) when node(GL)=/=node() ->
 filter_remote_gl(_,_) ->
     ignore.
 
-on_match(log,Log) -> Log;
+on_match(log,LogEvent) -> LogEvent;
 on_match(stop,_) -> stop.
diff --git a/lib/kernel/src/logger_formatter.erl b/lib/kernel/src/logger_formatter.erl
index 602c666cc7..4d727b3da0 100644
--- a/lib/kernel/src/logger_formatter.erl
+++ b/lib/kernel/src/logger_formatter.erl
@@ -26,21 +26,22 @@
 
 %%%-----------------------------------------------------------------
 %%% Types
+-type config() :: #{chars_limit=>pos_integer()| unlimited,
+                    depth=>pos_integer() | unlimited,
+                    legacy_header=>boolean(),
+                    max_size=>pos_integer() | unlimited,
+                    report_cb=>fun((logger:report()) -> {io:format(),[term()]}),
+                    single_line=>boolean(),
+                    template=>template(),
+                    time_designator=>byte(),
+                    time_offset=>integer()|[byte()]}.
 -type template() :: [atom()|tuple()|string()].
 
 %%%-----------------------------------------------------------------
 %%% API
--spec format(Log,Config) -> unicode:chardata() when
-      Log :: logger:log(),
-      Config :: #{single_line=>boolean(),
-                  legacy_header=>boolean(),
-                  report_cb=>fun((logger:report()) -> {io:format(),[term()]}),
-                  chars_limit=>pos_integer()| unlimited,
-                  max_size=>pos_integer() | unlimited,
-                  depth=>pos_integer() | unlimited,
-                  template=>template(),
-                  time_designator=>byte(),
-                  time_offset=>integer()|[byte()]}.
+-spec format(LogEvent,Config) -> unicode:chardata() when
+      LogEvent :: logger:log_event(),
+      Config :: config().
 format(#{level:=Level,msg:=Msg0,meta:=Meta},Config0)
   when is_map(Config0) ->
     Config = add_default_config(Config0),
@@ -85,8 +86,6 @@ format(#{level:=Level,msg:=Msg0,meta:=Meta},Config0)
 
 do_format(Level,Msg,Data,[level|Format],Config) ->
     [to_string(level,Level,Config)|do_format(Level,Msg,Data,Format,Config)];
-do_format(Level,Msg,Data,[msg|Format],Config) ->
-    [Msg|do_format(Level,Msg,Data,Format,Config)];
 do_format(Level,Msg,Data,[Key|Format],Config) when is_atom(Key); is_tuple(Key) ->
     Value = value(Key,Data),
     [to_string(Key,Value,Config)|do_format(Level,Msg,Data,Format,Config)];
@@ -130,9 +129,7 @@ to_string(X) ->
     io_lib:format("~tp",[X]).
 
 format_msg({string,Chardata},Meta,Config) ->
-    try unicode:characters_to_list(Chardata)
-    catch _:_ -> format_msg({"INVALID STRING: ~tp",[Chardata]},Meta,Config)
-    end;
+    format_msg({"~ts",[Chardata]},Meta,Config);
 format_msg({report,_}=Msg,Meta,#{report_cb:=Fun}=Config) when is_function(Fun,1) ->
     format_msg(Msg,Meta#{report_cb=>Fun},maps:remove(report_cb,Config));
 format_msg({report,Report},#{report_cb:=Fun}=Meta,Config) when is_function(Fun,1) ->
@@ -197,16 +194,15 @@ truncate(String,Size) ->
             String
     end.
 
-format_time(Timestamp,#{time_offset:=Offset,time_designator:=Des})
-  when is_integer(Timestamp) ->
-    SysTime = Timestamp + erlang:time_offset(microsecond),
+%% SysTime is the system time in microseconds
+format_time(SysTime,#{time_offset:=Offset,time_designator:=Des})
+  when is_integer(SysTime) ->
     calendar:system_time_to_rfc3339(SysTime,[{unit,microsecond},
                                              {offset,Offset},
                                              {time_designator,Des}]).
 
-%% Assuming this is monotonic time in microseconds
-timestamp_to_datetimemicro(Timestamp,Config) when is_integer(Timestamp) ->
-    SysTime = Timestamp + erlang:time_offset(microsecond),
+%% SysTime is the system time in microseconds
+timestamp_to_datetimemicro(SysTime,Config) when is_integer(SysTime) ->
     Micro = SysTime rem 1000000,
     Sec = SysTime div 1000000,
     UniversalTime =  erlang:posixtime_to_universaltime(Sec),
@@ -327,6 +323,8 @@ offset_to_utc([$+|Tz]) ->
 offset_to_utc(_) ->
     false.
 
+-spec check_config(Config) -> ok | {error,term()} when
+      Config :: config().
 check_config(Config) when is_map(Config) ->
     do_check_config(maps:to_list(Config));
 check_config(Config) ->
diff --git a/lib/kernel/src/logger_h_common.erl b/lib/kernel/src/logger_h_common.erl
index 901c4c0dad..336398cd4a 100644
--- a/lib/kernel/src/logger_h_common.erl
+++ b/lib/kernel/src/logger_h_common.erl
@@ -39,8 +39,8 @@
 
 %%%-----------------------------------------------------------------
 %%% Covert log data on any form to binary
--spec log_to_binary(Log,Config) -> LogString when
-      Log :: logger:log(),
+-spec log_to_binary(LogEvent,Config) -> LogString when
+      LogEvent :: logger:log_event(),
       Config :: logger:config(),
       LogString :: binary().
 log_to_binary(#{msg:={report,_},meta:=#{report_cb:=_}}=Log,Config) ->
@@ -58,7 +58,7 @@ do_log_to_binary(Log,Config) ->
     catch _:_ ->
             ?LOG_INTERNAL(debug,[{formatter_error,Formatter},
                                  {config,FormatterConfig},
-                                 {log,Log},
+                                 {log_event,Log},
                                  {bad_return_value,String}]),
             <<"FORMATTER ERROR: bad_return_value">>
     end.
@@ -69,10 +69,10 @@ try_format(Log,Formatter,FormatterConfig) ->
         C:R:S ->
             ?LOG_INTERNAL(debug,[{formatter_crashed,Formatter},
                                  {config,FormatterConfig},
-                                 {log,Log},
+                                 {log_event,Log},
                                  {reason,
                                   {C,R,logger:filter_stacktrace(?MODULE,S)}}]),
-            case {?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG} of
+            case {?DEFAULT_FORMATTER,#{}} of
                 {Formatter,FormatterConfig} ->
                     "DEFAULT FORMATTER CRASHED";
                 {DefaultFormatter,DefaultConfig} ->
diff --git a/lib/kernel/src/logger_internal.hrl b/lib/kernel/src/logger_internal.hrl
index f9377259f3..fedd6db370 100644
--- a/lib/kernel/src/logger_internal.hrl
+++ b/lib/kernel/src/logger_internal.hrl
@@ -27,12 +27,11 @@
         ?DEFAULT_HANDLER_FILTERS([beam,erlang,otp])).
 -define(DEFAULT_HANDLER_FILTERS(Domain),
         [{remote_gl,{fun logger_filters:remote_gl/2,stop}},
-         {domain,{fun logger_filters:domain/2,{log,prefix_of,Domain}}},
-         {no_domain,{fun logger_filters:domain/2,{log,no_domain,[]}}}]).
+         {domain,{fun logger_filters:domain/2,{log,super,Domain}}},
+         {no_domain,{fun logger_filters:domain/2,{log,undefined,[]}}}]).
 -define(DEFAULT_FORMATTER,logger_formatter).
 -define(DEFAULT_FORMAT_CONFIG,#{legacy_header=>true,
-                                single_line=>false,
-                                template=>?DEFAULT_FORMAT_TEMPLATE_HEADER}).
+                                single_line=>false}).
 -define(DEFAULT_FORMAT_TEMPLATE_HEADER,
         [{logger_formatter,header},"\n",msg,"\n"]).
 -define(DEFAULT_FORMAT_TEMPLATE_SINGLE,
diff --git a/lib/kernel/src/logger_server.erl b/lib/kernel/src/logger_server.erl
index 275b9c476f..47010c9fa5 100644
--- a/lib/kernel/src/logger_server.erl
+++ b/lib/kernel/src/logger_server.erl
@@ -25,9 +25,10 @@
 -export([start_link/0,
          add_handler/3, remove_handler/1,
          add_filter/2, remove_filter/2,
-         set_module_level/2, reset_module_level/1,
+         set_module_level/2, unset_module_level/1,
          cache_module_level/1,
-         set_config/2, set_config/3, update_config/2]).
+         set_config/2, set_config/3, update_config/2,
+         update_formatter_config/2]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -82,9 +83,9 @@ set_module_level(Module,Level) when is_atom(Module) ->
 set_module_level(Module,_) ->
     {error,{not_a_module,Module}}.
 
-reset_module_level(Module) when is_atom(Module) ->
-    call({reset_module_level,Module});
-reset_module_level(Module) ->
+unset_module_level(Module) when is_atom(Module) ->
+    call({unset_module_level,Module});
+unset_module_level(Module) ->
     {error,{not_a_module,Module}}.
 
 cache_module_level(Module) ->
@@ -111,6 +112,13 @@ update_config(Owner, Config) ->
             Error
     end.
 
+update_formatter_config(HandlerId, FormatterConfig)
+  when is_map(FormatterConfig) ->
+    call({update_formatter_config,HandlerId,FormatterConfig});
+update_formatter_config(_HandlerId, FormatterConfig) ->
+    {error,{invalid_formatter_config,FormatterConfig}}.
+
+
 %%%===================================================================
 %%% gen_server callbacks
 %%%===================================================================
@@ -119,15 +127,14 @@ init([]) ->
     process_flag(trap_exit, true),
     Tid = logger_config:new(?LOGGER_TABLE),
     LoggerConfig = maps:merge(default_config(logger),
-                              #{handlers=>[logger_simple]}),
+                              #{handlers=>[simple]}),
     logger_config:create(Tid,logger,LoggerConfig),
-    SimpleConfig0 = maps:merge(default_config(logger_simple),
+    SimpleConfig0 = maps:merge(default_config(simple),
                                #{filter_default=>stop,
                                  filters=>?DEFAULT_HANDLER_FILTERS}),
     %% If this fails, then the node should crash
-    {ok,SimpleConfig} =
-        logger_simple:adding_handler(logger_simple,SimpleConfig0),
-    logger_config:create(Tid,logger_simple,logger_simple,SimpleConfig),
+    {ok,SimpleConfig} = logger_simple_h:adding_handler(SimpleConfig0),
+    logger_config:create(Tid,simple,logger_simple_h,SimpleConfig),
     {ok, #state{tid=Tid, async_req_queue = queue:new()}}.
 
 handle_call({add_handler,Id,Module,HConfig}, From, #state{tid=Tid}=State) ->
@@ -138,7 +145,7 @@ handle_call({add_handler,Id,Module,HConfig}, From, #state{tid=Tid}=State) ->
             call_h_async(
               fun() ->
                       %% inform the handler
-                      call_h(Module,adding_handler,[Id,HConfig],{ok,HConfig})
+                      call_h(Module,adding_handler,[HConfig],{ok,HConfig})
               end,
               fun({ok,HConfig1}) ->
                       %% We know that the call_h would have loaded the module
@@ -169,7 +176,7 @@ handle_call({remove_handler,HandlerId}, From, #state{tid=Tid}=State) ->
             call_h_async(
               fun() ->
                       %% inform the handler
-                      call_h(Module,removing_handler,[HandlerId,HConfig],ok)
+                      call_h(Module,removing_handler,[HConfig],ok)
               end,
               fun(_Res) ->
                       do_set_config(Tid,logger,Config#{handlers=>Handlers}),
@@ -205,7 +212,7 @@ handle_call({set_config,HandlerId,Config}, From, #state{tid=Tid}=State) ->
         {ok,{Module,OldConfig}} ->
             call_h_async(
               fun() ->
-                      call_h(Module,changing_config,[HandlerId,OldConfig,Config],
+                      call_h(Module,changing_config,[OldConfig,Config],
                              {ok,Config})
               end,
               fun({ok,Config1}) ->
@@ -216,11 +223,27 @@ handle_call({set_config,HandlerId,Config}, From, #state{tid=Tid}=State) ->
         _ ->
             {reply,{error,{not_found,HandlerId}},State}
     end;
+handle_call({update_formatter_config,HandlerId,NewFConfig},_From,
+            #state{tid=Tid}=State) ->
+    Reply =
+        case logger_config:get(Tid,HandlerId) of
+            {ok,{_Mod,#{formatter:={FMod,OldFConfig}}=Config}} ->
+                try
+                    FConfig = maps:merge(OldFConfig,NewFConfig),
+                    check_formatter({FMod,FConfig}),
+                    do_set_config(Tid,HandlerId,
+                                  Config#{formatter=>{FMod,FConfig}})
+                catch throw:Reason -> {error,Reason}
+                end;
+            _ ->
+            {error,{not_found,HandlerId}}
+        end,
+    {reply,Reply,State};
 handle_call({set_module_level,Module,Level}, _From, #state{tid=Tid}=State) ->
     Reply = logger_config:set_module_level(Tid,Module,Level),
     {reply,Reply,State};
-handle_call({reset_module_level,Module}, _From, #state{tid=Tid}=State) ->
-    Reply = logger_config:reset_module_level(Tid,Module),
+handle_call({unset_module_level,Module}, _From, #state{tid=Tid}=State) ->
+    Reply = logger_config:unset_module_level(Tid,Module),
     {reply,Reply,State}.
 
 handle_cast({async_req_reply,_Ref,_Reply} = Reply,State) ->
@@ -324,11 +347,12 @@ default_config(logger) ->
     #{level=>info,
       filters=>[],
       filter_default=>log};
-default_config(_) ->
-    #{level=>info,
+default_config(Id) ->
+    #{id=>Id,
+      level=>info,
       filters=>[],
       filter_default=>log,
-      formatter=>{?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}}.
+      formatter=>{?DEFAULT_FORMATTER,#{}}}.
 
 sanity_check(Owner,Key,Value) ->
     sanity_check_1(Owner,[{Key,Value}]).
diff --git a/lib/kernel/src/logger_simple.erl b/lib/kernel/src/logger_simple_h.erl
index 5272455a2d..19fb3b54ba 100644
--- a/lib/kernel/src/logger_simple.erl
+++ b/lib/kernel/src/logger_simple_h.erl
@@ -17,9 +17,9 @@
 %%
 %% %CopyrightEnd%
 %%
--module(logger_simple).
+-module(logger_simple_h).
 
--export([adding_handler/2, removing_handler/2, log/2]).
+-export([adding_handler/1, removing_handler/1, log/2]).
 
 %% This module implements a simple handler for logger. It is the
 %% default used during system start.
@@ -27,7 +27,7 @@
 %%%-----------------------------------------------------------------
 %%% Logger callback
 
-adding_handler(?MODULE,Config) ->
+adding_handler(#{id:=simple}=Config) ->
     Me = self(),
     case whereis(?MODULE) of
         undefined ->
@@ -44,7 +44,7 @@ adding_handler(?MODULE,Config) ->
             {error,{handler_process_name_already_exists,?MODULE}}
     end.
 
-removing_handler(?MODULE,_Config) ->
+removing_handler(#{id:=simple}) ->
     case whereis(?MODULE) of
         undefined ->
             ok;
@@ -70,7 +70,7 @@ log(#{msg:=_,meta:=#{time:=_}}=Log,_Config) ->
                 do_log(
                   #{level=>error,
                     msg=>{report,{error,simple_handler_process_dead}},
-                    meta=>#{time=>erlang:monotonic_time(microsecond)}}),
+                    meta=>#{time=>erlang:system_time(microsecond)}}),
                 do_log(Log);
             _ ->
                 ?MODULE ! {log,Log}
@@ -126,7 +126,7 @@ drop_msg(0) ->
 drop_msg(N) ->
     [#{level=>info,
        msg=>{"Simple handler buffer full, dropped ~w messages",[N]},
-       meta=>#{time=>erlang:monotonic_time(microsecond)}}].
+       meta=>#{time=>erlang:system_time(microsecond)}}].
 
 %%%-----------------------------------------------------------------
 %%% Internal
@@ -141,8 +141,7 @@ do_log(#{msg:=Msg,meta:=#{time:=T}}) ->
     display_date(T),
     display(Msg).
 
-display_date(Timestamp0) when is_integer(Timestamp0) ->
-    Timestamp = Timestamp0 + erlang:time_offset(microsecond),
+display_date(Timestamp) when is_integer(Timestamp) ->
     Micro = Timestamp rem 1000000,
     Sec = Timestamp div 1000000,
     {{Y,Mo,D},{H,Mi,S}} = erlang:universaltime_to_localtime(
diff --git a/lib/kernel/src/logger_std_h.erl b/lib/kernel/src/logger_std_h.erl
index e5e0febc88..63c3ab2dac 100644
--- a/lib/kernel/src/logger_std_h.erl
+++ b/lib/kernel/src/logger_std_h.erl
@@ -35,8 +35,8 @@
          terminate/2, code_change/3]).
 
 %% logger callbacks
--export([log/2, adding_handler/2, removing_handler/2,
-         changing_config/3, swap_buffer/2]).
+-export([log/2, adding_handler/1, removing_handler/1,
+         changing_config/2, swap_buffer/2]).
 
 %%%===================================================================
 %%% API
@@ -109,8 +109,8 @@ reset(Name) ->
 
 %%%-----------------------------------------------------------------
 %%% Handler being added
-adding_handler(Name, Config) ->
-    case check_config(adding, Name, Config) of
+adding_handler(#{id:=Name}=Config) ->
+    case check_config(adding, Config) of
         {ok, Config1} ->
             %% create initial handler state by merging defaults with config
             HConfig = maps:get(?MODULE, Config1, #{}),
@@ -137,9 +137,8 @@ adding_handler(Name, Config) ->
 
 %%%-----------------------------------------------------------------
 %%% Updating handler config
-changing_config(Name,
-                OldConfig=#{id:=Id, ?MODULE:=#{type:=Type}},
-                NewConfig=#{id:=Id}) ->
+changing_config(OldConfig=#{id:=Name, ?MODULE:=#{type:=Type}},
+                NewConfig=#{id:=Name}) ->
     MyConfig = maps:get(?MODULE, NewConfig, #{}),
     case maps:get(type, MyConfig, Type) of
         Type ->
@@ -149,11 +148,11 @@ changing_config(Name,
         _ ->
             {error,{illegal_config_change,OldConfig,NewConfig}}
     end;
-changing_config(_Name, OldConfig, NewConfig) ->
+changing_config(OldConfig, NewConfig) ->
     {error,{illegal_config_change,OldConfig,NewConfig}}.
 
 changing_config1(Name, OldConfig, NewConfig) ->
-    case check_config(changing, Name, NewConfig) of
+    case check_config(changing, NewConfig) of
         Result = {ok,NewConfig1} ->
             try gen_server:call(Name, {change_config,OldConfig,NewConfig1},
                                 ?DEFAULT_CALL_TIMEOUT) of
@@ -166,9 +165,7 @@ changing_config1(Name, OldConfig, NewConfig) ->
             Error
     end.    
 
-check_config(adding, Name, Config0) ->
-    %% Merge in defaults on top level
-    Config = maps:merge(#{id => Name}, Config0),
+check_config(adding, Config) ->
     %% Merge in defaults on handler level
     MyConfig0 = maps:get(?MODULE, Config, #{}),
     MyConfig = maps:merge(#{type => standard_io},
@@ -179,7 +176,7 @@ check_config(adding, Name, Config0) ->
         Error ->
             Error
     end;
-check_config(changing, _Name, Config) ->
+check_config(changing, Config) ->
     MyConfig = maps:get(?MODULE, Config, #{}),
     case check_my_config(maps:to_list(MyConfig)) of
         ok    -> {ok,Config};
@@ -207,7 +204,7 @@ check_my_config([]) ->
 
 %%%-----------------------------------------------------------------
 %%% Handler being removed
-removing_handler(Name,_Config) ->
+removing_handler(#{id:=Name}) ->
     stop(Name).
 
 %%%-----------------------------------------------------------------
@@ -222,15 +219,15 @@ swap_buffer(Name,Buffer) ->
 
 %%%-----------------------------------------------------------------
 %%% Log a string or report
--spec log(Log, Config) -> ok | dropped when
-      Log :: logger:log(),
+-spec log(LogEvent, Config) -> ok | dropped when
+      LogEvent :: logger:log_event(),
       Config :: logger:config().
 
-log(Log,Config=#{id:=Name}) ->
+log(LogEvent,Config=#{id:=Name}) ->
     %% if the handler has crashed, we must drop this request
     %% and hope the handler restarts so we can try again
     true = is_pid(whereis(Name)),
-    Bin = logger_h_common:log_to_binary(Log,Config),
+    Bin = logger_h_common:log_to_binary(LogEvent,Config),
     logger_h_common:call_cast_or_drop(Name, Bin).
 
 %%%===================================================================
diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index 2f637ca9de..2ad1e3107c 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -77,7 +77,7 @@ MODULES= \
 	logger_filters_SUITE \
 	logger_formatter_SUITE \
 	logger_legacy_SUITE \
-	logger_simple_SUITE \
+	logger_simple_h_SUITE \
 	logger_std_h_SUITE \
 	logger_test_lib \
 	os_SUITE \
diff --git a/lib/kernel/test/logger.cover b/lib/kernel/test/logger.cover
index b30bcfe920..960bc0abff 100644
--- a/lib/kernel/test/logger.cover
+++ b/lib/kernel/test/logger.cover
@@ -8,7 +8,7 @@
             logger_filters,
             logger_formatter,
             logger_server,
-            logger_simple,
+            logger_simple_h,
             logger_std_h,
             logger_sup]}.
 
diff --git a/lib/kernel/test/logger.spec b/lib/kernel/test/logger.spec
index cd76a754a4..1ab90b3e93 100644
--- a/lib/kernel/test/logger.spec
+++ b/lib/kernel/test/logger.spec
@@ -7,5 +7,5 @@
                            logger_filters_SUITE,
                            logger_formatter_SUITE,
                            logger_legacy_SUITE,
-                           logger_simple_SUITE,
+                           logger_simple_h_SUITE,
                            logger_std_h_SUITE]}.
diff --git a/lib/kernel/test/logger_SUITE.erl b/lib/kernel/test/logger_SUITE.erl
index e602fa2576..f7ec59a7b7 100644
--- a/lib/kernel/test/logger_SUITE.erl
+++ b/lib/kernel/test/logger_SUITE.erl
@@ -318,7 +318,7 @@ macros(_Config) ->
 
 macros(cleanup,_Config) ->
     logger:remove_handler(h1),
-    logger:reset_module_level(?MODULE),
+    logger:unset_module_level(?MODULE),
     ok.
 
 set_level(_Config) ->
@@ -350,29 +350,29 @@ set_level_module(_Config) ->
     logger:info(M2=?map_rep,?MY_LOC(0)),
     ok = check_logged(info,M2,?MY_LOC(1)),
 
-    {error,{not_a_module,{bad}}} = logger:reset_module_level({bad}),
-    ok = logger:reset_module_level(?MODULE),
+    {error,{not_a_module,{bad}}} = logger:unset_module_level({bad}),
+    ok = logger:unset_module_level(?MODULE),
 
     ok.
 
 set_level_module(cleanup,_Config) ->
     logger:remove_handler(h1),
-    logger:reset_module_level(?MODULE),
+    logger:unset_module_level(?MODULE),
     ok.
 
 cache_level_module(_Config) ->
-    ok = logger:reset_module_level(?MODULE),
+    ok = logger:unset_module_level(?MODULE),
     [] = ets:lookup(logger,?MODULE), %dirty - add API in logger_config?
     ?LOG_INFO(?map_rep),
     %% Caching is done asynchronously, so wait a bit for the update
     timer:sleep(100),
     [_] = ets:lookup(logger,?MODULE), %dirty - add API in logger_config?
-    ok = logger:reset_module_level(?MODULE),
+    ok = logger:unset_module_level(?MODULE),
     [] = ets:lookup(logger,?MODULE), %dirty - add API in logger_config?
     ok.
 
 cache_level_module(cleanup,_Config) ->
-    logger:reset_module_level(?MODULE),
+    logger:unset_module_level(?MODULE),
     ok.
 
 format_report(_Config) ->
@@ -769,14 +769,14 @@ process_metadata(_Config) ->
     undefined = logger:get_process_metadata(),
     {error,badarg} = ?TRY(logger:set_process_metadata(bad)),
     ok = logger:add_handler(h1,?MODULE,#{level=>info,filter_default=>log}),
-    Time = erlang:monotonic_time(microsecond),
+    Time = erlang:system_time(microsecond),
     ProcMeta = #{time=>Time,line=>0,custom=>proc},
     ok = logger:set_process_metadata(ProcMeta),
     S1 = ?str,
     ?LOG_INFO(S1,#{custom=>macro}),
     check_logged(info,S1,#{time=>Time,line=>0,custom=>macro}),
 
-    Time2 = erlang:monotonic_time(microsecond),
+    Time2 = erlang:system_time(microsecond),
     S2 = ?str,
     ?LOG_INFO(S2,#{time=>Time2,line=>1,custom=>macro}),
     check_logged(info,S2,#{time=>Time2,line=>1,custom=>macro}),
@@ -839,20 +839,20 @@ check_maps(Expected,Got,What) ->
     end.
 
 %% Handler
-adding_handler(_Id,#{add_call:=Fun}) ->
+adding_handler(#{add_call:=Fun}) ->
     Fun();
-adding_handler(_Id,Config) ->
+adding_handler(Config) ->
     maybe_send(add),
     {ok,Config}.
 
-removing_handler(_Id,#{rem_call:=Fun}) ->
+removing_handler(#{rem_call:=Fun}) ->
     Fun();
-removing_handler(_Id,_Config) ->
+removing_handler(_Config) ->
     maybe_send(remove),
     ok.
-changing_config(_Id,_Old,#{conf_call:=Fun}) ->
+changing_config(_Old,#{conf_call:=Fun}) ->
     Fun();
-changing_config(_Id,_Old,Config) ->
+changing_config(_Old,Config) ->
     maybe_send(changing_config),
     {ok,Config}.
 
diff --git a/lib/kernel/test/logger_disk_log_h_SUITE.erl b/lib/kernel/test/logger_disk_log_h_SUITE.erl
index 3aa1c3557b..7a1736c814 100644
--- a/lib/kernel/test/logger_disk_log_h_SUITE.erl
+++ b/lib/kernel/test/logger_disk_log_h_SUITE.erl
@@ -336,24 +336,24 @@ formatter_fail(Config) ->
     {ok,{_,#{formatter:={logger_formatter,_}}}} =
         logger:get_handler_config(Name),
     logger:info(M1=?msg,?domain),
-    Got1 = try_match_file(?log_no(LogFile,1),"=INFO REPORT====.*\n"++M1,5000),
+    Got1 = try_match_file(?log_no(LogFile,1),"[0-9\\+\\-T:\\.]* info: "++M1,5000),
 
     ok = logger:set_handler_config(Name,formatter,{nonexistingmodule,#{}}),
     logger:info(M2=?msg,?domain),
     Got2 = try_match_file(?log_no(LogFile,1),
-                          Got1++"=INFO REPORT====.*\nFORMATTER CRASH: .*"++M2,
+                          escape(Got1)++"[0-9\\+\\-T:\\.]* info: FORMATTER CRASH: .*"++M2,
                           5000),
 
     ok = logger:set_handler_config(Name,formatter,{?MODULE,crash}),
     logger:info(M3=?msg,?domain),
     Got3 = try_match_file(?log_no(LogFile,1),
-                          Got2++"=INFO REPORT====.*\nFORMATTER CRASH: .*"++M3,
+                          escape(Got2)++"[0-9\\+\\-T:\\.]* info: FORMATTER CRASH: .*"++M3,
                           5000),
 
     ok = logger:set_handler_config(Name,formatter,{?MODULE,bad_return}),
     logger:info(?msg,?domain),
     try_match_file(?log_no(LogFile,1),
-                   Got3++"FORMATTER ERROR: bad_return_value",
+                   escape(Got3)++"FORMATTER ERROR: bad_return_value",
                    5000),
 
     %% Check that handler is still alive and was never dead
@@ -1491,3 +1491,10 @@ check_tracer(T) ->
             dbg:stop_clear(),
             ct:fail({timeout,tracer})
     end.
+
+escape([$+|Rest]) ->
+    [$\\,$+|escape(Rest)];
+escape([H|T]) ->
+    [H|escape(T)];
+escape([]) ->
+    [].
diff --git a/lib/kernel/test/logger_env_var_SUITE.erl b/lib/kernel/test/logger_env_var_SUITE.erl
index 764f443634..601d331fb0 100644
--- a/lib/kernel/test/logger_env_var_SUITE.erl
+++ b/lib/kernel/test/logger_env_var_SUITE.erl
@@ -82,11 +82,11 @@ default(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 default_sasl_compatible(Config) ->
@@ -95,11 +95,11 @@ default_sasl_compatible(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp]}}} =
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    true = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_tty(Config) ->
@@ -107,11 +107,11 @@ error_logger_tty(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_tty_sasl_compatible(Config) ->
@@ -121,11 +121,11 @@ error_logger_tty_sasl_compatible(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp]}}} =
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    true = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_false(Config) ->
@@ -134,14 +134,14 @@ error_logger_false(Config) ->
               [{error_logger,false},
                {logger_level,notice}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
-    {logger_simple,logger_simple,SimpleC} = lists:keyfind(logger_simple,1,Hs),
+    {simple,logger_simple_h,SimpleC} = lists:keyfind(simple,1,Hs),
     info = maps:get(level,SimpleC),
     notice = maps:get(level,L),
     SimpleFilters = maps:get(filters,SimpleC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,SimpleFilters),
     true = lists:keymember(stop_progress,1,SimpleFilters),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_false_progress(Config) ->
@@ -149,16 +149,16 @@ error_logger_false_progress(Config) ->
         setup(Config,
               [{error_logger,false},
                {logger_level,notice},
-               {logger_log_progress,true}]),
+               {logger_progress_reports,log}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
-    {logger_simple,logger_simple,SimpleC} = lists:keyfind(logger_simple,1,Hs),
+    {simple,logger_simple_h,SimpleC} = lists:keyfind(simple,1,Hs),
     info = maps:get(level,SimpleC),
     notice = maps:get(level,L),
     SimpleFilters = maps:get(filters,SimpleC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,SimpleFilters),
     false = lists:keymember(stop_progress,1,SimpleFilters),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_false_sasl_compatible(Config) ->
@@ -168,22 +168,22 @@ error_logger_false_sasl_compatible(Config) ->
                {logger_level,notice},
                {logger_sasl_compatible,true}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
-    {logger_simple,logger_simple,SimpleC} = lists:keyfind(logger_simple,1,Hs),
+    {simple,logger_simple_h,SimpleC} = lists:keyfind(simple,1,Hs),
     info = maps:get(level,SimpleC),
     notice = maps:get(level,L),
     SimpleFilters = maps:get(filters,SimpleC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp]}}} =
         lists:keyfind(domain,1,SimpleFilters),
     false = lists:keymember(stop_progress,1,SimpleFilters),
-    true = lists:keymember(sasl_h,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_silent(Config) ->
     {ok,#{handlers:=Hs},_Node} = setup(Config,
                                        [{error_logger,silent}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_silent_sasl_compatible(Config) ->
@@ -191,8 +191,8 @@ error_logger_silent_sasl_compatible(Config) ->
                                        [{error_logger,silent},
                                         {logger_sasl_compatible,true}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
-    false = lists:keymember(logger_simple,1,Hs),
-    true = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
     ok.
 
 
@@ -220,11 +220,11 @@ logger_file(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -243,11 +243,11 @@ logger_file_sasl_compatible(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp]}}} =
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    true = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -255,7 +255,7 @@ logger_file_log_progress(Config) ->
     Log = file(Config,?FUNCTION_NAME),
     {ok,#{handlers:=Hs},Node}
         = setup(Config,
-                [{logger_log_progress,true},
+                [{logger_progress_reports,log},
                  {logger,
                   [{handler,?STANDARD_HANDLER,logger_std_h,
                     #{logger_std_h=>#{type=>{file,Log}}}}]}]),
@@ -266,11 +266,11 @@ logger_file_log_progress(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -289,8 +289,8 @@ logger_file_no_filter(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -310,8 +310,8 @@ logger_file_no_filter_level(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     error = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -331,8 +331,8 @@ logger_file_formatter(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -340,7 +340,7 @@ logger_filters(Config) ->
     Log = file(Config,?FUNCTION_NAME),
     {ok,#{handlers:=Hs,logger:=Logger},Node}
         = setup(Config,
-                [{logger_log_progress,true},
+                [{logger_progress_reports,log},
                  {logger,
                   [{handler,?STANDARD_HANDLER,logger_std_h,
                     #{logger_std_h=>#{type=>{file,Log}}}},
@@ -353,11 +353,11 @@ logger_filters(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     LoggerFilters = maps:get(filters,Logger),
     true = lists:keymember(stop_progress,1,LoggerFilters),
 
@@ -367,7 +367,7 @@ logger_filters_stop(Config) ->
     Log = file(Config,?FUNCTION_NAME),
     {ok,#{handlers:=Hs,logger:=Logger},Node}
         = setup(Config,
-                [{logger_log_progress,true},
+                [{logger_progress_reports,log},
                  {logger,
                   [{handler,?STANDARD_HANDLER,logger_std_h,
                     #{filters=>[],
@@ -382,8 +382,8 @@ logger_filters_stop(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     LoggerFilters = maps:get(filters,Logger),
     true = lists:keymember(log_error,1,LoggerFilters),
 
@@ -393,7 +393,7 @@ logger_module_level(Config) ->
     Log = file(Config,?FUNCTION_NAME),
     {ok,#{handlers:=Hs,module_levels:=ModuleLevels},Node}
         = setup(Config,
-                [{logger_log_progress,true},
+                [{logger_progress_reports,log},
                  {logger,
                   [{handler,?STANDARD_HANDLER,logger_std_h,
                     #{logger_std_h=>#{type=>{file,Log}}}},
@@ -406,11 +406,11 @@ logger_module_level(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     [{supervisor,error}] = ModuleLevels,
     ok.
 
@@ -428,11 +428,11 @@ logger_disk_log(Config) ->
     {?STANDARD_HANDLER,logger_disk_log_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -452,8 +452,8 @@ logger_disk_log_formatter(Config) ->
     {?STANDARD_HANDLER,logger_disk_log_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -461,14 +461,14 @@ logger_undefined(Config) ->
     {ok,#{handlers:=Hs,logger:=L},_Node} =
         setup(Config,[{logger,[{handler,?STANDARD_HANDLER,undefined}]}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
-    {logger_simple,logger_simple,SimpleC} = lists:keyfind(logger_simple,1,Hs),
+    {simple,logger_simple_h,SimpleC} = lists:keyfind(simple,1,Hs),
     info = maps:get(level,SimpleC),
     info = maps:get(level,L),
     SimpleFilters = maps:get(filters,SimpleC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,SimpleFilters),
     true = lists:keymember(stop_progress,1,SimpleFilters),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 
@@ -542,8 +542,8 @@ logger_many_handlers(Config, Env, LogErr, LogInfo, NumProgress) ->
     ok = rpc:call(Node,logger_std_h,filesync,[info]),
     {ok, Bin} = file:read_file(LogInfo),
     ct:log("Log content:~n~s",[Bin]),
-    match(Bin,<<"PROGRESS REPORT">>,NumProgress,info,info),
-    match(Bin,<<"ALERT REPORT">>,0,alert,info),
+    match(Bin,<<"info:">>,NumProgress+1,info,info),
+    match(Bin,<<"alert:">>,0,alert,info),
 
     ok.
 
@@ -552,7 +552,7 @@ sasl_compatible_false(Config) ->
     {ok,_Hs,Node} = setup(Config,
                           [{error_logger,{file,Log}},
                            {logger_sasl_compatible,false},
-                           {logger_log_progress,true}]),
+                           {logger_progress_reports,log}]),
     check_default_log(Node,Log,
                       file,% dest
                       6),% progress in std logger
@@ -563,7 +563,7 @@ sasl_compatible_false_no_progress(Config) ->
     {ok,_Hs,Node} = setup(Config,
                           [{error_logger,{file,Log}},
                            {logger_sasl_compatible,false},
-                           {logger_log_progress,false}]),
+                           {logger_progress_reports,stop}]),
     check_default_log(Node,Log,
                       file,% dest
                       0),% progress in std logger
@@ -589,7 +589,7 @@ bad_sasl_compatibility(Config) ->
     error = setup(Config,[{logger_sasl_compatible,badcomp}]).
 
 bad_progress(Config) ->
-    error = setup(Config,[{logger_log_progress,badprogress}]).
+    error = setup(Config,[{logger_progress_reports,badprogress}]).
 
 %%%-----------------------------------------------------------------
 %%% Internal
diff --git a/lib/kernel/test/logger_filters_SUITE.erl b/lib/kernel/test/logger_filters_SUITE.erl
index c4b31370ff..11cce8fd20 100644
--- a/lib/kernel/test/logger_filters_SUITE.erl
+++ b/lib/kernel/test/logger_filters_SUITE.erl
@@ -75,79 +75,79 @@ all() ->
      remote_gl].
 
 domain(_Config) ->
-    L1 = logger_filters:domain(L1=?dlog([]),{log,prefix_of,[]}),
-    stop = logger_filters:domain(?dlog([]),{stop,prefix_of,[]}),
-    L2 = logger_filters:domain(L2=?dlog([]),{log,starts_with,[]}),
-    stop = logger_filters:domain(?dlog([]),{stop,starts_with,[]}),
-    L3 = logger_filters:domain(L3=?dlog([]),{log,equals,[]}),
-    stop = logger_filters:domain(?dlog([]),{stop,equals,[]}),
-    ignore = logger_filters:domain(?dlog([]),{log,differs,[]}),
-    ignore = logger_filters:domain(?dlog([]),{stop,differs,[]}),
-    ignore = logger_filters:domain(?dlog([]),{log,no_domain,[]}),
-    ignore = logger_filters:domain(?dlog([]),{stop,no_domain,[]}),
-
-    L4 = logger_filters:domain(L4=?dlog([a]),{log,prefix_of,[a,b]}),
-    stop = logger_filters:domain(?dlog([a]),{stop,prefix_of,[a,b]}),
-    ignore = logger_filters:domain(?dlog([a]),{log,starts_with,[a,b]}),
-    ignore = logger_filters:domain(?dlog([a]),{stop,starts_with,[a,b]}),
-    ignore = logger_filters:domain(?dlog([a]),{log,equals,[a,b]}),
-    ignore = logger_filters:domain(?dlog([a]),{stop,equals,[a,b]}),
-    L5 = logger_filters:domain(L5=?dlog([a]),{log,differs,[a,b]}),
-    stop = logger_filters:domain(?dlog([a]),{stop,differs,[a,b]}),
-    ignore = logger_filters:domain(?dlog([a]),{log,no_domain,[a,b]}),
-    ignore = logger_filters:domain(?dlog([a]),{stop,no_domain,[a,b]}),
-
-    ignore = logger_filters:domain(?dlog([a,b]),{log,prefix_of,[a]}),
-    ignore = logger_filters:domain(?dlog([a,b]),{stop,prefix_of,[a]}),
-    L6 = logger_filters:domain(L6=?dlog([a,b]),{log,starts_with,[a]}),
-    stop = logger_filters:domain(?dlog([a,b]),{stop,starts_with,[a]}),
-    ignore = logger_filters:domain(?dlog([a,b]),{log,equals,[a]}),
-    ignore = logger_filters:domain(?dlog([a,b]),{stop,equals,[a]}),
-    L7 = logger_filters:domain(L7=?dlog([a,b]),{log,differs,[a]}),
-    stop = logger_filters:domain(?dlog([a,b]),{stop,differs,[a]}),
-    ignore = logger_filters:domain(?dlog([a,b]),{log,no_domain,[a]}),
-    ignore = logger_filters:domain(?dlog([a,b]),{stop,no_domain,[a]}),
-
-    ignore = logger_filters:domain(?ndlog,{log,prefix_of,[a]}),
-    ignore = logger_filters:domain(?ndlog,{stop,prefix_of,[a]}),
-    ignore = logger_filters:domain(?ndlog,{log,starts_with,[a]}),
-    ignore = logger_filters:domain(?ndlog,{stop,starts_with,[a]}),
-    ignore = logger_filters:domain(?ndlog,{log,equals,[a]}),
-    ignore = logger_filters:domain(?ndlog,{stop,equals,[a]}),
-    L8 = logger_filters:domain(L8=?ndlog,{log,differs,[a]}),
-    stop = logger_filters:domain(?ndlog,{stop,differs,[a]}),
-    L9 = logger_filters:domain(L9=?ndlog,{log,no_domain,[a]}),
-    stop = logger_filters:domain(?ndlog,{stop,no_domain,[a]}),
-
-    L10 = logger_filters:domain(L10=?dlog([a,b,c,d]),{log,prefix_of,[a,b,c,d]}),
-    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,prefix_of,[a,b,c,d]}),
-    L11 = logger_filters:domain(L11=?dlog([a,b,c,d]),{log,starts_with,[a,b,c,d]}),
-    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,starts_with,[a,b,c,d]}),
-    L12 = logger_filters:domain(L12=?dlog([a,b,c,d]),{log,equals,[a,b,c,d]}),
-    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,equals,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog([a,b,c,d]),{log,differs,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog([a,b,c,d]),{stop,differs,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog([a,b,c,d]),{log,no_domain,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog([a,b,c,d]),{stop,no_domain,[a,b,c,d]}),
+    L1 = logger_filters:domain(L1=?dlog([]),{log,super,[]}),
+    stop = logger_filters:domain(?dlog([]),{stop,super,[]}),
+    L2 = logger_filters:domain(L2=?dlog([]),{log,sub,[]}),
+    stop = logger_filters:domain(?dlog([]),{stop,sub,[]}),
+    L3 = logger_filters:domain(L3=?dlog([]),{log,equal,[]}),
+    stop = logger_filters:domain(?dlog([]),{stop,equal,[]}),
+    ignore = logger_filters:domain(?dlog([]),{log,not_equal,[]}),
+    ignore = logger_filters:domain(?dlog([]),{stop,not_equal,[]}),
+    ignore = logger_filters:domain(?dlog([]),{log,undefined,[]}),
+    ignore = logger_filters:domain(?dlog([]),{stop,undefined,[]}),
+
+    L4 = logger_filters:domain(L4=?dlog([a]),{log,super,[a,b]}),
+    stop = logger_filters:domain(?dlog([a]),{stop,super,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{log,sub,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{stop,sub,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{log,equal,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{stop,equal,[a,b]}),
+    L5 = logger_filters:domain(L5=?dlog([a]),{log,not_equal,[a,b]}),
+    stop = logger_filters:domain(?dlog([a]),{stop,not_equal,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{log,undefined,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{stop,undefined,[a,b]}),
+
+    ignore = logger_filters:domain(?dlog([a,b]),{log,super,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{stop,super,[a]}),
+    L6 = logger_filters:domain(L6=?dlog([a,b]),{log,sub,[a]}),
+    stop = logger_filters:domain(?dlog([a,b]),{stop,sub,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{log,equal,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{stop,equal,[a]}),
+    L7 = logger_filters:domain(L7=?dlog([a,b]),{log,not_equal,[a]}),
+    stop = logger_filters:domain(?dlog([a,b]),{stop,not_equal,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{log,undefined,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{stop,undefined,[a]}),
+
+    ignore = logger_filters:domain(?ndlog,{log,super,[a]}),
+    ignore = logger_filters:domain(?ndlog,{stop,super,[a]}),
+    ignore = logger_filters:domain(?ndlog,{log,sub,[a]}),
+    ignore = logger_filters:domain(?ndlog,{stop,sub,[a]}),
+    ignore = logger_filters:domain(?ndlog,{log,equal,[a]}),
+    ignore = logger_filters:domain(?ndlog,{stop,equal,[a]}),
+    L8 = logger_filters:domain(L8=?ndlog,{log,not_equal,[a]}),
+    stop = logger_filters:domain(?ndlog,{stop,not_equal,[a]}),
+    L9 = logger_filters:domain(L9=?ndlog,{log,undefined,[a]}),
+    stop = logger_filters:domain(?ndlog,{stop,undefined,[a]}),
+
+    L10 = logger_filters:domain(L10=?dlog([a,b,c,d]),{log,super,[a,b,c,d]}),
+    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,super,[a,b,c,d]}),
+    L11 = logger_filters:domain(L11=?dlog([a,b,c,d]),{log,sub,[a,b,c,d]}),
+    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,sub,[a,b,c,d]}),
+    L12 = logger_filters:domain(L12=?dlog([a,b,c,d]),{log,equal,[a,b,c,d]}),
+    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog([a,b,c,d]),{log,not_equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog([a,b,c,d]),{stop,not_equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog([a,b,c,d]),{log,undefined,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog([a,b,c,d]),{stop,undefined,[a,b,c,d]}),
 
     %% A domain field in meta which is not a list is allowed by the
     %% filter, but since MatchDomain is always a list of atoms, only
-    %% Action=differs can ever match.
-    ignore = logger_filters:domain(?dlog(dummy),{log,prefix_of,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{stop,prefix_of,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{log,starts_with,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{stop,starts_with,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{log,equals,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{stop,equals,[a,b,c,d]}),
-    L13 = logger_filters:domain(L13=?dlog(dummy),{log,differs,[a,b,c,d]}),
-    stop = logger_filters:domain(?dlog(dummy),{stop,differs,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{log,no_domain,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{stop,no_domain,[a,b,c,d]}),
+    %% Action=not_equal can ever match.
+    ignore = logger_filters:domain(?dlog(dummy),{log,super,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{stop,super,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{log,sub,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{stop,sub,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{log,equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{stop,equal,[a,b,c,d]}),
+    L13 = logger_filters:domain(L13=?dlog(dummy),{log,not_equal,[a,b,c,d]}),
+    stop = logger_filters:domain(?dlog(dummy),{stop,not_equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{log,undefined,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{stop,undefined,[a,b,c,d]}),
 
     {error,badarg} = ?TRY(logger_filters:domain(?ndlog,bad)),
-    {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{bad,prefix_of,[]})),
+    {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{bad,super,[]})),
     {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{log,bad,[]})),
-    {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{log,prefix_of,bad})),
+    {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{log,super,bad})),
 
     ok.
 
diff --git a/lib/kernel/test/logger_formatter_SUITE.erl b/lib/kernel/test/logger_formatter_SUITE.erl
index 9baadfd65a..7a93f2ca79 100644
--- a/lib/kernel/test/logger_formatter_SUITE.erl
+++ b/lib/kernel/test/logger_formatter_SUITE.erl
@@ -68,7 +68,8 @@ all() ->
      level_or_msg_in_meta,
      faulty_log,
      faulty_config,
-     faulty_msg].
+     faulty_msg,
+     update_config].
 
 default(_Config) ->
     String1 = format(info,{"~p",[term]},#{},#{}),
@@ -268,8 +269,8 @@ format_msg(_Config) ->
     String8 = format(info,{string,['not',printable,list]},
                      #{report_cb=>fun(_)-> {"formatted",[]} end},
                      #{template=>Template}),
-    ct:log(String8),
-    "INVALID STRING: ['not',printable,list]" = String8,
+    ct:log("~ts",[String8]), % avoiding ct_log crash
+    "FORMAT ERROR: \"~ts\" - [['not',printable,list]]" = String8,
 
     String9 = format(info,{string,"string"},#{},#{template=>Template}),
     ct:log(String9),
@@ -405,6 +406,14 @@ chars_limit(_Config) ->
     L5 = MS5,
     true = lists:prefix(lists:sublist(String5,L5-4),String4),
 
+    %% Test that chars_limit limits string also
+    Str = "123456789012345678901234567890123456789012345678901234567890123456789",
+    CL6 = 80,
+    String6 = format(info,{string,Str},Meta,FC#{chars_limit=>CL6}),
+    L6 = string:length(String6),
+    ct:log("String6: ~p~nLength6: ~p~n",[String6,L6]),
+    L6 = CL6,
+
     ok.
 
 format_mfa(_Config) ->
@@ -505,7 +514,7 @@ level_or_msg_in_meta(_Config) ->
     ok.
 
 faulty_log(_Config) ->
-    %% Unexpected log (should be type logger:log()) - print error
+    %% Unexpected log (should be type logger:log_event()) - print error
     {error,
      function_clause,
      {logger_formatter,format,[_,_],_}} =
@@ -532,6 +541,54 @@ faulty_msg(_Config) ->
                                      #{})),
     ok.
 
+%% Test that formatter config can be changed, and that the default
+%% template is updated accordingly
+update_config(_Config) ->
+    logger:add_handler_filter(default,silence,{fun(_,_) -> stop end,ok}),
+    ok = logger:add_handler(?MODULE,?MODULE,#{}),
+    D = lists:seq(1,1000),
+    logger:info("~p~n",[D]),
+    {Lines1,C1} = check_log(),
+    [ct:log(L) || L <- Lines1],
+    ct:log("~p",[C1]),
+    [Line1] = Lines1,
+    [_Time,"info: "++D1] = string:split(Line1," "),
+    true = length(D1)>3000,
+    true = #{}==C1,
+
+    ok = logger:update_formatter_config(?MODULE,single_line,false),
+    logger:info("~p~n",[D]),
+    {Lines2,C2} = check_log(),
+    [ct:log(L) || L <- Lines2],
+    ct:log("~p",[C2]),
+    true = length(Lines2)>50,
+    true = #{single_line=>false}==C2,
+
+    ok = logger:update_formatter_config(?MODULE,#{legacy_header=>true}),
+    logger:info("~p~n",[D]),
+    {Lines3,C3} = check_log(),
+    [ct:log(L) || L <- Lines3],
+    ct:log("~p",[C3]),
+    ["=INFO REPORT==== "++_|D3] = Lines3,
+    true = length(D3)>50,
+    true = #{legacy_header=>true,single_line=>false}==C3,
+
+    ok = logger:update_formatter_config(?MODULE,single_line,true),
+    logger:info("~p~n",[D]),
+    {Lines4,C4} = check_log(),
+    [ct:log(L) || L <- Lines4],
+    ct:log("~p",[C4]),
+    ["=INFO REPORT==== "++_,D4] = Lines4,
+    true = length(D4)>3000,
+    true = #{legacy_header=>true,single_line=>true}==C4,
+
+    ok.
+
+update_config(cleanup,_Config) ->
+    _ = logger:remove_handler(?MODULE),
+    _ = logger:remove_handler_filter(default,silence),
+    ok.
+
 %%%-----------------------------------------------------------------
 %%% Internal
 format(Level,Msg,Meta,Config) ->
@@ -546,8 +603,7 @@ default_time_format(Timestamp) ->
 default_time_format(Timestamp,Utc) ->
     default_time_format(Timestamp,Utc,$T).
 
-default_time_format(Timestamp0,Utc,Sep) ->
-    Timestamp=Timestamp0+erlang:time_offset(microsecond),
+default_time_format(Timestamp,Utc,Sep) ->
     Offset = if Utc -> "Z";
                 true -> ""
              end,
@@ -569,10 +625,20 @@ my_try(Fun) ->
     try Fun() catch C:R:S -> {C,R,hd(S)} end.
 
 timestamp() ->
-    erlang:monotonic_time(microsecond).
+    erlang:system_time(microsecond).
 
 %% necessary?
 add_time(#{time:=_}=Meta) ->
     Meta;
 add_time(Meta) ->
     Meta#{time=>timestamp()}.
+
+%%%-----------------------------------------------------------------
+%%% handler callback
+log(Log,#{formatter:={M,C}}) ->
+    put(log,{M:format(Log,C),C}),
+    ok.
+
+check_log() ->
+    {S,C} = erase(log),
+    {string:lexemes(S,"\n"),C}.
diff --git a/lib/kernel/test/logger_legacy_SUITE.erl b/lib/kernel/test/logger_legacy_SUITE.erl
index b59f5f7758..cfba35e43f 100644
--- a/lib/kernel/test/logger_legacy_SUITE.erl
+++ b/lib/kernel/test/logger_legacy_SUITE.erl
@@ -68,13 +68,13 @@ init_per_group(std, Config) ->
     ok = logger:set_handler_config(
            error_logger,filters,
            [{domain,{fun logger_filters:domain/2,
-                     {log,prefix_of,[beam,erlang,otp]}}}]),
+                     {log,super,[beam,erlang,otp]}}}]),
     Config;
 init_per_group(sasl, Config) ->
     ok = logger:set_handler_config(
            error_logger,filters,
            [{domain,{fun logger_filters:domain/2,
-                     {log,prefix_of,[beam,erlang,otp,sasl]}}}]),
+                     {log,super,[beam,erlang,otp,sasl]}}}]),
 
     %% cth_log_redirect checks if sasl is started before displaying
     %% any sasl reports - so just to see the real sasl reports in tc
diff --git a/lib/kernel/test/logger_simple_SUITE.erl b/lib/kernel/test/logger_simple_h_SUITE.erl
index 0d505b14f5..271a2126de 100644
--- a/lib/kernel/test/logger_simple_SUITE.erl
+++ b/lib/kernel/test/logger_simple_h_SUITE.erl
@@ -17,7 +17,7 @@
 %%
 %% %CopyrightEnd%
 %%
--module(logger_simple_SUITE).
+-module(logger_simple_h_SUITE).
 
 -compile(export_all).
 
@@ -87,20 +87,20 @@ all() ->
     ].
 
 start_stop(_Config) ->
-    undefined = whereis(logger_simple),
-    register(logger_simple,self()),
-    {error,_} = logger:add_handler(logger_simple,
-                                   logger_simple,
+    undefined = whereis(logger_simple_h),
+    register(logger_simple_h,self()),
+    {error,_} = logger:add_handler(simple,
+                                   logger_simple_h,
                                    #{filter_default=>log}),    
-    unregister(logger_simple),
-    ok = logger:add_handler(logger_simple,logger_simple,#{filter_default=>log}),
-    Pid = whereis(logger_simple),
+    unregister(logger_simple_h),
+    ok = logger:add_handler(simple,logger_simple_h,#{filter_default=>log}),
+    Pid = whereis(logger_simple_h),
     true = is_pid(Pid),
-    ok = logger:remove_handler(logger_simple),
-    false = is_pid(whereis(logger_simple)),
+    ok = logger:remove_handler(simple),
+    false = is_pid(whereis(logger_simple_h)),
     ok.
 start_stop(cleanup,_Config) ->
-    logger:remove_handler(logger_simple).
+    logger:remove_handler(simple).
 
 %% This testcase just tests that it does not crash, the default handler prints
 %% to stdout which we cannot read from in a detached slave.
@@ -138,7 +138,8 @@ replace_file(Config) ->
 
     ok = rpc:call(Node, logger, add_handlers,
                   [[{handler, default, logger_std_h,
-                     #{ logger_std_h => #{ type => {file, File} }}}]]),
+                     #{ logger_std_h => #{ type => {file, File} },
+                        formatter => {?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}}}]]),
 
     {ok,Bin} = sync_and_read(Node, file, File),
     Lines = [unicode:characters_to_list(L) ||
@@ -181,7 +182,8 @@ replace_disk_log(Config) ->
 
     ok = rpc:call(Node, logger, add_handlers,
                   [[{handler, default, logger_disk_log_h,
-                     #{ disk_log_opts => #{ file => File }}}]]),
+                     #{ disk_log_opts => #{ file => File },
+                        formatter => {?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}}}]]),
     {ok,Bin} = sync_and_read(Node, disk_log, File),
     Lines = [unicode:characters_to_list(L) ||
                 L <- binary:split(Bin,<<"\n">>,[global,trim])],
diff --git a/lib/kernel/test/logger_std_h_SUITE.erl b/lib/kernel/test/logger_std_h_SUITE.erl
index fc59d393e0..5764abd063 100644
--- a/lib/kernel/test/logger_std_h_SUITE.erl
+++ b/lib/kernel/test/logger_std_h_SUITE.erl
@@ -250,24 +250,24 @@ formatter_fail(Config) ->
     {ok,{_,#{formatter:={logger_formatter,_}}}} =
         logger:get_handler_config(?MODULE),
     logger:info(M1=?msg,?domain),
-    Got1 = try_match_file(Log,"=INFO REPORT====.*\n"++M1,5000),
+    Got1 = try_match_file(Log,"[0-9\\+\\-T:\\.]* info: "++M1,5000),
 
     ok = logger:set_handler_config(?MODULE,formatter,{nonexistingmodule,#{}}),
     logger:info(M2=?msg,?domain),
     Got2 = try_match_file(Log,
-                          Got1++"=INFO REPORT====.*\nFORMATTER CRASH: .*"++M2,
+                          escape(Got1)++"[0-9\\+\\-T:\\.]* info: FORMATTER CRASH: .*"++M2,
                           5000),
 
     ok = logger:set_handler_config(?MODULE,formatter,{?MODULE,crash}),
     logger:info(M3=?msg,?domain),
     Got3 = try_match_file(Log,
-                          Got2++"=INFO REPORT====.*\nFORMATTER CRASH: .*"++M3,
+                          escape(Got2)++"[0-9\\+\\-T:\\.]* info: FORMATTER CRASH: .*"++M3,
                           5000),
 
     ok = logger:set_handler_config(?MODULE,formatter,{?MODULE,bad_return}),
     logger:info(?msg,?domain),
     try_match_file(Log,
-                   Got3++"FORMATTER ERROR: bad_return_value",
+                   escape(Got3)++"FORMATTER ERROR: bad_return_value",
                    5000),
 
     %% Check that handler is still alive and was never dead
@@ -1020,7 +1020,7 @@ mem_kill_new(Config) ->
                 killed ->
                     ct:pal("Slow shutdown, handler process was killed!", [])
             end,
-            timer:sleep(RestartAfter + 2000),
+            timer:sleep(RestartAfter * 3),
             true = is_pid(whereis(?MODULE)),
             ok
     after
@@ -1518,3 +1518,10 @@ check_tracer(T,TimeoutFun) ->
             dbg:stop_clear(),
             TimeoutFun()
     end.
+
+escape([$+|Rest]) ->
+    [$\\,$+|escape(Rest)];
+escape([H|T]) ->
+    [H|escape(T)];
+escape([]) ->
+    [].
diff --git a/lib/runtime_tools/doc/src/LTTng.xml b/lib/runtime_tools/doc/src/LTTng.xml
index 93937b3fdc..4114542c74 100644
--- a/lib/runtime_tools/doc/src/LTTng.xml
+++ b/lib/runtime_tools/doc/src/LTTng.xml
@@ -111,7 +111,7 @@ $ make </code>
         <p><em>process_register</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
-            <item><c>name : string</c> :: Registered name. Ex. <c>"error_logger"</c></item>
+            <item><c>name : string</c> :: Registered name. Ex. <c>"logger"</c></item>
             <item><c>type : string</c> :: <c>"register" | "unregister"</c></item>
         </list>
         <p>Example:</p>
diff --git a/lib/sasl/doc/src/error_logging.xml b/lib/sasl/doc/src/error_logging.xml
index 4b2c960bbb..8731b73599 100644
--- a/lib/sasl/doc/src/error_logging.xml
+++ b/lib/sasl/doc/src/error_logging.xml
@@ -32,22 +32,51 @@
     <rev>B</rev>
     <file>error_logging.xml</file>
     </header>
+  <note>
+    <p>The SASL error logging concept desribed in this section is
+      deprecated since OTP-21, when the
+      new <seealso marker="kernel:logger_chapter">logging
+      API</seealso> was introduced.</p>
+    <p>The new default behaviour is that the SASL application no
+      longer affects which log events that are logged.
+      <seealso marker="#supervisor_report">Supervisor
+      reports</seealso> and <seealso marker="#crash_report">crash
+      reports</seealso> are logged via the default logger handler
+      which is setup by
+      Kernel. <seealso marker="#progress_report">Progress
+      reports</seealso> are by default not logged, but can be enabled
+      by setting the Kernel configuration
+      parameter <seealso marker="kernel:kernel_app#logger_progress_reports">
+	<c>logger_progress_reports</c></seealso> to <c>log</c>.</p>
+    <p>The old SASL error logging behaviour can be re-enabled by setting the
+      Kernel configuration
+      parameter <seealso marker="kernel:kernel_app#logger_sasl_compatible">
+	<c>logger_sasl_compatible</c></seealso> to <c>true</c>.</p>
+    <p>The mechanism
+      for <seealso marker="#multi_file_logging">multi-file error report
+      logging</seealso> as described in this section is also kept for
+      backwards compatibility. However, the new logging API also
+      introduces <seealso marker="kernel:logger_disk_log_h">
+	<c>logger_disk_log_h(3)</c></seealso>, which is a logger
+      handler that can print to multiple files
+      using <seealso marker="kernel:disk_log"><c>disk_log(3)</c></seealso>.</p>
+  </note>
+
+  <section>
+    <title>SASL reports</title>
   <p>The SASL application introduces three types of reports:</p>
   <list type="bulleted">
     <item>Supervisor report</item>
     <item>Progress report</item>
     <item>Crash report</item>
   </list>
-  <p>When the SASL application is started, it adds a handler that
-    formats and writes these reports, as specified in the configuration
-    parameters for SASL, that is, the environment variables
-    in the SASL application specification, which is found in the
-    <c>.app</c> file of SASL. For details, see the
-    <seealso marker="sasl_app"><c>sasl(6)</c></seealso> application in the
-    Reference Manual and the <seealso marker="kernel:app"><c>app(4)</c></seealso>
-    file in the Kernel Reference Manual.</p>
+  <p>When the SASL application is started, it adds a logger handler
+    that formats and writes these reports, as specified in
+    the <seealso marker="sasl_app#deprecated_error_logger_config">configuration
+    parameters for SASL</seealso></p>
 
   <section>
+    <marker id="supervisor_report"/>
     <title>Supervisor Report</title>
     <p>A supervisor report is issued when a supervised child terminates
       unexpectedly. A supervisor report contains the following
@@ -68,6 +97,7 @@
   </section>
 
   <section>
+    <marker id="progress_report"/>
     <title>Progress Report</title>
     <p>A progress report is issued when a supervisor starts or
       restarts a child. A progress report contains the following items:</p>
@@ -82,6 +112,7 @@
   </section>
 
   <section>
+    <marker id="crash_report"/>
     <title>Crash Report</title>
     <p>Processes started with functions 
       <seealso marker="stdlib:proc_lib#spawn/1"><c>proc_lib:spawn</c></seealso> or
@@ -105,6 +136,7 @@
        crash. The information gathered is the same as the information
        for Crasher, described in the previous item.</p></item>
     </taglist>
+    </section>
 
     <section>
       <title>Example</title>
@@ -163,6 +195,7 @@
   </section>
 
   <section>
+    <marker id="multi_file_logging"/>
     <title>Multi-File Error Report Logging</title>
     <p>Multi-file error report logging is used to store error messages
       received by <c>error_logger</c>. The error messages
@@ -171,7 +204,8 @@
       of files exist at the same time. The logging is very fast, as
       each error message is written as a binary term.</p>
     <p>For more details, see the
-      <seealso marker="sasl_app"><c>sasl(6)</c></seealso>
+      <seealso marker="sasl_app#deprecated_error_logger_config">
+	<c>sasl(6)</c></seealso>
       application in the Reference Manual.</p>
   </section>
 
diff --git a/lib/sasl/doc/src/sasl_app.xml b/lib/sasl/doc/src/sasl_app.xml
index 26b9bece2a..be275879ee 100644
--- a/lib/sasl/doc/src/sasl_app.xml
+++ b/lib/sasl/doc/src/sasl_app.xml
@@ -90,20 +90,22 @@
   </section>
 
   <section>
+    <marker id="deprecated_error_logger_config"/>
     <title>Deprecated Error Logger Event Handlers and Configuration</title>
-    <p>In OTP-21, a new API for logging was added to Erlang/OTP. The
+    <p>In Erlang/OTP 21.0, a new API for logging was added. The
       old <c>error_logger</c> event manager, and event handlers
-      running on this manager, will still work, but they are not used
+      running on this manager, still work, but they are not used
       by default.</p>
     <p>The error logger event handlers <c>sasl_report_tty_h</c>
-      and <c>sasl_report_file_h</c>, were earliger used for printing
+      and <c>sasl_report_file_h</c>, were earlier used for printing
       the so called SASL reports, i.e. <em>supervisor
       reports</em>, <em>crash reports</em>, and <em>progress
-      reports</em>. These reports are now also printed by the standard
+      reports</em>. These reports are now also printed by the default
       logger handler started by the Kernel application. Progress
-      reports are by default stopped by a filter, but can easily be
+      reports are by default stopped by a filter, but can be
       added by setting the Kernel configuration
-      parameter <seealso marker="kernel:kernel_app#logger_log_progress"><c>logger_log_progress=true</c></seealso>.</p>
+      parameter <seealso marker="kernel:kernel_app#logger_progress_reports">
+      <c>logger_progress_reports</c></seealso> to <c>log</c>.</p>
     <p>If the old error logger event handlers are still desired, they
       must be added by
       calling <c>error_logger:add_report_handler/1,2</c>.</p>
@@ -131,10 +133,10 @@
       obtained by setting the Kernel application environment
       variable <seealso marker="kernel:kernel_app#logger_sasl_compatible"><c>logger_sasl_compatible=true</c></seealso>. This will add a
       second instance of the standard logger handler
-      named <c>sasl_h</c>, which will only print the SASL reports. No
+      named <c>sasl</c>, which will only print the SASL reports. No
       SASL reports will then be printed by the Kernel logger
       handler.</p>
-    <p>The <c>sasl_h</c> handler will be configured according to the
+    <p>The <c>sasl</c> handler will be configured according to the
       values of the following SASL application environment
       variables.</p>
     <taglist>
@@ -218,6 +220,7 @@
     <title>See Also</title>
     <p><seealso marker="alarm_handler"><c>alarm_handler(3)</c></seealso>,
       <seealso marker="kernel:error_logger"><c>error_logger(3)</c></seealso>,
+      <seealso marker="kernel:logger"><c>logger(3)</c></seealso>,
       <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>,
       <seealso marker="rb"><c>rb(3)</c></seealso>,
       <seealso marker="release_handler"><c>release_handler(3)</c></seealso>,
diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
index 9359bdb30e..92b80694d7 100644
--- a/lib/sasl/src/sasl.erl
+++ b/lib/sasl/src/sasl.erl
@@ -129,16 +129,9 @@ get_mf_maxf() ->
 add_sasl_logger(undefined, _Level) -> ok;
 add_sasl_logger(std, undefined) -> ok;
 add_sasl_logger(Dest, Level) ->
-    FC0 = #{legacy_header=>true,
-            single_line=>false,
-            template=>[{logger_formatter,header},"\n",msg,"\n"]},
-    FC = case application:get_env(sasl,utc_log) of
-             {ok,Bool} when is_boolean(Bool) ->
-                 FC0#{utc=>Bool};
-             _ ->
-                 FC0
-         end,
-    ok = logger:add_handler(sasl_h,logger_std_h,
+    FC = #{legacy_header=>true,
+           single_line=>false},
+    ok = logger:add_handler(sasl,logger_std_h,
                             #{level=>Level,
                               filter_default=>stop,
                               filters=>
@@ -146,14 +139,14 @@ add_sasl_logger(Dest, Level) ->
                                     {fun logger_filters:remote_gl/2,stop}},
                                    {sasl_domain,
                                     {fun logger_filters:domain/2,
-                                     {log,equals,[beam,erlang,otp,sasl]}}}],
+                                     {log,equal,[beam,erlang,otp,sasl]}}}],
                               logger_std_h=>#{type=>Dest},
                               formatter=>{logger_formatter,FC}}).
 
 delete_sasl_logger(undefined) -> ok;
 delete_sasl_logger(std) -> ok;
 delete_sasl_logger(_Type) ->
-    _ = logger:remove_handler(sasl_h),
+    _ = logger:remove_handler(sasl),
     ok.
 
 add_error_logger_mf(undefined) -> ok;
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index f4b1b54fd1..6916107623 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -1551,7 +1551,7 @@ mandatory_modules() ->
      logger_server,
      logger_backend,
      logger_config,
-     logger_simple,
+     logger_simple_h,
      lists,
      proc_lib,
      supervisor
diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml
index 012737c390..51378a6b73 100644
--- a/lib/stdlib/doc/src/gen_event.xml
+++ b/lib/stdlib/doc/src/gen_event.xml
@@ -458,8 +458,7 @@ gen_event:stop             ----->  Module:terminate/2
           with the expected reason. Any other reason than <c>normal</c>,
           <c>shutdown</c>, or <c>{shutdown,Term}</c> causes an
           error report to be issued using
-          <seealso marker="kernel:error_logger#format/2">
-          <c>error_logger:format/2</c></seealso>.
+          <seealso marker="kernel:logger"><c>logger(3)</c></seealso>.
           The default <c>Reason</c> is <c>normal</c>.</p>
         <p><c>Timeout</c> is an integer greater than zero that
           specifies how many milliseconds to wait for the event manager to
diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml
index da74e793e6..27edbc8de7 100644
--- a/lib/stdlib/doc/src/gen_server.xml
+++ b/lib/stdlib/doc/src/gen_server.xml
@@ -486,8 +486,7 @@ gen_server:abcast     -----> Module:handle_cast/2
           with the expected reason. Any other reason than <c>normal</c>,
           <c>shutdown</c>, or <c>{shutdown,Term}</c> causes an
           error report to be issued using
-          <seealso marker="kernel:error_logger#format/2">
-          <c>error_logger:format/2</c></seealso>.
+          <seealso marker="kernel:logger"><c>logger(3)</c></seealso>.
           The default <c>Reason</c> is <c>normal</c>.</p>
         <p><c>Timeout</c> is an integer greater than zero that
           specifies how many milliseconds to wait for the server to
@@ -861,8 +860,7 @@ gen_server:abcast     -----> Module:handle_cast/2
           <c>shutdown</c>, or <c>{shutdown,Term}</c>, the <c>gen_server</c>
           process is assumed to terminate because of an error and
           an error report is issued using
-          <seealso marker="kernel:error_logger#format/2">
-          <c>error_logger:format/2</c></seealso>.</p>
+          <seealso marker="kernel:logger"><c>logger(3)</c></seealso>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index e918e83df7..a808d3af55 100644
--- a/lib/stdlib/doc/src/gen_statem.xml
+++ b/lib/stdlib/doc/src/gen_statem.xml
@@ -1778,7 +1778,7 @@ handle_event(_, _, State, Data) ->
 	  with the expected reason. Any other reason than <c>normal</c>,
 	  <c>shutdown</c>, or <c>{shutdown,Term}</c> causes an
 	  error report to be issued through
-	  <seealso marker="kernel:error_logger#format/2"><c>error_logger:format/2</c></seealso>.
+	  <seealso marker="kernel:logger"><c>logger(3)</c></seealso>.
 	  The default <c><anno>Reason</anno></c> is <c>normal</c>.
 	</p>
 	<p>
@@ -2286,7 +2286,7 @@ init(Args) -> erlang:error(not_implemented, [Args]).</pre>
           <c>shutdown</c>, or <c>{shutdown,Term}</c>,
 	  the <c>gen_statem</c> is assumed to terminate because of an error
 	  and an error report is issued using
-          <seealso marker="kernel:error_logger#format/2"><c>error_logger:format/2</c></seealso>.
+          <seealso marker="kernel:logger"><c>logger(3)</c></seealso>.
 	</p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml
index cb152d1935..51380ae51c 100644
--- a/lib/stdlib/doc/src/proc_lib.xml
+++ b/lib/stdlib/doc/src/proc_lib.xml
@@ -59,18 +59,17 @@
     <p>When a process that is started using <c>proc_lib</c> terminates
       abnormally (that is, with another exit reason than <c>normal</c>,
       <c>shutdown</c>, or <c>{shutdown,Term}</c>), a <em>crash report</em>
-      is generated, which is written to terminal by the default SASL
-      event handler. That is, the crash report is normally only visible
-      if the SASL application is started; see
-      <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso> and section
+      is generated, which is written to terminal by the default logger
+      handler setup by Kernel. For more information about how crash reports
+      were logged prior to Erlang/OTP 21.0, see
       <seealso marker="sasl:error_logging">SASL Error Logging</seealso>
       in the SASL User's Guide.</p>
 
     <p>Unlike in "plain Erlang", <c>proc_lib</c> processes will not generate
       <em>error reports</em>, which are written to the terminal by the
-      emulator and do not require SASL to be started. All exceptions are
+      emulator. All exceptions are
       converted to <em>exits</em> which are ignored by the default
-      <c>error_logger</c> handler.</p>
+      <c>logger</c> handler.</p>
 
     <p>The crash report contains the previously stored information, such
       as ancestors and initial function, the termination reason, and
@@ -115,12 +114,22 @@
       <name name="format" arity="2"/>
       <fsummary>Format a crash report.</fsummary>
       <desc>
-        <p>This function can be used by a user-defined event handler to
+	<note>
+	  <p>This function is deprecated in the sense that
+	    the <c>error_logger</c> is no longer the preferred
+	    interface for logging in Erlang/OTP. A
+	    new <seealso marker="kernel:logger_chapter">logging
+	    API</seealso> was added in Erlang/OTP 21.0, but
+	    legacy <c>error_logger</c> handlers can still be used. New
+	    Logger handlers do not need to use this function, since
+	    the formatting callback (<c>report_cb</c>) is included as
+	    metadata in the log event.</p>
+	</note>
+        <p>This function can be used by a user-defined legacy
+	  <c>error_logger</c> event handler to
           format a crash report. The crash report is sent using
-          <seealso marker="kernel:error_logger#error_report/2">
-          <c>error_logger:error_report(crash_report,
-          <anno>CrashReport</anno>)</c></seealso>.
-          That is, the event to be handled is of the format
+          <seealso marker="kernel:logger">
+          <c>logger(3)</c></seealso>, and the event to be handled is of the format
           <c>{error_report, GL, {Pid, crash_report,
           <anno>CrashReport</anno>}}</c>,
           where <c>GL</c> is the group leader pid of process
@@ -132,7 +141,19 @@
       <name name="format" arity="3"/>
       <fsummary>Format a crash report.</fsummary>
       <desc>
-        <p>This function can be used by a user-defined event handler to
+	<note>
+	  <p>This function is deprecated in the sense that
+	    the <c>error_logger</c> is no longer the preferred
+	    interface for logging in Erlang/OTP. A
+	    new <seealso marker="kernel:logger_chapter">logging
+	    API</seealso> was added in Erlang/OTP 21.0, but
+	    legacy <c>error_logger</c> handlers can still be used. New
+	    Logger handlers do not need to used this function, since
+	    the formatting callback (<c>report_cb</c>) is included as
+	    metadata in the log event.</p>
+	</note>
+        <p>This function can be used by a user-defined legacy
+	  <c>error_logger</c> event handler to
           format a crash report. When <anno>Depth</anno> is specified as a
           positive integer, it is used in the format string to
           limit the output as follows: <c>io_lib:format("~P",
@@ -395,6 +416,8 @@ init(Parent) ->
     <title>See Also</title>
     <p><seealso marker="kernel:error_logger">
       <c>error_logger(3)</c></seealso></p>
+    <p><seealso marker="kernel:logger">
+      <c>logger(3)</c></seealso></p>
   </section>
 </erlref>