[Python-checkins] r79737 - in python/branches/py3k: Doc/library/collections.rst

[ezio.melotti]

Author: ezio.melotti
Date: Sun Apr  4 08:53:44 2010
New Revision: 79737

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/collections.rst

Modified: python/branches/py3k/Doc/library/collections.rst
==============================================================================
--- python/branches/py3k/Doc/library/collections.rst	(original)
+++ python/branches/py3k/Doc/library/collections.rst	Sun Apr  4 08:53:44 2010
@@ -191,7 +191,7 @@
    .. 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 @@
             >>> 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.