summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-06-03 17:18:41 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-06-03 17:18:41 (GMT)
commitf90112efe8695e9cb6545591349553324a17cf2c (patch)
treeb586f1e63803ca5c8471811c29c8e5bcb0116f73
parent5d5bde1df2e92fcd545baeef4fb212462982e47e (diff)
downloadcpython-f90112efe8695e9cb6545591349553324a17cf2c.zip
cpython-f90112efe8695e9cb6545591349553324a17cf2c.tar.gz
cpython-f90112efe8695e9cb6545591349553324a17cf2c.tar.bz2
Fix reST label for collections ABCs.
The previous markup hijacked the abstract-base-classes glossary entry, which resulted in the HTML linking to collections.abc when defining the generic ABC concept. Now the glossary links to the abc module.
-rw-r--r--Doc/library/abc.rst4
-rw-r--r--Doc/library/collections.abc.rst2
-rw-r--r--Doc/library/collections.rst2
3 files changed, 5 insertions, 3 deletions
diff --git a/Doc/library/abc.rst b/Doc/library/abc.rst
index 2eced45..3e38cb4 100644
--- a/Doc/library/abc.rst
+++ b/Doc/library/abc.rst
@@ -1,3 +1,5 @@
+.. _abstract-base-classes:
+
:mod:`abc` --- Abstract Base Classes
====================================
@@ -12,7 +14,7 @@
--------------
This module provides the infrastructure for defining an :term:`abstract base
-class` (ABCs) in Python, as outlined in :pep:`3119`; see the PEP for why this
+class` (ABC) in Python, as outlined in :pep:`3119`; see the PEP for why this
was added to Python. (See also :pep:`3141` and the :mod:`numbers` module
regarding a type hierarchy for numbers based on ABCs.)
diff --git a/Doc/library/collections.abc.rst b/Doc/library/collections.abc.rst
index 58354f8..1d451d1 100644
--- a/Doc/library/collections.abc.rst
+++ b/Doc/library/collections.abc.rst
@@ -23,7 +23,7 @@ example, whether it is hashable or whether it is a mapping.
.. versionchanged:: 3.3
Formerly, this module was part of the :mod:`collections` module.
-.. _abstract-base-classes:
+.. _collections-abstract-base-classes:
Collections Abstract Base Classes
---------------------------------
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index f54af32..6c9b1e5 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -34,7 +34,7 @@ Python's general purpose built-in containers, :class:`dict`, :class:`list`,
===================== ====================================================================
.. versionchanged:: 3.3
- Moved :ref:`abstract-base-classes` to the :mod:`collections.abc` module.
+ Moved :ref:`collections-abstract-base-classes` to the :mod:`collections.abc` module.
For backwards compatibility, they continue to be visible in this module
as well.