diff options
| author | Gnus developers <ding@gnus.org> | 2010-09-26 14:35:50 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-09-26 14:35:50 +0000 |
| commit | 2696d88f195c0888432f03fb455fdcf273c295c2 (patch) | |
| tree | 34fc731d72e77f3ab9247315c3ee6a1af7b54d24 /doc | |
| parent | 1821a7b49194ddf558746de5cf67bdc9217e9ebd (diff) | |
| download | emacs-2696d88f195c0888432f03fb455fdcf273c295c2.tar.gz | |
Merge changes made in Gnus trunk.
gnus-picon.el (gnus-picon-create-glyph): Set the background XPM colour explicitly.
message.el (message-cite-prefix-regexp): Remove } from the cite prefix.
gnus-win.el (gnus-window-to-buffer-helper, gnus-all-windows-visible-p): Function needn't be a symbol.
mail-source.el (mail-source-value): Function needn't be a symbol.
tls.el (open-tls-stream): Don't query killing process.
gnus-win.el: Revert previous patch, since it made Gnus backtrace.
nnimap.el: Look up IMAP credentials based on both the virtual and physical server names.
mail-source.el (mail-source-value): Revert previous patch.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/gnus.texi | 4 | ||||
| -rw-r--r-- | doc/misc/message.texi | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 46a7d8fd7ef..1914fb0bc74 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -27333,9 +27333,7 @@ The revised Gnus @acronym{FAQ} is included in the manual, @acronym{TLS} wrapper shipped with Gnus @acronym{TLS}/@acronym{SSL} is now supported in @acronym{IMAP} and -@acronym{NNTP} via @file{tls.el} and GNUTLS. The old -@acronym{TLS}/@acronym{SSL} support via (external third party) -@file{ssl.el} and OpenSSL still works. +@acronym{NNTP} via @file{tls.el} and GNUTLS. @item Improved anti-spam features. diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 6b922476596..ad56520f892 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -1090,11 +1090,11 @@ the passphrase prompt. @subsection Using PGP/MIME @acronym{PGP/MIME} requires an external OpenPGP implementation, such -as @uref{http://www.gnupg.org/, GNU Privacy Guard}. Pre-OpenPGP -implementations such as PGP 2.x and PGP 5.x are also supported. One +as @uref{http://www.gnupg.org/, GNU Privacy Guard}. Pre-OpenPGP +implementations such as PGP 2.x and PGP 5.x are also supported. One Emacs interface to the PGP implementations, PGG (@pxref{Top, ,PGG, -pgg, PGG Manual}), is included, but Mailcrypt and Florian Weimer's -@code{gpg.el} are also supported. @xref{PGP Compatibility}. +pgg, PGG Manual}), is included, but Mailcrypt is also supported. +@xref{PGP Compatibility}. @cindex gpg-agent Message internally calls GnuPG (the @command{gpg} command) to perform |