From: Georg Brandl <georg@python.org>
Date: Fri, 9 May 2008 06:18:27 +0000 (+0000)
Subject: Add a sentence to basicConfig() that is in the docstring.
X-Git-Tag: v2.6b1~560
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dfb5bbd44a7b7a4a9746fca341bfefe6ce85a394;p=thirdparty%2FPython%2Fcpython.git

Add a sentence to basicConfig() that is in the docstring.
---

diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 9cd36687909d..1f7c59b06af9 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -698,6 +698,8 @@ functions.
    :func:`error` and :func:`critical` will call :func:`basicConfig` automatically
    if no handlers are defined for the root logger.
 
+   This function does nothing if the root logger already has handlers configured.
+
    .. versionchanged:: 2.4
       Formerly, :func:`basicConfig` did not take any keyword arguments.