[Python-checkins] cpython (merge 3.3 -> default): Issue #20460: Merge with 3.3

[zach.ware]

http://hg.python.org/cpython/rev/b56ce3410ca6
changeset:   88863:b56ce3410ca6
parent:      88861:681c86da0664
parent:      88862:7a611b7aae38
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Fri Jan 31 12:06:48 2014 -0600
summary:
  Issue #20460: Merge with 3.3

files:
  Doc/c-api/arg.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst
--- a/Doc/c-api/arg.rst
+++ b/Doc/c-api/arg.rst
@@ -515,7 +515,7 @@
       ``None`` is returned.
 
    ``y`` (:class:`bytes`) [char \*]
-      This converts a C string to a Python :func:`bytes` object.  If the C
+      This converts a C string to a Python :class:`bytes` object.  If the C
       string pointer is *NULL*, ``None`` is returned.
 
    ``y#`` (:class:`bytes`) [char \*, int]

-- 
Repository URL: http://hg.python.org/cpython