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

diff --cc Doc/library/typing.rst
index fda3dd59fcdbc878e55c49cc203134b2062738d0,8b4eec3eab5425131d36706d08a9228894ec8fa9..447b548db2e09e05303829ae9e6a9bbe74e990b4
--- 1/Doc/library/typing.rst
--- 2/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`.