summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2012-03-14 22:03:40 (GMT)
committerGregory P. Smith <greg@krypto.org>2012-03-14 22:03:40 (GMT)
commit9439523c22ebe57a3ba09408d8fb91a6c47f092e (patch)
tree7de5ffc7dfe47cbfc3fe52d8b78192c94f8d1b5f
parent0bca49772165f307d836a834089f62a6de8b2cb9 (diff)
parent300a69102689088892ba99306d4b2000714c32a3 (diff)
downloadcpython-9439523c22ebe57a3ba09408d8fb91a6c47f092e.zip
cpython-9439523c22ebe57a3ba09408d8fb91a6c47f092e.tar.gz
cpython-9439523c22ebe57a3ba09408d8fb91a6c47f092e.tar.bz2
merge heads
-rw-r--r--Doc/faq/programming.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index 5de3676..d33e25b 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -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
remember before diving further:
-* Performance characteristics vary accross Python implementations. This FAQ
+* Performance characteristics vary across Python implementations. This FAQ
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.
* You should always find the hot spots in your program *before* attempting to
optimize any code (see the :mod:`profile` module).