summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-05-22 08:21:45 (GMT)
committerGeorg Brandl <georg@python.org>2010-05-22 08:21:45 (GMT)
commita10d64fba224bbe922ae5297b8c8df1e01ef70c8 (patch)
tree2e95e5dca83e3a7c237d42fea99c7cc29a474e61
parentf5a3eafaac77d897b702f0ae6dbb00b8449141f7 (diff)
downloadcpython-a10d64fba224bbe922ae5297b8c8df1e01ef70c8.zip
cpython-a10d64fba224bbe922ae5297b8c8df1e01ef70c8.tar.gz
cpython-a10d64fba224bbe922ae5297b8c8df1e01ef70c8.tar.bz2
Merged revisions 81463 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81463 | georg.brandl | 2010-05-22 10:17:23 +0200 (Sa, 22 Mai 2010) | 1 line #8785: less confusing description of regex.find*. ........
-rw-r--r--Doc/library/re.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index c613a41..3da70ab 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -727,12 +727,16 @@ Regular Expression Objects
.. method:: RegexObject.findall(string[, pos[, endpos]])
- Identical to the :func:`findall` function, using the compiled pattern.
+ Similar to the :func:`findall` function, using the compiled pattern, but
+ also accepts optional *pos* and *endpos* parameters that limit the search
+ region like for :meth:`match`.
.. method:: RegexObject.finditer(string[, pos[, endpos]])
- Identical to the :func:`finditer` function, using the compiled pattern.
+ Similar to the :func:`finditer` function, using the compiled pattern, but
+ also accepts optional *pos* and *endpos* parameters that limit the search
+ region like for :meth:`match`.
.. method:: RegexObject.sub(repl, string[, count=0])