diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0eae8312..7707f0cc 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,7 +8,7 @@ Relates OR Closes #0000 -Release note for [CHANGELOG](https://github.com/bpg/terraform-provider-proxmox/blob/master/CHANGELOG.md): +Release note for [CHANGELOG](https://github.com/bpg/terraform-provider-proxmox/blob/main/CHANGELOG.md): ```release-note diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 85268ab5..41deeb56 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] paths-ignore: - '**/*.md' - '**/*.tf' diff --git a/.github/workflows/generate_changelog.yml b/.github/workflows/generate_changelog.yml index ed404609..233e7244 100644 --- a/.github/workflows/generate_changelog.yml +++ b/.github/workflows/generate_changelog.yml @@ -2,7 +2,7 @@ name: Generate CHANGELOG on: push: - branches: [ master ] + branches: [ main ] pull_request: types: [closed] @@ -16,7 +16,7 @@ on: jobs: generate_changelog: runs-on: ubuntu-latest - name: Generate changelog for master branch + name: Generate changelog for main branch steps: - uses: actions/checkout@v2 @@ -28,5 +28,5 @@ jobs: - uses: stefanzweifel/git-auto-commit-action@v4 with: commit_message: Update CHANGELOG.md - branch: master + branch: main file_pattern: CHANGELOG.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d22fbedd..3851c420 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,7 +21,7 @@ You can run all the test cases by invoking `make test`. ## Submitting changes -Please create a new PR against the `master` branch which must be based on the +Please create a new PR against the `main` branch which must be based on the project's [pull request template](.github/PULL_REQUEST_TEMPLATE.md). ## Coding conventions diff --git a/docs/_config.yml b/docs/_config.yml index 76bc46a0..9744ddff 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -11,6 +11,6 @@ plugins: remote_theme: pmarsceill/just-the-docs # Theme settings. -footer_content: 'Copyright © 2019-2021 Danitso - Distributed under the Mozilla Public License 2.0
Copyright © 2021 Pavel Boldyrev - Distributed under the Mozilla Public License 2.0' +footer_content: 'Copyright © 2019-2021 Danitso - Distributed under the Mozilla Public License 2.0
Copyright © 2021 Pavel Boldyrev - Distributed under the Mozilla Public License 2.0' heading_anchors: true search_enabled: false