diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-08-31 01:06:00 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-08-31 01:06:00 (GMT) |
| commit | c187f15bb7bf23ee7e731f71ae1d9ba4e317364e (patch) | |
| tree | b248c2c7c0a9081027ab6f34cde60edf5dac450c /Doc/library/os.rst | |
| parent | b10be1550850f82e3dc716b8bf2dea4a85c963d7 (diff) | |
| parent | e218bcbf3936b5fb8124d22ecc7c0d2e92a8886b (diff) | |
| download | cpython-c187f15bb7bf23ee7e731f71ae1d9ba4e317364e.zip cpython-c187f15bb7bf23ee7e731f71ae1d9ba4e317364e.tar.gz cpython-c187f15bb7bf23ee7e731f71ae1d9ba4e317364e.tar.bz2 | |
merge 3.4 (closes #22307)
Diffstat (limited to 'Doc/library/os.rst')
| -rw-r--r-- | Doc/library/os.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index bf3a8d5..f3e7b5d 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -282,10 +282,10 @@ process and user. .. 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. |