Merge from origin/emacs-28

bf137fdbd2 ; * admin/make-tarball.txt: Small clarification.

1 files changed, 9 insertions, 7 deletions

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 02b4f318e26..98001e24e7d 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -158,13 +158,15 @@ General steps (for each step, check for possible errors):
 
 5.  Copy lisp/loaddefs.el to lisp/ldefs-boot.el.
 
-    Commit ChangeLog.N, etc/AUTHORS, lisp/ldefs-boot.el, and the
-    files changed by M-x set-version.  The easiest way of doing that
-    is "C-x v d ROOT-DIR RET", then go to the first modified file,
-    press 'M' to mark all modified files, and finally 'v' to commit
-    them.  Make sure the commit log message mentions all the changes
-    in all modified files, as by default 'v' doesn't necessarily do
-    so.
+    Commit ChangeLog.N, etc/AUTHORS, lisp/ldefs-boot.el, and the files
+    changed by M-x set-version.  Note that the set-version changes
+    should be committed separately, as described in step 3 above.
+
+    The easiest way of doing that is "C-x v d ROOT-DIR RET", then go
+    to the first modified file, press 'M' to mark all modified files,
+    and finally 'v' to commit them.  Make sure the commit log message
+    mentions all the changes in all modified files, as by default 'v'
+    doesn't necessarily do so.
 
     If someone else made a commit between step 1 and now,
     you need to repeat from step 4 onwards.  (You can commit the files