tighten up the description here

the wall of words hurts more than it helps.

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

1 files changed, 4 insertions, 10 deletions

diff --git a/lib/chef/node_map.rb b/lib/chef/node_map.rb
index a4891234f5..9b0a7cef22 100644
--- a/lib/chef/node_map.rb
+++ b/lib/chef/node_map.rb
@@ -38,19 +38,13 @@
 class Chef
   class NodeMap
     COLLISION_WARNING_14 = <<~EOH.gsub(/\s+/, " ").strip
-      %{type_caps} %{key} has been loaded from a cookbook. The %{type} %{key} is now
-      included in Chef and will take precedence over the existing cookbook %{type} in the
-      next major release of Chef (15.0, April 2019). You may be able to remove this cookbook dependency from
-      your runlist if you do not use other recipes/resources/libraries from the cookbook.
-      Alternatively there may be a newer version of this cookbook without the %{key} %{type}.
+      %{type_caps} %{key} from a cookbook is overriding the %{type} from core.  Please upgrade your cookbook
+        or remove the cookbook from your run_list before the next major release of Chef.
 EOH
 
     COLLISION_WARNING_15 = <<~EOH.gsub(/\s+/, " ").strip
-      %{type_caps} %{key} attempted to load from a cookbook. The %{type} %{key} is now
-      included in Chef and takes precedence over the existing cookbook %{type}
-      which will be ignored. You may be able to remove this cookbook dependency from
-      your runlist if you do not use other recipes/resources/libraries from the cookbook.
-      Alternatively there may be a newer version of this cookbook without the %{key} %{type}.
+      %{type_caps} %{key} from core is overriding the %{type} from a cookbook.  Please upgrade your cookbook
+        or remove the cookbook from your run_list.
 EOH
 
     #