Merge from origin/emacs-27

d5b160d7cc (tag: emacs-27.2-rc1, origin/emacs-27) Prepare the Emacs 2...
216bd67a4f ; * admin/make-tarball.txt: Advise to remove stale subdire...

# Conflicts:
#	ChangeLog.3
#	README
#	configure.ac
#	etc/AUTHORS
#	etc/NEWS
#	lisp/ldefs-boot.el
#	msdos/sed2v2.inp
#	nt/README.W32

1 files changed, 5 insertions, 0 deletions

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 5125086e881..e644f96202e 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -33,6 +33,11 @@ General steps (for each step, check for possible errors):
     or some form of "git clean -x".  It's probably simpler and safer to
     make a new working directory exclusively for the release branch.
 
+    If the working directory has subdirectories created when making
+    previous releases or pretests, remove those subdirectories, as the
+    command which updates the ChangeLog file might attempt to recurse
+    there and scan any ChangeLog.* files there.
+
     Make sure the tree is built, or at least configured.  That's
     because some of the commands below run Make, so they need
     Makefiles to be present.