Merge from origin/emacs-25

74b4f13 Document nil args of compare-buffer-substrings
9fc81bc * doc/misc/message.texi (Bcc Warning): Fix markup.
95baa25 * doc/misc/message.texi (Bcc Warning): Document mml-secure-sa...

1 files changed, 7 insertions, 1 deletions

diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 048990d53a7..6ec761506d0 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1326,7 +1326,13 @@ OpenPGP) or @code{mml-secure-smime-encrypt-to-self} (for
 The @code{Bcc} header is meant to hide recipients of messages.
 However, when encrypted messages are used, the e-mail addresses of all
 @code{Bcc}-headers are given away to all recipients without
-warning, which is a bug, see
+warning, which is a bug.
+@vindex mml-secure-safe-bcc-list
+But now Message got to warn if @code{Bcc} recipients are found in an
+encrypted message when you are just about to send it.  If you are sure
+those @code{Bcc} addresses are safe to expose, set the
+@code{mml-secure-safe-bcc-list} variable, that is a list of e-mail
+addresses.  See
 @uref{https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718}.