Merge branch 'maintenance/2.11.x' following 2.11.4 release

Author: Pierre-Sassoulas

CONTRIBUTORS.txt

@@ -67,7 +67,6 @@ Contributors
 - Peter Kolbus <peter.kolbus@gmail.com>
 - Omer Katz <omer.drow@gmail.com>
 - Moises Lopez <moylop260@vauxoo.com>
-- Michael <michael-k@users.noreply.github.com>
 - Keichi Takahashi <keichi.t@me.com>
 - Kavins Singh <kavinsingh@hotmail.com>
 - Karthikeyan Singaravelan <tir.karthi@gmail.com>

ChangeLog

@@ -17,10 +17,17 @@ Release date: TBA
   name and improve typing. Use ``type`` instead.
 
 
-What's New in astroid 2.11.4?
+What's New in astroid 2.11.5?
 =============================
 Release date: TBA
 
+
+
+
+What's New in astroid 2.11.4?
+=============================
+Release date: 2022-05-02
+
 * Fix ``col_offset`` attribute for nodes involving ``with`` on ``PyPy``.
 
 * Fixed a crash involving two starred expressions: one inside a comprehension,

doc/release.md

@@ -63,9 +63,9 @@ cherry-picked on the maintenance branch.
 - Install the release dependencies: `pip3 install -r requirements_test.txt`
 - Bump the version and release by using `tbump X.Y-1.Z --no-push`. (For example:
   `tbump 2.3.5 --no-push`)
-- Check the result visually and then by triggering the "release tests" workflow in
-  GitHub Actions first.
-- Push the tag.
+- Check the result visually with `git show`.
+- Open a merge request to run the CI tests for this branch
+- Create and push the tag.
 - Release the version on GitHub with the same name as the tag and copy and paste the
   appropriate changelog in the description. This triggers the PyPI release.
 - Merge the `maintenance/X.Y.x` branch on the main branch. The main branch should have