merge 3.4 (#10503)

benjaminp · benjaminp · commit 8dfd73a2b429 · 2014-06-07T13:51:51.000-07:00
diff --git 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.
 
