Merge from 3.2: link to mapping glossary entry in docs.

diff --cc Doc/library/os.rst
index 2e45de25dd8e4afb25a43fc0b3260f6b56196cd6,94298108779d02b5af2b209ade6583cb01cc26ee..e253aac1072f15d39dc8591a60650e83c233428e
--- 1/Doc/library/os.rst
--- 2/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@@ -96,16 -96,9 +96,16 @@@ These functions and data items provide 
  process and user.
  
  
 +.. function:: ctermid()
 +
 +   Return the filename corresponding to the controlling terminal of the process.
 +
 +   Availability: Unix.
 +
 +
  .. 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.
  

diff --cc Doc/library/stdtypes.rst
index ea6977f4773bd26942f1aeaa12411e3d6227cda2,6e6e8ce51a26bba8197403c6b5e6fc3de04e468c..0366507c0c64fe8172bc553c5f2c8516143db631
--- 1/Doc/library/stdtypes.rst
--- 2/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@@ -2928,9 -2095,9 +2928,9 @@@ Mapping Types --- :class:`dict
     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
 +type, the :dfn:`dictionary`.  (For other containers see the built-in
  :class:`list`, :class:`set`, and :class:`tuple` classes, and the
  :mod:`collections` module.)