Merge pull request #84 from jvanasco/main

rename "master" to "main"
Pylons · Nov 21, 2022 · 9e4c800 · 9e4c800
2 parents 9b9e025 + e77038b
commit 9e4c800
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -1,6 +1,11 @@
 Changes
 -------
 
+Unreleased (2022-11-14)
+^^^^^^^^^^^^^^^^^^^^^^^
+
+- rename "master" to "main"
+
 2.5 (2022-03-12)
 ^^^^^^^^^^^^^^^^
 

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -111,3 +111,4 @@ Contributors
 - Steve Piercy, 2016/11/19
 - Sean Hammond, 2019/09/27
 - Jon Betts, 2021/04/19
+- Jonathan Vanasco, 2022/11/14
diff --git a/docs/conf.py b/docs/conf.py
@@ -46,7 +46,7 @@
 # The suffix of source filenames.
 source_suffix = '.rst'
 
-# The master toctree document.
+# The main toctree document.
 master_doc = 'index'
 
 # General substitutions.