[Python-checkins] cpython (merge default -> default): merge

[christian.heimes]

http://hg.python.org/cpython/rev/88272c8f233e
changeset:   87714:88272c8f233e
parent:      87713:23001d915b39
parent:      87712:93e75bbd3ab8
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Dec 02 20:02:04 2013 +0100
summary:
  merge

files:
  Doc/library/re.rst   |  2 +-
  Doc/whatsnew/3.4.rst |  2 +-
  2 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
@@ -801,7 +801,7 @@
    >>> pattern.fullmatch("dog")      # No match as "o" is not at the start of "dog".
    >>> pattern.fullmatch("ogre")     # No match as not the full string matches.
    >>> pattern.fullmatch("doggie", 1, 3)   # Matches within given limits.
-   <_sre.SRE_Match object at ...>
+   <_sre.SRE_Match object; span=(1, 3), match='og'>
 
    .. versionadded:: 3.4
 
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -742,7 +742,7 @@
   cert store.
 
 (Contributed by Christian Heimes in :issue:`18143`, :issue:`18147` and
- :issue:`17134`.)
+:issue:`17134`.)
 
 Support for server-side SNI using the new
 :meth:`ssl.SSLContext.set_servername_callback` method.

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