From 6c75e5468178dde841c6301d3bab6f091cca06e9 Mon Sep 17 00:00:00 2001
From: Alisdair McDiarmid <alisdair@users.noreply.github.com>
Date: Mon, 19 Sep 2022 10:11:36 -0400
Subject: [PATCH 1/3] Add initial pull request template

This is intended to add some structure to pull request descriptions, and
encourage peer review of changelog entries before merging a PR.
---
 .github/pull_request_template.md | 56 ++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 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 000000000000..68e1f58a774a
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,56 @@
+<!--
+
+Describe in detail the changes you are proposing, and the rationale.
+
+-->
+
+<!--
+
+Link any GitHub issues to be fixed by this PR, and add references to
+prior related PRs.
+
+-->
+
+Fixes #
+
+## Target Release
+
+<!--
+
+If targeting the next patch release, use the appropriate x.y-backport
+label to enable the backport bot.
+
+In normal circumstances we only target changes at the upcoming minor
+release, or as a patch to the current minor version. If you need to
+port a security fix to an older release, highlight this here.
+
+-->
+
+- [ ] 1.4.x
+- [ ] 1.3.x
+
+## Draft CHANGELOG entry
+
+<!--
+
+Choose a category:
+
+-->
+
+- [ ] NEW FEATURES
+- [ ] UPGRADE NOTES
+- [ ] ENHANCEMENTS
+- [ ] BUG FIXES
+- [ ] EXPERIMENTS
+
+<!--
+
+Write a short description of the user-facing change. Examples:
+
+- `terraform show -json`: Fixed crash with sensitive set values.
+- When rendering a diff, Terraform now quotes the name of any object attribute whose string representation is not a valid identifier.
+- The local token configuration in the cloud and remote backend now has higher priority than a token specified in a credentials block in the CLI configuration.
+
+--> 
+
+-  

From 99fcb747e994844bff020180d2a54018ebfbd3a6 Mon Sep 17 00:00:00 2001
From: Alisdair McDiarmid <alisdair@users.noreply.github.com>
Date: Mon, 19 Sep 2022 11:40:35 -0400
Subject: [PATCH 2/3] Revise markup to avoid unwanted checklist UI

---
 .github/pull_request_template.md | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 68e1f58a774a..dc72beadb858 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -17,31 +17,27 @@ Fixes #
 
 <!--
 
-If targeting the next patch release, use the appropriate x.y-backport
-label to enable the backport bot.
-
 In normal circumstances we only target changes at the upcoming minor
 release, or as a patch to the current minor version. If you need to
-port a security fix to an older release, highlight this here.
+port a security fix to an older release, highlight this here by listing
+all targeted releases.
+
+If targeting the next patch release, also add the relevant x.y-backport
+label to enable the backport bot.
 
 -->
 
-- [ ] 1.4.x
-- [ ] 1.3.x
+1.4.x
 
 ## Draft CHANGELOG entry
 
 <!--
 
-Choose a category:
+Choose a category, delete the others:
 
 -->
 
-- [ ] NEW FEATURES
-- [ ] UPGRADE NOTES
-- [ ] ENHANCEMENTS
-- [ ] BUG FIXES
-- [ ] EXPERIMENTS
+### NEW FEATURES | UPGRADE NOTES | ENHANCEMENTS | BUG FIXES | EXPERIMENTS
 
 <!--
 

From 3ff89c9cec3e9b30318939729aba87578e1f58e2 Mon Sep 17 00:00:00 2001
From: Alisdair McDiarmid <alisdair@users.noreply.github.com>
Date: Thu, 22 Sep 2022 09:17:31 -0400
Subject: [PATCH 3/3] Update pull_request_template.md

---
 .github/pull_request_template.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index dc72beadb858..dfa6b8241853 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,12 +2,16 @@
 
 Describe in detail the changes you are proposing, and the rationale.
 
+See the contributing guide:
+
+https://github.com/hashicorp/terraform/blob/main/.github/CONTRIBUTING.md
+
 -->
 
 <!--
 
-Link any GitHub issues to be fixed by this PR, and add references to
-prior related PRs.
+Link all GitHub issues fixed by this PR, and add references to prior
+related PRs.
 
 -->