[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 946a56a: Update some URLs

From: Paul Eggert
Subject: [Emacs-diffs] master 946a56a: Update some URLs
Date: Mon, 23 Sep 2019 03:12:59 -0400 (EDT)

branch: master
commit 946a56a10fed769646a8b7c4ebc53f53c84be896
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Update some URLs
    This mostly changes http: to https: in URLs.  It also updates
    some URLs that have moved, removes some URLs that no longer
    work, recommends against using procmail (procmail.org no
    longer works), and removes some mentions of the
    no-longer-existing Gmane, LPF and VTW.
    It doesn't update all URLs, just the ones I had time for.
    * GNUmakefile (help):
    * admin/admin.el (manual-doctype-string):
    * admin/charsets/Makefile.in (${charsetdir}/ALTERNATIVNYJ.map):
    * admin/charsets/mapconv:
    * lisp/net/soap-client.el (soap-create-envelope):
    * lisp/org/org.el (org-doi-server-url):
    * lisp/textmodes/bibtex.el (bibtex-generate-url-list):
    Prefer https: to http: un URLs.
 CONTRIBUTE                                 |  4 +-
 GNUmakefile                                |  2 +-
 admin/admin.el                             |  2 +-
 admin/automerge                            |  2 +-
 admin/charsets/Makefile.in                 |  6 +--
 admin/charsets/cp932.awk                   |  3 +-
 admin/charsets/eucjp-ms.awk                |  2 +-
 admin/charsets/mapconv                     |  9 ++--
 admin/charsets/mapfiles/README             |  6 +--
 admin/grammars/js.wy                       |  2 +-
 admin/notes/bugtracker                     |  8 ++--
 admin/notes/copyright                      |  8 ++--
 admin/notes/emba                           |  3 --
 admin/notes/nextstep                       |  3 --
 admin/notes/spelling                       |  2 +-
 doc/emacs/emacs.texi                       |  2 +-
 doc/emacs/mule.texi                        |  2 +-
 doc/emacs/package.texi                     |  2 +-
 doc/lispref/frames.texi                    |  2 +-
 doc/lispref/nonascii.texi                  |  6 +--
 doc/lispref/os.texi                        |  2 +-
 doc/lispref/package.texi                   |  4 +-
 doc/lispref/processes.texi                 |  4 +-
 doc/lispref/text.texi                      |  4 +-
 doc/lispref/tips.texi                      |  2 +-
 doc/misc/auth.texi                         |  4 +-
 doc/misc/autotype.texi                     |  3 +-
 doc/misc/cc-mode.texi                      | 12 +++---
 doc/misc/dbus.texi                         | 12 +++---
 doc/misc/efaq.texi                         | 27 +-----------
 doc/misc/eieio.texi                        |  2 +-
 doc/misc/emacs-gnutls.texi                 |  2 +-
 doc/misc/epa.texi                          |  2 +-
 doc/misc/erc.texi                          |  6 +--
 doc/misc/ert.texi                          |  6 +--
 doc/misc/eudc.texi                         |  4 +-
 doc/misc/eww.texi                          |  2 +-
 doc/misc/gnus-faq.texi                     | 43 +++++++++----------
 doc/misc/gnus.texi                         | 38 ++++++++---------
 doc/misc/message.texi                      |  4 +-
 doc/misc/mh-e.texi                         | 67 ++++++++++++++++--------------
 doc/misc/newsticker.texi                   |  5 +--
 doc/misc/org.texi                          |  2 +-
 doc/misc/url.texi                          |  3 +-
 doc/misc/wisent.texi                       |  2 +-
 etc/MH-E-NEWS                              |  6 +--
 etc/NEWS.23                                |  2 +-
 etc/PROBLEMS                               |  2 +-
 etc/TODO                                   |  2 +-
 lib-src/make-fingerprint.c                 |  2 +-
 lib/fingerprint.c                          |  2 +-
 lib/fingerprint.h                          |  2 +-
 lisp/cedet/pulse.el                        |  4 +-
 lisp/gnus/gnus-group.el                    |  1 +
 lisp/net/dbus.el                           | 10 ++---
 lisp/net/newst-backend.el                  |  4 +-
 lisp/net/soap-client.el                    |  2 +-
 lisp/org/org.el                            |  2 +-
 lisp/progmodes/verilog-mode.el             |  6 +--
 lisp/progmodes/vhdl-mode.el                |  2 +-
 lisp/textmodes/bibtex.el                   |  2 +-
 lisp/url/url-vars.el                       |  2 +-
 lisp/xt-mouse.el                           |  2 +-
 src/.gdbinit                               |  2 +-
 src/character.c                            |  2 +-
 src/coding.c                               |  2 +-
 src/emacs.c                                |  6 +--
 src/fileio.c                               |  2 +-
 src/image.c                                |  4 +-
 src/lcms.c                                 |  2 +-
 src/lisp.h                                 |  2 +-
 src/nsfont.m                               |  2 +-
 src/pdumper.h                              |  2 +-
 src/process.c                              |  3 +-
 src/widget.c                               |  7 +---
 src/window.c                               |  4 +-
 src/xfaces.c                               |  2 +-
 src/xselect.c                              |  2 +-
 src/xsettings.c                            |  4 +-
 src/xterm.c                                |  8 ++--
 test/lisp/emacs-lisp/cl-preloaded-tests.el |  2 +-
 test/manual/biditest.el                    |  2 +-
 82 files changed, 202 insertions(+), 251 deletions(-)

index f480ffe..d9502dc 100644
@@ -23,8 +23,8 @@ The following shell commands then build and run Emacs from 
 For more details, see
-http://www.emacswiki.org/emacs/GitQuickStartForEmacsDevs and
-http://www.emacswiki.org/emacs/GitForEmacsDevs or see the file
+https://www.emacswiki.org/emacs/GitQuickStartForEmacsDevs and
+https://www.emacswiki.org/emacs/GitForEmacsDevs or see the file
 ** Getting involved with development
diff --git a/GNUmakefile b/GNUmakefile
index 274109c..9f279b7 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -39,7 +39,7 @@ help:
        @echo "NOTE:  This is a brief summary of some common make targets."
        @echo "For more detailed information, please read the files INSTALL,"
        @echo "INSTALL.REPO, Makefile or visit this URL:"
-       @echo 
+       @echo 
        @echo ""
        @echo "make all              -- compile and build Emacs"
        @echo "make install          -- install Emacs"
diff --git a/admin/admin.el b/admin/admin.el
index 5968e32..76f5500 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -337,7 +337,7 @@ Optional argument TYPE is type of output (nil means all)."
 (defconst manual-doctype-string
   "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"
 (defconst manual-meta-string
   "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">
diff --git a/admin/automerge b/admin/automerge
index 405fd9e..21a2cf0 100755
--- a/admin/automerge
+++ b/admin/automerge
@@ -236,7 +236,7 @@ git fetch || die "fetch error"
     ## Rebasing would be incorrect, since it would rewrite the
     ## (already published) release branch commits.
-    ## Ref eg http://lists.gnu.org/r/emacs-devel/2014-12/msg01435.html
+    ## Ref eg https://lists.gnu.org/r/emacs-devel/2014-12/msg01435.html
     ## Instead, we throw away what we just did, and do the merge again.
     echo "Resetting..."
     git reset --hard $rev
diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in
index 9f6b3e9..efeac26 100644
--- a/admin/charsets/Makefile.in
+++ b/admin/charsets/Makefile.in
@@ -141,7 +141,7 @@ ${charsetdir}/VSCII-2.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz 
${mapconv} ${compact}
 ${charsetdir}/ALTERNATIVNYJ.map: ${charsetdir}/IBM866.map
        ${AM_V_GEN}(echo "# Modified from $(notdir $<) according to the chart 
at" && \
-         echo "# http://www.cyrillic.com/ref/cyrillic/koi-8alt.html,"; && \
+         echo "# 
 && \
          echo "# with guesses for the Unicodes of the glyphs." && \
          sed -e '1 d' \
             -e '/0xF2/ s/ .*/ 0x2019/' \
@@ -226,8 +226,8 @@ ${lispintdir}/eucjp-ms.el: ${GLIBC_CHARMAPS}/EUC-JP-MS.gz 
 # As Uni2JIS doesn't contain mappings of characters added to Unicode
 # recently, we add them manually here (including one correction for
-# U+005C vs U+FF3C).  These changes are based on bogytech's blog at
-# http://bogytech.blogspot.jp/search/label/emacs.
+# U+005C vs U+FF3C).  These changes are based on bogytech's blog at:
+# https://bogytech.blogspot.com/search/label/emacs
 ${charsetdir}/JISC6226.map: ${mapfiledir}/Uni2JIS ${mapconv} ${kuten}
        ${AM_V_GEN}(${run_mapconv} $< '/^[^#].*0-/' YASUOKA ${kuten} \
          | sed -e '/0x2140/s/005C/FF3C/' && \
diff --git a/admin/charsets/cp932.awk b/admin/charsets/cp932.awk
index 7fd3e91..27fdf02 100644
--- a/admin/charsets/cp932.awk
+++ b/admin/charsets/cp932.awk
@@ -22,8 +22,7 @@
 # Add a sort key 0, 1, 2, or 3 at the tail of each line as a comment
 # to realize the round trip mapping to Unicode works as described in
-# this page:
-#      http://support.microsoft.com/default.aspx?scid=kb;EN-US;170559
+# https://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT
 # Each sort key means as below:
 #   0: JISX0208 characters.
 #   1: NEC special characters.
diff --git a/admin/charsets/eucjp-ms.awk b/admin/charsets/eucjp-ms.awk
index 94e27d0..0c9f94d 100644
--- a/admin/charsets/eucjp-ms.awk
+++ b/admin/charsets/eucjp-ms.awk
@@ -21,7 +21,7 @@
 # Commentary:
 # eucJP-ms is one of eucJP-open encoding defined at this page:
-#  http://home.m05.itscom.net/numa/cde/ucs-conv/appendix.html
 # This program reads the mapping file EUC-JP-MS (of glibc) and
 # generates the Elisp file eucjp-ms.el that defines two translation
 # tables 'eucjp-ms-decode' and 'eucjp-ms-encode'.
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index 8e19972..2af715a 100755
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -51,17 +51,18 @@ case "$3" in
-       SOURCE="http://czyborra.com/charsets/${BASE}";;;
+       SOURCE="https://czyborra.com/charsets/${BASE}";;;
-       SOURCE="http://www.iana.org/assignments/charset-reg/${BASE}";;;
+       SOURCE="https://www.iana.org/assignments/charset-reg/${BASE}";;;
-       SOURCE="http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/${BASE}";;;
+       SOURCE="https://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/${BASE}";;;
+       # FIXME: This URL no longer works.
        printf 'Unknown file type: %s\n' "$3"
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README
index 7e4493b..4cc615b 100644
--- a/admin/charsets/mapfiles/README
+++ b/admin/charsets/mapfiles/README
@@ -15,7 +15,7 @@ files based on freely available information.
 * CP932.TXT
 Available at:
-    <http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT>
+    <https://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT>
 * PTCP154
@@ -42,8 +42,8 @@ Available at:
 * stdenc.txt and symbol.txt
 Available at:
-    <http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/stdenc.txt>
-    <http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt>
+    <https://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/stdenc.txt>
+    <https://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt>
 (2) Newly created files
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy
index ff048d8..f5aca81 100644
--- a/admin/grammars/js.wy
+++ b/admin/grammars/js.wy
@@ -25,7 +25,7 @@
 ;; The grammar itself is transcribed from the ECMAScript Language
 ;; Specification published at
-;; http://www.ecma-international.org/publications/standards/Ecma-262.htm
+;; https://www.ecma-international.org/publications/standards/Ecma-262.htm
 ;; and redistributed under the following license:
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index b890b89..ac54f8d 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -76,7 +76,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 https://bugs.debian.org/37078
 See also https://debbugs.gnu.org/5439 )
 Do NOT send a separate copy to the bug list address, since this may
@@ -155,7 +155,7 @@ Package: emacs
 Version: 23.0.60
 Severity: minor
-Remember to fix FOO, as discussed on emacs-devel at http://... .
+Remember to fix FOO, as discussed on emacs-devel at https://... .
 ** Not interested in tracker control messages (tags being set, etc)?
 Discard mails matching:
@@ -280,7 +280,7 @@ tag:tag                # all bugs with given tag
 *** Usertags
-See <http://wiki.debian.org/bugs.debian.org/usertags>
+See <https://wiki.debian.org/bugs.debian.org/usertags>
 "Usertags" are very similar to tags: a set of labels that can be added
 to a bug.  There are two differences between normal tags and user tags:
@@ -385,7 +385,7 @@ will be assigned proper numbers).
 NB you cannot clone a merged bug.  You'd think that trying to do so
 would just give you an unmerged copy of the specified bug number, but no:
 You must unmerge, clone, then re-merge.
diff --git a/admin/notes/copyright b/admin/notes/copyright
index e22db6b..5a0cf4d 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -193,14 +193,14 @@ lib-src/etags.c
   After some investigation in Feb 2007, then to the best of our
   knowledge we believe that the original 1984 Emacs version was based
   on the version in BSD4.2. See for example this 1985 post from Ken Arnold:
     I have received enough requests for the current source to ctags
     to post it. Here is the latest version (what will go out with
     4.3, modulo any bugs fixed during the beta period). It is the
     4.2 ctags with recognition of yacc and lex tags added.
   See also a 1984 version of ctags (no copyright) posted to net.sources:
-  <http://groups.google.com/group/net.sources/msg/a21b6c21be12a98d>
+  <https://groups.google.com/group/net.sources/msg/a21b6c21be12a98d>
   Version of etags.c in emacs-16.56 duplicates comment typos.
   Accordingly, in Feb 2007 we added a 1984 copyright for the
@@ -350,9 +350,7 @@ added or not, rms says (2007-02-25, "oldXmenu issues"):
 insque.c had no copyright notice until 2005. The version of insque.c
 added to Emacs 1992-01-27 is essentially the same as insremque.c added
 to glic three days later by Roland McGrath, with an FSF copyright and
-GPL, but no ChangeLog entry:
+GPL, but no ChangeLog entry.
 To the best of his recollection, McGrath (who has a copyright
 assignment) was the author of this file (email from roland at frob.com
 to rms, 2007-02-23, "Where did insque.c come from?"). The FSF
diff --git a/admin/notes/emba b/admin/notes/emba
index cb0dbc4..40fc88b 100644
--- a/admin/notes/emba
+++ b/admin/notes/emba
@@ -19,9 +19,6 @@ when a job fails.  It sends notifications about test status to
 If you want to receive these notifications, please subscribe at
-Alternatively, these notifications can be read via gmane at
 The messages contain a URL to the log file of the failed job, like
diff --git a/admin/notes/nextstep b/admin/notes/nextstep
index a2e5ce2..b053294 100644
--- a/admin/notes/nextstep
+++ b/admin/notes/nextstep
@@ -65,9 +65,6 @@ functions are:
 Currently ctrl-g is not detected in as many circumstances as other emacsen.
 It is not certain whether this is due to the means of event loop integration,
 or errors of omission in the NS code.  This is an area for improvement.
-Also, see the article here and its containing thread:
diff --git a/admin/notes/spelling b/admin/notes/spelling
index a63d4bb..b783227 100644
--- a/admin/notes/spelling
+++ b/admin/notes/spelling
@@ -8,4 +8,4 @@ Re "behavior" vs "behaviour", etc.
 - It's probably (IMHO --ttn, 2017-10-13) not a high priority to
   change existing text; use your best judgement (ask if unsure).
-- http://lists.gnu.org/archive/html/emacs-devel/2005-06/msg00489.html
+- https://lists.gnu.org/r/emacs-devel/2005-06/msg00489.html
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index ad4be90..17aaaea 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1316,7 +1316,7 @@ Emacs editors, all sharing common principles of 
organization.  For
 information on the underlying philosophy of Emacs and the lessons
 learned from its development, see @cite{Emacs, the Extensible,
 Customizable Self-Documenting Display Editor}, available from
 This version of the manual is mainly intended for use with GNU Emacs
 installed on GNU and Unix systems.  GNU Emacs can also be used on
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index dfd464c..bca917d 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1790,7 +1790,7 @@ Reordering of bidirectional text into the @dfn{visual} 
order happens
 at display time.  As a result, character positions no longer increase
 monotonically with their positions on display.  Emacs implements the
 Unicode Bidirectional Algorithm (UBA) described in the
-@uref{http://unicode.org/reports/tr9/, Unicode Standard Annex #9}, for
+@uref{https://unicode.org/reports/tr9/, Unicode Standard Annex #9}, for
 reordering of bidirectional text for display.
 It deviates from the UBA only in how continuation lines are displayed
 when text direction is opposite to the base paragraph direction,
diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index 4b33f25..2c09ca8 100644
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -179,7 +179,7 @@ maintained by the Emacs developers.  This is controlled by 
 variable @code{package-archives}, whose value is a list of package
 archives known to Emacs.  Each list element must have the form
 @code{(@var{id} . @var{location})}, where @var{id} is the name of a
-package archive and @var{location} is the @acronym{HTTP} address or
+package archive and @var{location} is the @acronym{URL} or
 name of the package archive directory.  You can alter this list if you
 wish to use third party package archives---but do so at your own risk,
 and use only third parties that you think you can trust!
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 618ea16..8596db7 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -3861,7 +3861,7 @@ drop.
 @vindex dnd-protocol-alist
   When an URL is dropped on Emacs it may be a file, but it may also be
-another URL type (ftp, http, etc.).  Emacs first checks
+another URL type (https, etc.).  Emacs first checks
 @code{dnd-protocol-alist} to determine what to do with the URL@.  If
 there is no match there and if @code{browse-url-browser-function} is
 an alist, Emacs looks for a match there.  If no match is found the
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index a56a365..612c362 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -453,13 +453,13 @@ during text processing and display.  Thus, character 
properties are an
 important part of specifying the character's semantics.
 @c FIXME: Use the latest URI of this chapter?
-@c http://www.unicode.org/versions/latest/ch04.pdf
+@c https://www.unicode.org/versions/latest/ch04.pdf
   On the whole, Emacs follows the Unicode Standard in its implementation
 of character properties.  In particular, Emacs supports the
-@uref{http://www.unicode.org/reports/tr23/, Unicode Character Property
+@uref{https://www.unicode.org/reports/tr23/, Unicode Character Property
 Model}, and the Emacs character property database is derived from the
 Unicode Character Database (@acronym{UCD}).  See the
-@uref{http://www.unicode.org/versions/latest/ch04.pdf, Character
+@uref{https://www.unicode.org/versions/Unicode12.1.0/ch04.pdf, Character
 Properties chapter of the Unicode Standard}, for a detailed
 description of Unicode character properties and their meaning.  This
 section assumes you are already familiar with that chapter of the
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index ddbc8a8..fae23cb 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -2718,7 +2718,7 @@ interpreted as icon name.
 @item :category @var{category}
 The type of notification this is, a string.  See the
 Desktop Notifications Specification} for a list of standard
diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi
index eb34b8e..57f4cbc 100644
--- a/doc/lispref/package.texi
+++ b/doc/lispref/package.texi
@@ -159,7 +159,7 @@ the various headers, as illustrated by the following 
 ;; Version: 1.3
 ;; Package-Requires: ((flange "1.0"))
 ;; Keywords: multimedia, hypermedia
-;; URL: http://example.com/jrhacker/superfrobnicate
+;; URL: https://example.com/jrhacker/superfrobnicate
@@ -351,7 +351,7 @@ for a multi-file package, it is the package tar file.
 You can also sign the archive's contents file in the same way.
 Make the @file{.sig} files available in the same location as the packages.
 You should also make your public key available for people to download;
-e.g., by uploading it to a key server such as @url{http://pgp.mit.edu/}.
+e.g., by uploading it to a key server such as @url{https://pgp.mit.edu/}.
 When people install packages from your archive, they can use
 your public key to verify the signatures.
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 4c7853b..2ba5b1c 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -2690,8 +2690,8 @@ override this.
 @item :service @var{service}
 @var{service} specifies a port number to connect to; or, for a server,
 the port number to listen on.  It should be a service name like
-@samp{"http"} that translates to a port number, or an integer like @samp{80}
-or an integer string like @samp{"80"} that specifies the port number
+@samp{"https"} that translates to a port number, or an integer like @samp{443}
+or an integer string like @samp{"443"} that specifies the port number
 directly.  For a server, it can also be @code{t}, which means to let
 the system select an unused port number.
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 955ad61..d7b04d2 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -5310,7 +5310,7 @@ the value if contains a valid JSON object; otherwise it 
signals the
 The @code{jsonrpc} library implements the @acronym{JSONRPC}
 specification, version 2.0, as it is described in
-@uref{http://www.jsonrpc.org/}.  As the name suggests, JSONRPC is a
+@uref{https://www.jsonrpc.org/}.  As the name suggests, JSONRPC is a
 generic @dfn{Remote Procedure Call} protocol designed around
 @acronym{JSON} objects, which you can convert to and from Lisp objects
 (@pxref{Parsing JSON}).
@@ -5325,7 +5325,7 @@ generic @dfn{Remote Procedure Call} protocol designed 
 @node JSONRPC Overview
 @subsection Overview
-Quoting from the @uref{http://www.jsonrpc.org/, spec}, JSONRPC "is
+Quoting from the @uref{https://www.jsonrpc.org/, spec}, JSONRPC "is
 transport agnostic in that the concepts can be used within the same
 process, over sockets, over http, or in many various message passing
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 855b284..6d84cfe 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -958,7 +958,7 @@ explains these conventions, starting with an example:
 ;; Created: 14 Jul 2010
 ;; Keywords: languages
-;; URL: http://example.com/foo
+;; URL: https://example.com/foo
 ;; This file is not part of GNU Emacs.
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 850441e..93a301d 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -279,7 +279,7 @@ machine gmail2 login account2@@gmail.com password "account2 
password" port imap
 @chapter Secret Service API
 The @dfn{Secret Service API} is a standard from
 to securely store passwords and other confidential information.  This
 API is implemented by system daemons such as the GNOME Keyring and the
 KDE Wallet (these are GNOME and KDE packages respectively and should
@@ -442,7 +442,7 @@ then fall back to @file{~/.authinfo.gpg}.
 @node The Unix password store
 @chapter The Unix password store
-@uref{http://www.passwordstore.org,,The standard unix password
+@uref{https://www.passwordstore.org,,The standard unix password
 manager} (or just @code{pass}) stores your passwords in
 @code{gpg}-protected files following the Unix philosophy.  The store
 location (any directory) must be specified in the
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index 96262fc..a354383 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -592,8 +592,7 @@ specify that @kbd{M-x quickurl} should insert @var{URL} if 
the word
 (("FSF"      "https://www.fsf.org/"; "The Free Software Foundation")
- ("emacs"  . "http://www.emacs.org/";)
- ("hagbard"  "http://www.hagbard.demon.co.uk"; "Hagbard's World"))
+ ("emacs"  . "https://www.gnu.org/software/emacs/";))
 @end example
 @findex quickurl-add-url
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 1df9dce..2172610 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -393,7 +393,7 @@ version 5.34.
 @ccmode{} supports the editing of C, C++, Objective-C,
 Java, CORBA's Interface Definition Language, Pike@footnote{A C-like
 scripting language with its roots in the LPC language used in some MUD
-engines.  See @uref{http://pike.ida.liu.se/}.} and AWK files.  In this
+engines.  See @uref{https://pike.lysator.liu.se/}.} and AWK files.  In this
 way, you can easily set up consistent font locking and coding styles for
 use in editing all of these languages, although AWK is not yet as
 uniformly integrated as the other languages.
@@ -2693,7 +2693,7 @@ The classic Stroustrup style for C++ code.
 Popular C++ coding standards as defined by ``Programming in C++, Rules
 and Recommendations,'' Erik Nyquist and Mats Henricson,
 Ellemtel@footnote{This document is available at
-@uref{http://www.doc.ic.ac.uk/lab/cplus/c++.rules/} among other
+@uref{https://www.doc.ic.ac.uk/lab/cplus/c++.rules/} among other
 @c N.B.  This URL was still valid at 2005/8/28  (ACM).
@@ -2705,7 +2705,7 @@ C coding standard for Linux (the kernel).
 @cindex Python style
 C coding standard for Python extension modules@footnote{Python is a
 high level scripting language with a C/C++ foreign function interface.
-For more information, see @uref{http://www.python.org/}.}.
+For more information, see @uref{https://www.python.org/}.}.
 @item java
 @cindex Java style
@@ -6014,7 +6014,7 @@ set_line (line_t @{point_t@{0.4, 0.2@},
          ^ enclosing parenthesis.
 @end group
 @end example
 The middle line of that example will have a syntactic context with
 three syntactic symbols, @code{arglist-cont-nonempty},
@@ -6059,7 +6059,7 @@ struct STR @{
 @end group
 @end example
 Note that the syntactic context of the @code{brace-list-intro} line
 also has a syntactic element with the symbol @code{brace-list-entry}
@@ -6100,7 +6100,7 @@ struct STR @{
 @end group
 @end example
 Note that the syntactic context of the @code{brace-list-intro} line
 also has a syntactic element with the symbol @code{brace-list-entry}
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 7c7612f..43bf2f7 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -47,7 +47,7 @@ modify this GNU manual.''
 This manual documents an API for usage of D-Bus in Emacs.  D-Bus is a
 message bus system, a simple way for applications to talk to one
 another.  An overview of D-Bus can be found at
@@ -328,7 +328,7 @@ and @code{direction}.  The @code{name} attribute is 
optional.  The
 in D-Bus.  For a discussion of D-Bus types and their Lisp
 representation see @ref{Type Conversion}.@footnote{D-Bus signatures
 are explained in the D-Bus specification
 The @code{direction} attribute of an @code{arg} element can be only
 @samp{in} or @samp{out}; in case it is omitted, it defaults to
@@ -415,7 +415,7 @@ string and 2 boolean values.@footnote{ The interfaces of 
the service
 @samp{org.freedesktop.Hal} are described in
 @c Previous link is gone.  Since HAL is now obsolete, this URL
 @c (unchanged in ~ 4 years) feels like it might go too...
 the HAL specification}.}
 @end defun
@@ -663,13 +663,13 @@ returned by @code{dbus-introspect-get-signal-names}.  
 Interfaces can have properties.  These can be exposed via the
 @samp{org.freedesktop.DBus.Properties} interface@footnote{See
 That is, properties can be retrieved and changed during lifetime of an
 A generalized interface is
 which returns objects, their interfaces and properties for a given
 service in just one call.
@@ -839,7 +839,7 @@ belong to.  Example:
 @end lisp
 Default annotation names@footnote{See
 @table @samp
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index a591b88..219ad24 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -280,9 +280,8 @@ For information on some of the files in the @file{etc} 
 @pxref{Informational files for Emacs}.
 @node Common acronyms
-@section What are FSF, LPF, GNU, RMS, FTP, and GPL?
+@section What are FSF, GNU, RMS, FTP, and GPL?
 @cindex FSF, definition of
-@cindex LPF, definition of
 @cindex GNU, definition of
 @cindex RMS, definition of
 @cindex Stallman, Richard, acronym for
@@ -297,9 +296,6 @@ For information on some of the files in the @file{etc} 
 @item FSF
 Free Software Foundation
-@item LPF
-League for Programming Freedom
 @item GNU
 GNU's Not Unix
@@ -314,10 +310,6 @@ GNU General Public License
 @end table
-Avoid confusing the FSF and the LPF@.  The LPF opposes
-look-and-feel copyrights and software patents.  The FSF aims to make
-high quality free software available for everyone.
 The word ``free'' in the title of the Free Software Foundation refers to
 ``freedom,'' not ``zero cost.''  Anyone can charge any price for
 GPL-covered software that they want to.  However, in practice, the
@@ -334,7 +326,6 @@ This chapter contains general questions having to do with 
Emacs, the
 Free Software Foundation, and related organizations.
-* The LPF::
 * Real meaning of copyleft::
 * Guidelines for newsgroup postings::
 * Newsgroup archives::
@@ -343,17 +334,6 @@ Free Software Foundation, and related organizations.
 * Contacting the FSF::
 @end menu
-@node The LPF
-@section What is the LPF?
-@cindex LPF, description of
-@cindex League for Programming Freedom
-@cindex Software patents, opposition to
-@cindex Patents for software, opposition to
-The LPF opposes the expanding danger of software patents and
-look-and-feel copyrights.  More information on the LPF's views is
-available at @uref{http://progfree.org/, the LPF home page}.
 @node Real meaning of copyleft
 @section What is the real legal meaning of the GNU copyleft?
 @cindex Copyleft, real meaning of
@@ -427,11 +407,6 @@ Web-based Usenet search services, such as
 @uref{http://groups.google.com/groups/dir?q=gnu&;, Google}, also
 archive the @code{gnu.*} groups.
-You can also read the archives of the @code{gnu.*} groups and post new
-messages at @uref{http://gmane.org/, Gmane}.  Gmane is a service that
-presents mailing lists as newsgroups (even those without a traditional
-mail-to-news gateway).
 @node Reporting bugs
 @section Where should I report bugs and other problems with Emacs?
 @cindex Bug reporting
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index f56b2b6..f20af3b 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -1006,7 +1006,7 @@ what CLOS does when a monotonic class structure is 
 This is derived from the Dylan language documents by
 Kim Barrett et al.: A Monotonic Superclass Linearization for Dylan
-Retrieved from:
+Retrieved from: https://doi.org/10.1145/236338.236343
 @end table
 @node Predicates
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index add79d1..36a490b 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -90,7 +90,7 @@ alias of the second.
 There's one way to find out if GnuTLS is available, by calling
 @code{gnutls-available-p}.  This is a little bit trickier on the W32
 (Windows) platform, but if you have the GnuTLS DLLs (available from
-@url{http://sourceforge.net/projects/ezwinports/files/} thanks to Eli
+@url{https://sourceforge.net/projects/ezwinports/files/} thanks to Eli
 Zaretskii) in the same directory as Emacs, you should be OK.
 @defun gnutls-available-p
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 330ce70..b1ca8d9 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -312,7 +312,7 @@ blobs inside a message body, not using modern MIME format.
 NOTE: Inline OpenPGP is not recommended and you should consider to use
 PGP/MIME@.  See
 Inline OpenPGP in E-mail is bad@comma{} Mm'kay?}.
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index e1d2217..a6b39c2 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -699,7 +699,7 @@ stuff, to the current ERC buffer."
 ;; This causes ERC to connect to the IRC server on your own machine (if
 ;; you have one) upon hitting C-c e b.  Replace MYNICK with your IRC
-;; nick.  Often, people like to run bitlbee (http://bitlbee.org/) as an
+;; nick.  Often, people like to run bitlbee (https://bitlbee.org/) as an
 ;; AIM/Jabber/MSN to IRC gateway, so that they can use ERC to chat with
 ;; people on those networks.
 (global-set-key "\C-ceb" (lambda () (interactive)
@@ -801,7 +801,7 @@ or if you have bugs to report, there are several places you 
can go.
 @itemize @bullet
-@uref{http://www.emacswiki.org/cgi-bin/wiki/ERC} is the
+@uref{https://www.emacswiki.org/emacs/ERC} is the
 emacswiki.org page for ERC@.  Anyone may add tips, hints, etc.@: to it.
@@ -838,7 +838,7 @@ general.
 @c mlang@@delysid.org, alex@@gnu.org
 In June 2001, Mario Lang and Alex Schroeder
 took over development and created a ERC Project at
 In reaction to a mail about the new ERC development effort, Sergey
 Berezin said, ``First of all, I'm glad that my version of ERC is being
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index d2d8655..2dbba09 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -53,7 +53,7 @@ ERT is similar to tools for other environments such as JUnit, 
but has
 unique features that take advantage of the dynamic and interactive
 nature of Emacs.  Despite its name, it works well both for test-driven
 development (see
-@url{http://en.wikipedia.org/wiki/Test-driven_development}) and for
+@url{https://en.wikipedia.org/wiki/Test-driven_development}) and for
 traditional software development methods.
@@ -899,11 +899,11 @@ For information on mocks, stubs, fixtures, or test 
suites, see below.
 Stubbing out functions or using so-called @emph{mocks} can make it
 easier to write tests.  See
-@url{http://en.wikipedia.org/wiki/Mock_object} for an explanation of
+@url{https://en.wikipedia.org/wiki/Mock_object} for an explanation of
 the corresponding concepts in object-oriented languages.
 ERT does not have built-in support for mocks or stubs.  The package
-@code{el-mock} (see @url{http://www.emacswiki.org/emacs/el-mock.el})
+@code{el-mock} (see @url{https://www.emacswiki.org/emacs/el-mock.el})
 offers mocks for Emacs Lisp and can be used in conjunction with ERT.
diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi
index 568f94b..9e91871 100644
--- a/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@ -131,7 +131,7 @@ complement to the DAP itself.
 LDAP servers usually store (but are not limited to) information about
 people such as their name, phone number, email address, office
 location, etc@enddots{} More information about LDAP can be found at
 EUDC requires external support to access LDAP directory servers
 (@pxref{LDAP Configuration})
@@ -193,7 +193,7 @@ email composition buffers (@pxref{Inline Query Expansion})
 LDAP support is added by means of @file{ldap.el}, which is part of
 Emacs.  @file{ldap.el} needs an external program called
 @command{ldapsearch}, available as part of OpenLDAP
-(@url{http://www.openldap.org/}).  The configurations in this section
+(@url{https://www.openldap.org/}).  The configurations in this section
 were tested with OpenLDAP 2.4.23.
 Most servers use LDAP-over-SSL these days; the examples here reflect
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index 63f676e..315b4b0 100644
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -319,7 +319,7 @@ Gnus.  He started writing an Emacs HTML rendering library,
 @code{shr.el}, to read blogs in Gnus.  He eventually added a web
 browser front end and HTML form support.  Which resulted in EWW, the
 Emacs Web Wowser.  EWW was announced on 16 June 2013:
 EWW was then moved from the Gnus repository to GNU Emacs and several
 developers started contributing to it as well.
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index f295c99..b0dc9c3 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -164,7 +164,7 @@ Gnus is released independent from releases of Emacs.  
Therefore, the
 version bundled with Emacs might not be up to date (e.g., Gnus 5.9
 bundled with Emacs 21 is outdated).
 You can get the latest released version of Gnus from
 or from
@@ -178,10 +178,9 @@ What to do with the tarball now?
 Untar it via @samp{tar xvzf gnus.tar.gz} and do the common
 @samp{./configure; make; make install} circle.
 (under MS-Windows either get the Cygwin environment from
 which allows you to do what's described above or unpack the
-tarball with some packer (e.g., Winace from
+tarball with some packer (e.g., Winace)
 and use the batch-file make.bat included in the tarball to install
 Gnus.) If you don't want to (or aren't allowed to) install Gnus
 system-wide, you can install it in your home directory and add the
@@ -1367,12 +1366,12 @@ Is there a spell-checker? Perhaps even on-the-fly 
 You can use ispell.el to spell-check stuff in Emacs. So the
 first thing to do is to make sure that you've got either
-@uref{http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell.html, ispell}
-or @uref{http://aspell.sourceforge.net/, aspell}
+@uref{https://www.cs.hmc.edu/~geoff/ispell.html, ispell}
+or @uref{http://aspell.net, aspell}
 installed and in your Path. Then you need
-@uref{http://www.kdstevens.com/~stevens/ispell-page.html, ispell.el}
 and for on-the-fly spell-checking
 Ispell.el is shipped with Emacs,
 flyspell.el is shipped with Emacs, so there should be no need to install them
@@ -1515,7 +1514,7 @@ cat file.face | sed 's/["\\]/\\&/g' > file.face.quoted
 If you can't use compface, there's an online X-face converter at
 If you use MS Windows, you could also use the WinFace program,
 which used to be available from
@@ -1713,7 +1712,7 @@ The easiest way is to tell your old mail program to
 export the messages in mbox format. Most Unix mailers
 are able to do this, if you come from the MS Windows
 world, you may find tools at
 Now you've got to import this mbox file into Gnus. To do
 this, create a nndoc group based on the mbox file by
@@ -1787,7 +1786,7 @@ How to search for a specific message?
 There are several ways for this, too. For a posting from
 a Usenet group the easiest solution is probably to ask
-@uref{http://groups.google.com, groups.google.com},
+@uref{https://groups.google.com, groups.google.com},
 if you found the posting there, tell Google to display
 the raw message, look for the message-id, and say
 @samp{M-^ the@@message.id @key{RET}} in a
@@ -1942,21 +1941,21 @@ when you're online.
 Let's talk about Unix systems first: For the news part,
 the easiest solution is a small nntp server like
 @uref{http://www.leafnode.org/, Leafnode} or
-@uref{http://infa.abo.fi/~patrik/sn/, sn},
+@uref{http://patrik.iki.fi/sn/, sn},
 of course you can also install a full featured news
 server like
-@uref{http://www.isc.org/software/inn/, inn}.
+@uref{https://www.isc.org/othersoftware/, inn}.
 Then you want to fetch your Mail, popular choices
-are @uref{http://www.catb.org/~esr/fetchmail/, fetchmail}
+are @uref{http://www.fetchmail.info/, fetchmail}
 and @uref{http://pyropus.ca/software/getmail/, getmail}.
 You should tell those to write the mail to your disk and
 Gnus to read it from there. Last but not least the mail
 sending part: This can be done with every MTA like
-@uref{http://www.sendmail.org/, sendmail} or
-@uref{http://www.exim.org/, exim}.
+@uref{https://www.proofpoint.com/us/open-source-email-solution, sendmail} or
+@uref{https://www.exim.org/, exim}.
 On windows boxes I'd vote for
-@uref{http://www.tglsoft.de/, Hamster},
+@uref{http://www.tglsoft.de/freeware_hamster.html, Hamster},
 it's a small freeware, open-source program which fetches
 your mail and news from remote servers and offers them
 to Gnus (or any other mail and/or news reader) via nntp
@@ -2100,7 +2099,7 @@ Which websites should I know?
 @subsubheading Answer
 The most important one is the
-@uref{http://www.gnus.org, official Gnus website}.
+@uref{https://www.gnus.org, official Gnus website}.
 Tell me about other sites which are interesting.
@@ -2111,9 +2110,7 @@ Which mailing lists and newsgroups are there?
 @subsubheading Answer
-There's the newsgroup gnu.emacs.gnus (also available as
-gmane.emacs.gnus.user}) which deals with general Gnus
+There's the newsgroup gnu.emacs.gnus which deals with general Gnus
 questions.  If you have questions about development versions of
 Gnus, you should better ask on the ding mailing list, see below.
@@ -2124,9 +2121,7 @@ the above groups).  If you speak German, there's
 The ding mailing list (ding@@gnus.org) deals with development of
-Gnus. You can read the ding list via NNTP, too under the name
-gmane.emacs.gnus.general} from news.gmane.org.
 @node FAQ 8-5
 @subsubheading Question 8.5
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 4824cdc..afa45d1 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -2629,6 +2629,9 @@ type.  @xref{Document Groups}.
 Create one of the groups mentioned in @code{gnus-useful-groups}
+@c FIXME: Gmane.org is no longer working; fix the Gmane referrences
+@c in this file accordingly.
 @item G w
 @kindex G w @r{(Group)}
 @findex gnus-group-make-web-group
@@ -3234,7 +3237,7 @@ group by reverse date to see the latest news at the top 
and an
 Debian daily news group @code{gmane.linux.debian.user.news} from
 news.gmane.org.  The @acronym{RSS} group corresponds to the Debian
 weekly news RSS feed
@@ -9164,10 +9167,10 @@ Use @uref{http://emacs-w3m.namazu.org/, emacs-w3m}.
 Use @uref{http://w3m.sourceforge.net/, w3m}.
 @item links
-Use @uref{http://links.sf.net/, Links}.
+Use @uref{https://almende.github.io/chap-links-library/, CHAP Links}.
 @item lynx
-Use @uref{http://lynx.isc.org/, Lynx}.
+Use @uref{https://lynx.browser.org/, Lynx}.
 @item html2text
 Use html2text---a simple @acronym{HTML} converter included with Gnus.
@@ -9591,7 +9594,7 @@ Picons, on the other hand, reside on your own system, and 
Gnus will
 try to match the headers to what you have (@pxref{Picons}).
 Gravatars reside on-line and are fetched from
-@uref{http://www.gravatar.com/} (@pxref{Gravatars}).
+@uref{https://en.gravatar.com/} (@pxref{Gravatars}).
 All these functions are toggles---if the elements already exist,
 they'll be removed.
@@ -13897,7 +13900,7 @@ installed.  You then define a server as follows:
 @findex nntp-open-ssl-stream
 @item nntp-open-ssl-stream
 Opens a connection to a server over a @dfn{secure} channel.  To use
-this you must have @uref{http://www.openssl.org, OpenSSL}
+this you must have @uref{https://www.openssl.org/, OpenSSL}
 @c Defunct URL, ancient package, so don't mention it.
 or @uref{ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL, SSLeay}
@@ -16411,7 +16414,7 @@ have to set this variable to @code{t}.  The default is 
 @code{nnmaildir} stores mail in the maildir format, with each maildir
 corresponding to a group in Gnus.  This format is documented here:
-@uref{http://cr.yp.to/proto/maildir.html}.  @code{nnmaildir}
+@uref{https://cr.yp.to/proto/maildir.html}.  @code{nnmaildir}
 also stores extra information in the @file{.nnmaildir/} directory
 within a maildir.
@@ -17083,7 +17086,7 @@ Some web sites have an RDF Site Summary (@acronym{RSS}).
 @acronym{RSS} is a format for summarizing headlines from news related
 sites (such as BBC or CNN).  But basically anything list-like can be
 presented as an @acronym{RSS} feed: weblogs, changelogs or recent
-changes to a wiki (e.g., @url{http://cliki.net/site/recent-changes}).
+changes to a wiki (e.g., @url{https://cliki.net/site/recent-changes}).
 @acronym{RSS} has a quite regular and nice interface, and it's
 possible to get the information Gnus needs to keep groups updated.
@@ -20864,6 +20867,7 @@ The kill to score conversion package isn't included in 
Emacs by default.
 You can fetch it from the contrib directory of the Gnus distribution or
+@c FIXME: The above URL no longer works.
 If your old kill files are very complex---if they contain more
 non-@code{gnus-kill} forms than not, you'll have to convert them by
@@ -21370,9 +21374,6 @@ to get a group name.  By default this is 
 FIXME: Say something more here.
-Documentation for swish-e may be found at the swish-e homepage
 @table @code
 @item nnir-swish-e-program
@@ -23557,7 +23558,7 @@ represent the author of the message.
 @cindex face
 @findex gnus-article-display-face
 The contents of a @code{Face} header must be a base64 encoded PNG image.
-See @uref{http://quimby.gnus.org/circus/face/} for the precise
+See @uref{https://quimby.gnus.org/circus/face/} for the precise
 The @code{gnus-face-properties-alist} variable affects the appearance of
@@ -23681,7 +23682,7 @@ in either monochrome @code{XBM} format or color 
@code{XPM} and
 @vindex gnus-picon-databases
 For instructions on obtaining and installing the picons databases,
 point your Web browser at
 If you are using Debian GNU/Linux, saying @samp{apt-get install
 picon-.*} will install the picons where Gnus can find them.
@@ -23750,7 +23751,7 @@ interesting.
 A gravatar is an image registered to an e-mail address.
-You can submit yours on-line at @uref{http://www.gravatar.com}.
+You can submit yours on-line at @uref{https://en.gravatar.com/}.
 The following variables offer control over how things are displayed.
@@ -24147,8 +24148,7 @@ compute a hash collision up to a certain number of 
bits.  The
 resulting hashcash cookie is inserted in a @samp{X-Hashcash:} header.
 For more details, and for the external application @code{hashcash} you
 need to install to use this feature, see
-@uref{http://www.hashcash.org/}.  Even more information can be found
-at @uref{http://www.camram.org/}.
 If you wish to generate hashcash for each message you send, you can
 customize @code{message-generate-hashcash} (@pxref{Mail Headers, ,Mail
@@ -24999,7 +24999,7 @@ added to a group's @code{spam-process} parameter, the 
 articles groups will be reported to the Gmane administrators via a
 HTTP request.
-Gmane can be found at @uref{http://gmane.org}.
+Gmane was formerly found at @uref{http://gmane.org}.
@@ -26505,7 +26505,7 @@ but at the common table.@*
 If you want to investigate the person responsible for this outrage,
 you can point your (feh!) web browser to
-@uref{http://quimby.gnus.org/}.  This is also the primary
+@uref{https://quimby.gnus.org/}.  This is also the primary
 distribution point for the new and spiffy versions of Gnus, and is
 known as The Site That Destroys Newsrcs And Drives People Mad.
@@ -26567,9 +26567,7 @@ Gnus 5.10 on May 1st 2003 (24 releases).
 On the January 4th 2004, No Gnus was begun.
-On April 19, 2010 Gnus development was moved to Git.  See
-http://git.gnus.org for details (http://www.gnus.org will be updated
-with the information when possible).
+On April 19, 2010 Gnus development was moved to Git.
 On the January 31th 2012, Ma Gnus was begun.
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 7089bb5..9b79fe6 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1143,7 +1143,7 @@ standards, OpenSSL and so on.
 The @acronym{S/MIME} support in Message (and @acronym{MML}) can use
 OpenSSL@.  OpenSSL performs the actual @acronym{S/MIME} sign/encrypt
-operations.  OpenSSL can be found at @uref{http://www.openssl.org/}.
+operations.  OpenSSL can be found at @uref{https://www.openssl.org/}.
 OpenSSL 0.9.6 and later should work.  Version 0.9.5a cannot extract mail
 addresses from certificates, and it insert a spurious CR character into
 @acronym{MIME} separators so you may wish to avoid it if you would like
@@ -1291,7 +1291,7 @@ to change this behavior you can customize the
 This causes to sign and encrypt in two passes, thus generating a
 message that can be understood by PGP version 2.
-(Refer to @uref{http://www.gnupg.org/gph/en/pgp2x.html} for more
+(Refer to @uref{https://www.gnupg.org/gph/en/pgp2x.html} for more
 information about the problem.)
 @node Encrypt-to-self
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 25dd53c..9d249fb 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -17,8 +17,8 @@
 @set UPDATE-MONTH April, 2016
 @c Other variables.
-@set MH-BOOK-HOME http://rand-mh.sourceforge.net/book/mh
-@set MH-E-HOME http://mh-e.sourceforge.net/
+@set MH-BOOK-HOME https://rand-mh.sourceforge.io/book/
+@set MH-E-HOME https://mh-e.sourceforge.io/
 @c Copyright
@@ -256,9 +256,9 @@ This manual is available in both Info and online formats. 
The Info
 version is distributed with Emacs and can be accessed with the
 @command{info} command (@samp{info mh-e}) or within Emacs (@kbd{C-h i
 m mh-e @key{RET}}). The online version is available at
-@uref{http://mh-e.sourceforge.net/manual/, SourceForge}. Another great
+@uref{https://mh-e.sourceforge.io/manual/, SourceForge}. Another great
 online resource is the book
-@uref{http://rand-mh.sourceforge.net/book/, @cite{MH & nmh: Email for
+@uref{https://rand-mh.sourceforge.io/book/, @cite{MH & nmh: Email for
 Users & Programmers}} (also known as @dfn{the MH book}).
 I hope you enjoy this manual! If you have any comments, or suggestions
@@ -554,8 +554,8 @@ to install MH or tell MH-E where to find MH.
 If you don't have MH on your system already, you must install a
 variant of MH@. The Debian mh-e package does this for you
 automatically (@pxref{Getting MH-E}). Most people use
-@uref{http://www.nongnu.org/nmh/, nmh}, but you may be interested in
-trying out @uref{http://mailutils.org/, GNU mailutils MH}, which
+@uref{https://www.nongnu.org/nmh/, nmh}, but you may be interested in
+trying out @uref{https://mailutils.org/, GNU mailutils MH}, which
 supports IMAP@. Your GNU/Linux distribution probably has packages for
 both of these.
@@ -2092,7 +2092,7 @@ This feature will be turned on by default if your system 
supports it.
 The first header field used, if present, is the Gnus-specific
 @samp{Face:} field@footnote{The @samp{Face:} field appeared in GNU
 Emacs 21 and XEmacs. For more information, see
 @cindex @command{uncompface}
 @cindex Emacs, packages, @samp{x-face}
@@ -2100,6 +2100,7 @@ Emacs 21 and XEmacs. For more information, see
 @cindex @samp{x-face} package
 @vindex mh-show-xface
+@c FIXME: These URLs do not seem to work any more.
 Next is the traditional @samp{X-Face:} header field@footnote{The
 display of this field requires the
@@ -2122,7 +2123,7 @@ Finally, MH-E will display images referenced by the
 @samp{X-Face:} fields are present@footnote{The display of the images
 requires the @uref{https://www.gnu.org/software/wget/wget.html,
 @command{wget} program} to fetch the image and the @command{convert}
-program from the @uref{http://www.imagemagick.org/script/index.php,
+program from the @uref{https://www.imagemagick.org/script/index.php,
 ImageMagick suite}.}. Of the three header fields this is the most
 efficient in terms of network usage since the image doesn't need to be
 transmitted with every single mail. The option
@@ -2509,9 +2510,9 @@ For additional information on buttons, see
 @ref{Article Buttons,,,gnus}, and @ref{MIME Commands,,,gnus}.
 @end ifinfo
-the chapters @uref{http://www.gnus.org/manual/gnus_101.html#SEC101,
+the chapters @uref{https://www.gnus.org/manual/gnus_101.html#SEC101,
 Article Buttons} and
-@uref{http://www.gnus.org/manual/gnus_108.html#SEC108, MIME Commands}
+@uref{https://www.gnus.org/manual/gnus_108.html#SEC108, MIME Commands}
 in the @cite{The Gnus Manual}.
 @end ifnotinfo
@@ -2603,7 +2604,7 @@ and @code{mm-html-inhibit-images}
 (@pxref{Display Customization,,,emacs-mime}).
 @end ifinfo
-(see section @uref{http://www.gnus.org/manual/emacs-mime_6.html,
+(see section @uref{https://www.gnus.org/manual/emacs-mime_6.html,
 Display Customization} in the @cite{The Emacs MIME Manual}).
 @end ifnotinfo
 @c -------------------------
@@ -2623,7 +2624,7 @@ the option @code{mm-w3m-safe-url-regexp}
 (@pxref{Display Customization,,,emacs-mime}).
 @end ifinfo
-(see section @uref{http://www.gnus.org/manual/emacs-mime_6.html,
+(see section @uref{https://www.gnus.org/manual/emacs-mime_6.html,
 Display Customization} in the @cite{The Emacs MIME Manual}).
 @end ifnotinfo
 @c -------------------------
@@ -2647,10 +2648,10 @@ For a couple more sources of information about
 the Gnus command @kbd{W h} (@pxref{Article Washing,,,gnus}).
 @end ifinfo
-see section @uref{http://www.gnus.org/manual/emacs-mime_6.html,
+see section @uref{https://www.gnus.org/manual/emacs-mime_6.html,
 Display Customization} in the @cite{The Emacs MIME Manual} and the
 documentation for the Gnus command @kbd{W h} (see section
-@uref{http://www.gnus.org/manual/gnus_48.html#Article-Washing, Article
+@uref{https://www.gnus.org/manual/gnus_48.html#Article-Washing, Article
 Washing} in the
 @cite{The Gnus Manual}).
 @end ifnotinfo
@@ -2729,7 +2730,7 @@ Drafts}).
 You can read encrypted or signed PGP or GPG messages with
 MH-E@footnote{This feature depends on post-5.10 versions of Gnus.
 @cite{MIME Security with OpenPGP} is documented in
-@uref{http://www.rfc-editor.org/rfc/rfc3156.txt, RFC 3156}. However,
+@uref{https://www.rfc-editor.org/rfc/rfc3156.txt, RFC 3156}. However,
 MH-E can also decrypt old-style PGP messages that are not in MIME
 format.}. This section assumes that you already have a good
 understanding of GPG and have set up your keys appropriately.
@@ -5050,7 +5051,7 @@ for the next hook function. The standard prefix
 @vindex mh-yank-behavior
 For example, if you use the hook function
 @code{trivial-cite}} (which is NOT part of Emacs), set
 @code{mh-yank-behavior} to @samp{Body and Header}.
@@ -5166,11 +5167,11 @@ contains the value of the @samp{X-Face:} header field.
 The @samp{X-Face:} header field, which is a low-resolution, black and
 white image, can be generated using the
-@command{compface}} command. The @uref{http://www.dairiki.org/xface/,
+@command{compface}} command. The @uref{https://www.dairiki.org/xface/,
 @cite{Online X-Face Converter}} is a useful resource for quick
 conversion of images into @samp{X-Face:} header fields.
-Use the @uref{http://quimby.gnus.org/circus/face/make-face,
+Use the @uref{https://quimby.gnus.org/circus/face/make-face,
 @command{make-face}} script to convert a JPEG image to the higher
 resolution, color, @samp{Face:} header field.
@@ -5198,7 +5199,7 @@ defined by this option doesn't exist.
 MH-E has the capability to create multimedia messages. It uses the
 @sc{mime} (Multipurpose Internet Mail Extensions)
 protocol@footnote{@sc{mime} is defined in
-@uref{http://www.rfc-editor.org/rfc/rfc2045.txt, RFC 2045}.} The
+@uref{https://www.rfc-editor.org/rfc/rfc2045.txt, RFC 2045}.} The
 @sc{mime} protocol allows you to incorporate images, sound, video,
 binary files, and even commands that fetch a file with @samp{ftp} when
 your recipient reads the message!
@@ -5231,7 +5232,7 @@ Meta Language) tags@footnote{
 @end ifinfo
 See the section Composing in
-@uref{http://www.gnus.org/manual/emacs-mime.html, @cite{The Emacs MIME
+@uref{https://www.gnus.org/manual/emacs-mime.html, @cite{The Emacs MIME
 @end ifnotinfo
 }. The option @code{mh-compose-insertion} can be used to choose
@@ -5537,7 +5538,7 @@ been formatted by @kbd{C-c C-e}.
 @cindex RFC 3156
 MH-E can sign and encrypt messages as defined in
-@uref{http://www.rfc-editor.org/rfc/rfc3156.txt, RFC 3156}. If you
+@uref{https://www.rfc-editor.org/rfc/rfc3156.txt, RFC 3156}. If you
 should choose to sign or encrypt your message, use one of the
 following commands to do so any time before sending your message.
@@ -6909,7 +6910,7 @@ IndexDir /home/user/Mail
 IndexFile /home/user/Mail/.swish/index
 IndexName "Mail Index"
 IndexDescription "Mail Index"
-IndexPointer "http://nowhere";
+IndexPointer "https://nowhere";
 IndexAdmin "nobody"
 #MetaNames automatic
 IndexReport 3
@@ -7630,7 +7631,7 @@ Whitelisted message face
 @cindex spam filters, SpamAssassin
 @cindex spam filters, bogofilter
-MH-E depends on @uref{http://spamassassin.apache.org/, SpamAssassin},
+MH-E depends on @uref{https://spamassassin.apache.org/, SpamAssassin},
 @uref{http://bogofilter.sourceforge.net/, bogofilter}, or
 @uref{http://spamprobe.sourceforge.net/, SpamProbe} to throw the dreck
 away. This chapter describes briefly how to configure these programs
@@ -7705,7 +7706,7 @@ MH-E can work with.
 SpamAssassin is one of the more popular spam filtering programs. Get
 it from your local distribution or from the
-@uref{http://spamassassin.apache.org/, SpamAssassin web site}.
+@uref{https://spamassassin.apache.org/, SpamAssassin web site}.
 To use SpamAssassin, add the following recipes to @file{~/.procmailrc}:
@@ -8530,11 +8531,13 @@ expressions to ensure that MH-E and highlighting 
perform well.
 @cindex Unix commands, @command{procmail}
 @cindex mailing lists, reading
-This appendix explains how to use @uref{http://www.procmail.org/,
-procmail} to file mail from mailing lists into folders which can then
+This appendix explains how to use procmail, which can
+file mail from mailing lists into folders which can then
 be read easily with MH-E@footnote{The MH equivalent, @command{slocal},
-can be used as well, but procmail is more flexible and more packages
-exist for procmail than for slocal.}. Some mailing lists have such
+can be used as well, but procmail was more flexible and more packages
+exist for procmail than for slocal.}. Unfortunately, procmail is no
+longer recommended due to its security vulnerabilities.
+Some mailing lists have such
 high traffic that Gnus must be used and I discuss how to use Gnus
 side-by-side with MH-E.
@@ -8764,7 +8767,7 @@ in all new releases).
 @cindex Debian
 If you use Debian, you can install the Debian
-@uref{http://packages.debian.org/unstable/mail/mh-e, mh-e package}
+@uref{https://packages.debian.org/unstable/mail/mh-e, mh-e package}
 @cindex files, @samp{MH-E-NEWS}
@@ -8813,7 +8816,7 @@ hands several times since then. Jim Larus wanted to do 
 similar for GNU Emacs, and ended up completely rewriting it that same
 year. In 1989, Stephen Gildea picked it up and added many
 improvements. Bill Wohler then took over in 2000 and moved its
-development to @uref{http://sourceforge.net/, SourceForge} where it
+development to @uref{https://sourceforge.net/, SourceForge} where it
 lives today.
@@ -9040,8 +9043,8 @@ Bill Wohler, August 2008
 @c LocalWords: Tennex texi texinfo Thelen thelenm
 @c LocalWords: UCI undeleted whatnow wohler xmh ypcat
-@c See http://www.oreilly.com/oreilly/author/stylesheet.html.
-@c See http://en.wikipedia.org/.
+@c See https://oreillymedia.github.io/production-resources/styleguide/.
+@c See https://en.wikipedia.org/.
 @c Note the lowercase mh which is needed to avoid hits in the
 @c functions and variables. Occasionally, check for accidental
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index 5db3f43..502ed1d 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -39,7 +39,6 @@ modify this GNU manual.''
 @title Newsticker---a feed reader for Emacs
 @author Ulf Jasper
 @author @email{ulf.jasper@@web.de}
-@author @uref{http://ulf.epplejasper.de/}
 @vskip 0pt plus 1filll
@@ -590,8 +589,8 @@ Newsticker works with the standard RSS and Atom formats 
listed below
 @item RSS 0.91 (see @uref{http://backend.userland.com/rss091})
 @item RSS 0.92 (see @uref{http://backend.userland.com/rss092})
-@item RSS 1.0 (see @uref{http://purl.org/rss/1.0/spec})
-@item RSS 2.0 (see @uref{http://blogs.law.harvard.edu/tech/rss})
+@item RSS 1.0 (see @uref{http://web.resource.org/rss/1.0/spec})
+@item RSS 2.0 (see @uref{https://cyber.harvard.edu/rss/rss.html})
 @end itemize
 @subheading Atom formats
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index de3b7bb..adb795e 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -3527,7 +3527,7 @@ string followed by a colon.  There can be no space after 
the colon.  The
 following list shows examples for each link type.
-http://www.astro.uva.nl/~dominik             @r{on the web}
+https://api.uva.nl/                          @r{on the web}
 doi:10.1000/182                              @r{DOI for an electronic resource}
 file:/home/dominik/images/jupiter.jpg        @r{file, absolute path}
 /home/dominik/images/jupiter.jpg             @r{same as above}
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index bad7701..e72d9bf 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -440,8 +440,7 @@ Specifies whether confirmation is required to accept 
 @defopt url-cookie-multiple-line
 Specifies whether to put all cookies for the server on one line in the
-HTTP request to satisfy broken servers like
+HTTP request to satisfy broken servers.
 @end defopt
 @defopt url-cookie-trusted-urls
diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index b404c2a..2cf3b2e 100644
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -135,7 +135,7 @@ technique of F. DeRemer and T. Pennello described in:
 @cite{Efficient Computation of LALR(1) Look-Ahead Sets}@*
 October 1982, ACM TOPLAS Vol 4 No 4, 615--49,
 @end quotation
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index def0af1..978358b 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -2362,9 +2362,9 @@ header if it doesn't already exist and "~/.face" is 
present. See the
 new customization variables `mh-show-use-xface-flag' and `mh-x-face-file'
 (closes SF #480770).
-MH-E depends on the external x-face package found in
+MH-E depends on the external x-face package formerly found in
 http://www.jpl.org/pub/elisp/ to do this. The `uncompface' binary is
-also required to be in the execute PATH. It can be obtained from:
+also required to be in the execute PATH. It was formerly obtainable from:
 It has also been observed that if you don't see the faces, you might
@@ -2684,7 +2684,7 @@ mh-quit now cleans up the buffers named `mh-temp-buffer,'
 * Changes in mh-e 6.0
 mh-e is now maintained at SourceForge (see
-http://mh-e.sourceforge.net/). This is where you need to go to obtain
+https://mh-e.sourceforge.io/). This is where you need to go to obtain
 new versions of mh-e, report bugs and receive support.
 The maintainers have moved much of their personal configurations into
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index bbc81d2..e18a7ab 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -815,7 +815,7 @@ remote display.  There are some bugs for Gtk+.  See 
 *** Emacs now supports the XEmbed specification.
 You can embed Emacs in another application on X11.  The new command line
 option --parent-id is used to pass the parent window id to Emacs.  See
 for details about XEmbed.
 *** Emacs can now set the frame opacity.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 2d56cc7..c0d30ae 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -298,7 +298,7 @@ you launched Emacs:
 This problem occurs because unfortunately there are two libraries
 called "libotf".  One is the library for handling OpenType fonts,
-http://www.m17n.org/libotf/, which is the one that Emacs expects.
+https://www.nongnu.org/m17n/, which is the one that Emacs expects.
 The other is a library for Open Trace Format, and is used by some
 versions of the MPI message passing interface for parallel
diff --git a/etc/TODO b/etc/TODO
index ac47b0a..67de79f 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -720,7 +720,7 @@ Anders Lindgren <address@hidden> has implemented
 running Emacs as root.
 See this article by Bozhidar Batsov for an overview of Proced:
 **** Tooltip properties
diff --git a/lib-src/make-fingerprint.c b/lib-src/make-fingerprint.c
index 2417548..0e26c53 100644
--- a/lib-src/make-fingerprint.c
+++ b/lib-src/make-fingerprint.c
 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/>.  */
 /* The arguments given to this program are all the object files that
diff --git a/lib/fingerprint.c b/lib/fingerprint.c
index 2cc1973..015ca71 100644
--- a/lib/fingerprint.c
+++ b/lib/fingerprint.c
 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 <config.h>
diff --git a/lib/fingerprint.h b/lib/fingerprint.h
index 7d2160c..333c743 100644
--- a/lib/fingerprint.h
+++ b/lib/fingerprint.h
 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/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index bd3687a..7aaca83 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -100,7 +100,7 @@ left.  So, for example, INT=256 and NB-DIGITS=2 returns 
\"00\", since
 the hex equivalent of 256 decimal is 100, which is more than 2 digits.
 This function was blindly copied from hexrgb.el by Drew Adams.
   (setq nb-digits (or nb-digits 4))
   (substring (format (concat "%0" (int-to-string nb-digits) "X") int) (- 
@@ -110,7 +110,7 @@ Each X in the string is a hexadecimal digit.
 Input VALUES is as for the output of `x-color-values'.
 This function was blindly copied from hexrgb.el by Drew Adams.
   (concat "#"
           (pulse-int-to-hex (nth 0 values) 4) ; red
           (pulse-int-to-hex (nth 1 values) 4) ; green
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index b40379c..915125b 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2297,6 +2297,7 @@ Return the name of the group if selection was successful."
           (message "Quit reading the ephemeral group"))
+;; FIXME: This URL no longer works.
 (defcustom gnus-gmane-group-download-format
   "URL for downloading mbox files.
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 3820cd4..c3297ac 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -24,7 +24,7 @@
 ;; This package provides language bindings for the D-Bus API.  D-Bus
 ;; is a message bus system, a simple way for applications to talk to
-;; one another.  See <http://dbus.freedesktop.org/> for details.
+;; one another.  See <https://dbus.freedesktop.org/> for details.
 ;; Low-level language bindings are implemented in src/dbusbind.c.
@@ -72,7 +72,7 @@
 (defconst dbus-interface-peer (concat dbus-interface-dbus ".Peer")
   "The interface for peer objects.
-See URL 
+See URL 
 ;; <interface name="org.freedesktop.DBus.Peer">
 ;;   <method name="Ping">
@@ -85,7 +85,7 @@ See URL 
 (defconst dbus-interface-introspectable
   (concat dbus-interface-dbus ".Introspectable")
   "The interface supported by introspectable objects.
-See URL 
+See URL 
 ;; <interface name="org.freedesktop.DBus.Introspectable">
 ;;   <method name="Introspect">
@@ -95,7 +95,7 @@ See URL 
 (defconst dbus-interface-properties (concat dbus-interface-dbus ".Properties")
   "The interface for property objects.
-See URL 
+See URL 
 ;; <interface name="org.freedesktop.DBus.Properties">
 ;;   <method name="Get">
@@ -122,7 +122,7 @@ See URL 
 (defconst dbus-interface-objectmanager
   (concat dbus-interface-dbus ".ObjectManager")
   "The object manager interface.
-See URL 
+See URL 
 ;; <interface name="org.freedesktop.DBus.ObjectManager">
 ;;   <method name="GetManagedObjects">
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 1fb7fe0..9c24dec 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -167,8 +167,8 @@ value effective."
   "A customizable list of news feeds to select from.
-These were mostly extracted from the Radio Community Server at
+These were mostly extracted from the Radio Community Server
 You may add other entries in `newsticker-url-list'."
   :type `(set ,@(mapcar #'newsticker--splicer
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index 3f9eb5c..956e2cf 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -3027,7 +3027,7 @@ SERVICE-URL should be provided when WS-Addressing is 
being used."
       (insert "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<soap:Envelope\n")
       (when (eq use 'encoded)
         (insert "    soapenc:encodingStyle=\"\
       (dolist (nstag soap-encoded-namespaces)
         (insert "    xmlns:" nstag "=\"")
         (let ((nsname (cdr (assoc nstag soap-well-known-xmlns))))
diff --git a/lisp/org/org.el b/lisp/org/org.el
index ca223d6..aa7e319 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -2353,7 +2353,7 @@ For more examples, see the system specific constants
                        (string :tag "Command")
                        (function :tag "Function")))))
-(defcustom org-doi-server-url "http://dx.doi.org/";
+(defcustom org-doi-server-url "https://doi.org/";
   "The URL of the DOI server."
   :type 'string
   :version "24.3"
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 293d0b2..15bb25f 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -14617,11 +14617,11 @@ I save so much time, my files are colored nicely, my 
co workers respect
 my coding ability... until now.  I'd really appreciate anything you
 could do to help me out with this minor deficiency in the product.
-I've taken a look at the Verilog-Mode FAQ at
+I've taken a look at the Verilog-Mode FAQ at:
 And, I've considered filing the bug on the issue tracker at
 since I realize that public bugs are easier for you to track,
 and for others to search, but would prefer to email.
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 8cdf9cd..50b5ad0 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -4858,7 +4858,7 @@ releases.  You are kindly invited to participate in beta 
testing.  Subscribe
 to above mailing lists by sending an email to <address@hidden>.
 VHDL Mode is officially distributed at
 where the latest version can be found.
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 5ae8097..7e99032 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -1243,7 +1243,7 @@ Used by `bibtex-complete-crossref-cleanup' and 
 (defcustom bibtex-generate-url-list
   '((("url" . ".*:.*"))
     (("doi" . "10\\.[0-9]+/.+")
-     "http://dx.doi.org/%s";
+     "https://doi.org/%s";
      ("doi" ".*" 0)))
   "List of schemes for generating the URL of a BibTeX entry.
 These schemes are used by `bibtex-url'.
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 134404c..0f9b1b6 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -327,7 +327,7 @@ a terminal with a slow modem."
 (defvar url-using-proxy nil
   "Either nil or the fully qualified proxy URL in use, e.g.
 (defcustom url-news-server nil
   "The default news server from which to get newsgroups/articles.
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index b53174b..9e8a32a 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -50,7 +50,7 @@
   "Read a click and release event from XTerm.
 Similar to `xterm-mouse-translate', but using the \"1006\"
 extension, which supports coordinates >= 231 (see
   (xterm-mouse-translate-1 1006))
 (defun xterm-mouse-translate-1 (&optional extension)
diff --git a/src/.gdbinit b/src/.gdbinit
index e9ba526..eb767f2 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -1314,7 +1314,7 @@ if hasattr(gdb, 'printing'):
       # simpler and works regardless of whether VAL is a pointer or
       # integer.  Also, val.cast (gdb.lookup.type ("EMACS_UINT"))
       # would have problems with GDB 7.12.1; see
-      # <http://patchwork.sourceware.org/patch/11557/>.
+      # <https://patchwork.sourceware.org/patch/11557/>
       ival = long (val)
       # For nil, yield "XIL(0)", which is easier to read than "XIL(0x0)".
diff --git a/src/character.c b/src/character.c
index d14d0df..a80e6f8 100644
--- a/src/character.c
+++ b/src/character.c
@@ -1045,7 +1045,7 @@ printablep (int c)
 /* Return true if C is a horizontal whitespace character, as defined
-   by http://www.unicode.org/reports/tr18/tr18-19.html#blank.  */
+   by https://www.unicode.org/reports/tr18/tr18-19.html#blank.  */
 blankp (int c)
diff --git a/src/coding.c b/src/coding.c
index c0408fb..21e6dc4 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -2678,7 +2678,7 @@ encode_coding_emacs_mule (struct coding_system *coding)
    functions in this file, some parts are NOT ACCURATE or are OVERLY
    SIMPLIFIED.  For thorough understanding, please refer to the
    original document of ISO2022.  This is equivalent to the standard
-   ECMA-35, obtainable from <URL:http://www.ecma.ch/> (*).
+   ECMA-35, obtainable from <URL:https://www.ecma.ch/> (*).
    ISO2022 provides many mechanisms to encode several character sets
    in 7-bit and 8-bit environments.  For 7-bit environments, all text
diff --git a/src/emacs.c b/src/emacs.c
index 8a8d8b5..21a05d3 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -159,11 +159,7 @@ static uintmax_t heap_bss_diff;
    On Cocoa, CoreFoundation lib fails in forked process, see Mac OS X
    Leopard Developer Release Notes for CoreFoundation Framework:
-   http://developer.apple.com/ReleaseNotes/
-   CoreFoundation/CoreFoundation.html
-   Note: the above is no longer available on-line, but it can be found
-   via the "Wayback machine", https://web.archive.org.
    On Windows, a Cygwin fork child cannot access the USER subsystem.
diff --git a/src/fileio.c b/src/fileio.c
index b510d48..45186d6 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6151,7 +6151,7 @@ init_fileio (void)
      For more on why fsync often fails to work on today's hardware, see:
      Zheng M et al. Understanding the robustness of SSDs under power fault.
      11th USENIX Conf. on File and Storage Technologies, 2013 (FAST '13), 
-     http://www.usenix.org/system/files/conference/fast13/fast13-final80.pdf
+     https://www.usenix.org/system/files/conference/fast13/fast13-final80.pdf
      For more on why fsync does not suffice even if it works properly, see:
      Roche X. Necessary step(s) to synchronize filename operations on disk.
diff --git a/src/image.c b/src/image.c
index 5183558..d9b7101 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8294,7 +8294,7 @@ gif_load (struct frame *f, struct image *img)
       /* For disposal == 0, the spec says "No disposal specified. The
         decoder is not required to take any action."  In practice, it
         seems we need to treat this like "keep in place", see e.g.
-        http://upload.wikimedia.org/wikipedia/commons/3/37/Clock.gif */
+        https://upload.wikimedia.org/wikipedia/commons/3/37/Clock.gif */
       if (disposal == 0)
        disposal = 1;
@@ -9196,7 +9196,7 @@ DEFUN ("imagemagick-types", Fimagemagick_types, 
Simagemagick_types, 0, 0, 0,
        doc: /* Return a list of image types supported by ImageMagick.
 Each entry in this list is a symbol named after an ImageMagick format
 tag.  See the ImageMagick manual for a list of ImageMagick formats and
-their descriptions (http://www.imagemagick.org/script/formats.php).
+their descriptions (https://www.imagemagick.org/script/formats.php).
 You can also try the shell command: `identify -list format'.
 Note that ImageMagick recognizes many file-types that Emacs does not
diff --git a/src/lcms.c b/src/lcms.c
index cd8de0e..01ce886 100644
--- a/src/lcms.c
+++ b/src/lcms.c
@@ -108,7 +108,7 @@ parse_lab_list (Lisp_Object lab_list, cmsCIELab *color)
   return true;
-/* http://www.ece.rochester.edu/~gsharma/ciede2000/ciede2000noteCRNA.pdf> */
+/* http://www.ece.rochester.edu/~gsharma/ciede2000/ciede2000noteCRNA.pdf */
 DEFUN ("lcms-cie-de2000", Flcms_cie_de2000, Slcms_cie_de2000, 2, 5, 0,
        doc: /* Compute CIEDE2000 metric distance between COLOR1 and COLOR2.
diff --git a/src/lisp.h b/src/lisp.h
index e68d273..bcb91b2 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -5026,7 +5026,7 @@ struct for_each_tail_internal
    Use Brent’s teleporting tortoise-hare algorithm.  See:
    Brent RP. BIT. 1980;20(2):176-84. doi:10.1007/BF01933190
-   http://maths-people.anu.edu.au/~brent/pd/rpb051i.pdf
+   https://maths-people.anu.edu.au/~brent/pd/rpb051i.pdf
    This macro uses maybe_quit because of an excess of caution.  The
    call to maybe_quit should not be needed in practice, as a very long
diff --git a/src/nsfont.m b/src/nsfont.m
index 7a40d67..dc609cc 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -722,7 +722,7 @@ nsfont_open (struct frame *f, Lisp_Object font_entity, int 
   if (fabs (ns_attribute_fvalue (fontDesc, NSFontSlantTrait) > 0.05F))
       traits |= NSItalicFontMask;
-  /* see http://cocoadev.com/forums/comments.php?DiscussionID=74 */
+  /* see 
   fixLeopardBug = traits & NSBoldFontMask ? 10 : 5;
   nsfont = [fontMgr fontWithFamily: family
                             traits: traits weight: fixLeopardBug
diff --git a/src/pdumper.h b/src/pdumper.h
index 31b0d53..b07f017 100644
--- a/src/pdumper.h
+++ b/src/pdumper.h
 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/src/process.c b/src/process.c
index d30b17d..e53d5d8 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5547,8 +5547,7 @@ wait_reading_process_output (intmax_t time_limit, int 
nsecs, int read_kbd,
                     through all the channels and check for data.
                     This is a workaround needed for some versions of
                     the gnutls library -- 2.12.14 has been confirmed
-                    to need it.  See
-                    http://comments.gmane.org/gmane.emacs.devel/145074 */
+                    to need it.  */
                  for (channel = 0; channel < FD_SETSIZE; ++channel)
                    if (! NILP (chan_process[channel]))
diff --git a/src/widget.c b/src/widget.c
index c3d396d..e8eaf0f 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -21,12 +21,7 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.  */
 /* This file has been censored by the Communications Decency Act.
    That law was passed under the guise of a ban on pornography, but
    it bans far more than that.  This file did not contain pornography,
-   but it was censored nonetheless.
-   For information on US government censorship of the Internet, and
-   what you can do to bring back freedom of the press, see the web
-   site http://www.vtw.org/
-   */
+   but it was censored nonetheless.  */
 #include <config.h>
 #include "widget.h"
diff --git a/src/window.c b/src/window.c
index 9a0a9a1..321b3e0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6350,8 +6350,8 @@ and redisplay normally--don't erase and redraw the frame. 
   int this_scroll_margin;
   /* For reasons why we signal an error here, see
-     http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00053.html,
-     http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00094.html.  */
+     https://lists.gnu.org/r/emacs-devel/2014-06/msg00053.html,
+     https://lists.gnu.org/r/emacs-devel/2014-06/msg00094.html.  */
   if (buf != current_buffer)
     error ("`recenter'ing a window that does not display current-buffer.");
diff --git a/src/xfaces.c b/src/xfaces.c
index c3cae7e..946401b 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4177,7 +4177,7 @@ color_distance (Emacs_Color *x, Emacs_Color *y)
         algorithm: it does not have a range of colors where it suddenly
         gives far from optimal results.
-     See <http://www.compuphase.com/cmetric.htm> for more info.  */
+     See <https://www.compuphase.com/cmetric.htm> for more info.  */
   long r = (x->red   - y->red)   >> 8;
   long g = (x->green - y->green) >> 8;
diff --git a/src/xselect.c b/src/xselect.c
index d74f064..6bb3560 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2137,7 +2137,7 @@ On Nextstep, TERMINAL is unused.  */)
 /* Send clipboard manager a SAVE_TARGETS request with a UTF8_STRING
-   property (http://www.freedesktop.org/wiki/ClipboardManager).  */
+   property (https://www.freedesktop.org/wiki/ClipboardManager/).  */
 static Lisp_Object
 x_clipboard_manager_save (Lisp_Object frame)
diff --git a/src/xsettings.c b/src/xsettings.c
index 06c47c6..c23a5dc 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -343,8 +343,8 @@ get_prop_window (struct x_display_info *dpyinfo)
 #define PAD(nr)    (((nr) + 3) & ~3)
 /* Parse xsettings and extract those that deal with Xft.
-   See http://freedesktop.org/wiki/Specifications/XSettingsRegistry
-   and http://standards.freedesktop.org/xsettings-spec/xsettings-spec-0.5.html.
+   See https://freedesktop.org/wiki/Specifications/XSettingsRegistry/
+   and 
    Layout of prop.  First is a header:
diff --git a/src/xterm.c b/src/xterm.c
index 27d9800..255b6c6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10599,7 +10599,7 @@ x_set_offset (struct frame *f, register int xoff, 
register int yoff, int change_
    on the root window for frame F contains ATOMNAME.
    This is how a WM check shall be done according to the Window Manager
    Specification/Extended Window Manager Hints at
-   http://freedesktop.org/wiki/Specifications/wm-spec.  */
+   https://freedesktop.org/wiki/Specifications/wm-spec/.  */
 x_wm_supports (struct frame *f, Atom want_atom)
@@ -11524,7 +11524,7 @@ static void
 xembed_request_focus (struct frame *f)
   /* See XEmbed Protocol Specification at
-     http://freedesktop.org/wiki/Specifications/xembed-spec  */
+     https://freedesktop.org/wiki/Specifications/xembed-spec/  */
   if (FRAME_VISIBLE_P (f))
     xembed_send_message (f, CurrentTime,
                         XEMBED_REQUEST_FOCUS, 0, 0, 0);
@@ -11536,7 +11536,7 @@ static void
 x_ewmh_activate_frame (struct frame *f)
   /* See Window Manager Specification/Extended Window Manager Hints at
-     http://freedesktop.org/wiki/Specifications/wm-spec  */
+     https://freedesktop.org/wiki/Specifications/wm-spec/  */
   struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
@@ -11586,7 +11586,7 @@ x_focus_frame (struct frame *f, bool noactivate)
       /* For Xembedded frames, normally the embedder forwards key
         events.  See XEmbed Protocol Specification at
-        http://freedesktop.org/wiki/Specifications/xembed-spec  */
+        https://freedesktop.org/wiki/Specifications/xembed-spec/  */
       xembed_request_focus (f);
diff --git a/test/lisp/emacs-lisp/cl-preloaded-tests.el 
index 3251b5f..c1a6d5d 100644
--- a/test/lisp/emacs-lisp/cl-preloaded-tests.el
+++ b/test/lisp/emacs-lisp/cl-preloaded-tests.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 this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ;;; Commentary:
diff --git a/test/manual/biditest.el b/test/manual/biditest.el
index d813642..81b9fd2 100644
--- a/test/manual/biditest.el
+++ b/test/manual/biditest.el
@@ -34,7 +34,7 @@
 INPUT-FILE should be in the format of the BidiCharacterTest.txt file
 available from the Unicode site, as part of the UCD database, see
 The resulting file should be viewed with `inhibit-bidi-mirroring' set to t."
   (let ((output-buf (get-buffer-create "*biditest-output*"))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]