diff --git a/.github/workflows/knative-boilerplate.yaml b/.github/workflows/knative-boilerplate.yaml index f901369ff..9d4093ea6 100644 --- a/.github/workflows/knative-boilerplate.yaml +++ b/.github/workflows/knative-boilerplate.yaml @@ -19,7 +19,7 @@ name: Boilerplate on: pull_request: - branches: [ 'main', 'master', 'release-*', 'mkdocs' ] + branches: [ 'main', 'master', 'release-*' ] jobs: diff --git a/.github/workflows/knative-donotsubmit.yaml b/.github/workflows/knative-donotsubmit.yaml index d9d0a3b05..cec5c3077 100644 --- a/.github/workflows/knative-donotsubmit.yaml +++ b/.github/workflows/knative-donotsubmit.yaml @@ -19,7 +19,7 @@ name: Do Not Submit on: pull_request: - branches: [ 'main', 'master', 'release-*', 'mkdocs' ] + branches: [ 'main', 'master', 'release-*' ] jobs: diff --git a/.github/workflows/knative-go-build.yaml b/.github/workflows/knative-go-build.yaml index 47e0f99eb..da2ffd01a 100644 --- a/.github/workflows/knative-go-build.yaml +++ b/.github/workflows/knative-go-build.yaml @@ -19,7 +19,7 @@ name: Build on: pull_request: - branches: [ 'main', 'master', 'release-*', 'mkdocs' ] + branches: [ 'main', 'master', 'release-*' ] jobs: diff --git a/.github/workflows/knative-go-test.yaml b/.github/workflows/knative-go-test.yaml index 75b2a6591..2c892f18d 100644 --- a/.github/workflows/knative-go-test.yaml +++ b/.github/workflows/knative-go-test.yaml @@ -20,10 +20,10 @@ name: Test on: push: - branches: [ 'main', 'master', 'mkdocs' ] + branches: [ 'main', 'master' ] pull_request: - branches: [ 'main', 'master', 'release-*', 'mkdocs' ] + branches: [ 'main', 'master', 'release-*' ] jobs: diff --git a/.github/workflows/knative-security.yaml b/.github/workflows/knative-security.yaml index 635a8465e..fbfe531d9 100644 --- a/.github/workflows/knative-security.yaml +++ b/.github/workflows/knative-security.yaml @@ -19,10 +19,10 @@ name: 'Security' on: push: - branches: [ 'main', 'master', 'release-*', 'mkdocs' ] + branches: [ 'main', 'master', 'release-*' ] pull_request: - branches: [ 'main', 'master', 'release-*', 'mkdocs' ] + branches: [ 'main', 'master', 'release-*' ] jobs: analyze: diff --git a/.github/workflows/knative-style.yaml b/.github/workflows/knative-style.yaml index 5f5caaaab..00902ffd4 100644 --- a/.github/workflows/knative-style.yaml +++ b/.github/workflows/knative-style.yaml @@ -19,7 +19,7 @@ name: Code Style on: pull_request: - branches: [ 'main', 'master', 'release-*', 'mkdocs' ] + branches: [ 'main', 'master', 'release-*' ] jobs: @@ -169,7 +169,7 @@ jobs: echo '::group:: Flagging trailing whitespace with reviewdog 🐶 ...' # Don't fail because of grep set +o pipefail - + # Exclude generated and vendored files, plus some legacy # paths until we update all .gitattributes git ls-files | diff --git a/.github/workflows/knative-verify.yaml b/.github/workflows/knative-verify.yaml index 945712342..e18937e17 100644 --- a/.github/workflows/knative-verify.yaml +++ b/.github/workflows/knative-verify.yaml @@ -19,7 +19,7 @@ name: Verify on: pull_request: - branches: [ 'main', 'master', 'release-*', 'mkdocs' ] + branches: [ 'main', 'master', 'release-*' ] jobs: diff --git a/.github/workflows/mkdocs-strict-verify.yaml b/.github/workflows/mkdocs-strict-verify.yaml index aade7dbe4..23a0268f4 100644 --- a/.github/workflows/mkdocs-strict-verify.yaml +++ b/.github/workflows/mkdocs-strict-verify.yaml @@ -19,7 +19,7 @@ name: Knative Verify on: pull_request: - branches: [ 'mkdocs', 'release-*' ] + branches: [ 'main', 'release-*' ] jobs: diff --git a/docs/help/contributor/README.md b/docs/help/contributor/README.md index 7ae6c4591..5931f0a1c 100644 --- a/docs/help/contributor/README.md +++ b/docs/help/contributor/README.md @@ -38,5 +38,5 @@ If you notice gaps in the style guide or have queries, please post in [the Docs - [Formatting standard and conventions](style-guide/style-and-formatting.md) - [Voice and language](style-guide/voice-and-language.md) - [Word and phrase list](style-guide/word-and-phrase-list.md) -- [Content re-use](https://github.com/knative/docs/tree/mkdocs/docs/snippets) +- [Content re-use](https://github.com/knative/docs/tree/main/docs/snippets) - [Using shortcodes (TBD)]() diff --git a/docs/snippets/links/main-docs-branch-link.md b/docs/snippets/links/main-docs-branch-link.md index 1fcd12fd1..860f30810 100644 --- a/docs/snippets/links/main-docs-branch-link.md +++ b/docs/snippets/links/main-docs-branch-link.md @@ -1 +1 @@ -[https://github.com/knative/docs/tree/mkdocs](https://github.com/knative/docs/tree/mkdocs) +[https://github.com/knative/docs/tree/main](https://github.com/knative/docs/tree/main) diff --git a/golang/docs.html b/golang/docs.html index 4e4c44867..b2e43a786 100644 --- a/golang/docs.html +++ b/golang/docs.html @@ -1,4 +1,4 @@
- + diff --git a/mkdocs.yml b/mkdocs.yml index 452462583..945dff7ef 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -7,7 +7,7 @@ extra_css: - stylesheets/extra.css repo_url: https://github.com/knative/docs -edit_uri: edit/mkdocs/docs +edit_uri: edit/main/docs theme: name: material @@ -80,7 +80,7 @@ extra: # TODO: Replace with https://github.com/mkdocs/mkdocs/pull/2267 once mkdocs 1.2 is out. version_warning: !!python/object/apply:os.getenv ["VERSION_WARNING"] knative_version: !!python/object/apply:os.getenv ["KNATIVE_VERSION"] - branch: !!python/object/apply:os.getenv ["SAMPLES_BRANCH", "mkdocs"] + branch: !!python/object/apply:os.getenv ["SAMPLES_BRANCH", "main"] analytics: provider: google property: G-YRMNFYE32R