master fc46552dc8: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit fc46552dc8273e41e40b395b554eb0e3cfa386b9
Merge: b6238a26c9 1f6750b53a
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    1f6750b53a Avoid treating number as an enum in the org manual
---
 doc/misc/org.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/misc/org.org b/doc/misc/org.org
index baab2efeda..b1dc708498 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -8544,8 +8544,8 @@ commands:
   Search for a regular expression in all agenda files and additionally
   in the files listed in ~org-agenda-text-search-extra-files~.  This
   uses the Emacs command ~multi-occur~.  A prefix argument can be used
-  to specify the number of context lines for each match, default is
-  1.
+  to specify the number of context lines for each match, the default
+  is 1.
 
 - {{{kbd(#)}}} ::