Skip to content

Commit

Permalink
Update PR template for 1.13 release (#10603)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
tfogo authored and k8s-ci-robot committed Oct 13, 2018
1 parent abcee2d commit 9abeb8b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 7 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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.
>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/contribute/start.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9abeb8b

Please sign in to comment.