From 09703609fc2432ecf086b8fe45d6b324c5a923c9 Mon Sep 17 00:00:00 2001
From: Tom Lant <lampholder@gmail.com>
Date: Mon, 14 Aug 2017 14:35:25 +0100
Subject: [PATCH 1/5] Create ISSUE_TEMPLATE.md

A new issue template proposed to try and steer people towards #matrix:matrix.org for support queries relating to running their own homeserver.
---
 ISSUE_TEMPLATE.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 ISSUE_TEMPLATE.md

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..61d8b59eb0
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,36 @@
+<!-- 
+
+**IF YOU HAVE SUPPORT QUESTIONS ABOUT RUNNING OR CONFIGURING YOUR OWN HOME SERVER**: 
+PLease don't file a bug; you will likely get better support more quickly if you 
+ask in #matrix:matrix.org ;)
+
+
+This is a bug report template. By following the instructions below and
+filling out the sections with your information, you will help the us to get all
+the necessary data to fix your issue.
+
+You can also preview your report before submitting it. You may remove sections
+that aren't relevant to your particular case.
+
+Text between <!-- and --​> marks will be invisible in the report.
+-->
+
+### Description
+
+Describe here the problem that you are experiencing, or the feature you are requesting.
+
+### Steps to reproduce
+
+- For bugs, list the steps
+- that reproduce the bug
+- using hyphens as bullet points
+
+Describe how what happens differs from what you expected.
+
+### Version information
+
+<!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
+
+- **Homeserver**: was this issue identified on matrix.org or another homeserver?
+- **Platform**:   tell us about the environment in which your homeserver is operating
+                  - distro, hardware, if it's running in a vm/container, etc.

From b524dd4c355700e449ff5806514527e7b040ac5c Mon Sep 17 00:00:00 2001
From: Tom Lant <lampholder@gmail.com>
Date: Mon, 14 Aug 2017 14:36:49 +0100
Subject: [PATCH 2/5] Update ISSUE_TEMPLATE.md

Oops capital L.
---
 ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 61d8b59eb0..e5415a202b 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!-- 
 
 **IF YOU HAVE SUPPORT QUESTIONS ABOUT RUNNING OR CONFIGURING YOUR OWN HOME SERVER**: 
-PLease don't file a bug; you will likely get better support more quickly if you 
+Please don't file a bug; you will likely get better support more quickly if you 
 ask in #matrix:matrix.org ;)
 
 

From 57cd0c3deac77741f335f1e72a29029f36955284 Mon Sep 17 00:00:00 2001
From: Tom Lant <lampholder@gmail.com>
Date: Mon, 14 Aug 2017 14:40:32 +0100
Subject: [PATCH 3/5] Update ISSUE_TEMPLATE.md

Removed the sentence encouraging people not to file a bug - if people are in doubt we'd rather they filed a bug than gave up entirely.
---
 ISSUE_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index e5415a202b..a3ca19ff72 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,8 +1,7 @@
 <!-- 
 
 **IF YOU HAVE SUPPORT QUESTIONS ABOUT RUNNING OR CONFIGURING YOUR OWN HOME SERVER**: 
-Please don't file a bug; you will likely get better support more quickly if you 
-ask in #matrix:matrix.org ;)
+You will likely get better support more quickly if you ask in ** #matrix:matrix.org ** ;)
 
 
 This is a bug report template. By following the instructions below and
@@ -13,6 +12,7 @@ You can also preview your report before submitting it. You may remove sections
 that aren't relevant to your particular case.
 
 Text between <!-- and --​> marks will be invisible in the report.
+
 -->
 
 ### Description

From ec3a2dc773d70e6d19e4c1f75571b5f2a313cb16 Mon Sep 17 00:00:00 2001
From: Tom Lant <lampholder@gmail.com>
Date: Thu, 17 Aug 2017 11:00:51 +0100
Subject: [PATCH 4/5] Update ISSUE_TEMPLATE.md

Responding to review comments.
---
 ISSUE_TEMPLATE.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index a3ca19ff72..a03285bc4e 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -27,10 +27,17 @@ Describe here the problem that you are experiencing, or the feature you are requ
 
 Describe how what happens differs from what you expected.
 
+If you can identify any relevant log snippets from _homeserver.log_, please include
+those here (please be careful to remove any personal or private data):
+
 ### Version information
 
 <!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
 
-- **Homeserver**: was this issue identified on matrix.org or another homeserver?
-- **Platform**:   tell us about the environment in which your homeserver is operating
-                  - distro, hardware, if it's running in a vm/container, etc.
+- **Homeserver**: Was this issue identified on matrix.org or another homeserver?
+
+If not matrix.org:
+- **Version**:        What version of Synapse is running?
+- **Install method**: package manager/git clone/pip      
+- **Platform**:       Tell us about the environment in which your homeserver is operating
+                      - distro, hardware, if it's running in a vm/container, etc.

From 413c2707236aa0a7e96e23eae1f760826163cc5a Mon Sep 17 00:00:00 2001
From: Tom Lant <lampholder@gmail.com>
Date: Thu, 17 Aug 2017 11:14:35 +0100
Subject: [PATCH 5/5] Update ISSUE_TEMPLATE.md

Added instructions for checking server version.
---
 ISSUE_TEMPLATE.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index a03285bc4e..d2050a3e44 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -37,7 +37,11 @@ those here (please be careful to remove any personal or private data):
 - **Homeserver**: Was this issue identified on matrix.org or another homeserver?
 
 If not matrix.org:
-- **Version**:        What version of Synapse is running?
+- **Version**:        What version of Synapse is running? <!-- 
+You can find the Synapse version by inspecting the server headers (replace matrix.org with
+your own homeserver domain):
+$ curl -v https://matrix.org/_matrix/client/versions 2>&1 | grep "Server:"
+-->
 - **Install method**: package manager/git clone/pip      
 - **Platform**:       Tell us about the environment in which your homeserver is operating
                       - distro, hardware, if it's running in a vm/container, etc.