From 16d59f571197b46ade0e4105f9654d6da00009b6 Mon Sep 17 00:00:00 2001
From: AlexWaygood <alex.waygood@gmail.com>
Date: Fri, 15 Apr 2022 15:34:43 +0100
Subject: [PATCH 01/18] Add minimal issue templates

---
 .github/ISSUE_TEMPLATE/bug.md           | 33 +++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml       |  7 ++++++
 .github/ISSUE_TEMPLATE/crash.md         | 33 +++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/documentation.md |  9 +++++++
 .github/ISSUE_TEMPLATE/feature.md       | 22 +++++++++++++++++
 .github/ISSUE_TEMPLATE/security.md      | 26 +++++++++++++++++++
 6 files changed, 130 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug.md
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/ISSUE_TEMPLATE/crash.md
 create mode 100644 .github/ISSUE_TEMPLATE/documentation.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature.md
 create mode 100644 .github/ISSUE_TEMPLATE/security.md

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
new file mode 100644
index 00000000000000..7ff1b8a84ed434
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,33 @@
+---
+name: Bug Report
+about: Submit a bug report
+labels: "type-bug"
+---
+
+<!--
+  If you're new to Python and you're not sure whether what you're experiencing is a bug, the Python issue tracker is not
+  the right place to seek help. Please consider one of the following options instead:
+
+  - reading the Python tutorial: https://docs.python.org/3/tutorial/
+  - posting in the Users category here on discuss.python.org: https://discuss.python.org/c/users/7
+  - emailing the Python-list mailing list: https://mail.python.org/mailman/listinfo/python-list
+  - searching our issue tracker: https://github.com/python/cpython/issues to see if
+    it's already been reported
+-->
+
+**Bug Report**
+
+A clear and concise description of what the bug is.
+Please include a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example), if possible.
+
+**Environment details**
+
+<!-- Include as many relevant details about the environment you experienced the bug in -->
+
+- CPython versions tested on:
+- Operating system and version:
+
+<!--
+You can freely edit this text, please remove all the lines
+you believe are unnecessary.
+-->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000000..2cae75dff0225b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+contact_links:
+  - about: "Please ask and answer any user questions about Python on discuss.python.org."
+    name: "Getting help"
+    url: "https://discuss.python.org/c/users/7"
+  - about: "Large feature proposals, for example proposals for new syntax, should be discussed on an ideas forum rather than the issue tracker."
+    name: "Proposing new features"
+    url: "https://discuss.python.org/c/ideas/6"
diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
new file mode 100644
index 00000000000000..5357d7b269f556
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -0,0 +1,33 @@
+---
+name: Crash Report
+about: A hard crash of the interpreter, possibly with a core dump
+labels: "type-crash"
+---
+
+<!--
+  Please do not submit this form if you encounter an exception being raised in an unexpected place.
+  Most of the time, these should be filed as bugs, rather than crashes.
+
+  The CPython interpreter is itself written in a different programming language, C.
+  For CPython, a "crash" is when Python itself fails, leading to a traceback in the C stack.
+-->
+
+**Crash Report**
+
+Tell us what happened, ideally including a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example).
+
+**Traceback**
+
+
+
+**Your Environment**
+
+<!-- Include as many relevant details about the environment you experienced the bug in -->
+
+- CPython versions tested on:
+- Operating system and version:
+
+<!--
+You can freely edit this text, please remove all the lines
+you believe are unnecessary.
+-->
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
new file mode 100644
index 00000000000000..669c92adb47531
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,9 @@
+---
+name: Documentation
+about: Report a problem with the documentation
+labels: "docs"
+---
+
+**Documentation**
+
+(A clear and concise description of the issue.)
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
new file mode 100644
index 00000000000000..05d22111a806c1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -0,0 +1,22 @@
+---
+name: Feature
+about: Submit a proposal for a new CPython feature
+labels: "type-feature"
+---
+
+**Feature**
+
+(A clear and concise description of your feature proposal.)
+
+**Pitch**
+
+(Please explain why this feature should be implemented and how it would be used. Add examples, if applicable.)
+
+**Previous discussion**
+
+<!--
+  New features to Python should first be discussed elsewhere before creating issues on GitHub,
+  for example in the "ideas" category (https://discuss.python.org/c/ideas/6) of discuss.python.org,
+  or the python-ideas mailing list (https://mail.python.org/mailman3/lists/python-ideas.python.org/).
+  Use this space to post links to the places where you have already discussed this feature proposal:
+-->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md
new file mode 100644
index 00000000000000..986cf54588aac8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/security.md
@@ -0,0 +1,26 @@
+---
+name: Security Report
+about: Submit a report regarding a security vulnerability
+labels: "type-security"
+---
+
+<!--
+  Please note that security issues should generally first be sent to the "security at python dot org" email address.
+  See here for further details: https://www.python.org/dev/security/
+-->
+
+**Security Vulnerability Report**
+
+A description of what the security vulnerability is.
+
+**Environment details**
+
+<!-- Include as many relevant details about your environment -->
+
+- CPython versions tested on:
+- Operating system and version:
+
+<!--
+You can freely edit this text, please remove all the lines
+you believe are unnecessary.
+-->

From de9ed903f217fb62c3b0792c1601028342375c76 Mon Sep 17 00:00:00 2001
From: AlexWaygood <alex.waygood@gmail.com>
Date: Fri, 15 Apr 2022 15:59:19 +0100
Subject: [PATCH 02/18] Wording tweaks

---
 .github/ISSUE_TEMPLATE/bug.md     | 8 ++++----
 .github/ISSUE_TEMPLATE/crash.md   | 4 ++--
 .github/ISSUE_TEMPLATE/feature.md | 6 ++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 7ff1b8a84ed434..327bd19935c1e3 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -5,14 +5,14 @@ labels: "type-bug"
 ---
 
 <!--
-  If you're new to Python and you're not sure whether what you're experiencing is a bug, the Python issue tracker is not
+  If you're new to Python and you're not sure whether what you're experiencing is a bug, the CPython issue tracker is not
   the right place to seek help. Please consider one of the following options instead:
 
   - reading the Python tutorial: https://docs.python.org/3/tutorial/
-  - posting in the Users category here on discuss.python.org: https://discuss.python.org/c/users/7
+  - posting in the "Users" category on discuss.python.org: https://discuss.python.org/c/users/7
   - emailing the Python-list mailing list: https://mail.python.org/mailman/listinfo/python-list
-  - searching our issue tracker: https://github.com/python/cpython/issues to see if
-    it's already been reported
+  - searching our issue tracker (https://github.com/python/cpython/issues) to see if
+    your problem has already been reported
 -->
 
 **Bug Report**
diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
index 5357d7b269f556..0d2a2f5b231b1c 100644
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -5,7 +5,7 @@ labels: "type-crash"
 ---
 
 <!--
-  Please do not submit this form if you encounter an exception being raised in an unexpected place.
+  Please do not submit this form if you encounter an exception being unexectedly raised from a Python function.
   Most of the time, these should be filed as bugs, rather than crashes.
 
   The CPython interpreter is itself written in a different programming language, C.
@@ -18,7 +18,7 @@ Tell us what happened, ideally including a minimal, reproducible example (https:
 
 **Traceback**
 
-
+Enter the full traceback caused by the crash.
 
 **Your Environment**
 
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 05d22111a806c1..47862882829c77 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -19,4 +19,10 @@ labels: "type-feature"
   for example in the "ideas" category (https://discuss.python.org/c/ideas/6) of discuss.python.org,
   or the python-ideas mailing list (https://mail.python.org/mailman3/lists/python-ideas.python.org/).
   Use this space to post links to the places where you have already discussed this feature proposal:
+-->
+
+
+<!--
+You can freely edit this text, please remove all the lines
+you believe are unnecessary.
 -->
\ No newline at end of file

From 483632e542418a8a42bbc09b4b12488b75cef2a3 Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Fri, 15 Apr 2022 18:12:25 +0100
Subject: [PATCH 03/18] Apply suggestions from code review

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug.md      | 6 +++---
 .github/ISSUE_TEMPLATE/crash.md    | 6 +++---
 .github/ISSUE_TEMPLATE/security.md | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 327bd19935c1e3..0b4f23b58afee6 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,5 +1,5 @@
 ---
-name: Bug Report
+name: Bug report
 about: Submit a bug report
 labels: "type-bug"
 ---
@@ -15,12 +15,12 @@ labels: "type-bug"
     your problem has already been reported
 -->
 
-**Bug Report**
+**Bug report**
 
 A clear and concise description of what the bug is.
 Please include a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example), if possible.
 
-**Environment details**
+**Your environment**
 
 <!-- Include as many relevant details about the environment you experienced the bug in -->
 
diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
index 0d2a2f5b231b1c..f605d11c697af7 100644
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -1,5 +1,5 @@
 ---
-name: Crash Report
+name: Crash report
 about: A hard crash of the interpreter, possibly with a core dump
 labels: "type-crash"
 ---
@@ -12,7 +12,7 @@ labels: "type-crash"
   For CPython, a "crash" is when Python itself fails, leading to a traceback in the C stack.
 -->
 
-**Crash Report**
+**Crash report**
 
 Tell us what happened, ideally including a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example).
 
@@ -20,7 +20,7 @@ Tell us what happened, ideally including a minimal, reproducible example (https:
 
 Enter the full traceback caused by the crash.
 
-**Your Environment**
+**Your environment**
 
 <!-- Include as many relevant details about the environment you experienced the bug in -->
 
diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md
index 986cf54588aac8..2a4f7fce742f63 100644
--- a/.github/ISSUE_TEMPLATE/security.md
+++ b/.github/ISSUE_TEMPLATE/security.md
@@ -9,11 +9,11 @@ labels: "type-security"
   See here for further details: https://www.python.org/dev/security/
 -->
 
-**Security Vulnerability Report**
+**Security vulnerability report**
 
 A description of what the security vulnerability is.
 
-**Environment details**
+**Your environment**
 
 <!-- Include as many relevant details about your environment -->
 

From 5afdd72fd0521e6b2a70351b86a1313d8bcdb6d4 Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Fri, 15 Apr 2022 18:14:51 +0100
Subject: [PATCH 04/18] Improve words in `security` template

---
 .github/ISSUE_TEMPLATE/security.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md
index 2a4f7fce742f63..2fb46aafaa9268 100644
--- a/.github/ISSUE_TEMPLATE/security.md
+++ b/.github/ISSUE_TEMPLATE/security.md
@@ -1,5 +1,5 @@
 ---
-name: Security Report
+name: Security vulberability report
 about: Submit a report regarding a security vulnerability
 labels: "type-security"
 ---
@@ -15,7 +15,7 @@ A description of what the security vulnerability is.
 
 **Your environment**
 
-<!-- Include as many relevant details about your environment -->
+<!-- Include as many relevant details about your environment as possible -->
 
 - CPython versions tested on:
 - Operating system and version:

From b289c49a78c33e4f051f7a92e65f0db79ff0f365 Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Fri, 15 Apr 2022 18:16:43 +0100
Subject: [PATCH 05/18] Update bug.md

---
 .github/ISSUE_TEMPLATE/bug.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 0b4f23b58afee6..04e124f6d089ab 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -22,7 +22,7 @@ Please include a minimal, reproducible example (https://stackoverflow.com/help/m
 
 **Your environment**
 
-<!-- Include as many relevant details about the environment you experienced the bug in -->
+<!-- Include as many relevant details as possible about the environment you experienced the bug in -->
 
 - CPython versions tested on:
 - Operating system and version:

From d4eccad7440e5945a689cf3c49e085b49e5fd1dd Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Fri, 15 Apr 2022 18:17:59 +0100
Subject: [PATCH 06/18] Update crash.md

---
 .github/ISSUE_TEMPLATE/crash.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
index f605d11c697af7..3e81de017ea427 100644
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -22,7 +22,7 @@ Enter the full traceback caused by the crash.
 
 **Your environment**
 
-<!-- Include as many relevant details about the environment you experienced the bug in -->
+<!-- Include as many relevant details as possible about the environment you experienced the bug in -->
 
 - CPython versions tested on:
 - Operating system and version:

From 0664d48a78cb17c63d4bc3a26af9cb132707c32f Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Fri, 15 Apr 2022 18:24:41 +0100
Subject: [PATCH 07/18] Add link to security vulnerability website from first
 page

---
 .github/ISSUE_TEMPLATE/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 2cae75dff0225b..bae0e3343a03f7 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -5,3 +5,6 @@ contact_links:
   - about: "Large feature proposals, for example proposals for new syntax, should be discussed on an ideas forum rather than the issue tracker."
     name: "Proposing new features"
     url: "https://discuss.python.org/c/ideas/6"
+  - about: "Please see here for details on reporting security vulnerabilities in CPython"
+    name: "Reporting security vulnerabilities"
+    url: https://www.python.org/dev/security/

From 22ef7816ac22dacf27faa3a4d4246bb07d35890a Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Fri, 15 Apr 2022 18:25:55 +0100
Subject: [PATCH 08/18] Never edit on your phone

---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index bae0e3343a03f7..3350acb4b558fa 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -7,4 +7,4 @@ contact_links:
     url: "https://discuss.python.org/c/ideas/6"
   - about: "Please see here for details on reporting security vulnerabilities in CPython"
     name: "Reporting security vulnerabilities"
-    url: https://www.python.org/dev/security/
+    url: "https://www.python.org/dev/security/"

From a9aea8f06bffa332f7028be513d5394dbc93000c Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Fri, 15 Apr 2022 18:39:12 +0100
Subject: [PATCH 09/18] Apply suggestions from code review

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug.md      | 4 ++--
 .github/ISSUE_TEMPLATE/config.yml  | 2 +-
 .github/ISSUE_TEMPLATE/crash.md    | 2 +-
 .github/ISSUE_TEMPLATE/feature.md  | 2 +-
 .github/ISSUE_TEMPLATE/security.md | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 04e124f6d089ab..b69d0e37bdb272 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -6,7 +6,7 @@ labels: "type-bug"
 
 <!--
   If you're new to Python and you're not sure whether what you're experiencing is a bug, the CPython issue tracker is not
-  the right place to seek help. Please consider one of the following options instead:
+  the right place to seek help. Consider the following options instead:
 
   - reading the Python tutorial: https://docs.python.org/3/tutorial/
   - posting in the "Users" category on discuss.python.org: https://discuss.python.org/c/users/7
@@ -18,7 +18,7 @@ labels: "type-bug"
 **Bug report**
 
 A clear and concise description of what the bug is.
-Please include a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example), if possible.
+Include a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example), if possible.
 
 **Your environment**
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 3350acb4b558fa..84cfcfd09af6a8 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -5,6 +5,6 @@ contact_links:
   - about: "Large feature proposals, for example proposals for new syntax, should be discussed on an ideas forum rather than the issue tracker."
     name: "Proposing new features"
     url: "https://discuss.python.org/c/ideas/6"
-  - about: "Please see here for details on reporting security vulnerabilities in CPython"
+  - about: "See here for details on reporting security vulnerabilities in CPython"
     name: "Reporting security vulnerabilities"
     url: "https://www.python.org/dev/security/"
diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
index 3e81de017ea427..b84a225b882763 100644
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -5,7 +5,7 @@ labels: "type-crash"
 ---
 
 <!--
-  Please do not submit this form if you encounter an exception being unexectedly raised from a Python function.
+  Do not submit this form if you encounter an exception being unexpectedly raised from a Python function.
   Most of the time, these should be filed as bugs, rather than crashes.
 
   The CPython interpreter is itself written in a different programming language, C.
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 47862882829c77..84e4c1a4e0570e 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -10,7 +10,7 @@ labels: "type-feature"
 
 **Pitch**
 
-(Please explain why this feature should be implemented and how it would be used. Add examples, if applicable.)
+(Explain why this feature should be implemented and how it would be used. Add examples, if applicable.)
 
 **Previous discussion**
 
diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md
index 2fb46aafaa9268..213c7b4e7cdb7b 100644
--- a/.github/ISSUE_TEMPLATE/security.md
+++ b/.github/ISSUE_TEMPLATE/security.md
@@ -5,7 +5,7 @@ labels: "type-security"
 ---
 
 <!--
-  Please note that security issues should generally first be sent to the "security at python dot org" email address.
+  Note that security issues should generally first be sent to the "security at python dot org" email address.
   See here for further details: https://www.python.org/dev/security/
 -->
 

From fa7da16e1085305593e0107768cb61555be8f0e7 Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Fri, 15 Apr 2022 18:40:24 +0100
Subject: [PATCH 10/18] Update .github/ISSUE_TEMPLATE/config.yml

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 84cfcfd09af6a8..36ccf6d1642dfa 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 contact_links:
-  - about: "Please ask and answer any user questions about Python on discuss.python.org."
+  - about: "Ask and answer user questions about Python on discuss.python.org."
     name: "Getting help"
     url: "https://discuss.python.org/c/users/7"
   - about: "Large feature proposals, for example proposals for new syntax, should be discussed on an ideas forum rather than the issue tracker."

From 246ea0a836269e46f35f0ed18d35d22d96556f8c Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Fri, 15 Apr 2022 18:46:47 +0100
Subject: [PATCH 11/18] Apply suggestions from code review

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug.md      | 2 +-
 .github/ISSUE_TEMPLATE/crash.md    | 2 +-
 .github/ISSUE_TEMPLATE/feature.md  | 2 +-
 .github/ISSUE_TEMPLATE/security.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index b69d0e37bdb272..aae6bd7056fbdd 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -28,6 +28,6 @@ Include a minimal, reproducible example (https://stackoverflow.com/help/minimal-
 - Operating system and version:
 
 <!--
-You can freely edit this text, please remove all the lines
+You can freely edit this text. Remove any lines
 you believe are unnecessary.
 -->
diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
index b84a225b882763..14a5a1b2dd77bc 100644
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -28,6 +28,6 @@ Enter the full traceback caused by the crash.
 - Operating system and version:
 
 <!--
-You can freely edit this text, please remove all the lines
+You can freely edit this text. Remove any lines
 you believe are unnecessary.
 -->
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 84e4c1a4e0570e..56beff9b220592 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -23,6 +23,6 @@ labels: "type-feature"
 
 
 <!--
-You can freely edit this text, please remove all the lines
+You can freely edit this text. Remove any lines
 you believe are unnecessary.
 -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md
index 213c7b4e7cdb7b..73a4d76fe9e1e8 100644
--- a/.github/ISSUE_TEMPLATE/security.md
+++ b/.github/ISSUE_TEMPLATE/security.md
@@ -21,6 +21,6 @@ A description of what the security vulnerability is.
 - Operating system and version:
 
 <!--
-You can freely edit this text, please remove all the lines
+You can freely edit this text. Remove any lines
 you believe are unnecessary.
 -->

From 2a50b245d84a563a01d84063e2b4dcca0183932e Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Fri, 15 Apr 2022 20:15:12 +0100
Subject: [PATCH 12/18] Apply suggestions from code review

Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
---
 .github/ISSUE_TEMPLATE/config.yml  | 2 +-
 .github/ISSUE_TEMPLATE/security.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 36ccf6d1642dfa..b69568e7fa4d9d 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 contact_links:
-  - about: "Ask and answer user questions about Python on discuss.python.org."
+  - about: "Ask questions about using Python and debugging errors on Discourse."
     name: "Getting help"
     url: "https://discuss.python.org/c/users/7"
   - about: "Large feature proposals, for example proposals for new syntax, should be discussed on an ideas forum rather than the issue tracker."
diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md
index 73a4d76fe9e1e8..3e529066c6158a 100644
--- a/.github/ISSUE_TEMPLATE/security.md
+++ b/.github/ISSUE_TEMPLATE/security.md
@@ -1,5 +1,5 @@
 ---
-name: Security vulberability report
+name: Security vulnerability report
 about: Submit a report regarding a security vulnerability
 labels: "type-security"
 ---

From 642bc823cbbcdccd0838cd0e1a950b61cc4cb726 Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Fri, 15 Apr 2022 20:15:56 +0100
Subject: [PATCH 13/18] There might not be a traceback if there's a crash

Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
---
 .github/ISSUE_TEMPLATE/crash.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
index 14a5a1b2dd77bc..2eed9ae7cba221 100644
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -18,7 +18,7 @@ Tell us what happened, ideally including a minimal, reproducible example (https:
 
 **Traceback**
 
-Enter the full traceback caused by the crash.
+Enter the full traceback caused by the crash, if there is one.
 
 **Your environment**
 

From 4f1163474a80d577a01ffc70fe6ad0f78c924fee Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Fri, 15 Apr 2022 20:16:52 +0100
Subject: [PATCH 14/18] Update .github/ISSUE_TEMPLATE/config.yml

Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index b69568e7fa4d9d..0a3abce36904ed 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,7 +2,7 @@ contact_links:
   - about: "Ask questions about using Python and debugging errors on Discourse."
     name: "Getting help"
     url: "https://discuss.python.org/c/users/7"
-  - about: "Large feature proposals, for example proposals for new syntax, should be discussed on an ideas forum rather than the issue tracker."
+  - about: "Submit major feature proposal (e.g. syntax changes) to an ideas forum first."
     name: "Proposing new features"
     url: "https://discuss.python.org/c/ideas/6"
   - about: "See here for details on reporting security vulnerabilities in CPython"

From 1834c5c9ca6fb194f94fca04eed94e5d914887b4 Mon Sep 17 00:00:00 2001
From: AlexWaygood <alex.waygood@gmail.com>
Date: Fri, 15 Apr 2022 20:18:52 +0100
Subject: [PATCH 15/18] Reorder `config.yml` file

---
 .github/ISSUE_TEMPLATE/config.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 0a3abce36904ed..547c7241139851 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,10 +1,10 @@
 contact_links:
-  - about: "Ask questions about using Python and debugging errors on Discourse."
-    name: "Getting help"
+  - name: "Getting help"
+    about: "Ask questions about using Python and debugging errors on Discourse."
     url: "https://discuss.python.org/c/users/7"
-  - about: "Submit major feature proposal (e.g. syntax changes) to an ideas forum first."
-    name: "Proposing new features"
+  - name: "Proposing new features"
+    about: "Submit major feature proposal (e.g. syntax changes) to an ideas forum first."
     url: "https://discuss.python.org/c/ideas/6"
-  - about: "See here for details on reporting security vulnerabilities in CPython"
-    name: "Reporting security vulnerabilities"
+  - name: "Reporting security vulnerabilities"
+    about: "See here for details on reporting security vulnerabilities in CPython"
     url: "https://www.python.org/dev/security/"

From 9c96ec70d080a40bfce8ac63fc7599c99a10b02a Mon Sep 17 00:00:00 2001
From: AlexWaygood <alex.waygood@gmail.com>
Date: Fri, 15 Apr 2022 20:21:10 +0100
Subject: [PATCH 16/18] Fix Erlend's nits

---
 .github/ISSUE_TEMPLATE/bug.md      | 3 +--
 .github/ISSUE_TEMPLATE/crash.md    | 3 +--
 .github/ISSUE_TEMPLATE/feature.md  | 3 +--
 .github/ISSUE_TEMPLATE/security.md | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index aae6bd7056fbdd..821d989da925f8 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -28,6 +28,5 @@ Include a minimal, reproducible example (https://stackoverflow.com/help/minimal-
 - Operating system and version:
 
 <!--
-You can freely edit this text. Remove any lines
-you believe are unnecessary.
+You can freely edit this text. Remove any lines you believe are unnecessary.
 -->
diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
index 2eed9ae7cba221..94313c268b4ed1 100644
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -28,6 +28,5 @@ Enter the full traceback caused by the crash, if there is one.
 - Operating system and version:
 
 <!--
-You can freely edit this text. Remove any lines
-you believe are unnecessary.
+You can freely edit this text. Remove any lines you believe are unnecessary.
 -->
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 56beff9b220592..53312fd11bb2cc 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -23,6 +23,5 @@ labels: "type-feature"
 
 
 <!--
-You can freely edit this text. Remove any lines
-you believe are unnecessary.
+You can freely edit this text. Remove any lines you believe are unnecessary.
 -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md
index 3e529066c6158a..0337f470991be0 100644
--- a/.github/ISSUE_TEMPLATE/security.md
+++ b/.github/ISSUE_TEMPLATE/security.md
@@ -21,6 +21,5 @@ A description of what the security vulnerability is.
 - Operating system and version:
 
 <!--
-You can freely edit this text. Remove any lines
-you believe are unnecessary.
+You can freely edit this text. Remove any lines you believe are unnecessary.
 -->

From 6afef34193ff119eb83875e4c5f0eac88a614be0 Mon Sep 17 00:00:00 2001
From: AlexWaygood <alex.waygood@gmail.com>
Date: Fri, 15 Apr 2022 21:09:08 +0100
Subject: [PATCH 17/18] version -> architecture

---
 .github/ISSUE_TEMPLATE/bug.md      | 2 +-
 .github/ISSUE_TEMPLATE/crash.md    | 2 +-
 .github/ISSUE_TEMPLATE/security.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 821d989da925f8..7bdca2112b287b 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -25,7 +25,7 @@ Include a minimal, reproducible example (https://stackoverflow.com/help/minimal-
 <!-- Include as many relevant details as possible about the environment you experienced the bug in -->
 
 - CPython versions tested on:
-- Operating system and version:
+- Operating system and architecture:
 
 <!--
 You can freely edit this text. Remove any lines you believe are unnecessary.
diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
index 94313c268b4ed1..06d305cbc2404a 100644
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -25,7 +25,7 @@ Enter the full traceback caused by the crash, if there is one.
 <!-- Include as many relevant details as possible about the environment you experienced the bug in -->
 
 - CPython versions tested on:
-- Operating system and version:
+- Operating system and architecture:
 
 <!--
 You can freely edit this text. Remove any lines you believe are unnecessary.
diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md
index 0337f470991be0..fd45cae2d28d22 100644
--- a/.github/ISSUE_TEMPLATE/security.md
+++ b/.github/ISSUE_TEMPLATE/security.md
@@ -18,7 +18,7 @@ A description of what the security vulnerability is.
 <!-- Include as many relevant details about your environment as possible -->
 
 - CPython versions tested on:
-- Operating system and version:
+- Operating system and architecture:
 
 <!--
 You can freely edit this text. Remove any lines you believe are unnecessary.

From 534c60712706a5858cce7f95daba27270be04be3 Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Sat, 16 Apr 2022 01:32:55 +0100
Subject: [PATCH 18/18] Apply suggestions from code review

Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
---
 .github/ISSUE_TEMPLATE/crash.md   |  5 +++--
 .github/ISSUE_TEMPLATE/feature.md | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
index 06d305cbc2404a..28d7bfec193814 100644
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -5,6 +5,7 @@ labels: "type-crash"
 ---
 
 <!--
+  Use this template for hard crashes of the interpreter, segmentation faults, failed C-level assertions, and similar.
   Do not submit this form if you encounter an exception being unexpectedly raised from a Python function.
   Most of the time, these should be filed as bugs, rather than crashes.
 
@@ -16,9 +17,9 @@ labels: "type-crash"
 
 Tell us what happened, ideally including a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example).
 
-**Traceback**
+**Error messages**
 
-Enter the full traceback caused by the crash, if there is one.
+Enter any relevant error message caused by the crash, including a core dump if there is one.
 
 **Your environment**
 
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 53312fd11bb2cc..75ef03bea675c7 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -1,16 +1,17 @@
 ---
-name: Feature
-about: Submit a proposal for a new CPython feature
+name: Feature or enhancement
+about: Submit a proposal for a new CPython feature or enhancement
 labels: "type-feature"
 ---
 
-**Feature**
+**Feature or enhancement**
 
-(A clear and concise description of your feature proposal.)
+(A clear and concise description of your proposal.)
 
 **Pitch**
 
-(Explain why this feature should be implemented and how it would be used. Add examples, if applicable.)
+(Explain why this feature or enhacement should be implemented and how it would be used.
+ Add examples, if applicable.)
 
 **Previous discussion**