Merge branch 'master' into next

This commit is contained in:
Dmitrijs Ledkovs
2013-07-10 02:49:52 +01:00
5 changed files with 86 additions and 78 deletions

View File

@ -234,7 +234,7 @@ remoterepository = RemoteExample
# Messages older than maxage days will not be synced, their flags will
# not be changed, they will not be deleted etc. For offlineimap it will
# be like these messages do not exist. This will perform an IMAP search
# in the case of IMAP or Gmail and therefor requires that the server
# in the case of IMAP or Gmail and therefore requires that the server
# support server side searching. This will calculate the earliest day
# that would be included in the search and include all messages from
# that day until today. e.g. maxage = 3 to sync only the last 3 days
@ -292,6 +292,7 @@ type = IMAP
# "getcredentials" that parses a file "filename" and returns the account
# details for "hostname".
# remotehosteval = getcredentials("filename", "hostname", "hostname")
# remoteporteval = getcredentials("filename", "hostname", "port")
# remoteusereval = getcredentials("filename", "hostname", "user")
# remotepasseval = getcredentials("filename", "hostname", "passwd")