summaryrefslogtreecommitdiffstats
path: root/Doc/glossary.rst
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-08-19 07:36:59 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-08-19 07:36:59 (GMT)
commitd1ca4f9dc6f28bcda09576e6148200b82c3cedae (patch)
tree4cb9826deb99824080c8575ee71b1f6f051f1356 /Doc/glossary.rst
parent87552785c3f5e80dea44b170e790d7d29602e758 (diff)
parent355d48ad8374d4b0f2ac40ad274104bff861ea5e (diff)
downloadcpython-d1ca4f9dc6f28bcda09576e6148200b82c3cedae.zip
cpython-d1ca4f9dc6f28bcda09576e6148200b82c3cedae.tar.gz
cpython-d1ca4f9dc6f28bcda09576e6148200b82c3cedae.tar.bz2
Merge fixes for #12256 and typos from 3.2
Diffstat (limited to 'Doc/glossary.rst')
-rw-r--r--Doc/glossary.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 358f40e..c66aac1 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -30,7 +30,10 @@ Glossary
Abstract base classes complement :term:`duck-typing` by
providing a way to define interfaces when other techniques like
:func:`hasattr` would be clumsy or subtly wrong (for example with
- :ref:`magic methods <special-lookup>`). Python comes with many built-in ABCs for
+ :ref:`magic methods <special-lookup>`). ABCs introduce virtual
+ subclasses, which are classes that don't inherit from a class but are
+ still recognized by :func:`isinstance` and :func:`issubclass`; see the
+ :mod:`abc` module documentation. Python comes with many built-in ABCs for
data structures (in the :mod:`collections.abc` module), numbers (in the
:mod:`numbers` module), streams (in the :mod:`io` module), import finders
and loaders (in the :mod:`importlib.abc` module). You can create your own