diff options
| author | Patricio Cano <patricio@gitlab.com> | 2015-01-12 22:26:51 -0500 |
|---|---|---|
| committer | Patricio Cano <patricio@gitlab.com> | 2015-01-12 22:26:51 -0500 |
| commit | e588328674f1c0c956b924c9ec78391d209150cd (patch) | |
| tree | 923d25fb4ad808159d96363b43546d5cf9aedf3e | |
| parent | 0be1a45b9f4296016e758a5e650f516262fae640 (diff) | |
| download | gitlab-ce-e588328674f1c0c956b924c9ec78391d209150cd.tar.gz | |
Fixed wording in message.
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | doc/release/monthly.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1842ee39162..08a9a1daa28 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -DISCLAIMER: The upcoming release contains empty lines to reduce the number of merge conflicts, scroll down to see past releases. +Note: The upcoming release contains empty lines to reduce the number of merge conflicts, scroll down to see past releases. v 7.7.0 - diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 7e2e4f41d6e..175112b90c6 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -90,7 +90,7 @@ asked if there is anything missing. There are three changelogs that need to be updated: CE, EE and CI. -Remove the DISCLAIMER text in the stable branches. +Remove the Note text in the stable branches. ## Create RC1 (CE, EE, CI) @@ -103,7 +103,7 @@ lines to it. We do this in order to avoid merge conflicts when merging the CHANG Make sure that the CHANGELOG im master contains the following disclaimer message: -> DISCLAIMER: The upcoming release contains empty lines to reduce the number of merge conflicts, scroll down to see past releases. +> Note: The upcoming release contains empty lines to reduce the number of merge conflicts, scroll down to see past releases. ## QA |