From 9abeb8bfa1a381b49bad6ed2bd20e21cee6810b6 Mon Sep 17 00:00:00 2001 From: Tim Fogarty Date: Fri, 12 Oct 2018 18:00:20 -0700 Subject: [PATCH] Update PR template for 1.13 release (#10603) * Update PR template for 1.13 release Also updates links to documentation for submitting PRs * Update contributing docs for new branch strategy Branches for upcoming releases are now dev-X.Y instead of release-X.Y --- .github/PULL_REQUEST_TEMPLATE.md | 10 +++++++--- content/en/docs/contribute/start.md | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b702f514d18e0..7c0810171f884 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,8 +1,12 @@ >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > Please delete this note before submitting the pull request. -> For 1.12 Features: set Milestone to 1.12 and Base Branch to release-1.12 -> Help editing and submitting pull requests: https://deploy-preview-9510--kubernetes-io-master-staging.netlify.com/docs/contribute/start/#submit-a-pull-request. -> Help choosing which branch to use, see +> +> For 1.13 Features: set Milestone to 1.13 and Base Branch to dev-1.13 +> +> Help editing and submitting pull requests: +> https://kubernetes.io/docs/contribute/start/#improve-existing-content. +> +> Help choosing which branch to use: > https://kubernetes.io/docs/contribute/start#choose-which-git-branch-to-use. >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > diff --git a/content/en/docs/contribute/start.md b/content/en/docs/contribute/start.md index dfd45d668ffa0..02e0ce0bc0ce5 100644 --- a/content/en/docs/contribute/start.md +++ b/content/en/docs/contribute/start.md @@ -179,7 +179,7 @@ to base your work on. Use these guidelines to make the decision: - Use `master` for fixing problems in content that is already published, or making improvements to content that already exists. -- Use a release branch (such as `release-1.12`) to document upcoming features + - Use a release branch (such as `dev-{{< release-branch >}}` for the {{< release-branch >}} release) to document upcoming features or changes for an upcoming release that is not yet published. - Use a feature branch that has been agreed upon by SIG Docs to collaborate on big improvements or changes to the existing documentation, including content