summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2011-08-19 20:55:24 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2011-08-19 20:55:24 (GMT)
commit5f4ea28f4979523c94446121e8057b68d4119ee4 (patch)
tree636f89c4c95e4dc349ebaf3558cb44657d33d0fb
parent107d65d1448e9f526469bb306204260dc83f49a7 (diff)
parent6a633bb87837fb8da42f6ba81e9fa86fdab61a5a (diff)
downloadcpython-5f4ea28f4979523c94446121e8057b68d4119ee4.zip
cpython-5f4ea28f4979523c94446121e8057b68d4119ee4.tar.gz
cpython-5f4ea28f4979523c94446121e8057b68d4119ee4.tar.bz2
merge with 3.2
-rw-r--r--Doc/library/re.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 606825c..412e6ee 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -635,7 +635,7 @@ form.
of *pattern* in *string* by the replacement *repl*. If the pattern isn't found,
*string* is returned unchanged. *repl* can be a string or a function; if it is
a string, any backslash escapes in it are processed. That is, ``\n`` is
- converted to a single newline character, ``\r`` is converted to a linefeed, and
+ converted to a single newline character, ``\r`` is converted to a carriage return, and
so forth. Unknown escapes such as ``\j`` are left alone. Backreferences, such
as ``\6``, are replaced with the substring matched by group 6 in the pattern.
For example: