rename default branch in files

This commit is contained in:
David Lord 2021-05-11 15:18:41 -07:00
parent 6fb1101f70
commit 52adf2ec21
No known key found for this signature in database
GPG Key ID: 7A1C87E3F5BC42A8
5 changed files with 9 additions and 9 deletions

View File

@ -2,7 +2,7 @@ name: Tests
on: on:
push: push:
branches: branches:
- master - main
- '*.x' - '*.x'
paths-ignore: paths-ignore:
- 'docs/**' - 'docs/**'
@ -10,7 +10,7 @@ on:
- '*.rst' - '*.rst'
pull_request: pull_request:
branches: branches:
- master - main
- '*.x' - '*.x'
paths-ignore: paths-ignore:
- 'docs/**' - 'docs/**'

View File

@ -143,15 +143,15 @@ Start coding
.. code-block:: text .. code-block:: text
$ git fetch origin $ 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 If you're submitting a feature addition or change, branch off of the
"master" branch. "main" branch.
.. code-block:: text .. code-block:: text
$ git fetch origin $ 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, - Using your favorite editor, make your changes,
`committing as you go`_. `committing as you go`_.

View File

@ -55,7 +55,7 @@ Contributing
For guidance on setting up a development environment and how to make a For guidance on setting up a development environment and how to make a
contribution to Flask, see the `contributing guidelines`_. 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 Donate

View File

@ -78,7 +78,7 @@ def github_link(name, rawtext, text, lineno, inliner, options=None, content=None
words = None words = None
if packaging.version.parse(release).is_devrelease: if packaging.version.parse(release).is_devrelease:
url = f"{base_url}master/{text}" url = f"{base_url}main/{text}"
else: else:
url = f"{base_url}{release}/{text}" url = f"{base_url}{release}/{text}"

View File

@ -11,7 +11,7 @@ Install
**Be sure to use the same version of the code as the version of the docs **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 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 # clone the repository
$ git clone https://github.com/pallets/flask $ git clone https://github.com/pallets/flask
@ -35,7 +35,7 @@ Install Flaskr::
$ pip install -e . $ 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:: installing Flaskr::
$ pip install -e ../.. $ pip install -e ../..