Merge from origin/emacs-27

2c5f215419 Avoid crashes in Mew due to corrupted tool-bar label
7a23915618 * lisp/tooltip.el (tooltip): Doc fix for GTK.
c4bbe02cc4 * lisp/help.el (help-for-help-internal): Doc fix; use impe...

# Conflicts:
#	lisp/help.el
#	lisp/tooltip.el

2 files changed, 5 insertions, 2 deletions

diff --git a/lisp/help.el b/lisp/help.el
index 79d8296cfed..d4be9aa7200 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -210,7 +210,7 @@ Do not call this in the scope of `with-help-window'."
 \\[describe-key] KEYS      Display the full documentation for the key sequence.
 \\[Info-goto-emacs-key-command-node] KEYS      Show the Emacs manual's section for the command bound to KEYS.
 \\[view-lossage]           Show last 300 input keystrokes (lossage).
-\\[describe-language-environment] LANG-ENV  Describes a specific language environment, or RET for current.
+\\[describe-language-environment] LANG-ENV  Describe a specific language environment, or RET for current.
 \\[describe-mode]           Display documentation of current minor modes and current major mode,
              including their special commands.
 \\[view-emacs-news]           Display news of recent Emacs changes.
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index af3b86bba71..293c0343956 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -131,7 +131,10 @@ of the `tooltip' face are used instead."
      :inherit variable-pitch)
     (t
      :inherit variable-pitch))
-  "Face for tooltips."
+  "Face for tooltips.
+
+When using the GTK toolkit, this face will only be used if
+`x-gtk-use-system-tooltips' is non-nil."
   :group 'basic-faces)
 
 (defcustom tooltip-use-echo-area nil