diff -r bd3447481d70 Doc/library/getpass.rst --- a/Doc/library/getpass.rst Wed Jun 01 16:18:00 2011 -0700 +++ b/Doc/library/getpass.rst Thu Jun 02 08:47:52 2011 -0700 @@ -22,8 +22,6 @@ The :mod:`getpass` module provides two f a warning message to *stream* and reading from ``sys.stdin`` and issuing a :exc:`GetPassWarning`. - Availability: Macintosh, Unix, Windows. - .. note:: If you call getpass from within IDLE, the input may be done in the terminal you launched IDLE from rather than the idle window itself. @@ -35,7 +33,7 @@ The :mod:`getpass` module provides two f .. function:: getuser() - Return the "login name" of the user. Availability: Unix, Windows. + Return the "login name" of the user. This function checks the environment variables :envvar:`LOGNAME`, :envvar:`USER`, :envvar:`LNAME` and :envvar:`USERNAME`, in order, and returns