From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 4 Jul 2012 05:24:28 +0000 (-0700)
Subject: Fix sphinx formatting of new docstring
X-Git-Tag: v2.4.0~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61007f888c25e7baed798c3ef97b747559858bbd;p=thirdparty%2Ftornado.git

Fix sphinx formatting of new docstring
---

diff --git a/tornado/testing.py b/tornado/testing.py
index 034ffafce..42fec8e72 100644
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -392,13 +392,11 @@ def main(**kwargs):
         # Runs one test
         python -m tornado.test.runtests tornado.test.stack_context_test
 
-    Args:
-      kwargs: Keyword arguments passed through to unittest.main().
-        For example:
-          tornado.testing.main(verbosity=2)
-        to show many test details as they are run.
-        See http://docs.python.org/library/unittest.html#unittest.main
-        for full argument list.
+    Additional keyword arguments passed through to ``unittest.main()``.
+    For example, use ``tornado.testing.main(verbosity=2)``
+    to show many test details as they are run.
+    See http://docs.python.org/library/unittest.html#unittest.main
+    for full argument list.
     """
     from tornado.options import define, options, parse_command_line