Merge from savannah/emacs-30

976416bebe2 Fix some function type declaration
23549d71751 * src/image.c (gui_put_x_image): Avoid memory leak.
cb633820c15 ; * doc/misc/use-package.texi (Getting Started): Fix word...

1 files changed, 2 insertions, 2 deletions

diff --git a/doc/misc/use-package.texi b/doc/misc/use-package.texi
index 8a7af5bc6f6..9e11b349f20 100644
--- a/doc/misc/use-package.texi
+++ b/doc/misc/use-package.texi
@@ -180,8 +180,8 @@ loading actually occurs.  As you might expect, you can use
 The above declarations will load the @samp{foo} package immediately.  In
 most cases, this is not necessary or desirable, as that will slow down
 Emacs startup.  Instead, you should try to set things up so that
-packages are only loaded when they are actually needed
-(``autoloading'').  If you have installed a package from @acronym{GNU}
+packages are only loaded when they are actually needed (this is known as
+``autoloading'').  If you have installed a package from @acronym{GNU}
 @acronym{ELPA} that provides its own autoloads, it is often enough to
 say: