summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2013-04-29 17:18:09 -0700
committerJeff McCune <jeff@puppetlabs.com>2013-04-29 17:18:09 -0700
commit0aa7e942f4bdcd51d7af827618288c662e0cb8e4 (patch)
treee510527b4d785dd19ee30cc8918c6c1c1b649f96
parentbebecd33783b483f6af059e311b9631d3a3336cc (diff)
parent928036ac538dd32cd5af81bea90fac077a89d721 (diff)
Merge branch 'msmithgu-small-typo-fix'
* msmithgu-small-typo-fix: (maint) Fix a small typo in hash() description closes #148
-rw-r--r--README.markdown2
-rw-r--r--lib/puppet/parser/functions/hash.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/README.markdown b/README.markdown
index 0efaf16..640299f 100644
--- a/README.markdown
+++ b/README.markdown
@@ -390,7 +390,7 @@ Example:
hash
----
-This function converts and array into a hash.
+This function converts an array into a hash.
*Examples:*
diff --git a/lib/puppet/parser/functions/hash.rb b/lib/puppet/parser/functions/hash.rb
index 453ba1e..8cc4823 100644
--- a/lib/puppet/parser/functions/hash.rb
+++ b/lib/puppet/parser/functions/hash.rb
@@ -4,7 +4,7 @@
module Puppet::Parser::Functions
newfunction(:hash, :type => :rvalue, :doc => <<-EOS
-This function converts and array into a hash.
+This function converts an array into a hash.
*Examples:*