summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-05-28 22:29:56 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-05-28 22:29:56 (GMT)
commitc5069e00705a499c2db37deb5d0eefae791d39ea (patch)
treeb1510d869e20dd304ba9b48ccb2c575682f05f15 /Doc/library
parentb5096f739b0acde489826d1ca5c18cb22fa51ed2 (diff)
parent456ae893d7a0b40a5346cbba7771127aca2113e9 (diff)
downloadcpython-c5069e00705a499c2db37deb5d0eefae791d39ea.zip
cpython-c5069e00705a499c2db37deb5d0eefae791d39ea.tar.gz
cpython-c5069e00705a499c2db37deb5d0eefae791d39ea.tar.bz2
Merge doc touch-ups and fixes for #9831 and #9223 from 3.1
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])