From: Guido van Rossum <guido@python.org>
Date: Sun, 9 Oct 2016 03:09:56 +0000 (-0700)
Subject: Issue #28388: update typing module documentation. (merge 3.5->3.6)
X-Git-Tag: v3.6.0b2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b258db9840540a1451dbad8ab66f20664c584d8a;p=python

Issue #28388: update typing module documentation. (merge 3.5->3.6)
---

b258db9840540a1451dbad8ab66f20664c584d8a
diff --cc Doc/library/typing.rst
index fda3dd59fc,8b4eec3eab..447b548db2
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@@ -10,9 -10,9 +10,9 @@@
  
  --------------
  
- This module supports type hints as specified by :pep:`484` and :pep:`526`.  The most
- fundamental support consists of the type :class:`Any`, :class:`Union`,
- :class:`Tuple`, :class:`Callable`, :class:`TypeVar`, and
 -This module supports type hints as specified by :pep:`484`.  The most
 -fundamental support consists of the type :data:`Any`, :data:`Union`,
++This module supports type hints as specified by :pep:`484` and :pep:`526`.
++The most fundamental support consists of the type :data:`Any`, :data:`Union`,
+ :data:`Tuple`, :data:`Callable`, :class:`TypeVar`, and
  :class:`Generic`.  For full specification please see :pep:`484`.  For
  a simplified introduction to type hints see :pep:`483`.