Rework issue templates

.github/ISSUE_TEMPLATE/design_bug_report.md → .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,19 +1,26 @@
 ---
 name: Design Bug Report
 about: Found something which looks wrong in the Rust website design?
+labels: A-Design, C-Bug
 ---
 
-# Design Bug Report
-
-## Page(s) Affected
+### Page(s) Affected
+<!--
 Please list the page or pages this bug is present on. Please file one issue
 for each bug you find. Only file an issue for a multi-page bug if the bug is
 indeed the *same* bug, across the pages.
+-->
+
+### What needs to be fixed?
+<!--
+Tell us what is causing the issue and (if possible) *how* it is causing the
+issue.  For example, "The lowercase g (in 'Getting') overlaps with the l
+(in 'development').".
+-->
 
-## What needs to be fixed?
-Tell us what is causing the issue and (if possible) *how* it is causing the issue.
-For example, "The lowercase g (in 'Getting') overlaps with the l (in 'development').".
+### Suggested Improvement
+<!--
+(optional) Do you have a suggestion for how to fix the problem? Include your
+ideas here.
+-->
 
-## Suggested Improvement
-(optional) Do you have a suggestion for how to fix the problem? Include your ideas
-here.

.github/ISSUE_TEMPLATE/content_bug_report.md

@@ -1,20 +1,25 @@
 ---
-name: Content Bug Report
-about: Find a typo? Content out of date? Need a clarification?
+name: Incorrect Content
+about: Found a typo? Is content out of date? Need a clarification?
+labels: A-Content, C-Bug
 ---
 
-# Content Bug Report
+### What needs to be fixed?
+<!--
+Tell us what content is causing the issue and *how* it is causing the issue. For
+example, "The code sample was confusing because it used advanced Rust features",
+or "The call to action on the community page was vague".
+-->
 
-## Page(s) Affected
+### Page(s) Affected
+<!--
 Please list the page or pages this bug is present on. Please file one issue
 for each bug you find. Only file an issue for a multi-page bug if the bug is
 indeed the *same* bug, across the pages.
+-->
 
-## What needs to be fixed?
-Tell us what content is causing the issue and *how* it is causing the issue.
-For example, "The code sample was confusing because it used advanced Rust features",
-or "The call to action on the community page was vague".
-
-## Suggested Improvement
-(optional) Do you have a suggestion for how to fix the problem? Include your ideas
-here.
+### Suggested Improvement
+<!--
+(optional) Do you have a suggestion for how to fix the problem? Include your
+ideas here.
+-->

.github/ISSUE_TEMPLATE/design_feature_request.md → .github/ISSUE_TEMPLATE/feature_request.md

@@ -1,29 +1,42 @@
 ---
-name: Design Feature Request
-about: Want us to change a design element on the Rust website?
+name: Feature Request
+about: Would you like to add something to the Rust website?
+labels: C-Enhancement
 ---
 
-# Design Feature Request
-## Summary
+### Summary
+<!--
 One paragraph explanation of the design you'd like to see added.
+-->
 
-## Motivation
-Why are we doing this? What use cases does it support? What is the expected
-outcome?
+### Motivation
+<!--
+Why are we doing this? What use cases does it support? What is the
+expected outcome?
+-->
 
-## Drawbacks
+### Drawbacks
+<!--
 Why should we _not_ do this?
+-->
 
-## Rationale and alternatives
+### Rationale and alternatives
+<!--
 - Why is this design the best in the space of possible designs?
 - What other designs have been considered and what is the rationale for not
   choosing them?
 - What is the impact of not doing this?
+-->
 
-## Maintenance
+### Maintenance
+<!--
 How will this design be maintained? Who will do it?
+-->
 
-## Unresolved Questions
+### Unresolved Questions
+<!--
 What related issues do you consider out of scope for this feature that could be
 addressed in the future independently of the solution that comes out of this
 feature?
+-->
+