[Python-checkins] r86627 - in python/branches/release31-maint: Doc/library/stdtypes.rst

[eric.araujo]

Author: eric.araujo
Date: Sun Nov 21 01:43:28 2010
New Revision: 86627

Log:
Merged revisions 86625 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86625 | eric.araujo | 2010-11-21 00:56:22 +0100 (dim., 21 nov. 2010) | 2 lines
  
  Document index and count as part of the Sequence ABC (#9746)
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/stdtypes.rst

Modified: python/branches/release31-maint/Doc/library/stdtypes.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/stdtypes.rst	(original)
+++ python/branches/release31-maint/Doc/library/stdtypes.rst	Sun Nov 21 01:43:28 2010
@@ -711,6 +711,12 @@
 +------------------+--------------------------------+----------+
 | ``max(s)``       | largest item of *s*            |          |
 +------------------+--------------------------------+----------+
+| ``s.index(i)``   | index of the first occurence   |          |
+|                  | of *i* in *s*                  |          |
++------------------+--------------------------------+----------+
+| ``s.count(i)``   | total number of occurences of  |          |
+|                  | *i* in *s*                     |          |
++------------------+--------------------------------+----------+
 
 Sequence types also support comparisons.  In particular, tuples and lists are
 compared lexicographically by comparing corresponding elements.  This means that