[Python-checkins] cpython (merge 3.2 -> default): #14283: merge with 3.2

Wed Mar 14 08:07:45 CET 2012

http://hg.python.org/cpython/rev/3ffa1b88e9f6
changeset: 75624:3ffa1b88e9f6
parent: 75622:f5dcb2d58893
parent: 75623:544ed2cfb097
user: Georg Brandl <georg at python.org>
date: Wed Mar 14 08:07:29 2012 +0100
summary:
 #14283: merge with 3.2
files:
 Doc/library/re.rst | 9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -947,16 +947,15 @@
 .. attribute:: match.pos
 
 The value of *pos* which was passed to the :meth:`~regex.search` or
- :meth:`~regex.match` method of a :ref:`match object <match-objects>`. This
- is the index into the string at which the RE engine started looking for a
- match.
+ :meth:`~regex.match` method of a :ref:`regex object <re-objects>`. This is
+ the index into the string at which the RE engine started looking for a match.
 
 
 .. attribute:: match.endpos
 
 The value of *endpos* which was passed to the :meth:`~regex.search` or
- :meth:`~regex.match` method of a :ref:`match object <match-objects>`. This
- is the index into the string beyond which the RE engine will not go.
+ :meth:`~regex.match` method of a :ref:`regex object <re-objects>`. This is
+ the index into the string beyond which the RE engine will not go.
 
 
 .. attribute:: match.lastindex
-- 
Repository URL: http://hg.python.org/cpython
