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

[terry.reedy]

https://hg.python.org/cpython/rev/e19bbbcc43f2
changeset:   100701:e19bbbcc43f2
parent:      100697:3247f8df5514
parent:      100700:226c24fc844a
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Wed Mar 23 13:40:14 2016 -0400
summary:
  Merge heads

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


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -158,7 +158,7 @@
 
    Return the string representing a character whose Unicode code point is the
    integer *i*.  For example, ``chr(97)`` returns the string ``'a'``, while
-   ``chr(957)`` returns the string ``'ν'``. This is the inverse of :func:`ord`.
+   ``chr(8364)`` returns the string ``'€'``. This is the inverse of :func:`ord`.
 
    The valid range for the argument is from 0 through 1,114,111 (0x10FFFF in
    base 16).  :exc:`ValueError` will be raised if *i* is outside that range.

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