merge heads

This commit is contained in:
Gregory P. Smith 2012-03-14 15:03:40 -07:00
commit 9439523c22
1 changed files with 2 additions and 2 deletions

View File

@ -794,9 +794,9 @@ My program is too slow. How do I speed it up?
That's a tough one, in general. First, here are a list of things to That's a tough one, in general. First, here are a list of things to
remember before diving further: remember before diving further:
* Performance characteristics vary accross Python implementations. This FAQ * Performance characteristics vary across Python implementations. This FAQ
focusses on :term:`CPython`. focusses on :term:`CPython`.
* Behaviour can vary accross operating systems, especially when talking about * Behaviour can vary across operating systems, especially when talking about
I/O or multi-threading. I/O or multi-threading.
* You should always find the hot spots in your program *before* attempting to * You should always find the hot spots in your program *before* attempting to
optimize any code (see the :mod:`profile` module). optimize any code (see the :mod:`profile` module).