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

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

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 17ad10557571..02a9ecd96ad2 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -72,7 +72,7 @@ process and user.
 
 .. 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 --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index b08561e1cd30..f00c4fb4f5be 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1937,7 +1937,7 @@ 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
 :class:`list`, :class:`set`, and :class:`tuple` classes, and the