From: Akihiro Yamazaki <yamazaki@iij.ad.jp>
Date: Tue, 19 Apr 2016 05:41:58 +0000 (+0900)
Subject: fix Formatter description in docstring
X-Git-Tag: v4.4.0b1~28^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1694%2Fhead;p=thirdparty%2Ftornado.git

fix Formatter description in docstring
---

diff --git a/tornado/log.py b/tornado/log.py
index 1d10d3790..ac1bb95ea 100644
--- a/tornado/log.py
+++ b/tornado/log.py
@@ -77,8 +77,8 @@ class LogFormatter(logging.Formatter):
     * Robust against str/bytes encoding problems.
 
     This formatter is enabled automatically by
-    `tornado.options.parse_command_line` (unless ``--logging=none`` is
-    used).
+    `tornado.options.parse_command_line` or `tornado.options.parse_config_file`
+    (unless ``--logging=none`` is used).
     """
     DEFAULT_FORMAT = '%(color)s[%(levelname)1.1s %(asctime)s %(module)s:%(lineno)d]%(end_color)s %(message)s'
     DEFAULT_DATE_FORMAT = '%y%m%d %H:%M:%S'