[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#10503)

[benjamin.peterson]

http://hg.python.org/cpython/rev/8866ac6f2269
changeset:   91069:8866ac6f2269
parent:      91066:171e8f6c814c
parent:      91067:19172062e5c0
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Jun 07 13:51:51 2014 -0700
summary:
  merge 3.4 (#10503)

files:
  Doc/library/os.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -379,7 +379,7 @@
 
    .. index:: single: user; id
 
-   Return the current process's user id.
+   Return the current process's real user id.
 
    Availability: Unix.
 

-- 
Repository URL: http://hg.python.org/cpython