summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-06-07 20:51:51 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-06-07 20:51:51 (GMT)
commit8dfd73a2b42917b07698f446e20ab296fdfe0ef2 (patch)
treeb40b3e16c65cb5dd4857f90432efb95d2acb646c
parent33919e8423784fa0172a0ce2d82ce1248be301bd (diff)
parent4bb09c843240afd0c3f3d502f411c01e585ad08d (diff)
downloadcpython-8dfd73a2b42917b07698f446e20ab296fdfe0ef2.zip
cpython-8dfd73a2b42917b07698f446e20ab296fdfe0ef2.tar.gz
cpython-8dfd73a2b42917b07698f446e20ab296fdfe0ef2.tar.bz2
merge 3.4 (#10503)
-rw-r--r--Doc/library/os.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 54b2542..2de4888 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -379,7 +379,7 @@ process and user.
.. index:: single: user; id
- Return the current process's user id.
+ Return the current process's real user id.
Availability: Unix.