summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2012-03-24 16:40:50 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2012-03-24 16:40:50 (GMT)
commitecc92db031bd0df9ac294860e61a20dcfc226461 (patch)
treea3cb457cd21a0d2d69de3f76decc69ee626c1cbd
parent55bce63ea0b6da28a71d4a014bf58b39b91b4e3c (diff)
parent2dee394af9a021c905c91a550d3201115b16dfee (diff)
downloadcpython-ecc92db031bd0df9ac294860e61a20dcfc226461.zip
cpython-ecc92db031bd0df9ac294860e61a20dcfc226461.tar.gz
cpython-ecc92db031bd0df9ac294860e61a20dcfc226461.tar.bz2
merge 3.2
-rw-r--r--Doc/howto/cporting.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/howto/cporting.rst b/Doc/howto/cporting.rst
index bea2153..6dd0765 100644
--- a/Doc/howto/cporting.rst
+++ b/Doc/howto/cporting.rst
@@ -257,7 +257,7 @@ behave slightly differently from real Capsules. Specifically:
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