X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fzip.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fzip.rb;h=87a89f82455f12ac5e6ff9039414d474b9e8635b;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=13e24b6c9e5a5c933829fdcce5b49f182a902527;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/zip.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/zip.rb
index 13e24b6c9..87a89f824 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/zip.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/zip.rb
@@ -1,20 +1,19 @@
 #
 # zip.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:zip, :type => :rvalue, :doc => <<-EOS
-Takes one element from first array and merges corresponding elements from second array. This generates a sequence of n-element arrays, where n is one more than the count of arguments.
+  newfunction(:zip, :type => :rvalue, :doc => <<-DOC
+    Takes one element from first array and merges corresponding elements from second array. This generates a sequence of n-element arrays, where n is one more than the count of arguments.
 
-*Example:*
+    *Example:*
 
-    zip(['1','2','3'],['4','5','6'])
+        zip(['1','2','3'],['4','5','6'])
 
-Would result in:
+    Would result in:
 
-    ["1", "4"], ["2", "5"], ["3", "6"]
-    EOS
-  ) do |arguments|
+        ["1", "4"], ["2", "5"], ["3", "6"]
+    DOC
+             ) do |arguments|
 
     # Technically we support three arguments but only first is mandatory ...
     raise(Puppet::ParseError, "zip(): Wrong number of arguments given (#{arguments.size} for 2)") if arguments.size < 2
@@ -22,7 +21,7 @@ Would result in:
     a = arguments[0]
     b = arguments[1]
 
-    unless a.is_a?(Array) and b.is_a?(Array)
+    unless a.is_a?(Array) && b.is_a?(Array)
       raise(Puppet::ParseError, 'zip(): Requires array to work with')
     end