Merge from origin/emacs-28

cb911febc6 ; Fix typos

# Conflicts:
#	test/lisp/net/tramp-tests.el

diff --cc ChangeLog.3
Simple merge

diff --cc doc/misc/texinfo.tex
Simple merge

diff --cc lisp/net/tramp.el
Simple merge

diff --cc test/lisp/net/tramp-tests.el
index 551a70a21ad597b07d75bde74c260af7cc0336a3,cee3651f213b7b48c143da113d12ad83c349461b..55a6feba9b74a30ce3c2c2beab757786168390a5
--- 1/test/lisp/net/tramp-tests.el
--- 2/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@@ -6547,8 -6290,8 +6547,8 @@@ This is used in tests which we don't wa
             (string-match-p "[[:multibyte:]]" default-directory)))))
  
  (defun tramp--test-crypt-p ()
-   "Check, whether the remote directory is crypted."
+   "Check, whether the remote directory is encrypted."
 -  (tramp-crypt-file-name-p tramp-test-temporary-file-directory))
 +  (tramp-crypt-file-name-p ert-remote-temporary-file-directory))
  
  (defun tramp--test-docker-p ()
    "Check, whether the docker method is used.