diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9b74d4070..504360305 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,8 +34,8 @@ Naming conventions: tools `yapf` and `isort`. Please check also with `flake8`. * Please include one single feature per merge request, to keep the review simple and focused on one topic. (This might still mean hundreds of lines of code.) - Use a branch other than `master`, so you can create multiple merge requests - and still keep merging from `master`. Depending on the complexity of your + Use a branch other than `main`, so you can create multiple merge requests + and still keep merging from `main`. Depending on the complexity of your merge request, it may take a while until it is reviewed and merged. * Keep your commits organized logically and as small as possible. If commit B fixes a mistake in commit A, both of which are part of the same merge request, diff --git a/README.md b/README.md index 3ea73a307..a355de3ce 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![pipeline status](https://salsa.debian.org/freedombox-team/freedombox/badges/master/pipeline.svg)](https://salsa.debian.org/freedombox-team/freedombox/commits/master) +[![pipeline status](https://salsa.debian.org/freedombox-team/freedombox/badges/main/pipeline.svg)](https://salsa.debian.org/freedombox-team/freedombox/commits/main) [![Translation status](https://hosted.weblate.org/widgets/freedombox/-/svg-badge.svg)](https://hosted.weblate.org/engage/freedombox/?utm_source=widget) [![Debian Unstable](https://badges.debian.net/badges/debian/unstable/freedombox/version.svg)](https://packages.debian.org/unstable/freedombox) [![Debian Testing](https://badges.debian.net/badges/debian/testing/freedombox/version.svg)](https://packages.debian.org/testing/freedombox) @@ -58,7 +58,7 @@ HACKING.md. # Contributing -See the [HACKING.md](https://salsa.debian.org/freedombox-team/freedombox/blob/master/HACKING.md) file for contributing to FreedomBox Service (Plinth). +See the [HACKING.md](https://salsa.debian.org/freedombox-team/freedombox/blob/main/HACKING.md) file for contributing to FreedomBox Service (Plinth). # Localization diff --git a/pyproject.toml b/pyproject.toml index 0cfa98b4a..135c67205 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -94,8 +94,8 @@ homepage = "https://freedombox.org" projectpage = "https://salsa.debian.org/freedombox-team/freedombox" manual = "https://wiki.debian.org/FreedomBox/Manual/" documentation = "https://docs.freedombox.org/" -changelog = "https://salsa.debian.org/freedombox-team/freedombox/-/blob/master/debian/changelog" -readme = "https://salsa.debian.org/freedombox-team/freedombox/-/blob/master/README.md" +changelog = "https://salsa.debian.org/freedombox-team/freedombox/-/blob/main/debian/changelog" +readme = "https://salsa.debian.org/freedombox-team/freedombox/-/blob/main/README.md" support = "https://freedombox.org/#community" [build-system]