[PATCH 4/4] update nnimap documentation for gssapi connections

[Jochen Hein <jochen@jochen.org>]

       * doc/misc/gnus.texi: update nnimap docs for gssapi.
---
 doc/misc/gnus.texi | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index fa7cd09..a22ee3e 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -14237,7 +14237,7 @@ Customizing the IMAP Connection
 This is the default, and this first tries the @code{ssl} setting, and
 then tries the @code{network} setting.
 
-@item ssl
+@item ssl or tls
 This uses standard @acronym{TLS}/@acronym{SSL} connections.
 
 @item network
@@ -14257,6 +14257,11 @@ Customizing the IMAP Connection
 Non-encrypted and unsafe straight socket connection.
 @acronym{STARTTLS} will not be used even if it is available.
 
+@item gssapi
+Connect with GSSAPI by using the commands @code{gsasl} or
+@code{imtest}.  The commands can be customized by changing
+@code{gssapi-program}.
+
 @end table
 
 @item nnimap-authenticator
@@ -14981,14 +14986,15 @@ Mail Source Specifiers
 @item :stream
 What stream to use for connecting to the server, this is one of the
 symbols in @code{imap-stream-alist}.  Right now, this means
-@samp{gssapi}, @samp{kerberos4}, @samp{starttls}, @samp{tls},
-@samp{ssl}, @samp{shell} or the default @samp{network}.
-
-@item :authentication
-Which authenticator to use for authenticating to the server, this is
-one of the symbols in @code{imap-authenticator-alist}.  Right now,
-this means @samp{gssapi}, @samp{kerberos4}, @samp{digest-md5},
-@samp{cram-md5}, @samp{anonymous} or the default @samp{login}.
+@samp{undecided}, @samp{gssapi}, @samp{starttls}, @samp{tls},
+@samp{ssl}, @samp{shell}, @samp{plain} or the default @samp{network}.
+If the value is @samp{undecided}, nnimap tries @samp{ssl} first, then falls
+back on @samp{network}.
+
+@item :authenticator
+Which authenticator to use for authenticating to the server.  Right now,
+this means @samp{anonymous}, @samp{login}, @samp{plain},
+@samp{cram-md5}, or the default @samp{nil}.
 
 @item :program
 When using the @samp{shell} :stream, the contents of this variable is
-- 
2.1.4