Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	spec/integration/defaults.rb
	spec/integration/node/catalog.rb
	spec/unit/rails.rb
	spec/unit/type/mount.rb

2 files changed, 7 insertions, 3 deletions

diff --git a/bin/puppetd b/bin/puppetd
index b92773c76..d408af7d3 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.
 #
diff --git a/bin/ralsh b/bin/ralsh
index 1d0036717..3cbfcad41 100755
--- a/bin/ralsh
+++ b/bin/ralsh
@@ -65,7 +65,7 @@
 #
 # This example uses ``ralsh`` to return Puppet configuration for the user ``luke``::
 #   
-# $ ralsh user luke
+#    $ ralsh user luke
 #    user { 'luke':
 #      home => '/home/luke',
 #      uid => '100',