Merge changes made in Gnus master

nnimap.el (nnimap-authenticator): Expand to allow specifying the
  login methods.
  (nnimap-login): Respect the `nnimap-authenticator' variable.
gnus-sum.el (gnus-summary-push-marks-to-backend): Push the complete
  mark state when moving articles.  Otherwise unticked articles will get
  their ticks back after moving.
gnus.texi (Customizing the IMAP Connection): Mention the other
  authenticators.

2 files changed, 10 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 18db253a714..9b58992d2d9 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Customizing the IMAP Connection): Mention the other
+        authenticators.
+
 2012-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Browse Foreign Server): Document
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index a41a2023a45..2cb3514dc60 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -14208,7 +14208,11 @@ what you need.
 
 @item nnimap-authenticator
 Some @acronym{IMAP} servers allow anonymous logins.  In that case,
-this should be set to @code{anonymous}.
+this should be set to @code{anonymous}.  If this variable isn't set,
+the normal login methods will be used.  If you wish to specify a
+specific login method to be used, you can set this variable to either
+@code{login} (the traditional @acronym{IMAP} login method),
+@code{plain} or @code{cram-md5}.
 
 @item nnimap-expunge
 If non-@code{nil}, expunge articles after deleting them.  This is always done