[Python-checkins] cpython (merge 3.5 -> default): Issue #21593: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/243b95782059
changeset:   101791:243b95782059
parent:      101789:de5e1eb4a88d
parent:      101790:48bb48e7499d
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Wed Jun 08 14:57:24 2016 +0300
summary:
  Issue #21593: Merge from 3.5

files:
  Doc/library/re.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -811,8 +811,8 @@
 
 .. method:: regex.search(string[, pos[, endpos]])
 
-   Scan through *string* looking for a location where this regular expression
-   produces a match, and return a corresponding :ref:`match object
+   Scan through *string* looking for the first location where this regular
+   expression produces a match, and return a corresponding :ref:`match object
    <match-objects>`.  Return ``None`` if no position in the string matches the
    pattern; note that this is different from finding a zero-length match at some
    point in the string.

-- 
Repository URL: https://hg.python.org/cpython