diff --git a/README.rst b/README.rst index bb825cdc0e..4302f10ad5 100644 --- a/README.rst +++ b/README.rst @@ -30,8 +30,7 @@ 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://en.wikipedia.org/wiki/Wikipedia:IRC/Tutorial if you're - new to IRC. + out there. See https://freenode.net/kb/answer/chat if you're new to IRC. * 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 f5fb0ab276..b27a1cef96 100644 --- a/docs/faq/help.txt +++ b/docs/faq/help.txt @@ -23,10 +23,12 @@ Then, please post it in one of the following channels: 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. + chat-based discussions. If you're new to IRC, see the `Freenode + documentation`_ for different ways to connect. .. _`"Using Django"`: https://forum.djangoproject.com/c/users -.. _`#django IRC channel`: irc://irc.freenode.net/django +.. _#django IRC channel: https://webchat.freenode.net/#django +.. _Freenode documentation: https://freenode.net/kb/answer/chat 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 a85f689326..da4ee20a15 100644 --- a/docs/internals/contributing/bugs-and-features.txt +++ b/docs/internals/contributing/bugs-and-features.txt @@ -165,4 +165,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: irc://irc.freenode.net/django +.. _#django: https://webchat.freenode.net/#django diff --git a/docs/internals/contributing/index.txt b/docs/internals/contributing/index.txt index 46a47ab405..0dcfa7a844 100644 --- a/docs/internals/contributing/index.txt +++ b/docs/internals/contributing/index.txt @@ -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: irc://irc.freenode.net/django -.. _#django-dev IRC channel: irc://irc.freenode.net/django-dev +.. _#django IRC channel: https://webchat.freenode.net/#django +.. _#django-dev IRC channel: https://webchat.freenode.net/#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 50271c86fa..06cc061670 100644 --- a/docs/intro/contributing.txt +++ b/docs/intro/contributing.txt @@ -45,7 +45,7 @@ so that it can be of use to the widest audience. chat with other Django users who might be able to help. __ https://diveinto.org/python3/table-of-contents.html -__ irc://irc.freenode.net/django-dev +__ https://webchat.freenode.net/#django-dev What does this tutorial cover? ------------------------------ diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt index 5a3814a503..578f725ed3 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: irc://irc.freenode.net/django +.. _#django IRC channel: https://webchat.freenode.net/#django In plain text ------------- diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt index 355c7366ca..3fabf6607e 100644 --- a/docs/topics/db/sql.txt +++ b/docs/topics/db/sql.txt @@ -24,7 +24,8 @@ __ `executing custom SQL directly`_ Before using raw SQL, explore :doc:`the ORM `. Ask on |django-users| or the `#django IRC channel - `_ to see if the ORM supports your use case. + `_ to see if the ORM supports your + use case. .. warning::