diff options
| author | Georg Brandl <georg@python.org> | 2014-10-06 14:48:38 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-06 14:48:38 (GMT) |
| commit | 033ec051f8b0e49c3c3ebeab6a1a649d81740308 (patch) | |
| tree | 6819f0b889e8ee8e4c25b2179c70d776e6f6cd45 /Doc/glossary.rst | |
| parent | 4f8fed28f020cd1a4d3471514fa40629e440e5e3 (diff) | |
| parent | 4dd27a3edba94d2f75cd234b67f109cf98aa76b6 (diff) | |
| download | cpython-033ec051f8b0e49c3c3ebeab6a1a649d81740308.zip cpython-033ec051f8b0e49c3c3ebeab6a1a649d81740308.tar.gz cpython-033ec051f8b0e49c3c3ebeab6a1a649d81740308.tar.bz2 | |
merge with 3.4
Diffstat (limited to 'Doc/glossary.rst')
| -rw-r--r-- | Doc/glossary.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 21d1673..09507f4 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -355,8 +355,8 @@ Glossary All of Python's immutable built-in objects are hashable, while no mutable containers (such as lists or dictionaries) are. Objects which are instances of user-defined classes are hashable by default; they all - compare unequal (except with themselves), and their hash value is their - :func:`id`. + compare unequal (except with themselves), and their hash value is derived + from their :func:`id`. IDLE An Integrated Development Environment for Python. IDLE is a basic editor |