From: Zac Dover Date: Thu, 16 Jun 2022 05:57:16 +0000 (+1000) Subject: doc/dev: s/master/main/ in title X-Git-Tag: v16.2.11~103^2~70^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F46722%2Fhead;p=ceph.git doc/dev: s/master/main/ in title This changes "master" to "main" in a title. If we lived in an ideal world, this would have been a part of PR#46678. Signed-off-by: Zac Dover (cherry picked from commit f5fd158bea2a54b83c7f75cd806885de44045ad6) --- diff --git a/doc/dev/developer_guide/basic-workflow.rst b/doc/dev/developer_guide/basic-workflow.rst index c10025b51d13d..db048190e1ff1 100644 --- a/doc/dev/developer_guide/basic-workflow.rst +++ b/doc/dev/developer_guide/basic-workflow.rst @@ -163,8 +163,8 @@ Fixing the Bug .. _synchronizing: -Synchronizing Local Master with Upstream Master -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Synchronizing Local Main with Upstream Main +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ In your local git environment, there is a copy of the ``main`` branch in ``remotes/origin/main``. This is called "local main". This copy of the