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

52 files changed, 82 insertions, 89 deletions

diff --git a/admin/README b/admin/README
index cb6ba859926..7906844309a 100644
--- a/admin/README
+++ b/admin/README
@@ -78,7 +78,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 Local variables:
 mode: outline
diff --git a/admin/admin.el b/admin/admin.el
index e81e7f1e7e1..44d091d1423 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index fa6a639d88b..a4701dd77bd 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <X11/Xlib.h>
diff --git a/admin/authors.el b/admin/authors.el
index 86d42be8dc6..c69ca9405c7 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/build-configs b/admin/build-configs
index aa62dadc912..ac3147fe63b 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 require 5;
@@ -97,4 +97,3 @@ foreach $config (@configs)
 # Local Variables:
 # mode: cperl
 # End:
-
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 46a5e42aa7b..d867c053e5c 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in
index b154bc13d45..0c252ae919f 100644
--- a/admin/charsets/Makefile.in
+++ b/admin/charsets/Makefile.in
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
diff --git a/admin/charsets/big5.awk b/admin/charsets/big5.awk
index 7482d11a2d1..2393f9144bc 100644
--- a/admin/charsets/big5.awk
+++ b/admin/charsets/big5.awk
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 BEGIN {
   tohex["A"] = 10;
@@ -68,5 +68,3 @@ function decode_big5(big5) {
   code = decode_big5(big5);
   printf "0x%04X %s\n", code, $2;
 }
-
-
diff --git a/admin/charsets/compact.awk b/admin/charsets/compact.awk
index 21e03ee4157..b912a0fd203 100644
--- a/admin/charsets/compact.awk
+++ b/admin/charsets/compact.awk
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Commentary:
 # Make a charset map compact by changing this kind of line sequence:
diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk
index df1f8cd7b23..6aac98815b5 100644
--- a/admin/charsets/cp51932.awk
+++ b/admin/charsets/cp51932.awk
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Commentary:
 
diff --git a/admin/charsets/cp932.awk b/admin/charsets/cp932.awk
index acba0333371..7fd3e9111f5 100644
--- a/admin/charsets/cp932.awk
+++ b/admin/charsets/cp932.awk
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Commentary:
 
@@ -113,4 +113,3 @@ END {
         printf "0x%02X%02X 0x%04X # 4\n", i, j, code++;
     }
 }
-
diff --git a/admin/charsets/eucjp-ms.awk b/admin/charsets/eucjp-ms.awk
index 24152b44eff..94e27d00651 100644
--- a/admin/charsets/eucjp-ms.awk
+++ b/admin/charsets/eucjp-ms.awk
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Commentary:
 
