| commit | e976fc74647f679519edde2a1e0b73ff711e079b | [log] [tgz] |
|---|---|---|
| author | Eric V. Smith <eric@trueblade.com> | Sun Mar 11 22:47:07 2012 -0700 |
| committer | Eric V. Smith <eric@trueblade.com> | Sun Mar 11 22:47:07 2012 -0700 |
| tree | ebdc63e2bc33b673ed894e4b9aa15f660897440e | |
| parent | 68e994e9e4a30fd3195b6cca46ff057f43021fc8 [diff] | |
| parent | 851cad76164bb8ebc84937bfd14a7ea00e4911bc [diff] |
Merge.
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index f5ca0d9..3ac1031 100644 --- 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