diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-09-01 03:57:12 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-09-01 03:57:12 (GMT) |
| commit | b8edbdf4b986048e48b689baf339023c38384ae7 (patch) | |
| tree | 33d61ab7d6e5252b6f5cd682ce45d92cfbfc896b /Doc/glossary.rst | |
| parent | 95fc53f2b378e603dadb3629597b053c13e45965 (diff) | |
| parent | 7af8ebb6ce7576a629206d9c063c0914b9b576bc (diff) | |
| download | cpython-b8edbdf4b986048e48b689baf339023c38384ae7.zip cpython-b8edbdf4b986048e48b689baf339023c38384ae7.tar.gz cpython-b8edbdf4b986048e48b689baf339023c38384ae7.tar.bz2 | |
Merge doc changes from 3.2.
rstlint complains about packaging docs but I’m working on those in
another patch.
Diffstat (limited to 'Doc/glossary.rst')
| -rw-r--r-- | Doc/glossary.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index c66aac1..4f1795d 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -434,8 +434,8 @@ Glossary 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`. @@ -492,7 +492,7 @@ Glossary :func:`builtins.open` and :func:`os.open` are distinguished by their namespaces. Namespaces also aid readability and maintainability by making it clear which module implements a function. For instance, writing - :func:`random.seed` or :func:`itertools.izip` makes it clear that those + :func:`random.seed` or :func:`itertools.islice` makes it clear that those functions are implemented by the :mod:`random` and :mod:`itertools` modules, respectively. |