From ee4b9ee1f95b2fb9c920649b36ebabec73b448b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Ord=C3=A1s?= <3125580+davorpa@users.noreply.github.com> Date: Tue, 23 Nov 2021 15:25:57 +0100 Subject: [PATCH] chore: Rename `master` to `main` #blacklivesmatter (#6627) * chore: Rename `master` to `main` #blacklivesmatter Resolves EbookFoundation/free-programming-books#5803 * docs(contributing): fix broken ref link to `programming-playgrounds` Fix over EbookFoundation/free-programming-books#5449 and commit 3c42c3629ed302fd5818454472c49f11a27ca477 (cherry picked from commit 59ebfe3f97e318fa43d58877cbc5bfdd8b0c7426) * fix: Complete #6614 upstream/main merge Over commit: https://github.com/EbookFoundation/free-programming-books/commit/4d3c9fe11c84604c09d4b3834a59cd5820bbd1f9 Co-authored-by: ImVector <59611597+LuigiImVector@users.noreply.github.com> Co-authored-by: ImVector <59611597+LuigiImVector@users.noreply.github.com> --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- docs/CONTRIBUTING-es.md | 2 +- docs/CONTRIBUTING.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 52a7e5430..5df316492 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -11,7 +11,7 @@ Add resource(s) | Remove resource(s) | Add info | Improve repo ### For book lists, is it a book? For course lists, is it a course? etc. ## Checklist: -- [ ] Read our [contributing guidelines](https://github.com/EbookFoundation/free-programming-books/blob/master/CONTRIBUTING.md) +- [ ] Read our [contributing guidelines](https://github.com/EbookFoundation/free-programming-books/blob/main/docs/CONTRIBUTING.md) - [ ] Search for duplicates. - [ ] Include author(s) and platform where appropriate. - [ ] Put lists in alphabetical order, correct spacing. diff --git a/docs/CONTRIBUTING-es.md b/docs/CONTRIBUTING-es.md index f2c58f49c..fb505f184 100644 --- a/docs/CONTRIBUTING-es.md +++ b/docs/CONTRIBUTING-es.md @@ -257,4 +257,4 @@ Si es posible imprimirlo y conservar su esencia, no es un Tutorial Interactivo. [in_process]: #in_process [archived]: #archived [markdown_guide]: https://guides.github.com/features/mastering-markdown/ -[programming_playgrounds_list]: (https://github.com/EbookFoundation/free-programming-books/blob/master/more/free-programming-playgrounds.md) +[programming_playgrounds_list]: https://github.com/EbookFoundation/free-programming-books/blob/main/more/free-programming-playgrounds.md diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 39ba217ad..84aeb6fee 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -2,7 +2,7 @@ ## Contributor License Agreement -By contributing you agree to the [LICENSE](https://github.com/EbookFoundation/free-programming-books/blob/master/LICENSE) of this repository. +By contributing you agree to the [LICENSE](https://github.com/EbookFoundation/free-programming-books/blob/main/LICENSE) of this repository. ## Contributor Code of Conduct By contributing you agree to respect the [Code of Conduct](CODE_OF_CONDUCT.md) of this repository. ([translations](../README.md#translations))