summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-05-29 16:05:53 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-05-29 16:05:53 (GMT)
commit4b8f6651f017cc380a13e095aae3bb2a1255b758 (patch)
tree103ccedc5a260af2f65889ce711ebfad6987eba5 /Doc/library
parent67473810075aa085a2b5a8f61b33af97e158bc96 (diff)
parentf0ab5d6e7f46ec8d06d2a62db0e316cd7443238f (diff)
downloadcpython-4b8f6651f017cc380a13e095aae3bb2a1255b758.zip
cpython-4b8f6651f017cc380a13e095aae3bb2a1255b758.tar.gz
cpython-4b8f6651f017cc380a13e095aae3bb2a1255b758.tar.bz2
Branch merge
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/functions.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 8b7eef5..134c19c 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -580,7 +580,7 @@ are always available. They are listed here in alphabetical order.
Two objects with non-overlapping lifetimes may have the same :func:`id`
value.
- .. impl-detail:: This is the address of the object.
+ .. impl-detail:: This is the address of the object in memory.
.. function:: input([prompt])