Merge from origin/emacs-28

6a05715552 Update the Samaritan's contact details in M-x doctor
d19834dfda ; Fix typos

diff --cc ChangeLog.3
Simple merge

diff --cc lisp/play/doctor.el
Simple merge

diff --cc lisp/play/mpuz.el
Simple merge