merge 3.4 (#10503)

2014-06-07 13:51:51 -07:00 · 2014-06-07 13:51:51 -07:00 · 8dfd73a2b4
parent 33919e8423 4bb09c8432
commit 8dfd73a2b4
1 changed files with 1 additions and 1 deletions
--- 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.