From bd6fb455a526e64c752e60fc0ad4fdecd385ae04 Mon Sep 17 00:00:00 2001
From: tory-brown <vic3brown@gmail.com>
Date: Tue, 18 Aug 2020 14:21:29 +0100
Subject: [PATCH] Updated issue templates

Signed-off-by: tory-brown <vic3brown@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.md      | 14 ++++++-------
 .github/ISSUE_TEMPLATE/documentation.md   |  8 ++++----
 .github/ISSUE_TEMPLATE/feature_request.md | 24 ++++++++++++-----------
 .github/ISSUE_TEMPLATE/question.md        |  8 ++++----
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 1ac0be3..9f38c54 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,20 +1,20 @@
 ---
 name: Bug/issue report
-about: Report an issue to help us improve
+about: Report an issue to help improve the project.
 title: ''
-labels: 'bug'
+labels: 'kind/bug'
 assignees: ''
 ---
 **Description**
-A brief description of the issue.
+<!-- A brief description of the issue. -->
 
 **Expected Behavior**
-A brief description of what you expected to happen.
+<!-- A brief description of what you expected to happen. -->
 
 **Screenshots**
-Add screenshots, if applicable, to help explain your problem.
+<!-- Add screenshots, if applicable, to help explain your problem. -->
 
-**Enviroment:**
+**Environment:**
  - OS: [e.g. Ubuntu]
  - Browser: [e.g. Chrome, Safari]
  - Version: [e.g. 22]
@@ -29,4 +29,4 @@ Steps to reproduce the behavior:
 4. See error
 
 [Optional] **Additional Context**
-Add any other context about the problem here.
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
index 663c7d3..70b1e51 100644
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -1,8 +1,8 @@
 ---
 name: Documentation issue
-about: Issues related to documenation.
-title: ''
-labels: 'docs'
+about: Issues related to documentation.
+title: '[Docs]'
+labels: 'area/docs'
 assignees: ''
 ---
 **Current State:**
@@ -10,9 +10,9 @@ assignees: ''
 
 **Desired State:**
 
+
 ---
 **Contributor Resources**
-
 - [Meshery documentation site](https://meshery.layer5.io/docs/)
 - [Meshery documentation source](https://github.com/layer5io/meshery/tree/master/docs)
 - [Instructions for contributing to documentation](https://github.com/layer5io/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow)
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index ed6fc99..1e2d929 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,20 +1,22 @@
 ---
-name: Feature request
-about: Suggest an enhancement to this project
+name: Feature Request
+about: Suggest an enhancement to this project.
 title: ''
-labels: 'enhancement'
+labels: 'kind/enhancement'
 assignees: ''
 ---
 
-**Enhancement Description**
-A brief description of the enhancement.
+**Current Behavior**
+<!-- A brief description of what the problem is. (e.g. I need to be able to...) -->
+
+
+**Desired Behavior**
+<!-- A brief description of the enhancement. -->
 
-**Related Challenges**
-A brief description of what the problem is. (e.g. I need to be able to...)
 
 ---
-[Optional] **Alternatives**
-A brief description of any alternative solutions or features you've considered.
+**Resources**
+<!-- Helpful tools and reference information. -->
 
-[Optional] **Additional context**
-Add any other context or screenshots about the feature request here.
+**Alternatives / Additional Context**
+<!-- A brief description of any alternative solutions or features you've considered or other context that might be helpful. -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index aa1c5e5..7f076ef 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,11 +1,11 @@
 ---
 name: General question
 about: Request information about the project; clarify behavior of the software
-title: ''
-labels: 'question'
+title: '[Question]'
+labels: 'kind/question'
 assignees: ''
-
 ---
 
 **How can we help?**
-A brief description of what question(s) you have and how we can help clarify.
+<!-- A brief description of what question(s) you have and how we can help clarify. -->
+