merge 3.4 (#10503)

8dfd73a2 · Benjamin Peterson · 33919e84 · 4bb09c84 · 8dfd73a2
Commit 8dfd73a2 authored Jun 07, 2014 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Doc/library/os.rst Doc/library/os.rst +1 -1

No files found.
--- 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.