aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGnus developers2010-12-11 01:27:14 +0000
committerKatsumi Yamaoka2010-12-11 01:27:14 +0000
commit3b84b005023f866afe3ba2b1e4178f39363aacc4 (patch)
tree5f6c008ed3078c40c694f5efaee5760278226b5b /doc
parent2b7f50d8775c7236b947c2f3e78786c1e2002722 (diff)
downloademacs-3b84b005023f866afe3ba2b1e4178f39363aacc4.tar.gz
emacs-3b84b005023f866afe3ba2b1e4178f39363aacc4.zip
Merge changes made in Gnus trunk.
nnir.el (nnir-request-expire-articles): Only allow article deletion. message.el (message-bogus-recipient-p): Set address to "" if nil. gnus-gravatar.el (gnus-gravatar-transform-address): Fix error when email address is nil. proto-stream.el (proto-stream-open-network-only): New function to have a way to specify non-STARTTLS upgrade connections.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/gnus.texi3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 2df6d90cc07..9f4d1f75ede 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -14445,6 +14445,9 @@ remote system. If both Emacs and the server supports it, the
14445connection will be upgraded to an encrypted @acronym{STARTTLS} 14445connection will be upgraded to an encrypted @acronym{STARTTLS}
14446connection automatically. 14446connection automatically.
14447 14447
14448@item network-only
14449The same as the above, but don't do automatic @acronym{STARTTLS} upgrades.
14450
14448@findex nntp-open-tls-stream 14451@findex nntp-open-tls-stream
14449@item nntp-open-tls-stream 14452@item nntp-open-tls-stream
14450Opens a connection to a server over a @dfn{secure} channel. To use 14453Opens a connection to a server over a @dfn{secure} channel. To use