Improve documentation templates

.gitlab/issue_templates/Documentation.md

@@ -4,21 +4,26 @@
   Note: Doc work as part of feature development is covered in the Feature Request template.
 
 * For issues related to features of the docs.gitlab.com site, see
-     https://gitlab.com/gitlab-org/gitlab-docs/issues/
+  https://gitlab.com/gitlab-org/gitlab-docs/issues/
 
 * For information about documentation content and process, see
-     https://docs.gitlab.com/ee/development/documentation/ -->
+  https://docs.gitlab.com/ee/development/documentation/
+-->
+
+- [ ] Start this issue's title with `Docs:` or `Docs feedback:`.
 
-### Problem to solve
+## Problem to solve
+
+<!--
+Include the following detail as necessary:
 
-<!-- Include the following detail as necessary:
 * What product or feature(s) affected?
 * What docs or doc section affected? Include links or paths.
 * Is there a problem with a specific document, or a feature/process that's not addressed sufficiently in docs?
 * Any other ideas or requests?
 -->
 
-### Further details
+## Further details
 
 <!--
 * Any concepts, procedures, reference info we could add to make it easier to successfully use GitLab?
@@ -28,16 +33,26 @@
   https://gitlab.com/groups/gitlab-org/-/labels?subscribed=&search=persona%3A
 -->
 
-### Proposal
+## Proposal
 
 <!-- Further specifics for how can we solve the problem. -->
 
-### Who can address the issue
+## Who can address the issue
 
 <!-- What if any special expertise is required to resolve this issue? -->
 
-### Other links/references
+## Other links/references
+
+<!-- For example, related GitLab issues/MRs -->
+
+/label ~"documentation"
+/label ~"docs-only"
+
+<!-- Keep one docs:: label, or leave as is to apply ~"docs::improvement"-->
+/label ~"docs::feature"
+/label ~"docs::fix"
+/label ~"docs::improvement"
 
-<!-- E.g. related GitLab issues/MRs -->
+/label ~"type::maintenance" ~"maintenance::refactor"
 
-/label ~documentation
+/milestone %Backlog

.gitlab/merge_request_templates/Documentation.md

@@ -46,5 +46,12 @@ If you aren't sure which tech writer to ask, use [roulette](https://gitlab-org.g
     - If the content still needs to be edited for topic types, you can create a follow-up issue with the ~"docs-technical-debt" label.
 - [ ] Review by assigned maintainer, who can always request/require the reviews above. Maintainer's review can occur before or after a technical writer review.
 
-/label ~documentation ~"type::maintenance" ~"docs::improvement" ~"maintenance::refactor" ~"docs-only"
+/label ~documentation
+/label ~"docs-only"
+
+/label ~"docs::feature"
+/label ~"docs::fix"
+/label ~"docs::improvement"
+
+/label ~"type::maintenance" ~"maintenance::refactor"
 /assign me