rename default branch in files

davidism · davidism · commit 52adf2ec219a · 2021-05-11T15:18:41.000-07:00
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -2,15 +2,15 @@ name: Tests
 on:
   push:
     branches:
-      - master
+      - main
       - '*.x'
     paths-ignore:
       - 'docs/**'
       - '*.md'
       - '*.rst'
   pull_request:
     branches:
-      - master
+      - main
       - '*.x'
     paths-ignore:
       - 'docs/**'
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -143,15 +143,15 @@ Start coding
     .. code-block:: text
 
         $ git fetch origin
-        $ git checkout -b your-branch-name origin/1.1.x
+        $ git checkout -b your-branch-name origin/2.0.x
 
     If you're submitting a feature addition or change, branch off of the
-    "master" branch.
+    "main" branch.
 
     .. code-block:: text
 
         $ git fetch origin
-        $ git checkout -b your-branch-name origin/master
+        $ git checkout -b your-branch-name origin/main
 
 -   Using your favorite editor, make your changes,
     `committing as you go`_.
diff --git a/README.rst b/README.rst
@@ -55,7 +55,7 @@ Contributing
 For guidance on setting up a development environment and how to make a
 contribution to Flask, see the `contributing guidelines`_.
 
-.. _contributing guidelines: https://github.com/pallets/flask/blob/master/CONTRIBUTING.rst
+.. _contributing guidelines: https://github.com/pallets/flask/blob/main/CONTRIBUTING.rst
 
 
 Donate
diff --git a/docs/conf.py b/docs/conf.py
@@ -78,7 +78,7 @@ def github_link(name, rawtext, text, lineno, inliner, options=None, content=None
         words = None
 
     if packaging.version.parse(release).is_devrelease:
-        url = f"{base_url}master/{text}"
+        url = f"{base_url}main/{text}"
     else:
         url = f"{base_url}{release}/{text}"
 
diff --git a/examples/tutorial/README.rst b/examples/tutorial/README.rst
@@ -11,7 +11,7 @@ Install
 
 **Be sure to use the same version of the code as the version of the docs
 you're reading.** You probably want the latest tagged version, but the
-default Git version is the master branch. ::
+default Git version is the main branch. ::
 
     # clone the repository
     $ git clone https://github.com/pallets/flask
@@ -35,7 +35,7 @@ Install Flaskr::
 
     $ pip install -e .
 
-Or if you are using the master branch, install Flask from source before
+Or if you are using the main branch, install Flask from source before
 installing Flaskr::
 
     $ pip install -e ../..
