Post release version bump (#4747)

* Boilerplate version number update after v2.11.0 release.

* Small updates to release.rst

docs/changelog.rst

@@ -10,6 +10,12 @@ Changes will be added here periodically from the "Suggested changelog entry"
 block in pull request descriptions.
 
 
+IN DEVELOPMENT
+--------------
+
+Changes will be summarized here periodically.
+
+
 Version 2.11.0 (July 14, 2023)
 -----------------------------
 

docs/release.rst

@@ -41,7 +41,7 @@ If you don't have nox, you should either use ``pipx run nox`` instead, or use
             interface (very easy: start by clicking the link above).
     - ``git add`` and ``git commit``, ``git push``. **Ensure CI passes**. (If it
       fails due to a known flake issue, either ignore or restart CI.)
-- Add a release branch if this is a new minor version, or update the existing release branch if it is a patch version
+- Add a release branch if this is a new MINOR version, or update the existing release branch if it is a patch version
     - New branch: ``git checkout -b vX.Y``, ``git push -u origin vX.Y``
     - Update branch: ``git checkout vX.Y``, ``git merge <release branch>``, ``git push``
 - Update tags (optional; if you skip this, the GitHub release makes a
@@ -50,7 +50,9 @@ If you don't have nox, you should either use ``pipx run nox`` instead, or use
     - ``git push --tags``.
 - Update stable
     - ``git checkout stable``
-    - ``git merge master``
+    - ``git merge -X theirs vX.Y.Z``
+    - ``git diff vX.Y.Z``
+    - Carefully review and reconcile any diffs. There should be none.
     - ``git push``
 - Make a GitHub release (this shows up in the UI, sends new release
   notifications to users watching releases, and also uploads PyPI packages).
@@ -69,9 +71,10 @@ If you don't have nox, you should either use ``pipx run nox`` instead, or use
     - Make sure you are on master, not somewhere else: ``git checkout master``
     - Update version macros in ``include/pybind11/detail/common.h`` (set PATCH to
       ``0.dev1`` and increment MINOR).
-    - Update ``_version.py`` to match
+    - Update ``pybind11/_version.py`` to match
     - Run ``nox -s tests_packaging`` to ensure this was done correctly.
-    - Add a spot for in-development updates in ``docs/changelog.rst``.
+    - If the release was a new MINOR version, add a new `IN DEVELOPMENT`
+      section in ``docs/changelog.rst``.
     - ``git add``, ``git commit``, ``git push``
 
 If a version branch is updated, remember to set PATCH to ``1.dev1``.