(Customizing the IMAP Connection): Note the new defaults.

(Direct Functions): Note the STARTTLS upgrade.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index a5c93e6..17d99f5 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-28  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus.texi (Customizing the IMAP Connection): Note the new defaults.
+       (Direct Functions): Note the STARTTLS upgrade.
+
 2010-11-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Server Commands): Document gnus-server-show-server.

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 1eef221..20d12a9 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -14453,7 +14453,9 @@ functions is also affected by commonly understood variables
 @findex nntp-open-network-stream
 @item nntp-open-network-stream
 This is the default, and simply connects to some port or other on the
-remote system.
+remote system.  If both Emacs and the server supports it, the
+connection will be upgraded to an encrypted @acronym{STARTTLS}
+connection automatically.
 
 @findex nntp-open-tls-stream
 @item nntp-open-tls-stream
@@ -14887,12 +14889,17 @@ typical port would be @code{"imap"} or @code{"imaps"}.
 How @code{nnimap} should connect to the server.  Possible values are:
 
 @table @code
+@item undecided
+This is the default, and this first tries the @code{ssl} setting, and
+then tries the @code{network} setting.
+
 @item ssl
-This is the default, and this uses standard
-@acronym{TLS}/@acronym{SSL} connection.
+This uses standard @acronym{TLS}/@acronym{SSL} connections.
 
 @item network
-Non-encrypted and unsafe straight socket connection.
+Non-encrypted and unsafe straight socket connection, but will upgrade
+to encrypted @acronym{STARTTLS} if both Emacs and the server
+supports it.
 
 @item starttls
 Encrypted @acronym{STARTTLS} over the normal @acronym{IMAP} port.