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

[martin.v.loewis]

http://hg.python.org/cpython/rev/79deef49082d
changeset:   75914:79deef49082d
parent:      75911:53a2488605e3
parent:      75913:ff679f22682b
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Sat Mar 24 17:40:50 2012 +0100
summary:
  merge 3.2

files:
  Doc/howto/cporting.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/howto/cporting.rst b/Doc/howto/cporting.rst
--- a/Doc/howto/cporting.rst
+++ b/Doc/howto/cporting.rst
@@ -257,7 +257,7 @@
     returns failure.  (Since there's no way to store a name
     in a CObject, noisy failure of :c:func:`PyCapsule_SetName`
     was deemed preferable to silent failure here.  If this is
-    inconveient, feel free to modify your local
+    inconvenient, feel free to modify your local
     copy as you see fit.)
 
 You can find :file:`capsulethunk.h` in the Python source distribution

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