From cfa55ef94f1ff4831fc5826e7342d5f5eb4b265f Mon Sep 17 00:00:00 2001 From: Zac Dover Date: Tue, 14 Jun 2022 07:48:46 +1000 Subject: [PATCH] doc/dev: s/master/main/ essentials.rst dev guide 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 (cherry picked from commit 728b8f26746c733988302d52cce4c46ebc607f63) --- doc/dev/developer_guide/essentials.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/dev/developer_guide/essentials.rst b/doc/dev/developer_guide/essentials.rst index c265e655ad6be..2d3591cdfabfa 100644 --- a/doc/dev/developer_guide/essentials.rst +++ b/doc/dev/developer_guide/essentials.rst @@ -187,7 +187,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. @@ -289,7 +289,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 -- 2.39.5