From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 12 Jan 2016 09:36:25 +0000 (+0200)
Subject: #25574: backport glossary doc fix about hash and id of user-defined classes.
X-Git-Tag: v2.7.12rc1~293
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cb7fca89f27f81cf784bc9bbaf9350e216615ee;p=thirdparty%2FPython%2Fcpython.git

#25574: backport glossary doc fix about hash and id of user-defined classes.
---

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 6a6feba21c9a..cbd1237f8e5f 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -346,8 +346,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