diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-04 15:02:09 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-04 15:02:09 -0700 |
| commit | 207f11935755236b21ca4d3fe6b19206e0a9ed33 (patch) | |
| tree | d7f5d2ec7b91215f601e085afc64b2176e99b751 /admin/make-tarball.txt | |
| parent | 389698e53a4d3130035e46bf7f8b28480ae9ed8a (diff) | |
| parent | 21d4bf6c449c9ca24f514c82cc0aa2f2ba65f748 (diff) | |
| download | emacs-207f11935755236b21ca4d3fe6b19206e0a9ed33.tar.gz | |
Merge from origin/emacs-24
21d4bf6 * admin/make-tarball.txt: Copyedits.
f3b70a7 ; ChangeLog fix
07432a8 Revert "CC Mode: Stop Font Lock forcing fontification from BOL."
Conflicts:
lisp/ChangeLog
Diffstat (limited to 'admin/make-tarball.txt')
| -rw-r--r-- | admin/make-tarball.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 8f8b031ba2f..e902b023f80 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -52,9 +52,11 @@ General steps (for each step, check for possible errors): number to that of the actual release. Pick a date about a week from now when you intend to make the release. Use M-x add-release-logs to add the ChangeLog entries for that date to the tar file (but - not yet to the repository). Name the tar file as - emacs-XX.Y-rc1.tar. If all goes well in the following week, you - can simply rename the file and use it for the actual release. + do not commit the entries to the repository until the actual release). + Name the tar file as emacs-XX.Y-rc1.tar. If all goes well in the + following week, you can simply rename the file and use it for the + actual release. If you need another release candidate, remember + to adjust the ChangeLog entries. 4. autoreconf -i -I m4 --force make bootstrap |