Merge from savannah/emacs-30

0edacf2aa7e Add jsdoc support to js-ts-mode
cace0cbee93 ; Restore inadvertently removed line.
2b04effb13d ; * test/lisp/net/shr-tests.el (shr-test--rendering-check...
6619aec6bca ; Don't run new 'shr-test/zoom-image' when built without ...
5d19bfda321 ; * admin/release-branch.txt: Update and fix typo.
fb11294d415 ; Fix typos

2 files changed, 2 insertions, 2 deletions

diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index 7792bd88c01..798e87dd572 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -5956,7 +5956,7 @@
         Assume C89 or later for math functions (Bug#12381).
         This simplifies the code, and makes it a bit smaller and faster,
         and (most important) makes it easier to clean up signal handling
-        since we can stop worring about floating-point exceptions in
+        since we can stop worrying about floating-point exceptions in
         library code.  That was a problem before C89, but the problem
         went away many years ago on all practical Emacs targets.
         * data.c, image.c, lread.c, print.c:
diff --git a/src/w32image.c b/src/w32image.c
index e71471f4a7c..359a4fa3a72 100644
--- a/src/w32image.c
+++ b/src/w32image.c
@@ -605,7 +605,7 @@ get_encoder_clsid (const char *type, CLSID *clsid)
 
 DEFUN ("w32image-create-thumbnail", Fw32image_create_thumbnail,
        Sw32image_create_thumbnail, 5, 5, 0,
-       doc: /* Create a HEIGHT by WIDTH thumnail file THUMB-FILE for image INPUT-FILE.
+       doc: /* Create a HEIGHT by WIDTH thumbnail file THUMB-FILE for image INPUT-FILE.
 TYPE is the image type to use for the thumbnail file, a string.  It is
 usually identical to the file-name extension of THUMB-FILE, but without
 the leading period, and both "jpeg" and "jpg" can be used for JPEG.