diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-03-29 08:26:25 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-03-29 08:26:25 -0700 |
| commit | 7ebd79f3c618773852ed09f4c121dd717368c23a (patch) | |
| tree | 173b468fc5b41f11d8e508cd3b999dbedf7d32ad /admin | |
| parent | 31153cb50938fb15030efd6af5b3a888f317224e (diff) | |
| parent | bcc4cc3362fdb0f2b299087af5e7b31b92862fbb (diff) | |
| download | emacs-7ebd79f3c618773852ed09f4c121dd717368c23a.tar.gz | |
Merge from origin/emacs-27
bcc4cc3362 Doc fixes for 'face-foreground' and 'face-background'.
bf6442fafd ; * admin/make-tarball.txt: Minor addition to the Web page...
38b127d32e * admin/admin.el (set-version): Handle malformed NEWS markup.
0d7e2a993e admin.el fix for bug#47394
fdec444758 ; * etc/NEWS: Fix typo.
1e6ca2765f ; * admin/make-tarball.txt: Another minor addition.
# Conflicts:
# etc/NEWS
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/admin.el | 4 | ||||
| -rw-r--r-- | admin/make-tarball.txt | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/admin/admin.el b/admin/admin.el index e3701070d03..ad4208beef0 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -151,7 +151,7 @@ Root must be the root of an Emacs source tree." (display-warning 'admin "NEWS file contains empty sections - remove them?")) (goto-char (point-min)) - (if (re-search-forward "^\\(\\+\\+\\+ *$\\|--- *$\\|Temporary note:\\)" nil t) + (if (re-search-forward "^\\(\\+\\+\\+? *$\\|---? *$\\|Temporary note:\\)" nil t) (display-warning 'admin "NEWS file still contains temporary markup. Documentation changes might not have been completed!")))) @@ -545,7 +545,7 @@ Leave point after the table." (forward-line 1) (while (not done) (cond ((re-search-forward "<tr><td.*• \\(<a.*</a>\\)\ -:</td><td> </td><td[^>]*>\\(.*\\)" (line-end-position) t) +:?</td><td> </td><td[^>]*>\\(.*\\)" (line-end-position) t) (replace-match (format "<tr><td%s>\\1</td>\n<td>\\2" (if table-workaround " bgcolor=\"white\"" ""))) diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 418cf91ae29..c2078955336 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -250,8 +250,12 @@ General steps (for each step, check for possible errors): because replies that invariably are not announcements also get sent out as if they were.) -12. After a release, update the Emacs pages as below. +12. After a release, update the Emacs pages as described below. +13. Bump the Emacs version on the release branch. + If the released version was XX.Y, use 'set-version' from + admin/admin.el to bump the version on the release branch to + XX.Y.50. Commit the changes. UPDATING THE EMACS WEB PAGES AFTER A RELEASE @@ -271,5 +275,14 @@ page for about a month, then comment it again. Regenerate the various manuals in manual/. The scripts admin/make-manuals and admin/upload-manuals summarize the process. +If you have Texinfo installed locally, make-manuals might fail if it +cannot find epsf.tex. In that case define in the environment + + TEXINPUTS=:/path/to/texinfo-tree/doc + +where /path/to/texinfo-tree is the absolute file name of the top-level +directory where you have the Texinfo source tree. Then re-run +make-manuals. + Browsing <https://web.cvs.savannah.gnu.org/viewvc/?root=emacs> is one way to check for any files that still need updating. |