Merge from origin/emacs-28

# Conflicts:
#	lisp/progmodes/xref.el

1 files changed, 26 insertions, 3 deletions

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 17a4d9f807b..c8ee3349cdb 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -54,12 +54,31 @@ General steps (for each step, check for possible errors):
     section at the beginning of that file, and commit etc/NEWS if it
     was modified.
 
-2.  Regenerate the etc/AUTHORS file:
+2.  Regenerate the versioned ChangeLog.N and etc/AUTHORS files.
+
+    The "M-x authors" command below will first update the current
+    versioned ChangeLog.N file.  For this to work correctly, make sure
+    the top-level Makefile says
+
+      PREFERRED_BRANCH = emacs-NN
+
+    where NN is the version on the release branch from which you are
+    producing the tarball.  If NN is incorrect, update Makefile.in and
+    re-run 'configure' to update Makefile.
+
+    If the versioned ChangeLog.N file is too large, start a new one
+    by bumping N, and also update the line in top-level Makefile.in
+    which says
+
+      CHANGELOG_HISTORY_INDEX_MAX = N
+
+    by incrementing the value of N by 1; then regenerate Makefile.
+
+    Now:
+
       M-: (require 'authors) RET
       M-x authors RET
 
-    (This first updates the current versioned ChangeLog.N)
-
     If this says "Problem updating ChangeLog", find the reason for the
     failure of the command it runs, viz.:
 
@@ -315,6 +334,10 @@ looks like this:
         </div>
     </div>
 
+The file download.html may need to be updated, for example if the
+MS-Windows binaries will be signed by a different person/key than
+those mentioned there.
+
 Next, regenerate the various manuals in HTML, PDF, and PS formats:
 
   Invoke ./admin/make-manuals from the top-level directory of the