From: Stephen Finucane <stephen@that.guru>
Date: Mon, 18 Jul 2022 09:34:59 +0000 (+0100)
Subject: Replace references to master with main
X-Git-Tag: v3.2.0~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3e5c8899c1ba31b3f5f342c9aceecbcfb253e17;p=thirdparty%2Fpatchwork.git

Replace references to master with main

Signed-off-by: Stephen Finucane <stephen@that.guru>
---

diff --git a/README.rst b/README.rst
index 5de5e623..94ae431d 100644
--- a/README.rst
+++ b/README.rst
@@ -6,7 +6,7 @@ Patchwork
    :target: https://pyup.io/repos/github/getpatchwork/patchwork/
    :alt: Requirements Status
 
-.. image:: https://codecov.io/gh/getpatchwork/patchwork/branch/master/graph/badge.svg
+.. image:: https://codecov.io/gh/getpatchwork/patchwork/branch/main/graph/badge.svg
    :target: https://codecov.io/gh/getpatchwork/patchwork
    :alt: Codecov
 
diff --git a/docs/development/releasing.rst b/docs/development/releasing.rst
index 8bb6b314..9c18e202 100644
--- a/docs/development/releasing.rst
+++ b/docs/development/releasing.rst
@@ -53,7 +53,7 @@ There is no cadence for releases: they are made available as necessary.
 Supported Versions
 ------------------
 
-Typically all development should occur on ``master``. While we will backport
+Typically all development should occur on ``main``. While we will backport
 bugfixes and security updates, we will not backport any new features. This is
 to ensure stability for users of these versions of Patchwork.
 
@@ -100,12 +100,12 @@ Backporting
 -----------
 
 We will occasionally backport bugfixes and security updates. When backporting a
-patch, said patch should first be merged into ``master``. Once merged, you can
+patch, said patch should first be merged into ``main``. Once merged, you can
 backport by cherry-picking commits, using the ``-x`` flag for posterity:
 
 .. code-block:: shell
 
-   $ git cherry-pick -x <master_commit>
+   $ git cherry-pick -x <main_commit>
 
 There may be some conflicts; resolve these, uncommenting the `Conflicts` line
 when committing::
diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml
index 97525214..fd99ee37 100644
--- a/releasenotes/config.yaml
+++ b/releasenotes/config.yaml
@@ -1,4 +1,5 @@
 ---
+branch: main
 release_tag_re: 'v\d\.\d\.\d(rc\d+)?'
 pre_release_tag_re: '(?P<pre_release>-rc(?:\d)*)$'
 sections: