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.
........
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 @@
.. 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 @@
: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)