master 3b0cb1c 6/6: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit 3b0cb1c4f5cb78d3c887701810b5370b80be6559
Merge: b8c8e93 d024fc1
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-27
    
    d024fc141b (origin/emacs-27) * doc/lispref/symbols.texi (Definitions)...
    d78e0f3cd5 ; lisp/ldefs-boot.el: Update.
    27877e7bcf (tag: emacs-27.1-rc1) * etc/HISTORY: Add Emacs 27.1 releas...
---
 doc/lispref/symbols.texi | 2 +-
 etc/HISTORY              | 2 ++
 lisp/ldefs-boot.el       | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi
index dad2955..d6b0494 100644
--- a/doc/lispref/symbols.texi
+++ b/doc/lispref/symbols.texi
@@ -132,7 +132,7 @@ variables.  To define a customizable variable, use the
 (@pxref{Customization}).
 
   In principle, you can assign a variable value to any symbol with
-@code{setq}, whether not it has first been defined as a variable.
+@code{setq}, whether or not it has first been defined as a variable.
 However, you ought to write a variable definition for each global
 variable that you want to use; otherwise, your Lisp program may not
 act correctly if it is evaluated with lexical scoping enabled
diff --git a/etc/HISTORY b/etc/HISTORY
index 6cda28d..f0fd7d6 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -220,6 +220,8 @@ GNU Emacs 26.2 (2019-04-12) emacs-26.2
 
 GNU Emacs 26.3 (2019-08-28) emacs-26.3
 
+GNU Emacs 27.1 (2020-08-06) emacs-27.1
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index bcd8e0d..dd363b6 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -10608,7 +10608,10 @@ The buffer is expected to contain a mail message." t 
nil)
 
 (autoload 'epa-mail-sign "epa-mail" "\
 Sign the current buffer.
-The buffer is expected to contain a mail message.
+The buffer is expected to contain a mail message, and signing is
+performed with your default key.
+With prefix argument, asks you to select interactively the key to
+use from your key ring.
 
 \(fn START END SIGNERS MODE)" t nil)