From e49f508b04eade91be75252ba781925ad1100f53 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Fri, 3 Aug 2018 10:33:35 +0200
Subject: [PATCH] Update Github issue/pr templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 30 +++++++++++++++++------
 .github/ISSUE_TEMPLATE/documentation.md   | 16 +++++++-----
 .github/ISSUE_TEMPLATE/feature_request.md | 14 ++++++++---
 .github/ISSUE_TEMPLATE/question.md        | 16 ++++++------
 .github/PULL_REQUEST_TEMPLATE.md          |  7 +++---
 5 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index df2599a8..e9cc84c5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,28 +7,42 @@ about: Create a report to help us improve
 <!---
 1. Verify first that your issue/request is not already reported on GitHub.
 
-2. Fill out all required information below, otherwise it might take more time to properly handle this bug
+2. Verify that your question is not covered in the docs: https://devilbox.readthedocs.io
+
+3. PLEASE FILL OUT ALL REQUIRED INFORMATION BELOW! Otherwise it might take more time to properly handle this bug report.
 -->
 
+
 #### ISSUE TYPE
 <!-- DO NOT CHANGE THIS -->
  - Bug Report
+<!-- DO NOT CHANGE THIS -->
 
 
 #### OS / ENVIRONMENT
-<!-- Complete all bullet points -->
-* Host operating system:
-* Native Docker or Docker Toolbox:
-* Docker version:
-* Docker Compose version:
+<!-- COMPLETE ALL 6 BULLET POINTS BELOW: -->
+1. Host operating system: 
+2. Native Docker or Docker Toolbox: 
+3. Docker version: 
+4. Docker Compose version: 
+5. What containers are running: 
+6. Container versions: 
 
 
 #### SUMMARY
-<!--- Explain the problem briefly -->
+<!-- Explain the problem briefly -->
 
 
 #### STEPS TO REPRODUCE
-<!--- Show exactly how to reproduce the problem -->
+<!-- Show exactly how to reproduce the problem -->
+
+
+#### EXPECTED BEHAVIOUR
+<!-- What is the expected behaviour? -->
+
+
+#### ACTUAL BEHAVIOUR
+<!-- What is the actual behaviour? -->
 
 
 #### OTHER INFORMATION
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
index a209ccc9..b39ac8c7 100644
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -5,20 +5,24 @@ about: Anything related to the Devilbox documentation
 ---
 
 <!---
-1. Verify first that your issue/request is not already reported on GitHub.
+1. Verify first that your question is not already reported on GitHub.
 
-2. Fill out all required information below, otherwise it might take more time to properly handle this bug
+2. Verify that your question is not covered in the docs: https://devilbox.readthedocs.io
+
+3. PLEASE FILL OUT ALL REQUIRED INFORMATION BELOW! Otherwise it might take more time to properly handle this question.
 -->
 
+
 #### ISSUE TYPE
 <!-- DO NOT CHANGE THIS -->
  - Documentation
+<!-- DO NOT CHANGE THIS -->
 
 
 #### SUMMARY
-<!-- 
-Find the Documentation here: https://readthedocs.org/projects/devilbox/
+<!-- Add your information here -->
 
-Explain what is missing or wrong in the documentation and how it should be
--->
+
+#### Goal
+<!-- Explain what you actually want to accomplish -->
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index ec2311c3..d3c3c73e 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -5,16 +5,24 @@ about: Suggest an idea for this project
 ---
 
 <!---
-1. Verify first that your issue/request is not already reported on GitHub.
+1. Verify first that your feature request is not already reported on GitHub.
 
-2. Fill out all required information below, otherwise it might take more time to properly handle this bug
+2. Verify that your feature is not already implemented: https://devilbox.readthedocs.io
+
+3. PLEASE FILL OUT ALL REQUIRED INFORMATION BELOW! Otherwise it might take more time to properly handle this feature request
 -->
 
+
 #### ISSUE TYPE
 <!-- DO NOT CHANGE THIS -->
  - Feature request
+<!-- DO NOT CHANGE THIS -->
 
 
 #### SUMMARY
-<!--- Explain your feature idea briefly -->
+<!-- Explain your feature idea briefly -->
+
+
+#### Goal
+<!-- Explain what you actually want to accomplish with that feature -->
 
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 3c11c016..9e530e7c 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -5,22 +5,24 @@ about: General question
 ---
 
 <!---
-1. Verify first that your issue/request is not already reported on GitHub.
+1. Verify first that your question is not already reported on GitHub.
 
-2. Fill out all required information below, otherwise it might take more time to properly handle this bug
+2. Verify that your question is not covered in the docs: https://devilbox.readthedocs.io
+
+3. PLEASE FILL OUT ALL REQUIRED INFORMATION BELOW! Otherwise it might take more time to properly handle this question.
 -->
 
 
 #### ISSUE TYPE
 <!-- DO NOT CHANGE THIS -->
  - Question
+<!-- DO NOT CHANGE THIS -->
 
 
 #### SUMMARY
-<!--
-Ensure your question is not already covered by the documentation:
-https://readthedocs.org/projects/devilbox/
+<!-- Ask your question here -->
 
-Explain your question in detail below
--->
+
+#### Goal
+<!-- Explain what you actually want to accomplish -->
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 75085f54..0e94efb4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,9 @@
+<!-- Add a name to your PR below -->
 # FEATURE_NAME
 
-#### Short description
+
+#### DESCRIPTION
 
 <!-- Enter a short description here -->
 <!-- Link to issues in case it fixes an issue -->
 
-#### Tasks done
-
-* [ ] Updated `$DEVILBOX_DATE` in [config.php](https://github.com/cytopia/devilbox/blob/master/.devilbox/www/config.php#L17)