]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
doc/dev: s/master/main/ essentials.rst dev guide 46662/head
authorZac Dover <zac.dover@gmail.com>
Mon, 13 Jun 2022 21:48:46 +0000 (07:48 +1000)
committerZac Dover <zac.dover@gmail.com>
Tue, 14 Jun 2022 06:31:05 +0000 (16:31 +1000)
This PR changes all reference to the "master" branch
to references to the "main" branch (because we renamed
"master" to main", and the docs now need to reflect that).

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 728b8f26746c733988302d52cce4c46ebc607f63)

doc/dev/developer_guide/essentials.rst

index 092daeaca795f4beda3d1ecfb81bf684c495deea..96413628e3ecfc220c34d3924f9c2503f06306ff 100644 (file)
@@ -152,7 +152,7 @@ file `CONTRIBUTING.rst`_ in the top-level directory of the source-code
 tree. There may be some overlap between this guide and that file.
 
 .. _`CONTRIBUTING.rst`:
-  https://github.com/ceph/ceph/blob/master/CONTRIBUTING.rst
+  https://github.com/ceph/ceph/blob/main/CONTRIBUTING.rst
 
 All newcomers are encouraged to read that file carefully.
 
@@ -252,7 +252,7 @@ See :ref:`kubernetes-dev`
 Backporting
 -----------
 
-All bugfixes should be merged to the ``master`` branch before being
+All bugfixes should be merged to the ``main`` branch before being
 backported. To flag a bugfix for backporting, make sure it has a
 `tracker issue`_ associated with it and set the ``Backport`` field to a
 comma-separated list of previous releases (e.g. "hammer,jewel") that you think