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

[georg.brandl]

Author: georg.brandl
Date: Mon Feb 23 16:53:25 2009
New Revision: 69906

Log:
Merged revisions 69905 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69905 | georg.brandl | 2009-02-23 16:51:27 +0100 (Mo, 23 Feb 2009) | 2 lines
  
  #5352: str.count() counts non-overlapping instances.
........


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

Modified: python/branches/release26-maint/Doc/library/stdtypes.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/stdtypes.rst	(original)
+++ python/branches/release26-maint/Doc/library/stdtypes.rst	Mon Feb 23 16:53:25 2009
@@ -795,9 +795,9 @@
 
 .. method:: str.count(sub[, start[, end]])
 
-   Return the number of occurrences of substring *sub* in the range [*start*,
-   *end*].  Optional arguments *start* and *end* are interpreted as in slice
-   notation.
+   Return the number of non-overlapping occurrences of substring *sub* in the
+   range [*start*, *end*].  Optional arguments *start* and *end* are
+   interpreted as in slice notation.
 
 
 .. method:: str.decode([encoding[, errors]])