[Python-checkins] cpython (merge 3.2 -> 3.2): merge heads

[gregory.p.smith]

http://hg.python.org/cpython/rev/6c70d8e8b7a9
changeset:   75656:6c70d8e8b7a9
branch:      3.2
parent:      75653:e3c5416989e1
parent:      75647:0092ab03fdd5
user:        Gregory P. Smith <greg at krypto.org>
date:        Wed Mar 14 15:03:40 2012 -0700
summary:
  merge heads

files:
  Doc/faq/programming.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -794,9 +794,9 @@
 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).

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