Skip to content

Commit b24ed50

Browse files
hugovkAA-Turner
andauthored
Clarify development cycle (#1681)
Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
1 parent ec0447a commit b24ed50

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

developer-workflow/development-cycle.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ Maintenance branches
6868
A branch for a previous feature release, currently being maintained for bug
6969
fixes, or for the next feature release in its
7070
:ref:`beta <beta>` or :ref:`release candidate <rc>` stages.
71-
There is usually either one or two maintenance branches at any given time for
72-
Python 3.x. After the final release of a new minor version (3.x.0), releases
71+
There are usually either one or two maintenance branches at any given time.
72+
After the final release of a new minor version (3.x.0), releases
7373
produced from a maintenance branch are called **bugfix** or **maintenance**
7474
releases; the terms are used interchangeably. These releases have a
7575
**micro version** number greater than zero.
@@ -190,7 +190,7 @@ severe enough (for example, crashes) that they deserve fixing before the final r
190190
All other issues should be deferred to the next development cycle, since
191191
stability is the strongest concern at this point.
192192

193-
While the goal is to have no code changes between a RC and a final release,
193+
While the goal is to have no code changes between an RC and a final release,
194194
there may be a need for final documentation or test fixes. Any such proposed
195195
changes should be discussed first with the release manager.
196196

@@ -204,8 +204,7 @@ Final
204204
^^^^^
205205

206206
When a final release is being cut, only the release manager (RM) can make
207-
changes to the branch. After the final release is published, the full
208-
:ref:`development cycle <stages>` starts again for the next minor version.
207+
changes to the branch.
209208

210209

211210
Repository administration

0 commit comments

Comments
 (0)