Merged revisions 80562 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80562 | benjamin.peterson | 2010-04-27 17:58:50 -0500 (Tue, 27 Apr 2010) | 9 lines

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

  ........
    r80561 | benjamin.peterson | 2010-04-27 17:56:31 -0500 (Tue, 27 Apr 2010) | 1 line

    make slice notation in (r)find docs consistent
  ........
................

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 128fd032c999376d0d174d0ebbecc672cb99e6c4..3b6851c6d1eab5a1e17d5c9f1af100b456a03a7e 100644 (file)
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -847,10 +847,10 @@ functions based on regular expressions.
 
 .. method:: str.find(sub[, start[, end]])
 
-   Return the lowest index in the string where substring *sub* is found, such that
-   *sub* is contained in the range [*start*, *end*].  Optional arguments *start*
-   and *end* are interpreted as in slice notation.  Return ``-1`` if *sub* is not
-   found.
+   Return the lowest index in the string where substring *sub* is found, such
+   that *sub* is contained in the slice ``s[start:end]``.  Optional arguments
+   *start* and *end* are interpreted as in slice notation.  Return ``-1`` if
+   *sub* is not found.
 
 
 .. method:: str.format(*args, **kwargs)
@@ -1017,9 +1017,9 @@ functions based on regular expressions.
 
 .. method:: str.rfind(sub[, start[, end]])
 
-   Return the highest index in the string where substring *sub* is found, such that
-   *sub* is contained within s[start,end].  Optional arguments *start* and *end*
-   are interpreted as in slice notation.  Return ``-1`` on failure.
+   Return the highest index in the string where substring *sub* is found, such
+   that *sub* is contained within ``s[start:end]``.  Optional arguments *start*
+   and *end* are interpreted as in slice notation.  Return ``-1`` on failure.
 
 
 .. method:: str.rindex(sub[, start[, end]])