summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2012-11-03 19:13:46 (GMT)
committerChris Jerdonek <chris.jerdonek@gmail.com>2012-11-03 19:13:46 (GMT)
commitb9829fca711605ed4a5966b32fbc8e2f5755c9a1 (patch)
tree17ac9b1fc4033171f1803e7e86412377b0763891 /Doc
parentef3173877c78f1bbab1e570c68b2ce11460a9f5b (diff)
downloadcpython-b9829fca711605ed4a5966b32fbc8e2f5755c9a1.zip
cpython-b9829fca711605ed4a5966b32fbc8e2f5755c9a1.tar.gz
cpython-b9829fca711605ed4a5966b32fbc8e2f5755c9a1.tar.bz2
Backport from 3.2: link to mapping glossary entry in docs.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/os.rst2
-rw-r--r--Doc/library/stdtypes.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 17ad105..02a9ecd 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 b08561e..f00c4fb 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