From 4bf208784e21a97e29474a7b5e7283d1105b14c9 Mon Sep 17 00:00:00 2001
From: Matteo Bertucci <matteobertucci2004@gmail.com>
Date: Fri, 12 Nov 2021 09:27:15 +0100
Subject: Content: update help channel claiming system

This commit changes the following inside the help channel guide:
* Only one help channel can be claimed at the same time
* You can use the search to find your channel
* The channel will close after 10 minutes if someone else sends a message
---
 .../apps/content/resources/guides/pydis-guides/help-channel-guide.md  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
index 8b7c5584..fe1c4747 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
@@ -42,14 +42,14 @@ There are always 3 available help channels waiting to be claimed in the **Python
 
 In order to claim one, simply start typing your question into one of these channels. Once your question has been posted, you have claimed this channel, and the channel will be moved down to the **Python Help: Occupied** category.
 
-If you're unable to type into these channels, this means you're currently **on cooldown**. In order to prevent someone from claiming all the channels for themselves, **we only allow someone to claim a new help channel every 15 minutes**. However, if you close your help channel using the `!dormant` command, this cooldown is reset early.
+If you're unable to type into these channels, this means you're currently **on cooldown**. In order to prevent someone from claiming all the channels for themselves, **we only allow someone to claim a single help channel at the same time**. You can search in the top right corner of your Discord client `from:yourusername#xxxx` to find back your channel.
 
 ![Channel available message](/static/images/content/help_channels/available_message.png)
 *This message is always posted when a channel becomes available for use.*
 
 ## Q: For how long is the channel mine?
 
-The channel is yours until it has been inactive for **30 minutes**. When this happens, we move the channel down to the **Python Help: Dormant** category, and make the channel read-only. After a while, the channel will be rotated back into **Python Help: Available** for the next question. Please try to resist the urge to continue bumping the channel so that it never gets marked as inactive. If nobody is answering your question, you should try to reformulate the question to increase your chances of getting help.
+The channel is yours until it has been inactive for **10 minutes**, or 30 minutes until someone participate in the channel. When this happens, we move the channel down to the **Python Help: Dormant** category, and make the channel read-only. After a while, the channel will be rotated back into **Python Help: Available** for the next question. Please try to resist the urge to continue bumping the channel so that it never gets marked as inactive. If nobody is answering your question, you should try to reformulate the question to increase your chances of getting help.
 
 ![Channel dormant message](/static/images/content/help_channels/dormant_message.png)
 *You'll see this message in your channel when the channel is marked as inactive.*
-- 
cgit v1.2.3


From c1593a66e1fe8739ba881f76736330459d0ffc8e Mon Sep 17 00:00:00 2001
From: mina <sueminaoh@gmail.com>
Date: Thu, 23 Dec 2021 13:13:26 -0500
Subject: Fix markdown error linking to recommended editors

---
 .../guides/python-guides/creating-python-environment-windows.md         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/creating-python-environment-windows.md b/pydis_site/apps/content/resources/guides/python-guides/creating-python-environment-windows.md
