summaryrefslogtreecommitdiffstats
path: root/examples/modules/sample-module
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-07-14 15:24:19 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-07-14 15:24:32 -0700
commit21efa7b282080c69760a17576dff60c01821a963 (patch)
tree8874c587d6932f49b0588caaa78149083231d947 /examples/modules/sample-module
parent9caa04fd36353f02b5e3e1d343f04a62ba640f64 (diff)
parent91185c6c04dc2bb5659db8f7a7d23a41c4d308ea (diff)
downloadpuppet-21efa7b282080c69760a17576dff60c01821a963.tar.gz
puppet-21efa7b282080c69760a17576dff60c01821a963.tar.xz
puppet-21efa7b282080c69760a17576dff60c01821a963.zip
Merge branch 'master' into next
This is the code for 2.6 RC3
Diffstat (limited to 'examples/modules/sample-module')
-rw-r--r--examples/modules/sample-module/README.txt2
-rw-r--r--examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/modules/sample-module/README.txt b/examples/modules/sample-module/README.txt
index ee4b8201a..cd35c83a1 100644
--- a/examples/modules/sample-module/README.txt
+++ b/examples/modules/sample-module/README.txt
@@ -13,5 +13,5 @@ Note the consistent naming of files for Puppet::Util::Autoload
Reference Documents:
http://reductivelabs.com/trac/puppet/wiki/ModuleOrganisation
-http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+http://docs.puppetlabs.com/guides/custom_functions.html
http://reductivelabs.com/trac/puppet/wiki/FunctionReference
diff --git a/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
index 34ab280fb..fe4e54992 100644
--- a/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
+++ b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
@@ -27,7 +27,7 @@
# Jeff McCune <jeff.mccune@northstarlabs.net>
# 2007-08-14
-# See: http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+# See: http://docs.puppetlabs.com/guides/custom_functions.html
module Puppet::Parser::Functions
newfunction(:hostname_to_dn, :type => :rvalue, :doc => "Given 'foo.bar.com', return 'dc=foo,dc=bar,dc=com'.") do |args|