Merge doc changes from 3.2.

rstlint complains about packaging docs but I’m working on those in
another patch.

diff --cc Doc/faq/design.rst
index b9faf576bfd4273072a3746ace3eaaca3290e7f0,02417b1e90f1e1b31715ee18c772a0ceb08e8b04..1f3135a9e557d26c6955beeb6a36395c024adccf
--- 1/Doc/faq/design.rst
--- 2/Doc/faq/design.rst
+++ b/Doc/faq/design.rst
@@@ -667,7 -667,7 +667,7 @@@ construction of large programs
  Python 2.6 adds an :mod:`abc` module that lets you define Abstract Base Classes
  (ABCs).  You can then use :func:`isinstance` and :func:`issubclass` to check
  whether an instance or a class implements a particular ABC.  The
- :mod:`collections` modules defines a set of useful ABCs such as
 -:mod:`collections` module defines a set of useful ABCs such as
++:mod:`collections.abc` module defines a set of useful ABCs such as
  :class:`Iterable`, :class:`Container`, and :class:`MutableMapping`.
  
  For Python, many of the advantages of interface specifications can be obtained

diff --cc Doc/glossary.rst
index c66aac162f092d88e106aa620242cc09b68316d6,3b211aedefb1c399db5b98d807c31cc57ae5a45b..4f1795d91b743f4c03d10d70ed451ff6ad80ebdd
--- 1/Doc/glossary.rst
--- 2/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@@ -434,8 -434,8 +434,8 @@@ Glossar
  
     mapping
        A container object that supports arbitrary key lookups and implements the
--      methods specified in the :class:`~collections.Mapping` or
--      :class:`~collections.MutableMapping`
++      methods specified in the :class:`~collections.abc.Mapping` or
++      :class:`~collections.abc.MutableMapping`
        :ref:`abstract base classes <collections-abstract-base-classes>`.  Examples
        include :class:`dict`, :class:`collections.defaultdict`,
        :class:`collections.OrderedDict` and :class:`collections.Counter`.

diff --cc Doc/library/argparse.rst
Simple merge

diff --cc Doc/library/unittest.rst
index 191d5b9fdd6e952aa814ae4552c9847f8f321907,6036f7de88218ba3f36c1ae8232d191f768bd6ed..7340588d11668c2c4e59b33328b8bea1ceb0f978
--- 1/Doc/library/unittest.rst
--- 2/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@@ -723,9 -723,9 +723,9 @@@ Test case
     Here, we create two instances of :class:`WidgetTestCase`, each of which runs a
     single test.
  
 -   .. versionchanged::
 +   .. versionchanged:: 3.2
-       `TestCase` can be instantiated successfully without providing a method
-       name. This makes it easier to experiment with `TestCase` from the
+       :class:`TestCase` can be instantiated successfully without providing a method
+       name. This makes it easier to experiment with :class:`TestCase` from the
        interactive interpreter.
  
     *methodName* defaults to :meth:`runTest`.