[Python-checkins] r82793 - in python/branches/release27-maint: Doc/glossary.rst

[georg.brandl]

Author: georg.brandl
Date: Sun Jul 11 10:56:18 2010
New Revision: 82793

Log:
Merged revisions 82790 via svnmerge from 
svn+ssh://pythondev@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.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Doc/glossary.rst

Modified: python/branches/release27-maint/Doc/glossary.rst
==============================================================================
--- python/branches/release27-maint/Doc/glossary.rst	(original)
+++ python/branches/release27-maint/Doc/glossary.rst	Sun Jul 11 10:56:18 2010
@@ -163,9 +163,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