From: Raymond Hettinger <python@rcn.com>
Date: Tue, 20 Jan 2009 07:11:47 +0000 (+0000)
Subject: Don't disrupt automatic url target name generation
X-Git-Tag: v2.7a1~2240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=230dd276283cd39756a907439a3e699e51fefa6e;p=thirdparty%2FPython%2Fcpython.git

Don't disrupt automatic url target name generation
with manually specified, conflicting names.

Before:
    http://docs.python.org/dev/library/collections.html#id1

After:
    http://docs.python.org/dev/library/collections.html#counter-objects
---

diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index df6cd5a688cf..46a2d628ccbd 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -152,8 +152,6 @@ Notes on using :class:`Set` and :class:`MutableSet` as a mixin:
 (For more about ABCs, see the :mod:`abc` module and :pep:`3119`.)
 
 
-.. _counter-objects:
-
 :class:`Counter` objects
 ------------------------
 
@@ -281,7 +279,7 @@ of corresponding counts::
     Counter({'a': 4, 'b': 3})
     >>> c - d                           # subtract (keeping only positive counts)
     Counter({'a': 2})
-    >>> c & d                           # interection:  min(c[x], d[x])
+    >>> c & d                           # intersection:  min(c[x], d[x])
     Counter({'a': 1, 'b': 1})
     >>> c | d                           # union:  max(c[x], d[x])
     Counter({'a': 3, 'b': 2})
@@ -314,13 +312,9 @@ are undefined for negative inputs::
    Section 4.6.3, Exercise 19
 
 
-
-.. _deque-objects:
-
 :class:`deque` objects
 ----------------------
 
-
 .. class:: deque([iterable[, maxlen]])
 
    Returns a new deque object initialized left-to-right (using :meth:`append`) with
@@ -469,8 +463,6 @@ Example:
    deque(['c', 'b', 'a'])
 
 
-.. _deque-recipes:
-
 :class:`deque` Recipes
 ^^^^^^^^^^^^^^^^^^^^^^
 
@@ -518,12 +510,10 @@ in Unix::
        'Return the last n lines of a file'
        return deque(open(filename), n)
 
-.. _defaultdict-objects:
 
 :class:`defaultdict` objects
 ----------------------------
 
-
 .. class:: defaultdict([default_factory[, ...]])
 
    Returns a new dictionary-like object.  :class:`defaultdict` is a subclass of the
@@ -569,8 +559,6 @@ in Unix::
       ``None``, if absent.
 
 
-.. _defaultdict-examples:
-
 :class:`defaultdict` Examples
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -640,8 +628,6 @@ Setting the :attr:`default_factory` to :class:`set` makes the
    [('blue', set([2, 4])), ('red', set([1, 3]))]
 
 
-.. _named-tuple-factory:
-
 :func:`namedtuple` Factory Function for Tuples with Named Fields
 ----------------------------------------------------------------