From e93fe247d19e1cf9129e153f1e1cc00bbccbdc3f Mon Sep 17 00:00:00 2001
From: Bill Little <bill.james.little@gmail.com>
Date: Fri, 4 Sep 2020 09:12:13 +0100
Subject: [PATCH 1/2] tidy issue templates

---
 .../{---bug-report.md => bug-report.md}               | 10 +++++-----
 .github/ISSUE_TEMPLATE/config.yml                     |  2 ++
 .../{---documentation.md => documentation.md}         |  4 ++--
 .../{-feature-request.md => feature-request.md}       |  8 ++++----
 .github/ISSUE_TEMPLATE/issue.md                       | 11 +++++++++++
 5 files changed, 24 insertions(+), 11 deletions(-)
 rename .github/ISSUE_TEMPLATE/{---bug-report.md => bug-report.md} (62%)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 rename .github/ISSUE_TEMPLATE/{---documentation.md => documentation.md} (55%)
 rename .github/ISSUE_TEMPLATE/{-feature-request.md => feature-request.md} (57%)
 create mode 100644 .github/ISSUE_TEMPLATE/issue.md

diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
similarity index 62%
rename from .github/ISSUE_TEMPLATE/---bug-report.md
rename to .github/ISSUE_TEMPLATE/bug-report.md
index f36cdc6efd..f2ca77972e 100644
--- a/.github/ISSUE_TEMPLATE/---bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 ## 🐛 Bug Report
-<!-- a clear description of what the bug is -->
+<!-- Provide a clear description of what the bug is -->
 
 ## How To Reproduce
 Steps to reproduce the behaviour:
@@ -21,11 +21,11 @@ Steps to reproduce the behaviour:
 <!-- A clear and concise description of what you expected to happen -->
 
 ## Screenshots
-<!-- If applicable, add screenshots to help explain your problem. -->
+<!-- If applicable, add screenshots to help explain your problem -->
 
 ## Environment 
- - OS & Version: [e.g. Ubuntu 20.04 LTS]
- - Iris Version.  [e.g. From the command line run `python -c "import iris; print(iris.__version__)"`]
+ - OS & Version: [e.g., Ubuntu 20.04 LTS]
+ - Iris Version.  [e.g., From the command line run `python -c "import iris; print(iris.__version__)"`]
 
 ## Additional context
-<!--  Add any other context about the problem here. -->
+<!-- Provide any further information to help us understand -->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..6d8befbe3c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,2 @@
+# reference: https://docs.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/---documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
similarity index 55%
rename from .github/ISSUE_TEMPLATE/---documentation.md
rename to .github/ISSUE_TEMPLATE/documentation.md
index de28de303c..8caa62a1c7 100644
--- a/.github/ISSUE_TEMPLATE/---documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -8,5 +8,5 @@ assignees: ''
 ---
 
 ## 📚 Documentation
-<!--  https://scitools-iris.readthedocs.io/en/latest/ -->
-<!-- Describe an issue or suggestion for improving the documentation -->
+<!-- See https://scitools-iris.readthedocs.io/en/latest/ -->
+<!-- Describe the issue or provide a suggestion for improving the Iris documentation -->
diff --git a/.github/ISSUE_TEMPLATE/-feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
similarity index 57%
rename from .github/ISSUE_TEMPLATE/-feature-request.md
rename to .github/ISSUE_TEMPLATE/feature-request.md
index 4ad248deb8..e8b1c3894c 100644
--- a/.github/ISSUE_TEMPLATE/-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,5 +1,5 @@
 ---
-name: "⚙Feature Request"
+name: "⚙ Feature Request"
 about: Submit a request for a new feature in Iris
 title: ''
 labels: 'New: Feature'
@@ -7,12 +7,12 @@ assignees: ''
 
 ---
 
-##  ⚙Feature Request
-<!-- A clear and concise description of the feature proposal -->
+## ⚙ Feature Request
+<!-- Provide a clear and concise description of the feature proposal -->
 
 ## Motivation
 <!-- Is your feature request related to an existing issue? -->
 <!-- I'm always frustrated when ... -->
 
 ## Additional context
-<!-- any other useful information -->
+<!-- Provide any further information to help us understand -->
diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md
new file mode 100644
index 0000000000..e66042609c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue.md
@@ -0,0 +1,11 @@
+---
+name: "\U0001F4F0 Custom Issue"
+about: Submit a generic issue to help us improve Iris
+title: ''
+labels: 'New: Issue'
+assignees: ''
+
+---
+
+## 📰 Custom Issue
+<!-- Provide a clear description of what the issue is, and we'll try our best to help 😀 -->

From 6138644b1ba5e526ad20054922ff855b9174a8d7 Mon Sep 17 00:00:00 2001
From: Bill Little <bill.james.little@gmail.com>
Date: Fri, 4 Sep 2020 12:04:51 +0100
Subject: [PATCH 2/2] review actions

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

diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index f2ca77972e..9bb783574f 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -25,7 +25,7 @@ Steps to reproduce the behaviour:
 
 ## Environment 
  - OS & Version: [e.g., Ubuntu 20.04 LTS]
- - Iris Version.  [e.g., From the command line run `python -c "import iris; print(iris.__version__)"`]
+ - Iris Version: [e.g., From the command line run `python -c "import iris; print(iris.__version__)"`]
 
 ## Additional context
 <!-- Provide any further information to help us understand -->