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

[georg.brandl]

https://hg.python.org/cpython/rev/43d35574d61e
changeset:   93193:43d35574d61e
parent:      93191:0eec6943b3bd
parent:      93192:4ad8b11ca309
user:        Georg Brandl <georg at python.org>
date:        Tue Oct 28 21:41:58 2014 +0100
summary:
  merge with 3.4

files:
  Doc/library/re.rst |  15 ++++++++-------
  1 files changed, 8 insertions(+), 7 deletions(-)


diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -38,13 +38,6 @@
 that don't require you to compile a regex object first, but miss some
 fine-tuning parameters.
 
-.. seealso::
-
-   Mastering Regular Expressions
-      Book on regular expressions by Jeffrey Friedl, published by O'Reilly.  The
-      second edition of the book no longer covers Python at all, but the first
-      edition covered writing good regular expression patterns in great detail.
-
 
 .. _re-syntax:
 
@@ -443,6 +436,14 @@
    The ``'\u'`` and ``'\U'`` escape sequences have been added.
 
 
+.. seealso::
+
+   Mastering Regular Expressions
+      Book on regular expressions by Jeffrey Friedl, published by O'Reilly.  The
+      second edition of the book no longer covers Python at all, but the first
+      edition covered writing good regular expression patterns in great detail.
+
+
 
 .. _contents-of-module-re:
 

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