diff options
author | Bert JW Regeer <bertjw@regeer.org> | 2022-11-16 22:19:37 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-16 22:19:37 -0700 |
commit | 059b95352de65ecbdc112904d9c15f8fab06435d (patch) | |
tree | 1476727351bb8abe52845111fcf88202a7463cef /contributing.md | |
parent | 73fe701cba0b37dc6099858b064cb1e755e83e9e (diff) | |
parent | c084612323a7811ead77015280bb08ea2c9ab842 (diff) | |
download | waitress-059b95352de65ecbdc112904d9c15f8fab06435d.tar.gz |
Merge pull request #390 from jvanasco/main
rename "master" to "main"
Diffstat (limited to 'contributing.md')
-rw-r--r-- | contributing.md | 4 |
1 files changed, 2 insertions, 2 deletions
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. |