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

[ezio.melotti]

http://hg.python.org/cpython/rev/5fd1ac1c9474
changeset:   69107:5fd1ac1c9474
branch:      3.2
parent:      69093:7aa3f1f7ac94
parent:      69106:821244a44163
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Apr 03 16:24:22 2011 +0300
summary:
  Merge with 3.1

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


diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst
--- a/Doc/library/profile.rst
+++ b/Doc/library/profile.rst
@@ -50,7 +50,7 @@
 
    The profiler modules are designed to provide an execution profile for a given
    program, not for benchmarking purposes (for that, there is :mod:`timeit` for
-   resonably accurate results).  This particularly applies to benchmarking
+   reasonably accurate results).  This particularly applies to benchmarking
    Python code against C code: the profilers introduce overhead for Python code,
    but not for C-level functions, and so the C code would seem faster than any
    Python one.

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