@@ -24,7 +24,7 @@ Making the release branch
24
24
=========================
25
25
26
26
When 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
28
28
most new features intended for the minor release are merged and you are entering a
29
29
feature freeze (i.e. newly implemented features will be going into vX.Y+1).
30
30
This 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::
81
81
82
82
For ipympl, restart the kernel, add a cell for ``%matplotlib widget `` and do
83
83
not 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
85
85
to work for ``ipympl ``.
86
86
87
87
.. _release_ghstats :
@@ -440,7 +440,7 @@ notes, fixing broken links, and updating the version switcher) are bubbled up to
440
440
``main ``.
441
441
442
442
Git 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
444
444
by using the version from ``main ``. This is not a universal rule, and care should be
445
445
taken to ensure correctness::
446
446
0 commit comments