diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-06-04 19:16:42 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-06-04 19:16:42 (GMT) |
| commit | 459b452b9817a3dc16036bf09b0f2d910f4f331d (patch) | |
| tree | 0b2d507c3ce50ae4f28f5092553a39814d7f6681 /Doc/library | |
| parent | b4ef8f299f9e50c872026eac00243f75fcf24aa2 (diff) | |
| parent | 70798be6f65029f5a37b34db83512460aa88813c (diff) | |
| download | cpython-459b452b9817a3dc16036bf09b0f2d910f4f331d.zip cpython-459b452b9817a3dc16036bf09b0f2d910f4f331d.tar.gz cpython-459b452b9817a3dc16036bf09b0f2d910f4f331d.tar.bz2 | |
Merge ABC and distutils touch-ups from 3.2.
I have removed the reST target I added in 38cdca2cc253: it is not necessary, as
people can link to the glossary entry or the abc module without it.
Two indentation fixes from 3.2 collections.rst have been ported to 3.3
collections.abc.rst.
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/abc.rst | 2 | ||||
| -rw-r--r-- | Doc/library/collections.abc.rst | 8 | ||||
| -rw-r--r-- | Doc/library/numbers.rst | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/Doc/library/abc.rst b/Doc/library/abc.rst index 54f7a5f..030d286 100644 --- a/Doc/library/abc.rst +++ b/Doc/library/abc.rst @@ -1,5 +1,3 @@ -.. _abstract-base-classes: - :mod:`abc` --- Abstract Base Classes ==================================== diff --git a/Doc/library/collections.abc.rst b/Doc/library/collections.abc.rst index 1d451d1..dbd89ae 100644 --- a/Doc/library/collections.abc.rst +++ b/Doc/library/collections.abc.rst @@ -44,7 +44,7 @@ ABC Inherits from Abstract Methods Mixin :class:`Iterable`, ``index``, and ``count`` :class:`Container` -:class:`MutableSequence` :class:`Sequence` ``__setitem__`` Inherited :class:`Sequence` methods and +:class:`MutableSequence` :class:`Sequence` ``__setitem__``, Inherited :class:`Sequence` methods and ``__delitem__``, ``append``, ``reverse``, ``extend``, ``pop``, ``insert`` ``remove``, ``clear``, and ``__iadd__`` @@ -175,7 +175,7 @@ Notes on using :class:`Set` and :class:`MutableSet` as a mixin: .. seealso:: - * `OrderedSet recipe <http://code.activestate.com/recipes/576694/>`_ that uses - :class:`MutableSet`. + * `OrderedSet recipe <http://code.activestate.com/recipes/576694/>`_ for an + example built on :class:`MutableSet`. - * For more about ABCs, see the :mod:`abc` module and :pep:`3119`. + * For more about ABCs, see the :mod:`abc` module and :pep:`3119`. diff --git a/Doc/library/numbers.rst b/Doc/library/numbers.rst index df8d521..ad33396 100644 --- a/Doc/library/numbers.rst +++ b/Doc/library/numbers.rst @@ -5,9 +5,9 @@ :synopsis: Numeric abstract base classes (Complex, Real, Integral, etc.). -The :mod:`numbers` module (:pep:`3141`) defines a hierarchy of numeric abstract -base classes which progressively define more operations. None of the types -defined in this module can be instantiated. +The :mod:`numbers` module (:pep:`3141`) defines a hierarchy of numeric +:term:`abstract base classes <abstract base class>` which progressively define +more operations. None of the types defined in this module can be instantiated. .. class:: Number |