From d7a00bc6675d37e7197c1d6391139b682ff3d1c3 Mon Sep 17 00:00:00 2001
From: Martin Kraft <martinkraft@gmail.com>
Date: Fri, 15 Jan 2021 21:33:13 -0500
Subject: [PATCH] Expands release note instructions. (#16696)

* Expands release note instructions.

* Updates pluralization for consistency.

* Removes explicit reference to release note block.

* Removes unnecessary reason for past-tense.

* Adds message about newlines being stripped.

* Adds other criteria for release notes.
---
 .github/PULL_REQUEST_TEMPLATE.md | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 83e1b7a465..7e4fd47357 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -18,11 +18,35 @@ If this pull request addresses a Help Wanted ticket, please link the relevant Gi
 
 Otherwise, link the JIRA ticket.
 -->
+
 #### Release Note
 <!--
-If no release notes are required, just write "NONE" in the release-note block below.
-If yes, a release note is required:
-Enter your past-tense release note in the block below.
+Add a release note for each of the following conditions:
+
+* Config changes (additions, deletions, updates)
+* API additions—new endpoint, new response fields, or newly accepted request parameters
+* Database changes (any)
+* Websocket additions or changes
+* Anything noteworthy to a Mattermost instance administrator (err on the side of over-communicating)
+* New features and improvements, including behavioural changes, UI changes and CLI changes
+* Bug fixes and fixes of previous known issues
+* Deprecation warnings, breaking changes, or compatibility notes
+
+If no release notes are required write NONE. Use past-tense. Newlines are stripped.
+
+Examples:
+
+```release-note
+Added new API endpoints POST /api/v4/foo, GET api/v4/foo, and GET api/v4/foo/:foo_id.
+```
+
+```release-note
+Added a new config setting ServiceSettings.FooBar. Added a new column Foo to the Users table.
+```
+
+```release-note
+NONE
+```
 -->
 ```release-note
 ```