Merge pull request #23945 from meeseeksmachine/auto-backport-of-pr-23941-on-v3.6.x

dstansby · web-flow · commit fd4ab64c694b · 2022-09-19T21:02:10.000+01:00
Backport PR #23941 on branch v3.6.x (consistent notation for minor/patch branches)
diff --git a/doc/devel/coding_guide.rst b/doc/devel/coding_guide.rst
@@ -134,13 +134,13 @@ Milestones
 * Set the milestone according to these rules:
 
   * *New features and API changes* are milestoned for the next minor release
-    ``v3.X.0``.
+    ``v3.N.0``.
 
   * *Bugfixes and docstring changes* are milestoned for the next patch
-    release ``v3.X.Y``
+    release ``v3.N.M``
 
   * *Documentation changes* (all .rst files and examples) are milestoned
-    ``v3.X-doc``
+    ``v3.N-doc``
 
   If multiple rules apply, choose the first matching from the above list.
 
