summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2021-05-20 12:23:36 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-05-20 12:29:31 +0200
commit024e969062d1b7772c48c5fe45b65fcde50dea67 (patch)
tree654dd29b9e4ef9bbcc320f52e107a43fac37fd40
parentc53a76bdbf9b88fac0820cac50ae42e43f9b803f (diff)
[3.1.x] Changed IRC references to Libera.Chat.
Backport of 66491f08fe86629fa25977bb3dddda06959f65e7 from main.
-rw-r--r--README.rst4
-rw-r--r--docs/faq/help.txt8
-rw-r--r--docs/internals/contributing/bugs-and-features.txt2
-rw-r--r--docs/internals/contributing/index.txt6
-rw-r--r--docs/intro/contributing.txt4
-rw-r--r--docs/intro/whatsnext.txt2
-rw-r--r--docs/ref/contrib/gis/install/index.txt6
-rw-r--r--docs/releases/0.95.txt6
-rw-r--r--docs/releases/1.1.txt2
-rw-r--r--docs/spelling_wordlist2
-rw-r--r--docs/topics/db/sql.txt5
11 files changed, 23 insertions, 24 deletions
diff --git a/README.rst b/README.rst
index 4302f10ad5..92b2a85c27 100644
--- a/README.rst
+++ b/README.rst
@@ -29,8 +29,8 @@ ticket here: https://code.djangoproject.com/newticket
To get more help:
-* Join the ``#django`` channel on irc.freenode.net. Lots of helpful people hang
- out there. See https://freenode.net/kb/answer/chat if you're new to IRC.
+* Join the ``#django`` channel on ``irc.libera.chat``. Lots of helpful people
+ hang out there.
* Join the django-users mailing list, or read the archives, at
https://groups.google.com/group/django-users.
diff --git a/docs/faq/help.txt b/docs/faq/help.txt
index 30ae3e4398..d68bde3383 100644
--- a/docs/faq/help.txt
+++ b/docs/faq/help.txt
@@ -22,13 +22,13 @@ Then, please post it in one of the following channels:
* The Django Forum section `"Using Django"`_. This is for web-based
discussions.
* The |django-users| mailing list. This is for email-based discussions.
-* The `#django IRC channel`_ on the Freenode IRC network. This is for
- chat-based discussions. If you're new to IRC, see the `Freenode
+* The `#django IRC channel`_ on the Libera.Chat IRC network. This is for
+ chat-based discussions. If you're new to IRC, see the `Libera.Chat
documentation`_ for different ways to connect.
.. _`"Using Django"`: https://forum.djangoproject.com/c/users
-.. _#django IRC channel: https://webchat.freenode.net/#django
-.. _Freenode documentation: https://freenode.net/kb/answer/chat
+.. _#django IRC channel: irc://irc.libera.chat/django
+.. _Libera.Chat documentation: https://libera.chat/guides/connect
In all these channels please abide by the `Django Code of Conduct`_. In
summary, being friendly and patient, considerate, respectful, and careful in
diff --git a/docs/internals/contributing/bugs-and-features.txt b/docs/internals/contributing/bugs-and-features.txt
index d782f8000d..ee907d45e7 100644
--- a/docs/internals/contributing/bugs-and-features.txt
+++ b/docs/internals/contributing/bugs-and-features.txt
@@ -164,4 +164,4 @@ Votes on technical matters should be announced and held in public on the
.. _searching: https://code.djangoproject.com/search
.. _custom queries: https://code.djangoproject.com/query
-.. _#django: https://webchat.freenode.net/#django
+.. _#django: irc://irc.libera.chat/django
diff --git a/docs/internals/contributing/index.txt b/docs/internals/contributing/index.txt
index 0dcfa7a844..4fc1279020 100644
--- a/docs/internals/contributing/index.txt
+++ b/docs/internals/contributing/index.txt
@@ -16,7 +16,7 @@ contribute in many ways:
friendly and helpful atmosphere. If you're new to the Django community,
you should read the `posting guidelines`_.
-* Join the `#django IRC channel`_ on Freenode and answer questions. By
+* Join the `#django IRC channel`_ on Libera.Chat and answer questions. By
explaining Django to other users, you're going to learn a lot about the
framework yourself.
@@ -68,8 +68,8 @@ Browse the following sections to find out how:
committing-code
.. _posting guidelines: https://code.djangoproject.com/wiki/UsingTheMailingList
-.. _#django IRC channel: https://webchat.freenode.net/#django
-.. _#django-dev IRC channel: https://webchat.freenode.net/#django-dev
+.. _#django IRC channel: irc://irc.libera.chat/django
+.. _#django-dev IRC channel: irc://irc.libera.chat/django-dev
.. _community page: https://www.djangoproject.com/community/
.. _Django forum: https://forum.djangoproject.com/
.. _register it here: https://www.djangoproject.com/community/add/blogs/
diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt
index 707fb82920..042cca84e9 100644
--- a/docs/intro/contributing.txt
+++ b/docs/intro/contributing.txt
@@ -41,11 +41,11 @@ so that it can be of use to the widest audience.
.. admonition:: Where to get help:
If you're having trouble going through this tutorial, please post a message
- to |django-developers| or drop by `#django-dev on irc.freenode.net`__ to
+ to |django-developers| or drop by `#django-dev on irc.libera.chat`__ to
chat with other Django users who might be able to help.
__ https://diveinto.org/python3/table-of-contents.html
-__ https://webchat.freenode.net/#django-dev
+__ irc://irc.libera.chat/django-dev
What does this tutorial cover?
------------------------------
diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt
index 578f725ed3..a4f0e5fa3c 100644
--- a/docs/intro/whatsnext.txt
+++ b/docs/intro/whatsnext.txt
@@ -127,7 +127,7 @@ particular Django setup, try the |django-users| mailing list or the `#django
IRC channel`_ instead.
.. _ticket system: https://code.djangoproject.com/
-.. _#django IRC channel: https://webchat.freenode.net/#django
+.. _#django IRC channel: irc://irc.libera.chat/django
In plain text
-------------
diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt
index aa02aabe18..f04bb40a63 100644
--- a/docs/ref/contrib/gis/install/index.txt
+++ b/docs/ref/contrib/gis/install/index.txt
@@ -109,9 +109,9 @@ Troubleshooting
If you can't find the solution to your problem here then participate in the
community! You can:
-* Join the ``#geodjango`` IRC channel on Freenode. Please be patient and polite
- -- while you may not get an immediate response, someone will attempt to answer
- your question as soon as they see it.
+* Join the ``#django-geo`` IRC channel on Libera.Chat. Please be patient and
+ polite -- while you may not get an immediate response, someone will attempt
+ to answer your question as soon as they see it.
* Ask your question on the `GeoDjango`__ mailing list.
* File a ticket on the `Django trac`__ if you think there's a bug. Make
sure to provide a complete description of the problem, versions used,
diff --git a/docs/releases/0.95.txt b/docs/releases/0.95.txt
index 06248c0bc0..4b9b915708 100644
--- a/docs/releases/0.95.txt
+++ b/docs/releases/0.95.txt
@@ -109,9 +109,9 @@ many common questions appear with some regularity, and any particular problem
may already have been answered.
Finally, for those who prefer the more immediate feedback offered by IRC,
-there's a ``#django`` channel on irc.freenode.net that is regularly populated
-by Django users and developers from around the world. Friendly people are
-usually available at any hour of the day -- to help, or just to chat.
+there's a ``#django`` channel on ``irc.libera.chat`` that is regularly
+populated by Django users and developers from around the world. Friendly people
+are usually available at any hour of the day -- to help, or just to chat.
.. _Django website: https://www.djangoproject.com/
.. _django-users: https://groups.google.com/group/django-users
diff --git a/docs/releases/1.1.txt b/docs/releases/1.1.txt
index 49c375b5ce..e55ef9c903 100644
--- a/docs/releases/1.1.txt
+++ b/docs/releases/1.1.txt
@@ -441,7 +441,7 @@ What's next?
We'll take a short break, and then work on Django 1.2 will begin -- no rest for
the weary! If you'd like to help, discussion of Django development, including
progress toward the 1.2 release, takes place daily on the |django-developers|
-mailing list and in the ``#django-dev`` IRC channel on ``irc.freenode.net``.
+mailing list and in the ``#django-dev`` IRC channel on ``irc.libera.chat``.
Feel free to join the discussions!
Django's online documentation also includes pointers on how to contribute to
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index dff7a3918d..8566803715 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -227,7 +227,6 @@ formfield
formset
formsets
formtools
-freenode
Frysian
functionalities
gdal
@@ -330,6 +329,7 @@ Kyrgyz
latin
lawrence
lexer
+Libera
lifecycle
lifecycles
linearize
diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt
index c7224c78b0..fe5bea505e 100644
--- a/docs/topics/db/sql.txt
+++ b/docs/topics/db/sql.txt
@@ -23,9 +23,8 @@ __ `executing custom SQL directly`_
:doc:`custom query expressions </ref/models/expressions/>`.
Before using raw SQL, explore :doc:`the ORM </topics/db/index>`. Ask on
- |django-users| or the `#django IRC channel
- <https://webchat.freenode.net/#django>`_ to see if the ORM supports your
- use case.
+ one of :doc:`the support channels </faq/help>` to see if the ORM supports
+ your use case.
.. warning::