diff --git a/admin/charsets/gb180302.awk b/admin/charsets/gb180302.awk
index 4947f966371..1a6995a1cb4 100644
--- a/admin/charsets/gb180302.awk
+++ b/admin/charsets/gb180302.awk
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 BEGIN {
   tohex["A"] = 10;
diff --git a/admin/charsets/gb180304.awk b/admin/charsets/gb180304.awk
index 81d7e7301bf..9c6522b5729 100644
--- a/admin/charsets/gb180304.awk
+++ b/admin/charsets/gb180304.awk
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 BEGIN {
   tohex["A"] = 10;
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index 5f62ff90d3a..8ee3d142e72 100755
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Commentary:
 
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README
index f9dc2ba99f8..f4fea85e8b6 100644
--- a/admin/charsets/mapfiles/README
+++ b/admin/charsets/mapfiles/README
@@ -80,4 +80,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/charsets/mule-charsets.el b/admin/charsets/mule-charsets.el
index 4ccf4bfb5be..8355af4488d 100644
--- a/admin/charsets/mule-charsets.el
+++ b/admin/charsets/mule-charsets.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ;; For the record: the old, pre-v23 code was this:
@@ -67,4 +67,3 @@
     (sort-lines nil (point-min) (point-max))
     (let ((coding-system-for-write 'unix))
       (write-file (car elt)))))
-
diff --git a/admin/cus-test.el b/admin/cus-test.el
index 3808a44eff6..a8582ac59cf 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index 23df9ff1922..f45d72f1a66 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 if [ $# != 2 ]; then
diff --git a/admin/find-gc.el b/admin/find-gc.el
index 53ac9220408..91acbb5149d 100644
--- a/admin/find-gc.el
+++ b/admin/find-gc.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index a0efce5ea69..0dfd190d753 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in
index fd1d8954e58..740168fc735 100644
--- a/admin/grammars/Makefile.in
+++ b/admin/grammars/Makefile.in
@@ -15,7 +15,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
diff --git a/admin/grammars/c.by b/admin/grammars/c.by
index c312fd636df..da9f967a160 100644
--- a/admin/grammars/c.by
+++ b/admin/grammars/c.by
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; TODO:  From Nate Schley
 ;; >  * Can't parse signature element: "const char* const rmc_ClrTxt"
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy
index ffbe7cc4a99..d64dcdcbfd9 100644
--- a/admin/grammars/grammar.wy
+++ b/admin/grammars/grammar.wy
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 %package semantic-grammar-wy
 %provide semantic/grammar-wy
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy
index bbad38d23f6..f1a4c147cd1 100644
--- a/admin/grammars/java-tags.wy
+++ b/admin/grammars/java-tags.wy
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 %package wisent-java-tags-wy
 %provide semantic/wisent/javat-wy
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy
index 72b662e1795..ded8023b7f4 100644
--- a/admin/grammars/js.wy
+++ b/admin/grammars/js.wy
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/grammars/make.by b/admin/grammars/make.by
index 0bfde31979f..d3a03ead472 100644
--- a/admin/grammars/make.by
+++ b/admin/grammars/make.by
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 %package semantic-make-by
 %provide semantic/bovine/make-by
@@ -134,7 +134,7 @@ elements: element some-whitespace elements
           ( ,@$1 )
         | ;;EMPTY
         ;
-  
+
 element: sub-element element
          ( (concat (car ,$1) (car ,$2)) )
        | ;;EMPTY
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index 23aa65cd7f1..c8426e2581d 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/admin/grammars/scheme.by b/admin/grammars/scheme.by
index c4d6a392f7c..86fe81d1852 100644
--- a/admin/grammars/scheme.by
+++ b/admin/grammars/scheme.by
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 %package semantic-scm-by
 %provide semantic/bovine/scm-by
@@ -98,4 +98,3 @@ expression : symbol
            ;
 
 ;;; scheme.by ends here
-
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy
index 811a3240604..aefa4c81242 100644
--- a/admin/grammars/srecode-template.wy
+++ b/admin/grammars/srecode-template.wy
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/admin/last-chance.el b/admin/last-chance.el
index cab2d4718d6..76b8bcf6db1 100644
--- a/admin/last-chance.el
+++ b/admin/last-chance.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/make-emacs b/admin/make-emacs
index 4c735065e54..0938336407e 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 require 5;
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index e5c77172c9f..5822f666db4 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -18,7 +18,7 @@ Steps to take before starting on the first pretest in any release sequence:
     when preparing the first pretest for a major Emacs release.)
     Commit cus-edit.el if changed.
 
-3.  Remove any old pretests from ftp://alpha.gnu.org/gnu/emacs/pretest.
+3.  Remove any old pretests from https://alpha.gnu.org/gnu/emacs/pretest.
     You can use 'gnupload --delete' (see below for more gnupload details).
 
 General steps (for each step, check for possible errors):
@@ -101,8 +101,8 @@ General steps (for each step, check for possible errors):
     Check the contents of the new tar with admin/diff-tar-files
     against the previous release (if this is the first pretest) or the
     previous pretest.  If you did not make the previous pretest
-    yourself, find it at <ftp://alpha.gnu.org/gnu/emacs/pretest>.
-    Releases are of course at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
+    yourself, find it at <https://alpha.gnu.org/gnu/emacs/pretest>.
+    Releases are of course at <https://ftp.gnu.org/pub/gnu/emacs/>.
 
     If this is the first pretest of a major release, just comparing
     with the previous release may overlook many new files.  You can try
@@ -130,9 +130,9 @@ General steps (for each step, check for possible errors):
     Now you should upload the files to the GNU ftp server.  In order to
     do that, you must be registered as an Emacs maintainer and have your
     GPG key acknowledged by the ftp people.  For instructions, see
-    http://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html
+    https://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html
     The simplest method to upload is to use the gnulib
-    <http://www.gnu.org/s/gnulib/> script "build-aux/gnupload":
+    <https://www.gnu.org/s/gnulib/> script "build-aux/gnupload":
 
     For a pretest:
      gnupload [--user your@gpg.key.email] --to alpha.gnu.org:emacs/pretest \
@@ -161,11 +161,11 @@ General steps (for each step, check for possible errors):
     FILE.sig, FILE.directive.asc.
     For a release, place the files in the /incoming/ftp directory.
     For a pretest, place the files in /incoming/alpha instead, so that
-    they appear on ftp://alpha.gnu.org/.
+    they appear on https://alpha.gnu.org/.
 
 10. After five minutes, verify that the files are visible at
-    ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, or
-    ftp://ftp.gnu.org/gnu/emacs/ for a release.
+    https://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, or
+    https://ftp.gnu.org/gnu/emacs/ for a release.
 
     Download them and check the signatures.  Check they build.
 
@@ -185,7 +185,7 @@ UPDATING THE EMACS WEB PAGES AFTER A RELEASE
 
 As soon as possible after a release, the Emacs web pages should be updated.
 Anyone with write access to the Emacs code repository can do this.
-For instructions, see <http://savannah.gnu.org/cvs/?group=emacs>.
+For instructions, see <https://savannah.gnu.org/cvs/?group=emacs>.
 Changes go live more or less as soon as they are committed.
 
 The pages to update are:
@@ -215,5 +215,5 @@ Add compressed copies of the main info pages from the tarfile to manual/info/.
 Update the refcards/pdf/ and ps/ directories, and also
 refcards/emacs-refcards.tar.gz (use make -C etc/refcards pdf ps dist).
 
-Browsing <http://web.cvs.savannah.gnu.org/viewvc/?root=emacs> is one
+Browsing <https://web.cvs.savannah.gnu.org/viewvc/?root=emacs> is one
 way to check for any files that still need updating.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index e7b304a264d..60104e86c69 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # written by Paul Eggert
 
diff --git a/admin/merge-pkg-config b/admin/merge-pkg-config
index 363d22dfa5b..dbacb4bc30d 100755
--- a/admin/merge-pkg-config
+++ b/admin/merge-pkg-config
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # written by Paul Eggert
 
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 3d6df03d5e7..6d0fe50ae53 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -1,6 +1,6 @@
 NOTES ON THE EMACS BUG TRACKER   -*- outline -*-
 
-The Emacs Bug Tracker can be found at http://debbugs.gnu.org/
+The Emacs Bug Tracker can be found at https://debbugs.gnu.org/
 
 * Quick-start guide
 
@@ -33,14 +33,14 @@ tags 123 moreinfo|unreproducible|wontfix|patch
 
 * More detailed information
 
-For a list of all bugs, see http://debbugs.gnu.org/db/pa/lemacs.html
+For a list of all bugs, see https://debbugs.gnu.org/db/pa/lemacs.html
 This is a static page, updated once a day.  There is also a dynamic
 list, generated on request. This accepts various options, eg to see
 the most recent bugs:
 
-http://debbugs.gnu.org/cgi/pkgreport.cgi?newest=100
+https://debbugs.gnu.org/cgi/pkgreport.cgi?newest=100
 
-Or follow the links on the front page http://debbugs.gnu.org .
+Or follow the links on the front page https://debbugs.gnu.org .
 
 ** How do I report a bug in Emacs now?
 The same way as you always did.  Send mail to bug-gnu-emacs@gnu.org,
@@ -73,7 +73,7 @@ cc everyone on replies.)
 (Many people think the submitter SHOULD be automatically subscribed
 to subsequent discussion, but this does not seem to be implemented.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=37078
-See also http://debbugs.gnu.org/5439 )
+See also https://debbugs.gnu.org/5439 )
 
 Do NOT send a separate copy to the bug list address, since this may
 generate a new report.  The only time to send mail to the bug list
@@ -246,7 +246,7 @@ reopen 123
 *** Bugs can be tagged in various ways (eg wontfix, patch, etc).
 The available tags are:
 patch wontfix moreinfo unreproducible fixed notabug
-See http://debbugs.gnu.org/Developer#tags
+See https://debbugs.gnu.org/Developer#tags
 The list of tags can be prefixed with +, - or =, meaning to add (the
 default), remove, or reset the tags. E.g.:
 
@@ -254,7 +254,7 @@ tags 123 + wontfix
 
 ** URL shortcuts
 
-http://debbugs.gnu.org/...
+https://debbugs.gnu.org/...
 
 123             # given bug number
 123;mbox=yes    # mbox version of given bug
@@ -314,11 +314,11 @@ search box.  The only piece you really need to add is the "users"
 portion, the rest has the same syntax as normal.
 
 **** To browse bugs by usertag:
-http://debbugs.gnu.org/cgi/pkgindex.cgi?indexon=users
+https://debbugs.gnu.org/cgi/pkgindex.cgi?indexon=users
 
 **** To find all bugs usertagged by a given email address:
 
-http://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs
+https://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs
 
 (Supposedly, the "users" field can be a comma-separated list of more
 than one email address, but it does not seem to work for me.)
@@ -328,7 +328,7 @@ than one email address, but it does not seem to work for me.)
 This works just like a normal tags search, but with the addition of a
 "users" field.  Eg:
 
-http://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs;tag=calendar
+https://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs;tag=calendar
 
 *** To merge bugs:
 Eg when bad replies create a bunch of new bugs for the same report.
@@ -377,7 +377,7 @@ You must unmerge, clone, then re-merge.
 *** To set severity:
 severity 123 critical|grave|serious|important|normal|minor|wishlist
 
-See http://debbugs.gnu.org/Developer#severities for the meanings.
+See https://debbugs.gnu.org/Developer#severities for the meanings.
 
 *** To set the owner of a bug:
 owner 123 A Hacker <none@example.com>
@@ -435,10 +435,10 @@ The bug will be re-archived after the next 28 day period of no activity.
 
 It's a function of the number of displayed bugs.  You can speed things
 up by only looking at the newest 100 bugs:
-http://debbugs.gnu.org/cgi-bin/pkgreport.cgi?newest=100;package=emacs
+https://debbugs.gnu.org/cgi-bin/pkgreport.cgi?newest=100;package=emacs
 
 Or use the static index:
-http://debbugs.gnu.org/db/ix/full.html
+https://debbugs.gnu.org/db/ix/full.html
 
 ** What are those "mbox folder" links on the bug report pages?
 
@@ -484,7 +484,7 @@ the bug web-pages.
 
 *** Debian stuff
 
-http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
+https://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
 
 ** Gnus-specific voodoo
 
@@ -493,7 +493,7 @@ http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
 *** If the above is not available:
 (add-hook 'gnus-article-mode-hook
           (lambda ()
-             (setq bug-reference-url-format "http://debbugs.gnu.org/%s")
+             (setq bug-reference-url-format "https://debbugs.gnu.org/%s")
               (bug-reference-mode 1)))
 
 and you can click on the bug number in the subject header.
@@ -507,8 +507,8 @@ reference, you don't need to read these as a user of the system.
 Getting mail from the Emacs bug list into the tracker requires the
 assistance of sysadmin at gnu.org.  The test tracker set-up was, I
 think, [gnu.org #359140]:
-http://lists.gnu.org/archive/html/savannah-hackers/2008-03/msg00074.html
-http://lists.gnu.org/archive/html/savannah-hackers/2008-04/msg00034.html
+https://lists.gnu.org/archive/html/savannah-hackers/2008-03/msg00074.html
+https://lists.gnu.org/archive/html/savannah-hackers/2008-04/msg00034.html
 
 ** The debbugs.gnu.org setup was handled in [gnu.org #510605].
 There are two pieces (replace AT with @ in the following):
@@ -548,7 +548,7 @@ It does basic spam processing on the moderator requests and
 automatically rejects the obviously bogus ones.  Someone still has to
 accept the good ones though.  The advantage of this would not be having
 to run and tune our own spam filter.  See
-http://savannah.nongnu.org/projects/listhelper
+https://savannah.nongnu.org/projects/listhelper
 
 An "X-Debbugs-Envelope-To" header is used to keep track of where the
 mail was actually bound for:
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 9b614221caf..8345646b977 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -511,7 +511,7 @@ etc/TUTORIAL* (translations)
   rms: "We can leave the TUTORIAL translations alone until their
   maintainers update them."
   Can adapt short license text from end of GPL translations at:
-  http://www.gnu.org/licenses/translations.html
+  https://www.gnu.org/licenses/translations.html
   Only a few sentences around the license notice need changing from
   previous version.
 Done: TUTORIAL.eo
@@ -594,4 +594,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/notes/elpa b/admin/notes/elpa
index 4c0f1980def..ea6c132fe19 100644
--- a/admin/notes/elpa
+++ b/admin/notes/elpa
@@ -10,7 +10,7 @@ repository named "elpa", hosted on Savannah.  To check it out:
 
 Changes to this branch propagate to elpa.gnu.org via a "deployment" script run
 daily.  This script (which is kept in elpa/admin/update-archive.sh) generates
-the content visible at http://elpa.gnu.org/packages.
+the content visible at https://elpa.gnu.org/packages.
 
 A new package is released as soon as the "version number" of that package is
 changed.  So you can use 'elpa' to work on a package without fear of releasing
diff --git a/admin/notes/font-backend b/admin/notes/font-backend
index 2418966c93d..65c37a483bc 100644
--- a/admin/notes/font-backend
+++ b/admin/notes/font-backend
@@ -66,4 +66,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/notes/hydra b/admin/notes/hydra
index 4c1944a57da..a0c46df08e4 100644
--- a/admin/notes/hydra
+++ b/admin/notes/hydra
@@ -68,4 +68,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index d0096adc6d2..0969daf9d07 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -1296,4 +1296,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 8284e1b44cf..bc7279150a9 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -306,4 +306,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/notes/www b/admin/notes/www
index 8e911a44d50..8e5bfb68d7a 100644
--- a/admin/notes/www
+++ b/admin/notes/www
@@ -79,4 +79,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32
index f4214161230..aa91633dd49 100644
--- a/admin/nt/README-UNDUMP.W32
+++ b/admin/nt/README-UNDUMP.W32
@@ -7,7 +7,7 @@ This README file describes how to dump a bare precompiled version of
 GNU Emacs for Windows.  This barebin distribution supplements the
 standard distribution of Emacs, which you can download from:
 
-        ftp://ftp.gnu.org/gnu/emacs/
+        https://ftp.gnu.org/gnu/emacs/
 
 If you do not have the "bin" or "src" distribution, then you will need
 to download one of those before you can use this barebin version.
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 76b3c646503..8f84edee47d 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -18,7 +18,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ### Commentary:
diff --git a/admin/release-process b/admin/release-process
index 6aa004014b8..3bb72b9735c 100644
--- a/admin/release-process
+++ b/admin/release-process
@@ -115,12 +115,12 @@ Redirect /software/emacs/manual/html_mono/automake.html /software/automake/manua
 Redirect /software/emacs/manual/html_node/automake/ /software/automake/manual/html_node/
 
 Another tool you can use to check links is gnu.org's linc.py:
-http://www.gnu.org/server/source/
+https://www.gnu.org/server/source/
 
 You run this with something like:
 
 cd /path/to/cvs/emacs-www
-linc.py -o /path/to/output-dir --url http://www.gnu.org/software/emacs/ .
+linc.py -o /path/to/output-dir --url https://www.gnu.org/software/emacs/ .
 
 Be warned that it is really, really slow (as in, can take ~ a full day
 to check the manual/ directory).  It is probably best to run it on a
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 5cc43bc3718..c389cb3f535 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 SHELL = @SHELL@
 
@@ -119,4 +119,3 @@ maintainer-clean: distclean
 extraclean:
         rm -f ${top_srcdir}/src/macuvs.h ${unidir}/charscript.el*
         rm -f ${unifiles} ${unidir}/charprop.el
-
diff --git a/admin/unidata/blocks.awk b/admin/unidata/blocks.awk
index 7845d02cdc8..8eafedb82c2 100755
--- a/admin/unidata/blocks.awk
+++ b/admin/unidata/blocks.awk
@@ -17,7 +17,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
@@ -32,7 +32,7 @@
 ## The Unicode blocks actually extend past some of these ranges with
 ## undefined codepoints.
 
-## For additional details, see <http://debbugs.gnu.org/20789#11>.
+## For additional details, see <https://debbugs.gnu.org/20789#11>.
 
 ## Things to do after installing a new version of Blocks.txt:
 ## Check the output against the old output.
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index 478099c831a..e6e8aaa0954 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/unidata/uvs.el b/admin/unidata/uvs.el
index 0b7edc73c8c..f254f4a3666 100644
--- a/admin/unidata/uvs.el
+++ b/admin/unidata/uvs.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/update-copyright b/admin/update-copyright
index 4da327bd9c3..a068816e304 100755
--- a/admin/update-copyright
+++ b/admin/update-copyright
@@ -22,7 +22,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # written by Paul Eggert
 
diff --git a/admin/update_autogen b/admin/update_autogen
index ba4ed00fa39..cfbb7c77a79 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -18,7 +18,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary: