Merged revisions 82793-82794,82807,82876,83432 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
................
r82793 | georg.brandl | 2010-07-11 10:56:18 +0200 (So, 11 Jul 2010) | 9 lines
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.
........
................
r82794 | georg.brandl | 2010-07-11 10:57:05 +0200 (So, 11 Jul 2010) | 9 lines
Merged revisions 82789 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82789 | georg.brandl | 2010-07-11 10:33:16 +0200 (So, 11 Jul 2010) | 1 line
Silence makeindex.
........
................
r82807 | georg.brandl | 2010-07-11 12:29:37 +0200 (So, 11 Jul 2010) | 9 lines
Merged revisions 82806 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82806 | georg.brandl | 2010-07-11 12:22:44 +0200 (So, 11 Jul 2010) | 1 line
#9223: link to Command class reference, and move Command interface docs nearer to class docs.
........
................
r82876 | georg.brandl | 2010-07-14 10:55:55 +0200 (Mi, 14 Jul 2010) | 13 lines
Merged revisions 82872,82874 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82872 | georg.brandl | 2010-07-14 10:53:18 +0200 (Mi, 14 Jul 2010) | 1 line
Remove XXX from text.
........
r82874 | georg.brandl | 2010-07-14 10:54:40 +0200 (Mi, 14 Jul 2010) | 1 line
#9235: fix missing import of sys.
........
................
r83432 | georg.brandl | 2010-08-01 21:21:26 +0200 (So, 01 Aug 2010) | 13 lines
Merged revisions 83328,83341 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83328 | raymond.hettinger | 2010-07-31 12:14:41 +0200 (Sa, 31 Jul 2010) | 1 line
Document how to change OrderedDict update order from first to last.
........
r83341 | georg.brandl | 2010-07-31 13:40:07 +0200 (Sa, 31 Jul 2010) | 1 line
#9430: document timedelta str() and repr().
........
................
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 30bd1c2..5cf3aee 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -160,9 +160,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