master 213840a 1/5: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit 213840acf272186f014a1c69eb68fdf84f5040db
Merge: b615c1f 8d091f7
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-27
    
    8d091f7fc2 ; Fix recent markup change
    b78426526c ; * lisp/obsolete/vc-arch.el: Add missing "Obsolete-since"...
    3fb37dc9a4 ; * lisp/ezimage.el: Fix typo.
    778923afe5 Document feature requests in the Emacs manual
---
 doc/emacs/custom.texi    |  2 +-
 doc/emacs/trouble.texi   | 11 +++++++++++
 lisp/ezimage.el          |  2 +-
 lisp/obsolete/vc-arch.el |  1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 2e04a6b..4fe7bbb 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -2676,7 +2676,7 @@ Note also that if neither the XDG location nor 
@file{~/.emacs.d}
 exist, then Emacs will create @file{~/.emacs.d} (and therefore use it
 during subsequent invocations).
 
-Emacs will set @var{user-emacs-directory} to the directory it decides
+Emacs will set @code{user-emacs-directory} to the directory it decides
 to use.
 
 Although this is backward-compatible with older Emacs versions, modern
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 9cbcf20..33f67f2 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -1299,6 +1299,17 @@ emacs-devel mailing list}.
 @end ifhtml
 You can ask for suggested projects or suggest your own ideas.
 
+If you have a feature request or a suggestion for how to improve
+Emacs, the best place to send it is to
+@ifnothtml
+@email{bug-gnu-emacs@@gnu.org}
+@end ifnothtml
+@ifhtml
+@url{https://lists.gnu.org/mailman/listinfo/bug-gnu-emacs, bug-gnu-emacs}
+@end ifhtml
+.  Please explain as clearly as possible what change you would like to
+see, and why and how you think it would improve Emacs.
+
 If you have already written an improvement, please tell us about it.  If
 you have not yet started work, it is useful to contact
 @ifnothtml
diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index dab7a53..dcedd8a 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -270,4 +270,4 @@ See `ezimage-expand-image-button-alist' for details."
 
 (provide 'ezimage)
 
-;;; sb-image.el ends here
+;;; ezimage.el ends here
diff --git a/lisp/obsolete/vc-arch.el b/lisp/obsolete/vc-arch.el
index 0b70927..b186a5c 100644
--- a/lisp/obsolete/vc-arch.el
+++ b/lisp/obsolete/vc-arch.el
@@ -5,6 +5,7 @@
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <address@hidden>
 ;; Package: vc
+;; Obsolete-since: 25.1
 
 ;; This file is part of GNU Emacs.