diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-02-26 03:38:59 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-02-26 03:38:59 (GMT) |
| commit | ad3d5c2235743f23db54fb5ef2c337a0e21c9548 (patch) | |
| tree | 9814660def28b76dc923a39d292588cb2fd9b9fb /Doc/c-api | |
| parent | 40ce6cc06688e8527180eeee342005e5912d4eb2 (diff) | |
| download | cpython-ad3d5c2235743f23db54fb5ef2c337a0e21c9548.zip cpython-ad3d5c2235743f23db54fb5ef2c337a0e21c9548.tar.gz cpython-ad3d5c2235743f23db54fb5ef2c337a0e21c9548.tar.bz2 | |
Merged revisions 69803-69805,69840,69901,69905,69907,69924,69927,69987 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69803 | georg.brandl | 2009-02-20 01:48:21 -0600 (Fri, 20 Feb 2009) | 1 line
#5327: fix a broken link by joining it.
........
r69804 | georg.brandl | 2009-02-20 02:22:21 -0600 (Fri, 20 Feb 2009) | 1 line
At least separate imports from other statements.
........
r69805 | georg.brandl | 2009-02-20 02:45:47 -0600 (Fri, 20 Feb 2009) | 2 lines
Fix punctuation.
........
r69840 | georg.brandl | 2009-02-21 13:09:40 -0600 (Sat, 21 Feb 2009) | 1 line
#5338, #5339: two types in the API manual.
........
r69901 | georg.brandl | 2009-02-23 05:24:46 -0600 (Mon, 23 Feb 2009) | 2 lines
#5349: C++ pure virtuals can also have an implementation.
........
r69905 | georg.brandl | 2009-02-23 09:51:27 -0600 (Mon, 23 Feb 2009) | 2 lines
#5352: str.count() counts non-overlapping instances.
........
r69907 | georg.brandl | 2009-02-23 12:33:48 -0600 (Mon, 23 Feb 2009) | 1 line
Fix grammar.
........
r69924 | benjamin.peterson | 2009-02-23 20:45:35 -0600 (Mon, 23 Feb 2009) | 1 line
update README on running tests
........
r69927 | neil.schemenauer | 2009-02-23 22:23:25 -0600 (Mon, 23 Feb 2009) | 1 line
Fix call to os.waitpid, it does not take keyword args.
........
r69987 | benjamin.peterson | 2009-02-25 18:30:11 -0600 (Wed, 25 Feb 2009) | 1 line
fix str.format()'s first arg #5371
........
Diffstat (limited to 'Doc/c-api')
| -rw-r--r-- | Doc/c-api/intro.rst | 2 | ||||
| -rw-r--r-- | Doc/c-api/veryhigh.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/c-api/intro.rst b/Doc/c-api/intro.rst index 33e6060..65dbcd7 100644 --- a/Doc/c-api/intro.rst +++ b/Doc/c-api/intro.rst @@ -187,7 +187,7 @@ caller is said to receive a *new* reference. When no ownership is transferred, the caller is said to *borrow* the reference. Nothing needs to be done for a borrowed reference. -Conversely, when a calling function passes it a reference to an object, there +Conversely, when a calling function passes in a reference to an object, there are two possibilities: the function *steals* a reference to the object, or it does not. *Stealing a reference* means that when you pass a reference to a function, that function assumes that it now owns that reference, and you are not diff --git a/Doc/c-api/veryhigh.rst b/Doc/c-api/veryhigh.rst index 2378c76..62281aa 100644 --- a/Doc/c-api/veryhigh.rst +++ b/Doc/c-api/veryhigh.rst @@ -16,7 +16,7 @@ parameter. The available start symbols are :const:`Py_eval_input`, :const:`Py_file_input`, and :const:`Py_single_input`. These are described following the functions which accept them as parameters. -Note also that several of these functions take :ctype:`FILE\*` parameters. On +Note also that several of these functions take :ctype:`FILE\*` parameters. One particular issue which needs to be handled carefully is that the :ctype:`FILE` structure for different C libraries can be different and incompatible. Under Windows (at least), it is possible for dynamically linked extensions to actually |