summaryrefslogtreecommitdiffstats
path: root/Doc/faq
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-03-14 21:42:49 (GMT)
committerGeorg Brandl <georg@python.org>2012-03-14 21:42:49 (GMT)
commit30162be9e463df2f9d50dcab14932999e2b5b5fe (patch)
tree294024fbc26c107f8221b2f3abb46df60a416e14 /Doc/faq
parenta74b3aa0cce004bfa8a8be04519667a70d5651b0 (diff)
parent300a69102689088892ba99306d4b2000714c32a3 (diff)
downloadcpython-30162be9e463df2f9d50dcab14932999e2b5b5fe.zip
cpython-30162be9e463df2f9d50dcab14932999e2b5b5fe.tar.gz
cpython-30162be9e463df2f9d50dcab14932999e2b5b5fe.tar.bz2
merge with 3.2
Diffstat (limited to 'Doc/faq')
-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).