diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4736acc68..a11e41250 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: pull_request: push: branches: - - master + - main - main tags: - "*.*.*" diff --git a/docs/conf.py b/docs/conf.py index 677bb35ca..cf23b3aeb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,8 +51,8 @@ # # source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = 'CMake Python Distributions' @@ -266,7 +266,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'CMakePythonDistributions.tex', 'CMake Python Distributions Documentation', + (main_doc, 'CMakePythonDistributions.tex', 'CMake Python Distributions Documentation', 'Jean-Christophe Fillion-Robin', 'manual'), ] @@ -308,7 +308,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'cmakepythondistributions', 'CMake Python Distributions Documentation', + (main_doc, 'cmakepythondistributions', 'CMake Python Distributions Documentation', [author], 1) ] @@ -323,7 +323,7 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'CMakePythonDistributions', 'CMake Python Distributions Documentation', + (main_doc, 'CMakePythonDistributions', 'CMake Python Distributions Documentation', author, 'CMakePythonDistributions', 'One line description of project.', 'Miscellaneous'), ] diff --git a/docs/index.rst b/docs/index.rst index a81884996..64f1d919c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,4 +1,4 @@ -.. CMake Python Distributions documentation master file, created by +.. CMake Python Distributions documentation main file, created by sphinx-quickstart on Wed Nov 9 02:28:46 2016. You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. diff --git a/docs/make_a_release.rst b/docs/make_a_release.rst index eaaff7a55..d31de20f7 100644 --- a/docs/make_a_release.rst +++ b/docs/make_a_release.rst @@ -72,7 +72,7 @@ means that ``echo "Hello"`` should be copied and evaluated in the terminal. .. code:: - $ git tag --sign -m "cmake-python-distributions $release" $release master + $ git tag --sign -m "cmake-python-distributions $release" $release main .. warning:: diff --git a/scripts/utils.sh b/scripts/utils.sh index 9052cc1f9..5a3e360c8 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -2,7 +2,7 @@ set -e -# Copied from https://github.com/pypa/manylinux/blob/master/docker/build_scripts/build_utils.sh +# Copied from https://github.com/pypa/manylinux/blob/main/docker/build_scripts/build_utils.sh function check_var { if [ -z "$1" ]; then echo "required variable not defined" @@ -10,7 +10,7 @@ function check_var { fi } -# Copied from https://github.com/pypa/manylinux/blob/master/docker/build_scripts/build_utils.sh +# Copied from https://github.com/pypa/manylinux/blob/main/docker/build_scripts/build_utils.sh function check_sha256sum { local fname=$1 check_var ${fname}