Merge branch 'netrc-integration'

Applies patches by bboisin to add netrc support

Conflicts:

	offlineimap/repository/IMAP.py

refs #14
This commit is contained in:
John Goerzen
2008-03-03 02:27:13 -06:00
2 changed files with 25 additions and 3 deletions

View File

@ -230,8 +230,10 @@ remoteuser = username
# There are four ways to specify the password for the remote IMAP
# server:
#
# 1. No password at all specified in the config file. You will
# be prompted for the password when OfflineIMAP starts.
# 1. No password at all specified in the config file. If a matching
# entry is found in ~/.netrc (see netrc (5) for information) the
# password from the matching entry will be used. Otherwise you
# will be prompted for the password when OfflineIMAP starts.
#
# 2. The remote password stored in this file with the remotepass
# option. Example: