diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 66d04f9..34fa104 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -1,10 +1,10 @@ name: Build and test on: - # Only on pushes to master or one of the release branches we build on push + # Only on pushes to main or one of the release branches we build on push push: branches: - - master + - main - "[0-9].[0-9]+-branch" tags: # Build pull requests diff --git a/CHANGES.rst b/CHANGES.rst index 08426f6..1db69f9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,8 @@ +Unreleased (2022-11-15) +----------------------- + +- Rename "master" to "main" + 1.1 (2022-03-12) ---------------- diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index c7783db..e31083b 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -106,3 +106,4 @@ Contributors - Marco Falcioni, 2016/09/21 - Jon Betts, 2021/04/19 - Lynn Vaughan, 2022/02/22 +- Jonathan Vanasco, 2022/11/15 diff --git a/docs/conf.py b/docs/conf.py index 0eb68bb..2fc67e3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -41,7 +41,7 @@ # The suffix of source filenames. source_suffix = '.rst' -# The master toctree document. +# The main toctree document. master_doc = 'index' # General substitutions.