From: Zac Dover Date: Mon, 13 Jun 2022 21:48:46 +0000 (+1000) Subject: doc/dev: s/master/main/ essentials.rst dev guide X-Git-Tag: v16.2.11~515^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52f7edaa9ad84dc4322bbab6a70369fadb179ec8;p=ceph.git 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) --- diff --git a/doc/dev/developer_guide/essentials.rst b/doc/dev/developer_guide/essentials.rst index 092daeaca795..96413628e3ec 100644 --- a/doc/dev/developer_guide/essentials.rst +++ b/doc/dev/developer_guide/essentials.rst @@ -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