Merge branch 'nom' into newio

rakudo · Jan 5, 2015 · 109a680 · 109a680
2 parents cb3bd5f + 97bf782
commit 109a680
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/docs/ChangeLog b/docs/ChangeLog
@@ -3,6 +3,7 @@ New in 2015.01
   non-placeholder in the same scope
 + sub form of 'unique' introduced, 'uniq' deprecated
 + Supply.for deprecated in favour of Supply.from-list
++ All deprecated features will be removed with 6.0.0 (sometime in 2015)
 
 New in 2014.12
 + Flakiness on OS X has been fixed

diff --git a/src/core/Deprecations.pm b/src/core/Deprecations.pm
@@ -110,9 +110,12 @@ sub DEPRECATED ( $alternative, $from?, $removed?, :$up = 1, :$what ) {
 END {
     unless %*ENV<RAKUDO_NO_DEPRECATIONS> {
         if Deprecation.report -> $message {
-            note $message;
-            note "Please contact the author to have these calls to deprecated code adapted,";
-            note "so that this message will disappear!";
+            note $message;   # q:to/TEXT/ doesn't work in settings
+            note 'Please contact the author to have these calls to deprecated code adapted,
+so that this message will disappear!
+
+Please note that *ALL* deprecated features will be removed at the release
+of Perl 6.0.0 (expected some time in 2015).'
         }
     }
 }