diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index b90914a4f2..6d449f74c1 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -114,6 +114,7 @@ Florian Scheffler Frederik Gladhorn Frederik Peter Aalund Gabriel Tremblay +Gary Wilson Jr. Gennady Andreyev Georges Dubus Greg Holt diff --git a/docs/client_reference.rst b/docs/client_reference.rst index 407006fda1..bacdb5b78f 100644 --- a/docs/client_reference.rst +++ b/docs/client_reference.rst @@ -129,7 +129,7 @@ The client session supports the context manager protocol for self closing. requests where you need to handle responses with status 400 or higher. - :param timeout: a :class:`ClientTimeout` settings structure, 5min + :param timeout: a :class:`ClientTimeout` settings structure, 300 seconds (5min) total timeout by default. .. versionadded:: 3.3 @@ -150,9 +150,6 @@ The client session supports the context manager protocol for self closing. Use ``timeout`` parameter instead. - :param timeout: a :class:`ClientTimeout` settings structure, 300 seconds (5min) - total timeout by default. - :param bool connector_owner: Close connector instance on session closing.