summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-03-12 16:28:26 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-03-12 16:28:26 (GMT)
commit800b3aa57f073403ed2b64c49058e9b88ba582d3 (patch)
tree148dd3f384ea29a3983f4e1d25cbeecbd360bc00
parentd279e286f2e7035836d779bfad5e93d22eb42cf0 (diff)
parenta7fccd8b14885a76525e11baa1f9db7792d9a26c (diff)
downloadcpython-800b3aa57f073403ed2b64c49058e9b88ba582d3.zip
cpython-800b3aa57f073403ed2b64c49058e9b88ba582d3.tar.gz
cpython-800b3aa57f073403ed2b64c49058e9b88ba582d3.tar.bz2
merge heads
-rw-r--r--Doc/glossary.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 3b211ae..079cfdf 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -147,7 +147,7 @@ Glossary
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