4 files changed, 22 insertions, 9 deletions

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 5c3017a3883..c7eea90b92f 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1981,7 +1981,7 @@ table.
 @item M-x tags-query-replace @key{RET} @var{regexp} @key{RET} @var{replacement} @key{RET}
 Perform a @code{query-replace-regexp} on each file in the selected tags table.
 
-@item M-x tags-loop-continue
+@item M-x multifile-continue
 Restart one of the last 2 commands above, from the current location of point.
 @end table
 
@@ -2017,9 +2017,9 @@ you can follow its progress.  As soon as it finds an occurrence,
 @code{tags-search} returns.  This command requires tags tables to be
 available (@pxref{Tags Tables}).
 
-@findex tags-loop-continue
+@findex multifile-continue
   Having found one match with @code{tags-search}, you probably want to
-find all the rest.  @kbd{M-x tags-loop-continue} resumes the
+find all the rest.  @kbd{M-x multifile-continue} resumes the
 @code{tags-search}, finding one more match.  This searches the rest of
 the current buffer, followed by the remaining files of the tags table.
 
@@ -2042,10 +2042,10 @@ default is to use the same setting as the value of
 single invocation of @kbd{M-x tags-query-replace}.  But often it is
 useful to exit temporarily, which you can do with any input event that
 has no special query replace meaning.  You can resume the query
-replace subsequently by typing @kbd{M-x tags-loop-continue}; this
+replace subsequently by typing @kbd{M-x multifile-continue}; this
 command resumes the last tags search or replace command that you did.
 For instance, to skip the rest of the current file, you can type
-@w{@kbd{M-> M-x tags-loop-continue}}.
+@w{@kbd{M-> M-x multifile-continue}}.
 
   Note that the commands described above carry out much broader
 searches than the @code{xref-find-definitions} family.  The
@@ -2077,7 +2077,7 @@ Display a list of all known identifiers matching @var{regexp}.
 Display a list of the identifiers defined in the program file
 @var{file}.
 
-@item M-x next-file
+@item M-x tags-next-file
 Visit files recorded in the selected tags table.
 @end table
 
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 38e89c6cfdd..d9d213df15a 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2443,7 +2443,7 @@ Next we define the menu items:
 
 @smallexample
 (define-key menu-bar-replace-menu [tags-repl-continue]
-  '(menu-item "Continue Replace" tags-loop-continue
+  '(menu-item "Continue Replace" multifile-continue
               :help "Continue last tags replace operation"))
 (define-key menu-bar-replace-menu [tags-repl]
   '(menu-item "Replace in tagged files" tags-query-replace
diff --git a/etc/NEWS b/etc/NEWS
index 2158fdc10dd..bc6791b05bc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -265,6 +265,17 @@ navigation and editing of large files.
 
 * Changes in Specialized Modes and Packages in Emacs 27.1
 
+** project.el
+*** New commands project-search and project-query-replace
+
+** Etags
++++
+*** 'next-file' is now an obsolete alias of tags-next-file
+*** tags-loop-revert-buffers is an obsolete alias of multifile-revert-buffers
+*** The tags-loop-continue function along with the tags-loop-operate and
+tags-loop-scan variables are now obsolete; use the new multifile-initialize and
+multifile-continue functions instead.
+
 ---
 ** bibtex
 *** New commands 'bibtex-next-entry' and 'bibtex-previous-entry'.
@@ -770,6 +781,8 @@ subexpression.
 
 * New Modes and Packages in Emacs 27.1
 
+** multifile.el lets one setup multifile operations like search&replace
+
 +++
 ** Emacs can now visit files in archives as if they were directories.
 This feature uses Tramp and works only on systems which support GVFS,
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 20d5ad95d85..74e01f87e9b 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -300,7 +300,7 @@
       menu-bar-separator)
 
     (bindings--define-key menu [tags-continue]
-      '(menu-item "Continue Tags Search" tags-loop-continue
+      '(menu-item "Continue Tags Search" multifile-continue
                   :help "Continue last tags search operation"))
     (bindings--define-key menu [tags-srch]
       '(menu-item "Search Tagged Files..." tags-search
@@ -349,7 +349,7 @@
 (defvar menu-bar-replace-menu
   (let ((menu (make-sparse-keymap "Replace")))
     (bindings--define-key menu [tags-repl-continue]
-      '(menu-item "Continue Replace" tags-loop-continue
+      '(menu-item "Continue Replace" multifile-continue
                   :help "Continue last tags replace operation"))
     (bindings--define-key menu [tags-repl]
       '(menu-item "Replace in Tagged Files..." tags-query-replace