From 9387c1b758ac6dce8510ee6e637cf4f793fd9cd3 Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Fri, 10 Jun 2016 17:57:00 +0200
Subject: [PATCH] Update GitHub templates to reflect ansible/ansible (#3900)

* Update GitHub templates to reflect ansible/ansible

Update the GitHub templates to what is used for some time on ansible/ansible
For more information, see ansible/ansible#15961

* Small improvement from ansible/ansible
---
 lib/ansible/modules/.github/ISSUE_TEMPLATE.md       | 13 ++++++++-----
 .../modules/.github/PULL_REQUEST_TEMPLATE.md        | 13 +++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/ansible/modules/.github/ISSUE_TEMPLATE.md b/lib/ansible/modules/.github/ISSUE_TEMPLATE.md
index feb687200ed..cc50f9530da 100644
--- a/lib/ansible/modules/.github/ISSUE_TEMPLATE.md
+++ b/lib/ansible/modules/.github/ISSUE_TEMPLATE.md
@@ -10,8 +10,9 @@
 <!--- Name of the plugin/module/task -->
 
 ##### ANSIBLE VERSION
+<!--- Paste verbatim output from “ansible --version” between quotes below -->
 ```
-<!--- Paste verbatim output from “ansible --version” between quotes -->
+
 ```
 
 ##### CONFIGURATION
@@ -35,8 +36,9 @@ For bugs, show exactly how to reproduce the problem.
 For new features, show how the feature would be used.
 -->
 
+<!--- Paste example playbooks or commands between quotes below -->
 ```
-<!--- Paste example playbooks or commands between quotes -->
+
 ```
 
 <!--- You can also paste gist.github.com links for larger files -->
@@ -45,8 +47,9 @@ For new features, show how the feature would be used.
 <!--- What did you expect to happen when running the steps above? -->
 
 ##### ACTUAL RESULTS
-<!--- What actually happened? If possible run with high verbosity (-vvvv) -->
+<!--- What actually happened? If possible run with extra verbosity (-vvvv) -->
+
+<!--- Paste verbatim command output between quotes below -->
+```
 
 ```
-<!--- Paste verbatim command output between quotes -->
-```
diff --git a/lib/ansible/modules/.github/PULL_REQUEST_TEMPLATE.md b/lib/ansible/modules/.github/PULL_REQUEST_TEMPLATE.md
index d8b8e17cbd5..5cfd027103a 100644
--- a/lib/ansible/modules/.github/PULL_REQUEST_TEMPLATE.md
+++ b/lib/ansible/modules/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,22 +6,23 @@
  - Docs Pull Request
 
 ##### COMPONENT NAME
-<!--- Name of the plugin/module/task  -->
+<!--- Name of the plugin/module/task -->
 
 ##### ANSIBLE VERSION
+<!--- Paste verbatim output from “ansible --version” between quotes below -->
 ```
-<!--- Paste verbatim output from “ansible --version” between quotes -->
+
 ```
 
 ##### SUMMARY
 <!--- Describe the change, including rationale and design decisions -->
 
 <!---
-If you are fixing an existing issue, please include "Fixes #nnn" in your
-commit message and your description; but you should still explain what
-the change does.
+If you are fixing an existing issue, please include "Fixes #nnnn" in your commit
+message and your description; but you should still explain what the change does.
 -->
 
+<!--- Paste verbatim command output below, e.g. before and after your change -->
 ```
-<!--- Paste verbatim command output here, e.g. before and after your change -->
+
 ```