[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/c45841ac52d4
changeset:   92853:c45841ac52d4
parent:      92849:c6c7bd9874fb
parent:      92852:bfaf434a6f10
user:        Georg Brandl <georg at python.org>
date:        Mon Oct 06 16:48:38 2014 +0200
summary:
  merge with 3.4

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


diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -355,8 +355,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 (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

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