diff options
| author | Georg Brandl <georg@python.org> | 2010-10-06 08:56:53 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-10-06 08:56:53 (GMT) |
| commit | 4b05466e25b686fed9084452e88e7a8b7728a843 (patch) | |
| tree | 6119674ce9a9904c8ecd0f8de2b3e9a9214e467d /Doc/c-api | |
| parent | 57a5e3f0e288b70267297511f5af2c92721d7e2d (diff) | |
| download | cpython-4b05466e25b686fed9084452e88e7a8b7728a843.zip cpython-4b05466e25b686fed9084452e88e7a8b7728a843.tar.gz cpython-4b05466e25b686fed9084452e88e7a8b7728a843.tar.bz2 | |
Merged revisions 84945 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r84945 | georg.brandl | 2010-09-21 16:48:28 +0200 (Di, 21 Sep 2010) | 1 line
#9911: doc copyedits.
........
Diffstat (limited to 'Doc/c-api')
| -rw-r--r-- | Doc/c-api/arg.rst | 2 | ||||
| -rw-r--r-- | Doc/c-api/unicode.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst index 7ebd283..b5e51f6 100644 --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -65,7 +65,7 @@ Unless otherwise stated, buffers are not NUL-terminated. .. note:: This format does not accept bytes-like objects. If you want to accept filesystem paths and convert them to C character strings, it is - preferrable to use the ``O&`` format with :cfunc:`PyUnicode_FSConverter` + preferable to use the ``O&`` format with :cfunc:`PyUnicode_FSConverter` as *converter*. ``s*`` (:class:`str`, :class:`bytes`, :class:`bytearray` or buffer compatible object) [Py_buffer] diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst index 014571e..14d1c27 100644 --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -358,7 +358,7 @@ To encode and decode file names and other environment strings, :cdata:`Py_FileSystemEncoding` should be used as the encoding, and ``"surrogateescape"`` should be used as the error handler (:pep:`383`). To encode file names during argument parsing, the ``"O&"`` converter should be -used, passsing :func:`PyUnicode_FSConverter` as the conversion function: +used, passing :cfunc:`PyUnicode_FSConverter` as the conversion function: .. cfunction:: int PyUnicode_FSConverter(PyObject* obj, void* result) |