[Python-checkins] cpython (merge 3.2 -> 3.3): #16128: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/d9255c100971
changeset:   81863:d9255c100971
branch:      3.3
parent:      81857:886f48754f7e
parent:      81862:e84c5cf92b6f
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Feb 01 05:20:06 2013 +0200
summary:
  #16128: merge with 3.2.

files:
  Doc/glossary.rst |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -320,7 +320,8 @@
       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, and their hash value is their :func:`id`.
+      compare unequal (except with themselves), and their hash value is their
+      :func:`id`.
 
    IDLE
       An Integrated Development Environment for Python.  IDLE is a basic editor

-- 
Repository URL: http://hg.python.org/cpython