From 551c22247d11e108093047dcbf915578737e50ca Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 23 Feb 2021 10:23:58 -0700
Subject: [PATCH 1/2] Override issue templates from org

We don't need OS information for a bug report here.
---
 .github/ISSUE_TEMPLATE/clarification.md | 13 +++++++++++++
 .github/ISSUE_TEMPLATE/config.yaml      |  8 ++++++++
 .github/ISSUE_TEMPLATE/cosmetic-bug.md  | 13 +++++++++++++
 .github/ISSUE_TEMPLATE/idea.md          | 12 ++++++++++++
 .github/ISSUE_TEMPLATE/spec-bug.md      | 16 ++++++++++++++++
 5 files changed, 62 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/clarification.md
 create mode 100644 .github/ISSUE_TEMPLATE/config.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/cosmetic-bug.md
 create mode 100644 .github/ISSUE_TEMPLATE/idea.md
 create mode 100644 .github/ISSUE_TEMPLATE/spec-bug.md

diff --git a/.github/ISSUE_TEMPLATE/clarification.md b/.github/ISSUE_TEMPLATE/clarification.md
new file mode 100644
index 00000000..1aaa35c6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/clarification.md
@@ -0,0 +1,13 @@
+---
+name: Clarity problem
+about: Report an area of the spec that is unclear.
+title: ''
+labels: 'clarification'
+assignees: ''
+
+---
+
+**Link to problem area**:
+
+**Issue**
+What is wrong? How can we improve?
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
new file mode 100644
index 00000000..79bc995d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+ - name: Matrix Spec Discussion
+   url: "https://matrix.to/#/#matrix-spec:matrix.org"
+   about: Questions about the spec and proposal process can be asked here.
+ - name: Matrix Security Policy
+   url: https://www.matrix.org/security-disclosure-policy/
+   about: Learn more about our security disclosure policy.
diff --git a/.github/ISSUE_TEMPLATE/cosmetic-bug.md b/.github/ISSUE_TEMPLATE/cosmetic-bug.md
new file mode 100644
index 00000000..1012302b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/cosmetic-bug.md
@@ -0,0 +1,13 @@
+---
+name: Cosmetic issue
+about: Report an issue with how the spec looks.
+title: ''
+labels: 'aesthetic'
+assignees: ''
+
+---
+
+**Link to problem area**:
+
+**Issue**
+What is wrong? What can we do to improve?
diff --git a/.github/ISSUE_TEMPLATE/idea.md b/.github/ISSUE_TEMPLATE/idea.md
new file mode 100644
index 00000000..3f834244
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/idea.md
@@ -0,0 +1,12 @@
+---
+name: Feature request
+about: Suggest a future MSC idea.
+title: ''
+labels: 'improvement'
+assignees: ''
+
+---
+
+**Suggestion**
+What would you like to see in Matrix? If your idea is vaguely complete enough, we
+recommend submitting [an MSC](https://matrix.org/docs/spec/proposals) instead.
diff --git a/.github/ISSUE_TEMPLATE/spec-bug.md b/.github/ISSUE_TEMPLATE/spec-bug.md
new file mode 100644
index 00000000..590234ca
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/spec-bug.md
@@ -0,0 +1,16 @@
+---
+name: Documentation error
+about: Report an issue with the spec itself (incorrect text).
+title: ''
+labels: 'spec-bug'
+assignees: ''
+
+---
+
+**Link to problem area**:
+
+**Issue**
+What is wrong?
+
+**Expected behaviour**
+How can the issue be fixed? Links to implementations/documents which prove the spec is wrong are appreciated.

From 7da1ed51a3fcb0f6c8386caaf3555fda11d0088d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 23 Feb 2021 10:28:21 -0700
Subject: [PATCH 2/2] Update idea.md

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

diff --git a/.github/ISSUE_TEMPLATE/idea.md b/.github/ISSUE_TEMPLATE/idea.md
index 3f834244..028012a5 100644
--- a/.github/ISSUE_TEMPLATE/idea.md
+++ b/.github/ISSUE_TEMPLATE/idea.md
@@ -1,5 +1,5 @@
 ---
-name: Feature request
+name: Spec idea
 about: Suggest a future MSC idea.
 title: ''
 labels: 'improvement'