From 236643eefad7b99e5756722ebb2a55bce1dc9a54 Mon Sep 17 00:00:00 2001 From: riQQ Date: Wed, 11 Oct 2023 10:59:43 +0200 Subject: [PATCH 1/2] Editorial improvements in CONTRIBUTING docs --- CONTRIBUTING.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d2e224fb6..05f9499b9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,22 +6,22 @@ Hi! Thanks for checking out how to contribute to MapComplete! There are multiple ways to contribute: - Translating MapComplete to your own language can be done - on [this website](https://hosted.weblate.org/projects/mapcomplete/) + on [the Weblate website](https://hosted.weblate.org/projects/mapcomplete/) - If you encounter a bug, the [issue tracker](https://github.com/pietervdvn/MapComplete/issues) is the place to be - A good start to contribute is to create a single map layer showing features which interest you. Read more about [making your own theme](/Docs/Making_Your_Own_Theme.md). - If you want to improve a theme, create a new theme, spot a typo in the repo... the best way is to open a pull request. -People who stick around and contribute in a meaningful way, _might_ be granted write access to the repository (except . This is +People who stick around and contribute in a meaningful way, _might_ be granted write access to the repository. This is done on a purely subjective basis, e.g. after a few pull requests and if you are a member of the OSM community. Rights of contributors ----------------------- If you have write access to the repository, you can make a fork of an already existing branch and push this new branch -to github. This means that this branch will be _automatically built_ and be **deployed** +to GitHub. This means that this branch will be _automatically built_ and be **deployed** to `https://pietervdvn.github.io/mc/`. You can see the deploy process -on [Github Actions](https://github.com/pietervdvn/MapComplete/actions). Don't worry about pushing too much. These -deploys are free and totally automatic. They might fail if something is wrong, but this will hinder no-one. +on [GitHub Actions](https://github.com/pietervdvn/MapComplete/actions). Don't worry about pushing too much. These +deploys are free and totally automatic. They might fail if something is wrong, but this will hinder no one. Additionaly, some other maintainer might step in and merge the latest develop with your branch, making later pull requests easier. @@ -58,6 +58,6 @@ again to start fresh. What not to contribute ---------------------- -I'm currently _not_ accepting files for integration with some editor. There are hundreds of editors out there, if every single one of them needs a file in the repo, this ends up as a mess. -Furthermore, MapComplete doesn't want to encourage or discourage some editors. +I'm currently _not_ accepting files for integration with some text editor. There are hundreds of editors out there, if every single one of them needs a file in the repo, this ends up as a mess. +Furthermore, MapComplete doesn't want to encourage or discourage some text editors. At last, these files are hard to maintain and are hard to detect if they have fallen out of use. From 2e3bddc90088190befda69f7f3667a804fe9daf4 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 11 Oct 2023 21:46:41 +0000 Subject: [PATCH 2/2] Update CONTRIBUTING.md Co-authored-by: riQQ --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 05f9499b9..6acc1b1ee 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ There are multiple ways to contribute: - A good start to contribute is to create a single map layer showing features which interest you. Read more about [making your own theme](/Docs/Making_Your_Own_Theme.md). - If you want to improve a theme, create a new theme, spot a typo in the repo... the best way is to open a pull request. -People who stick around and contribute in a meaningful way, _might_ be granted write access to the repository. This is +People who stick around and contribute in a meaningful way, _might_ be granted write access to the repository (except the branches *master* and *develop*). This is done on a purely subjective basis, e.g. after a few pull requests and if you are a member of the OSM community. Rights of contributors