index 356d63bd..635c384f 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/creating-python-environment-windows.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/creating-python-environment-windows.md
@@ -29,7 +29,7 @@ You will also need a text editor for writing Python programs, and for subsequent
 Powerful programs called integrated development environments (IDEs) like PyCharm and Visual Studio Code contain text editors, but they also contain many other features with uses that aren't immediately obvious to new programmers.
 
 [Notepad++](https://notepad-plus-plus.org/) is a popular text editor for both beginners and advanced users who prefer a simpler interface.
-Other editors we recommend can be found (https://pythondiscord.com/resources/tools/#editors)[here].
+Other editors we recommend can be found [here](https://pythondiscord.com/resources/tools/#editors).
 
 ## Installing Git Bash
 Git is a command line program that helps you keep track of changes to your code, among other things.
-- 
cgit v1.2.3


From 0dc2e2a1c8bb7f8ee51bc37a311d3b60473fbad6 Mon Sep 17 00:00:00 2001
From: mina <sueminaoh@gmail.com>
Date: Thu, 23 Dec 2021 16:25:56 -0500
Subject: Update wording in topical and general help channel sections

---
 .../guides/pydis-guides/help-channel-guide.md          | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
index fe1c4747..5b0c773c 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
@@ -22,17 +22,15 @@ If your question fits into the domain of one of our topical help channels, and i
 
 ![List of topical help channels](/static/images/content/help_channels/topical_channels.png)
 
-Some of the topical help channels have a broad scope, so they can cover many (somewhat) related topics.
+Some of the topical help channels have a broad scope, so they can cover many related topics.
 For example, `#data-science-and-ai` covers scientific Python, statistics, and machine learning, while `#algos-and-data-structs` covers everything from data structures and algorithms to maths.
 
-To help you navigate this, we've added a list of suggested topics in the topic of every channel.
-If you're not sure where to post, feel free to ask us which channel is relevant for a topic in `#community-meta`.
+Each channel on the server has a channel description which briefly describes the topics covered by that channel. If you're not sure where to post, feel free to ask us which channel is appropriate in `#community-meta`.
 
 # General Help Channels
 
-Our general help channels move at a fast pace, and attract a far more diverse spectrum of helpers.
-This is a great choice for a generic Python question, and a good choice if you need an answer as soon as possible.
-It's particularly important to [ask good questions](../asking-good-questions) when asking in these channels, or you risk not getting an answer and having your help channel be claimed by someone else.
+Our general help channels cycle quickly, with the advantage of attracting a more diverse spectrum of helpers, and getting individual attention and help for your question. These channels are a great choice for generic Python questions, but they can be used for domain-specific Python help as well. 
+Be sure to [ask good questions](../asking-good-questions) in order to give yourself the best chances of getting help. 
 
 ## How To Claim a Channel
 
@@ -40,12 +38,12 @@ There are always 3 available help channels waiting to be claimed in the **Python
 
 ![Available help channels](/static/images/content/help_channels/available_channels.png)
 
-In order to claim one, simply start typing your question into one of these channels. Once your question has been posted, you have claimed this channel, and the channel will be moved down to the **Python Help: Occupied** category.
+This message is posted when a channel becomes available for use:
+![Channel available message](/static/images/content/help_channels/available_message.png)
 
-If you're unable to type into these channels, this means you're currently **on cooldown**. In order to prevent someone from claiming all the channels for themselves, **we only allow someone to claim a single help channel at the same time**. You can search in the top right corner of your Discord client `from:yourusername#xxxx` to find back your channel.
+In order to claim one, simply start typing your question into one of these channels. Once your question is posted, you have claimed this channel it will be moved down to the **Occupied Help Channels** category.
 
-![Channel available message](/static/images/content/help_channels/available_message.png)
-*This message is always posted when a channel becomes available for use.*
+At this point you will have the **Help Cooldown** role which will remain on your profile until your help channel is closed (with the `!closed` command) or goes dormant due to inactivity.
 
 ## Q: For how long is the channel mine?
 
-- 
cgit v1.2.3


From 5403f81215c7ea51aaebfc29148f8c9104b92430 Mon Sep 17 00:00:00 2001
From: mina <sueminaoh@gmail.com>
Date: Thu, 23 Dec 2021 16:29:23 -0500
Subject: Add Frequently Asked Questions header

---
 .../apps/content/resources/guides/pydis-guides/help-channel-guide.md    | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
index 5b0c773c..0f5a4f9c 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
@@ -45,6 +45,8 @@ In order to claim one, simply start typing your question into one of these chann
 
 At this point you will have the **Help Cooldown** role which will remain on your profile until your help channel is closed (with the `!closed` command) or goes dormant due to inactivity.
 
+# Frequently Asked Questions
+
 ## Q: For how long is the channel mine?
 
 The channel is yours until it has been inactive for **10 minutes**, or 30 minutes until someone participate in the channel. When this happens, we move the channel down to the **Python Help: Dormant** category, and make the channel read-only. After a while, the channel will be rotated back into **Python Help: Available** for the next question. Please try to resist the urge to continue bumping the channel so that it never gets marked as inactive. If nobody is answering your question, you should try to reformulate the question to increase your chances of getting help.
-- 
cgit v1.2.3


From 75cde82850b683a563a23cbed813bfcb0322e92e Mon Sep 17 00:00:00 2001
From: mina <sueminaoh@gmail.com>
Date: Thu, 23 Dec 2021 16:55:59 -0500
Subject: Update channel dormancy timings

---
 .../content/resources/guides/pydis-guides/help-channel-guide.md     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
index 0f5a4f9c..c0c7f896 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
@@ -47,12 +47,12 @@ At this point you will have the **Help Cooldown** role which will remain on your
 
 # Frequently Asked Questions
 
-## Q: For how long is the channel mine?
+## Q: How long does my help channel stay active?
 
-The channel is yours until it has been inactive for **10 minutes**, or 30 minutes until someone participate in the channel. When this happens, we move the channel down to the **Python Help: Dormant** category, and make the channel read-only. After a while, the channel will be rotated back into **Python Help: Available** for the next question. Please try to resist the urge to continue bumping the channel so that it never gets marked as inactive. If nobody is answering your question, you should try to reformulate the question to increase your chances of getting help.
+The channel remains open for **30 minutes** after your last message, but if another user posts in your channel, the closing will be delayed by 10 minutes.
 
+*You'll see this message in your channel once it goes dormant:*
 ![Channel dormant message](/static/images/content/help_channels/dormant_message.png)
-*You'll see this message in your channel when the channel is marked as inactive.*
 
 ## Q: I don't need my help channel anymore, my question was answered. What do I do?
 
-- 
cgit v1.2.3


From 0219d94eb449f99dabf1f26dcf77f07ef92d13e0 Mon Sep 17 00:00:00 2001
From: mina <sueminaoh@gmail.com>
Date: Thu, 23 Dec 2021 17:05:08 -0500
Subject: Add "no one answered me" question and answer

---
 .../content/resources/guides/pydis-guides/help-channel-guide.md     | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
index c0c7f896..e74cc43f 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
@@ -54,6 +54,12 @@ The channel remains open for **30 minutes** after your last message, but if anot
 *You'll see this message in your channel once it goes dormant:*
 ![Channel dormant message](/static/images/content/help_channels/dormant_message.png)
 
+## Q: No one answered my question. How come?
+
+The server has users active all over the world and all hours of the day, but some days are less active than others. If no one answered your question, feel free to claim another help channel a little later.
+
+If you still feel like your question is being overlooked, read our guide on [asking good questions](../asking-good-questions) to incease your chances of getting a response.
+
 ## Q: I don't need my help channel anymore, my question was answered. What do I do?
 
 Once you have finished with your help channel you or a staff member can run `!dormant`. This will move the channel to the **Python Help: Dormant** category where it will sit until it is returned to circulation. You will only be able to run the command if you claimed the channel from the available category, you cannot close channels belonging to others.
-- 
cgit v1.2.3


From 72234b1a2b6585e998d85cebd31d3b5ed7986cec Mon Sep 17 00:00:00 2001
From: mina <sueminaoh@gmail.com>
Date: Thu, 23 Dec 2021 17:12:18 -0500
Subject: Edit "how do I close my channel" question and answer

---
 .../apps/content/resources/guides/pydis-guides/help-channel-guide.md    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
index e74cc43f..5f41f442 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
@@ -62,7 +62,7 @@ If you still feel like your question is being overlooked, read our guide on [ask
 
 ## Q: I don't need my help channel anymore, my question was answered. What do I do?
 
-Once you have finished with your help channel you or a staff member can run `!dormant`. This will move the channel to the **Python Help: Dormant** category where it will sit until it is returned to circulation. You will only be able to run the command if you claimed the channel from the available category, you cannot close channels belonging to others.
+Go ahead and move your channel to the dormant category by running the `!closed` command. You will only be able to run this command in your own help channel, and likewise no one will be able to prematurely close your claimed help channel (with the exception of staff).
 
 ## Q: Are only Helpers supposed to answer questions?
 
-- 
cgit v1.2.3


From 512b1659f5bb5d2dfb8029f42d7b8c7e3436ede1 Mon Sep 17 00:00:00 2001
From: Krish <krishbhardwaj27203@gmail.com>
Date: Fri, 7 Jan 2022 12:19:29 +0530
Subject: Resource Suggestion: #639 solved

---
 .../pydis-guides/contributing/setting-test-server-and-bot-account.md  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/setting-test-server-and-bot-account.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/setting-test-server-and-bot-account.md
index c14fe50d..43d1c8f5 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/setting-test-server-and-bot-account.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/setting-test-server-and-bot-account.md
@@ -18,13 +18,11 @@ icon: fab fa-discord
 4. Change your bot's `Public Bot` setting off so only you can invite it, save, and then get your **Bot Token** with the `Copy` button.
 > **Note:** **DO NOT** post your bot token anywhere public, or it can and will be compromised.
 5. Save your **Bot Token** somewhere safe to use in the project settings later.
-6. In the `General Information` tab, grab the **Client ID**.
+6. In the `OAuth2` tab, grab the **Client ID**.
 7. Replace `<CLIENT_ID_HERE>` in the following URL and visit it in the browser to invite your bot to your new test server.
 ```plaintext
 https://discordapp.com/api/oauth2/authorize?client_id=<CLIENT_ID_HERE>&permissions=8&scope=bot
 ```
-Optionally, you can generate your own invite url in the `OAuth` tab, after selecting `bot` as the scope.
-
 ---
 
 ## Obtain the IDs
-- 
cgit v1.2.3


From 7242fb9492f07c724d4b354ca34d07e2948e4a1f Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Wed, 26 Jan 2022 23:15:05 +0000
Subject: Fix pynews config in example file

The python news cog relies on the python_news section of the config being filled in via a named alias. Since we were using the DEV_ prefix, this meant it was not being populated, leading to the cog throwing an error on boot.
---
 .../apps/content/resources/guides/pydis-guides/contributing/bot.md  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
index b9589def..d31c6dbf 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
@@ -350,7 +350,7 @@ style:
 
         trashcan: "<:trashcan:�>"
 
-##### <<  Optional - If you don't care about the filtering and help channel cogs, ignore the rest of this file  >> #####
+##### <<  Optional - If you don't care about the filtering, help channel and py-news cogs, ignore the rest of this file  >> #####
 filter:
     # What do we filter?
     filter_domains:        true
@@ -426,6 +426,10 @@ help_channels:
     notify_roles:
         - *HELPERS_ROLE
 
+python_news:
+    channel: *DEV_PY_NEWS
+    webhook: *PYNEWS_WEBHOOK
+
 ##### <<  Add any additional sections you need to override from config-default.yml  >> #####
             </code>
           </pre>
-- 
cgit v1.2.3


From 8b50bef2f43d660679702c8043390b2e3ec62f03 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Wed, 26 Jan 2022 23:15:39 +0000
Subject: Add new incidents webhook to exmaple config.yml

This was recently added to the bot.
---
 .../apps/content/resources/guides/pydis-guides/contributing/bot.md       | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
index d31c6dbf..ed9e3db3 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
@@ -196,6 +196,7 @@ guild:
         big_brother:                            �
         dev_log:                                �
         duck_pond:                              �
+        incidents:                              �
         incidents_archive:                      �
         python_news:        &PYNEWS_WEBHOOK     �
         talent_pool:                            �
-- 
cgit v1.2.3


From 4b17d714fb0cb7d1fd199a2ca123b6d18fe377e7 Mon Sep 17 00:00:00 2001
From: Leon Sandøy <leon.haland@gmail.com>
Date: Sun, 30 Jan 2022 14:02:19 +0100
Subject: Fix resource redirects for deploy previews.

This could probably be improved by making it less hardcoded, but since
there's a bunch of special cases, and since it only affects deploy
previews, I'm choosing to solve this with a simple solution.

I don't think realistically that we're gonna be adding a ton of resource
types down the line anyway.
---
 pydis_site/apps/content/urls.py   |  2 +-
 pydis_site/apps/resources/urls.py | 40 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/urls.py b/pydis_site/apps/content/urls.py
index fe7c2852..f8496095 100644
--- a/pydis_site/apps/content/urls.py
+++ b/pydis_site/apps/content/urls.py
@@ -30,7 +30,7 @@ def __get_all_files(root: Path, folder: typing.Optional[Path] = None) -> list[st
 
 
 def get_all_pages() -> typing.Iterator[dict[str, str]]:
-    """Yield a dict of all pag categories."""
+    """Yield a dict of all page categories."""
     for location in __get_all_files(Path("pydis_site", "apps", "content", "resources")):
         yield {"location": location}
 
diff --git a/pydis_site/apps/resources/urls.py b/pydis_site/apps/resources/urls.py
index ed24dc99..aa3892b6 100644
--- a/pydis_site/apps/resources/urls.py
+++ b/pydis_site/apps/resources/urls.py
@@ -1,9 +1,47 @@
+import typing
+
 from django_distill import distill_path
 
 from pydis_site.apps.resources import views
 
+# This is only used for `distill_path`, so that the Netlify Deploy Previews
+# can successfully redirect to static pages. This could probably be improved by
+# making it less hardcoded, but since there's a bunch of special cases, and since
+# it only affects deploy previews, I'm choosing to solve this with a simple solution.
+VALID_RESOURCE_TYPES = [
+    "book",
+    "books",
+    "reading",
+    "podcast",
+    "podcasts",
+    "interactive",
+    "videos",
+    "video",
+    "courses",
+    "course",
+    "communities",
+    "community",
+    "tutorial",
+    "tutorials",
+    "tool",
+    "tools",
+    "project ideas",
+    "project-ideas",
+]
+
+
+def get_all_pages() -> typing.Iterator[dict[str, str]]:
+    for resource_type in VALID_RESOURCE_TYPES:
+        yield {"resource_type": resource_type}
+
+
 app_name = "resources"
 urlpatterns = [
     distill_path("", views.resources.ResourceView.as_view(), name="index"),
-    distill_path("<resource_type>/", views.resources.ResourceView.as_view(), name="index"),
+    distill_path(
+        "<resource_type>/",
+        views.resources.ResourceView.as_view(),
+        name="index",
+        distill_func=get_all_pages,
+    ),
 ]
-- 
cgit v1.2.3


From e144d4d1b4d1ef2ec2f9f8b771b3606b581ace34 Mon Sep 17 00:00:00 2001
From: Leon Sandøy <leon.haland@gmail.com>
Date: Tue, 1 Feb 2022 22:43:15 +0100
Subject: Complete refactor of collapsibles.

This is now a completely self-contained feature, which
can be used in the same way on every page. I've moved all the
collapsible-related logics out of the resources.js file and
into collapsibles.js, and added documentation and other
quality-of-life features that will apply to other pages, as well.

Changes:
- The icon will now always change when the collapsible opens or closes.
- By adding the "collapsed" class, you can tell the collapsible to
  be collapsed by default.
---
 .../guides/pydis-guides/contributing/bot.md        | 20 ++++----
 pydis_site/static/css/collapsibles.css             |  4 --
 pydis_site/static/js/collapsibles.js               | 60 ++++++++++++++++++++--
 pydis_site/static/js/resources/resources.js        | 15 +-----
 4 files changed, 67 insertions(+), 32 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
index ed9e3db3..2aa10aa3 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
@@ -14,10 +14,10 @@ First things first, to run the bot's code and make changes to it, you need a loc
     <button type="button" class="card-header collapsible">
         <span class="card-header-title subtitle is-6 my-2 ml-2">Getting started with Git and GitHub</span>
         <span class="card-header-icon">
-            <i class="fas fa-angle-down title is-5" aria-hidden="true"></i>
+            <i class="fas fa-fw fa-angle-down title is-5" aria-hidden="true"></i>
         </span>
     </button>
-    <div class="collapsible-content">
+    <div class="collapsible-content collapsed">
         <div class="card-content">
               <p>If you don't have Git on your computer already, <a href="https://git-scm.com/downloads">install it</a>. You can additionally install a Git GUI such as <a href="https://www.gitkraken.com/download">GitKraken</a>, or the <a href="https://cli.github.com/manual/installation">GitHub CLI</a>.</p>
               <p>To learn more about Git, you can look into <a href="../working-with-git">our guides</a>, as well as <a href="https://education.github.com/git-cheat-sheet-education.pdf">this cheatsheet</a>, <a href="https://learngitbranching.js.org">Learn Git Branching</a>, and otherwise any guide you can find on the internet. Once you got the basic idea though, the best way to learn Git is to use it.</p>
@@ -78,10 +78,10 @@ See [here](../obtaining-discord-ids) for help with obtaining Discord IDs.
     <button type="button" class="card-header collapsible">
         <span class="card-header-title subtitle is-6 my-2 ml-2">Optional config.yml</span>
         <span class="card-header-icon">
-            <i class="fas fa-angle-down title is-5" aria-hidden="true"></i>
+            <i class="fas fa-fw fa-angle-down title is-5" aria-hidden="true"></i>
         </span>
     </button>
-    <div class="collapsible-content">
+    <div class="collapsible-content collapsed">
         <div class="card-content">
               <p>If you used the provided server template, and you're not sure which channels belong where in the config file, you can use the config below. Pay attention to the comments with several <code>#</code> symbols, and replace the <code>�</code> characters with the right IDs.</p>
               <pre>
@@ -458,10 +458,10 @@ We understand this is tedious and are working on a better solution for setting u
     <button type="button" class="card-header collapsible">
         <span class="card-header-title subtitle is-6 my-2 ml-2">Why do you need a separate config file?</span>
         <span class="card-header-icon">
-            <i class="fas fa-angle-down title is-5" aria-hidden="true"></i>
+            <i class="fas fa-fw fa-angle-down title is-5" aria-hidden="true"></i>
         </span>
     </button>
-    <div class="collapsible-content">
+    <div class="collapsible-content collapsed">
         <div class="card-content">
             While it's technically possible to edit <code>config-default.yml</code> to match your server, it is heavily discouraged.
             This file's purpose is to provide the configurations the Python bot needs to run in the Python server in production, and should remain as such.
@@ -487,10 +487,10 @@ You are now almost ready to run the Python bot. The simplest way to do so is wit
     <button type="button" class="card-header collapsible">
         <span class="card-header-title subtitle is-6 my-2 ml-2">Getting started with Docker</span>
         <span class="card-header-icon">
-            <i class="fas fa-angle-down title is-5" aria-hidden="true"></i>
+            <i class="fas fa-fw fa-angle-down title is-5" aria-hidden="true"></i>
         </span>
     </button>
-    <div class="collapsible-content">
+    <div class="collapsible-content collapsed">
         <div class="card-content">
             The requirements for Docker are:
             <ul>
@@ -541,10 +541,10 @@ With at least the site running in Docker already (see the previous section on ho
     <button type="button" class="card-header collapsible">
         <span class="card-header-title subtitle is-6 my-2 ml-2">Ways to run code</span>
         <span class="card-header-icon">
-            <i class="fas fa-angle-down title is-5" aria-hidden="true"></i>
+            <i class="fas fa-fw fa-angle-down title is-5" aria-hidden="true"></i>
         </span>
     </button>
-    <div class="collapsible-content">
+    <div class="collapsible-content collapsed">
         <div class="card-content">
             Notice that the bot is started as a module. There are several ways to do so:
             <ul>
diff --git a/pydis_site/static/css/collapsibles.css b/pydis_site/static/css/collapsibles.css
index a722d646..1d73fa00 100644
--- a/pydis_site/static/css/collapsibles.css
+++ b/pydis_site/static/css/collapsibles.css
@@ -7,9 +7,5 @@
 
 .collapsible-content {
   transition: max-height 0.3s ease-out;
-}
-
-.collapsible-content.collapsed {
   overflow: hidden;
-  max-height: 0 !important;
 }
diff --git a/pydis_site/static/js/collapsibles.js b/pydis_site/static/js/collapsibles.js
index 443d3f49..1df0b9fe 100644
--- a/pydis_site/static/js/collapsibles.js
+++ b/pydis_site/static/js/collapsibles.js
@@ -1,15 +1,67 @@
+/*
+A utility for creating simple collapsible cards.
+
+To see this in action, go to /resources or /pages/guides/pydis-guides/contributing/bot/
+
+// HOW TO USE THIS //
+First, import this file and the corresponding css file into your template.
+
+  <link rel="stylesheet" href="{% static "css/collapsibles.css" %}">
+  <script defer src="{% static "js/collapsibles.js" %}"></script>
+
+Next, you'll need some HTML that these scripts can interact with.
+
+<div class="card">
+    <button type="button" class="card-header collapsible">
+        <span class="card-header-title subtitle is-6 my-2 ml-2">Your headline</span>
+        <span class="card-header-icon">
+            <i class="fas fa-fw fa-angle-down title is-5" aria-hidden="true"></i>
+        </span>
+    </button>
+    <div class="collapsible-content collapsed">
+        <div class="card-content">
+            You can put anything you want here. Lists, more divs, flexboxes, images, whatever.
+        </div>
+    </div>
+</div>
+
+That's it! Collapsing stuff should now work.
+ */
+
 document.addEventListener("DOMContentLoaded", () => {
-    // Set maxHeight to scroll height on all matching collapsibles
     const contentContainers = document.getElementsByClassName("collapsible-content");
     for (const container of contentContainers) {
-        container.style.maxHeight = container.scrollHeight + "px";
+        // Close any collapsibles that are marked as initially collapsed
+        if (container.classList.contains("collapsed")) {
+            container.style.maxHeight = "0px";
+        // Set maxHeight to the size of the container on all other containers.
+        } else {
+            container.style.maxHeight = container.scrollHeight + "px";
+        }
     }
 
+    // Listen for click events, and collapse or explode
     const headers = document.getElementsByClassName("collapsible");
     for (const header of headers) {
+        const content = header.nextElementSibling;
+        const icon = header.querySelector(".card-header-icon i");
+
+        // Any collapsibles that are not initially collapsed needs an icon switch.
+        if (!content.classList.contains("collapsed")) {
+            icon.classList.remove("fas", "fa-angle-down");
+            icon.classList.add("far", "fa-window-minimize");
+        }
+
         header.addEventListener("click", () => {
-            var content = header.nextElementSibling;
-            content.classList.toggle('collapsed');
+            if (content.style.maxHeight !== "0px"){
+                content.style.maxHeight = "0px";
+                icon.classList.remove("far", "fa-window-minimize");
+                icon.classList.add("fas", "fa-angle-down");
+            } else {
+                content.style.maxHeight = content.scrollHeight + "px";
+                icon.classList.remove("fas", "fa-angle-down");
+                icon.classList.add("far", "fa-window-minimize");
+            }
         });
     }
 });
diff --git a/pydis_site/static/js/resources/resources.js b/pydis_site/static/js/resources/resources.js
index 00bc6ad8..e45233b3 100644
--- a/pydis_site/static/js/resources/resources.js
+++ b/pydis_site/static/js/resources/resources.js
@@ -217,20 +217,7 @@ document.addEventListener("DOMContentLoaded", function () {
     deserializeURLParams();
     updateUI();
 
-    // If you collapse or uncollapse a filter group, swap the icon.
-    $('button.collapsible').on("click", function() {
-        let icon = $(this).find(".card-header-icon i");
-
-        if ($(icon).hasClass("fa-window-minimize")) {
-            $(icon).removeClass(["far", "fa-window-minimize"]);
-            $(icon).addClass(["fas", "fa-angle-down"]);
-        } else {
-            $(icon).removeClass(["fas", "fa-angle-down"]);
-            $(icon).addClass(["far", "fa-window-minimize"]);
-        }
-    });
-
-    // If this is a mobile device, collapse the categories to win back some screen real estate.
+    // If this is a mobile device, collapse all the categories to win back some screen real estate.
     if (screen.width < 480) {
         let categoryHeaders = $(".filter-category-header .collapsible-content");
         let icons = $('.filter-category-header button .card-header-icon i');
-- 
cgit v1.2.3


From 63b464b57ea0824570879f24baaaca6fd80393ee Mon Sep 17 00:00:00 2001
From: ChrisJL <ChrisLovering@users.noreply.github.com>
Date: Fri, 4 Feb 2022 16:26:57 +0000
Subject: Replace FA pro issue icon with the regular icon

We stopped using FA pro, as we wanted it was using an ex-admin's person FA pro subscription, which we didn't control.
---
 .../apps/content/resources/guides/pydis-guides/contributing.md      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index d367dbc7..4013962c 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -27,7 +27,7 @@ Our projects on Python Discord are open source and [available on Github](https:/
         </div>
       </div>
       <div class="card-footer">
-        <a href="https://github.com/python-discord/sir-lancebot/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc" class="card-footer-item"><i class="far fa-exclamation-circle"></i>&ensp;Issues</a>
+        <a href="https://github.com/python-discord/sir-lancebot/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc" class="card-footer-item"><i class="fas fa-exclamation-circle"></i>&ensp;Issues</a>
         <a href="https://github.com/python-discord/sir-lancebot/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" class="card-footer-item"><i class="fas fa-code-merge"></i>&ensp;PRs</a>
       </div>
       <div class="card-footer">
@@ -54,7 +54,7 @@ Our projects on Python Discord are open source and [available on Github](https:/
         </div>
       </div>
       <div class="card-footer">
-        <a href="https://github.com/python-discord/bot/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc" class="card-footer-item"><i class="far fa-exclamation-circle"></i>&ensp;Issues</a>
+        <a href="https://github.com/python-discord/bot/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc" class="card-footer-item"><i class="fas fa-exclamation-circle"></i>&ensp;Issues</a>
         <a href="https://github.com/python-discord/bot/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" class="card-footer-item"><i class="fas fa-code-merge"></i>&ensp;PRs</a>
       </div>
       <div class="card-footer">
@@ -81,7 +81,7 @@ Our projects on Python Discord are open source and [available on Github](https:/
         </div>
       </div>
       <div class="card-footer">
-        <a href="https://github.com/python-discord/site/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc" class="card-footer-item"><i class="far fa-exclamation-circle"></i>&ensp;Issues</a>
+        <a href="https://github.com/python-discord/site/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc" class="card-footer-item"><i class="fas fa-exclamation-circle"></i>&ensp;Issues</a>
         <a href="https://github.com/python-discord/site/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" class="card-footer-item"><i class="fas fa-code-merge"></i>&ensp;PRs</a>
       </div>
       <div class="card-footer">
-- 
cgit v1.2.3


From 44d4895a86fb93ff91c5adc577f57073758b8c08 Mon Sep 17 00:00:00 2001
From: minalike <sueminaoh@gmail.com>
Date: Sun, 20 Feb 2022 18:13:11 -0500
Subject: Update Name & Profile Policy

Update to better reflect our current moderation practices in regards to
user profiles. Previous name was "Nickname Policy"
---
 pydis_site/apps/content/resources/rules.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/rules.md b/pydis_site/apps/content/resources/rules.md
index ef6cc4d1..b788c81b 100644
--- a/pydis_site/apps/content/resources/rules.md
+++ b/pydis_site/apps/content/resources/rules.md
@@ -10,21 +10,21 @@ We have a small but strict set of rules on our server. Please read over them and
 > 3. Respect staff members and listen to their instructions.
 > 4. Use English to the best of your ability. Be polite if someone speaks English imperfectly.
 > 5. Do not provide or request help on projects that may break laws, breach terms of services, or are malicious or inappropriate.
-> 6.  Do not post unapproved advertising.
-> 7.  Keep discussions relevant to the channel topic. Each channel's description tells you the topic.
+> 6. Do not post unapproved advertising.
+> 7. Keep discussions relevant to the channel topic. Each channel's description tells you the topic.
 > 8. Do not help with ongoing exams. When helping with homework, help people learn how to do the assignment without doing it for them.
 > 9. Do not offer or ask for paid work of any kind.
 
-# Nickname Policy
+# Name & Profile Policy
 
-In order to keep things pleasant and workable for both users and staff members, we enforce the following requirements regarding your nickname.
+In order to keep things pleasant and workable for both users and staff members, we enforce the following requirements regarding your name, avatar, and profile. Staff reserve the right to change any nickname we judge to be violating these requirements.
 
-1. No blank or "invisible" names
-2. No slurs or other offensive sentiments
-3. No noisy unicode characters - for example, z̯̯͡a̧͎̺̻̝͕̠l̡͓̫̣g̹̲o̡̼̘ or byte order marks
-4. No nicknames designed to annoy other users
+We also reserve the right to enforce compliance of hateful or otherwise inappropriate usernames and profiles regardless of the server-specific nickname or profile.
+​
 
-Staff reserves the right to change the nickname of any user for any reason. Failure to comply with these requirements may result in you losing the right to change your nickname. We also reserve the right to discipline users with offensive usernames, regardless of the nickname they're using.
+1. No blank or "invisible" names.
+2. No slurs or other offensive sentiments or imagery.
+3. No noisy unicode characters (for example z̯̯͡a̧͎̺̻̝͕̠l̡͓̫̣g̹̲o̡̼̘) or rapidly flashing avatars.
 
 
 # Infractions
-- 
cgit v1.2.3


From 415b3c0827eb9e0346f6c156d68cff9ddbe55a3a Mon Sep 17 00:00:00 2001
From: mina <sueminaoh@gmail.com>
Date: Thu, 23 Dec 2021 17:33:30 -0500
Subject: Edit "can only Helpers help?" answer and question

Remove screenshot of occupied help channels because it doesn't serve much purpose, and help can also be provided in topical channels.
---
 .../resources/guides/pydis-guides/help-channel-guide.md      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
index 5f41f442..7c537a13 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
@@ -29,8 +29,8 @@ Each channel on the server has a channel description which briefly describes the
 
 # General Help Channels
 
-Our general help channels cycle quickly, with the advantage of attracting a more diverse spectrum of helpers, and getting individual attention and help for your question. These channels are a great choice for generic Python questions, but they can be used for domain-specific Python help as well. 
-Be sure to [ask good questions](../asking-good-questions) in order to give yourself the best chances of getting help. 
+Our general help channels cycle quickly, with the advantage of attracting a more diverse spectrum of helpers, and getting individual attention and help for your question. These channels are a great choice for generic Python questions, but they can be used for domain-specific Python help as well.
+Be sure to [ask good questions](../asking-good-questions) in order to give yourself the best chances of getting help.
 
 ## How To Claim a Channel
 
@@ -64,13 +64,11 @@ If you still feel like your question is being overlooked, read our guide on [ask
 
 Go ahead and move your channel to the dormant category by running the `!closed` command. You will only be able to run this command in your own help channel, and likewise no one will be able to prematurely close your claimed help channel (with the exception of staff).
 
-## Q: Are only Helpers supposed to answer questions?
+## Q: Can only Helpers answer help questions?
 
-Absolutely not. We strongly encourage all members of the community to help answer questions. If you'd like to help answer some questions, simply head over to one of the help channels that are currently in use. These can be found in the **Python Help: Occupied** category.
+Definitely not! We encourage all members of the community to participate in giving help. If you'd like to help answer some questions, head over to the **Occupied Help Channels** or **Topical Chat/Help** categories.
 
-![Occupied help channels](/static/images/content/help_channels/occupied_channels.png)
-
-Anyone can type in these channels, and users who are particularly helpful [may be offered a chance to join the staff on Python Discord](/pages/server-info/roles/#note-regarding-staff-roles).
+Before jumping in, please read our guide on [helping others](../helping-others) which explains our expectations for the culture and quailty of help that we aim for on the server.
 
 ## Q: I lost my help channel!
 
-- 
cgit v1.2.3


From fe9011e32c6bedb222858dca510a10c3cf1e1dac Mon Sep 17 00:00:00 2001
From: minalike <sueminaoh@gmail.com>
Date: Mon, 31 Jan 2022 00:17:30 -0500
Subject: Update content

Update some screenshot images to reflect emoji used in category names
Break up some of the FAQ questions into smaller questions
Mention the !helpdm on command added in 2021
Mention the channel claimed embed added in 2022
Culling of content to focus on information pertaining to getting help
---
 .../guides/pydis-guides/help-channel-guide.md      |  64 +++++++++++++--------
 .../content/help_channels/available_message.png    | Bin 36279 -> 89386 bytes
 .../content/help_channels/claimed_channel.png      | Bin 0 -> 26100 bytes
 .../content/help_channels/dormant_channels.png     | Bin 6975 -> 22386 bytes
 .../content/help_channels/topical_channels.png     | Bin 29231 -> 66126 bytes
 5 files changed, 39 insertions(+), 25 deletions(-)
 create mode 100644 pydis_site/static/images/content/help_channels/claimed_channel.png

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
index 7c537a13..98b4705d 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
@@ -10,14 +10,13 @@ relevant_links:
 
 On the 5th of April 2020, we introduced a new help channel system at Python Discord. This article is a supplementary guide to explain precisely where to go to find help.
 
-We have two different kinds of help channels in our community - **Topical help channels**, and **general help channels**.
-Where you should go depends on what you need help with.
-These channels also attract different helpers, and move at different speeds, which affects the kind of help you're likely to receive, and how fast you get that help.
+We have two different kinds of help channels in our community: **topical help channels** and **general help channels**.
+The topical channels can be great for longer and broader discussions, whereas a general help channel might be more appropriate for specific troubleshooting. Individual topical channels may have a narrower audience than the general help channels, but that may also be to your advantage if the audience is very familiar with the area of Python you are struggling with.
 
 # Topical Help Channels
 
 The topical help channels move at a slower pace than the general help channels.
-They also sometimes attract domain experts - for example, `#async-and-concurrency` has CPython contributors who helped write asyncio, and in `#game-development` you can find the creators and maintainers of several game frameworks.
+They also sometimes attract domain experts. For example, `#async-and-concurrency` has CPython contributors who helped write asyncio, and in `#game-development` you can find the creators and maintainers of several game frameworks.
 If your question fits into the domain of one of our topical help channels, and if you're not in a big hurry, then this is probably the best place to ask for help.
 
 ![List of topical help channels](/static/images/content/help_channels/topical_channels.png)
@@ -29,51 +28,66 @@ Each channel on the server has a channel description which briefly describes the
 
 # General Help Channels
 
-Our general help channels cycle quickly, with the advantage of attracting a more diverse spectrum of helpers, and getting individual attention and help for your question. These channels are a great choice for generic Python questions, but they can be used for domain-specific Python help as well.
-Be sure to [ask good questions](../asking-good-questions) in order to give yourself the best chances of getting help.
+Our general help channels cycle quickly, with the advantage of attracting a more diverse spectrum of helpers, and getting individual focus and attention on your question. These channels are a great choice for generic Python help, but can be used for domain-specific Python help as well.
 
-## How To Claim a Channel
+## How to Claim a Channel
 
-There are always 3 available help channels waiting to be claimed in the **Python Help: Available** category.
+There are always three help channels waiting to be claimed in the **Available Help Channels** category.
 
 ![Available help channels](/static/images/content/help_channels/available_channels.png)
+*The Available Help Channels category is always at the top of the server's channel list.*
 
-This message is posted when a channel becomes available for use:
-![Channel available message](/static/images/content/help_channels/available_message.png)
+![Available message](/static/images/content/help_channels/available_message.png)
+*This message indicates that a channel is available.*
 
-In order to claim one, simply start typing your question into one of these channels. Once your question is posted, you have claimed this channel it will be moved down to the **Occupied Help Channels** category.
+In order to claim one, simply ask your question into one of the available channels. Be sure to [ask good questions](../asking-good-questions) in order to give yourself the best chances of getting help!
 
-At this point you will have the **Help Cooldown** role which will remain on your profile until your help channel is closed (with the `!closed` command) or goes dormant due to inactivity.
+![Channel claimed embed](/static/images/content/help_channels/claimed_channel.png)
+*This messages indicates that you've claimed the channel.*
 
-# Frequently Asked Questions
+At this point you will have the **Help Cooldown** role which will remain on your profile until your help channel is closed (with the `!close` command) or goes dormant due to inactivity. This ensures that users can claim only one help channel at any given time, giving everyone a chance to have their question seen.
 
-## Q: How long does my help channel stay active?
+## Frequently Asked Questions
 
-The channel remains open for **30 minutes** after your last message, but if another user posts in your channel, the closing will be delayed by 10 minutes.
+### Q: How long does my help channel stay active?
+
+The channel remains open for **30 minutes** after your last message, or 10 minutes after the last message sent by another user (whichever time comes later).
 
-*You'll see this message in your channel once it goes dormant:*
 ![Channel dormant message](/static/images/content/help_channels/dormant_message.png)
+*You'll see this message in your channel once it goes dormant.*
+### Q: No one answered my question. How come?
 
-## Q: No one answered my question. How come?
+The server has users active all over the world and all hours of the day, but some time periods are less active than others. It's also possible that the users that read your question didn't have the knowledge required to help you. If no one responded, feel free to claim another help channel a little later.
 
-The server has users active all over the world and all hours of the day, but some days are less active than others. If no one answered your question, feel free to claim another help channel a little later.
+If you feel like your question is continuously being overlooked, read our guide on [asking good questions](../asking-good-questions) to incease your chances of getting a response.
 
-If you still feel like your question is being overlooked, read our guide on [asking good questions](../asking-good-questions) to incease your chances of getting a response.
+### Q: My question was answered. What do I do?
 
-## Q: I don't need my help channel anymore, my question was answered. What do I do?
+Go ahead use the `!close` command if you've satisfactorily solved your problem. You will only be able to run this command in your own help channel, and no one (outside of staff) will be able to close your channel for you.
 
-Go ahead and move your channel to the dormant category by running the `!closed` command. You will only be able to run this command in your own help channel, and likewise no one will be able to prematurely close your claimed help channel (with the exception of staff).
+Closing your help channel once you are finished leads to less occupied channels, which means more attention can be given to other users that still need help.
 
-## Q: Can only Helpers answer help questions?
+### Q: Can only Helpers answer help questions?
 
 Definitely not! We encourage all members of the community to participate in giving help. If you'd like to help answer some questions, head over to the **Occupied Help Channels** or **Topical Chat/Help** categories.
 
 Before jumping in, please read our guide on [helping others](../helping-others) which explains our expectations for the culture and quailty of help that we aim for on the server.
 
-## Q: I lost my help channel!
+Tip: run the `!helpdm on` command in `#bot-commands` to get notified via DM with jumplinks to help channels you're participating in.
+
+### Q: What are the available, occupied, and dormant categories?
+
+The three help channels under **Available Help Channels** are free for anyone to claim. Claimed channels are then moved to **Occupied Help Channels**. Once they close, they are moved to the **Python Help: Dormant** category until they are needed again for **Available Help Channels**.
+
+### Q: Can I save my help session for future reference?
+
+Yes! Because the help channels are continuously cycled in and out without being deleted, this means you can always refer to a previous help session if you found one particularly helpful.
+
+Tip: reply to a message and run the `.bm` command to get bookmarks sent to you via DM for future reference.
+
+### Q: I lost my help channel!
 
-No need to panic.
-Your channel was probably just marked as dormant.
+No need to panic. Your channel was probably just closed due to inactivity.
 All the dormant help channels are still available at the bottom of the channel list, in the **Python Help: Dormant** category, and also through search.
 If you're not sure what the name of your help channel was, you can easily find it by using the Discord Search feature.
 Try searching for `from:<your nickname>` to find the last messages sent by yourself, and from there you will be able to jump directly into the channel by pressing the Jump button on your message.
diff --git a/pydis_site/static/images/content/help_channels/available_message.png b/pydis_site/static/images/content/help_channels/available_message.png
index 05f6ec7d..09668c9b 100644
Binary files a/pydis_site/static/images/content/help_channels/available_message.png and b/pydis_site/static/images/content/help_channels/available_message.png differ
diff --git a/pydis_site/static/images/content/help_channels/claimed_channel.png b/pydis_site/static/images/content/help_channels/claimed_channel.png
new file mode 100644
index 00000000..777e31ea
Binary files /dev/null and b/pydis_site/static/images/content/help_channels/claimed_channel.png differ
diff --git a/pydis_site/static/images/content/help_channels/dormant_channels.png b/pydis_site/static/images/content/help_channels/dormant_channels.png
index 2c53de87..7c9ba61e 100644
Binary files a/pydis_site/static/images/content/help_channels/dormant_channels.png and b/pydis_site/static/images/content/help_channels/dormant_channels.png differ
diff --git a/pydis_site/static/images/content/help_channels/topical_channels.png b/pydis_site/static/images/content/help_channels/topical_channels.png
index 63b48e7b..43530cbe 100644
Binary files a/pydis_site/static/images/content/help_channels/topical_channels.png and b/pydis_site/static/images/content/help_channels/topical_channels.png differ
-- 
cgit v1.2.3


From 64723d375280365cb14ff6fe890a9627a9697bb5 Mon Sep 17 00:00:00 2001
From: minalike <sueminaoh@gmail.com>
Date: Sun, 20 Feb 2022 17:52:46 -0500
Subject: Add table of content and final edits

---
 .../guides/pydis-guides/help-channel-guide.md      | 34 ++++++++++------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
index 98b4705d..010335fd 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
@@ -6,17 +6,15 @@ relevant_links:
     Asking Good Questions: ../asking-good-questions
     Role Guide: /pages/server-info/roles
     Helping Others: ../helping-others
+toc: 3
 ---
 
-On the 5th of April 2020, we introduced a new help channel system at Python Discord. This article is a supplementary guide to explain precisely where to go to find help.
-
-We have two different kinds of help channels in our community: **topical help channels** and **general help channels**.
-The topical channels can be great for longer and broader discussions, whereas a general help channel might be more appropriate for specific troubleshooting. Individual topical channels may have a narrower audience than the general help channels, but that may also be to your advantage if the audience is very familiar with the area of Python you are struggling with.
+At Python Discord we have two different kinds of help channels: **topical help channels** and **general help channels**.
 
 # Topical Help Channels
 
-The topical help channels move at a slower pace than the general help channels.
-They also sometimes attract domain experts. For example, `#async-and-concurrency` has CPython contributors who helped write asyncio, and in `#game-development` you can find the creators and maintainers of several game frameworks.
+In topical channels, users can ask for help regarding specific domains or areas of Python.
+These channels also sometimes attract domain experts. For example, `#async-and-concurrency` has CPython contributors who helped write asyncio, and in `#game-development` you can find the creators and maintainers of several game frameworks.
 If your question fits into the domain of one of our topical help channels, and if you're not in a big hurry, then this is probably the best place to ask for help.
 
 ![List of topical help channels](/static/images/content/help_channels/topical_channels.png)
@@ -28,7 +26,7 @@ Each channel on the server has a channel description which briefly describes the
 
 # General Help Channels
 
-Our general help channels cycle quickly, with the advantage of attracting a more diverse spectrum of helpers, and getting individual focus and attention on your question. These channels are a great choice for generic Python help, but can be used for domain-specific Python help as well.
+General help channels can be used for all Python-related help, and have the advantage of attracting a more diverse spectrum of helpers, and getting individual focus and attention on your question. These channels are a great choice for generic Python help, but can be used for domain-specific Python help as well.
 
 ## How to Claim a Channel
 
@@ -40,34 +38,34 @@ There are always three help channels waiting to be claimed in the **Available He
 ![Available message](/static/images/content/help_channels/available_message.png)
 *This message indicates that a channel is available.*
 
-In order to claim one, simply ask your question into one of the available channels. Be sure to [ask good questions](../asking-good-questions) in order to give yourself the best chances of getting help!
+In order to claim one, simply ask your question in one of the available channels. Be sure to [ask questions with enough information](../asking-good-questions) in order to give yourself the best chances of getting help!
 
 ![Channel claimed embed](/static/images/content/help_channels/claimed_channel.png)
 *This messages indicates that you've claimed the channel.*
 
-At this point you will have the **Help Cooldown** role which will remain on your profile until your help channel is closed (with the `!close` command) or goes dormant due to inactivity. This ensures that users can claim only one help channel at any given time, giving everyone a chance to have their question seen.
+At this point you will have the **Help Cooldown** role which will remain on your profile until you close your help channel. This ensures that users can claim only one help channel at any given time, giving everyone a chance to have their question seen.
 
-## Frequently Asked Questions
+# Frequently Asked Questions
 
-### Q: How long does my help channel stay active?
+### How long does my help channel stay active?
 
 The channel remains open for **30 minutes** after your last message, or 10 minutes after the last message sent by another user (whichever time comes later).
 
 ![Channel dormant message](/static/images/content/help_channels/dormant_message.png)
 *You'll see this message in your channel once it goes dormant.*
-### Q: No one answered my question. How come?
+### No one answered my question. How come?
 
-The server has users active all over the world and all hours of the day, but some time periods are less active than others. It's also possible that the users that read your question didn't have the knowledge required to help you. If no one responded, feel free to claim another help channel a little later.
+The server has users active all over the world and all hours of the day, but some time periods are less active than others. It's also possible that the users that read your question didn't have the knowledge required to help you. If no one responded, feel free to claim another help channel a little later, or try an appropriate topical channel.
 
 If you feel like your question is continuously being overlooked, read our guide on [asking good questions](../asking-good-questions) to incease your chances of getting a response.
 
-### Q: My question was answered. What do I do?
+### My question was answered. What do I do?
 
 Go ahead use the `!close` command if you've satisfactorily solved your problem. You will only be able to run this command in your own help channel, and no one (outside of staff) will be able to close your channel for you.
 
 Closing your help channel once you are finished leads to less occupied channels, which means more attention can be given to other users that still need help.
 
-### Q: Can only Helpers answer help questions?
+### Can only Helpers answer help questions?
 
 Definitely not! We encourage all members of the community to participate in giving help. If you'd like to help answer some questions, head over to the **Occupied Help Channels** or **Topical Chat/Help** categories.
 
@@ -75,17 +73,17 @@ Before jumping in, please read our guide on [helping others](../helping-others)
 
 Tip: run the `!helpdm on` command in `#bot-commands` to get notified via DM with jumplinks to help channels you're participating in.
 
-### Q: What are the available, occupied, and dormant categories?
+### What are the available, occupied, and dormant categories?
 
 The three help channels under **Available Help Channels** are free for anyone to claim. Claimed channels are then moved to **Occupied Help Channels**. Once they close, they are moved to the **Python Help: Dormant** category until they are needed again for **Available Help Channels**.
 
-### Q: Can I save my help session for future reference?
+### Can I save my help session for future reference?
 
 Yes! Because the help channels are continuously cycled in and out without being deleted, this means you can always refer to a previous help session if you found one particularly helpful.
 
 Tip: reply to a message and run the `.bm` command to get bookmarks sent to you via DM for future reference.
 
-### Q: I lost my help channel!
+### I lost my help channel!
 
 No need to panic. Your channel was probably just closed due to inactivity.
 All the dormant help channels are still available at the bottom of the channel list, in the **Python Help: Dormant** category, and also through search.
-- 
cgit v1.2.3


From 16a9727d414ed931cc74fa49f86a52f288399fa1 Mon Sep 17 00:00:00 2001
From: mina <sueminaoh@gmail.com>
Date: Mon, 21 Feb 2022 15:59:45 -0500
Subject: Fixup: final wording and typo

---
 .../apps/content/resources/guides/pydis-guides/help-channel-guide.md  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
index 010335fd..2be845d3 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md
@@ -26,7 +26,7 @@ Each channel on the server has a channel description which briefly describes the
 
 # General Help Channels
 
-General help channels can be used for all Python-related help, and have the advantage of attracting a more diverse spectrum of helpers, and getting individual focus and attention on your question. These channels are a great choice for generic Python help, but can be used for domain-specific Python help as well.
+General help channels can be used for all Python-related help, and have the advantage of attracting a more diverse spectrum of helpers. There is also the added benefit of receiving individual focus and attention on your question. These channels are a great choice for generic Python help, but can be used for domain-specific Python help as well.
 
 ## How to Claim a Channel
 
@@ -57,7 +57,7 @@ The channel remains open for **30 minutes** after your last message, or 10 minut
 
 The server has users active all over the world and all hours of the day, but some time periods are less active than others. It's also possible that the users that read your question didn't have the knowledge required to help you. If no one responded, feel free to claim another help channel a little later, or try an appropriate topical channel.
 
-If you feel like your question is continuously being overlooked, read our guide on [asking good questions](../asking-good-questions) to incease your chances of getting a response.
+If you feel like your question is continuously being overlooked, read our guide on [asking good questions](../asking-good-questions) to increase your chances of getting a response.
 
 ### My question was answered. What do I do?
 
-- 
cgit v1.2.3


From 63fa1c03977435a2aa92325f8872e2d222d9e28a Mon Sep 17 00:00:00 2001
From: Krypton <hello@krypt0n.co.uk>
Date: Wed, 9 Mar 2022 15:42:05 +0100
Subject: Create discord-messages-with-colors.md

---
 .../python-guides/discord-messages-with-colors.md  | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
new file mode 100644
index 00000000..60ea8656
--- /dev/null
+++ b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
@@ -0,0 +1,64 @@
+---
+title: Discord messages with colors
+description: A guide on how to add colors to your codeblocks on Discord
+---
+
+Discord is now slowly rolling out the ability to send colored messages within code blocks. It uses the ANSI color codes, so if you've tried to print colored text in your terminal or console with Python or other languages then it will be easy for you.
+
+To be able to send a colored text, you need to use the `ansi` language for your code block and provide a prefix of this format before writing your text:
+```
+\u001b[{format};{color}m
+```
+*The `\u001b` is the unicode for ESCAPE/ESC, see <http://www.unicode-symbol.com/u/001B.html>.* ***If you want to use it yourself without bots, then you need to copy paste the character from the website.***
+
+After you've written this, you can type and text you wish, and if you want to reset the color back to normal, then you need to use `\u001b[0m` as prefix.
+
+Here is the list of values you can use to replace `{format}`:
+
+* 0: Normal
+* 1: **Bold**
+* 4: <ins>Underline</ins>
+
+Here is the list of values you can use to replace `{color}`:
+
+*The following values will change the **text** color.*
+
+* 30: Gray
+* 31: Red
+* 32: Green
+* 33: Yellow
+* 34: Blue
+* 35: Pink
+* 36: Cyan
+* 37: White
+
+*The following values will change the **text background** color.*
+
+* 40: Some very dark blue
+* 41: Orange
+* 42: Gray
+* 43: Light gray
+* 44: Even lighter gray
+* 45: Indigo
+* 46: Again some gray
+* 47: White
+
+Let's take an example, I want a bold green colored text with the very dark blue background.
+I simply use `\u001b[0;40m` (background color) and `\u001b[1;32m` (text color) as prefix. Note that the order is **important**, first you give the background color and then the text color.<br>
+Alternatively you can also directly combine them into a single prefix like the following: `\u001b[1;40;32m` and you can also use multiple values. Something like `\u001b[1;40;4;32m` would underline the text, make it bold, make it green and have a dark blue background.
+
+Raw message:<br>
+\`\`\`ansi<br>
+\u001b[0;40m\u001b[1;32mThat's some cool formatted text right?<br>
+or<br>
+\u001b[1;40;32mThat's some cool formatted text right?<br>
+\`\`\`
+
+Result:<br>
+![Background and text color](https://media.discordapp.net/attachments/739937507768270939/930460020603224084/Background-Text-Color.png)
+
+The way the colors look like on Discord is shown in the image below ^^
+
+Note: If the change as not been brought to you yet, or other users, then you can use other code blocks in the meantime to get colored text. See this gist: <https://gist.github.com/matthewzring/9f7bbfd102003963f9be7dbcf7d40e51>
+
+![ANSI Colors](https://media.discordapp.net/attachments/739937507768270939/930825555803263016/ANSI-Colors.png)
-- 
cgit v1.2.3


From 934218e86b8e72ee999e7c086aa0ec7cabf08408 Mon Sep 17 00:00:00 2001
From: Krypton <hello@krypt0n.co.uk>
Date: Thu, 10 Mar 2022 10:26:23 +0100
Subject: Update discord-messages-with-colors.md

---
 .../resources/guides/python-guides/discord-messages-with-colors.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
index 60ea8656..30f40948 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
@@ -1,5 +1,5 @@
 ---
-title: Discord messages with colors
+title: Discord Messages with Colors
 description: A guide on how to add colors to your codeblocks on Discord
 ---
 
@@ -57,8 +57,7 @@ or<br>
 Result:<br>
 ![Background and text color](https://media.discordapp.net/attachments/739937507768270939/930460020603224084/Background-Text-Color.png)
 
-The way the colors look like on Discord is shown in the image below ^^
+The way the colors look like on Discord is shown in the image below:
+![ANSI Colors](https://media.discordapp.net/attachments/739937507768270939/930825555803263016/ANSI-Colors.png)
 
 Note: If the change as not been brought to you yet, or other users, then you can use other code blocks in the meantime to get colored text. See this gist: <https://gist.github.com/matthewzring/9f7bbfd102003963f9be7dbcf7d40e51>
-
-![ANSI Colors](https://media.discordapp.net/attachments/739937507768270939/930825555803263016/ANSI-Colors.png)
-- 
cgit v1.2.3


From c0666e5095c6e427b786fb934520d63fabaa8840 Mon Sep 17 00:00:00 2001
From: Johannes Christ <jc@jchri.st>
Date: Sat, 12 Mar 2022 16:41:11 +0100
Subject: Add a README for the content directory

---
 pydis_site/apps/content/README.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pydis_site/apps/content/README.md

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/README.md b/pydis_site/apps/content/README.md
new file mode 100644
index 00000000..b2719a9f
--- /dev/null
+++ b/pydis_site/apps/content/README.md
@@ -0,0 +1,37 @@
+# The "content" app
+
+This application serves static, markdown-based content. Django-wise there is
+relatively little code in there, most of it is concerned with serving our
+content.
+
+The markdown files hosting our content can be found in the
+[`resources/`](./resources) directory, and contain
+
+
+## Contributing pages
+
+Contributing pages is covered extensively in our online guide, which you can
+find
+[here](https://www.pythondiscord.com/pages/guides/pydis-guides/how-to-contribute-a-page/)
+or alternatively read it directly at
+[`resources/guides/pydis-guides/how-to-contribute-a-page.md`](./resources/guides/pydis-guides/how-to-contribute-a-page.md).
+
+
+## Directory structure
+
+Let's look at the structure in here:
+
+- `resources` contains the static Markdown files that make up our site's
+  [pages](https://www.pythondiscord.com/pages/)
+
+- `migrations` contains standard Django migrations. As the `content` app
+  contains purely static markdown files, no migrations are present here.
+
+- `tests` contains unit tests for verifying that the app works properly.
+
+- `views` contains our Django views generating and serving the pages from the
+  input markdown.
+
+As for the modules, apart from the standard Django modules in here, the
+`utils.py` module contains utility functions for discovering markdown files to
+serve on the filesystem.
-- 
cgit v1.2.3


From ca2c583b15d46d7821a03ec047678429f96c7e03 Mon Sep 17 00:00:00 2001
From: Johannes Christ <jc@jchri.st>
Date: Sat, 12 Mar 2022 21:51:28 +0100
Subject: Reword documentation per review

Co-authored-by: MarkKoz <KozlovMark@gmail.com>
---
 pydis_site/apps/content/README.md | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/README.md b/pydis_site/apps/content/README.md
index b2719a9f..d36d6bee 100644
--- a/pydis_site/apps/content/README.md
+++ b/pydis_site/apps/content/README.md
@@ -1,19 +1,17 @@
 # The "content" app
 
-This application serves static, markdown-based content. Django-wise there is
-relatively little code in there, most of it is concerned with serving our
+This application serves static, Markdown-based content. Django-wise there is
+relatively little code in there; most of it is concerned with serving our
 content.
 
-The markdown files hosting our content can be found in the
-[`resources/`](./resources) directory, and contain
-
 
 ## Contributing pages
 
-Contributing pages is covered extensively in our online guide, which you can
-find
-[here](https://www.pythondiscord.com/pages/guides/pydis-guides/how-to-contribute-a-page/)
-or alternatively read it directly at
+The Markdown files hosting our content can be found in the
+[`resources/`](./resources) directory. The process of contributing to pages is
+covered extensively in our online guide which you can find
+[here](https://www.pythondiscord.com/pages/guides/pydis-guides/how-to-contribute-a-page/).
+Alternatively, read it directly at
 [`resources/guides/pydis-guides/how-to-contribute-a-page.md`](./resources/guides/pydis-guides/how-to-contribute-a-page.md).
 
 
@@ -25,13 +23,13 @@ Let's look at the structure in here:
   [pages](https://www.pythondiscord.com/pages/)
 
 - `migrations` contains standard Django migrations. As the `content` app
-  contains purely static markdown files, no migrations are present here.
+  contains purely static Markdown files, no migrations are present here.
 
 - `tests` contains unit tests for verifying that the app works properly.
 
-- `views` contains our Django views generating and serving the pages from the
-  input markdown.
+- `views` contains Django views which generating and serve the pages from the
+  input Markdown.
 
 As for the modules, apart from the standard Django modules in here, the
-`utils.py` module contains utility functions for discovering markdown files to
-serve on the filesystem.
+`utils.py` module contains utility functions for discovering Markdown files to
+serve.
-- 
cgit v1.2.3


From 4ad92b98a0df047b12e302ce8d849c2bd85862f1 Mon Sep 17 00:00:00 2001
From: Johannes Christ <jc@jchri.st>
Date: Sat, 12 Mar 2022 21:53:53 +0100
Subject: Remove unused migrations package

---
 pydis_site/apps/content/README.md              | 3 ---
 pydis_site/apps/content/migrations/__init__.py | 0
 2 files changed, 3 deletions(-)
 delete mode 100644 pydis_site/apps/content/migrations/__init__.py

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/README.md b/pydis_site/apps/content/README.md
index d36d6bee..4149a6f0 100644
--- a/pydis_site/apps/content/README.md
+++ b/pydis_site/apps/content/README.md
@@ -22,9 +22,6 @@ Let's look at the structure in here:
 - `resources` contains the static Markdown files that make up our site's
   [pages](https://www.pythondiscord.com/pages/)
 
-- `migrations` contains standard Django migrations. As the `content` app
-  contains purely static Markdown files, no migrations are present here.
-
 - `tests` contains unit tests for verifying that the app works properly.
 
 - `views` contains Django views which generating and serve the pages from the
diff --git a/pydis_site/apps/content/migrations/__init__.py b/pydis_site/apps/content/migrations/__init__.py
deleted file mode 100644
index e69de29b..00000000
-- 
cgit v1.2.3


From 2bf88327c6298e9004aeda028576946b1704d799 Mon Sep 17 00:00:00 2001
From: Johannes Christ <jc@jchri.st>
Date: Sat, 12 Mar 2022 22:43:52 +0100
Subject: Correct typo

Co-authored-by: Mark <1515135+MarkKoz@users.noreply.github.com>
---
 pydis_site/apps/content/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/README.md b/pydis_site/apps/content/README.md
index 4149a6f0..e7061207 100644
--- a/pydis_site/apps/content/README.md
+++ b/pydis_site/apps/content/README.md
@@ -24,7 +24,7 @@ Let's look at the structure in here:
 
 - `tests` contains unit tests for verifying that the app works properly.
 
-- `views` contains Django views which generating and serve the pages from the
+- `views` contains Django views which generate and serve the pages from the
   input Markdown.
 
 As for the modules, apart from the standard Django modules in here, the
-- 
cgit v1.2.3


From a52a2cf631d92173f1a5573a56d3347d6456ac39 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 13 Mar 2022 14:31:09 -0400
Subject: Update Project Lead color

---
 pydis_site/apps/content/resources/server-info/roles.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/server-info/roles.md b/pydis_site/apps/content/resources/server-info/roles.md
index 716f5b1e..2888f837 100644
--- a/pydis_site/apps/content/resources/server-info/roles.md
+++ b/pydis_site/apps/content/resources/server-info/roles.md
@@ -68,7 +68,7 @@ In addition to the informal descriptions below, we've also written down a more f
 ### <span class="fas fa-circle" style="color:#1abc9c"></span> Domain Leads
 **Description:** Staff in charge of a certain domain such as moderation, events, and outreach. A lead will have a second role specifying their domain.
 
-### <span class="fas fa-circle" style="color:#8dc2ba"></span> Project Leads
+### <span class="fas fa-circle" style="color:#00aeb4"></span> Project Leads
 **Description:** Staff in charge of a certain project that require special attention, such as a YouTube video series or our new forms page.
 
 ### <span class="fas fa-circle" style="color:#ff9f1b"></span> Moderators
-- 
cgit v1.2.3


From 06079418f5610a63c84dcc6c979ade347c6c5451 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 13 Mar 2022 14:40:14 -0400
Subject: Add Events Team

---
 pydis_site/apps/content/resources/server-info/roles.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/server-info/roles.md b/pydis_site/apps/content/resources/server-info/roles.md
index 2888f837..edc02066 100644
--- a/pydis_site/apps/content/resources/server-info/roles.md
+++ b/pydis_site/apps/content/resources/server-info/roles.md
@@ -80,8 +80,8 @@ In addition to the informal descriptions below, we've also written down a more f
 ### <span class="fas fa-circle" style="color:#a1d1ff"></span> DevOps
 **Description:** A role for staff involved with the DevOps toolchain of our core projects.
 
-### <span class="fas fa-circle" style="color:#f8d188"></span> Project Teams
-**Description:** Staff can join teams which work on specific projects in the organisation, such as our code jams, media projects, and more.
+### <span class="fas fa-circle" style="color:#7de29c"></span> Events Team
+**Description:** The events team are staff members who help plan and execute Python Discord events. This can range from the Code Jam, to Pixels, to our survey, specific workshops we want to run, and more.
 
 ### <span class="fas fa-circle" style="color:#eecd36"></span> Helpers
 **Description:** This is the core staff role in our organization: All staff members have the Helpers role.
-- 
cgit v1.2.3


From 40bb274538b80eacc7e2435391af9a87d90ab23d Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 13 Mar 2022 16:15:49 -0400
Subject: Preliminary structure

---
 .../resources/guides/pydis-guides/contributing.md  | 55 ++++++++++++++++++----
 1 file changed, 46 insertions(+), 9 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index 4013962c..2f4cce9d 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -4,7 +4,7 @@ description: A guide to contributing to our open source projects.
 icon: fab fa-github
 ---
 
-Our projects on Python Discord are open source and [available on Github](https://github.com/python-discord).  If you would like to contribute, consider one of the following projects:
+Our projects on Python Discord are open source and [available on GitHub](https://github.com/python-discord).  If you would like to contribute, consider one of the following projects:
 
 <!-- Project cards -->
 <div class="columns is-multiline is-centered is-3 is-variable">
@@ -91,14 +91,6 @@ Our projects on Python Discord are open source and [available on Github](https:/
   </div>
 </div>
 
-If you don't understand anything or need clarification, feel free to ask any staff member with the  **@PyDis Core Developers** role in the server. We're always happy to help!
-
-### Useful Resources
-
-[Guidelines](./contributing-guidelines/) - General guidelines you should follow when contributing to our projects.<br>
-[Style Guide](./style-guide/) - Information regarding the code styles you should follow when working on our projects.<br>
-[Review Guide](../code-reviews-primer/) - A guide to get you started on doing code reviews.
-
 ## Contributors Community
 We are very happy to have many members in our community that contribute to [our open source projects](https://github.com/python-discord/).
 Whether it's writing code, reviewing pull requests, or contributing graphics for our events, it’s great to see so many people being motivated to help out.
@@ -114,3 +106,48 @@ As it’s difficult to precisely quantify contributions, we’ve come up with th
 - The member has a positive influence in our contributors subcommunity.
 
 The role will be assigned at the discretion of the Admin Team in consultation with the Core Developers Team.
+
+
+# How do I start contributing?
+  Completing these steps will have you ready to make your first contribution. If you've already been using Git or GitHub feel free to skip those steps, but please make sure to read about the PyDis contributing process and ettiquette. If you are here looking for the answer to a specific question, check out the sub-articles in the top right of the page to see a list of our guides.
+
+
+
+### Fork the repo
+   GitHub is a website based on the Git version control system that stores project files in the cloud. The people working on the project can use GitHub as a central place for sending their changes, getting their teammates' changes, and communicating with each other. Forking the repository that you want to work on will create a copy under your own GitHub account. You'll make your changes to this copy, then later we can bring them back to the PyDis repository.
+
+   [Check out our guide on forking a GitHub repo](./forking-repository/)
+
+### Clone the repo
+  Now that you have your own fork you could make changes to it directly on GitHub, but that's not a convenient way to write code. Instead you can use Git to clone the repo to your local machine, commit changes to it there, then push those changes to GitHub.
+
+  [Check out our guide on forking a GitHub repo](./forking-repository/)
+
+### Set up the project
+  You have the source code on your local computer, but how do you actually run it?
+
+  [Sir Lancebot](./sir-lancebot/)
+
+  [Python Bot](./bot/)
+
+  [Site](./site/)
+
+### Ettiquette
+  [Guidelines](./contributing-guidelines/)
+### Read the style guide
+  [Style Guide](./style-guide/)
+
+### Open a pull request
+
+### The review process
+  [Review Guide](../code-reviews-primer/)
+### Create an issue
+
+
+### Learn the basics of Git
+  Git is a *Version Control System*, software for carefully tracking changes to the files in a project. Git allows the same project to be worked on by people in different places. You can make changes to your local code and then distribute those changes to the other people working on the project.
+
+  [Check out these resources to get started using Git](./working-with-git/)
+
+
+If you don't understand anything or need clarification, feel free to ask any staff member with the  **@PyDis Core Developers** role in the server. We're always happy to help!
-- 
cgit v1.2.3


From 92b1f701b3d1b159b3353db954ce06fe631e56bc Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 13 Mar 2022 16:27:45 -0400
Subject: Move Contributors role info to the Roles page

---
 .../resources/guides/pydis-guides/contributing.md       | 17 -----------------
 pydis_site/apps/content/resources/server-info/roles.md  |  8 ++++++--
 2 files changed, 6 insertions(+), 19 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index 2f4cce9d..596afb53 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -91,23 +91,6 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
   </div>
 </div>
 
-## Contributors Community
-We are very happy to have many members in our community that contribute to [our open source projects](https://github.com/python-discord/).
-Whether it's writing code, reviewing pull requests, or contributing graphics for our events, it’s great to see so many people being motivated to help out.
-As a token of our appreciation, those who have made significant contributions to our projects will receive a special **@Contributors** role on our server that makes them stand out from other members.
-That way, they can also serve as guides to others who are looking to start contributing to our open source projects or open source in general.
-
-#### Guidelines for the @Contributors Role
-
-One question we get a lot is what the requirements for the **@Contributors** role are.
-As it’s difficult to precisely quantify contributions, we’ve come up with the following guidelines for the role:
-
-- The member has made several significant contributions to our projects.
-- The member has a positive influence in our contributors subcommunity.
-
-The role will be assigned at the discretion of the Admin Team in consultation with the Core Developers Team.
-
-
 # How do I start contributing?
   Completing these steps will have you ready to make your first contribution. If you've already been using Git or GitHub feel free to skip those steps, but please make sure to read about the PyDis contributing process and ettiquette. If you are here looking for the answer to a specific question, check out the sub-articles in the top right of the page to see a list of our guides.
 
diff --git a/pydis_site/apps/content/resources/server-info/roles.md b/pydis_site/apps/content/resources/server-info/roles.md
index 716f5b1e..d9e0af15 100644
--- a/pydis_site/apps/content/resources/server-info/roles.md
+++ b/pydis_site/apps/content/resources/server-info/roles.md
@@ -28,8 +28,12 @@ There are multiple requirements listed there for getting the role.
 This includes writing pull requests for open issues, and also for reviewing open pull requests (**we really need reviewers!**)
 
 **How to get it:** Contribute to the projects!
-There is no minimum requirements, but the role is **not** assigned for every single contribution.
-Read more about this in the [Guidelines for the Contributors Role](/pages/contributing/#guidelines-for-the-contributors-role) on the Contributing page.
+It’s difficult to precisely quantify contributions, but we’ve come up with the following guidelines for the role:
+
+- The member has made several significant contributions to our projects.
+- The member has a positive influence in our contributors subcommunity.
+
+The role will be assigned at the discretion of the Admin Team in consultation with the Core Developers Team. Check out our [walkthrough](/pages/contributing/) to get started contributing.
 
 ---
 
-- 
cgit v1.2.3


From 0de454f00fd7de1991a68078eea99a3b8e7004b1 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 13 Mar 2022 18:11:16 -0400
Subject: Remove forking and cloning sections in set-up guides

---
 .../guides/pydis-guides/contributing/bot.md        | 27 ----------------------
 .../pydis-guides/contributing/sir-lancebot.md      | 19 ---------------
 .../guides/pydis-guides/contributing/site.md       | 12 ----------
 .../pydis-guides/contributing/working-with-git.md  |  6 +++--
 4 files changed, 4 insertions(+), 60 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
index 2aa10aa3..0f783ef6 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
@@ -7,33 +7,6 @@ toc: 3
 The purpose of this guide is to get you a running local version of [the Python bot](https://github.com/python-discord/bot).
 This page will focus on the quickest steps one can take, with mentions of alternatives afterwards.
 
-### Clone The Repository
-First things first, to run the bot's code and make changes to it, you need a local version of it (on your computer).
-
-<div class="card">
-    <button type="button" class="card-header collapsible">
-        <span class="card-header-title subtitle is-6 my-2 ml-2">Getting started with Git and GitHub</span>
-        <span class="card-header-icon">
-            <i class="fas fa-fw fa-angle-down title is-5" aria-hidden="true"></i>
-        </span>
-    </button>
-    <div class="collapsible-content collapsed">
-        <div class="card-content">
-              <p>If you don't have Git on your computer already, <a href="https://git-scm.com/downloads">install it</a>. You can additionally install a Git GUI such as <a href="https://www.gitkraken.com/download">GitKraken</a>, or the <a href="https://cli.github.com/manual/installation">GitHub CLI</a>.</p>
-              <p>To learn more about Git, you can look into <a href="../working-with-git">our guides</a>, as well as <a href="https://education.github.com/git-cheat-sheet-education.pdf">this cheatsheet</a>, <a href="https://learngitbranching.js.org">Learn Git Branching</a>, and otherwise any guide you can find on the internet. Once you got the basic idea though, the best way to learn Git is to use it.</p>
-              <p>Creating a copy of a repository under your own account is called a <em>fork</em>. This is where all your changes and commits will be pushed to, and from where your pull requests will originate from.</p>
-              <p><strong><a href="../forking-repository">Learn about forking a project</a></strong>.</p>
-        </div>
-    </div>
-</div>
-<br>
-
-You will need to create a fork of [the project](https://github.com/python-discord/bot), and clone the fork.
-Once this is done, you will have completed the first step towards having a running version of the bot.
-
-#### Working on the Repository Directly
-If you are a member of the organisation (a member of [this list](https://github.com/orgs/python-discord/people), or in our particular case, server staff), you can clone the project repository without creating a fork, and work on a feature branch instead.
-
 ---
 
 ### Set Up a Test Server
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
index e3cd8f0c..6e5a9199 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
@@ -41,16 +41,6 @@ The requirements for Docker are:
     * This is only a required step for linux. Docker comes bundled with docker-compose on Mac OS and Windows.
 
 ---
-
-# Fork the Project
-You will need your own remote (online) copy of the project repository, known as a *fork*.
-
-- [**Learn how to create a fork of the repository here.**](../forking-repository)
-
-You will do all your work in the fork rather than directly in the main repository.
-
----
-
 # Development Environment
 1. Once you have your fork, you will need to [**clone the repository to your computer**](../cloning-repository).
 2. After cloning, proceed to [**install the project's dependencies**](../installing-project-dependencies). (This is not required if using Docker)
@@ -121,13 +111,4 @@ After installing project dependencies use the poetry command `poetry run task st
 $ poetry run task start
 ```
 
----
-
-# Working with Git
-Now that you have everything setup, it is finally time to make changes to the bot! If you have not yet [read the contributing guidelines](https://github.com/python-discord/sir-lancebot/blob/main/CONTRIBUTING.md), now is a good time. Contributions that do not adhere to the guidelines may be rejected.
-
-Notably, version control of our projects is done using Git and Github. It can be intimidating at first, so feel free to ask for any help in the server.
-
-[**Click here to see the basic Git workflow when contributing to one of our projects.**](../working-with-git/)
-
 Have fun!
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md
index f2c3bd95..7eda027a 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md
@@ -26,18 +26,6 @@ Without Docker:
 - [PostgreSQL](https://www.postgresql.org/download/)
     - Note that if you wish, the webserver can run on the host and still use Docker for PostgreSQL.
 
----
-# Fork the project
-
-You will need access to a copy of the git repository of your own that will allow you to edit the code and push your commits to.
-Creating a copy of a repository under your own account is called a _fork_.
-
-- [Learn how to create a fork of the repository here.](../forking-repository/)
-
-This is where all your changes and commits will be pushed to, and from where your PRs will originate from.
-
-For any Core Developers, since you have write permissions already to the original repository, you can just create a feature branch to push your commits to instead.
-
 ---
 # Development environment
 
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/working-with-git.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/working-with-git.md
index 26c89b56..59c57859 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/working-with-git.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/working-with-git.md
@@ -19,5 +19,7 @@ Below are links to regular workflows for working with Git using PyCharm or the C
 **Resources to learn Git**
 
 * [The Git Book](https://git-scm.com/book)
-* [Corey Schafer's Youtube Tutorials](https://www.youtube.com/watch?v=HVsySz-h9r4&list=PL-osiE80TeTuRUfjRe54Eea17-YfnOOAx)
-* [GitHub Git Resources Portal](https://try.github.io/)
+* [Corey Schafer's YouTube tutorials](https://www.youtube.com/watch?v=HVsySz-h9r4&list=PL-osiE80TeTuRUfjRe54Eea17-YfnOOAx)
+* [GitHub Git resources portal](https://try.github.io/)
+* [Git cheatsheet](https://education.github.com/git-cheat-sheet-education.pdf)
+* [Learn Git branching](https://learngitbranching.js.org)
-- 
cgit v1.2.3


From 35081bc351bde2ee338a855d33d719d689930e1f Mon Sep 17 00:00:00 2001
From: Robin5605 <robinjefferson123@gmail.com>
Date: Mon, 14 Mar 2022 22:49:58 -0500
Subject: Migrate VPS services pin by Python bot to site

---
 .../resources/guides/python-guides/vps-services.md | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 pydis_site/apps/content/resources/guides/python-guides/vps-services.md

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
new file mode 100644
index 00000000..c153e876
--- /dev/null
+++ b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
@@ -0,0 +1,25 @@
+---
+title: VPS Services
+description: On different VPS services
+---
+If you need to run your bot 24/7 (with no downtime), you should consider using a virtual private server (VPS).
+This is a list of VPS services that are sufficient for running Discord bots.
+
+* https://www.scaleway.com/
+    * Based in Europe.
+* https://www.digitalocean.com/
+    * US-based.
+    * Considered by many to be the gold standard.
+    * Locations available across the world.
+* https://www.ovh.co.uk/
+    * France and Canadian locations available.
+* https://www.time4vps.eu/
+    * Seemingly based in Lithuania.
+* https://www.linode.com/
+    * Cheap VPS.
+* https://www.vultr.com/
+    * US-based, DigitalOcean-like.
+* https://galaxygate.net/
+    * A reliable, affordable, and trusted host.
+
+There are no reliable free options for VPS hosting. If you would rather not pay for a hosting service, you can consider self-hosting. Any modern hardware should be sufficient for running a bot. An old computer with a few GB of ram could be suitable, or a Raspberry Pi (any model, except perhaps one of the particularly less powerful ones).
\ No newline at end of file
-- 
cgit v1.2.3


From 831f56f71d76741276d13e20954f46088e754d18 Mon Sep 17 00:00:00 2001
From: Robin5605 <robinjefferson123@gmail.com>
Date: Mon, 14 Mar 2022 23:07:45 -0500
Subject: Fix end of file

---
 pydis_site/apps/content/resources/guides/python-guides/vps-services.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
index c153e876..02feb8e6 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
@@ -22,4 +22,4 @@ This is a list of VPS services that are sufficient for running Discord bots.
 * https://galaxygate.net/
     * A reliable, affordable, and trusted host.
 
-There are no reliable free options for VPS hosting. If you would rather not pay for a hosting service, you can consider self-hosting. Any modern hardware should be sufficient for running a bot. An old computer with a few GB of ram could be suitable, or a Raspberry Pi (any model, except perhaps one of the particularly less powerful ones).
\ No newline at end of file
+There are no reliable free options for VPS hosting. If you would rather not pay for a hosting service, you can consider self-hosting. Any modern hardware should be sufficient for running a bot. An old computer with a few GB of ram could be suitable, or a Raspberry Pi (any model, except perhaps one of the particularly less powerful ones).
-- 
cgit v1.2.3


From 36b43f94cb1f8c622914048696efec8ccdeb608f Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sat, 19 Mar 2022 23:42:45 -0400
Subject: Add guide for pull requests and reviews

This covers the GitHub UI for opening a pull request,
 getting it reviewed, and draft PRs.
---
 .../pydis-guides/contributing/pull-requests.md     |  41 +++++++++++++++++++++
 .../images/content/contributing/pull_request.png   | Bin 0 -> 10190 bytes
 2 files changed, 41 insertions(+)
 create mode 100644 pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md
 create mode 100644 pydis_site/static/images/content/contributing/pull_request.png

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md
new file mode 100644
index 00000000..f7dee491
--- /dev/null
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md
@@ -0,0 +1,41 @@
+---
+title: Pull Requests
+description: A guide for opening pull requests.
+---
+
+As stated in our [Contributing Guidelines](../contributing-guidelines/), do not open a pull request if you aren't assigned to an approved issue. You can check out our [Issues Guide](../issues/) for help with opening an issue or getting assigned to an existing one.
+{: .notification .is-warning }
+
+
+Before opening a pull request you should have:
+
+1. Committed your changes to your local repository
+2. [Linted](../contributing-guidelines/#linting-and-pre-commit) your code
+3. Tested your changes
+4. Pushed the branch to your fork of the project on GitHub
+
+## Opening a Pull Request
+
+Navigate to your fork on GitHub and make sure you're on the branch with your changes. Click on `Contribute` and then `Open pull request`.
+
+![Pull Request UI](/static/images/content/contributing/pull_request.png)
+
+In the page that it opened, write an overview of the changes you made and why. This should explain how you resolved the issue that spawned this PR and highlight any differences from the proposed implementation. You should also [link the issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
+
+At this stage you can also request reviews from individual contributors. If someone showed interest in the issue or has specific knowledge about it, they may be a good reviewer. It isn't necessary to request your reviewers; someone will review your PR either way.
+
+## The Review Process
+
+Before your changes are merged, your PR needs to be reviewed by other contributors. They will read the issue and your description of your PR, look at your code, test it, and then leave comments on the PR if they find any problems, possibly with suggested changes. Sometimes this can feel intrusive or insulting, but remember that the reviewers are there to help you make your code better.
+
+#### If the PR is already open, how do I make changes to it?
+
+A pull request is between a source branch and a target branch. Updating the source branch with new commits will automatically update the PR to include those commits; they'll even show up in the comment thread of the PR. Sometimes for small changes the reviewer will even write the suggested code themself, in which case you can simply accept them with the click of a button.
+
+If you truly disagree with a reviewer's suggestion, leave a reply in the thread explaining why or proposing an alternative change. Also feel free to ask questions if you want clarification about suggested changes or just want to discuss them further.
+
+## Draft Pull Requests
+
+GitHub [provides a PR feature](https://github.blog/2019-02-14-introducing-draft-pull-requests/) that allows the PR author to mark it as a draft when opening it. This provides both a visual and functional indicator that the contents of the PR are in a draft state and not yet ready for formal review. This is helpful when you want people to see the changes you're making before you're ready for the final pull request.
+
+This feature should be utilized in place of the traditional method of prepending `[WIP]` to the PR title.
diff --git a/pydis_site/static/images/content/contributing/pull_request.png b/pydis_site/static/images/content/contributing/pull_request.png
new file mode 100644
index 00000000..87b7ffbe
Binary files /dev/null and b/pydis_site/static/images/content/contributing/pull_request.png differ
-- 
cgit v1.2.3


From d198b3e02236e65bc2d8fceb9d7d8776dc306b87 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 20 Mar 2022 14:56:05 -0400
Subject: Split up Supplemental Info and touch up Contrib Guidelines

Created new pages:
* Linting
* Logging
* Writing Good Commit Messages

Moved Draft PR section to new pull requests guide
Moved type hinting section to style guide
---
 .../contributing/contributing-guidelines.md        | 25 +++---
 .../contributing-guidelines/commit-messages.md     | 15 ++++
 .../supplemental-information.md                    | 99 ----------------------
 .../guides/pydis-guides/contributing/linting.md    | 14 +++
 .../guides/pydis-guides/contributing/logging.md    | 31 +++++++
 .../pydis-guides/contributing/pull-requests.md     |  2 +-
 .../pydis-guides/contributing/style-guide.md       | 24 +++---
 7 files changed, 82 insertions(+), 128 deletions(-)
 create mode 100644 pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines/commit-messages.md
 delete mode 100644 pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines/supplemental-information.md
 create mode 100644 pydis_site/apps/content/resources/guides/pydis-guides/contributing/linting.md
 create mode 100644 pydis_site/apps/content/resources/guides/pydis-guides/contributing/logging.md

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md
index de1777f2..f13b05be 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md
@@ -4,22 +4,15 @@ description: Guidelines to adhere to when contributing to our projects.
 ---
 
 Thank you for your interest in our projects!
+This page contains the golden rules to follow when contributing. If you have questions about how to get started contributing, check out our [in-depth walkthrough](../../contributing/).
 
-If you are interested in contributing, **this page contains the golden rules to follow when contributing.**
-Supplemental information [can be found here](./supplemental-information/).
-Do note that failing to comply with our guidelines may lead to a rejection of the contribution.
-
-If you are confused by any of these rules, feel free to ask us in the `#dev-contrib` channel in our [Discord server.](https://discord.gg/python)
-
-# The Golden Rules of Contributing
-
-1. **Lint before you push.** We have simple but strict style rules that are enforced through linting.
-You must always lint your code before committing or pushing.
-[Using tools](./supplemental-information/#linting-and-pre-commit) such as `flake8` and `pre-commit` can make this easier.
-Make sure to follow our [style guide](../style-guide/) when contributing.
+1. **Lint before you push.**
+We have simple but strict style rules that are enforced through linting.
+[Set up a pre-commit hook](../linting/) to lint your code when you commit it.
+Not all of the style rules are enforced by linting, so make sure to read the [style guide](../style-guide/) as well.
 2. **Make great commits.**
 Great commits should be atomic, with a commit message explaining what and why.
-More on that can be found in [this section](./supplemental-information/#writing-good-commit-messages).
+Check out [Writing Good Commit Messages](/commit-messages) for details.
 3. **Do not open a pull request if you aren't assigned to the issue.**
 If someone is already working on it, consider offering to collaborate with that person.
 4. **Use assets licensed for public use.**
@@ -28,4 +21,8 @@ Whenever the assets are images, audio or even code, they must have a license com
 We aim to foster a welcoming and friendly environment on our open source projects.
 We take violations of our Code of Conduct very seriously, and may respond with moderator action.
 
-Welcome to our projects!
+<br/>
+
+Failing to comply with our guidelines may lead to a rejection of the contribution.
+If you have questions about any of the rules, feel free to ask us in the `#dev-contrib` channel in our [Discord server](https://discord.gg/python).
+{: .notification .is-warning }
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines/commit-messages.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines/commit-messages.md
new file mode 100644
index 00000000..ba476b65
--- /dev/null
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines/commit-messages.md
@@ -0,0 +1,15 @@
+---
+title: Writing Good Commit Messages
+description: Information about logging in our projects.
+---
+
+A well-structured git log is key to a project's maintainability; it provides insight into when and *why* things were done for future maintainers of the project.
+
+Commits should be as narrow in scope as possible.
+Commits that span hundreds of lines across multiple unrelated functions and/or files are very hard for maintainers to follow.
+After about a week they'll probably be hard for you to follow, too.
+
+Please also avoid making minor commits for fixing typos or linting errors.
+[Don’t forget to lint before you push!](https://soundcloud.com/lemonsaurusrex/lint-before-you-push)
+
+A more in-depth guide to writing great commit messages can be found in Chris Beam's [How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/).
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines/supplemental-information.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines/supplemental-information.md
deleted file mode 100644
index e64e4fc6..00000000
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines/supplemental-information.md
+++ /dev/null
@@ -1,99 +0,0 @@
----
-title: Supplemental Information
-description: Additional information related to our contributing guidelines.
----
-
-This page contains additional information concerning a specific part of our development pipeline.
-
-## Writing Good Commit Messages
-
-A well-structured git log is key to a project's maintainability; it provides insight into when and *why* things were done for future maintainers of the project.
-
-Commits should be as narrow in scope as possible.
-Commits that span hundreds of lines across multiple unrelated functions and/or files are very hard for maintainers to follow.
-After about a week they'll probably be hard for you to follow, too.
-
-Please also avoid making minor commits for fixing typos or linting errors.
-*[Don’t forget to lint before you push!](https://soundcloud.com/lemonsaurusrex/lint-before-you-push)*
-
-A more in-depth guide to writing great commit messages can be found in Chris Beam's *[How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/).*
-
-## Code Style
-
-All of our projects have a certain project-wide style that contributions should attempt to maintain consistency with.
-During PR review, it's not unusual for style adjustments to be requested.
-
-[This page](../../style-guide/) will reference the differences between our projects and what is recommended by [PEP 8.](https://www.python.org/dev/peps/pep-0008/)
-
-## Linting and Pre-commit
-
-On most of our projects, we use `flake8` and `pre-commit` to ensure that the code style is consistent across the code base.
-
-Running `flake8` will warn you about any potential style errors in your contribution.
-You must always check it **before pushing**.
-Your commit will be rejected by the build server if it fails to lint.
-
-**Some style rules are not enforced by flake8. Make sure to read the [style guide](../../style-guide/).**
-
-`pre-commit` is a powerful tool that helps you automatically lint before you commit.
-If the linter complains, the commit is aborted so that you can fix the linting errors before committing again.
-That way, you never commit the problematic code in the first place!
-
-Please refer to the project-specific documentation to see how to setup and run those tools.
-In most cases, you can install pre-commit using `poetry run task precommit`, and lint using `poetry run task lint`.
-
-## Type Hinting
-
-[PEP 484](https://www.python.org/dev/peps/pep-0484/) formally specifies type hints for Python functions, added to the Python Standard Library in version 3.5.
-Type hints are recognized by most modern code editing tools and provide useful insight into both the input and output types of a function, preventing the user from having to go through the codebase to determine these types.
-
-For example:
-
-```python
-import typing
-
-def foo(input_1: int, input_2: typing.Dict[str, str]) -> bool:
-    ...
-```
-
-This tells us that `foo` accepts an `int` and a `dict`, with `str` keys and values, and returns a `bool`.
-
-If the project is running Python 3.9 or above, you can use `dict` instead of `typing.Dict`.
-See [PEP 585](https://www.python.org/dev/peps/pep-0585/) for more information.
-
-All function declarations should be type hinted in code contributed to the PyDis organization.
-
-## Logging
-
-Instead of using `print` statements for logging, we use the built-in [`logging`](https://docs.python.org/3/library/logging.html) module.
-Here is an example usage:
-
-```python
-import logging
-
-log = logging.getLogger(__name__) # Get a logger bound to the module name.
-# This line is usually placed under the import statements at the top of the file.
-
-log.trace("This is a trace log.")
-log.warning("BEEP! This is a warning.")
-log.critical("It is about to go down!")
-```
-
-Print statements should be avoided when possible.
-Our projects currently defines logging levels as follows, from lowest to highest severity:
-
-- **TRACE:** These events should be used to provide a *verbose* trace of every step of a complex process. This is essentially the `logging` equivalent of sprinkling `print` statements throughout the code.
-- **Note:** This is a PyDis-implemented logging level. It may not be available on every project.
-- **DEBUG:** These events should add context to what's happening in a development setup to make it easier to follow what's going while workig on a project. This is in the same vein as **TRACE** logging but at a much lower level of verbosity.
-- **INFO:** These events are normal and don't need direct attention but are worth keeping track of in production, like checking which cogs were loaded during a start-up.
-- **WARNING:** These events are out of the ordinary and should be fixed, but can cause a failure.
-- **ERROR:** These events can cause a failure in a specific part of the application and require urgent attention.
-- **CRITICAL:** These events can cause the whole application to fail and require immediate intervention.
-
-Any logging above the **INFO** level will trigger a [Sentry](https://sentry.io) issue and alert the Core Developer team.
-
-## Draft Pull Requests
-
-Github [provides a PR feature](https://github.blog/2019-02-14-introducing-draft-pull-requests/) that allows the PR author to mark it as a Draft when opening it. This provides both a visual and functional indicator that the contents of the PR are in a draft state and not yet ready for formal review.
-
-This feature should be utilized in place of the traditional method of prepending `[WIP]` to the PR title.
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/linting.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/linting.md
new file mode 100644
index 00000000..48f1cafc
--- /dev/null
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/linting.md
@@ -0,0 +1,14 @@
+---
+title: Linting
+description: A guide for linting and setting up pre-commit.
+---
+
+Your commit will be rejected by the build server if it fails to lint.
+On most of our projects, we use `flake8` and `pre-commit` to ensure that the code style is consistent across the code base.
+
+`pre-commit` is a powerful tool that helps you automatically lint before you commit.
+If the linter complains, the commit is aborted so that you can fix the linting errors before committing again.
+That way, you never commit the problematic code in the first place!
+
+Please refer to the project-specific documentation to see how to setup and run those tools.
+In most cases, you can install pre-commit using `poetry run task precommit`, and lint using `poetry run task lint`.
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/logging.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/logging.md
new file mode 100644
index 00000000..1291a7a4
--- /dev/null
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/logging.md
@@ -0,0 +1,31 @@
+---
+title: Logging
+description: Information about logging in our projects.
+---
+
+Instead of using `print` statements for logging, we use the built-in [`logging`](https://docs.python.org/3/library/logging.html) module.
+Here is an example usage:
+
+```python
+import logging
+
+log = logging.getLogger(__name__) # Get a logger bound to the module name.
+# This line is usually placed under the import statements at the top of the file.
+
+log.trace("This is a trace log.")
+log.warning("BEEP! This is a warning.")
+log.critical("It is about to go down!")
+```
+
+Print statements should be avoided when possible.
+Our projects currently defines logging levels as follows, from lowest to highest severity:
+
+- **TRACE:** These events should be used to provide a *verbose* trace of every step of a complex process. This is essentially the `logging` equivalent of sprinkling `print` statements throughout the code.
+- **Note:** This is a PyDis-implemented logging level. It may not be available on every project.
+- **DEBUG:** These events should add context to what's happening in a development setup to make it easier to follow what's going while workig on a project. This is in the same vein as **TRACE** logging but at a much lower level of verbosity.
+- **INFO:** These events are normal and don't need direct attention but are worth keeping track of in production, like checking which cogs were loaded during a start-up.
+- **WARNING:** These events are out of the ordinary and should be fixed, but can cause a failure.
+- **ERROR:** These events can cause a failure in a specific part of the application and require urgent attention.
+- **CRITICAL:** These events can cause the whole application to fail and require immediate intervention.
+
+Any logging above the **INFO** level will trigger a [Sentry](https://sentry.io) issue and alert the Core Developer team.
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md
index f7dee491..a9b6385e 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md
@@ -10,7 +10,7 @@ As stated in our [Contributing Guidelines](../contributing-guidelines/), do not
 Before opening a pull request you should have:
 
 1. Committed your changes to your local repository
-2. [Linted](../contributing-guidelines/#linting-and-pre-commit) your code
+2. [Linted](../linting/) your code
 3. Tested your changes
 4. Pushed the branch to your fork of the project on GitHub
 
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/style-guide.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/style-guide.md
index f9962990..4dba45c8 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/style-guide.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/style-guide.md
@@ -191,21 +191,17 @@ Present tense defines that the work being done is now, in the present, rather th
 **Use:** "Build an information embed."<br>
 **Don't use:** "Built an information embed." or "Will build an information embed."
 
-# Type Annotations
-Functions are required to have type annotations as per the style defined in [PEP 484](https://www.python.org/dev/peps/pep-0484/).
+# Type Hinting
+Functions are required to have type annotations as per the style defined in [PEP 484](https://www.python.org/dev/peps/pep-0484/). Type hints are recognized by most modern code editing tools and provide useful insight into both the input and output types of a function, preventing the user from having to go through the codebase to determine these types.
 
-A function without annotations might look like:
-```py
-def divide(a, b):
-    """Divide the two given arguments."""
-    return a / b
-```
-
-With annotations, the arguments and the function are annotated with their respective types:
-```py
-def divide(a: int, b: int) -> float:
-    """Divide the two given arguments."""
-    return a / b
+A function with type hints looks like:
+```python
+def foo(input_1: int, input_2: dict[str, int]) -> bool:
+    ...
 ```
+This tells us that `foo` accepts an `int` and a `dict`, with `str` keys and `int` values, and returns a `bool`.
 
 In previous examples, we have purposely omitted annotations to keep focus on the specific points they represent.
+
+> **Note:** if the project is running Python 3.8 or below you have to use `typing.Dict` instead of `dict`, but our three main projects are all >=3.9.
+> See [PEP 585](https://www.python.org/dev/peps/pep-0585/) for more information.
-- 
cgit v1.2.3


From 79694efe7bb13a9d6791844e7a836b7f4350308d Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 20 Mar 2022 17:08:08 -0400
Subject: Write walkthrough

---
 .../resources/guides/pydis-guides/contributing.md  | 60 +++++++++++++---------
 1 file changed, 36 insertions(+), 24 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index 596afb53..759ed1dc 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -92,45 +92,57 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
 </div>
 
 # How do I start contributing?
-  Completing these steps will have you ready to make your first contribution. If you've already been using Git or GitHub feel free to skip those steps, but please make sure to read about the PyDis contributing process and ettiquette. If you are here looking for the answer to a specific question, check out the sub-articles in the top right of the page to see a list of our guides.
+  Unsure of what contributing to open source projects involves? Have questions about how to use GitHub? Just need to know about our contribution etiquette? Completing these steps will have you ready to make your first contribution.
 
+  Feel free to skip any steps you're already familiar with, but please make sure not to miss the  [Contributing Guidelines](#5-read-our-contributing-guidelines).
 
+  If you are here looking for the answer to a specific question, check out the sub-articles in the top right of the page to see a list of our guides.
 
-### Fork the repo
-   GitHub is a website based on the Git version control system that stores project files in the cloud. The people working on the project can use GitHub as a central place for sending their changes, getting their teammates' changes, and communicating with each other. Forking the repository that you want to work on will create a copy under your own GitHub account. You'll make your changes to this copy, then later we can bring them back to the PyDis repository.
+### 1. Learn the basics of Git
+  Git is a _Version Control System_, software for carefully tracking changes to the files in a project. Git allows the same project to be worked on by people in different places. You can make changes to your local code and then distribute those changes to the other people working on the project.
 
-   [Check out our guide on forking a GitHub repo](./forking-repository/)
+  Check out these [**resources to get started using Git**](./working-with-git/).
 
-### Clone the repo
-  Now that you have your own fork you could make changes to it directly on GitHub, but that's not a convenient way to write code. Instead you can use Git to clone the repo to your local machine, commit changes to it there, then push those changes to GitHub.
+### 2. Fork the repo
+  GitHub is a website based on the Git version control system that stores project files in the cloud. The people working on the project can use GitHub as a central place for sending their changes, getting their teammates' changes, and communicating with each other. Forking the repository that you want to work on will create a copy under your own GitHub account. You'll make your changes to this copy, then later we can bring them back to the PyDis repository.
 
-  [Check out our guide on forking a GitHub repo](./forking-repository/)
+  Check out our [**guide on forking a GitHub repo**](./forking-repository/).
 
-### Set up the project
-  You have the source code on your local computer, but how do you actually run it?
+### 3. Clone the repo
+  Now that you have your own fork you need to be able to make changes to the code. You can clone the repo to your local machine, commit changes to it there, then push those changes to GitHub.
 
-  [Sir Lancebot](./sir-lancebot/)
+  Check out our [**guide on cloning a GitHub repo**](./cloning-repository/).
 
-  [Python Bot](./bot/)
+### 4. Set up the project
+  You have the source code on your local computer, now how do you actually run it? We have detailed guides on setting up the environment for each of our projects:
 
-  [Site](./site/)
+  * [**Sir Lancebot**](./sir-lancebot/)
 
-### Ettiquette
-  [Guidelines](./contributing-guidelines/)
-### Read the style guide
-  [Style Guide](./style-guide/)
+  * [**Python Bot**](./bot/)
 
-### Open a pull request
+  * [**Site**](./site/)
 
-### The review process
-  [Review Guide](../code-reviews-primer/)
-### Create an issue
+### 5. Read our Contributing Guidelines
+  We have a few short rules that all contributors must follow. Make sure you read and follow them while working on our projects.
 
+  [**Contributing Guidelines**](./contributing-guidelines/).
 
-### Learn the basics of Git
-  Git is a *Version Control System*, software for carefully tracking changes to the files in a project. Git allows the same project to be worked on by people in different places. You can make changes to your local code and then distribute those changes to the other people working on the project.
+  As mentioned in the Contributing Guidelines, we have a simple style guide for our projects based on PEP 8. Give it a read to keep your code consistent with the rest of the codebase.
 
-  [Check out these resources to get started using Git](./working-with-git/)
+  [**Style Guide**](./style-guide/)
 
+### 6. Create an issue
+  The first step to any new contribution is an issue describing a problem with the current codebase or proposing a new feature. All the open issues are viewable on the GitHub repositories, for instance here is the [issues page for Sir Lancebot](https://github.com/python-discord/sir-lancebot/issues). If you have an idea that you want to implement, open a new issue (and check out our [**guide on writing an issue**](./issues/)). Otherwise you can browse the unassigned issues and ask to be assigned to one that you're interested in, either in the comments on the issue or in the`#dev-contrib`channel on Discord.
 
-If you don't understand anything or need clarification, feel free to ask any staff member with the  **@PyDis Core Developers** role in the server. We're always happy to help!
+  Don't move forward until your issue is approved by a Core Developer. Issues are not guaranteed to be approved so your work may be wasted.
+  {: .notification .is-warning }
+
+### 7. Open a pull request
+  After your issue has been approved and you've written your code and tested it, it's time to open a pull request. Pull requests are a feature in GitHub; you can think of them as asking the project maintainers to accept your changes. This gives other contributors a chance to review your code and make any needed changes before it's merged into the main branch of the project.
+
+  Check out our [**Pull Request Guide**](./contributing/pull-requests/) for help with opening a pull request and going through the review process.
+
+  Check out our [**Code Review Guide**](../code-reviews-primer/) to learn how to be a star reviewer. Reviewing PRs is a vital part of open source development, and we always need more reviewers!
+
+### That's it!
+Thank you for contributing to our community projects. If you don't understand anything or need clarification, feel free to ask a question in the`dev-contrib`channel and keep an eye out for staff members with the **@PyDis Core Developers** role in the server. We're always happy to help!
-- 
cgit v1.2.3


From e76e0a5f2d80a4f5ec31fe015155b0349f9f607b Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 20 Mar 2022 18:55:16 -0400
Subject: Fix PR page link

---
 pydis_site/apps/content/resources/guides/pydis-guides/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index 759ed1dc..51991d9c 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -140,7 +140,7 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
 ### 7. Open a pull request
   After your issue has been approved and you've written your code and tested it, it's time to open a pull request. Pull requests are a feature in GitHub; you can think of them as asking the project maintainers to accept your changes. This gives other contributors a chance to review your code and make any needed changes before it's merged into the main branch of the project.
 
-  Check out our [**Pull Request Guide**](./contributing/pull-requests/) for help with opening a pull request and going through the review process.
+  Check out our [**Pull Request Guide**](./pull-requests/) for help with opening a pull request and going through the review process.
 
   Check out our [**Code Review Guide**](../code-reviews-primer/) to learn how to be a star reviewer. Reviewing PRs is a vital part of open source development, and we always need more reviewers!
 
-- 
cgit v1.2.3


From 506ac4281dd150eefc4864a00838ac97aa71f14f Mon Sep 17 00:00:00 2001
From: Robin <74519799+Robin5605@users.noreply.github.com>
Date: Mon, 21 Mar 2022 14:15:50 -0500
Subject: Add hyperlinks

Co-authored-by: Xithrius <15021300+Xithrius@users.noreply.github.com>
---
 .../content/resources/guides/python-guides/vps-services.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
index 02feb8e6..07e70e9a 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
@@ -5,21 +5,21 @@ description: On different VPS services
 If you need to run your bot 24/7 (with no downtime), you should consider using a virtual private server (VPS).
 This is a list of VPS services that are sufficient for running Discord bots.
 
-* https://www.scaleway.com/
+* [https://www.scaleway.com](https://www.scaleway.com)
     * Based in Europe.
-* https://www.digitalocean.com/
+* [https://www.digitalocean.com](https://www.digitalocean.com)
     * US-based.
     * Considered by many to be the gold standard.
     * Locations available across the world.
-* https://www.ovh.co.uk/
+* [https://www.ovh.co.uk](https://www.ovh.co.uk)
     * France and Canadian locations available.
-* https://www.time4vps.eu/
+* [https://www.time4vps.eu](https://www.time4vps.eu)
     * Seemingly based in Lithuania.
-* https://www.linode.com/
+* [https://www.linode.com](https://www.linode.com)
     * Cheap VPS.
-* https://www.vultr.com/
+* [https://www.vultr.com](https://www.vultr.com)
     * US-based, DigitalOcean-like.
-* https://galaxygate.net/
+* [https://galaxygate.net](https://galaxygate.net)
     * A reliable, affordable, and trusted host.
 
 There are no reliable free options for VPS hosting. If you would rather not pay for a hosting service, you can consider self-hosting. Any modern hardware should be sufficient for running a bot. An old computer with a few GB of ram could be suitable, or a Raspberry Pi (any model, except perhaps one of the particularly less powerful ones).
-- 
cgit v1.2.3


From 00a17a53c542b6de263691219c38438393d9f806 Mon Sep 17 00:00:00 2001
From: Robin5605 <robinjefferson123@gmail.com>
Date: Tue, 22 Mar 2022 12:33:13 -0500
Subject: Update VPS services content

---
 .../resources/guides/python-guides/vps-services.md | 53 +++++++++++++---------
 1 file changed, 32 insertions(+), 21 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
index 07e70e9a..4dfca732 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
@@ -1,25 +1,36 @@
 ---
-title: VPS Services
-description: On different VPS services
+ title: VPS Services
+ description: On different VPS services
 ---
-If you need to run your bot 24/7 (with no downtime), you should consider using a virtual private server (VPS).
-This is a list of VPS services that are sufficient for running Discord bots.
 
-* [https://www.scaleway.com](https://www.scaleway.com)
-    * Based in Europe.
-* [https://www.digitalocean.com](https://www.digitalocean.com)
-    * US-based.
-    * Considered by many to be the gold standard.
-    * Locations available across the world.
-* [https://www.ovh.co.uk](https://www.ovh.co.uk)
-    * France and Canadian locations available.
-* [https://www.time4vps.eu](https://www.time4vps.eu)
-    * Seemingly based in Lithuania.
-* [https://www.linode.com](https://www.linode.com)
-    * Cheap VPS.
-* [https://www.vultr.com](https://www.vultr.com)
-    * US-based, DigitalOcean-like.
-* [https://galaxygate.net](https://galaxygate.net)
-    * A reliable, affordable, and trusted host.
+If you need to run your bot 24/7 (with no downtime), you should consider using a virtual private server (VPS).This is a list of VPS services that are sufficient for running Discord bots.
+
+* Europe
+    * [netcup](https://www.netcup.eu/)
+        * Germany & Austria data centres.
+        * Great affiliate program.
+    * [Yandex Cloud](https://cloud.yandex.ru/)
+        * Vladimir, Ryazan, and Moscow region data centres.
+    * [Scaleway](https://www.scaleway.com/)
+        * France data centre.
+    * [Time 4 VPS](https://www.time4vps.eu/)
+        * Lithuania data centre.
+* US
+    * [GalaxyGate](https://galaxygate.net/)
+        * New York data centre.
+        * Great affiliate program.
+* Global
+    * [Linode](https://www.linode.com/)
+        * Global data centre options.
+    * [Digital Ocean](https://www.digitalocean.com/)
+        * Global data centre options.
+    * [OVHcloud](https://www.ovhcloud.com/)
+        * Global data centre options.
+    * [Vultr](https://www.vultr.com/)
+        * Global data centre options.
+
+---
+Free hosts
+There are no reliable free options for VPS hosting. If you would rather not pay for a hosting service, you can consider self-hosting.
+Any modern hardware should be sufficient for running a bot. An old computer with a few GB of ram could be suitable, or a Raspberry Pi.
 
-There are no reliable free options for VPS hosting. If you would rather not pay for a hosting service, you can consider self-hosting. Any modern hardware should be sufficient for running a bot. An old computer with a few GB of ram could be suitable, or a Raspberry Pi (any model, except perhaps one of the particularly less powerful ones).
-- 
cgit v1.2.3


From aedf67e6f141288f1f8b00bbd0e46cae1eb16a6c Mon Sep 17 00:00:00 2001
From: Robin5605 <robinjefferson123@gmail.com>
Date: Tue, 22 Mar 2022 14:22:27 -0500
Subject: Fix EOF

---
 pydis_site/apps/content/resources/guides/python-guides/vps-services.md | 1 -
 1 file changed, 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
index 4dfca732..95951134 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
@@ -33,4 +33,3 @@ If you need to run your bot 24/7 (with no downtime), you should consider using a
 Free hosts
 There are no reliable free options for VPS hosting. If you would rather not pay for a hosting service, you can consider self-hosting.
 Any modern hardware should be sufficient for running a bot. An old computer with a few GB of ram could be suitable, or a Raspberry Pi.
-
-- 
cgit v1.2.3


From 682613bcf56ea6aefac8b15b56064a16732894a4 Mon Sep 17 00:00:00 2001
From: Robin <74519799+Robin5605@users.noreply.github.com>
Date: Tue, 22 Mar 2022 23:51:36 -0500
Subject: Remove starting whitespaces

Co-authored-by: Xithrius <15021300+Xithrius@users.noreply.github.com>
---
 .../apps/content/resources/guides/python-guides/vps-services.md       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
index 95951134..90306057 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
@@ -1,6 +1,6 @@
 ---
- title: VPS Services
- description: On different VPS services
+title: VPS Services
+description: On different VPS services
 ---
 
 If you need to run your bot 24/7 (with no downtime), you should consider using a virtual private server (VPS).This is a list of VPS services that are sufficient for running Discord bots.
-- 
cgit v1.2.3


From 806ce3fdf433d05b9d480a3d7ca2332dac951194 Mon Sep 17 00:00:00 2001
From: Krypton <root@krypt0n.co.uk>
Date: Wed, 23 Mar 2022 22:35:32 +0100
Subject: Update discord-messages-with-colors.md

---
 .../python-guides/discord-messages-with-colors.md   | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
index 30f40948..c8e50d71 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
@@ -3,13 +3,13 @@ title: Discord Messages with Colors
 description: A guide on how to add colors to your codeblocks on Discord
 ---
 
-Discord is now slowly rolling out the ability to send colored messages within code blocks. It uses the ANSI color codes, so if you've tried to print colored text in your terminal or console with Python or other languages then it will be easy for you.
+Discord is now slowly rolling out the ability to send colored text within code blocks. This is done using ANSI color codes which is also how you print colored text in your terminal.
 
-To be able to send a colored text, you need to use the `ansi` language for your code block and provide a prefix of this format before writing your text:
-```
+To send colored text in a code block you need to first specify the `ansi` language and use the prefixes similar to the one below:
+```ansi
 \u001b[{format};{color}m
 ```
-*The `\u001b` is the unicode for ESCAPE/ESC, see <http://www.unicode-symbol.com/u/001B.html>.* ***If you want to use it yourself without bots, then you need to copy paste the character from the website.***
+*`\u001b` is the unicode escape for ESCAPE/ESC, meant to be used in the source of your bot (see <http://www.unicode-symbol.com/u/001B.html>).* ***If you wish to send colored text without using your bot you need to copy the character from the website.***
 
 After you've written this, you can type and text you wish, and if you want to reset the color back to normal, then you need to use `\u001b[0m` as prefix.
 
@@ -34,13 +34,13 @@ Here is the list of values you can use to replace `{color}`:
 
 *The following values will change the **text background** color.*
 
-* 40: Some very dark blue
+* 40: Firefly dark blue
 * 41: Orange
-* 42: Gray
-* 43: Light gray
-* 44: Even lighter gray
+* 42: Marble blue
+* 43: Greyish turquoise
+* 44: Gray
 * 45: Indigo
-* 46: Again some gray
+* 46: Light gray
 * 47: White
 
 Let's take an example, I want a bold green colored text with the very dark blue background.
@@ -54,7 +54,8 @@ or<br>
 \u001b[1;40;32mThat's some cool formatted text right?<br>
 \`\`\`
 
-Result:<br>
+Result:
+
 ![Background and text color](https://media.discordapp.net/attachments/739937507768270939/930460020603224084/Background-Text-Color.png)
 
 The way the colors look like on Discord is shown in the image below:
-- 
cgit v1.2.3


From 1017676bea05d423d86a29c2ede769a6288a3d4a Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sat, 26 Mar 2022 22:33:03 -0400
Subject: Fix commit-messages link

---
 .../guides/pydis-guides/contributing/contributing-guidelines.md         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md
index f13b05be..1917ee43 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md
@@ -12,7 +12,7 @@ We have simple but strict style rules that are enforced through linting.
 Not all of the style rules are enforced by linting, so make sure to read the [style guide](../style-guide/) as well.
 2. **Make great commits.**
 Great commits should be atomic, with a commit message explaining what and why.
-Check out [Writing Good Commit Messages](/commit-messages) for details.
+Check out [Writing Good Commit Messages](./commit-messages) for details.
 3. **Do not open a pull request if you aren't assigned to the issue.**
 If someone is already working on it, consider offering to collaborate with that person.
 4. **Use assets licensed for public use.**
-- 
cgit v1.2.3


From 15a32db18b72291913cf80b9fc85ac578b824f34 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 27 Mar 2022 00:06:14 -0400
Subject: Make small wording improvements

---
 .../apps/content/resources/guides/pydis-guides/contributing.md       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index 51991d9c..4b53d978 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -92,7 +92,7 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
 </div>
 
 # How do I start contributing?
-  Unsure of what contributing to open source projects involves? Have questions about how to use GitHub? Just need to know about our contribution etiquette? Completing these steps will have you ready to make your first contribution.
+  Unsure of what contributing to open source projects involves? Have questions about how to use GitHub? Just need to know about our contribution etiquette? Completing these steps will have you ready to make your first contribution no matter your starting point.
 
   Feel free to skip any steps you're already familiar with, but please make sure not to miss the  [Contributing Guidelines](#5-read-our-contributing-guidelines).
 
@@ -107,7 +107,6 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
   GitHub is a website based on the Git version control system that stores project files in the cloud. The people working on the project can use GitHub as a central place for sending their changes, getting their teammates' changes, and communicating with each other. Forking the repository that you want to work on will create a copy under your own GitHub account. You'll make your changes to this copy, then later we can bring them back to the PyDis repository.
 
   Check out our [**guide on forking a GitHub repo**](./forking-repository/).
-
 ### 3. Clone the repo
   Now that you have your own fork you need to be able to make changes to the code. You can clone the repo to your local machine, commit changes to it there, then push those changes to GitHub.
 
@@ -145,4 +144,4 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
   Check out our [**Code Review Guide**](../code-reviews-primer/) to learn how to be a star reviewer. Reviewing PRs is a vital part of open source development, and we always need more reviewers!
 
 ### That's it!
-Thank you for contributing to our community projects. If you don't understand anything or need clarification, feel free to ask a question in the`dev-contrib`channel and keep an eye out for staff members with the **@PyDis Core Developers** role in the server. We're always happy to help!
+Thank you for contributing to our community projects. If there's anything you don't understand or you just want to discuss with other contributors, come visit the`dev-contrib`channel to ask questions. Keep an eye out for staff members with the **@PyDis Core Developers** role in the server; we're always happy to help!
-- 
cgit v1.2.3


From 08d5e01be09e482f92a96cf00bc007e60dfa2c98 Mon Sep 17 00:00:00 2001
From: Robin <74519799+Robin5605@users.noreply.github.com>
Date: Thu, 31 Mar 2022 10:46:33 -0500
Subject: Make "free hosts" a header

Co-authored-by: Shom770 <82843611+Shom770@users.noreply.github.com>
---
 pydis_site/apps/content/resources/guides/python-guides/vps-services.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
index 90306057..b8a6f8fd 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
@@ -30,6 +30,6 @@ If you need to run your bot 24/7 (with no downtime), you should consider using a
         * Global data centre options.
 
 ---
-Free hosts
+# Free hosts
 There are no reliable free options for VPS hosting. If you would rather not pay for a hosting service, you can consider self-hosting.
 Any modern hardware should be sufficient for running a bot. An old computer with a few GB of ram could be suitable, or a Raspberry Pi.
-- 
cgit v1.2.3


From 0cc092741ea35b5810d57d4d768dcb0e021603bd Mon Sep 17 00:00:00 2001
From: Robin5605 <robinjefferson123@gmail.com>
Date: Thu, 31 Mar 2022 10:50:38 -0500
Subject: Remove extraneous bullet points in "global"

---
 .../apps/content/resources/guides/python-guides/vps-services.md       | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
index b8a6f8fd..bd4af0a5 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
@@ -21,13 +21,9 @@ If you need to run your bot 24/7 (with no downtime), you should consider using a
         * Great affiliate program.
 * Global
     * [Linode](https://www.linode.com/)
-        * Global data centre options.
     * [Digital Ocean](https://www.digitalocean.com/)
-        * Global data centre options.
     * [OVHcloud](https://www.ovhcloud.com/)
-        * Global data centre options.
     * [Vultr](https://www.vultr.com/)
-        * Global data centre options.
 
 ---
 # Free hosts
-- 
cgit v1.2.3


From 1e916a0515940caa95f34fc0bc04a040b36c214d Mon Sep 17 00:00:00 2001
From: Robin <74519799+Robin5605@users.noreply.github.com>
Date: Thu, 31 Mar 2022 11:52:57 -0500
Subject: Add space

Co-authored-by: Hassan Abouelela <abouelelahassan@gmail.com>
---
 pydis_site/apps/content/resources/guides/python-guides/vps-services.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
index bd4af0a5..0acd3e55 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
@@ -3,7 +3,7 @@ title: VPS Services
 description: On different VPS services
 ---
 
-If you need to run your bot 24/7 (with no downtime), you should consider using a virtual private server (VPS).This is a list of VPS services that are sufficient for running Discord bots.
+If you need to run your bot 24/7 (with no downtime), you should consider using a virtual private server (VPS). This is a list of VPS services that are sufficient for running Discord bots.
 
 * Europe
     * [netcup](https://www.netcup.eu/)
-- 
cgit v1.2.3


From 1005229e825a5f2449168bcae2b85667c5799265 Mon Sep 17 00:00:00 2001
From: Krypton <coderkrypton@gmail.com>
Date: Fri, 1 Apr 2022 18:15:19 +0200
Subject: Added Discord embed limits guide (#690)

Co-authored-by: Krypton <hello@krypt0n.co.uk>
Co-authored-by: Krypton <root@krypt0n.co.uk>
Co-authored-by: Xithrius <15021300+Xithrius@users.noreply.github.com>
---
 .../guides/python-guides/discord-embed-limits.md    | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 pydis_site/apps/content/resources/guides/python-guides/discord-embed-limits.md

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/discord-embed-limits.md b/pydis_site/apps/content/resources/guides/python-guides/discord-embed-limits.md
new file mode 100644
index 00000000..ca97462b
--- /dev/null
+++ b/pydis_site/apps/content/resources/guides/python-guides/discord-embed-limits.md
@@ -0,0 +1,21 @@
+---
+title: Discord Embed Limits
+description: A guide that shows the limits of embeds in Discord and how to avoid them.
+---
+
+If you plan on using embed responses for your bot you should know the limits of the embeds on Discord or you will get `Invalid Form Body` errors:
+
+- Embed **title** is limited to **256 characters**
+- Embed **description** is limited to **4096 characters**
+- An embed can contain a maximum of **25 fields**
+- A **field name/title** is limited to **256 character** and the **value of the field** is limited to **1024 characters**
+- Embed **footer** is limited to **2048 characters**
+- Embed **author name** is limited to **256 characters**
+- The **total of characters** allowed in an embed is **6000**
+
+Now if you need to get over this limit (for example for a help command), you would need to use pagination.
+There are several ways to do that:
+
+- A library called **[disputils](https://pypi.org/project/disputils)**
+- An experimental library made by the discord.py developer called **[discord-ext-menus](https://github.com/Rapptz/discord-ext-menus)**
+- Make your own setup using **[wait_for()](https://discordpy.readthedocs.io/en/stable/ext/commands/api.html#discord.ext.commands.Bot.wait_for)** and wait for a reaction to be added
-- 
cgit v1.2.3


From 788c8fc1b3fc54fa35dc8282b8a1267314e85a77 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Thu, 7 Apr 2022 22:44:09 -0400
Subject: Replace difficulty badges with more description

---
 .../resources/guides/pydis-guides/contributing.md      | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index 4b53d978..e4b3e621 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -19,11 +19,7 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
       </div>
       <div class="card-content">
         <div class="content">
-          Our community-driven Discord bot.
-        </div>
-        <div class="tags has-addons">
-          <span class="tag is-dark">Difficulty</span>
-          <span class="tag is-primary">Beginner</span>
+          Sir Lancebot has a collection of self-contained, for-fun features. If you're new to Discord bots or contributing, this is a great place to start!
         </div>
       </div>
       <div class="card-footer">
@@ -46,11 +42,7 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
       </div>
       <div class="card-content">
         <div class="content">
-          The community and moderation Discord bot.
-        </div>
-        <div class="tags has-addons">
-          <span class="tag is-dark">Difficulty</span>
-          <span class="tag is-warning">Intermediate</span>
+          Called @Python on the server, this bot handles moderation tools, help channels, and other critical features for our community.
         </div>
       </div>
       <div class="card-footer">
@@ -73,11 +65,7 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
       </div>
       <div class="card-content">
         <div class="content">
-          The website, subdomains and API.
-        </div>
-        <div class="tags has-addons">
-          <span class="tag is-dark">Difficulty</span>
-          <span class="tag is-danger">Advanced</span>
+          This website itself! This project is built with Django and includes our API, which is used by various services such as @Python.
         </div>
       </div>
       <div class="card-footer">
-- 
cgit v1.2.3


From 1290df613d23441afc61191b78fe2de26df839f7 Mon Sep 17 00:00:00 2001
From: camcaswell <38672443+camcaswell@users.noreply.github.com>
Date: Thu, 7 Apr 2022 23:24:50 -0400
Subject: Clarify main projects

Co-authored-by: Boris Muratov <8bee278@gmail.com>
---
 pydis_site/apps/content/resources/guides/pydis-guides/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index e4b3e621..868b5899 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -101,7 +101,7 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
   Check out our [**guide on cloning a GitHub repo**](./cloning-repository/).
 
 ### 4. Set up the project
-  You have the source code on your local computer, now how do you actually run it? We have detailed guides on setting up the environment for each of our projects:
+  You have the source code on your local computer, now how do you actually run it? We have detailed guides on setting up the environment for each of our main projects:
 
   * [**Sir Lancebot**](./sir-lancebot/)
 
-- 
cgit v1.2.3


From 734d26c8c260eab0f2edb4e784da5bf42e07bbda Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Fri, 8 Apr 2022 14:33:55 -0400
Subject: Add links to #dev-contrib

---
 pydis_site/apps/content/resources/guides/pydis-guides/contributing.md | 4 ++--
 .../guides/pydis-guides/contributing/contributing-guidelines.md       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index e4b3e621..0c95abe0 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -119,7 +119,7 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
   [**Style Guide**](./style-guide/)
 
 ### 6. Create an issue
-  The first step to any new contribution is an issue describing a problem with the current codebase or proposing a new feature. All the open issues are viewable on the GitHub repositories, for instance here is the [issues page for Sir Lancebot](https://github.com/python-discord/sir-lancebot/issues). If you have an idea that you want to implement, open a new issue (and check out our [**guide on writing an issue**](./issues/)). Otherwise you can browse the unassigned issues and ask to be assigned to one that you're interested in, either in the comments on the issue or in the`#dev-contrib`channel on Discord.
+  The first step to any new contribution is an issue describing a problem with the current codebase or proposing a new feature. All the open issues are viewable on the GitHub repositories, for instance here is the [issues page for Sir Lancebot](https://github.com/python-discord/sir-lancebot/issues). If you have an idea that you want to implement, open a new issue (and check out our [**guide on writing an issue**](./issues/)). Otherwise you can browse the unassigned issues and ask to be assigned to one that you're interested in, either in the comments on the issue or in the[`#dev-contrib`](https://discord.gg/2h3qBv8Xaa)channel on Discord.
 
   Don't move forward until your issue is approved by a Core Developer. Issues are not guaranteed to be approved so your work may be wasted.
   {: .notification .is-warning }
@@ -132,4 +132,4 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
   Check out our [**Code Review Guide**](../code-reviews-primer/) to learn how to be a star reviewer. Reviewing PRs is a vital part of open source development, and we always need more reviewers!
 
 ### That's it!
-Thank you for contributing to our community projects. If there's anything you don't understand or you just want to discuss with other contributors, come visit the`dev-contrib`channel to ask questions. Keep an eye out for staff members with the **@PyDis Core Developers** role in the server; we're always happy to help!
+Thank you for contributing to our community projects. If there's anything you don't understand or you just want to discuss with other contributors, come visit the[`#dev-contrib`](https://discord.gg/2h3qBv8Xaa)channel to ask questions. Keep an eye out for staff members with the **@PyDis Core Developers** role in the server; we're always happy to help!
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md
index 1917ee43..b7a22677 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md
@@ -24,5 +24,5 @@ We take violations of our Code of Conduct very seriously, and may respond with m
 <br/>
 
 Failing to comply with our guidelines may lead to a rejection of the contribution.
-If you have questions about any of the rules, feel free to ask us in the `#dev-contrib` channel in our [Discord server](https://discord.gg/python).
+If you have questions about any of the rules, feel free to ask us in the[`#dev-contrib`](https://discord.gg/2h3qBv8Xaa)channel in our [Discord server](https://discord.gg/python).
 {: .notification .is-warning }
-- 
cgit v1.2.3


From f3811ad0a5f06f524f678003594ad173a2dddbb5 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Fri, 8 Apr 2022 17:03:54 -0400
Subject: Shorten and combine steps

---
 .../resources/guides/pydis-guides/contributing.md    | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index 6e500500..a7701d4f 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -86,21 +86,19 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
 
   If you are here looking for the answer to a specific question, check out the sub-articles in the top right of the page to see a list of our guides.
 
-### 1. Learn the basics of Git
-  Git is a _Version Control System_, software for carefully tracking changes to the files in a project. Git allows the same project to be worked on by people in different places. You can make changes to your local code and then distribute those changes to the other people working on the project.
+  **Note:** We use Git to keep track of changes to the files in our projects. Git allows you to make changes to your local code and then distribute those changes to the other people working on the project. You'll use Git in a couple steps of the contributing process. You can refer to this [**guide on using Git**](./working-with-git/).
+  {: .notification }
 
-  Check out these [**resources to get started using Git**](./working-with-git/).
-
-### 2. Fork the repo
-  GitHub is a website based on the Git version control system that stores project files in the cloud. The people working on the project can use GitHub as a central place for sending their changes, getting their teammates' changes, and communicating with each other. Forking the repository that you want to work on will create a copy under your own GitHub account. You'll make your changes to this copy, then later we can bring them back to the PyDis repository.
+### 1. Fork and clone the repo
+  GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to fork the repository to create a copy under your own GitHub account. You'll make your changes to this copy, which can then later be merged into the PyDis repository.
 
   Check out our [**guide on forking a GitHub repo**](./forking-repository/).
-### 3. Clone the repo
+
   Now that you have your own fork you need to be able to make changes to the code. You can clone the repo to your local machine, commit changes to it there, then push those changes to GitHub.
 
   Check out our [**guide on cloning a GitHub repo**](./cloning-repository/).
 
-### 4. Set up the project
+### 2. Set up the project
   You have the source code on your local computer, now how do you actually run it? We have detailed guides on setting up the environment for each of our main projects:
 
   * [**Sir Lancebot**](./sir-lancebot/)
@@ -109,7 +107,7 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
 
   * [**Site**](./site/)
 
-### 5. Read our Contributing Guidelines
+### 3. Read our Contributing Guidelines
   We have a few short rules that all contributors must follow. Make sure you read and follow them while working on our projects.
 
   [**Contributing Guidelines**](./contributing-guidelines/).
@@ -118,13 +116,13 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
 
   [**Style Guide**](./style-guide/)
 
-### 6. Create an issue
+### 4. Create an issue
   The first step to any new contribution is an issue describing a problem with the current codebase or proposing a new feature. All the open issues are viewable on the GitHub repositories, for instance here is the [issues page for Sir Lancebot](https://github.com/python-discord/sir-lancebot/issues). If you have an idea that you want to implement, open a new issue (and check out our [**guide on writing an issue**](./issues/)). Otherwise you can browse the unassigned issues and ask to be assigned to one that you're interested in, either in the comments on the issue or in the[`#dev-contrib`](https://discord.gg/2h3qBv8Xaa)channel on Discord.
 
   Don't move forward until your issue is approved by a Core Developer. Issues are not guaranteed to be approved so your work may be wasted.
   {: .notification .is-warning }
 
-### 7. Open a pull request
+### 5. Open a pull request
   After your issue has been approved and you've written your code and tested it, it's time to open a pull request. Pull requests are a feature in GitHub; you can think of them as asking the project maintainers to accept your changes. This gives other contributors a chance to review your code and make any needed changes before it's merged into the main branch of the project.
 
   Check out our [**Pull Request Guide**](./pull-requests/) for help with opening a pull request and going through the review process.
-- 
cgit v1.2.3


From 85755c99adaffee2d65bc3d09ff45b79f10bde91 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Fri, 8 Apr 2022 17:31:50 -0400
Subject: Add link to forking guide

---
 .../content/resources/guides/pydis-guides/contributing/sir-lancebot.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
index 6e5a9199..1621abb6 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
@@ -19,7 +19,7 @@ toc: 1
 ## Using Gitpod
 Sir Lancebot can be edited and tested on Gitpod. Gitpod will automatically install the correct dependencies and Python version, so you can get straight to coding.
 
-To do this, you will need a Gitpod account, which you can get [here](https://www.gitpod.io/#get-started), and a fork of Sir Lancebot. This guide covers forking the repository [here](#fork-the-project).
+To do this, you will need a Gitpod account, which you can get [here](https://www.gitpod.io/#get-started), and a fork of Sir Lancebot. This guide covers forking the repository [here](../forking-repository).
 
 Afterwards, click on [this link](https://gitpod.io/#/github.com/python-discord/sir-lancebot) to spin up a new workspace for Sir Lancebot. Then run the following commands in the terminal after the existing tasks have finished running:
 ```sh
-- 
cgit v1.2.3


From 7f6547e812c633464a68ed027dd79413384cb218 Mon Sep 17 00:00:00 2001
From: camcaswell <38672443+camcaswell@users.noreply.github.com>
Date: Thu, 21 Apr 2022 16:15:13 -0400
Subject: Change period to colon

Co-authored-by: Bluenix <bluenixdev@gmail.com>
---
 .../content/resources/guides/pydis-guides/contributing/pull-requests.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md
index a9b6385e..c1ce1bf6 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md
@@ -16,7 +16,7 @@ Before opening a pull request you should have:
 
 ## Opening a Pull Request
 
-Navigate to your fork on GitHub and make sure you're on the branch with your changes. Click on `Contribute` and then `Open pull request`.
+Navigate to your fork on GitHub and make sure you're on the branch with your changes. Click on `Contribute` and then `Open pull request`:
 
 ![Pull Request UI](/static/images/content/contributing/pull_request.png)
 
-- 
cgit v1.2.3


From e09fade2fb9de84180539d58c00a229f8812c9fb Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Thu, 21 Apr 2022 16:22:23 -0400
Subject: Remove redundant newline

---
 .../content/resources/guides/pydis-guides/contributing/pull-requests.md  | 1 -
 1 file changed, 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md
index c1ce1bf6..d193a455 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/pull-requests.md
@@ -6,7 +6,6 @@ description: A guide for opening pull requests.
 As stated in our [Contributing Guidelines](../contributing-guidelines/), do not open a pull request if you aren't assigned to an approved issue. You can check out our [Issues Guide](../issues/) for help with opening an issue or getting assigned to an existing one.
 {: .notification .is-warning }
 
-
 Before opening a pull request you should have:
 
 1. Committed your changes to your local repository
-- 
cgit v1.2.3


From 2e741c3e756e5a0cdf7ea2a061857709d5e828ce Mon Sep 17 00:00:00 2001
From: camcaswell <38672443+camcaswell@users.noreply.github.com>
Date: Thu, 21 Apr 2022 16:28:03 -0400
Subject: Add clarification about poetry console commands

Co-authored-by: Bluenix <bluenixdev@gmail.com>
---
 .../apps/content/resources/guides/pydis-guides/contributing/linting.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/linting.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/linting.md
index 48f1cafc..f6f8a5f2 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/linting.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/linting.md
@@ -11,4 +11,4 @@ If the linter complains, the commit is aborted so that you can fix the linting e
 That way, you never commit the problematic code in the first place!
 
 Please refer to the project-specific documentation to see how to setup and run those tools.
-In most cases, you can install pre-commit using `poetry run task precommit`, and lint using `poetry run task lint`.
+In most cases, you can install pre-commit using `poetry run task precommit`, and lint using `poetry run task lint` in the console.
-- 
cgit v1.2.3


From 55ab3e2f72f79e981ed13bd5788ffe1d85f73b28 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Thu, 21 Apr 2022 16:44:44 -0400
Subject: Remove unneeded indentation

---
 .../resources/guides/pydis-guides/contributing.md  | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index a7701d4f..a3e51440 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -90,44 +90,44 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
   {: .notification }
 
 ### 1. Fork and clone the repo
-  GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to fork the repository to create a copy under your own GitHub account. You'll make your changes to this copy, which can then later be merged into the PyDis repository.
+GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to fork the repository to create a copy under your own GitHub account. You'll make your changes to this copy, which can then later be merged into the PyDis repository.
 
-  Check out our [**guide on forking a GitHub repo**](./forking-repository/).
+Check out our [**guide on forking a GitHub repo**](./forking-repository/).
 
-  Now that you have your own fork you need to be able to make changes to the code. You can clone the repo to your local machine, commit changes to it there, then push those changes to GitHub.
+Now that you have your own fork you need to be able to make changes to the code. You can clone the repo to your local machine, commit changes to it there, then push those changes to GitHub.
 
-  Check out our [**guide on cloning a GitHub repo**](./cloning-repository/).
+Check out our [**guide on cloning a GitHub repo**](./cloning-repository/).
 
 ### 2. Set up the project
-  You have the source code on your local computer, now how do you actually run it? We have detailed guides on setting up the environment for each of our main projects:
+You have the source code on your local computer, now how do you actually run it? We have detailed guides on setting up the environment for each of our main projects:
 
-  * [**Sir Lancebot**](./sir-lancebot/)
+* [**Sir Lancebot**](./sir-lancebot/)
 
-  * [**Python Bot**](./bot/)
+* [**Python Bot**](./bot/)
 
-  * [**Site**](./site/)
+* [**Site**](./site/)
 
 ### 3. Read our Contributing Guidelines
-  We have a few short rules that all contributors must follow. Make sure you read and follow them while working on our projects.
+We have a few short rules that all contributors must follow. Make sure you read and follow them while working on our projects.
 
-  [**Contributing Guidelines**](./contributing-guidelines/).
+[**Contributing Guidelines**](./contributing-guidelines/).
 
-  As mentioned in the Contributing Guidelines, we have a simple style guide for our projects based on PEP 8. Give it a read to keep your code consistent with the rest of the codebase.
+As mentioned in the Contributing Guidelines, we have a simple style guide for our projects based on PEP 8. Give it a read to keep your code consistent with the rest of the codebase.
 
-  [**Style Guide**](./style-guide/)
+[**Style Guide**](./style-guide/)
 
 ### 4. Create an issue
-  The first step to any new contribution is an issue describing a problem with the current codebase or proposing a new feature. All the open issues are viewable on the GitHub repositories, for instance here is the [issues page for Sir Lancebot](https://github.com/python-discord/sir-lancebot/issues). If you have an idea that you want to implement, open a new issue (and check out our [**guide on writing an issue**](./issues/)). Otherwise you can browse the unassigned issues and ask to be assigned to one that you're interested in, either in the comments on the issue or in the[`#dev-contrib`](https://discord.gg/2h3qBv8Xaa)channel on Discord.
+The first step to any new contribution is an issue describing a problem with the current codebase or proposing a new feature. All the open issues are viewable on the GitHub repositories, for instance here is the [issues page for Sir Lancebot](https://github.com/python-discord/sir-lancebot/issues). If you have an idea that you want to implement, open a new issue (and check out our [**guide on writing an issue**](./issues/)). Otherwise you can browse the unassigned issues and ask to be assigned to one that you're interested in, either in the comments on the issue or in the[`#dev-contrib`](https://discord.gg/2h3qBv8Xaa)channel on Discord.
 
-  Don't move forward until your issue is approved by a Core Developer. Issues are not guaranteed to be approved so your work may be wasted.
-  {: .notification .is-warning }
+Don't move forward until your issue is approved by a Core Developer. Issues are not guaranteed to be approved so your work may be wasted.
+{: .notification .is-warning }
 
 ### 5. Open a pull request
-  After your issue has been approved and you've written your code and tested it, it's time to open a pull request. Pull requests are a feature in GitHub; you can think of them as asking the project maintainers to accept your changes. This gives other contributors a chance to review your code and make any needed changes before it's merged into the main branch of the project.
+After your issue has been approved and you've written your code and tested it, it's time to open a pull request. Pull requests are a feature in GitHub; you can think of them as asking the project maintainers to accept your changes. This gives other contributors a chance to review your code and make any needed changes before it's merged into the main branch of the project.
 
-  Check out our [**Pull Request Guide**](./pull-requests/) for help with opening a pull request and going through the review process.
+Check out our [**Pull Request Guide**](./pull-requests/) for help with opening a pull request and going through the review process.
 
-  Check out our [**Code Review Guide**](../code-reviews-primer/) to learn how to be a star reviewer. Reviewing PRs is a vital part of open source development, and we always need more reviewers!
+Check out our [**Code Review Guide**](../code-reviews-primer/) to learn how to be a star reviewer. Reviewing PRs is a vital part of open source development, and we always need more reviewers!
 
 ### That's it!
 Thank you for contributing to our community projects. If there's anything you don't understand or you just want to discuss with other contributors, come visit the[`#dev-contrib`](https://discord.gg/2h3qBv8Xaa)channel to ask questions. Keep an eye out for staff members with the **@PyDis Core Developers** role in the server; we're always happy to help!
-- 
cgit v1.2.3


From ece0657d143a5663a76e658a0975fed478a513e6 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Thu, 21 Apr 2022 17:12:39 -0400
Subject: Add spaces around code snippets

---
 pydis_site/apps/content/resources/guides/pydis-guides/contributing.md | 4 ++--
 .../guides/pydis-guides/contributing/contributing-guidelines.md       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index a3e51440..411ad9d4 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -117,7 +117,7 @@ As mentioned in the Contributing Guidelines, we have a simple style guide for ou
 [**Style Guide**](./style-guide/)
 
 ### 4. Create an issue
-The first step to any new contribution is an issue describing a problem with the current codebase or proposing a new feature. All the open issues are viewable on the GitHub repositories, for instance here is the [issues page for Sir Lancebot](https://github.com/python-discord/sir-lancebot/issues). If you have an idea that you want to implement, open a new issue (and check out our [**guide on writing an issue**](./issues/)). Otherwise you can browse the unassigned issues and ask to be assigned to one that you're interested in, either in the comments on the issue or in the[`#dev-contrib`](https://discord.gg/2h3qBv8Xaa)channel on Discord.
+The first step to any new contribution is an issue describing a problem with the current codebase or proposing a new feature. All the open issues are viewable on the GitHub repositories, for instance here is the [issues page for Sir Lancebot](https://github.com/python-discord/sir-lancebot/issues). If you have an idea that you want to implement, open a new issue (and check out our [**guide on writing an issue**](./issues/)). Otherwise you can browse the unassigned issues and ask to be assigned to one that you're interested in, either in the comments on the issue or in the [`#dev-contrib`](https://discord.gg/2h3qBv8Xaa) channel on Discord.
 
 Don't move forward until your issue is approved by a Core Developer. Issues are not guaranteed to be approved so your work may be wasted.
 {: .notification .is-warning }
@@ -130,4 +130,4 @@ Check out our [**Pull Request Guide**](./pull-requests/) for help with opening a
 Check out our [**Code Review Guide**](../code-reviews-primer/) to learn how to be a star reviewer. Reviewing PRs is a vital part of open source development, and we always need more reviewers!
 
 ### That's it!
-Thank you for contributing to our community projects. If there's anything you don't understand or you just want to discuss with other contributors, come visit the[`#dev-contrib`](https://discord.gg/2h3qBv8Xaa)channel to ask questions. Keep an eye out for staff members with the **@PyDis Core Developers** role in the server; we're always happy to help!
+Thank you for contributing to our community projects. If there's anything you don't understand or you just want to discuss with other contributors, come visit the [`#dev-contrib`](https://discord.gg/2h3qBv8Xaa) channel to ask questions. Keep an eye out for staff members with the **@PyDis Core Developers** role in the server; we're always happy to help!
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md
index b7a22677..73c5dcab 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/contributing-guidelines.md
@@ -24,5 +24,5 @@ We take violations of our Code of Conduct very seriously, and may respond with m
 <br/>
 
 Failing to comply with our guidelines may lead to a rejection of the contribution.
-If you have questions about any of the rules, feel free to ask us in the[`#dev-contrib`](https://discord.gg/2h3qBv8Xaa)channel in our [Discord server](https://discord.gg/python).
+If you have questions about any of the rules, feel free to ask us in the [`#dev-contrib`](https://discord.gg/2h3qBv8Xaa) channel in our [Discord server](https://discord.gg/python).
 {: .notification .is-warning }
-- 
cgit v1.2.3


From 557d839e20abbcc5c5c1bedf6c866abbcd81af8c Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Thu, 21 Apr 2022 17:27:38 -0400
Subject: Removed double space

---
 pydis_site/apps/content/resources/guides/pydis-guides/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index 411ad9d4..33b5f066 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -82,7 +82,7 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
 # How do I start contributing?
   Unsure of what contributing to open source projects involves? Have questions about how to use GitHub? Just need to know about our contribution etiquette? Completing these steps will have you ready to make your first contribution no matter your starting point.
 
-  Feel free to skip any steps you're already familiar with, but please make sure not to miss the  [Contributing Guidelines](#5-read-our-contributing-guidelines).
+  Feel free to skip any steps you're already familiar with, but please make sure not to miss the [Contributing Guidelines](#5-read-our-contributing-guidelines).
 
   If you are here looking for the answer to a specific question, check out the sub-articles in the top right of the page to see a list of our guides.
 
-- 
cgit v1.2.3


From 270a6f21fc94d2465c182a784d85accfd7064d68 Mon Sep 17 00:00:00 2001
From: Diabolical5777 <84365102+Diabolical5777@users.noreply.github.com>
Date: Sat, 23 Apr 2022 23:27:36 +0400
Subject: Migrate discord.py custom help command pin to site (#698)

---
 .../guides/python-guides/discordpy_help_command.md | 66 ++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 pydis_site/apps/content/resources/guides/python-guides/discordpy_help_command.md

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/discordpy_help_command.md b/pydis_site/apps/content/resources/guides/python-guides/discordpy_help_command.md
new file mode 100644
index 00000000..4b475146
--- /dev/null
+++ b/pydis_site/apps/content/resources/guides/python-guides/discordpy_help_command.md
@@ -0,0 +1,66 @@
+---
+title: Custom Help Command
+description: "Overwrite discord.py's help command to implement custom functionality"
+---
+
+First, a basic walkthrough can be found [here](https://gist.github.com/InterStella0/b78488fb28cadf279dfd3164b9f0cf96) by Stella#2000 on subclassing the HelpCommand. It will provide some foundational knowledge that is required before attempting a more customizable help command.
+
+## Custom Subclass of Help Command
+If the types of classes of the HelpCommand do not fit your needs, you can subclass HelpCommand and use the class mehods to customize the output. Below is a simple demonstration using the following methods that can also be found on the documenation:
+
+- [filter_commands](https://discordpy.readthedocs.io/en/stable/ext/commands/api.html#discord.ext.commands.HelpCommand.filter_commands)
+
+- [send_group_help](https://discordpy.readthedocs.io/en/stable/ext/commands/api.html#discord.ext.commands.HelpCommand.send_bot_help)
+
+- [send_command_help](https://discordpy.readthedocs.io/en/stable/ext/commands/api.html#discord.ext.commands.HelpCommand.send_command_help)
+
+- [send_group_help](https://discordpy.readthedocs.io/en/stable/ext/commands/api.html#discord.ext.commands.HelpCommand.send_group_help)
+
+- [send_error_message](https://discordpy.readthedocs.io/en/stable/ext/commands/api.html#discord.ext.commands.HelpCommand.send_error_message)
+
+```python
+class MyHelp(commands.HelpCommand):
+
+    async def send_bot_help(self, mapping):
+        """
+        This is triggered when !help is invoked.
+
+        This example demonstrates how to list the commands that the member invoking the help command can run.
+        """
+        filtered = await self.filter_commands(self.context.bot.commands, sort=True) # returns a list of command objects
+        names = [command.name for command in filtered] # iterating through the commands objects getting names
+        available_commands = "\n".join(names) # joining the list of names by a new line
+        embed  = disnake.Embed(description=available_commands)
+        await self.context.send(embed=embed)
+
+    async def send_command_help(self, command):
+        """This is triggered when !help <command> is invoked."""
+        await self.context.send("This is the help page for a command")
+
+    async def send_group_help(self, group):
+        """This is triggered when !help <group> is invoked."""
+        await self.context.send("This is the help page for a group command")
+
+    async def send_cog_help(self, cog):
+        """This is triggered when !help <cog> is invoked."""
+        await self.context.send("This is the help page for a cog")
+
+    async def send_error_message(self, error):
+        """If there is an error, send a embed containing the error."""
+        channel = self.get_destination() # this defaults to the command context channel
+        await channel.send(error)
+
+bot.help_command = MyHelp()
+```
+
+You can handle when a user does not pass a command name when invoking the help command and make a fancy and customized embed; here a page that describes the bot and shows a list of commands is generally used. However if a command is passed in, you can display detailed information of the command. Below are references from the documentation below that can be utilised:
+
+- [Get the command object](https://discordpy.readthedocs.io/en/latest/ext/commands/api.html#discord.ext.commands.Bot.get_command)
+
+- [Get the command name](https://discordpy.readthedocs.io/en/latest/ext/commands/api.html#discord.ext.commands.Command.name)
+
+- [Get the command aliases](https://discordpy.readthedocs.io/en/latest/ext/commands/api.html#discord.ext.commands.Command.aliases)
+
+- [Get the command brief](https://discordpy.readthedocs.io/en/latest/ext/commands/api.html#discord.ext.commands.Command.brief)
+
+- [Get the command usage](https://discordpy.readthedocs.io/en/latest/ext/commands/api.html#discord.ext.commands.Command.usage)
-- 
cgit v1.2.3


From ed7886a6a420be27082e1a0babe83fa883dde998 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 24 Apr 2022 14:58:46 -0400
Subject: Pydis -> Python Discord

---
 pydis_site/apps/content/resources/guides/pydis-guides/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index 33b5f066..03e5fe18 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -90,7 +90,7 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
   {: .notification }
 
 ### 1. Fork and clone the repo
-GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to fork the repository to create a copy under your own GitHub account. You'll make your changes to this copy, which can then later be merged into the PyDis repository.
+GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to fork the repository to create a copy under your own GitHub account. You'll make your changes to this copy, which can then later be merged into the Python Discord repository.
 
 Check out our [**guide on forking a GitHub repo**](./forking-repository/).
 
-- 
cgit v1.2.3


From 32cf915246fbec5d3dc792d717b50af635108ca3 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 24 Apr 2022 15:04:22 -0400
Subject: Make it clearer what forking is

---
 pydis_site/apps/content/resources/guides/pydis-guides/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index 03e5fe18..603e81ad 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -90,7 +90,7 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
   {: .notification }
 
 ### 1. Fork and clone the repo
-GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to fork the repository to create a copy under your own GitHub account. You'll make your changes to this copy, which can then later be merged into the Python Discord repository.
+GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to create a copy of the repository under your own GitHub account, aka "fork" it. You'll make your changes to this copy, which can then later be merged into the Python Discord repository.
 
 Check out our [**guide on forking a GitHub repo**](./forking-repository/).
 
-- 
cgit v1.2.3


From 8edb7f95b75b144c21fded1c723605d0cfa84ff8 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 24 Apr 2022 15:05:19 -0400
Subject: Annihilate some indent holdouts

---
 .../apps/content/resources/guides/pydis-guides/contributing.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index 603e81ad..fa829c9f 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -80,14 +80,14 @@ Our projects on Python Discord are open source and [available on GitHub](https:/
 </div>
 
 # How do I start contributing?
-  Unsure of what contributing to open source projects involves? Have questions about how to use GitHub? Just need to know about our contribution etiquette? Completing these steps will have you ready to make your first contribution no matter your starting point.
+Unsure of what contributing to open source projects involves? Have questions about how to use GitHub? Just need to know about our contribution etiquette? Completing these steps will have you ready to make your first contribution no matter your starting point.
 
-  Feel free to skip any steps you're already familiar with, but please make sure not to miss the [Contributing Guidelines](#5-read-our-contributing-guidelines).
+Feel free to skip any steps you're already familiar with, but please make sure not to miss the [Contributing Guidelines](#5-read-our-contributing-guidelines).
 
-  If you are here looking for the answer to a specific question, check out the sub-articles in the top right of the page to see a list of our guides.
+If you are here looking for the answer to a specific question, check out the sub-articles in the top right of the page to see a list of our guides.
 
-  **Note:** We use Git to keep track of changes to the files in our projects. Git allows you to make changes to your local code and then distribute those changes to the other people working on the project. You'll use Git in a couple steps of the contributing process. You can refer to this [**guide on using Git**](./working-with-git/).
-  {: .notification }
+**Note:** We use Git to keep track of changes to the files in our projects. Git allows you to make changes to your local code and then distribute those changes to the other people working on the project. You'll use Git in a couple steps of the contributing process. You can refer to this [**guide on using Git**](./working-with-git/).
+{: .notification }
 
 ### 1. Fork and clone the repo
 GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to create a copy of the repository under your own GitHub account, aka "fork" it. You'll make your changes to this copy, which can then later be merged into the Python Discord repository.
-- 
cgit v1.2.3


From d4150fdf04b3712655239a4fd77ee066f0920eda Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 24 Apr 2022 15:13:28 -0400
Subject: Move link to issue guide to match others

---
 pydis_site/apps/content/resources/guides/pydis-guides/contributing.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index fa829c9f..e19e2cea 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -117,7 +117,9 @@ As mentioned in the Contributing Guidelines, we have a simple style guide for ou
 [**Style Guide**](./style-guide/)
 
 ### 4. Create an issue
-The first step to any new contribution is an issue describing a problem with the current codebase or proposing a new feature. All the open issues are viewable on the GitHub repositories, for instance here is the [issues page for Sir Lancebot](https://github.com/python-discord/sir-lancebot/issues). If you have an idea that you want to implement, open a new issue (and check out our [**guide on writing an issue**](./issues/)). Otherwise you can browse the unassigned issues and ask to be assigned to one that you're interested in, either in the comments on the issue or in the [`#dev-contrib`](https://discord.gg/2h3qBv8Xaa) channel on Discord.
+The first step to any new contribution is an issue describing a problem with the current codebase or proposing a new feature. All the open issues are viewable on the GitHub repositories, for instance here is the [issues page for Sir Lancebot](https://github.com/python-discord/sir-lancebot/issues). If you have something that you want to implement open a new issue to present your idea. Otherwise you can browse the unassigned issues and ask to be assigned to one that you're interested in, either in the comments on the issue or in the [`#dev-contrib`](https://discord.gg/2h3qBv8Xaa) channel on Discord.
+
+[**How to write a good issue**](./issues/)
 
 Don't move forward until your issue is approved by a Core Developer. Issues are not guaranteed to be approved so your work may be wasted.
 {: .notification .is-warning }
-- 
cgit v1.2.3


From 371a5b7650b4fbea1ff30e0afd63563882f33b3f Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 24 Apr 2022 15:14:08 -0400
Subject: Revert "Make it clearer what forking is"

This reverts commit 32cf915246fbec5d3dc792d717b50af635108ca3.
---
 pydis_site/apps/content/resources/guides/pydis-guides/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index e19e2cea..db466029 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -90,7 +90,7 @@ If you are here looking for the answer to a specific question, check out the sub
 {: .notification }
 
 ### 1. Fork and clone the repo
-GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to create a copy of the repository under your own GitHub account, aka "fork" it. You'll make your changes to this copy, which can then later be merged into the Python Discord repository.
+GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to fork the repository to create a copy under your own GitHub account. You'll make your changes to this copy, which can then later be merged into the Python Discord repository.
 
 Check out our [**guide on forking a GitHub repo**](./forking-repository/).
 
-- 
cgit v1.2.3


From d75612d9431c330481a16d61d43aaefea733eb8f Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 24 Apr 2022 15:15:59 -0400
Subject: Make it more clear what forking is

---
 pydis_site/apps/content/resources/guides/pydis-guides/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index db466029..bed2ffa1 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -90,7 +90,7 @@ If you are here looking for the answer to a specific question, check out the sub
 {: .notification }
 
 ### 1. Fork and clone the repo
-GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to fork the repository to create a copy under your own GitHub account. You'll make your changes to this copy, which can then later be merged into the Python Discord repository.
+GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to create a copy under your own GitHub account, a.k.a. "fork" it. You'll make your changes to this copy, which can then later be merged into the Python Discord repository.
 
 Check out our [**guide on forking a GitHub repo**](./forking-repository/).
 
-- 
cgit v1.2.3


From fa1dd4058e8606f165df5ff7902d9215eeec4679 Mon Sep 17 00:00:00 2001
From: Krypton <root@krypton.ninja>
Date: Thu, 28 Apr 2022 19:00:06 +0200
Subject: Using static images

---
 .../python-guides/discord-messages-with-colors.md       |   8 ++++----
 .../content/discord_colored_messages/ansi-colors.png    | Bin 0 -> 33579 bytes
 .../images/content/discord_colored_messages/result.png  | Bin 0 -> 13740 bytes
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 pydis_site/static/images/content/discord_colored_messages/ansi-colors.png
 create mode 100644 pydis_site/static/images/content/discord_colored_messages/result.png

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
index c8e50d71..6845ce76 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
@@ -48,17 +48,17 @@ I simply use `\u001b[0;40m` (background color) and `\u001b[1;32m` (text color) a
 Alternatively you can also directly combine them into a single prefix like the following: `\u001b[1;40;32m` and you can also use multiple values. Something like `\u001b[1;40;4;32m` would underline the text, make it bold, make it green and have a dark blue background.
 
 Raw message:<br>
-\`\`\`ansi<br>
+\`\`\`ansi
 \u001b[0;40m\u001b[1;32mThat's some cool formatted text right?<br>
-or<br>
+or
 \u001b[1;40;32mThat's some cool formatted text right?<br>
 \`\`\`
 
 Result:
 
-![Background and text color](https://media.discordapp.net/attachments/739937507768270939/930460020603224084/Background-Text-Color.png)
+![Background and text color result](/static/images/content/discord_colored_messages/result.png)
 
 The way the colors look like on Discord is shown in the image below:
-![ANSI Colors](https://media.discordapp.net/attachments/739937507768270939/930825555803263016/ANSI-Colors.png)
+![ANSI Colors](/static/images/content/discord_colored_messages/ansi-colors.png)
 
 Note: If the change as not been brought to you yet, or other users, then you can use other code blocks in the meantime to get colored text. See this gist: <https://gist.github.com/matthewzring/9f7bbfd102003963f9be7dbcf7d40e51>
diff --git a/pydis_site/static/images/content/discord_colored_messages/ansi-colors.png b/pydis_site/static/images/content/discord_colored_messages/ansi-colors.png
new file mode 100644
index 00000000..32af146f
Binary files /dev/null and b/pydis_site/static/images/content/discord_colored_messages/ansi-colors.png differ
diff --git a/pydis_site/static/images/content/discord_colored_messages/result.png b/pydis_site/static/images/content/discord_colored_messages/result.png
new file mode 100644
index 00000000..a666804e
Binary files /dev/null and b/pydis_site/static/images/content/discord_colored_messages/result.png differ
-- 
cgit v1.2.3


From e3067dc451a3a5da02a90d61791c1c7c5731cab0 Mon Sep 17 00:00:00 2001
From: Krypton <root@krypton.ninja>
Date: Thu, 28 Apr 2022 19:17:00 +0200
Subject: Removed `<br>`'s and used code block for raw message

---
 .../python-guides/discord-messages-with-colors.md   |  15 +++++++++------
 .../discord_colored_messages/ansi-colors.png        | Bin 33579 -> 43004 bytes
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
index 6845ce76..9a69973e 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
@@ -44,15 +44,18 @@ Here is the list of values you can use to replace `{color}`:
 * 47: White
 
 Let's take an example, I want a bold green colored text with the very dark blue background.
-I simply use `\u001b[0;40m` (background color) and `\u001b[1;32m` (text color) as prefix. Note that the order is **important**, first you give the background color and then the text color.<br>
+I simply use `\u001b[0;40m` (background color) and `\u001b[1;32m` (text color) as prefix. Note that the order is **important**, first you give the background color and then the text color.
+
 Alternatively you can also directly combine them into a single prefix like the following: `\u001b[1;40;32m` and you can also use multiple values. Something like `\u001b[1;40;4;32m` would underline the text, make it bold, make it green and have a dark blue background.
 
-Raw message:<br>
-\`\`\`ansi
-\u001b[0;40m\u001b[1;32mThat's some cool formatted text right?<br>
+Raw message:
+````nohighlight
+```ansi
+\u001b[0;40m\u001b[1;32mThat's some cool formatted text right?
 or
-\u001b[1;40;32mThat's some cool formatted text right?<br>
-\`\`\`
+\u001b[1;40;32mThat's some cool formatted text right?
+```
+````
 
 Result:
 
diff --git a/pydis_site/static/images/content/discord_colored_messages/ansi-colors.png b/pydis_site/static/images/content/discord_colored_messages/ansi-colors.png
index 32af146f..d7176393 100644
Binary files a/pydis_site/static/images/content/discord_colored_messages/ansi-colors.png and b/pydis_site/static/images/content/discord_colored_messages/ansi-colors.png differ
-- 
cgit v1.2.3


From 5202bcda5d79f203a67b59990f0ed3d6c87044b2 Mon Sep 17 00:00:00 2001
From: Krypton <root@krypton.ninja>
Date: Thu, 28 Apr 2022 19:34:41 +0200
Subject: Sentences check

---
 .../resources/guides/python-guides/discord-messages-with-colors.md      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
index 9a69973e..f4a747c9 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
@@ -11,7 +11,7 @@ To send colored text in a code block you need to first specify the `ansi` langua
 ```
 *`\u001b` is the unicode escape for ESCAPE/ESC, meant to be used in the source of your bot (see <http://www.unicode-symbol.com/u/001B.html>).* ***If you wish to send colored text without using your bot you need to copy the character from the website.***
 
-After you've written this, you can type and text you wish, and if you want to reset the color back to normal, then you need to use `\u001b[0m` as prefix.
+After you've written this, you can now type the text you wish to color. If you want to reset the color back to normal, then you need to use the `\u001b[0m` prefix again.
 
 Here is the list of values you can use to replace `{format}`:
 
-- 
cgit v1.2.3


From 8f433372ce889b9a61355ca64a23ca11417d920f Mon Sep 17 00:00:00 2001
From: Krypton <root@krypton.ninja>
Date: Thu, 28 Apr 2022 19:37:42 +0200
Subject: Fixed image not at new line

---
 .../resources/guides/python-guides/discord-messages-with-colors.md       | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
index f4a747c9..e414ff39 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
@@ -62,6 +62,7 @@ Result:
 ![Background and text color result](/static/images/content/discord_colored_messages/result.png)
 
 The way the colors look like on Discord is shown in the image below:
+
 ![ANSI Colors](/static/images/content/discord_colored_messages/ansi-colors.png)
 
 Note: If the change as not been brought to you yet, or other users, then you can use other code blocks in the meantime to get colored text. See this gist: <https://gist.github.com/matthewzring/9f7bbfd102003963f9be7dbcf7d40e51>
-- 
cgit v1.2.3


From d25d4ed61c6cb4b8ee310e1647ab91fdd8fe83be Mon Sep 17 00:00:00 2001
From: Xithrius <15021300+Xithrius@users.noreply.github.com>
Date: Thu, 28 Apr 2022 11:19:05 -0700
Subject: Don't do JSON as a database, kids. (#700)

Migrate no-JSON-as-a-database pinned message to site
---
 .../python-guides/why-not-json-as-database.md      | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pydis_site/apps/content/resources/guides/python-guides/why-not-json-as-database.md

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/why-not-json-as-database.md b/pydis_site/apps/content/resources/guides/python-guides/why-not-json-as-database.md
new file mode 100644
index 00000000..ae34c2b4
--- /dev/null
+++ b/pydis_site/apps/content/resources/guides/python-guides/why-not-json-as-database.md
@@ -0,0 +1,28 @@
+---
+title: Why JSON is unsuitable as a database
+description: The many reasons why you shouldn't use JSON as a database, and instead opt for SQL.
+relevant_links:
+    Tips on Storing Data: https://tutorial.vcokltfre.dev/tips/storage/
+---
+
+JSON, quite simply, is not a database. It's not designed to be a data storage format,
+rather a wayof transmitting data over a network. It's also often used as a way of doing configuration files for programs.
+
+There is no redundancy built in to JSON. JSON is just a format, and Python has libraries for it
+like json and ujson that let you load and dump it, sometimes to files, but that's all it does, write data to a file.
+There is no sort of DBMS (Database Management System), which means no sort of sophistication in how the data is stored,
+or built in ways to keep it safe and backed up, there's no built in encryption either - bear in mind
+in larger applications encryption may be necessary for GDPR/relevant data protection regulations compliance.
+
+JSON, unlike relational databases, has no way to store relational data,
+which is a very commonly needed way of storing data.
+Relational data, as the name may suggest, is data that relates to other data.
+For example if you have a table of users and a table of servers, the server table will probably have an owner field,
+where you'd reference a user from the users table. (**This is only relevant for relational data**).
+
+JSON is primarily a KV (key-value) format, for example `{"a": "b"}` where `a` is the key and `b` is the value,
+but what if you want to search not by that key but by a sub-key? Well, instead of being able to quickly use `var[key]`,
+which in a Python dictionary has a constant return time (for more info look up hash tables),
+you now have to iterate through every object in the dictionary and compare to find what you're looking for.
+Most relational database systems, like MySQL, MariaDB, and PostgreSQL have ways of indexing secondary fields
+apart from the primary key so that you can easily search by multiple attributes.
-- 
cgit v1.2.3


From ad41d8d2a58b73bd4402f945f0ae8fcc7b49bda4 Mon Sep 17 00:00:00 2001
From: Krypton <root@krypton.ninja>
Date: Thu, 28 Apr 2022 22:20:52 +0200
Subject: Using hyperlink for gist link at the bottom

---
 .../resources/guides/python-guides/discord-messages-with-colors.md      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
index e414ff39..62ff61f9 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/discord-messages-with-colors.md
@@ -65,4 +65,4 @@ The way the colors look like on Discord is shown in the image below:
 
 ![ANSI Colors](/static/images/content/discord_colored_messages/ansi-colors.png)
 
-Note: If the change as not been brought to you yet, or other users, then you can use other code blocks in the meantime to get colored text. See this gist: <https://gist.github.com/matthewzring/9f7bbfd102003963f9be7dbcf7d40e51>
+Note: If the change as not been brought to you yet, or other users, then you can use other code blocks in the meantime to get colored text. See **[this gist](https://gist.github.com/matthewzring/9f7bbfd102003963f9be7dbcf7d40e51)**.
-- 
cgit v1.2.3


From ebdba4488b7def58614dc221215a2430d6df6ecf Mon Sep 17 00:00:00 2001
From: Diabolical5777 <84365102+Diabolical5777@users.noreply.github.com>
Date: Wed, 4 May 2022 20:00:15 +0400
Subject: Add recommended hosting service page (#712)

* add article discussing free hosting services

* add hsoting and VPS services article

* Merge branch 'pinned_messages' of https://github.com/Diabolical5777/site into pinned_messages

* Delete free_hosting_services.md

* Update pydis_site/apps/content/resources/guides/python-guides/vps_services.md

Co-authored-by: Bluenix <bluenixdev@gmail.com>

* Update pydis_site/apps/content/resources/guides/python-guides/vps_services.md

Co-authored-by: Bluenix <bluenixdev@gmail.com>

* Update pydis_site/apps/content/resources/guides/python-guides/vps_services.md

Co-authored-by: Bluenix <bluenixdev@gmail.com>

* add vps and hosting service guide

* Update pydis_site/apps/content/resources/guides/python-guides/vps_services.md

Co-authored-by: Bluenix <bluenixdev@gmail.com>

* add article on VPS and free hosting services

* Update vps_services.md

* Update vps_services.md

Co-authored-by: Bluenix <bluenixdev@gmail.com>
Co-authored-by: ChrisJL <ChrisLovering@users.noreply.github.com>
---
 .../resources/guides/python-guides/vps_services.md | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 pydis_site/apps/content/resources/guides/python-guides/vps_services.md

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/vps_services.md b/pydis_site/apps/content/resources/guides/python-guides/vps_services.md
new file mode 100644
index 00000000..710fd914
--- /dev/null
+++ b/pydis_site/apps/content/resources/guides/python-guides/vps_services.md
@@ -0,0 +1,58 @@
+---
+title: VPS and Free Hosting Service for Discord bots
+description: This article lists recommended VPS services and covers the disasdvantages of utilising a free hosting service to run a discord bot.
+toc: 2
+---
+
+## Recommended VPS services
+
+If you need to run your bot 24/7 (with no downtime), you should consider using a virtual private server (VPS). Here is a list of VPS services that are sufficient for running Discord bots.
+
+* Europe
+    * [netcup](https://www.netcup.eu/)
+        * Germany & Austria data centres.
+        * Great affiliate program.
+    * [Yandex Cloud](https://cloud.yandex.ru/)
+        * Vladimir, Ryazan, and Moscow region data centres.
+    * [Scaleway](https://www.scaleway.com/)
+        * France data centre.
+    * [Time 4 VPS](https://www.time4vps.eu/)
+        * Lithuania data centre.
+* US
+    * [GalaxyGate](https://galaxygate.net/)
+        * New York data centre.
+        * Great affiliate program.
+* Global
+    * [Linode](https://www.linode.com/)
+    * [Digital Ocean](https://www.digitalocean.com/)
+    * [OVHcloud](https://www.ovhcloud.com/)
+    * [Vultr](https://www.vultr.com/)
+
+
+## Why not to use free hosting services for bots?
+While these may seem like nice and free services, it has a lot more caveats than you may think. For example, the drawbacks of using common free hosting services to host a discord bot are discussed below.
+
+### Replit
+
+- The machines are super underpowered, resulting in your bot lagging a lot as it gets bigger.
+
+- You need to run a webserver alongside your bot to prevent it from being shut off. This uses extra machine power.
+
+- Repl.it uses an ephemeral file system. This means any file you saved through your bot will be overwritten when you next launch.
+
+- They use a shared IP for everything running on the service.
+This one is important - if someone is running a user bot on their service and gets banned, everyone on that IP will be banned. Including you.
+
+### Heroku
+- Bots are not what the platform is designed for. Heroku is designed to provide web servers (like Django, Flask, etc). This is why they give you a domain name and open a port on their local emulator.
+
+- Heroku's environment is heavily containerized, making it significantly underpowered for a standard use case.
+
+- Heroku's environment is volatile. In order to handle the insane amount of users trying to use it for their own applications, Heroku will dispose your environment every time your application dies unless you pay.
+
+- Heroku has minimal system dependency control. If any of your Python requirements need C bindings (such as PyNaCl
+  binding to libsodium, or lxml binding to libxml), they are unlikely to function properly, if at all, in a native
+  environment. As such, you often need to resort to adding third-party buildpacks to facilitate otherwise normal
+  CPython extension functionality. (This is the reason why voice doesn't work natively on heroku)
+
+- Heroku only offers a limited amount of time on their free programme for your applications. If you exceed this limit, which you probably will, they'll shut down your application until your free credit resets.
-- 
cgit v1.2.3


From 56648f34bb48b40668a4ae48f4117fcbaaadea23 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sat, 7 May 2022 21:52:57 -0400
Subject: Add 'Next steps' section to ends of the setup guides

---
 .../resources/guides/pydis-guides/contributing/bot.md        | 12 ++++++++----
 .../guides/pydis-guides/contributing/sir-lancebot.md         |  6 ++++++
 .../resources/guides/pydis-guides/contributing/site.md       |  9 +++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
index 0f783ef6..e98db596 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
@@ -543,10 +543,7 @@ Now that you have everything setup, it is finally time to make changes to the bo
 
 #### Working with Git
 
-If you have not yet [read the contributing guidelines](../contributing-guidelines), now is a good time.
-Contributions that do not adhere to the guidelines may be rejected.
-
-Notably, version control of our projects is done using Git and Github.
+Version control of our projects is done using Git and Github.
 It can be intimidating at first, so feel free to ask for any help in the server.
 
 [**Click here to see the basic Git workflow when contributing to one of our projects.**](../working-with-git/)
@@ -637,4 +634,11 @@ The following is a list of all available environment variables used by the bot:
 | `METABASE_USERNAME` | When you wish to interact with Metabase | The username for a Metabase admin account.
 | `METABASE_PASSWORD` | When you wish to interact with Metabase | The password for a Metabase admin account.
 
+---
+
+# Next steps
+Now that you have everything setup, it is finally time to make changes to the bot! If you have not yet read the [contributing guidelines](../contributing-guidelines.md), now is a good time. Contributions that do not adhere to the guidelines may be rejected.
+
+If you're not sure where to go from here, our [detailed walkthrough](../#2-set-up-the-project) is for you.
+
 Have fun!
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
index 1621abb6..f5f1ae4c 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
@@ -110,5 +110,11 @@ After installing project dependencies use the poetry command `poetry run task st
 ```shell
 $ poetry run task start
 ```
+---
+
+# Next steps
+Now that you have everything setup, it is finally time to make changes to the bot! If you have not yet read the [contributing guidelines](../contributing-guidelines.md), now is a good time. Contributions that do not adhere to the guidelines may be rejected.
+
+If you're not sure where to go from here, our [detailed walkthrough](../#2-set-up-the-project) is for you.
 
 Have fun!
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md
index 7eda027a..00115516 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md
@@ -166,3 +166,12 @@ The website is configured through the following environment variables:
 - **`STATIC_ROOT`**: The root in which `python manage.py collectstatic`
   collects static files. Optional, defaults to `/app/staticfiles` for the
   standard Docker deployment.
+
+---
+
+# Next steps
+Now that you have everything setup, it is finally time to make changes to the site! If you have not yet read the [contributing guidelines](../contributing-guidelines.md), now is a good time. Contributions that do not adhere to the guidelines may be rejected.
+
+If you're not sure where to go from here, our [detailed walkthrough](../#2-set-up-the-project) is for you.
+
+Have fun!
-- 
cgit v1.2.3


From 2b45c6c0b13b1183051659b7ea3660b1d6efc90b Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sat, 7 May 2022 22:57:24 -0400
Subject: Add reminders at tops of set-up guides to fork and clone

---
 .../resources/guides/pydis-guides/contributing/bot.md        |  2 ++
 .../guides/pydis-guides/contributing/sir-lancebot.md         | 12 +++++++-----
 .../resources/guides/pydis-guides/contributing/site.md       |  7 ++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
index e98db596..ad446cc8 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
@@ -5,6 +5,8 @@ icon: fab fa-github
 toc: 3
 ---
 The purpose of this guide is to get you a running local version of [the Python bot](https://github.com/python-discord/bot).
+You should have already forked the repository and cloned it to your local machine. If not, check out our [detailed walkthrough](../#1-fork-and-clone-the-repo).
+
 This page will focus on the quickest steps one can take, with mentions of alternatives afterwards.
 
 ---
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
index f5f1ae4c..c9566d23 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
@@ -5,10 +5,11 @@ icon: fab fa-github
 toc: 1
 ---
 
-> Before contributing, please ensure you read the [contributing guidelines](../contributing-guidelines) in full.
+You should have already forked the [`sir-lancebot`](https://github.com/python-discord/sir-lancebot) repository and cloned it to your local machine. If not, check out our [detailed walkthrough](../#1-fork-and-clone-the-repo).
 
----
-# Requirements
+Remember to ensure that you have read the [contributing guidelines](../contributing-guidelines) in full before you start contributing.
+
+### Requirements
 - [Python 3.9](https://www.python.org/downloads/)
 - [Poetry](https://github.com/python-poetry/poetry#installation)
 - [Git](https://git-scm.com/downloads)
@@ -16,6 +17,8 @@ toc: 1
     - [MacOS Installer](https://git-scm.com/download/mac) or `brew install git`
     - [Linux](https://git-scm.com/download/linux)
 
+---
+
 ## Using Gitpod
 Sir Lancebot can be edited and tested on Gitpod. Gitpod will automatically install the correct dependencies and Python version, so you can get straight to coding.
 
@@ -42,8 +45,7 @@ The requirements for Docker are:
 
 ---
 # Development Environment
-1. Once you have your fork, you will need to [**clone the repository to your computer**](../cloning-repository).
-2. After cloning, proceed to [**install the project's dependencies**](../installing-project-dependencies). (This is not required if using Docker)
+If you aren't using Docker, you will need to [install the project's dependencies](../installing-project-dependencies) yourself.
 
 ---
 # Test Server and Bot Account
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md
index 00115516..520e41ad 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md
@@ -5,7 +5,9 @@ icon: fab fa-github
 toc: 1
 ---
 
-# Requirements
+You should have already forked the [`site`](https://github.com/python-discord/site) repository and cloned it to your local machine. If not, check out our [detailed walkthrough](../#1-fork-and-clone-the-repo).
+
+### Requirements
 
 - [Python 3.9](https://www.python.org/downloads/)
 - [Poetry](https://python-poetry.org/docs/#installation)
@@ -29,8 +31,7 @@ Without Docker:
 ---
 # Development environment
 
-1. [Clone your fork to a local project directory](../cloning-repository/)
-2. [Install the project's dependencies](../installing-project-dependencies/)
+[Install the project's dependencies](../installing-project-dependencies/)
 
 ## Without Docker
 
-- 
cgit v1.2.3


From 0cce77e26b19949ed14da740f3bb9ed843af4255 Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 8 May 2022 12:06:26 -0400
Subject: Add note that staff members can create feature branches

---
 pydis_site/apps/content/resources/guides/pydis-guides/contributing.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index bed2ffa1..d67a827f 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -92,6 +92,8 @@ If you are here looking for the answer to a specific question, check out the sub
 ### 1. Fork and clone the repo
 GitHub is a website based on Git that stores project files in the cloud. We use GitHub as a central place for sending changes, reviewing others' changes, and communicating with each other. You'll need to create a copy under your own GitHub account, a.k.a. "fork" it. You'll make your changes to this copy, which can then later be merged into the Python Discord repository.
 
+*Note: Members of the Python Discord staff can create feature branches directly on the repo without forking it.*
+
 Check out our [**guide on forking a GitHub repo**](./forking-repository/).
 
 Now that you have your own fork you need to be able to make changes to the code. You can clone the repo to your local machine, commit changes to it there, then push those changes to GitHub.
-- 
cgit v1.2.3


From 2470557cb6f4ce9eb10bdf1759f67b03e1506b6e Mon Sep 17 00:00:00 2001
From: Cam Caswell <camcaswell@gmail.com>
Date: Sun, 8 May 2022 12:33:59 -0400
Subject: Add Making Changes step

---
 .../apps/content/resources/guides/pydis-guides/contributing.md     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'pydis_site/apps/content')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index d67a827f..6231fe87 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -126,7 +126,12 @@ The first step to any new contribution is an issue describing a problem with the
 Don't move forward until your issue is approved by a Core Developer. Issues are not guaranteed to be approved so your work may be wasted.
 {: .notification .is-warning }
 
-### 5. Open a pull request
+### 5. Make changes
+Now it is time to make the changes to fulfill your approved issue. You should create a new Git branch for your feature; that way you can keep your main branch up to date with ours and even work on multiple features at once in separate branches.
+
+This is a good time to review [how to write good commit messages](./contributing-guidelines/commit-messages) if you haven't already.
+
+### 6. Open a pull request
 After your issue has been approved and you've written your code and tested it, it's time to open a pull request. Pull requests are a feature in GitHub; you can think of them as asking the project maintainers to accept your changes. This gives other contributors a chance to review your code and make any needed changes before it's merged into the main branch of the project.
 
 Check out our [**Pull Request Guide**](./pull-requests/) for help with opening a pull request and going through the review process.
-- 
cgit v1.2.3


From 36a461b57c5b901fb5cfb81966bac3f0387fd590 Mon Sep 17 00:00:00 2001
From: Hassan Abouelela <hassan@hassanamr.com>
Date: Mon, 11 Jul 2022 05:05:51 +0400
Subject: Bump flake8-bandit To v3

Bumps flake-bandit to v3 to fix an incompatibility with the bandit
package.

This also bumps flake8-annotations to a legally acceptable version,
which introduces ANN401, which disallows `typing.Any` annotations (for
the most part, refer to the docs).

Signed-off-by: Hassan Abouelela <hassan@hassanamr.com>
---
 poetry.lock                                    | 271 +++++++++++--------------
 pydis_site/apps/api/pagination.py              |   5 +-
 pydis_site/apps/content/views/page_category.py |   4 +-
 pyproject.toml                                 |   2 +-
 4 files changed, 120 insertions(+), 162 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/poetry.lock b/poetry.lock
index fcdc9d84..826c4fca 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -17,7 +17,7 @@ trio = ["trio (>=0.16)"]
 
 [[package]]
 name = "asgiref"
-version = "3.5.0"
+version = "3.5.2"
 description = "ASGI specs, helper code, and adapters"
 category = "main"
 optional = false
@@ -42,7 +42,7 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>
 
 [[package]]
 name = "bandit"
-version = "1.7.2"
+version = "1.7.4"
 description = "Security oriented static analyser for python code."
 category = "dev"
 optional = false
@@ -55,17 +55,17 @@ PyYAML = ">=5.3.1"
 stevedore = ">=1.20.0"
 
 [package.extras]
-test = ["beautifulsoup4 (>=4.8.0)", "coverage (>=4.5.4)", "fixtures (>=3.0.0)", "flake8 (>=4.0.0)", "pylint (==1.9.4)", "stestr (>=2.5.0)", "testscenarios (>=0.5.0)", "testtools (>=2.3.0)", "toml"]
+test = ["coverage (>=4.5.4)", "fixtures (>=3.0.0)", "flake8 (>=4.0.0)", "stestr (>=2.5.0)", "testscenarios (>=0.5.0)", "testtools (>=2.3.0)", "toml", "beautifulsoup4 (>=4.8.0)", "pylint (==1.9.4)"]
 toml = ["toml"]
 yaml = ["pyyaml"]
 
 [[package]]
 name = "certifi"
-version = "2021.10.8"
+version = "2022.6.15"
 description = "Python package for providing Mozilla's CA Bundle."
 category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=3.6"
 
 [[package]]
 name = "cfgv"
@@ -77,18 +77,18 @@ python-versions = ">=3.6.1"
 
 [[package]]
 name = "charset-normalizer"
-version = "2.0.11"
+version = "2.1.0"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 category = "main"
 optional = false
-python-versions = ">=3.5.0"
+python-versions = ">=3.6.0"
 
 [package.extras]
 unicode_backport = ["unicodedata2"]
 
 [[package]]
 name = "colorama"
-version = "0.4.4"
+version = "0.4.5"
 description = "Cross-platform colored terminal text."
 category = "dev"
 optional = false
@@ -190,7 +190,7 @@ prometheus-client = ">=0.7"
 
 [[package]]
 name = "django-simple-bulma"
-version = "2.4.0"
+version = "2.5.0"
 description = "Django application to add the Bulma CSS framework and its extensions"
 category = "main"
 optional = false
@@ -224,7 +224,7 @@ python-versions = "*"
 
 [[package]]
 name = "filelock"
-version = "3.4.2"
+version = "3.7.1"
 description = "A platform independent file lock."
 category = "dev"
 optional = false
@@ -249,25 +249,26 @@ pyflakes = ">=2.3.0,<2.4.0"
 
 [[package]]
 name = "flake8-annotations"
-version = "2.7.0"
+version = "2.9.0"
 description = "Flake8 Type Annotation Checks"
 category = "dev"
 optional = false
-python-versions = ">=3.6.2,<4.0.0"
+python-versions = ">=3.7,<4.0"
 
 [package.dependencies]
-flake8 = ">=3.7,<5.0"
+attrs = ">=21.4,<22.0"
+flake8 = ">=3.7"
 
 [[package]]
 name = "flake8-bandit"
-version = "2.1.2"
+version = "3.0.0"
 description = "Automated security testing with bandit and flake8."
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.6"
 
 [package.dependencies]
-bandit = "*"
+bandit = ">=1.7.3"
 flake8 = "*"
 flake8-polyfill = "*"
 pycodestyle = "*"
@@ -334,7 +335,7 @@ flake8 = "*"
 
 [[package]]
 name = "flake8-tidy-imports"
-version = "4.6.0"
+version = "4.8.0"
 description = "A flake8 plugin that helps you write tidier imports."
 category = "dev"
 optional = false
@@ -367,7 +368,7 @@ smmap = ">=3.0.1,<6"
 
 [[package]]
 name = "gitpython"
-version = "3.1.26"
+version = "3.1.27"
 description = "GitPython is a python library used to interact with Git repositories"
 category = "dev"
 optional = false
@@ -438,7 +439,7 @@ socks = ["socksio (>=1.0.0,<2.0.0)"]
 
 [[package]]
 name = "identify"
-version = "2.4.6"
+version = "2.5.1"
 description = "File identification library for Python"
 category = "dev"
 optional = false
@@ -457,7 +458,7 @@ python-versions = ">=3.5"
 
 [[package]]
 name = "importlib-metadata"
-version = "4.10.1"
+version = "4.12.0"
 description = "Read metadata from Python packages"
 category = "main"
 optional = false
@@ -467,9 +468,9 @@ python-versions = ">=3.7"
 zipp = ">=0.5"
 
 [package.extras]
-docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
+docs = ["sphinx", "jaraco.packaging (>=9)", "rst.linker (>=1.9)"]
 perf = ["ipython"]
-testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
+testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.3)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)", "importlib-resources (>=1.3)"]
 
 [[package]]
 name = "libsass"
@@ -484,7 +485,7 @@ six = "*"
 
 [[package]]
 name = "markdown"
-version = "3.3.6"
+version = "3.3.7"
 description = "Python implementation of Markdown."
 category = "main"
 optional = false
@@ -514,15 +515,15 @@ python-versions = ">=3.5"
 
 [[package]]
 name = "nodeenv"
-version = "1.6.0"
+version = "1.7.0"
 description = "Node.js virtual environment builder"
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 
 [[package]]
 name = "pbr"
-version = "5.8.0"
+version = "5.9.0"
 description = "Python Build Reasonableness"
 category = "dev"
 optional = false
@@ -530,7 +531,7 @@ python-versions = ">=2.6"
 
 [[package]]
 name = "pep8-naming"
-version = "0.12.1"
+version = "0.13.0"
 description = "Check PEP-8 naming conventions, plugin for flake8"
 category = "dev"
 optional = false
@@ -538,27 +539,26 @@ python-versions = "*"
 
 [package.dependencies]
 flake8 = ">=3.9.1"
-flake8-polyfill = ">=1.0.2,<2"
 
 [[package]]
 name = "platformdirs"
-version = "2.4.1"
+version = "2.5.2"
 description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["Sphinx (>=4)", "furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)"]
-test = ["appdirs (==1.4.4)", "pytest (>=6)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)"]
+docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)", "sphinx (>=4)"]
+test = ["appdirs (==1.4.4)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)", "pytest (>=6)"]
 
 [[package]]
 name = "pre-commit"
-version = "2.17.0"
+version = "2.19.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
-python-versions = ">=3.6.1"
+python-versions = ">=3.7"
 
 [package.dependencies]
 cfgv = ">=2.0.0"
@@ -570,7 +570,7 @@ virtualenv = ">=20.0.8"
 
 [[package]]
 name = "prometheus-client"
-version = "0.13.1"
+version = "0.14.1"
 description = "Python client for the Prometheus monitoring system."
 category = "main"
 optional = false
@@ -581,14 +581,14 @@ twisted = ["twisted"]
 
 [[package]]
 name = "psutil"
-version = "5.9.0"
+version = "5.9.1"
 description = "Cross-platform lib for process and system monitoring in Python."
 category = "dev"
 optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [package.extras]
-test = ["ipaddress", "mock", "unittest2", "enum34", "pywin32", "wmi"]
+test = ["ipaddress", "mock", "enum34", "pywin32", "wmi"]
 
 [[package]]
 name = "psycopg2-binary"
@@ -622,7 +622,7 @@ toml = ["toml"]
 
 [[package]]
 name = "pyfakefs"
-version = "4.5.4"
+version = "4.5.6"
 description = "pyfakefs implements a fake file system that mocks the Python file system modules."
 category = "dev"
 optional = false
@@ -664,7 +664,7 @@ test = ["pytest", "toml", "pyaml"]
 
 [[package]]
 name = "pytz"
-version = "2021.3"
+version = "2022.1"
 description = "World timezone definitions, modern and historical"
 category = "main"
 optional = false
@@ -812,20 +812,20 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "urllib3"
-version = "1.26.8"
+version = "1.26.10"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
 
 [package.extras]
-brotli = ["brotlipy (>=0.6.0)"]
+brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"]
 secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.13.0"
+version = "20.15.1"
 description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
@@ -854,20 +854,20 @@ brotli = ["brotli"]
 
 [[package]]
 name = "zipp"
-version = "3.7.0"
+version = "3.8.0"
 description = "Backport of pathlib-compatible object wrapper for zip files"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"]
+docs = ["sphinx", "jaraco.packaging (>=9)", "rst.linker (>=1.9)"]
+testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)"]
 
 [metadata]
 lock-version = "1.1"
 python-versions = "3.9.*"
-content-hash = "c94949e29f868689d9c99379dbf4f9479e2ddfe5e6d49e15b57d016210a50379"
+content-hash = "91913e2e96ab2e0e78a09334241062359605135d64f458e710f66d00fb670e05"
 
 [metadata.files]
 anyio = [
@@ -875,32 +875,26 @@ anyio = [
     {file = "anyio-3.6.1.tar.gz", hash = "sha256:413adf95f93886e442aea925f3ee43baa5a765a64a0f52c6081894f9992fdd0b"},
 ]
 asgiref = [
-    {file = "asgiref-3.5.0-py3-none-any.whl", hash = "sha256:88d59c13d634dcffe0510be048210188edd79aeccb6a6c9028cdad6f31d730a9"},
-    {file = "asgiref-3.5.0.tar.gz", hash = "sha256:2f8abc20f7248433085eda803936d98992f1343ddb022065779f37c5da0181d0"},
+    {file = "asgiref-3.5.2-py3-none-any.whl", hash = "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4"},
+    {file = "asgiref-3.5.2.tar.gz", hash = "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"},
 ]
 attrs = [
     {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"},
     {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"},
 ]
-bandit = [
-    {file = "bandit-1.7.2-py3-none-any.whl", hash = "sha256:e20402cadfd126d85b68ed4c8862959663c8c372dbbb1fca8f8e2c9f55a067ec"},
-    {file = "bandit-1.7.2.tar.gz", hash = "sha256:6d11adea0214a43813887bfe71a377b5a9955e4c826c8ffd341b494e3ab25260"},
-]
+bandit = []
 certifi = [
-    {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
-    {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"},
+    {file = "certifi-2022.6.15-py3-none-any.whl", hash = "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"},
+    {file = "certifi-2022.6.15.tar.gz", hash = "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d"},
 ]
 cfgv = [
     {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
     {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
 ]
-charset-normalizer = [
-    {file = "charset-normalizer-2.0.11.tar.gz", hash = "sha256:98398a9d69ee80548c762ba991a4728bfc3836768ed226b3945908d1a688371c"},
-    {file = "charset_normalizer-2.0.11-py3-none-any.whl", hash = "sha256:2842d8f5e82a1f6aa437380934d5e1cd4fcf2003b06fed6940769c164a480a45"},
-]
+charset-normalizer = []
 colorama = [
-    {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
-    {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
+    {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"},
+    {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"},
 ]
 coverage = [
     {file = "coverage-5.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf"},
@@ -983,10 +977,7 @@ django-prometheus = [
     {file = "django-prometheus-2.2.0.tar.gz", hash = "sha256:240378a1307c408bd5fc85614a3a57f1ce633d4a222c9e291e2bbf325173b801"},
     {file = "django_prometheus-2.2.0-py2.py3-none-any.whl", hash = "sha256:e6616770d8820b8834762764bf1b76ec08e1b98e72a6f359d488a2e15fe3537c"},
 ]
-django-simple-bulma = [
-    {file = "django-simple-bulma-2.4.0.tar.gz", hash = "sha256:99a15261b0c61062a128af3c6a45da9c066d6a4a548c9063464e0fb7a5438aa1"},
-    {file = "django_simple_bulma-2.4.0-py3-none-any.whl", hash = "sha256:95d5e26bebbf6a0184e33df844a0ff534bdfd91431e413d1a844d47a75c55fff"},
-]
+django-simple-bulma = []
 djangorestframework = [
     {file = "djangorestframework-3.12.4-py3-none-any.whl", hash = "sha256:6d1d59f623a5ad0509fe0d6bfe93cbdfe17b8116ebc8eda86d45f6e16e819aaf"},
     {file = "djangorestframework-3.12.4.tar.gz", hash = "sha256:f747949a8ddac876e879190df194b925c177cdeb725a099db1460872f7c0a7f2"},
@@ -994,21 +985,16 @@ djangorestframework = [
 docopt = [
     {file = "docopt-0.6.2.tar.gz", hash = "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"},
 ]
-filelock = [
-    {file = "filelock-3.4.2-py3-none-any.whl", hash = "sha256:cf0fc6a2f8d26bd900f19bf33915ca70ba4dd8c56903eeb14e1e7a2fd7590146"},
-    {file = "filelock-3.4.2.tar.gz", hash = "sha256:38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80"},
-]
+filelock = []
 flake8 = [
     {file = "flake8-3.9.2-py2.py3-none-any.whl", hash = "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"},
     {file = "flake8-3.9.2.tar.gz", hash = "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"},
 ]
 flake8-annotations = [
-    {file = "flake8-annotations-2.7.0.tar.gz", hash = "sha256:52e53c05b0c06cac1c2dec192ea2c36e85081238add3bd99421d56f574b9479b"},
-    {file = "flake8_annotations-2.7.0-py3-none-any.whl", hash = "sha256:3edfbbfb58e404868834fe6ec3eaf49c139f64f0701259f707d043185545151e"},
-]
-flake8-bandit = [
-    {file = "flake8_bandit-2.1.2.tar.gz", hash = "sha256:687fc8da2e4a239b206af2e54a90093572a60d0954f3054e23690739b0b0de3b"},
+    {file = "flake8-annotations-2.9.0.tar.gz", hash = "sha256:63fb3f538970b6a8dfd84125cf5af16f7b22e52d5032acb3b7eb23645ecbda9b"},
+    {file = "flake8_annotations-2.9.0-py3-none-any.whl", hash = "sha256:84f46de2964cb18fccea968d9eafce7cf857e34d913d515120795b9af6498d56"},
 ]
+flake8-bandit = []
 flake8-bugbear = [
     {file = "flake8-bugbear-20.11.1.tar.gz", hash = "sha256:528020129fea2dea33a466b9d64ab650aa3e5f9ffc788b70ea4bc6cf18283538"},
     {file = "flake8_bugbear-20.11.1-py36.py37.py38-none-any.whl", hash = "sha256:f35b8135ece7a014bc0aee5b5d485334ac30a6da48494998cc1fabf7ec70d703"},
@@ -1030,8 +1016,8 @@ flake8-string-format = [
     {file = "flake8_string_format-0.3.0-py2.py3-none-any.whl", hash = "sha256:812ff431f10576a74c89be4e85b8e075a705be39bc40c4b4278b5b13e2afa9af"},
 ]
 flake8-tidy-imports = [
-    {file = "flake8-tidy-imports-4.6.0.tar.gz", hash = "sha256:3e193d8c4bb4492408a90e956d888b27eed14c698387c9b38230da3dad78058f"},
-    {file = "flake8_tidy_imports-4.6.0-py3-none-any.whl", hash = "sha256:6ae9f55d628156e19d19f4c359dd5d3e95431a9bd514f5e2748c53c1398c66b2"},
+    {file = "flake8-tidy-imports-4.8.0.tar.gz", hash = "sha256:df44f9c841b5dfb3a7a1f0da8546b319d772c2a816a1afefcce43e167a593d83"},
+    {file = "flake8_tidy_imports-4.8.0-py3-none-any.whl", hash = "sha256:25bd9799358edefa0e010ce2c587b093c3aba942e96aeaa99b6d0500ae1bf09c"},
 ]
 flake8-todo = [
     {file = "flake8-todo-0.7.tar.gz", hash = "sha256:6e4c5491ff838c06fe5a771b0e95ee15fc005ca57196011011280fc834a85915"},
@@ -1041,8 +1027,8 @@ gitdb = [
     {file = "gitdb-4.0.9.tar.gz", hash = "sha256:bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa"},
 ]
 gitpython = [
-    {file = "GitPython-3.1.26-py3-none-any.whl", hash = "sha256:26ac35c212d1f7b16036361ca5cff3ec66e11753a0d677fb6c48fa4e1a9dd8d6"},
-    {file = "GitPython-3.1.26.tar.gz", hash = "sha256:fc8868f63a2e6d268fb25f481995ba185a85a66fcad126f039323ff6635669ee"},
+    {file = "GitPython-3.1.27-py3-none-any.whl", hash = "sha256:5b68b000463593e05ff2b261acff0ff0972df8ab1b70d3cdbd41b546c8b8fc3d"},
+    {file = "GitPython-3.1.27.tar.gz", hash = "sha256:1c885ce809e8ba2d88a29befeb385fcea06338d3640712b59ca623c220bb5704"},
 ]
 gunicorn = [
     {file = "gunicorn-20.0.4-py2.py3-none-any.whl", hash = "sha256:cd4a810dd51bf497552cf3f863b575dabd73d6ad6a91075b65936b151cbf4f9c"},
@@ -1055,17 +1041,14 @@ h11 = [
 httpcore = []
 httpx = []
 identify = [
-    {file = "identify-2.4.6-py2.py3-none-any.whl", hash = "sha256:cf06b1639e0dca0c184b1504d8b73448c99a68e004a80524c7923b95f7b6837c"},
-    {file = "identify-2.4.6.tar.gz", hash = "sha256:233679e3f61a02015d4293dbccf16aa0e4996f868bd114688b8c124f18826706"},
+    {file = "identify-2.5.1-py2.py3-none-any.whl", hash = "sha256:0dca2ea3e4381c435ef9c33ba100a78a9b40c0bab11189c7cf121f75815efeaa"},
+    {file = "identify-2.5.1.tar.gz", hash = "sha256:3d11b16f3fe19f52039fb7e39c9c884b21cb1b586988114fbe42671f03de3e82"},
 ]
 idna = [
     {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
     {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
 ]
-importlib-metadata = [
-    {file = "importlib_metadata-4.10.1-py3-none-any.whl", hash = "sha256:899e2a40a8c4a1aec681feef45733de8a6c58f3f6a0dbed2eb6574b4387a77b6"},
-    {file = "importlib_metadata-4.10.1.tar.gz", hash = "sha256:951f0d8a5b7260e9db5e41d429285b5f451e928479f19d80818878527d36e95e"},
-]
+importlib-metadata = []
 libsass = [
     {file = "libsass-0.21.0-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:06c8776417fe930714bdc930a3d7e795ae3d72be6ac883ff72a1b8f7c49e5ffb"},
     {file = "libsass-0.21.0-cp27-cp27m-win32.whl", hash = "sha256:a005f298f64624f313a3ac618ab03f844c71d84ae4f4a4aec4b68d2a4ffe75eb"},
@@ -1078,10 +1061,7 @@ libsass = [
     {file = "libsass-0.21.0-cp38-abi3-macosx_12_0_arm64.whl", hash = "sha256:c9ec490609752c1d81ff6290da33485aa7cb6d7365ac665b74464c1b7d97f7da"},
     {file = "libsass-0.21.0.tar.gz", hash = "sha256:d5ba529d9ce668be9380563279f3ffe988f27bc5b299c5a28453df2e0b0fbaf2"},
 ]
-markdown = [
-    {file = "Markdown-3.3.6-py3-none-any.whl", hash = "sha256:9923332318f843411e9932237530df53162e29dc7a4e2b91e35764583c46c9a3"},
-    {file = "Markdown-3.3.6.tar.gz", hash = "sha256:76df8ae32294ec39dcf89340382882dfa12975f87f45c3ed1ecdb1e8cefc7006"},
-]
+markdown = []
 mccabe = [
     {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"},
     {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"},
@@ -1090,63 +1070,51 @@ mslex = [
     {file = "mslex-0.3.0-py2.py3-none-any.whl", hash = "sha256:380cb14abf8fabf40e56df5c8b21a6d533dc5cbdcfe42406bbf08dda8f42e42a"},
     {file = "mslex-0.3.0.tar.gz", hash = "sha256:4a1ac3f25025cad78ad2fe499dd16d42759f7a3801645399cce5c404415daa97"},
 ]
-nodeenv = [
-    {file = "nodeenv-1.6.0-py2.py3-none-any.whl", hash = "sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7"},
-    {file = "nodeenv-1.6.0.tar.gz", hash = "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b"},
-]
-pbr = [
-    {file = "pbr-5.8.0-py2.py3-none-any.whl", hash = "sha256:176e8560eaf61e127817ef93d8a844803abb27a4d4637f0ff3bb783129be2e0a"},
-    {file = "pbr-5.8.0.tar.gz", hash = "sha256:672d8ebee84921862110f23fcec2acea191ef58543d34dfe9ef3d9f13c31cddf"},
-]
-pep8-naming = [
-    {file = "pep8-naming-0.12.1.tar.gz", hash = "sha256:bb2455947757d162aa4cad55dba4ce029005cd1692f2899a21d51d8630ca7841"},
-    {file = "pep8_naming-0.12.1-py2.py3-none-any.whl", hash = "sha256:4a8daeaeb33cfcde779309fc0c9c0a68a3bbe2ad8a8308b763c5068f86eb9f37"},
-]
+nodeenv = []
+pbr = []
+pep8-naming = []
 platformdirs = [
-    {file = "platformdirs-2.4.1-py3-none-any.whl", hash = "sha256:1d7385c7db91728b83efd0ca99a5afb296cab9d0ed8313a45ed8ba17967ecfca"},
-    {file = "platformdirs-2.4.1.tar.gz", hash = "sha256:440633ddfebcc36264232365d7840a970e75e1018d15b4327d11f91909045fda"},
+    {file = "platformdirs-2.5.2-py3-none-any.whl", hash = "sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788"},
+    {file = "platformdirs-2.5.2.tar.gz", hash = "sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"},
 ]
 pre-commit = [
-    {file = "pre_commit-2.17.0-py2.py3-none-any.whl", hash = "sha256:725fa7459782d7bec5ead072810e47351de01709be838c2ce1726b9591dad616"},
-    {file = "pre_commit-2.17.0.tar.gz", hash = "sha256:c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a"},
-]
-prometheus-client = [
-    {file = "prometheus_client-0.13.1-py3-none-any.whl", hash = "sha256:357a447fd2359b0a1d2e9b311a0c5778c330cfbe186d880ad5a6b39884652316"},
-    {file = "prometheus_client-0.13.1.tar.gz", hash = "sha256:ada41b891b79fca5638bd5cfe149efa86512eaa55987893becd2c6d8d0a5dfc5"},
+    {file = "pre_commit-2.19.0-py2.py3-none-any.whl", hash = "sha256:10c62741aa5704faea2ad69cb550ca78082efe5697d6f04e5710c3c229afdd10"},
+    {file = "pre_commit-2.19.0.tar.gz", hash = "sha256:4233a1e38621c87d9dda9808c6606d7e7ba0e087cd56d3fe03202a01d2919615"},
 ]
+prometheus-client = []
 psutil = [
-    {file = "psutil-5.9.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:55ce319452e3d139e25d6c3f85a1acf12d1607ddedea5e35fb47a552c051161b"},
-    {file = "psutil-5.9.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:7336292a13a80eb93c21f36bde4328aa748a04b68c13d01dfddd67fc13fd0618"},
-    {file = "psutil-5.9.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:cb8d10461c1ceee0c25a64f2dd54872b70b89c26419e147a05a10b753ad36ec2"},
-    {file = "psutil-5.9.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:7641300de73e4909e5d148e90cc3142fb890079e1525a840cf0dfd39195239fd"},
-    {file = "psutil-5.9.0-cp27-none-win32.whl", hash = "sha256:ea42d747c5f71b5ccaa6897b216a7dadb9f52c72a0fe2b872ef7d3e1eacf3ba3"},
-    {file = "psutil-5.9.0-cp27-none-win_amd64.whl", hash = "sha256:ef216cc9feb60634bda2f341a9559ac594e2eeaadd0ba187a4c2eb5b5d40b91c"},
-    {file = "psutil-5.9.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:90a58b9fcae2dbfe4ba852b57bd4a1dded6b990a33d6428c7614b7d48eccb492"},
-    {file = "psutil-5.9.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ff0d41f8b3e9ebb6b6110057e40019a432e96aae2008951121ba4e56040b84f3"},
-    {file = "psutil-5.9.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:742c34fff804f34f62659279ed5c5b723bb0195e9d7bd9907591de9f8f6558e2"},
-    {file = "psutil-5.9.0-cp310-cp310-win32.whl", hash = "sha256:8293942e4ce0c5689821f65ce6522ce4786d02af57f13c0195b40e1edb1db61d"},
-    {file = "psutil-5.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:9b51917c1af3fa35a3f2dabd7ba96a2a4f19df3dec911da73875e1edaf22a40b"},
-    {file = "psutil-5.9.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e9805fed4f2a81de98ae5fe38b75a74c6e6ad2df8a5c479594c7629a1fe35f56"},
-    {file = "psutil-5.9.0-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c51f1af02334e4b516ec221ee26b8fdf105032418ca5a5ab9737e8c87dafe203"},
-    {file = "psutil-5.9.0-cp36-cp36m-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:32acf55cb9a8cbfb29167cd005951df81b567099295291bcfd1027365b36591d"},
-    {file = "psutil-5.9.0-cp36-cp36m-win32.whl", hash = "sha256:e5c783d0b1ad6ca8a5d3e7b680468c9c926b804be83a3a8e95141b05c39c9f64"},
-    {file = "psutil-5.9.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d62a2796e08dd024b8179bd441cb714e0f81226c352c802fca0fd3f89eeacd94"},
-    {file = "psutil-5.9.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3d00a664e31921009a84367266b35ba0aac04a2a6cad09c550a89041034d19a0"},
-    {file = "psutil-5.9.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7779be4025c540d1d65a2de3f30caeacc49ae7a2152108adeaf42c7534a115ce"},
-    {file = "psutil-5.9.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:072664401ae6e7c1bfb878c65d7282d4b4391f1bc9a56d5e03b5a490403271b5"},
-    {file = "psutil-5.9.0-cp37-cp37m-win32.whl", hash = "sha256:df2c8bd48fb83a8408c8390b143c6a6fa10cb1a674ca664954de193fdcab36a9"},
-    {file = "psutil-5.9.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1d7b433519b9a38192dfda962dd8f44446668c009833e1429a52424624f408b4"},
-    {file = "psutil-5.9.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c3400cae15bdb449d518545cbd5b649117de54e3596ded84aacabfbb3297ead2"},
-    {file = "psutil-5.9.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b2237f35c4bbae932ee98902a08050a27821f8f6dfa880a47195e5993af4702d"},
-    {file = "psutil-5.9.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1070a9b287846a21a5d572d6dddd369517510b68710fca56b0e9e02fd24bed9a"},
-    {file = "psutil-5.9.0-cp38-cp38-win32.whl", hash = "sha256:76cebf84aac1d6da5b63df11fe0d377b46b7b500d892284068bacccf12f20666"},
-    {file = "psutil-5.9.0-cp38-cp38-win_amd64.whl", hash = "sha256:3151a58f0fbd8942ba94f7c31c7e6b310d2989f4da74fcbf28b934374e9bf841"},
-    {file = "psutil-5.9.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:539e429da49c5d27d5a58e3563886057f8fc3868a5547b4f1876d9c0f007bccf"},
-    {file = "psutil-5.9.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:58c7d923dc209225600aec73aa2c4ae8ea33b1ab31bc11ef8a5933b027476f07"},
-    {file = "psutil-5.9.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3611e87eea393f779a35b192b46a164b1d01167c9d323dda9b1e527ea69d697d"},
-    {file = "psutil-5.9.0-cp39-cp39-win32.whl", hash = "sha256:4e2fb92e3aeae3ec3b7b66c528981fd327fb93fd906a77215200404444ec1845"},
-    {file = "psutil-5.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:7d190ee2eaef7831163f254dc58f6d2e2a22e27382b936aab51c835fc080c3d3"},
-    {file = "psutil-5.9.0.tar.gz", hash = "sha256:869842dbd66bb80c3217158e629d6fceaecc3a3166d3d1faee515b05dd26ca25"},
+    {file = "psutil-5.9.1-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:799759d809c31aab5fe4579e50addf84565e71c1dc9f1c31258f159ff70d3f87"},
+    {file = "psutil-5.9.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:9272167b5f5fbfe16945be3db475b3ce8d792386907e673a209da686176552af"},
+    {file = "psutil-5.9.1-cp27-cp27m-win32.whl", hash = "sha256:0904727e0b0a038830b019551cf3204dd48ef5c6868adc776e06e93d615fc5fc"},
+    {file = "psutil-5.9.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e7e10454cb1ab62cc6ce776e1c135a64045a11ec4c6d254d3f7689c16eb3efd2"},
+    {file = "psutil-5.9.1-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:56960b9e8edcca1456f8c86a196f0c3d8e3e361320071c93378d41445ffd28b0"},
+    {file = "psutil-5.9.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:44d1826150d49ffd62035785a9e2c56afcea66e55b43b8b630d7706276e87f22"},
+    {file = "psutil-5.9.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c7be9d7f5b0d206f0bbc3794b8e16fb7dbc53ec9e40bbe8787c6f2d38efcf6c9"},
+    {file = "psutil-5.9.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abd9246e4cdd5b554a2ddd97c157e292ac11ef3e7af25ac56b08b455c829dca8"},
+    {file = "psutil-5.9.1-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:29a442e25fab1f4d05e2655bb1b8ab6887981838d22effa2396d584b740194de"},
+    {file = "psutil-5.9.1-cp310-cp310-win32.whl", hash = "sha256:20b27771b077dcaa0de1de3ad52d22538fe101f9946d6dc7869e6f694f079329"},
+    {file = "psutil-5.9.1-cp310-cp310-win_amd64.whl", hash = "sha256:58678bbadae12e0db55186dc58f2888839228ac9f41cc7848853539b70490021"},
+    {file = "psutil-5.9.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3a76ad658641172d9c6e593de6fe248ddde825b5866464c3b2ee26c35da9d237"},
+    {file = "psutil-5.9.1-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a6a11e48cb93a5fa606306493f439b4aa7c56cb03fc9ace7f6bfa21aaf07c453"},
+    {file = "psutil-5.9.1-cp36-cp36m-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:068935df39055bf27a29824b95c801c7a5130f118b806eee663cad28dca97685"},
+    {file = "psutil-5.9.1-cp36-cp36m-win32.whl", hash = "sha256:0f15a19a05f39a09327345bc279c1ba4a8cfb0172cc0d3c7f7d16c813b2e7d36"},
+    {file = "psutil-5.9.1-cp36-cp36m-win_amd64.whl", hash = "sha256:db417f0865f90bdc07fa30e1aadc69b6f4cad7f86324b02aa842034efe8d8c4d"},
+    {file = "psutil-5.9.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:91c7ff2a40c373d0cc9121d54bc5f31c4fa09c346528e6a08d1845bce5771ffc"},
+    {file = "psutil-5.9.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fea896b54f3a4ae6f790ac1d017101252c93f6fe075d0e7571543510f11d2676"},
+    {file = "psutil-5.9.1-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3054e923204b8e9c23a55b23b6df73a8089ae1d075cb0bf711d3e9da1724ded4"},
+    {file = "psutil-5.9.1-cp37-cp37m-win32.whl", hash = "sha256:d2d006286fbcb60f0b391741f520862e9b69f4019b4d738a2a45728c7e952f1b"},
+    {file = "psutil-5.9.1-cp37-cp37m-win_amd64.whl", hash = "sha256:b14ee12da9338f5e5b3a3ef7ca58b3cba30f5b66f7662159762932e6d0b8f680"},
+    {file = "psutil-5.9.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:19f36c16012ba9cfc742604df189f2f28d2720e23ff7d1e81602dbe066be9fd1"},
+    {file = "psutil-5.9.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:944c4b4b82dc4a1b805329c980f270f170fdc9945464223f2ec8e57563139cf4"},
+    {file = "psutil-5.9.1-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b6750a73a9c4a4e689490ccb862d53c7b976a2a35c4e1846d049dcc3f17d83b"},
+    {file = "psutil-5.9.1-cp38-cp38-win32.whl", hash = "sha256:a8746bfe4e8f659528c5c7e9af5090c5a7d252f32b2e859c584ef7d8efb1e689"},
+    {file = "psutil-5.9.1-cp38-cp38-win_amd64.whl", hash = "sha256:79c9108d9aa7fa6fba6e668b61b82facc067a6b81517cab34d07a84aa89f3df0"},
+    {file = "psutil-5.9.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:28976df6c64ddd6320d281128817f32c29b539a52bdae5e192537bc338a9ec81"},
+    {file = "psutil-5.9.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b88f75005586131276634027f4219d06e0561292be8bd6bc7f2f00bdabd63c4e"},
+    {file = "psutil-5.9.1-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:645bd4f7bb5b8633803e0b6746ff1628724668681a434482546887d22c7a9537"},
+    {file = "psutil-5.9.1-cp39-cp39-win32.whl", hash = "sha256:32c52611756096ae91f5d1499fe6c53b86f4a9ada147ee42db4991ba1520e574"},
+    {file = "psutil-5.9.1-cp39-cp39-win_amd64.whl", hash = "sha256:f65f9a46d984b8cd9b3750c2bdb419b2996895b005aefa6cbaba9a143b1ce2c5"},
+    {file = "psutil-5.9.1.tar.gz", hash = "sha256:57f1819b5d9e95cdfb0c881a8a5b7d542ed0b7c522d575706a80bedc848c8954"},
 ]
 psycopg2-binary = [
     {file = "psycopg2-binary-2.8.6.tar.gz", hash = "sha256:11b9c0ebce097180129e422379b824ae21c8f2a6596b159c7659e2e5a00e1aa0"},
@@ -1193,10 +1161,7 @@ pydocstyle = [
     {file = "pydocstyle-6.1.1-py3-none-any.whl", hash = "sha256:6987826d6775056839940041beef5c08cc7e3d71d63149b48e36727f70144dc4"},
     {file = "pydocstyle-6.1.1.tar.gz", hash = "sha256:1d41b7c459ba0ee6c345f2eb9ae827cab14a7533a88c5c6f7e94923f72df92dc"},
 ]
-pyfakefs = [
-    {file = "pyfakefs-4.5.4-py3-none-any.whl", hash = "sha256:e0cc0d22cb74badf4fb2143a112817d7aea1a58ee9dca015a68bf38c3691cb52"},
-    {file = "pyfakefs-4.5.4.tar.gz", hash = "sha256:5b5951e873f73bf12e3a19d8e4470c4b7962c51df753cf8c4caaf64e24a0a323"},
-]
+pyfakefs = []
 pyflakes = [
     {file = "pyflakes-2.3.1-py2.py3-none-any.whl", hash = "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3"},
     {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"},
@@ -1210,8 +1175,8 @@ python-frontmatter = [
     {file = "python_frontmatter-1.0.0-py3-none-any.whl", hash = "sha256:766ae75f1b301ffc5fe3494339147e0fd80bc3deff3d7590a93991978b579b08"},
 ]
 pytz = [
-    {file = "pytz-2021.3-py2.py3-none-any.whl", hash = "sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c"},
-    {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"},
+    {file = "pytz-2022.1-py2.py3-none-any.whl", hash = "sha256:e68985985296d9a66a881eb3193b0906246245294a881e7c8afe623866ac6a5c"},
+    {file = "pytz-2022.1.tar.gz", hash = "sha256:1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7"},
 ]
 pyyaml = [
     {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"},
@@ -1285,19 +1250,13 @@ toml = [
     {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
     {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
 ]
-urllib3 = [
-    {file = "urllib3-1.26.8-py2.py3-none-any.whl", hash = "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"},
-    {file = "urllib3-1.26.8.tar.gz", hash = "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"},
-]
-virtualenv = [
-    {file = "virtualenv-20.13.0-py2.py3-none-any.whl", hash = "sha256:339f16c4a86b44240ba7223d0f93a7887c3ca04b5f9c8129da7958447d079b09"},
-    {file = "virtualenv-20.13.0.tar.gz", hash = "sha256:d8458cf8d59d0ea495ad9b34c2599487f8a7772d796f9910858376d1600dd2dd"},
-]
+urllib3 = []
+virtualenv = []
 whitenoise = [
     {file = "whitenoise-5.3.0-py2.py3-none-any.whl", hash = "sha256:d963ef25639d1417e8a247be36e6aedd8c7c6f0a08adcb5a89146980a96b577c"},
     {file = "whitenoise-5.3.0.tar.gz", hash = "sha256:d234b871b52271ae7ed6d9da47ffe857c76568f11dd30e28e18c5869dbd11e12"},
 ]
 zipp = [
-    {file = "zipp-3.7.0-py3-none-any.whl", hash = "sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375"},
-    {file = "zipp-3.7.0.tar.gz", hash = "sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d"},
+    {file = "zipp-3.8.0-py3-none-any.whl", hash = "sha256:c4f6e5bbf48e74f7a38e7cc5b0480ff42b0ae5178957d564d18932525d5cf099"},
+    {file = "zipp-3.8.0.tar.gz", hash = "sha256:56bf8aadb83c24db6c4b577e13de374ccfb67da2078beba1d037c17980bf43ad"},
 ]
diff --git a/pydis_site/apps/api/pagination.py b/pydis_site/apps/api/pagination.py
index 2a325460..61707d33 100644
--- a/pydis_site/apps/api/pagination.py
+++ b/pydis_site/apps/api/pagination.py
@@ -1,7 +1,6 @@
-import typing
-
 from rest_framework.pagination import LimitOffsetPagination
 from rest_framework.response import Response
+from rest_framework.utils.serializer_helpers import ReturnList
 
 
 class LimitOffsetPaginationExtended(LimitOffsetPagination):
@@ -44,6 +43,6 @@ class LimitOffsetPaginationExtended(LimitOffsetPagination):
 
     default_limit = 100
 
-    def get_paginated_response(self, data: typing.Any) -> Response:
+    def get_paginated_response(self, data: ReturnList) -> Response:
         """Override to skip metadata i.e. `count`, `next`, and `previous`."""
         return Response(data)
diff --git a/pydis_site/apps/content/views/page_category.py b/pydis_site/apps/content/views/page_category.py
index 5af77aff..356eb021 100644
--- a/pydis_site/apps/content/views/page_category.py
+++ b/pydis_site/apps/content/views/page_category.py
@@ -3,7 +3,7 @@ from pathlib import Path
 
 import frontmatter
 from django.conf import settings
-from django.http import Http404
+from django.http import Http404, HttpRequest, HttpResponse
 from django.views.generic import TemplateView
 
 from pydis_site.apps.content import utils
@@ -12,7 +12,7 @@ from pydis_site.apps.content import utils
 class PageOrCategoryView(TemplateView):
     """Handles pages and page categories."""
 
-    def dispatch(self, request: t.Any, *args, **kwargs) -> t.Any:
+    def dispatch(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
         """Conform URL path location to the filesystem path."""
         self.location = Path(kwargs.get("location", ""))
 
diff --git a/pyproject.toml b/pyproject.toml
index 01e7eda2..6ef7c407 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,7 +27,7 @@ django-distill = "~=2.9.0"
 coverage = "~=5.0"
 flake8 = "~=3.7"
 flake8-annotations = "~=2.0"
-flake8-bandit = "~=2.1"
+flake8-bandit = "~=3.0"
 flake8-bugbear = "~=20.1"
 flake8-docstrings = "~=1.5"
 flake8-import-order = "~=0.18"
-- 
cgit v1.2.3


From 4edb368c39c96f20e41a8874b0f77f30910c8ce7 Mon Sep 17 00:00:00 2001
From: Hassan Abouelela <hassan@hassanamr.com>
Date: Mon, 11 Jul 2022 05:10:19 +0400
Subject: Bump Django To 3.2

Bumps the current django version to 3.2 For the most part, there are no
major changes here. The app configuration names were incorrect, and the
new version no longer ignores that, so those were updated. The new
version also requires explicitly defining the field type for primary
keys if they are not defined on the model.

Signed-off-by: Hassan Abouelela <hassan@hassanamr.com>
---
 poetry.lock                       | 13 +++++--------
 pydis_site/apps/content/apps.py   |  2 +-
 pydis_site/apps/events/apps.py    |  2 +-
 pydis_site/apps/redirect/apps.py  |  2 +-
 pydis_site/apps/resources/apps.py |  2 +-
 pydis_site/apps/staff/apps.py     |  2 +-
 pydis_site/settings.py            |  3 +++
 pyproject.toml                    |  2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'pydis_site/apps/content')

diff --git a/poetry.lock b/poetry.lock
index 826c4fca..d855bdaf 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -131,19 +131,19 @@ python-versions = "*"
 
 [[package]]
 name = "django"
-version = "3.1.14"
+version = "3.2.14"
 description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design."
 category = "main"
 optional = false
 python-versions = ">=3.6"
 
 [package.dependencies]
-asgiref = ">=3.2.10,<4"
+asgiref = ">=3.3.2,<4"
 pytz = "*"
 sqlparse = ">=0.2.2"
 
 [package.extras]
-argon2 = ["argon2-cffi (>=16.1.0)"]
+argon2 = ["argon2-cffi (>=19.1.0)"]
 bcrypt = ["bcrypt"]
 
 [[package]]
@@ -867,7 +867,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-
 [metadata]
 lock-version = "1.1"
 python-versions = "3.9.*"
-content-hash = "91913e2e96ab2e0e78a09334241062359605135d64f458e710f66d00fb670e05"
+content-hash = "e40d87f94732c314e0fb3cd2c9023ea47d66d3c3d340085eb6df9c1fe1412529"
 
 [metadata.files]
 anyio = [
@@ -958,10 +958,7 @@ distlib = [
     {file = "distlib-0.3.4-py2.py3-none-any.whl", hash = "sha256:6564fe0a8f51e734df6333d08b8b94d4ea8ee6b99b5ed50613f731fd4089f34b"},
     {file = "distlib-0.3.4.zip", hash = "sha256:e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579"},
 ]
-django = [
-    {file = "Django-3.1.14-py3-none-any.whl", hash = "sha256:0fabc786489af16ad87a8c170ba9d42bfd23f7b699bd5ef05675864e8d012859"},
-    {file = "Django-3.1.14.tar.gz", hash = "sha256:72a4a5a136a214c39cf016ccdd6b69e2aa08c7479c66d93f3a9b5e4bb9d8a347"},
-]
+django = []
 django-distill = [
     {file = "django-distill-2.9.2.tar.gz", hash = "sha256:91d5f45c2ff78b8efd4805ff5ec17df4ba815bbf51ca12a2cea65727d2f1d42e"},
 ]
diff --git a/pydis_site/apps/content/apps.py b/pydis_site/apps/content/apps.py
index 1e300a48..96019e1c 100644
--- a/pydis_site/apps/content/apps.py
+++ b/pydis_site/apps/content/apps.py
@@ -4,4 +4,4 @@ from django.apps import AppConfig
 class ContentConfig(AppConfig):
     """Django AppConfig for content app."""
 
-    name = 'content'
+    name = 'pydis_site.apps.content'
diff --git a/pydis_site/apps/events/apps.py b/pydis_site/apps/events/apps.py
index a1cf09ef..70762bc2 100644
--- a/pydis_site/apps/events/apps.py
+++ b/pydis_site/apps/events/apps.py
@@ -4,4 +4,4 @@ from django.apps import AppConfig
 class EventsConfig(AppConfig):
     """Django AppConfig for events app."""
 
-    name = 'events'
+    name = 'pydis_site.apps.events'
diff --git a/pydis_site/apps/redirect/apps.py b/pydis_site/apps/redirect/apps.py
index 9b70d169..0234bc93 100644
--- a/pydis_site/apps/redirect/apps.py
+++ b/pydis_site/apps/redirect/apps.py
@@ -4,4 +4,4 @@ from django.apps import AppConfig
 class RedirectConfig(AppConfig):
     """AppConfig instance for Redirect app."""
 
-    name = 'redirect'
+    name = 'pydis_site.apps.redirect'
diff --git a/pydis_site/apps/resources/apps.py b/pydis_site/apps/resources/apps.py
index e0c235bd..93117654 100644
--- a/pydis_site/apps/resources/apps.py
+++ b/pydis_site/apps/resources/apps.py
@@ -4,4 +4,4 @@ from django.apps import AppConfig
 class ResourcesConfig(AppConfig):
     """AppConfig instance for Resources app."""
 
-    name = 'resources'
+    name = 'pydis_site.apps.resources'
diff --git a/pydis_site/apps/staff/apps.py b/pydis_site/apps/staff/apps.py
index 70a15f40..d68a80c3 100644
--- a/pydis_site/apps/staff/apps.py
+++ b/pydis_site/apps/staff/apps.py
@@ -4,4 +4,4 @@ from django.apps import AppConfig
 class StaffConfig(AppConfig):
     """Django AppConfig for the staff app."""
 
-    name = 'staff'
+    name = 'pydis_site.apps.staff'
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 17f220f3..03c16f4b 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -219,6 +219,9 @@ if DEBUG:
 else:
     PARENT_HOST = env('PARENT_HOST', default='pythondiscord.com')
 
+# Django Model Configuration
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
 # Django REST framework
 # https://www.django-rest-framework.org
 REST_FRAMEWORK = {
diff --git a/pyproject.toml b/pyproject.toml
index 6ef7c407..75292eb2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = "3.9.*"
-django = "~=3.1.14"
+django = "~=3.2.14"
 django-environ = "~=0.4.5"
 django-filter = "~=21.1"
 djangorestframework = "~=3.12.0"
-- 
cgit v1.2.3