From a32318d24688e92b8c1e54100f1fdf9699d2e68b Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Thu, 30 Apr 2020 10:38:31 +0000
Subject: [PATCH] Improve issue templates

---
 .github/ISSUE_TEMPLATE/bug.md  | 32 ++++++++++++++++++--------------
 .github/ISSUE_TEMPLATE/help.md | 30 +++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 0819d862..8e001894 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -7,19 +7,26 @@ assignees: qdm12
 
 ---
 
-1. What VPN service provider are you using?
+**TLDR**: *Describe your issue in a one liner here*
+
+1. Is this urgent?
+
+    - [ ] Yes
+    - [x] No
+
+2. What VPN service provider are you using?
 
     - [x] PIA
     - [ ] Mullvad
     - [ ] Windscribe
 
-2. What's the version of the program?
+3. What's the version of the program?
 
     **See the line at the top of your logs**
 
     `Running version latest built on 2020-03-13T01:30:06Z (commit d0f678c)`
 
-3. What are you using to run the container?
+4. What are you using to run the container?
 
     - [ ] Docker run
     - [x] Docker Compose
@@ -29,21 +36,18 @@ assignees: qdm12
     - [ ] Podman
     - [ ] Other:
 
-4. What's wrong? (please share some of your logs, and maybe configuration)
+5. Extra information
 
-    Logs
+Logs:
 
-    ```log
+```log
 
-    ```
+```
 
-    Configuration file:
+Configuration file:
 
-    ```yml
+```yml
 
-    ```
+```
 
-5. Is this urgent?
-
-    - [ ] Yes
-    - [x] No
+Host OS:
diff --git a/.github/ISSUE_TEMPLATE/help.md b/.github/ISSUE_TEMPLATE/help.md
index 0cdbeaf0..09fb9e95 100644
--- a/.github/ISSUE_TEMPLATE/help.md
+++ b/.github/ISSUE_TEMPLATE/help.md
@@ -7,19 +7,26 @@ assignees:
 
 ---
 
-1. What VPN service provider are you using?
+**TLDR**: *Describe your issue in a one liner here*
+
+1. Is this urgent?
+
+    - [ ] Yes
+    - [x] No
+
+2. What VPN service provider are you using?
 
     - [x] PIA
     - [ ] Mullvad
     - [ ] Windscribe
 
-2. What's the version of the program?
+3. What's the version of the program?
 
     **See the line at the top of your logs**
 
     `Running version latest built on 2020-03-13T01:30:06Z (commit d0f678c)`
 
-3. What are you using to run the container?
+4. What are you using to run the container?
 
     - [ ] Docker run
     - [x] Docker Compose
@@ -29,9 +36,18 @@ assignees:
     - [ ] Podman
     - [ ] Other:
 
-4. What's the problem?
+5. Extra information
 
-5. Is this urgent?
+Logs:
 
-    - [ ] Yes
-    - [x] No
+```log
+
+```
+
+Configuration file:
+
+```yml
+
+```
+
+Host OS: