Merge pull request #166 from jvanasco/main

rename master to main
Pylons · Nov 21, 2022 · 8682726 · 8682726
2 parents 13369f5 + c8383da
commit 8682726
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 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,3 +1,8 @@
+Unreleased (2022-11-15)
+=======================
+
+- Rename "master" git branch to "main"
+
 2.10 (2022-03-27)
 =================
 

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -135,3 +135,5 @@ Remco Verhoef (nl5887), 2013/11/08
 Geoffrey Dairiki, 2013/11/22
 
 Steve Piercy, 2016/01/07
+
+Jonathan Vanasco, 2022/11/15
diff --git a/docs/conf.py b/docs/conf.py
@@ -32,7 +32,7 @@
 # The suffix of source filenames.
 source_suffix = ".rst"
 
-# The master toctree document.
+# The main toctree document.
 master_doc = "index"
 
 # General substitutions.

diff --git a/setup.cfg b/setup.cfg
@@ -20,7 +20,7 @@ classifiers =
 url = https://github.com/Pylons/pyramid_jinja2
 project_urls =
     Documentation = https://docs.pylonsproject.org/projects/pyramid_jinja2/en/latest/
-    Changelog = https://github.com/Pylons/pyramid_jinja2/blob/master/CHANGES.rst
+    Changelog = https://github.com/Pylons/pyramid_jinja2/blob/main/CHANGES.rst
     Issue Tracker = https://github.com/Pylons/pyramid_jinja2/issues
 
 author = Rocky Burt