Merged revisions 67060-67061 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67060 | benjamin.peterson | 2008-10-30 17:39:25 -0500 (Thu, 30 Oct 2008) | 1 line
backport bin() documentation
........
r67061 | benjamin.peterson | 2008-10-30 17:44:18 -0500 (Thu, 30 Oct 2008) | 1 line
finish backporting binary literals and new octal literals docs
........
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 487fadf..c135651 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -112,6 +112,15 @@
.. versionadded:: 2.3
+.. function:: bin(x)
+
+ Convert an integer number to a binary string. The result is a valid Python
+ expression. If *x* is not a Python :class:`int` object, it has to define an
+ :meth:`__index__` method that returns an integer.
+
+ .. versionadded:: 2.6
+
+
.. function:: bool([x])
Convert a value to a Boolean, using the standard truth testing procedure. If