Merge branch '5.1' into 5.2

javiereguiluz · javiereguiluz · commit 19d170ea132c · 2021-01-20T17:38:02.000+01:00
* 5.1:
  Just moving this note upwards
diff --git a/logging.rst b/logging.rst
@@ -159,6 +159,13 @@ to write logs using the :phpfunction:`syslog` function:
 This defines a *stack* of handlers and each handler is called in the order that it's
 defined.
 
+.. note::
+
+    If you want to override the ``monolog`` configuration via another config
+    file, you will need to redefine the entire ``handlers`` stack. The configuration
+    from the two files cannot be merged because the order matters and a merge does
+    not allow to control the order.
+
 Handlers that Modify Log Entries
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -263,13 +270,6 @@ debugging much easier!
     The handler named "file_log" will not be included in the stack itself as
     it is used as a nested handler of the ``fingers_crossed`` handler.
 
-.. note::
-
-    If you want to override the ``monolog`` configuration via another config
-    file, you will need to redefine the entire ``handlers`` stack. The configuration
-    from the two files cannot be merged because the order matters and a merge does
-    not allow to control the order.
-
 All Built-in Handlers
 ---------------------
 
