Merge from origin/emacs-29

2773cf9e013 ; Fix typos
020aff95fa3 ; Fix typos in ChangeLog files
5e03a621efc ; * lisp/progmodes/c-ts-mode.el (c-ts-mode--else-heuristi...
f0734e1c0d1 Fix c-ts-mode indent heuristic (bug#67417)
08fc6bace20 Fix c-ts-mode indentation (bug#67357)
71bc2815ccd Add font-locking for hash-bang lines in typescript-ts-mode.
db8347c8c87 Add font-locking for hash-bang lines in js-ts-mode
91f2ade57bb ruby-mode: Better detect regexp vs division (bug#67569)

2 files changed, 2 insertions, 2 deletions

diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1
index 832dbd846a6..f8f2d27b723 100644
--- a/doc/misc/ChangeLog.1
+++ b/doc/misc/ChangeLog.1
@@ -6011,7 +6011,7 @@
         (RSS Feeds): New section.
         (Built-in table editor): Document M-e and M-a navigate
         inside table field.
-        (Stuck projects): Docment that projects identified as
+        (Stuck projects): Document that projects identified as
         un-stuck will still be searched for stuck sub-projects.
         (Paragraphs): Document centering.
         (Creating timestamps, Agenda commands): Document new
diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index bdcb0793098..e109926cb72 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -5080,7 +5080,7 @@ each of the three channels of light (red, green, blue).  For example:
 : xrandr --output LVDS1 --brightness 1.0 --gamma 0.76:0.75:0.68
 
 Typography is another variable.  Some font families are blurry at small
-point sizes.  Others may have a regular weight that is lighter (thiner)
+point sizes.  Others may have a regular weight that is lighter (thinner)
 than that of their peers which may, under certain circumstances, cause a
 halo effect around each glyph.