From: Mark Henderson <mark.henderson@8trk.com>
Date: Tue, 8 Dec 2015 04:27:47 +0000 (-0500)
Subject: Update options.py
X-Git-Tag: v4.4.0b1~61^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db36a844fc60c00b6ba384cbb0e4861ab54e4c43;p=thirdparty%2Ftornado.git

Update options.py

Updated verbiage.
---

diff --git a/tornado/options.py b/tornado/options.py
index 861aabee0..40169fb8a 100644
--- a/tornado/options.py
+++ b/tornado/options.py
@@ -43,10 +43,9 @@ either::
 
 .. note:
 
-   When using tornado.options.parse_config_file, the only options that are set
-   are ones that were previously defined with either tornado.options.parse_command_line
-   or tornado.options.define. tornado.options.parse_config_file is used mainly as a 
-   means to offer overriding settings for different environments.
+   When using tornado.options.parse_command_line or 
+   tornado.options.parse_config_file, the only options that are set are 
+   ones that were previously defined with tornado.options.define.
 
 Command line formats are what you would expect (``--myoption=myvalue``).
 Config files are just Python files. Global names become options, e.g.::