From c0625a74ce1bdc4e0fe6827a7106f653518b2c4c Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Mon, 16 Sep 2013 17:49:46 -0300 Subject: [PATCH] [1.6.x] Reworded a paragraph in the logging docs. 9d12f68a53 from master. --- docs/topics/logging.txt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/topics/logging.txt b/docs/topics/logging.txt index 05a1a73f3c7f3..2f72e7dff9585 100644 --- a/docs/topics/logging.txt +++ b/docs/topics/logging.txt @@ -218,14 +218,16 @@ handlers, filters and formatters that you want in your logging setup, and the log levels and other properties that you want those components to have. -Prior to Django 1.5, the :setting:`LOGGING` setting overwrote the :ref:`default -Django logging configuration `. From Django -1.5 forward, the project's logging configuration is merged with Django's -defaults, hence you can decide if you want to add to, or replace the existing -configuration. To completely override the default configuration, set the -``disable_existing_loggers`` key to ``True`` (which is the default) in the -:setting:`LOGGING` dictConfig. Alternatively you can redefine some or all of -the loggers by setting ``disable_existing_loggers`` to ``False``. +Prior to Django 1.5, the :setting:`LOGGING` setting always overwrote the +:ref:`default Django logging configuration `. +From Django 1.5 forward, it is possible to get the project's logging +configuration merged with Django's defaults, hence you can decide if you want to +add to, or replace the existing configuration. + +If the ``disable_existing_loggers`` key in the :setting:`LOGGING` dictConfig is +set to ``True`` (which is the default) the default configuration is completely +overridden. Alternatively you can redefine some or all of the loggers by +setting ``disable_existing_loggers`` to ``False``. Logging is configured as soon as settings have been loaded (either manually using :func:`~django.conf.settings.configure` or when at least