diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi
index 1db50f36132..4ddd84f470e 100644
--- a/doc/lispref/help.texi
+++ b/doc/lispref/help.texi
@@ -334,6 +334,9 @@ stands for a key sequence that will invoke @var{command}, or @samp{M-x
 @item \@{@var{mapvar}@}
 stands for a summary of the keymap which is the value of the variable
 @var{mapvar}.  The summary is made using @code{describe-bindings}.
+The summary will normally exclude meny bindings, but if the
+@var{include-menus} argument to @code{substitute-command-keys} is
+non-@code{nil}, the menu bindings will be included.
 
 @item \<@var{mapvar}>
 stands for no text itself.  It is used only for a side effect: it
@@ -384,11 +387,6 @@ given a special face @code{help-key-binding}, but if the optional
 argument @var{no-face} is non-@code{nil}, the function doesn't add
 this face to the produced string.
 
-@defun substitute-quotes string
-This function works like @code{substitute-command-keys}, but only
-replaces quote characters.
-@end defun
-
 @cindex advertised binding
 If a command has multiple bindings, this function normally uses the
 first one it finds.  You can specify one particular key binding by
@@ -440,6 +438,11 @@ The keymap description will normally exclude menu items, but if
 @end group
 @end smallexample
 
+@defun substitute-quotes string
+This function works like @code{substitute-command-keys}, but only
+replaces quote characters.
+@end defun
+
   There are other special conventions for the text in documentation
 strings---for instance, you can refer to functions, variables, and
 sections of this manual.  @xref{Documentation Tips}, for details.
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 2fa7ebc903d..6e3680bdb4f 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -2216,7 +2216,11 @@ this regular expression.  However, spaces inside of constructs such as
 
 Since this variable affects all regular expression search and match
 constructs, you should bind it temporarily for as small as possible
-a part of the code.
+a part of the code, and only where the Lisp code affected by the
+binding performs searches whose regexp was produced from interactive
+user input.  In other words, this variable should only be used to tell
+regexp search primitives how to interpret whitespace typed by the
+user.
 @end defvar
 
 @node Longest Match
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 2de78c5ae55..9ec9ede80e0 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -869,9 +869,9 @@ while \(:host t) would find all host entries."
 (defun auth-info-password (auth-info)
   "Return the :secret password from the AUTH-INFO."
   (let ((secret (plist-get auth-info :secret)))
-    (if (functionp secret)
-        (funcall secret)
-      secret)))
+    (while (functionp secret)
+      (setq secret (funcall secret)))
+    secret))
 
 (defun auth-source-pick-first-password (&rest spec)
   "Pick the first secret found by applying `auth-source-search' to SPEC."
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index d422383acdf..2b119c7a5c7 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -462,7 +462,9 @@ as argument, to ask the user that question."
   "List of functions to call when Rmail is invoked.")
 
 (defvar rmail-get-new-mail-hook nil
-  "List of functions to call when Rmail has retrieved new mail.")
+  "List of functions to call when Rmail has retrieved new mail.
+The functions are called in `rmail-buffer' narrowed to include
+only the new email messages, with point at the first new mail.")
 
 ;;;###autoload
 (defcustom rmail-show-message-hook nil