2 files changed, 7 insertions, 4 deletions

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 442104af8a8..b68b953464d 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1078,13 +1078,15 @@ point and mark around the citation text as modified."
 
 (defcustom message-signature mail-signature
   "String to be inserted at the end of the message buffer.
-If t, the `message-signature-file' file will be inserted instead.
-If a function, the result from the function will be used instead.
-If a form, the result from the form will be used instead."
+If nil, don't insert a signature.
+If t, insert `message-signature-file'.
+If a function or form, insert its result.
+See `mail-signature' for the recommended format of a signature."
   :version "23.2"
   :type '(choice string (const :tag "Contents of signature file" t)
                  function
-                 sexp)
+                 sexp
+                 (const :tag "None" nil))
   :risky t
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 93b6c90521b..208ebb68017 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -370,6 +370,7 @@ By default, this is the file specified by `mail-personal-alias-file'." t)
 ;;;###autoload
 (defcustom mail-signature t
   "Text inserted at end of mail buffer when a message is initialized.
+If nil, no signature is inserted.
 If t, it means to insert the contents of the file `mail-signature-file'.
 If a string, that string is inserted.
  (To make a proper signature, the string should begin with \\n\\n-- \\n,