Merge branch 'main' into emacs-31

4 files changed, 7 insertions, 24 deletions

diff --git a/NEWS.org b/NEWS.org
index 1cfe0ec..7164678 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,4 +1,3 @@
-#+link:    compat-srht https://todo.sr.ht/~pkal/compat/
 #+link:    compat-gh   https://github.com/emacs-compat/compat/issues/
 #+options: toc:nil num:nil author:nil
 
@@ -298,7 +297,7 @@
 
 * Release of "Compat" Version 28.1.2.2
 
-This is a minor release that hopes to address [[compat-srht:7]].
+This is a minor release.
 
 (Release <2022-08-25 Thu>)
 
@@ -320,8 +319,8 @@ include much more documentation that had been the case previously.
 
 The main change of this release has been the major simplification of
 Compat's initialisation system, improving the situation around issues
-people had been reporting ([[compat-srht:4]], once again) with unconventional
-or unpopular packaging systems.
+people had been reporting with unconventional or unpopular packaging
+systems.
 
 In addition to this, the following functional changes have been made:
 
@@ -337,7 +336,6 @@ Minor improvements to manual are also part of this release.
 
 This release just contains a hot-fix for an issue introduced in the
 last version, where compat.el raises an error during byte compilation.
-See [[compat-srht:4]].
 
 (Release <2022-06-19 Sun>)
 
@@ -357,7 +355,7 @@ Two main changes have necessitated a new patch release:
 
 This is a minor release fixing a bug in =json-serialize=, that could
 cause unintended side-effects, not related to packages using Compat
-directly (see [[compat-srht:2]]).
+directly.
 
 (Released <2022-05-05 Thu>)
 
diff --git a/README.md b/README.md
index 4fd69db..30407aa 100644
--- a/README.md
+++ b/README.md
@@ -30,11 +30,7 @@ builds].
 Bug and patches
 ---------------
 Patches, bug reports and comments can be sent via [GitHub]. These may include
-issues in the compatibility code, missing definitions or performance issues. We
-also provide a [development mailing list].
-
-[development mailing list]:
-    https://lists.sr.ht/~pkal/compat-devel
+issues in the compatibility code, missing definitions or performance issues.
 
 
 Contribute
diff --git a/compat.el b/compat.el
index 3f4ee71..95f3bd8 100644
--- a/compat.el
+++ b/compat.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2021-2026 Free Software Foundation, Inc.
 
 ;; Author: Philip Kaludercic <philipk@posteo.net>, Daniel Mendler <mail@daniel-mendler.de>
-;; Maintainer: Compat Development <~pkal/compat-devel@lists.sr.ht>
+;; Maintainer: Philip Kaludercic <philipk@posteo.net>, Daniel Mendler <mail@daniel-mendler.de>
 ;; Version: 30.1.0.1
 ;; URL: https://github.com/emacs-compat/compat
 ;; Package-Requires: ((emacs "25.1"))
diff --git a/compat.texi b/compat.texi
index 4503503..3786e91 100644
--- a/compat.texi
+++ b/compat.texi
@@ -189,14 +189,6 @@ versions. We ensure this using continuous integration.  All functions
 provided by Compat are covered by the test suite.  There is a link to
 the corresponding test on the first line of each definition.
 
-You may want to subscribe to the
-@uref{https://lists.sr.ht/~pkal/compat-announce, compat-announce}
-mailing list to be notified when new versions are released or relevant
-changes are made.  We also provide a
-@uref{https://lists.sr.ht/~pkal/compat-devel, development mailing
-list} (@email{~pkal/compat-devel@@lists.sr.ht,
-~pkal/compat-devel@@lists.sr.ht}).
-
 @node Limitations
 @section Limitations
 
@@ -3705,10 +3697,7 @@ Compat is developed on GitHub.
 Bug reports, patches and comments are best sent to the
 @uref{https://github.com/emacs-compat/compat/issues, issue tracker}.
 These may include issues in the compatibility code, missing
-definitions or performance issues. We also provide a
-@uref{https://lists.sr.ht/~pkal/compat-devel, development mailing
-list} (@email{~pkal/compat-devel@@lists.sr.ht,
-~pkal/compat-devel@@lists.sr.ht}).
+definitions or performance issues.
 
 Please note that as a GNU ELPA package, Compat requires contributors
 to have signed the