summaryrefslogtreecommitdiffstats
path: root/Doc/c-api
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-08-13 07:56:35 (GMT)
committerGeorg Brandl <georg@python.org>2009-08-13 07:56:35 (GMT)
commit1b5ab457f2d5541657d3bb618478853e2001eeb8 (patch)
tree3fd9225624a42c6e4ef764c8f3f8e218f61782f7 /Doc/c-api
parentd07ac6402422abbc54215478e042bbb009148cf9 (diff)
downloadcpython-1b5ab457f2d5541657d3bb618478853e2001eeb8.zip
cpython-1b5ab457f2d5541657d3bb618478853e2001eeb8.tar.gz
cpython-1b5ab457f2d5541657d3bb618478853e2001eeb8.tar.bz2
Merged revisions 74328,74332-74333,74365 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74328 | georg.brandl | 2009-08-06 17:06:25 +0200 (Do, 06 Aug 2009) | 1 line Fix base keyword arg name for int() and long(). ........ r74332 | georg.brandl | 2009-08-06 19:23:21 +0200 (Do, 06 Aug 2009) | 1 line Fix punctuation and one copy-paste error. ........ r74333 | georg.brandl | 2009-08-06 19:43:55 +0200 (Do, 06 Aug 2009) | 1 line #6658: fix two typos. ........ r74365 | georg.brandl | 2009-08-13 09:48:05 +0200 (Do, 13 Aug 2009) | 1 line #6679: Remove mention that sub supports no flags. ........
Diffstat (limited to 'Doc/c-api')
-rw-r--r--Doc/c-api/buffer.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
index 6ad4f7b..97adb07 100644
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -144,7 +144,7 @@ Buffer related functions
kind of buffer the caller is prepared to deal with and therefore what
kind of buffer the exporter is allowed to return. The buffer interface
allows for complicated memory sharing possibilities, but some caller may
- not be able to handle all the complexibity but may want to see if the
+ not be able to handle all the complexity but may want to see if the
exporter will let them take a simpler view to its memory.
Some exporters may not be able to share memory in every possible way and