X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fvalues.rb;h=91a0cb9adc5a93d13dea5b48305bd13d4d0a828a;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=0ca236c3d987188c523bf0fecfac42f7fc2bf2ad;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/values.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/values.rb
index 0ca236c3d..91a0cb9ad 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/values.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/values.rb
@@ -1,27 +1,29 @@
 #
 # values.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:values, :type => :rvalue, :doc => <<-EOS
-When given a hash this function will return the values of that hash.
+  newfunction(:values, :type => :rvalue, :doc => <<-DOC
+    When given a hash this function will return the values of that hash.
+
+    *Examples:*
 
-*Examples:*
+        $hash = {
+          'a' => 1,
+          'b' => 2,
+          'c' => 3,
+        }
+        values($hash)
 
-    $hash = {
-      'a' => 1,
-      'b' => 2,
-      'c' => 3,
-    }
-    values($hash)
+    This example would return:
 
-This example would return:
+        [1,2,3]
 
-    [1,2,3]
-    EOS
-  ) do |arguments|
+    Note: from Puppet 5.5.0, the compatible function with the same name in Puppet core
+    will be used instead of this function.
+    DOC
+             ) do |arguments|
 
-    raise(Puppet::ParseError, "values(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "values(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty?
 
     hash = arguments[0]