Update stdlib and concat to 6.1.0 both

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / lib / puppet / parser / functions / union.rb

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb
index abe2dc8..ac521e5 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb
@@ -1,18 +1,19 @@
 #
 # union.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:union, :type => :rvalue, :doc => <<-EOS
-This function returns a union of two or more arrays.
-
-*Examples:*
-
-    union(["a","b","c"],["b","c","d"])
-
-Would return: ["a","b","c","d"]
-    EOS
-  ) do |arguments|
+  newfunction(:union, :type => :rvalue, :doc => <<-DOC
+    @summary
+      This function returns a union of two or more arrays.
+
+    @return
+      a unionized array of two or more arrays
+    @example **Usage**
+
+      union(["a","b","c"],["b","c","d"])
+      Would return: ["a","b","c","d"]
+    DOC
+             ) do |arguments|
 
     # Check that 2 or more arguments have been given ...
     raise(Puppet::ParseError, "union(): Wrong number of arguments given (#{arguments.size} for < 2)") if arguments.size < 2