Version to 5.99.9

[offlineimap] / offlineimap.conf

diff --git a/offlineimap.conf b/offlineimap.conf
index 43cabafc4ad8e075665e1159e12784dd6bd1054f..e7b80a88c27241d15e0296ac817f4aefeec9fa1d 100644 (file)
--- a/offlineimap.conf
+++ b/offlineimap.conf
@@ -227,11 +227,13 @@ ssl = yes
 # Specify the remote user name.
 remoteuser = username
 
-# There are four ways to specify the password for the remote IMAP
+# There are five ways to give 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:
@@ -253,6 +255,10 @@ remoteuser = username
 #
 # preauthtunnel = ssh -q imaphost '/usr/bin/imapd ./Maildir'
 #
+# 5. If you are using Kerberos and have the Python Kerberos package installed,
+# you should not specify a remotepass.  If the user has a valid
+# Kerberos TGT, OfflineIMAP will figure out the rest all by itself, and
+# fall back to password authentication if needed.
 
 ########## Advanced settings