From 35ffaf77c2c5f665805b8abbbecd02f212eec03d Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.es>
Date: Thu, 23 Mar 2023 15:52:36 +0100
Subject: [PATCH] [4.2.x] Added Django Forum to mailing lists page.

Backport of d33368b4ab6ae0c01e83d525f7e1655156a640d1 from main
---
 docs/index.txt                   |  2 +-
 docs/internals/mailing-lists.txt | 35 +++++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/docs/index.txt b/docs/index.txt
index f4878fc850..9a5585c29e 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -330,7 +330,7 @@ you can contribute:
   :doc:`Team organization <internals/organization>` |
   :doc:`The Django source code repository <internals/git>` |
   :doc:`Security policies <internals/security>` |
-  :doc:`Mailing lists <internals/mailing-lists>`
+  :doc:`Mailing lists and Forum<internals/mailing-lists>`
 
 * **Design philosophies:**
   :doc:`Overview <misc/design-philosophies>`
diff --git a/docs/internals/mailing-lists.txt b/docs/internals/mailing-lists.txt
index d21f9906db..7ec4972d6e 100644
--- a/docs/internals/mailing-lists.txt
+++ b/docs/internals/mailing-lists.txt
@@ -1,6 +1,6 @@
-=============
-Mailing lists
-=============
+=======================
+Mailing lists and Forum
+=======================
 
 .. Important::
 
@@ -10,14 +10,34 @@ Mailing lists
     not public. For further details, please see :doc:`our security
     policies </internals/security>`.
 
-Django has several official mailing lists on Google Groups that are open to
-anyone.
+Django Forum
+============
+
+Django has an `official Forum`_ where you can input and ask questions.
+
+There are several categories of discussion including:
+
+* `Using Django`_: to ask any question regarding the installation, usage, or
+  debugging of Django.
+* `Internals`_: for discussion of the development of Django itself.
+
+.. _official Forum: https://forum.djangoproject.com
+.. _Internals: https://forum.djangoproject.com/c/internals/5
+.. _Using Django: https://forum.djangoproject.com/c/users/6
+
+In addition, Django has several official mailing lists on Google Groups that
+are open to anyone.
 
 .. _django-users-mailing-list:
 
 ``django-users``
 ================
 
+.. note::
+
+    The `Using Django`_ category of the `official Forum`_ is now the preferred
+    venue for asking usage questions.
+
 This is the right place if you are looking to ask any question regarding the
 installation, usage, or debugging of Django.
 
@@ -40,6 +60,11 @@ installation, usage, or debugging of Django.
 ``django-developers``
 =====================
 
+.. note::
+
+    The `Internals`_ category of the `official Forum`_ is now the preferred
+    venue for discussing the development of Django.
+
 The discussion about the development of Django itself takes place here.
 
 Before asking a question about how to contribute, read