16 files changed, 32 insertions, 37 deletions

diff --git a/ChangeLog.2 b/ChangeLog.2
index 11e6049b0bd..d40401093c5 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -10661,8 +10661,8 @@
 
         * lisp/gnus/nnir.el (nnir-request-update-mark):
         Default to the original mark.
-        cf. <http://thread.gmane.org/gmane.emacs.gnus.general/86583>
-        and <http://thread.gmane.org/gmane.emacs.gnus.general/86640>
+        cf. <http://thread.gmane.org/gmane.emacs.gnus.general/86583> [dead link]
+        and <http://thread.gmane.org/gmane.emacs.gnus.general/86640> [dead link]
 
 2016-01-19  Glenn Morris  <rgm@gnu.org>
 
@@ -12012,7 +12012,7 @@
         (Maybe this is the last merge from Gnus git to Emacs git)
 
         Cf. discussion on ding mailing list, messages in
-        <http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
+        <http://thread.gmane.org/gmane.emacs.gnus.general/86228>. [dead link]
         Common code from the three files mml-smime.el, mml1991.el, and
         mml2015.el is moved to mml-sec.el.  Auxiliary functions are added
         to gnus-util.el.
@@ -15206,8 +15206,9 @@
         Remove nnml-retrieve-groups that is unnecessary and somewhat problematic
 
         * lisp/gnus/nnml.el (nnml-retrieve-groups): Remove.  See:
-        <http://thread.gmane.org/gmane.emacs.gnus.general/86308> and
-        <http://thread.gmane.org/gmane.emacs.gnus.general/86321>
+        <http://thread.gmane.org/gmane.emacs.gnus.general/86308> [dead link]
+        and
+        <http://thread.gmane.org/gmane.emacs.gnus.general/86321> [dead link]
 
 2015-11-25  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -30968,7 +30969,7 @@
 2015-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * lisp/gnus/gnus-art.el (gnus-button-alist): Re-revert last change.
-        cf. <http://news.gmane.org/group/gmane.emacs.devel/thread=186896>
+        cf. <http://news.gmane.org/group/gmane.emacs.devel/thread=186896> [dead link]
 
 2015-05-28  Samer Masterson  <samer@samertm.com>
 
diff --git a/ChangeLog.3 b/ChangeLog.3
index 85cccf0d6ed..4401dd10920 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -234791,7 +234791,7 @@
         (Maybe this is the last merge from Gnus git to Emacs git)
 
         Cf. discussion on ding mailing list, messages in
-        <http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
+        <http://thread.gmane.org/gmane.emacs.gnus.general/86228>. [dead link]
         Common code from the three files mml-smime.el, mml1991.el, and
         mml2015.el is moved to mml-sec.el.  Auxiliary functions are added
         to gnus-util.el.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index d8136baacba..9c7ce4be216 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -25338,7 +25338,7 @@ added to a group's @code{spam-process} parameter, the spam-marked
 articles groups will be reported to the Gmane administrators via a
 HTTP request.
 
