From 1de4919051a05128aa6608e6961edf17c4a96124 Mon Sep 17 00:00:00 2001 From: Eemeli Aro Date: Tue, 19 Sep 2023 14:39:03 +0300 Subject: [PATCH] Update "master" references to "main" (#2963) --- .github/workflows/backend.yml | 4 ++-- .github/workflows/frontend.yml | 4 ++-- .github/workflows/heroku.yml | 4 ++-- .github/workflows/js-lint.yml | 4 ++-- .github/workflows/py-lint.yml | 4 ++-- .github/workflows/tag-admin.yml | 4 ++-- CONTRIBUTING.rst | 4 ++-- README.md | 2 +- docs/admin/deployment.rst | 4 ++-- docs/dev/first-contribution.rst | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index b7ae2f74a..40af171d0 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -3,7 +3,7 @@ name: Backend on: push: branches: - - master + - main paths: - requirements/** - docker** @@ -11,7 +11,7 @@ on: - .github/workflows/backend.yml pull_request: branches: - - master + - main paths: - requirements/** - docker** diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index efbe6759a..e87447b09 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -3,13 +3,13 @@ name: Frontend on: push: branches: - - master + - main paths: - translate/** - .github/workflows/frontend.yml pull_request: branches: - - master + - main paths: - translate/** - .github/workflows/frontend.yml diff --git a/.github/workflows/heroku.yml b/.github/workflows/heroku.yml index 30b036745..0746a359f 100644 --- a/.github/workflows/heroku.yml +++ b/.github/workflows/heroku.yml @@ -3,13 +3,13 @@ name: Heroku on: push: branches: - - master + - main paths: - app.json - .github/workflows/heroku.yml pull_request: branches: - - master + - main paths: - app.json - .github/workflows/heroku.yml diff --git a/.github/workflows/js-lint.yml b/.github/workflows/js-lint.yml index 7cabbd30c..0117e9f49 100644 --- a/.github/workflows/js-lint.yml +++ b/.github/workflows/js-lint.yml @@ -3,7 +3,7 @@ name: JavaScript linting on: push: branches: - - master + - main paths: - '**.js' - '**.ts' @@ -15,7 +15,7 @@ on: - .github/workflows/js-lint.yml pull_request: branches: - - master + - main paths: - '**.js' - '**.ts' diff --git a/.github/workflows/py-lint.yml b/.github/workflows/py-lint.yml index 1605f357c..0e9b4abe2 100644 --- a/.github/workflows/py-lint.yml +++ b/.github/workflows/py-lint.yml @@ -3,14 +3,14 @@ name: Python linting on: push: branches: - - master + - main paths: - pontoon/**.py - .github/workflows/py-lint.yml - requirements/lint.txt pull_request: branches: - - master + - main paths: - pontoon/**.py - .github/workflows/py-lint.yml diff --git a/.github/workflows/tag-admin.yml b/.github/workflows/tag-admin.yml index 41efedab4..3fda100df 100644 --- a/.github/workflows/tag-admin.yml +++ b/.github/workflows/tag-admin.yml @@ -3,14 +3,14 @@ name: Non-frontend JavaScript on: push: branches: - - master + - main paths: - tag-admin/** - package.json - .github/workflows/tag-admin.yml pull_request: branches: - - master + - main paths: - tag-admin/** - package.json diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index c7ea89f72..274cfcddf 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -387,8 +387,8 @@ steps, as they don't affect your setup if nothing has changed: .. code-block:: shell - # Pull the latest code (assuming you've already checked out master). - git pull origin master + # Pull the latest code (assuming you've already checked out main). + git pull origin main # Install new dependencies or update existing ones. pip install -U --force --require-hashes -r requirements/default.txt diff --git a/README.md b/README.md index 57e2b3dc5..e7e21ec29 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ If you want to go further, you can: This software is licensed under the [New BSD License](https://creativecommons.org/licenses/BSD/). For more -information, read [LICENSE](https://github.com/mozilla/pontoon/blob/master/LICENSE). +information, read [LICENSE](https://github.com/mozilla/pontoon/blob/HEAD/LICENSE). ## Screenshots diff --git a/docs/admin/deployment.rst b/docs/admin/deployment.rst index d2c16e053..e8cd731d2 100644 --- a/docs/admin/deployment.rst +++ b/docs/admin/deployment.rst @@ -10,7 +10,7 @@ For quick and easy deployment without leaving your web browser, click this butto .. raw:: html - + @@ -254,7 +254,7 @@ you create: ``VCS_SYNC_EMAIL`` Optional. Default committer's email used when committing translations to version control system. -.. _the spec: https://github.com/mozilla/pontoon/blob/master/specs/0108-community-health-dashboard.md +.. _the spec: https://github.com/mozilla/pontoon/blob/HEAD/specs/0108-community-health-dashboard.md .. _Heroku Reference: https://devcenter.heroku.com/articles/error-pages#customize-pages .. _Firefox Accounts: https://developer.mozilla.org/docs/Mozilla/Tech/Firefox_Accounts/Introduction .. _Microsoft Translator API: http://msdn.microsoft.com/en-us/library/hh454950 diff --git a/docs/dev/first-contribution.rst b/docs/dev/first-contribution.rst index 395989eb7..680cb3729 100644 --- a/docs/dev/first-contribution.rst +++ b/docs/dev/first-contribution.rst @@ -135,7 +135,7 @@ documentation resources: - If you want to work on the front-end, it is important that you read the `Front-End - Documentation `_. + Documentation `_. - Most of the documentation around installing and developing can be found in `Pontoon's Documentation `_.