Merge branch 'maint'

5 files changed, 6 insertions, 6 deletions

diff --git a/contrib/lisp/org-mairix.el b/contrib/lisp/org-mairix.el
index 8968bd0..1037328 100644
--- a/contrib/lisp/org-mairix.el
+++ b/contrib/lisp/org-mairix.el
@@ -186,7 +186,7 @@ applications in order to mimic `org-store-link'.  Used by
   :type 'string)
 
 ;; When we resolve some of the issues with `org-store-link' detailed
-;; at <http://thread.gmane.org/gmane.emacs.orgmode/4217/focus=4635>,
+;; at <https://orgmode.org/list/20071105181739.GB13544@atlantic.linksys.moosehall
 ;; we might not need org-mairix-insert-link.
 
 (defun org-mairix-insert-link ()
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 9225217..efad195 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -17231,7 +17231,7 @@ cause unexpected results.
 
 When the caching mechanism tests for any source code changes, it does
 not expand noweb style references (see [[*Noweb Reference Syntax]]).  For
-reasons why, see http://thread.gmane.org/gmane.emacs.orgmode/79046.
+reasons why, see https://orgmode.org/list/86fvqqc8jb.fsf@somewhere.org
 
 The =cache= header argument can have one of two values: =yes= or =no=.
 
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index d3f2bb1..f7c898f 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -5058,7 +5058,7 @@ that Calc formulas can operate on them.
 
     The new system has a technically cleaner implementation and more
     possibilities for capturing different types of data.  See
-    [[http://thread.gmane.org/gmane.emacs.orgmode/26441/focus%3D26441][Carsten's announcement]] for more details.
+    [[https://orgmode.org/list/C46F10DC-DE51-43D4-AFFE-F71E440D1E1F@gmail.com][Carsten's announcement]] for more details.
 
     To switch over to the new system:
 
@@ -5189,7 +5189,7 @@ that Calc formulas can operate on them.
 
 **** Modified link escaping
 
-     David Maus worked on `org-link-escape'.  See [[http://article.gmane.org/gmane.emacs.orgmode/37888][his message]]:
+     David Maus worked on `org-link-escape'.  See [[https://orgmode.org/list/87k4gysacq.wl%dmaus@ictsoc.de][his message]]:
 
      : Percent escaping is used in Org mode to escape certain characters
      : in links that would either break the parser (e.g. square brackets
diff --git a/lisp/ol-bibtex.el b/lisp/ol-bibtex.el
index fee97a2..18ee95e 100644
--- a/lisp/ol-bibtex.el
+++ b/lisp/ol-bibtex.el
@@ -95,7 +95,7 @@
 ;; The link creation part has been part of Org for a long time.
 ;;
 ;; Creating better capture template information was inspired by a request
-;; of Austin Frank: http://article.gmane.org/gmane.emacs.orgmode/4112
+;; of Austin Frank: https://orgmode.org/list/m0myu03vbx.fsf@gmail.com
 ;; and then implemented by Bastien Guerry.
 ;;
 ;; Eric Schulte eventually added the functions for translating between
diff --git a/lisp/org.el b/lisp/org.el
index ff5aaaf..c388224 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3698,7 +3698,7 @@ After a match, the match groups contain these elements:
 
 ;; This used to be a defcustom (Org <8.0) but allowing the users to
 ;; set this option proved cumbersome.  See this message/thread:
-;; http://article.gmane.org/gmane.emacs.orgmode/68681
+;; https://orgmode.org/list/B72CDC2B-72F6-43A8-AC70-E6E6295766EC@gmail.com
 (defvar org-emphasis-regexp-components
   '("-[:space:]('\"{" "-[:space:].,:!?;'\")}\\[" "[:space:]" "." 1)
   "Components used to build the regular expression for emphasis.