From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Sat, 3 Nov 2012 19:06:42 +0000 (-0700)
Subject: Merge from 3.2: link to mapping glossary entry in docs.
X-Git-Tag: v3.3.1rc1~693
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c8bb9f4d5478c4bc7e1b9dfa291753b184c2605;p=thirdparty%2FPython%2Fcpython.git

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

1c8bb9f4d5478c4bc7e1b9dfa291753b184c2605
diff --cc Doc/library/os.rst
index 2e45de25dd8e,94298108779d..e253aac1072f
--- a/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 ea6977f4773b,6e6e8ce51a26..0366507c0c64
--- a/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.)