Merge from origin/emacs-27

b242bbb073 (origin/emacs-27) ; lisp/org/org.el: Fix Version header.
e0fc939c5f Add more details to the "word processor" section
fda9b3e83a * src/Makefile.in (DO_CODESIGN): Fix expected architecture...

diff --cc etc/TODO
Simple merge

diff --cc lisp/org/org.el
Simple merge

diff --cc src/Makefile.in
Simple merge