[Python-checkins] cpython (merge 3.2 -> 3.2): merge heads

[benjamin.peterson]

http://hg.python.org/cpython/rev/13f251824b6b
changeset:   75537:13f251824b6b
branch:      3.2
parent:      75536:15550b5777b9
parent:      75532:3f15c069454d
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Mar 12 09:28:26 2012 -0700
summary:
  merge heads

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


diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -147,7 +147,7 @@
 
    dictionary
       An associative array, where arbitrary keys are mapped to values.  The keys
-      can be any object with :meth:`__hash__` function and :meth:`__eq__`
+      can be any object with :meth:`__hash__` method and :meth:`__eq__`
       methods. Called a hash in Perl.
 
    docstring

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