Update for move off freenode

README.md

@@ -4,13 +4,12 @@ This is the source for [Xapian's developer
 guide](https://xapian-developer-guide.readthedocs.org/).
 Eventually this repository will be merged into the main Xapian tree.
 
-Join in on channel #xapian on irc.freenode.net (webchat link:
-https://webchat.freenode.net/?channels=%23xapian) or via [our
-mailing lists](https://xapian.org/lists).
-
 You will need the [Sphinx documentation tool](https://sphinx-doc.org/)
-installed to process the documentation. You can install the `python-sphinx`
+installed to process this documentation. You can install the `python-sphinx`
 package on Debian, Fedora and Ubuntu, or `pip install -r requirements.txt`
 to install the python package directly.
 
-You can then build the HTML output by running `make html`.
+With that installed, you can then build the HTML output by running `make html`.
+
+You can chat to us on matrix, IRC or via our mailing lists.  Links to
+all of these are [on our website](https://xapian.org/lists).

contributing/index.rst

@@ -5,7 +5,7 @@ Contributing to Xapian
 
 Xapian is an open source project, depending on a community of volunteers. There are lots of ways of contributing to Xapian:
 
- * Join our `mailing lists <https://xapian.org/lists>`_ or IRC channel (#xapian on Freenode) and help people out.
+ * Join our `mailing lists or chat channel <https://xapian.org/lists>`_ and help people out.
 
  * Talk or write about Xapian. By explaining how you've used Xapian you not only help spread the word, but also might learn more about Xapian itself.
 

index.rst

@@ -47,21 +47,20 @@ contributors<advice for new contributors>`.
 Getting in touch
 ----------------
 
-The Xapian community typically works "in the open", via mailing lists and an
-IRC channel:
+The Xapian community typically works "in the open", via mailing lists and a
+chat channel:
 
 * Our `mailing lists <https://xapian.org/lists>`_ are open for anyone to
   join, although (because we don't want to relay spam to everyone) if you
   aren't subscribed to the list someone will have to manually approve your
   message. Please be patient and don't resend a message just because it
   doesn't appear right away.
 
-* We're on `#xapian <https://webchat.freenode.net/?channels=%23xapian>`_ on
-  ``irc.freenode.net``. IRC is a simple text chat system where many members
-  of the community hang out; although because we're distributed around the
-  world, you may not get an instant response. That doesn't mean we're
-  ignoring you, so either hang on for a reply, or you can use the mailing
-  list instead.
+* We're on `#xapian <https://kiwiirc.com/client/irc.libera.chat/#xapian>`_ on
+  ``irc.libera.chat``, which is bridged to the matrix room #xapian:matrix.org.
+  Note that because we're distributed around the world you may not get an
+  instant response. That doesn't mean we're ignoring you, so either hang on for
+  a reply, or you can use the mailing list instead.
 
 .. This would be a good place to talk about a CoC.