rename "master" to "main"

.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

CHANGES.txt

@@ -1,6 +1,8 @@
 3.0.0 (Unreleased)
 ------------------
 
+- Rename "master" git branch to "main"
+
 Updated Defaults
 ~~~~~~~~~~~~~~~~
 

CONTRIBUTORS.txt

@@ -146,3 +146,5 @@ Contributors
 - Jack Wearden, 2018-05-18
 
 - Frank Krick, 2018-10-29
+
+- Jonathan Vanasco, 2022-11-15

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

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

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.
 

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.

docs/index.rst

@@ -62,7 +62,7 @@ To check out the trunk via ``git``, use this command:
 
   git clone [email protected]:Pylons/waitress.git
 
-To find out how to become a contributor to Waitress, please see the guidelines in `contributing.md <https://github.com/Pylons/waitress/blob/master/contributing.md>`_ and `How to Contribute Source Code and Documentation <https://pylonsproject.org/community-how-to-contribute.html>`_.
+To find out how to become a contributor to Waitress, please see the guidelines in `contributing.md <https://github.com/Pylons/waitress/blob/main/contributing.md>`_ and `How to Contribute Source Code and Documentation <https://pylonsproject.org/community-how-to-contribute.html>`_.
 
 Why?
 ----