Merge from origin/emacs-28

5e47ec9511 ; * lisp/url/url-http.el (url-http-parse-headers): Fix typo.
ba0871bef1 ; Fix typos: prefer American spelling
e3e7f31faa Adapt Tramp doc

# Conflicts:
#	etc/NEWS
#	etc/themes/modus-themes.el
#	lisp/emacs-lisp/byte-opt.el
#	test/lisp/so-long-tests/spelling-tests.el

3 files changed, 5 insertions, 5 deletions

diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 21a2c6c51e4..5ee139a11d3 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -1898,7 +1898,7 @@ attempts.  Other zero-width assertions may also bring benefits by
 causing a match to fail early.
 
 @item
-Avoid or-patterns in favour of character alternatives: write
+Avoid or-patterns in favor of character alternatives: write
 @samp{[ab]} instead of @samp{a\|b}.  Recall that @samp{\s-} and @samp{\sw}
 are equivalent to @samp{[[:space:]]} and @samp{[[:word:]]}, respectively.
 
@@ -1933,7 +1933,7 @@ purposes.
 
 @ifnottex
 @item
-Consider using @code{rx} (@pxref{Rx Notation}); it can optimise some
+Consider using @code{rx} (@pxref{Rx Notation}); it can optimize some
 or-patterns automatically and will never introduce capturing groups
 unless explicitly requested.
 @end ifnottex
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index ab46afc838b..8b0e1981955 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -3394,7 +3394,7 @@ for @var{object} is the current buffer.
 Search for the next region that has text property @var{prop} set to
 @var{value} according to @var{predicate}.
 
-This function is modelled after @code{search-forward} and friends in
+This function is modeled after @code{search-forward} and friends in
 that it moves point, but it returns a structure that describes the
 match instead of returning it in @code{match-beginning} and friends.
 
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index c29547d00db..13ad181cdd4 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -327,7 +327,7 @@ Example of a loop summing a list of numbers:
 
 @anchor{Tail recursion}
 Recursive calls to @var{name} that occur in @emph{tail
-positions} in @var{body} are guaranteed to be optimised as @emph{tail
+positions} in @var{body} are guaranteed to be optimized as @emph{tail
 calls}, which means that they will not consume any additional stack
 space no matter how deeply the recursion runs.  Such recursive calls
 will effectively jump to the top of the loop with new values for the
@@ -1363,7 +1363,7 @@ disappear without prior notice.
 
 The byte-compiler can also warn about lexical variables that are
 special in other Emacs Lisp files, often indicating a missing
-@code{defvar} declaration.  This useful but somewhat specialised check
+@code{defvar} declaration.  This useful but somewhat specialized check
 requires three steps:
 
 @enumerate