Merge from 3.2: link to mapping glossary entry in docs.
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 2e45de2..e253aac 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -105,7 +105,7 @@
.. data:: environ
- A mapping object representing the string environment. For example,
+ A :term:`mapping` object representing the string environment. For example,
``environ['HOME']`` is the pathname of your home directory (on some platforms),
and is equivalent to ``getenv("HOME")`` in C.
@@ -145,7 +145,7 @@
.. data:: environb
- Bytes version of :data:`environ`: a mapping object representing the
+ Bytes version of :data:`environ`: a :term:`mapping` object representing the
environment as byte strings. :data:`environ` and :data:`environb` are
synchronized (modify :data:`environb` updates :data:`environ`, and vice
versa).
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index ea6977f..0366507 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2928,7 +2928,7 @@
statement: del
builtin: len
-A :dfn:`mapping` object maps :term:`hashable` values to arbitrary objects.
+A :term:`mapping` object maps :term:`hashable` values to arbitrary objects.
Mappings are mutable objects. There is currently only one standard mapping
type, the :dfn:`dictionary`. (For other containers see the built-in
:class:`list`, :class:`set`, and :class:`tuple` classes, and the