git cherry-pick -x X.Y
</pre>
-<p>Then run the <pre>./bin/post_verison.py X.Y.Z</pre>, where X.Y.Z is the
+<p>Then run the <pre>./bin/post_version.py X.Y.Z</pre>, where X.Y.Z is the
version you just made. This will updated docs/relnotes.html,
docs/index.html, and docs/release-calendar.html. It will then generate
a git commit automatically. Check that everything looks correct and push:
<h2 id="gitlab">Update gitlab issues</h2>
<p>
-Parse through the bugreports as listed in the docs/relnotes/X.Y.Z.html
+Parse through the bug reports as listed in the docs/relnotes/X.Y.Z.html
document. If there's outstanding action, close the bug referencing the commit
ID which addresses the bug and mention the Mesa version that has the fix.
</p>
</p>
<p>
-As mentioned at the begining, patches should be bisectable.
+As mentioned at the beginning, patches should be bisectable.
A good way to test this is to make use of the `git rebase` command,
to run your tests on each commit. Assuming your branch is based off
<code>origin/master</code>, you can run:
<ul>
<li> By adding the Cc: mesa-stable@ tag as described below.
<li> By adding the fixes: tag as described below.
-<li> By submitting a merge requestion against the "staging/year.quarter" branch on gitlab.
+<li> By submitting a merge request against the "staging/year.quarter" branch on gitlab.
</li>
</ul>
<p>
Please <strong>DO NOT</strong> send patches to
-mesa-stable@lists.freedektop.org, it is not monitored actively and is a
+mesa-stable@lists.freedesktop.org, it is not monitored actively and is a
historical artifact.
</p>
<p>
<p>
Using a "fixes tag" as described in <a href="#formatting">Patch formatting</a>
-is the prefered way to nominate a commit that you know ahead of time should be
+is the preferred way to nominate a commit that you know ahead of time should be
backported. There are scripts that will figure out which releases to apply the
patch to automatically, so you don't need to figure it out.
</p>
<p>
-Alternatively, you maye use a "CC:" tag.
+Alternatively, you may use a "CC:" tag.
Here are some examples of such a note:
</p>
<p>
For patches that either need to be nominated after they've landed in master, or
that are known ahead of time to not not apply cleanly to a stable branch (such
-as due to a rename), using a gitlab MR is most appropirate.
+as due to a rename), using a gitlab MR is most appropriate.
The MR should be based on and target the staging/year.quarter branch, not on
the year.quarter branch, per the stable branch policy.
-Assinging the MR to release maintainer for said branch or mentioning them is
+Assigning the MR to release maintainer for said branch or mentioning them is
helpful, but not required.
</p>