From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 11 Jun 2011 21:53:28 +0000 (-0700)
Subject: Include __init__ methods in autodoc too
X-Git-Tag: v2.0.0~20^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=824c07f616cb1cc948338543dae92d03b4073b64;p=thirdparty%2Ftornado.git

Include __init__ methods in autodoc too
---

diff --git a/tornado/web.py b/tornado/web.py
index 5a019e588..f8c3774fb 100644
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -1695,12 +1695,16 @@ class URLSpec(object):
         """Creates a URLSpec.
 
         Parameters:
+
         pattern: Regular expression to be matched.  Any groups in the regex
             will be passed in to the handler's get/post/etc methods as
             arguments.
+
         handler_class: RequestHandler subclass to be invoked.
+
         kwargs (optional): A dictionary of additional arguments to be passed
             to the handler's constructor.
+
         name (optional): A name for this handler.  Used by
             Application.reverse_url.
         """
diff --git a/website/sphinx/conf.py b/website/sphinx/conf.py
index 02eafe27b..4710be6b9 100644
--- a/website/sphinx/conf.py
+++ b/website/sphinx/conf.py
@@ -18,6 +18,7 @@ version = release = tornado.version
 extensions = ["sphinx.ext.autodoc", "sphinx_coverage"]
 
 autodoc_member_order = "bysource"
+autoclass_content = "both"
 
 coverage_skip_undoc_in_source = True
 # I wish this could go in a per-module file...