From 897ab6060c463b43ae346c8534e7c00b5024e0bc Mon Sep 17 00:00:00 2001
From: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Date: Sun, 30 Jan 2022 12:15:19 -0800
Subject: [PATCH 1/3] release process: formalize the changelog template

I did this manually for the last few releases and I think it's going to be
helpful in the future too. Unfortunately this adds a little more work during
the release (sorry @cooperlees).

This change will also improve the merge conflict situation a bit, because
changes to different sections won't merge conflict.

For the last release, the sections were in a kind of random order. In the
template I put highlights and "Style" first because they're most important
to users, and alphabetized the rest.
---
 docs/contributing/release_process.md | 56 +++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/docs/contributing/release_process.md b/docs/contributing/release_process.md
index 9ee7dbc607c..00d3f20fa63 100644
--- a/docs/contributing/release_process.md
+++ b/docs/contributing/release_process.md
@@ -9,8 +9,10 @@ To cut a release, you must be a _Black_ maintainer with `GitHub Release` creatio
 access. Using this access, the release process is:
 
 1. Cut a new PR editing `CHANGES.md` and the docs to version the latest changes
-   1. Example PR: [#2616](https://github.com/psf/black/pull/2616)
-   2. Example title: `Update CHANGES.md for XX.X release`
+   1. Remove any empty sections for the current release
+   2. Add a new empty template for the next release (template below)
+   3. Example PR: [#2616](https://github.com/psf/black/pull/2616)
+   4. Example title: `Update CHANGES.md for XX.X release`
 2. Once the release PR is merged ensure all CI passes
    1. If not, ensure there is an Issue open for the cause of failing CI (generally we'd
       want this fixed before cutting a release)
@@ -32,6 +34,56 @@ access. Using this access, the release process is:
 If anything fails, please go read the respective action's log output and configuration
 file to reverse engineer your way to a fix/soluton.
 
+## Changelog template
+
+Use the following template for a clean changelog after the release:
+
+```
+## Unreleased
+
+### Highlights
+
+<!-- Include any especially major or disruptive changes here -->
+
+### Style
+
+<!-- Changes that affect Black's style -->
+
+### *Blackd*
+
+<!-- Changes to blackd -->
+
+### Configuration
+
+<!-- Changes to how Black can be configured -->
+
+### Documentation
+
+<!-- Major changes to documentation and policies. Small docs changes
+     don't need a changelog entry. -->
+
+### Integrations
+
+<!-- For example, Docker, GitHub Actions, pre-commit, editors -->
+
+### Output
+
+<!-- Changes to Black's terminal output and error messages -->
+
+### Packaging
+
+<!-- Changes to how Black is packaged, such as dependency requirements -->
+
+### Parser
+
+<!-- Changes to the parser or to version autodetection -->
+
+### Performance
+
+<!-- Changes that improve Black's performance. -->
+
+```
+
 ## Release workflows
 
 All _Blacks_'s automation workflows use GitHub Actions. All workflows are therefore

From 8e303d584e92edba2a40e65f546d9c7b0f688546 Mon Sep 17 00:00:00 2001
From: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Date: Sun, 30 Jan 2022 13:59:42 -0800
Subject: [PATCH 2/3] apply template

---
 CHANGES.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index a840e013041..db17db89c10 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,10 +2,49 @@
 
 ## Unreleased
 
+### Highlights
+
+<!-- Include any especially major or disruptive changes here -->
+
+### Style
+
+<!-- Changes that affect Black's style -->
+
+### *Blackd*
+
+<!-- Changes to blackd -->
+
 ### Configuration
 
+<!-- Changes to how Black can be configured -->
+
 - Do not format `__pypackages__` directories by default (#2836)
 
+### Documentation
+
+<!-- Major changes to documentation and policies. Small docs changes
+     don't need a changelog entry. -->
+
+### Integrations
+
+<!-- For example, Docker, GitHub Actions, pre-commit, editors -->
+
+### Output
+
+<!-- Changes to Black's terminal output and error messages -->
+
+### Packaging
+
+<!-- Changes to how Black is packaged, such as dependency requirements -->
+
+### Parser
+
+<!-- Changes to the parser or to version autodetection -->
+
+### Performance
+
+<!-- Changes that improve Black's performance. -->
+
 ## 22.1.0
 
 At long last, _Black_ is no longer a beta product! This is the first non-beta release

From 72e0bb3ba0b57381938d9e0d976fefa4bac30143 Mon Sep 17 00:00:00 2001
From: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Date: Sun, 30 Jan 2022 14:02:01 -0800
Subject: [PATCH 3/3] prettier

---
 CHANGES.md                           | 2 +-
 docs/contributing/release_process.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index db17db89c10..9e82f2d2bdc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,7 @@
 
 <!-- Changes that affect Black's style -->
 
-### *Blackd*
+### _Blackd_
 
 <!-- Changes to blackd -->
 
diff --git a/docs/contributing/release_process.md b/docs/contributing/release_process.md
index 00d3f20fa63..89beb099e66 100644
--- a/docs/contributing/release_process.md
+++ b/docs/contributing/release_process.md
@@ -49,7 +49,7 @@ Use the following template for a clean changelog after the release:
 
 <!-- Changes that affect Black's style -->
 
-### *Blackd*
+### _Blackd_
 
 <!-- Changes to blackd -->