summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util/command_line/puppetd
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 /lib/puppet/util/command_line/puppetd
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 'lib/puppet/util/command_line/puppetd')
-rwxr-xr-xlib/puppet/util/command_line/puppetd2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd
index 3af2fdabf..571b15486 100755
--- a/lib/puppet/util/command_line/puppetd
+++ b/lib/puppet/util/command_line/puppetd
@@ -69,7 +69,7 @@
# parameter, so you can specify '--server <servername>' as an argument.
#
# See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://docs.puppetlabs.com/references/stable/configuration.html for
# the full list of acceptable parameters. A commented list of all
# configuration options can also be generated by running puppet agent with
# '--genconfig'.