Mesa (master): docs/releasing.rst: Rename master branch to main

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 2ec9cd31042a0c994c42a024c9185a7fcccf9855
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ec9cd31042a0c994c42a024c9185a7fcccf9855

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Mon Apr 26 13:48:30 2021 -0700

docs/releasing.rst: Rename master branch to main

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>

---

 docs/releasing.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/releasing.rst b/docs/releasing.rst
index b9e608438c1..87833f6dadd 100644
--- a/docs/releasing.rst
+++ b/docs/releasing.rst
@@ -182,10 +182,10 @@ To setup the branchpoint:
 
 .. code-block:: console
 
-   git checkout master # make sure we're in master first
+   git checkout main # make sure we're in main first
    git tag -s X.Y-branchpoint -m "Mesa X.Y branchpoint"
    git checkout -b X.Y
-   git checkout master
+   git checkout main
    $EDITOR VERSION # bump the version number
    git commit -as
    truncate docs/relnotes/new_features.txt
@@ -209,7 +209,7 @@ These are the instructions for making a new Mesa release.
 Get latest source files
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-Ensure the latest code is available - both in your local master and the
+Ensure the latest code is available - both in your local main and the
 relevant branch.
 
 Perform basic testing
@@ -294,7 +294,7 @@ Add the sha256sums to the release notes
 Edit ``docs/relnotes/X.Y.Z.rst`` to add the ``sha256sum`` as available in the
 ``mesa-X.Y.Z.announce`` template. Commit this change.
 
-Back on mesa master, add the new release notes into the tree
+Back on mesa main, add the new release notes into the tree
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Something like the following steps will do the trick:
@@ -317,7 +317,7 @@ push:
 
 .. code-block:: console
 
-      git push origin master X.Y
+      git push origin main X.Y
 
 Announce the release
 --------------------