summaryrefslogtreecommitdiff
path: root/docs/faq
diff options
context:
space:
mode:
authorraffaella <suardini.raffaella@gmail.com>2024-06-08 17:41:36 +0200
committerSarah Boyce <42296566+sarahboyce@users.noreply.github.com>2024-06-26 12:39:25 +0200
commit3f72c8b5a27f8cde3cab29e8b4a2f2972665cae5 (patch)
tree948453ec655144a64b4041a80a0588ae634621d6 /docs/faq
parent9c7bff1ee43e2d9fda602c1af1f39a168f0acb54 (diff)
[5.1.x] Added references to the Django Discord server inside the FAQ docs.
Backport of 88966bc2fe6fac7df261db9c053ce67c07979eaf from main.
Diffstat (limited to 'docs/faq')
-rw-r--r--docs/faq/help.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/faq/help.txt b/docs/faq/help.txt
index 9972e9a0ca..a999c08d32 100644
--- a/docs/faq/help.txt
+++ b/docs/faq/help.txt
@@ -22,11 +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 Discord server`_ for chat-based discussions.
* 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/6
+.. _`Django Discord server`: https://discord.gg/xcRH6mN4fa
.. _#django IRC channel: https://web.libera.chat/#django
.. _Libera.Chat documentation: https://libera.chat/guides/connect
@@ -86,8 +88,8 @@ to security@djangoproject.com. This is a private list only open to long-time,
highly trusted Django developers, and its archives are not publicly readable.
Due to the sensitive nature of security issues, we ask that if you think you
-have found a security problem, *please* don't post a message on the forum, IRC,
-or one of the public mailing lists. Django has a
+have found a security problem, *please* don't post a message on the forum, the
+Discord server, IRC, or one of the public mailing lists. Django has a
:ref:`policy for handling security issues <reporting-security-issues>`;
while a defect is outstanding, we would like to minimize any damage that
could be inflicted through public knowledge of that defect.