From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 26 May 2008 14:02:09 +0000 (+0000)
Subject: note that PyString and has been aliased to PyBytes
X-Git-Tag: v2.6b1~240
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=404d182bbabdd4ca4a57288ef67aa40b4cddd992;p=thirdparty%2FPython%2Fcpython.git

note that PyString and has been aliased to PyBytes
---

diff --git a/Doc/c-api/string.rst b/Doc/c-api/string.rst
index d0379c9821e2..f2e543cce383 100644
--- a/Doc/c-api/string.rst
+++ b/Doc/c-api/string.rst
@@ -2,12 +2,16 @@
 
 .. _stringobjects:
 
-String Objects
---------------
+String/Bytes Objects
+--------------------
 
 These functions raise :exc:`TypeError` when expecting a string parameter and are
 called with a non-string parameter.
 
+.. note::
+   These functions have been renamed to PyBytes_* in Python 3.x. The PyBytes
+   names are also available in 2.6.
+
 .. index:: object: string