minor fixes to .ignore and docs

diff --git a/files/empty/.ignore b/files/empty/.ignore
index ce47061b93b1f1db298e0667adb5373b95da2e47..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/files/empty/.ignore
+++ b/files/empty/.ignore
@@ -1 +0,0 @@
-A placeholder to nail this directory into git

diff --git a/manifests/defines/modules_dir.pp b/manifests/defines/modules_dir.pp
index a59102fcc988bc2e2c4777d9f84159d5b5053eec..797de2d7acff00b425be26257df3f7928f723e8e 100644 (file)
--- a/manifests/defines/modules_dir.pp
+++ b/manifests/defines/modules_dir.pp
@@ -19,7 +19,7 @@ define modules_dir (
                                source => [ "puppet:///${name}/modules_dir", "puppet:///common/empty"],
                                checksum => mtime,
                                # ignore the placeholder
-                               ignore => '.ignore', 
+                               ignore => '\.ignore', 
                                recurse => true, purge => true, force => true,
                                mode => $mode, owner => $owner, group => $group;
                }

diff --git a/plugins/puppet/parser/functions/gsub.rb b/plugins/puppet/parser/functions/gsub.rb
index 371820f2c7c77a071f9311be0afbb3e2cf7e6ce8..e2410ffbadf6e7a93fbf7960540048f58fa96c9b 100644 (file)
--- a/plugins/puppet/parser/functions/gsub.rb
+++ b/plugins/puppet/parser/functions/gsub.rb
@@ -1,5 +1,9 @@
-# generic gsub call
 module Puppet::Parser::Functions
+       # thin wrapper around the ruby gsub function
+       # gsub($string, $pattern, $replacement) will replace all occurrences of
+       # $pattern in $string with $replacement. $string can be either a singel
+       # value or an array. In the latter case, each element of the array will
+       # be processed in turn.
        newfunction(:gsub, :type => :rvalue) do |args|
                if args[0].is_a?(Array)
                        args[0].collect do |val|