Merge remote-tracking branch 'origin/develop' into develop

kennethreitz · Dec 9, 2011 · 961f78a · 961f78a
2 parents 463ca76 + f58ab8b
commit 961f78a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -62,4 +62,6 @@ Patches and Suggestions
 - Ryan Kelly
 - Rolando Espinoza La fuente
 - Robert Gieseke
-- Idan Gazit
+- Idan Gazit
+- Ed Summers
+- Chris Van Horne
diff --git a/docs/user/advanced.rst b/docs/user/advanced.rst
@@ -80,6 +80,8 @@ Keep-Alive
 
 Excellent news — thanks to urllib3, keep-alive is 100% automatic within a session! Any requests that you make within a session will automatically reuse the appropriate connection!
 
+Note that connections are only released back to the pool for reuse once all body data has been read; be sure to either set ``prefetch`` to ``True`` or read the ``content`` property of the ``Response`` object.
+
 If you'd like to disable keep-alive, you can simply set the ``keep_alive`` configuration to ``False``::
 
     s = requests.session()
@@ -122,7 +124,7 @@ will also guarantee execution of the ``response`` hook, described below. ::
 
 .. admonition:: Throttling
 
-    The ``map`` function also takes a ``size`` parameter, that specifies the nubmer of connections to make at a time::
+    The ``map`` function also takes a ``size`` parameter, that specifies the number of connections to make at a time::
 
         async.map(rs, size=5)
 

diff --git a/docs/user/quickstart.rst b/docs/user/quickstart.rst
@@ -316,9 +316,9 @@ The :class:`Response.history` list contains a list of the
 :class:`Request` objects that were created in order to complete the request.
 
 If you're using GET, HEAD, or OPTIONS, you can disable redirection
-handling with the ``disable_redirects`` parameter::
+handling with the ``allow_redirects`` parameter::
 
-    >>> r = requests.get('http://github.com')
+    >>> r = requests.get('http://github.com', allow_redirects=False)
     >>> r.status_code
     301
     >>> r.history