2009-09-22 Daiki Ueno <ueno@unixuser.org>

 * gnus.texi (Security): Document mm-sign-option and mm-encrypt-option.

2 files changed, 17 insertions, 2 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 24fb119b03a..b75d1d27c6f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-22  Daiki Ueno  <ueno@unixuser.org>
+
+        * gnus.texi (Security): Document mm-sign-option and mm-encrypt-option.
+
 2009-09-13  Chong Yidong  <cyd@stupidchicken.com>
 
         * dired-x.texi (Technical Details): Delete
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 91ce3228231..ca386c08416 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -12030,8 +12030,8 @@ or newer is recommended.
 
 @end enumerate
 
-The variables that control security functionality on reading messages
-include:
+The variables that control security functionality on reading/composing
+messages include:
 
 @table @code
 @item mm-verify-option
@@ -12046,6 +12046,17 @@ Option of decrypting encrypted parts.  @code{never}, no decryption;
 @code{always}, always decrypt; @code{known}, only decrypt known
 protocols.  Otherwise, ask user.
 
+@item mm-sign-option
+@vindex mm-sign-option
+Option of creating signed parts.  @code{nil}, use default signing
+keys; @code{guided}, ask user to select signing keys from the menu.
+
+@item mm-encrypt-option
+@vindex mm-encrypt-option
+Option of creating encrypted parts.  @code{nil}, use the first
+public-key matching the @samp{From:} header as the recipient;
+@code{guided}, ask user to select recipient keys from the menu.
+
 @item mml1991-use
 @vindex mml1991-use
 Symbol indicating elisp interface to OpenPGP implementation for