[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3: link to mapping glossary entry in docs.

Sat Nov 3 20:14:50 CET 2012

http://hg.python.org/cpython/rev/3d467c6e7469
changeset: 80205:3d467c6e7469
parent: 80202:3f4fbad75c99
parent: 80204:5982a6ea124f
user: Chris Jerdonek <chris.jerdonek at gmail.com>
date: Sat Nov 03 12:07:20 2012 -0700
summary:
 Merge from 3.3: link to mapping glossary entry in docs.
files:
 Doc/library/os.rst | 4 ++--
 Doc/library/stdtypes.rst | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- 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
--- 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
-- 
Repository URL: http://hg.python.org/cpython
