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
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 737ea97..f5a4e6c 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -246,14 +246,15 @@
pair: octal; literals
Numbers are created by numeric literals or as the result of built-in functions
-and operators. Unadorned integer literals (including hex and octal numbers)
-yield plain integers unless the value they denote is too large to be represented
-as a plain integer, in which case they yield a long integer. Integer literals
-with an ``'L'`` or ``'l'`` suffix yield long integers (``'L'`` is preferred
-because ``1l`` looks too much like eleven!). Numeric literals containing a
-decimal point or an exponent sign yield floating point numbers. Appending
-``'j'`` or ``'J'`` to a numeric literal yields a complex number with a zero real
-part. A complex numeric literal is the sum of a real and an imaginary part.
+and operators. Unadorned integer literals (including binary, hex, and octal
+numbers) yield plain integers unless the value they denote is too large to be
+represented as a plain integer, in which case they yield a long integer.
+Integer literals with an ``'L'`` or ``'l'`` suffix yield long integers (``'L'``
+is preferred because ``1l`` looks too much like eleven!). Numeric literals
+containing a decimal point or an exponent sign yield floating point numbers.
+Appending ``'j'`` or ``'J'`` to a numeric literal yields a complex number with a
+zero real part. A complex numeric literal is the sum of a real and an imaginary
+part.
.. index::
single: arithmetic