Merge 3.5

1st1 · 1st1 · commit 2c008d83dcd9 · 2015-12-15T00:38:38.000-05:00
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
@@ -814,7 +814,7 @@ Updates in 3.5.1:
   coroutines to event loops from other threads.
   (Contributed by Vincent Michel.)
 
-* New :meth:`Transport.is_closing() <asyncio.Transport.is_closing>`
+* New :meth:`Transport.is_closing() <asyncio.BaseTransport.is_closing>`
   method to check if the transport is closing or closed.
   (Contributed by Yury Selivanov.)
 
