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*.
........

diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index c613a41990f87d4abd5c74ea7edfbad60b88060b..3da70ab054a13254550cca28d039dd41a02dbe53 100644 (file)
--- 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])