summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-ci-robot <k8s-ci-robot@users.noreply.github.com>2018-10-23 08:25:30 -0700
committerGitHub <noreply@github.com>2018-10-23 08:25:30 -0700
commit9fa150d5b62297941f8052919fc66ffafee3fbf4 (patch)
tree050e9bc00dfd0f2794fc396528df132f8c0b8099
parent44ffd489343c06118f871a3e0587ac7e278b4a81 (diff)
parent9160d9b78403b2ff7e27f7750b9fb0b8b4261bab (diff)
Merge pull request #2339 from marpaia/update-adding-relnotes-guide
Update the release notes guide to reference recently added labels
-rw-r--r--contributors/guide/release-notes.md8
1 files changed, 3 insertions, 5 deletions
diff --git a/contributors/guide/release-notes.md b/contributors/guide/release-notes.md
index e9fcb4df..926f5946 100644
--- a/contributors/guide/release-notes.md
+++ b/contributors/guide/release-notes.md
@@ -22,14 +22,12 @@ For pull requests that require additional action from users switching to the new
action required: your release note here
```
-For pull requests that don't need to be mentioned at release time, just write "NONE" (case insensitive):
+For pull requests that don't need to be mentioned at release time, use the `/release-note-none` Prow command to add the `release-note-none` label to the PR. You can also write the string "NONE" as a release note in your PR description:
```release-note
NONE
```
-The `/release-note-none` comment command can still be used as an alternative to writing "NONE" in the release-note block if it is left empty.
+To see how to format your release notes, view the kubernetes/kubernetes [pull request template](https://git.k8s.io/kubernetes/.github/PULL_REQUEST_TEMPLATE.md) for a brief example. Pull Request titles and body comments can be modified at any time prior to the release to make them friendly for release notes.
-To see how to format your release notes, view the kubernetes/kubernetes [pull request template](https://git.k8s.io/kubernetes/.github/PULL_REQUEST_TEMPLATE.md) for a brief example. pull request titles and body comments can be modified at any time prior to the release to make them friendly for release notes.
-
-Release notes apply to pull requests on the master branch. For cherry-pick pull requests, see the [cherry-pick instructions](contributors/devel/cherry-picks.md). The only exception to these rules is when a pull request is not a cherry-pick and is targeted directly to the non-master branch. In this case, a `release-note-*` label is required for that non-master pull request. \ No newline at end of file
+Release notes apply to pull requests on the master branch. For cherry-pick pull requests, see the [cherry-pick instructions](contributors/devel/cherry-picks.md). The only exception to these rules is when a pull request is not a cherry-pick and is targeted directly to the non-master branch. In this case, a `release-note-*` label is required for that non-master pull request.