Fixed wording in message.

e5883286 · Patricio Cano · 0be1a45b · e5883286 · e5883286
Commit e5883286 authored Jan 12, 2015 by Patricio Cano
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

CHANGELOG CHANGELOG +1 -1

doc/release/monthly.md doc/release/monthly.md +2 -2

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
-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
  -

--- 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