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

[sandro.tosi]

http://hg.python.org/cpython/rev/79764f08ffd4
changeset:   71839:79764f08ffd4
parent:      71835:d403eaec64df
parent:      71838:aa6c073c2597
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Fri Aug 12 19:31:56 2011 +0200
summary:
  merge with 3.2

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


diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -649,7 +649,7 @@
 
    .. note::
 
-      A *character* means a C character (an ASCII code), rather then a Python
+      A *character* means a C character (an ASCII code), rather than a Python
       character (a string of length 1). (This note is true whenever the
       documentation mentions a character.) The built-in :func:`ord` is handy for
       conveying strings to codes.

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