From: bdarnell <ben@bendarnell.com>
Date: Wed, 8 May 2013 04:31:46 +0000 (-0700)
Subject: Merge pull request #780 from keakon/patch-1
X-Git-Tag: v3.1.0~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c54c0bf68f6c343cd9cf9264f286f986cb46b839;p=thirdparty%2Ftornado.git

Merge pull request #780 from keakon/patch-1

add missing parameter doc
---

c54c0bf68f6c343cd9cf9264f286f986cb46b839
diff --cc tornado/httpclient.py
index 76ece1d7e,63d8c2a1b..e933c416b
--- a/tornado/httpclient.py
+++ b/tornado/httpclient.py
@@@ -258,13 -258,10 +258,14 @@@ class HTTPRequest(object)
          :arg string url: URL to fetch
          :arg string method: HTTP method, e.g. "GET" or "POST"
          :arg headers: Additional HTTP headers to pass on the request
+         :arg body: HTTP body to pass on the request
          :type headers: `~tornado.httputil.HTTPHeaders` or `dict`
 -        :arg string auth_username: Username for HTTP "Basic" authentication
 -        :arg string auth_password: Password for HTTP "Basic" authentication
 +        :arg string auth_username: Username for HTTP authentication
 +        :arg string auth_password: Password for HTTP authentication
 +        :arg string auth_mode: Authentication mode; default is "basic".
 +           Allowed values are implementation-defined; ``curl_httpclient``
 +           supports "basic" and "digest"; ``simple_httpclient`` only supports
 +           "basic"
          :arg float connect_timeout: Timeout for initial connection in seconds
          :arg float request_timeout: Timeout for entire request in seconds
          :arg if_modified_since: Timestamp for ``If-Modified-Since`` header