From: Stefan Kangas <stefan@marxist.se>
Date: Fri, 5 Aug 2022 04:30:27 +0000 (+0200)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1447^2~425
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c7b0eafd7221b2b4a565448e19bf1b6704137a2e;p=emacs.git

Merge from origin/emacs-28

f484da5fcb * doc/lispref/loading.texi (Autoload by Prefix): Fix typo.
---

c7b0eafd7221b2b4a565448e19bf1b6704137a2e
diff --cc doc/lispref/loading.texi
index 874200d9f2d,723b4dd20a6..0972a7a123c
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@@ -764,9 -750,9 +764,9 @@@ contain definitions matching the prefi
  @code{definition-prefixes} holds a hashtable which maps a prefix to
  the corresponding list of files to load for it.  Entries to this
  mapping are added by calls to @code{register-definition-prefixes}
 -which are generated by @code{update-file-autoloads}
 +which are generated by @code{loaddefs-generate}
  (@pxref{Autoload}).  Files which don't contain any definitions worth
- loading (test files, for examples), should set
+ loading (test files, for example), should set
  @code{autoload-compute-prefixes} to @code{nil} as a file-local
  variable.