X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Funion.rb;h=ac521e55c2993ff76dae431d88a7bf7797987017;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=abe2dc88a67cb4085b7bc07955d7a0e716a46cc5;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb
index abe2dc88a..ac521e55c 100644
--- 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