summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-05-17 01:06:18 +1000
committerJames Turnbull <james@lovedthanlost.net>2008-05-17 01:06:18 +1000
commit390db8061ae81174ee9d42e26a6ebfe7182ea529 (patch)
tree9e5b6f8942e4df8c6edc6beaaf17529fbdd01807 /bin
parent2d6a914e6071681b83e482b40448d9219d6e4d76 (diff)
downloadpuppet-390db8061ae81174ee9d42e26a6ebfe7182ea529.tar.gz
puppet-390db8061ae81174ee9d42e26a6ebfe7182ea529.tar.xz
puppet-390db8061ae81174ee9d42e26a6ebfe7182ea529.zip
Updated puppetd documentation which fixes ticket #1227
Diffstat (limited to 'bin')
-rwxr-xr-xbin/puppetd8
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/puppetd b/bin/puppetd
index f652e6b08..96d0e5ee8 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -10,7 +10,7 @@
#
# puppetd [-D|--daemonize|--no-daemonize] [-d|--debug] [--disable] [--enable]
# [-h|--help] [--fqdn <host name>] [-l|--logdest syslog|<file>|console]
-# [-o|--onetime] [--serve <handler>] [-t|--test]
+# [-o|--onetime] [--serve <handler>] [-t|--test] [--noop]
# [-V|--version] [-v|--verbose] [-w|--waitforcert <seconds>]
#
# = Description
@@ -57,7 +57,7 @@
# parameter, so you can specify '--server <servername>' as an argument.
#
# See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
# the full list of acceptable parameters. A commented list of all
# configuration options can also be generated by running puppetd with
# '--genconfig'.
@@ -124,6 +124,10 @@
# Enable the most common options used for testing. These are +onetime+,
# +verbose+, +ignorecache, and +no-usecacheonfailure+.
#
+# noop::
+# Use +noop+ mode where the daemon runs in a no-op or dry-run mode. This is useful
+# for seeing what changes Puppet will make without actually executing the changes.
+#
# verbose::
# Turn on verbose reporting.
#