summaryrefslogtreecommitdiff
path: root/contributing.md
diff options
context:
space:
mode:
authorjonathan vanasco <jonathan@2xlp.com>2022-11-14 15:27:33 -0500
committerjonathan vanasco <jonathan@2xlp.com>2022-11-14 15:27:33 -0500
commitb7aecfe6aaff9ea50f657ae2d6638e33addc07c6 (patch)
tree1133f98211fa06c747b6524b2e5e627646017d90 /contributing.md
parent51a731c690b2644df206722767a74fee9339fb87 (diff)
downloadpyramid-b7aecfe6aaff9ea50f657ae2d6638e33addc07c6.tar.gz
pyramid-b7aecfe6aaff9ea50f657ae2d6638e33addc07c6.tar.bz2
pyramid-b7aecfe6aaff9ea50f657ae2d6638e33addc07c6.zip
rename "master" to "main"
Diffstat (limited to 'contributing.md')
-rw-r--r--contributing.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/contributing.md b/contributing.md
index 75dbfb86b..d661aaa4c 100644
--- a/contributing.md
+++ b/contributing.md
@@ -5,14 +5,14 @@ All projects under the Pylons Projects, including this one, follow the guideline
You can contribute to this project in several ways.
* [File an Issue on GitHub](https://github.com/Pylons/pyramid/issues)
-* Fork this project and create a branch with your suggested change. When ready, submit a pull request for consideration. [GitHub Flow](https://guides.github.com/introduction/flow/index.html) describes the workflow process and why it's a good practice. When submitting a pull request, sign [CONTRIBUTORS.txt](https://github.com/Pylons/pyramid/blob/master/CONTRIBUTORS.txt) if you have not yet done so.
+* Fork this project and create a branch with your suggested change. When ready, submit a pull request for consideration. [GitHub Flow](https://guides.github.com/introduction/flow/index.html) describes the workflow process and why it's a good practice. When submitting a pull request, sign [CONTRIBUTORS.txt](https://github.com/Pylons/pyramid/blob/main/CONTRIBUTORS.txt) if you have not yet done so.
* Join the [IRC channel #pyramid on irc.libera.chat](https://web.libera.chat/#pyramid).
## Git Branches
Git branches and their purpose and status at the time of this writing are listed below.
-* [master](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub.
+* [main](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub.
* [2.0-branch](https://github.com/Pylons/pyramid/tree/2.0-branch) - The branch classified as "stable" or "latest".
* [1.10-branch](https://github.com/Pylons/pyramid/tree/1.10-branch) - The oldest actively maintained and stable branch.
@@ -20,4 +20,4 @@ Older branches are not actively maintained. In general, two stable branches and
## Developing
-Follow the instructions in [HACKING.txt](https://github.com/Pylons/pyramid/blob/master/HACKING.txt) to install Pyramid and the tools needed to run its tests and build its documentation.
+Follow the instructions in [HACKING.txt](https://github.com/Pylons/pyramid/blob/main/HACKING.txt) to install Pyramid and the tools needed to run its tests and build its documentation.