Merge pull request #2187 from kevinburke/more-docs
authorKenneth Reitz <me@kennethreitz.org>
Thu, 4 Sep 2014 18:39:12 +0000 (11:39 -0700)
committerKenneth Reitz <me@kennethreitz.org>
Thu, 4 Sep 2014 18:39:12 +0000 (11:39 -0700)
Document Timeout behaviour

1  2 
docs/user/advanced.rst

Simple merge