Merged revisions 82790 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r82790 | georg.brandl | 2010-07-11 10:36:20 +0200 (So, 11 Jul 2010) | 1 line
#3214 followup: add link to ABC entry.
........
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 5442720..e8ff819 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -154,9 +154,9 @@
must be a duck.") By emphasizing interfaces rather than specific types,
well-designed code improves its flexibility by allowing polymorphic
substitution. Duck-typing avoids tests using :func:`type` or
- :func:`isinstance`. (Note, however, that duck-typing can be complemented
- with abstract base classes.) Instead, it typically employs :func:`hasattr`
- tests or :term:`EAFP` programming.
+ :func:`isinstance`. (Note, however, that duck-typing can be complemented
+ with :term:`abstract base class`\ es.) Instead, it typically employs
+ :func:`hasattr` tests or :term:`EAFP` programming.
EAFP
Easier to ask for forgiveness than permission. This common Python coding