summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authornfagerlund <nick.fagerlund@gmail.com>2011-02-23 18:18:45 -0800
committernfagerlund <nick.fagerlund@gmail.com>2011-02-23 18:18:45 -0800
commita42e796fa88574ef97a99b034c4229b961bdac60 (patch)
tree829c4362f019c0f4a523b76af5431887ef106ad7 /lib/puppet
parenta767eb03e7a01c047020763c0bfe3b500ac5044d (diff)
parentb5bae9f99fb2ab2bd2429d047db7e53aa8c90fbd (diff)
downloadpuppet-a42e796fa88574ef97a99b034c4229b961bdac60.tar.gz
puppet-a42e796fa88574ef97a99b034c4229b961bdac60.tar.xz
puppet-a42e796fa88574ef97a99b034c4229b961bdac60.zip
Merge branch 'ticket/2.6.next/6331' into 2.6.next
Diffstat (limited to 'lib/puppet')
-rwxr-xr-xlib/puppet/type/file/content.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/type/file/content.rb b/lib/puppet/type/file/content.rb
index cf924f371..63c0aaf4d 100755
--- a/lib/puppet/type/file/content.rb
+++ b/lib/puppet/type/file/content.rb
@@ -31,8 +31,7 @@ module Puppet
}
}
- This attribute is especially useful when used with
- `PuppetTemplating templating`:trac:."
+ This attribute is especially useful when used with templating."
# Store a checksum as the value, rather than the actual content.
# Simplifies everything.