From 94e124cd23e5c2efdd0ad31c890efd86d6131454 Mon Sep 17 00:00:00 2001
From: Brian Downs <brian.downs@gmail.com>
Date: Tue, 5 May 2020 15:07:50 -0700
Subject: [PATCH 1/6] add pull request template

---
 .github/PULL_REQUEST_TEMPLATE.md | 7 +++++++
 BUILDING.md                      | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..b3a459565d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,7 @@
+**- Description**
+
+**- How to verify**
+
+**- Related Issue**
+
+( What issue does this pull request resolve? If there is no issue, please create one [here](https://github.com/rancher/k3s/issues). )
diff --git a/BUILDING.md b/BUILDING.md
index 3ecdb82d17..8b7cbba7b9 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -10,7 +10,7 @@ This repo includes all of Kubernetes history so `--depth 1` will avoid most of t
 
 To build the full release binary run `make` and that will create `./dist/artifacts/k3s`.
 
-Optionally to build the binaries using local go environment without running linting or building docker images:
+Optionally to build the binaries using local Go environment without running linting or building docker images:
 
 ```bash
 ./scripts/download && ./scripts/build && ./scripts/package-cli

From 76087fc833d4ef924b134a3f15d0a7bc68d638aa Mon Sep 17 00:00:00 2001
From: Brian Downs <brian.downs@gmail.com>
Date: Tue, 5 May 2020 15:14:38 -0700
Subject: [PATCH 2/6] update template

---
 .github/PULL_REQUEST_TEMPLATE.md | 46 +++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b3a459565d..d3cac96fbd 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,45 @@
-**- Description**
+<!-- HTML Comments can be left in place or removed, dealers choice. They are present simply to guide you on your pull-request journey. --> 
+Proposed changes
+======
+<!-- 
 
-**- How to verify**
+Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue.
 
-**- Related Issue**
+-->
 
-( What issue does this pull request resolve? If there is no issue, please create one [here](https://github.com/rancher/k3s/issues). )
+Types of changes
+======
+<!-- 
+
+What types of changes does your code introduce to Rancher?
+- Bugfix (non-breaking change which fixes an issue)
+- New feature (non-breaking change which adds functionality)
+- Breaking change (fix or feature that would cause existing functionality to not work as expected)
+
+-->
+
+Verification
+======
+<!---
+
+How can the changes be verified? Please provide whatever additional information necessary to help verify the proposed changes.
+
+-->
+
+Linked Issues
+======
+<!--
+
+Link any related issues, pull-requests, or commit hashes that are relavent to this pull-request.
+
+If you are opening a PR without a corresponding issue create an issue before you do, [here](https://github.com/rancher/k3s/issues). This will help QA massively. PR's opened without linked issues will not be merged until an issue is created and linked here. 
+
+--> 
+
+Further comments
+======
+<!-- 
+
+If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... 
+
+-->
\ No newline at end of file

From 2744ea370c4b23cc83715f36bbc4ecc6a24a2335 Mon Sep 17 00:00:00 2001
From: Brian Downs <brian.downs@gmail.com>
Date: Tue, 5 May 2020 15:22:35 -0700
Subject: [PATCH 3/6] Update .github/PULL_REQUEST_TEMPLATE.md

Co-authored-by: Jacob Blain Christen <dweomer5@gmail.com>
---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d3cac96fbd..3087f83b55 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -32,7 +32,7 @@ Linked Issues
 
 Link any related issues, pull-requests, or commit hashes that are relavent to this pull-request.
 
-If you are opening a PR without a corresponding issue create an issue before you do, [here](https://github.com/rancher/k3s/issues). This will help QA massively. PR's opened without linked issues will not be merged until an issue is created and linked here. 
+If you are opening a PR without a corresponding issue please consider creating one first, [here](https://github.com/rancher/k3s/issues). This will help QA massively. PR's opened without linked issues will not be merged until an issue is created and linked here. 
 
 --> 
 
@@ -42,4 +42,4 @@ Further comments
 
 If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... 
 
--->
\ No newline at end of file
+-->

From baf62051193f71457c453edb4f8f1a7540c5b5e9 Mon Sep 17 00:00:00 2001
From: Brian Downs <brian.downs@gmail.com>
Date: Tue, 5 May 2020 15:53:08 -0700
Subject: [PATCH 4/6] update template

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3087f83b55..11551159d6 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -30,7 +30,7 @@ Linked Issues
 ======
 <!--
 
-Link any related issues, pull-requests, or commit hashes that are relavent to this pull-request.
+Link any related issues, pull-requests, or commit hashes that are relavent to this pull request.
 
 If you are opening a PR without a corresponding issue please consider creating one first, [here](https://github.com/rancher/k3s/issues). This will help QA massively. PR's opened without linked issues will not be merged until an issue is created and linked here. 
 

From 8a8b47e3e3c3e097b008935caa4f07de316749bc Mon Sep 17 00:00:00 2001
From: Brian Downs <brian.downs@gmail.com>
Date: Tue, 5 May 2020 17:06:24 -0700
Subject: [PATCH 5/6] update template

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 11551159d6..4617d0252c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -20,7 +20,7 @@ What types of changes does your code introduce to Rancher?
 
 Verification
 ======
-<!---
+<!--
 
 How can the changes be verified? Please provide whatever additional information necessary to help verify the proposed changes.
 

From 58ad9b87bea35a7928334f38e1e17ebdc302e6ca Mon Sep 17 00:00:00 2001
From: Brian Downs <brian.downs@gmail.com>
Date: Thu, 7 May 2020 11:17:19 -0700
Subject: [PATCH 6/6] Update .github/PULL_REQUEST_TEMPLATE.md

Co-authored-by: Erik Wilson <Erik.E.Wilson@gmail.com>
---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4617d0252c..0382a8768a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -32,7 +32,7 @@ Linked Issues
 
 Link any related issues, pull-requests, or commit hashes that are relavent to this pull request.
 
-If you are opening a PR without a corresponding issue please consider creating one first, [here](https://github.com/rancher/k3s/issues). This will help QA massively. PR's opened without linked issues will not be merged until an issue is created and linked here. 
+If you are opening a PR without a corresponding issue please consider creating one first, [here](https://github.com/rancher/k3s/issues). A functional example will greatly help QA with verifying/reproducing a bug or testing new features.
 
 -->