From 62fe1563ad6805decc51fb3d682064249deddb96 Mon Sep 17 00:00:00 2001 From: Abdur-Rahmaan Janhangeer Date: Wed, 3 Apr 2019 12:47:01 +0400 Subject: [PATCH 1/2] Update CONTRIBUTING.rst --- CONTRIBUTING.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 36b7df3ab9..387d8daee5 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -11,6 +11,7 @@ resources for questions about your own code: * The IRC channel ``#pocoo`` on FreeNode. * The IRC channel ``#python`` on FreeNode for more general questions. +* Our Discord server is here: `https://discordapp.com/invite/3TDRQsx`_ * The mailing list flask@python.org for long term discussion or larger issues. * Ask on `Stack Overflow`_. Search with Google first using: ``site:stackoverflow.com flask {search term, exception message, etc.}`` @@ -39,6 +40,7 @@ Submitting patches without your patch. - Try to follow `PEP8`_, but you may ignore the line length limit if following it would make the code uglier. +- We don't accept style-related patches. First time setup ~~~~~~~~~~~~~~~~ From 5e41e409bca42a8fef7b4460adfc76bf432824da Mon Sep 17 00:00:00 2001 From: David Lord Date: Thu, 16 May 2019 09:47:56 -0700 Subject: [PATCH 2/2] fix discord link, clean up --- CONTRIBUTING.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 387d8daee5..44bb53d5e0 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -9,9 +9,9 @@ Support questions Please, don't use the issue tracker for this. Use one of the following resources for questions about your own code: -* The IRC channel ``#pocoo`` on FreeNode. -* The IRC channel ``#python`` on FreeNode for more general questions. -* Our Discord server is here: `https://discordapp.com/invite/3TDRQsx`_ +* The ``#get-help`` channel on our Discord chat: https://discord.gg/t6rrQZH + * The IRC channel ``#pocoo`` on FreeNode is linked to Discord, but + Discord is preferred. * The mailing list flask@python.org for long term discussion or larger issues. * Ask on `Stack Overflow`_. Search with Google first using: ``site:stackoverflow.com flask {search term, exception message, etc.}`` @@ -40,7 +40,6 @@ Submitting patches without your patch. - Try to follow `PEP8`_, but you may ignore the line length limit if following it would make the code uglier. -- We don't accept style-related patches. First time setup ~~~~~~~~~~~~~~~~