summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-10-06 07:17:52 (GMT)
committerGeorg Brandl <georg@python.org>2013-10-06 07:17:52 (GMT)
commitdcd45552429f42e72299ad6e3e03e01a49577db6 (patch)
treee2e65c4d5bddc841e890b72934b900697e2a9aa2 /Doc/library
parent4f00dc570ca229bc9d966671d3c6091508bd9ff5 (diff)
parentc2b17b2ebae4930c65e3de38a0eb66c8ed1cfc30 (diff)
downloadcpython-dcd45552429f42e72299ad6e3e03e01a49577db6.zip
cpython-dcd45552429f42e72299ad6e3e03e01a49577db6.tar.gz
cpython-dcd45552429f42e72299ad6e3e03e01a49577db6.tar.bz2
merge with 3.3
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/profile.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst
index aefc024..f2453f1 100644
--- a/Doc/library/profile.rst
+++ b/Doc/library/profile.rst
@@ -600,8 +600,8 @@ your results will "less often" show up as negative in profile statistics.
.. _profile-timers:
-Using a customer timer
-======================
+Using a custom timer
+====================
If you want to change how current time is determined (for example, to force use
of wall-clock time or elapsed process time), pass the timing function you want