Przeglądaj źródła

Added Django Forum to mailing lists page.

Carlton Gibson 2 lat temu
rodzic
commit
d33368b4ab
2 zmienionych plików z 31 dodań i 6 usunięć
  1. 1 1
      docs/index.txt
  2. 30 5
      docs/internals/mailing-lists.txt

+ 1 - 1
docs/index.txt

@@ -330,7 +330,7 @@ you can contribute:
   :doc:`Team organization <internals/organization>` |
   :doc:`Team organization <internals/organization>` |
   :doc:`The Django source code repository <internals/git>` |
   :doc:`The Django source code repository <internals/git>` |
   :doc:`Security policies <internals/security>` |
   :doc:`Security policies <internals/security>` |
-  :doc:`Mailing lists <internals/mailing-lists>`
+  :doc:`Mailing lists and Forum<internals/mailing-lists>`
 
 
 * **Design philosophies:**
 * **Design philosophies:**
   :doc:`Overview <misc/design-philosophies>`
   :doc:`Overview <misc/design-philosophies>`

+ 30 - 5
docs/internals/mailing-lists.txt

@@ -1,6 +1,6 @@
-=============
-Mailing lists
-=============
+=======================
+Mailing lists and Forum
+=======================
 
 
 .. Important::
 .. Important::
 
 
@@ -10,14 +10,34 @@ Mailing lists
     not public. For further details, please see :doc:`our security
     not public. For further details, please see :doc:`our security
     policies </internals/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-mailing-list:
 
 
 ``django-users``
 ``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
 This is the right place if you are looking to ask any question regarding the
 installation, usage, or debugging of Django.
 installation, usage, or debugging of Django.
 
 
@@ -40,6 +60,11 @@ installation, usage, or debugging of Django.
 ``django-developers``
 ``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.
 The discussion about the development of Django itself takes place here.
 
 
 Before asking a question about how to contribute, read
 Before asking a question about how to contribute, read