Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

2 files changed, 20 insertions, 5 deletions

diff --git a/admin/admin.el b/admin/admin.el
index 542556a65e0..7e761c3f1f4 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -128,8 +128,13 @@ Root must be the root of an Emacs source tree."
                                 (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "java/AndroidManifest.xml.in"
                        (apply #'format "%02d%02d%02d000"
-                              (mapcar #'string-to-number
-                                      (split-string version "\\.")))
+                              (let ((ver-list
+                                     (mapcar #'string-to-number
+                                             (split-string version "\\."))))
+                                ;; Official releases are XX.YY, not XX.YY.ZZ
+                                (if (= 2 (length ver-list))
+                                    (setq ver-list (append ver-list '(0))))
+                                ver-list))
                        admin-android-version-code-regexp)
   (set-version-in-file root "nt/README.W32" version
                        (rx (and "version" (1+ space)
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 22e76a0ac2e..61d19e54b8e 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -388,9 +388,9 @@ add the new NEWS file as news/NEWS.xx.y
 Copy new etc/MACHINES to MACHINES and CONTRIBUTE to CONTRIBUTE
 
 For every new release, a banner is displayed on top of the emacs.html
-page.  Uncomment and the release banner in emacs.html.  Keep it on the
-page for about a month, then comment it again.  The new release banner
-looks like this:
+page.  Uncomment the release banner in emacs.html.  Keep it on the page
+for about a month, then comment it again.  The new release banner looks
+like this:
 
     <div class="release-banner">
         <div class="container">
@@ -398,6 +398,16 @@ looks like this:
         </div>
     </div>
 
+Add the information about the new release in the "Releases" section of
+emacs.html, which begins like this:
+
+    <div class="releases">
+        <div class="container">
+          <!-- NOTE: There is no need to keep more than the two most recent -->
+          <!-- major versions here. -->
+
+            <h2 id="Releases">
+
 Also, make sure the copyright years at the bottom of emacs.html are
 up-to-date.