summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG4
-rw-r--r--lib/puppet/parameter.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0dcfcbd80..1b828d19b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
0.24.x
- Fixed 1692 - k5login fails to set mode when file is created
+ Fixed #1667 - Documentation should specify natural language regexs, not Regexp objects
+
+ Fixed #1692 - k5login fails to set mode when file is created
Fixed #1660 - Added specific recurse values for tidy
diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb
index f90193fc8..06dfe5b91 100644
--- a/lib/puppet/parameter.rb
+++ b/lib/puppet/parameter.rb
@@ -63,7 +63,7 @@ class Puppet::Parameter
end
unless regs.empty?
@doc += " Values can also match ``" +
- regs.join("``, ``") + "``."
+ regs.collect { |r| r.inspect }.join("``, ``") + "``."
end
end