summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-02-23 15:53:25 +0000
committerGeorg Brandl <georg@python.org>2009-02-23 15:53:25 +0000
commit4ae203c610cee21a78407e241ea1249ae2710abd (patch)
tree077478ea962637822976090277faa302599e99ea
parent1ac3f4ec7d7152ab3cec66ea3bfc9655b041ca47 (diff)
downloadcpython-git-4ae203c610cee21a78407e241ea1249ae2710abd.tar.gz
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. ........
-rw-r--r--Doc/library/stdtypes.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 0434ff229f..b4b8ef9e4d 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -795,9 +795,9 @@ string functions based on regular expressions.
.. 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]])