From f87e199e988f42fc490890eee0642d86c48c85ff Mon Sep 17 00:00:00 2001
From: "Nicholas C. Zakas" <nicholas@nczconsulting.com>
Date: Mon, 13 Sep 2021 17:31:47 -0700
Subject: [PATCH] Chore: Cleanup issue templates (#15039)

---
 .github/ISSUE_TEMPLATE/bug-report.yml  | 17 +++++++++++------
 .github/ISSUE_TEMPLATE/change.yml      |  6 +++++-
 .github/ISSUE_TEMPLATE/new-rule.yml    |  6 +++++-
 .github/ISSUE_TEMPLATE/rule-change.yml | 15 ++++++++++-----
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 0e1b0d29f08..4102d50a088 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -7,7 +7,7 @@ labels:
 body:
 - type: markdown
   attributes:
-    value: ESLint adheres to the [Open JS Foundation Code of Conduct](https://eslint.org/conduct). By opening an issue, you agree to abide by the code of conduct.
+    value: By opening an issue, you agree to abide by the [Open JS Foundation Code of Conduct](https://eslint.org/conduct).
 - type: textarea
   attributes:
     label: Environment
@@ -43,11 +43,14 @@ body:
     value: |
       <details>
       <summary>Configuration</summary>
-      <!-- Paste your configuration below: -->
-      ```js
-      
+      ```
+      <!-- Paste your configuration here -->
       ```
       </details>
+
+      ```js
+      <!-- Paste your code here -->
+      ```
     render: markdown
   validations:
     required: true
@@ -56,7 +59,6 @@ body:
     label: What did you expect to happen?
     description: |
       You can use Markdown in this field.
-    render: markdown
   validations:
     required: true
 - type: textarea
@@ -64,7 +66,6 @@ body:
     label: What actually happened?
     description: |
       Please copy-paste the actual ESLint output. You can use Markdown in this field.
-    render: markdown
   validations:
     required: true
 - type: checkboxes
@@ -73,3 +74,7 @@ body:
     options:
       - label: I am willing to submit a pull request for this issue.
         required: false
+- type: textarea
+  attributes:
+    label: Additional comments
+    description: Is there anything else that's important for the team to know?
diff --git a/.github/ISSUE_TEMPLATE/change.yml b/.github/ISSUE_TEMPLATE/change.yml
index b03711b118d..cc2066dd3d3 100644
--- a/.github/ISSUE_TEMPLATE/change.yml
+++ b/.github/ISSUE_TEMPLATE/change.yml
@@ -8,7 +8,7 @@ labels:
 body:
 - type: markdown
   attributes:
-    value: ESLint adheres to the [Open JS Foundation Code of Conduct](https://eslint.org/conduct). By opening an issue, you agree to abide by the code of conduct.
+    value: By opening an issue, you agree to abide by the [Open JS Foundation Code of Conduct](https://eslint.org/conduct).
 - type: input
   attributes:
     label: ESLint version
@@ -42,3 +42,7 @@ body:
     options:
       - label: I am willing to submit a pull request for this change.
         required: false
+- type: textarea
+  attributes:
+    label: Additional comments
+    description: Is there anything else that's important for the team to know?
diff --git a/.github/ISSUE_TEMPLATE/new-rule.yml b/.github/ISSUE_TEMPLATE/new-rule.yml
index 49b585bfab0..9ef139fbb23 100644
--- a/.github/ISSUE_TEMPLATE/new-rule.yml
+++ b/.github/ISSUE_TEMPLATE/new-rule.yml
@@ -7,7 +7,7 @@ labels:
 body:
 - type: markdown
   attributes:
-    value: ESLint adheres to the [Open JS Foundation Code of Conduct](https://eslint.org/conduct). By opening an issue, you agree to abide by the code of conduct.
+    value: By opening an issue, you agree to abide by the [Open JS Foundation Code of Conduct](https://eslint.org/conduct).
 - type: input
   attributes:
     label: Rule details
@@ -48,3 +48,7 @@ body:
     options:
       - label: I am willing to submit a pull request to implement this rule.
         required: false
+- type: textarea
+  attributes:
+    label: Additional comments
+    description: Is there anything else that's important for the team to know?
diff --git a/.github/ISSUE_TEMPLATE/rule-change.yml b/.github/ISSUE_TEMPLATE/rule-change.yml
index 4240aeef075..86758cba555 100644
--- a/.github/ISSUE_TEMPLATE/rule-change.yml
+++ b/.github/ISSUE_TEMPLATE/rule-change.yml
@@ -7,7 +7,7 @@ labels:
 body:
 - type: markdown
   attributes:
-    value: ESLint adheres to the [Open JS Foundation Code of Conduct](https://eslint.org/conduct). By opening an issue, you agree to abide by the code of conduct.
+    value: By opening an issue, you agree to abide by the [Open JS Foundation Code of Conduct](https://eslint.org/conduct).
 - type: input
   attributes:
     label: What rule do you want to change?
@@ -15,11 +15,12 @@ body:
     required: true
 - type: dropdown
   attributes:
-    label: Does this change cause the rule to produce more or fewer warnings?
+    label: What change to do you want to make?
     options:
-      - More warnings
-      - Fewer warnings
-      - No change to warnings
+      - Generate more warnings
+      - Generate fewer warnings
+      - Implement autofix
+      - Implement suggestions
   validations:
     required: true
 - type: dropdown
@@ -54,3 +55,7 @@ body:
     options:
       - label: I am willing to submit a pull request to implement this change.
         required: false
+- type: textarea
+  attributes:
+    label: Additional comments
+    description: Is there anything else that's important for the team to know?