From 9e2d1fc31338049abb3e941ae5a1fafb040cae6c Mon Sep 17 00:00:00 2001 From: jonathan vanasco Date: Wed, 16 Nov 2022 13:38:08 -0500 Subject: rename "master" to "main" --- .github/workflows/ci-tests.yml | 4 ++-- CHANGES.txt | 2 ++ CONTRIBUTORS.txt | 2 ++ README.rst | 6 +++--- RELEASING.txt | 2 +- contributing.md | 4 ++-- docs/conf.py | 2 +- docs/index.rst | 2 +- 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 5a313c2..e6f5441 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.txt b/CHANGES.txt index 5ae6166..bd596c9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,8 @@ 3.0.0 (Unreleased) ------------------ +- Rename "master" git branch to "main" + Updated Defaults ~~~~~~~~~~~~~~~~ diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 6d6df5d..462ea24 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -146,3 +146,5 @@ Contributors - Jack Wearden, 2018-05-18 - Frank Krick, 2018-10-29 + +- Jonathan Vanasco, 2022-11-15 diff --git a/README.rst b/README.rst index 0d9c5e9..0696bba 100644 --- a/README.rst +++ b/README.rst @@ -8,9 +8,9 @@ Waitress .. image:: https://github.com/Pylons/waitress/workflows/Build%20and%20test/badge.svg :target: https://github.com/Pylons/waitress/actions?query=workflow%3A%22Build+and+test%22 -.. image:: https://readthedocs.org/projects/waitress/badge/?version=master - :target: https://docs.pylonsproject.org/projects/waitress/en/master - :alt: master Documentation Status +.. image:: https://readthedocs.org/projects/waitress/badge/?version=main + :target: https://docs.pylonsproject.org/projects/waitress/en/main + :alt: main Documentation Status .. image:: https://img.shields.io/badge/irc-freenode-blue.svg :target: https://webchat.freenode.net/?channels=pyramid diff --git a/RELEASING.txt b/RELEASING.txt index 1306098..0f1f917 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -49,7 +49,7 @@ Prepare new release $ twine upload dist/waitress-X.X-* -Prepare master for further development (major releases only) +Prepare main for further development (major releases only) ------------------------------------------------------------ - In CHANGES.txt, preserve headings but clear out content. Add heading diff --git a/contributing.md b/contributing.md index 6bdfb52..af8dfa4 100644 --- a/contributing.md +++ b/contributing.md @@ -23,7 +23,7 @@ To respect both your time and ours, we emphasize the following points. Git branches ------------ -There is a single branch [master](https://github.com/Pylons/waitress/) on which development takes place and from which releases to PyPI are tagged. This is the default branch on GitHub. +There is a single branch [main](https://github.com/Pylons/waitress/) on which development takes place and from which releases to PyPI are tagged. This is the default branch on GitHub. Running tests and building documentation @@ -81,7 +81,7 @@ Contributing documentation 6. From this point forward, follow the typical [git workflow](https://help.github.com/articles/what-is-a-good-git-workflow/). Start by pulling from the upstream to get the most current changes. - git pull upstream master + git pull upstream main 7. Make a branch, make changes to the docs, and rebuild them as indicated in step 5. To speed up the build process, you can omit `clean` from the above command to rebuild only those pages that depend on the files you have changed. diff --git a/docs/conf.py b/docs/conf.py index cf0ff9b..392bde9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -41,7 +41,7 @@ templates_path = ["_templates"] # The suffix of source filenames. source_suffix = ".rst" -# The master toctree document. +# The main toctree document. master_doc = "index" # General substitutions. diff --git a/docs/index.rst b/docs/index.rst index ba34b5e..2081778 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -62,7 +62,7 @@ To check out the trunk via ``git``, use this command: git clone git@github.com:Pylons/waitress.git -To find out how to become a contributor to Waitress, please see the guidelines in `contributing.md `_ and `How to Contribute Source Code and Documentation `_. +To find out how to become a contributor to Waitress, please see the guidelines in `contributing.md `_ and `How to Contribute Source Code and Documentation `_. Why? ---- -- cgit v1.2.1 From c084612323a7811ead77015280bb08ea2c9ab842 Mon Sep 17 00:00:00 2001 From: Jonathan Vanasco Date: Wed, 16 Nov 2022 21:53:29 -0500 Subject: Update RELEASING.txt Co-authored-by: Steve Piercy --- RELEASING.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASING.txt b/RELEASING.txt index 0f1f917..1c428cb 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -50,7 +50,7 @@ Prepare new release Prepare main for further development (major releases only) ------------------------------------------------------------- +---------------------------------------------------------- - In CHANGES.txt, preserve headings but clear out content. Add heading "unreleased" for the version number. -- cgit v1.2.1