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

[benjamin.peterson]

https://hg.python.org/cpython/rev/61daa699692b
changeset:   93961:61daa699692b
parent:      93959:c5603b77df68
parent:      93960:181dfe9288d4
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Dec 24 16:07:19 2014 -0600
summary:
  merge 3.4

files:
  Doc/howto/unicode.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -35,8 +35,8 @@
    PRINT "MISE A JOUR TERMINEE"
    PRINT "PARAMETRES ENREGISTRES"
 
-Those messages should contain accents (completé, caractère, accepté),
-and they just look wrong to someone who can read French.
+Those messages should contain accents (terminée, paramètre, enregistrés) and
+they just look wrong to someone who can read French.
 
 In the 1980s, almost all personal computers were 8-bit, meaning that bytes could
 hold values ranging from 0 to 255.  ASCII codes only went up to 127, so some

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