http://hg.python.org/cpython/rev/164a17eca081 changeset: 92276:164a17eca081 parent: 92272:d0d4ab0ba70e parent: 92275:c30163548f64 user: Benjamin Peterson <benjamin@python.org> date: Sat Aug 30 21:06:00 2014 -0400 summary: merge 3.4 (closes #22307) files: Doc/library/os.rst | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -282,10 +282,10 @@ .. function:: getlogin() Return the name of the user logged in on the controlling terminal of the - process. For most purposes, it is more useful to use the environment variables - :envvar:`LOGNAME` or :envvar:`USERNAME` to find out who the user is, or - ``pwd.getpwuid(os.getuid())[0]`` to get the login name of the currently - effective user id. + process. For most purposes, it is more useful to use the environment + variables :envvar:`LOGNAME` or :envvar:`USERNAME` to find out who the user + is, or ``pwd.getpwuid(os.getuid())[0]`` to get the login name of the current + real user id. Availability: Unix, Windows. -- Repository URL: http://hg.python.org/cpython