From 3e9ec689de55c596a4293b54650aa125a35e4bb4 Mon Sep 17 00:00:00 2001 From: Matthew Scott Conroy Date: Mon, 6 Nov 2023 11:23:29 -0500 Subject: [PATCH] Replaced references to master with references to main in docs/maintainers_guide.rst (#11196) (#11197) * Substituted mentions of the master branch with mentions to main in the file docs/maintainers_guide.rst (cherry picked from commit af643eb09b22fc3833084b3112890b1aebdcbf92) --- docs/maintainers_guide.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/maintainers_guide.rst b/docs/maintainers_guide.rst index e8c77125395f..ed2a6b508cdf 100644 --- a/docs/maintainers_guide.rst +++ b/docs/maintainers_guide.rst @@ -11,7 +11,7 @@ Stable Branch Policy ==================== The stable branch is intended to be a safe source of fixes for high-impact -bugs and security issues that have been fixed on master since a +bugs and security issues that have been fixed on ``main`` since a release. When reviewing a stable branch PR, we must balance the risk of any given patch with the value that it will provide to users of the stable branch. Only a limited class of changes are appropriate for @@ -29,8 +29,8 @@ change: also refactors a lot of code, it's probably worth thinking about what a less risky fix might look like. - Whether the fix is already on ``main``: a change must be a backport of - a change already merged onto master, unless the change simply does - not make sense on master. + a change already merged onto ``main``, unless the change simply does + not make sense on ``main``. Backporting