summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Engestrom <eric@engestrom.ch>2020-06-07 17:53:07 +0200
committerMarge Bot <eric+marge@anholt.net>2020-06-19 19:51:53 +0000
commit731465192a995e5448d015303ab8e4307a101b81 (patch)
treef61f89ca6110c2c3e2be9a014da1354d2097b38e
parent5d27d5eb614f1dc4a4e2288328b49d2f39794c37 (diff)
docs: reword a sentence a bit
The "that you know ahead of time" bit just sounded weird as everything on this page except the backport MR only applies if you know it "ahead of time". Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Eric Anholt <eric@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5378>
-rw-r--r--docs/submittingpatches.rst9
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/submittingpatches.rst b/docs/submittingpatches.rst
index 4262d107776..1556226ddec 100644
--- a/docs/submittingpatches.rst
+++ b/docs/submittingpatches.rst
@@ -275,11 +275,10 @@ The stable tag
If you want a commit to be applied to a stable branch, you should add an
appropriate note to the commit message.
-Using a "fixes tag" as described in `Patch formatting <#formatting>`__
-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.
+Using a ``Fixes:`` tag as described in `Patch formatting <#formatting>`__
+is the preferred way to nominate a commit that 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.
Alternatively, you may use a "CC:" tag. Here are some examples of such a
note: