@@ -24,7 +24,7 @@ Making the release branch
2424=========================
2525
2626When a new minor release (vX.Y.0) is approaching, a new release branch must be made.
27- When precisely this happens is up to the release manager, but at this point is where
27+ When precisely this should happen is up to the release manager, but this point is where
2828most new features intended for the minor release are merged and you are entering a
2929feature freeze (i.e. newly implemented features will be going into vX.Y+1).
3030This does not necessarily mean that no further changes will be made prior to release,
@@ -81,7 +81,7 @@ Run the User Acceptance Tests for the NBAgg and ipympl backends::
8181
8282For ipympl, restart the kernel, add a cell for ``%matplotlib widget `` and do
8383not run the cell with ``matplotlib.use('nbagg') ``. Tests which check
84- ``connection_info ``, use ``reshow ``, or test the OO interfeace are not expected
84+ ``connection_info ``, use ``reshow ``, or test the OO interface are not expected
8585to work for ``ipympl ``.
8686
8787.. _release_ghstats :
@@ -440,7 +440,7 @@ notes, fixing broken links, and updating the version switcher) are bubbled up to
440440``main ``.
441441
442442Git conflicts are very likely to arise, though aside from changes made directly to the
443- release branch (mostly as part of the release), should be relatively trivially resolved
443+ release branch (mostly as part of the release), they should be relatively trivially resolved
444444by using the version from ``main ``. This is not a universal rule, and care should be
445445taken to ensure correctness::
446446
0 commit comments