Merged revisions 79733,79735 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79733 | ezio.melotti | 2010-04-04 09:41:27 +0300 (Sun, 04 Apr 2010) | 1 line

  Add a versionadded to Counter.subtract() doc.
........
  r79735 | ezio.melotti | 2010-04-04 09:50:58 +0300 (Sun, 04 Apr 2010) | 1 line

  Revert 79733 - Counter is new in 2.7, the versionadded is not necessary - and fix a typo.
........

diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 3d04063adee8c32b0037212e50362fa670270ea1..e5036d5a6b71fb225447b8a3c3879b1b0f9950a3 100644 (file)
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -191,7 +191,7 @@ For example::
    .. versionadded:: 3.1
 
 
-   Counter objects support two methods beyond those available for all
+   Counter objects support three methods beyond those available for all
    dictionaries:
 
    .. method:: elements()
@@ -225,6 +225,8 @@ For example::
             >>> c.subtract(d)
             Counter({'a': 3, 'b': 0, 'c': -3, 'd': -6})
 
+      .. versionadded:: 3.2
+
    The usual dictionary methods are available for :class:`Counter` objects
    except for two which work differently for counters.