From 773ecb4e8c2897eb9893889259fd7ede8340a4d0 Mon Sep 17 00:00:00 2001
From: Akihiro Yamazaki <yamazaki@iij.ad.jp>
Date: Tue, 19 Apr 2016 14:41:58 +0900
Subject: [PATCH] fix Formatter description in docstring

---
 tornado/log.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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'
-- 
2.47.2