From 386f5af4b2e896f4fa0bf87f6235e7d7e3d22480 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Mon, 2 Aug 2021 12:12:42 +0100
Subject: [PATCH] Rename master branch to main (#3202)

---
 .github/ISSUE_TEMPLATE/bug_report.md  | 4 ++--
 .github/workflows/release-drafter.yml | 4 ++--
 .github/workflows/tox.yml             | 2 +-
 README.rst                            | 2 +-
 docs/ci.rst                           | 2 +-
 docs/conf.py                          | 2 +-
 docs/contributing.rst                 | 6 +++---
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index fa09eada9..597899072 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,10 +1,10 @@
 ---
 name: Bug report
-about: Please test the master branch before raising bugs.
+about: Please test the main branch before raising bugs.
 labels: bug
 ---
 <!--- Verify first that your issue is not already reported on GitHub -->
-<!--- Do not report bugs before reproducing them with the code of the master branch! -->
+<!--- Do not report bugs before reproducing them with the code of the main branch! -->
 <!--- Please also check https://molecule.readthedocs.io/en/latest/faq.html --->
 <!--- Please use https://groups.google.com/forum/#!forum/molecule-users for usage questions -->
 
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 97d09eaff..a40633f39 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -4,7 +4,7 @@ on:
   push:
     # branches to consider in the event; optional, defaults to all
     branches:
-      - master
+      - main
       - 'releases/**'
       - 'stable/**'
 
@@ -12,7 +12,7 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-20.04
     steps:
-      # Drafts your next Release notes as Pull Requests are merged into "master"
+      # Drafts your next Release notes as Pull Requests are merged into "main"
       - uses: release-drafter/release-drafter@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index bc1b51c03..d6415ddf3 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -5,7 +5,7 @@ on:
     tags:  # any tag regardless of its name, no branches
   push:  # only publishes pushes to the main branch to TestPyPI
     branches:  # any integration branch but not tag
-      - "master"
+      - "main"
     tags-ignore:
       - "**"
   pull_request:
diff --git a/README.rst b/README.rst
index 57f07baf9..380bf1ee7 100644
--- a/README.rst
+++ b/README.rst
@@ -106,7 +106,7 @@ License
 
 The `MIT`_ License.
 
-.. _`MIT`: https://github.com/ansible-community/molecule/blob/master/LICENSE
+.. _`MIT`: https://github.com/ansible-community/molecule/blob/main/LICENSE
 
 The logo is licensed under the `Creative Commons NoDerivatives 4.0 License`_.
 
diff --git a/docs/ci.rst b/docs/ci.rst
index a9d502ca3..a63bdb961 100644
--- a/docs/ci.rst
+++ b/docs/ci.rst
@@ -167,7 +167,7 @@ Azure Pipelines
 
   ---
   trigger:
-  - master
+  - main
 
   pool:
     vmImage: ubuntu-16.04
diff --git a/docs/conf.py b/docs/conf.py
index 83be85f97..e644263b2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -161,7 +161,7 @@
     'display_github': 'True',
     'github_user': 'ansible-community',
     'github_repo': 'molecule',
-    'github_version': 'master/docs/',
+    'github_version': 'main/docs/',
     'current_version': version,
     'latest_version': 'latest',
     # list specifically out of order to make latest work
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 61bcc241b..f1e011d20 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -43,20 +43,20 @@ Guidelines
 * Submit a pull request.
 
 .. _`Issue`: https://github.com/ansible-community/molecule/issues/new/choose
-.. _`DCO 1.1`: https://github.com/ansible-community/molecule/blob/master/DCO_1_1.md
+.. _`DCO 1.1`: https://github.com/ansible-community/molecule/blob/main/DCO_1_1.md
 
 Code Of Conduct
 ===============
 
 Please see our `Code of Conduct`_ document.
 
-.. _Code of Conduct: https://github.com/ansible-community/molecule/blob/master/.github/CODE_OF_CONDUCT.md
+.. _Code of Conduct: https://github.com/ansible-community/molecule/blob/main/.github/CODE_OF_CONDUCT.md
 
 Pull Request Life Cycle and Governance
 ======================================
 
 * If your PRs get stuck `join us on IRC`_ or add to the `working group agenda`_.
-* The code style is what is enforced by CI, everything else is off topic.
+* The code style is what is enforced by CI, everything else is off-topic.
 * All PRs must be reviewed by one other person. This is enforced by GitHub. Larger changes require +2.
 
 .. _working group agenda: https://github.com/ansible/community/wiki/Molecule#meetings