add #1593 to 1.3 release

aio-libs · Feb 8, 2017 · ecf267e · ecf267e
1 parent 03ec5ff
commit ecf267e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -75,6 +75,9 @@ CHANGES
 - Deprecated: Adding `sub app` via `app.router.add_subapp()` is deprecated
   use `app.add_subapp()` instead, will be removed in 1.4 #1592
 
+- Deprecated: aiohttp.get(), aiohttp.options(), aiohttp.head(), aiohttp.post(),
+  aiohttp.put(), aiohttp.patch(), aiohttp.delete(), and aiohttp.ws_connect() #1593
+
 
 1.2.0 (2016-12-17)
 ------------------

diff --git a/aiohttp/client.py b/aiohttp/client.py
@@ -193,7 +193,7 @@ def _request(self, method, url, *,
         elif self._connector.conn_timeout is not None:
             timeout = max(timeout, self._connector.conn_timeout)
 
-        # timeout is comulative for all request operations
+        # timeout is cumulative for all request operations
         # (request, redirects, responses, data consuming)
         timer = self._time_service.timeout(timeout)
 

diff --git a/docs/client.rst b/docs/client.rst
@@ -698,7 +698,8 @@ reading procedures::
 
 
 .. note::
-   Timeout is comulative time, it includes all operations like sending request,
+
+   Timeout is cumulative time, it includes all operations like sending request,
    redirects, response parsing, consuming response, etc.