Revision: emacs@sv.gnu.org/emacs--devo--0--patch-196

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 74-75)

   - Update from CVS

diff --git a/man/ChangeLog b/man/ChangeLog
index 7068352efed9a45e057eeb9c543794b6eab6c04b..5d469daf672ffc8ce22a5afd07cf23f0e197c98a 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-04  Simon Josefsson  <jas@extundo.com>
+
+       * gnus.texi (Security): Improve.
+
 2006-04-03  Richard Stallman  <rms@gnu.org>
 
        * misc.texi (Thumbnails): Minor cleanup.

diff --git a/man/gnus.texi b/man/gnus.texi
index 203287b3a4817dc2a0be404f069e2e417f0f4523..0c848478b60e6401c1aee774dfcfb0b3a98873b3 100644 (file)
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -10655,8 +10655,8 @@ or newer is recommended.
 
 @end enumerate
 
-More information on how to set things up can be found in the message
-manual (@pxref{Security, ,Security, message, Message Manual}).
+The variables that control security functionality on reading messages
+include:
 
 @table @code
 @item mm-verify-option
@@ -10687,6 +10687,15 @@ deprecated.
 
 @end table
 
+By default the buttons that display security information are not
+shown, because they clutter reading the actual e-mail.  You can type
+@kbd{K b} manually to display the information.  Use the
+@code{gnus-buttonized-mime-types} and
+@code{gnus-unbuttonized-mime-types} variables to control this
+permanently.  @ref{MIME Commands} for further details, and hints on
+how to customize these variables to always display security
+information.
+
 @cindex snarfing keys
 @cindex importing PGP keys
 @cindex PGP key ring import
@@ -10707,6 +10716,10 @@ application/pgp-keys; gpg --import --interactive --verbose; needsterminal
 This happens to also be the default action defined in
 @code{mailcap-mime-data}.
 
+More information on how to set things for sending outgoing signed and
+encrypted messages up can be found in the message manual
+(@pxref{Security, ,Security, message, Message Manual}).
+
 @node Mailing List
 @section Mailing List
 @cindex mailing list