-Gmane was formerly found at @uref{http://gmane.org}.
+Gmane is at @uref{https://gmane.io}.
 
 @emph{WARNING}
 
@@ -28805,7 +28805,7 @@ be read correctly in Emacs 22 and below.  If you want to use Gnus across
 different Emacs versions, you may set @code{mm-auto-save-coding-system}
 to @code{emacs-mule}.
 @c FIXME: Untested.  (Or did anyone test it?)
-@c Cf. http://thread.gmane.org/gmane.emacs.gnus.general/66251/focus=66344
+@c Cf. http://thread.gmane.org/gmane.emacs.gnus.general/66251/focus=66344 [dead link]
 
 @item Lisp files are now installed in @file{.../site-lisp/gnus/} by default.
 It defaulted to @file{.../site-lisp/} formerly.  In addition to this,
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 9bc440626dc..88d3a41461c 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -6789,8 +6789,8 @@
 2006-09-04  Daiki Ueno  <ueno@unixuser.org>
 
         * pgg-gpg.el (pgg-gpg-process-region): Revert two patches from Satyaki
-        Das.  http://article.gmane.org/gmane.emacs.gnus.general/49947
-        http://article.gmane.org/gmane.emacs.gnus.general/50457
+        Das.  http://article.gmane.org/gmane.emacs.gnus.general/49947 [dead link]
+        http://article.gmane.org/gmane.emacs.gnus.general/50457 [dead link]
 
 2006-09-03  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index 09bc4f6c4eb..bdf5948e748 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -15985,7 +15985,7 @@
         (imap-message-copyuid-1): Use it.
         (imap-message-appenduid-1): Likewise.  Based on patch by Nathan
         J. Williams in
-        <http://permalink.gmane.org/gmane.emacs.gnus.general/65855>.
+        <http://permalink.gmane.org/gmane.emacs.gnus.general/65855>. [dead link]
 
 2008-04-02  Alan Mackenzie  <acm@muc.de>
 
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index af3203444ae..3c75ab8ce88 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -14019,7 +14019,7 @@
         * font-lock.el (font-lock-refresh-defaults): New function, which
         can be used to let font-lock react to external changes in
         variables like font-lock-defaults and keywords.
-        See http://thread.gmane.org/gmane.emacs.devel/118777/focus=118802
+        See http://thread.gmane.org/gmane.emacs.devel/118777/focus=118802 [dead link]
 
 2009-12-28  Dan Nicolaescu  <dann@ics.uci.edu>
 
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index 6dda3703e6d..c898eb61d47 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -2573,7 +2573,7 @@
 
         * progmodes/grep.el (rgrep): Escape command line.  Sometimes, it
         is too long for Tramp.  See discussion in
-        <http://thread.gmane.org/gmane.emacs.tramp/8233/focus=8244>.
+        <http://thread.gmane.org/gmane.emacs.tramp/8233/focus=8244>. [dead link]
 
         * progmodes/compile.el (compilation-start): Remove line escape
         template.
diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3
index d0b195e5f13..0fc5c093371 100644
--- a/lisp/gnus/ChangeLog.3
+++ b/lisp/gnus/ChangeLog.3
@@ -578,7 +578,7 @@
 
         * gnus-start.el (gnus-dribble-read-file): Don't stop the auto-saving of
         the dribble buffer even when it is shrunk a lot.
-        <http://thread.gmane.org/gmane.emacs.gnus.user/16923>
+        <http://thread.gmane.org/gmane.emacs.gnus.user/16923> [dead link]
 
 2014-06-26  Glenn Morris  <rgm@gnu.org>
 
diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el
index ce8220f3a6e..aee122aa557 100644
--- a/lisp/gnus/gnus-bookmark.el
+++ b/lisp/gnus/gnus-bookmark.el
@@ -61,12 +61,12 @@
 ;; (define-key global-map "\C-crl" 'gnus-bookmark-bmenu-list)
 
 ;; FIXME: Add keybindings, see
-;; http://thread.gmane.org/gmane.emacs.gnus.general/63101/focus=63379
-;; http://thread.gmane.org/v9fxx9fkm4.fsf@marauder.physik.uni-ulm.de
+;; http://thread.gmane.org/gmane.emacs.gnus.general/63101/focus=63379 [dead link]
+;; http://thread.gmane.org/v9fxx9fkm4.fsf@marauder.physik.uni-ulm.de [dead link]
 
 ;; FIXME: Check if `gnus-bookmark.el' should use
 ;; `bookmark-make-record-function'.
-;; Cf. http://article.gmane.org/gmane.emacs.gnus.general/66076
+;; Cf. http://article.gmane.org/gmane.emacs.gnus.general/66076 [dead link]
 
 (defgroup gnus-bookmark nil
   "Setting, annotation and jumping to Gnus bookmarks."
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 0467907ec94..ac2596243b1 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1436,14 +1436,8 @@ if it is a string, only list groups matching REGEXP."
 
 ;; Moving through the Group buffer (in topic mode) e.g. with C-n doesn't
 ;; update the state (enabled/disabled) of the icon `gnus-group-describe-group'
-;; automatically.  After `C-l' the state is correct.  See the following report
-;; on emacs-devel
-;; <http://thread.gmane.org/v9acdmrcse.fsf@marauder.physik.uni-ulm.de>:
-;; From: Reiner Steib
-;; Subject: tool bar icons not updated according to :active condition
-;; Newsgroups: gmane.emacs.devel
-;; Date: Mon, 23 Jan 2006 19:59:13 +0100
-;; Message-ID: <v9acdmrcse.fsf@marauder.physik.uni-ulm.de>
+;; automatically.  After `C-l' the state is correct.
+;; See: https://lists.gnu.org/r/emacs-devel/2006-01/msg00853.html
 
 ;; Using `redraw-frame' (see `gnus-tool-bar-update') in Emacs might
 ;; be confusing, so maybe we shouldn't call it by default.
@@ -2336,7 +2330,7 @@ Valid input formats include:
     (cond
      ;; URLs providing `group', `start' and `range':
      ((string-match
-       ;; http://thread.gmane.org/gmane.emacs.devel/86326/focus=86525
+       ;; http://thread.gmane.org/gmane.emacs.devel/86326/focus=86525 [dead link]
        "^http://thread\\.gmane\\.org/\\([^/]+\\)/\\([0-9]+\\)/focus=\\([0-9]+\\)$"
        url)
       (setq group (match-string 1 url)
@@ -2347,7 +2341,7 @@ Valid input formats include:
                      start -1)))
      ;; URLs providing `group' and `start':
      ((or (string-match
-           ;; http://article.gmane.org/gmane.comp.gnu.make.bugs/3584
+           ;; http://article.gmane.org/gmane.comp.gnu.make.bugs/3584 [dead link]
            "^http://\\(?:thread\\|article\\|permalink\\)\\.gmane\\.org/\\([^/]+\\)/\\([0-9]+\\)"
            url)
           (string-match
@@ -2355,7 +2349,7 @@ Valid input formats include:
            "^\\(?:nntp\\|news\\)://news\\.gmane\\.org/\\([^/]+\\)/\\([0-9]+\\)"
            url)
           (string-match
-           ;; http://news.gmane.org/group/gmane.emacs.gnus.general/thread=65099/force_load=t
+           ;; http://news.gmane.org/group/gmane.emacs.gnus.general/thread=65099/force_load=t [dead link]
            "^http://news\\.gmane\\.org/group/\\([^/]+\\)/thread=\\([0-9]+\\)"
            url))
       (setq group (match-string 1 url)
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index b8dd61de3b9..eb5ce7b141c 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -148,8 +148,8 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
   ;;
   ;; This function doesn't handle NotDashEscaped correctly.  EasyPG handles it
   ;; correctly.
-  ;; http://thread.gmane.org/gmane.emacs.gnus.general/66062/focus=66082
-  ;; http://thread.gmane.org/gmane.emacs.gnus.general/65087/focus=65109
+  ;; http://thread.gmane.org/gmane.emacs.gnus.general/66062/focus=66082 [dead link]
+  ;; http://thread.gmane.org/gmane.emacs.gnus.general/65087/focus=65109 [dead link]
   (goto-char (point-min))
   (forward-line)
   ;; We need to be careful not to strip beyond the armor headers.
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index cdba6e663bf..5dc5bf1fd75 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -85,7 +85,7 @@ Integer values will in effect be rounded up to the nearest multiple of
 
 (defvar nnheader-read-timeout
   (if (memq system-type '(windows-nt cygwin))
-      ;; http://thread.gmane.org/v9655t3pjo.fsf@marauder.physik.uni-ulm.de
+      ;; http://thread.gmane.org/v9655t3pjo.fsf@marauder.physik.uni-ulm.de [dead link]
       ;;
       ;; IIRC, values lower than 1.0 didn't/don't work on Windows/DOS.
       ;;
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 39513b8f602..d59a314c26e 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -240,7 +240,7 @@ be used instead."
      (concat
       "\\(?:"
       ;; Match paired parentheses, e.g. in Wikipedia URLs:
-      ;; http://thread.gmane.org/47B4E3B2.3050402@gmail.com
+      ;; http://thread.gmane.org/47B4E3B2.3050402@gmail.com [dead link]
       "[" chars punct "]+" "(" "[" chars punct "]+" ")"
       "\\(?:" "[" chars punct "]+" "[" chars "]" "\\)?"
       "\\|"
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index f45490ef6c3..6fd59ed3f93 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -768,7 +768,7 @@ Key bindings:
   (setq-local comint-prompt-read-only inferior-octave-prompt-read-only)
   (add-hook 'comint-input-filter-functions
             'inferior-octave-directory-tracker nil t)
-  ;; http://thread.gmane.org/gmane.comp.gnu.octave.general/48572
+  ;; http://thread.gmane.org/gmane.comp.gnu.octave.general/48572 [dead link]
   (add-hook 'window-configuration-change-hook
             'inferior-octave-track-window-width-change nil t)
   (setq-local compilation-error-regexp-alist inferior-octave-error-regexp-alist)
@@ -1007,7 +1007,7 @@ directory and makes this the current buffer's default directory."
 (defvar inferior-octave-last-column-width nil)
 
 (defun inferior-octave-track-window-width-change ()
-  ;; http://thread.gmane.org/gmane.comp.gnu.octave.general/48572
+  ;; http://thread.gmane.org/gmane.comp.gnu.octave.general/48572 [dead link]
   (let ((width (max inferior-octave-minimal-columns (window-width))))
     (unless (eq inferior-octave-last-column-width width)
       (setq-local inferior-octave-last-column-width width)
diff --git a/nextstep/ChangeLog.1 b/nextstep/ChangeLog.1
index 26def2266fe..cd6bfbfbbbe 100644
--- a/nextstep/ChangeLog.1
+++ b/nextstep/ChangeLog.1
@@ -6,7 +6,7 @@
 
         * Makefile.in (links): New phony target to create a fake
         installation pointing back to the source tree to run GUI Emacs
-        in-place (http://article.gmane.org/gmane.emacs.devel:178330).
+        in-place (http://article.gmane.org/gmane.emacs.devel:178330). [dead link]
 
 2014-11-22  Glenn Morris  <rgm@gnu.org>
 
diff --git a/src/w32.c b/src/w32.c
index a6bc0f4b2ee..da4c7df340e 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -9387,7 +9387,7 @@ sys_write (int fd, const void * buffer, unsigned int count)
          break them into smaller chunks.  See the Comments section of
          the MSDN documentation of WriteFile for details behind the
          choice of the value of CHUNK below.  See also the thread
-         http://thread.gmane.org/gmane.comp.version-control.git/145294
+         http://thread.gmane.org/gmane.comp.version-control.git/145294 [dead link]
          in the git mailing list.  */
       const unsigned char *p = buffer;
       const bool is_pipe = (fd < MAXDESC