diff options
| -rw-r--r-- | admin/make-tarball.txt | 21 | ||||
| -rw-r--r-- | admin/notes/www | 4 |
2 files changed, 15 insertions, 10 deletions
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index a60fead2678..ad2aacb57a9 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -55,7 +55,8 @@ General steps (for each step, check for possible errors): For a release (as opposed to pretest), delete any left-over "---" and "+++" markers from etc/NEWS, as well as the "Temporary note" section at the beginning of that file, and commit etc/NEWS if it - was modified. + was modified. For a bug fix release (e.g. 28.2), delete any empty + headlines too. 2. Regenerate the versioned ChangeLog.N and etc/AUTHORS files. @@ -118,12 +119,13 @@ General steps (for each step, check for possible errors): Set the version number to that of the actual release (commit in one, as described above). Pick a date about a week from now when - you intend to make the release. Use M-x add-release-logs to add - entries to etc/HISTORY and the ChangeLog file. It's best not to - commit these files until the release is actually made. Merge the - entries from (unversioned) ChangeLog into the top of the current - versioned ChangeLog.N and commit that along with etc/HISTORY. - Then you can tag that commit as the release. + you intend to make the release. Use M-x add-release-logs from + admin/admin.el to add entries to etc/HISTORY and the ChangeLog + file. It's best not to commit these files until the release is + actually made. Merge the entries from (unversioned) ChangeLog + into the top of the current versioned ChangeLog.N and commit that + along with etc/HISTORY. Then you can tag that commit as the + release. Alternatively, you can commit and tag with the RC tag right away, and delay the final tagging until you actually decide to make a @@ -163,7 +165,10 @@ General steps (for each step, check for possible errors): 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. + should be committed separately, as described in step 3 above, to + avoid them being merged to master. The lisp/ldefs-boot.el file + should not be merged to master either, so it could be added to the + same commit or committed separately. 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, diff --git a/admin/notes/www b/admin/notes/www index 61a80e3d196..d1a8f0637ff 100644 --- a/admin/notes/www +++ b/admin/notes/www @@ -26,7 +26,7 @@ more specialized, alternative to M-x vc-dir. * Manual pages The scripts admin/make-manuals, admin/upload-manuals can be used to do -a complete update of the on-line manual pages (eg after a release). +a complete update of the on-line manual pages (e.g. after a release). * Renaming pages, redirects @@ -99,7 +99,7 @@ https://lists.gnu.org/r/bug-gnulib/2012-12/msg00072.html To use something other than CVS, convert the web-pages CVS repository to the other VCS, then set up a two-way sync between them. It needs to be two-way in case eg GNU webmasters make a change to the CVS. -Ref eg +Ref e.g. https://github.com/mikjo/bigitr https://lists.gnu.org/r/savannah-hackers-public/2013-04/msg00022.html |