From c5636525748c5602d0dcc53dced91e5da7da3559 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Thu, 23 Jan 2020 11:55:29 +0100
Subject: [PATCH] Cleanup of PR and issue templates (#31070)

* Remove old issue template

* Small wording improvement

* Consistency

* Configuration fix

* Process review suggestions
---
 .github/ISSUE_TEMPLATE.md            | 48 ----------------------------
 .github/ISSUE_TEMPLATE/BUG_REPORT.md | 28 ++++++++--------
 .github/ISSUE_TEMPLATE/config.yml    |  4 +--
 3 files changed, 16 insertions(+), 64 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index f68fbbc800c..00000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- READ THIS FIRST:
-- If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
-- Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
-- Frontend issues should be submitted to the home-assistant-polymer repository: https://github.com/home-assistant/home-assistant-polymer/issues
-- iOS issues should be submitted to the home-assistant-iOS repository: https://github.com/home-assistant/home-assistant-iOS/issues
-- Android issues should be submitted to the home-assistant-android repository: https://github.com/home-assistant/home-assistant-android/issues
-- Do not report issues for integrations if you are using custom integration: files in <config-dir>/custom_components
-- This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
-- Provide as many details as possible. Paste logs, configuration sample and code into the backticks. Do not delete any text from this template!
--->
-
-**Home Assistant release with the issue:**
-<!--
-- Frontend -> Developer tools -> Info
-- Or use this command: hass --version
--->
-
-
-**Last working Home Assistant release (if known):**
-
-
-**Operating environment (Hass.io/Docker/Windows/etc.):**
-<!--
-Please provide details about your environment.
--->
-
-**Integration:**
-<!--
-Please add the link to the documentation at https://www.home-assistant.io/integrations/ of the integration in question.
--->
-
-
-**Description of problem:**
-
-
-
-**Problem-relevant `configuration.yaml` entries and (fill out even if it seems unimportant):**
-```yaml
-
-```
-
-**Traceback (if applicable):**
-```
-
-```
-
-**Additional information:**
-
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
index 34c023c4410..977abc6ef6b 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -3,24 +3,24 @@ name: Report a bug with Home Assistant
 about: Report an issue with Home Assistant
 ---
 <!-- READ THIS FIRST:
-- If you need additional help with this template, please refer to https://www.home-assistant.io/help/reporting_issues/
-- Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
-- Do not report issues for integrations if you are using custom components or integrations.
-- Provide as many details as possible. Paste logs, configuration samples and code into the backticks.
-DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed without comment.
+  - If you need additional help with this template, please refer to https://www.home-assistant.io/help/reporting_issues/
+  - Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
+  - Do not report issues for integrations if you are using custom components or integrations.
+  - Provide as many details as possible. Paste logs, configuration samples and code into the backticks.
+  DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed without comment.
 -->
 ## The problem
 <!-- 
-    Describe the issue you are experiencing here to communicate to the
-    maintainers. Tell us what you were trying to do and what happened instead.
+  Describe the issue you are experiencing here to communicate to the
+  maintainers. Tell us what you were trying to do and what happened instead.
 -->
 
 
 ## Environment
 <!--
-    Provide details about the versions you are using, which helps us reproducing
-    and finding the issue quicker. Version information is found in the
-    Home Assistant frontend: Developer tools -> Info.
+  Provide details about the versions you are using, which helps us to reproduce
+  and find the issue quicker. Version information is found in the
+  Home Assistant frontend: Developer tools -> Info.
 -->
 
 - Home Assistant release with the issue: 
@@ -31,9 +31,9 @@ DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed w
 
 ## Problem-relevant `configuration.yaml`
 <!--
-    An example configuration that caused the problem for you. Fill this out even
-    if it seems unimportant to you. Please be sure to remove personal information
-    like password other credentials.
+  An example configuration that caused the problem for you. Fill this out even
+  if it seems unimportant to you. Please be sure to remove personal information
+  like passwords, private URLs and other credentials.
 -->
 
 ```yaml
@@ -42,7 +42,7 @@ DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed w
 
 ## Traceback/Error logs
 <!--
-    If you come across any trace or error logs, please provide them.
+  If you come across any trace or error logs, please provide them.
 -->
 
 ```txt
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index de21025840d..5b0b8c46e96 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,9 +2,9 @@ blank_issues_enabled: false
 contact_links:
   - name: Report a bug with the UI, Frontend or Lovelace
     url: https://github.com/home-assistant/home-assistant-polymer/issues
-    about: This is the issue tracker for our backed. Please report issues with the UI in the frontend repository.
+    about: This is the issue tracker for our backend. Please report issues with the UI in the frontend repository.
   - name: Report incorrect or missing information on our website
-    urls: https://github.com/home-assistant/home-assistant.io/issues
+    url: https://github.com/home-assistant/home-assistant.io/issues
     about: Our documentation has its own issue tracker. Please report issues with the website there.
   - name: I have a question or need support
     url: https://www.home-assistant.io/help