Merge from origin/emacs-28

e3427faf55 Fix typos and improve consistency in ERC manual
0bf10d5082 * test/Makefile.in (check-declare): Add missing --batch.
34f5656137 Document the subtleties of the 'cursor' text property

diff --cc doc/lispref/text.texi
Simple merge

diff --cc doc/misc/erc.texi
Simple merge

diff --cc test/Makefile.in
index 51696d7faaf29985254f03688cf968bfb8b9a72b,bb32ef672db313db5643259a7d040eac666de7b2..f2c49584e7f6aebb2ceffaa81906569340eca3b7
--- 1/test/Makefile.in
--- 2/test/Makefile.in
+++ b/test/Makefile.in
@@@ -368,16 -360,5 +368,16 @@@ maintainer-clean: distclean bootstrap-c
  .PHONY: check-declare
  
  check-declare:
-       $(emacs) -l check-declare \
+       $(emacs) --batch -l check-declare \
          --eval '(check-declare-directory "$(srcdir)")'
 +
 +.PHONY: subdirs subdir-targets generate-test-jobs
 +
 +subdirs:
 +      @echo $(SUBDIRS)
 +
 +subdir-targets:
 +      @echo $(SUBDIR_TARGETS)
 +
 +generate-test-jobs:
 +      @$(MAKE) -C infra generate-test-jobs SUBDIRS="$(SUBDIRS)"