summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornfagerlund <nick.fagerlund@gmail.com>2011-03-03 16:27:14 -0800
committernfagerlund <nick.fagerlund@gmail.com>2011-03-03 16:27:14 -0800
commitf519899dacab51c23db3ecf043feb481d1aa4bc1 (patch)
treebffcbbe3cefd8f561117383930cd8bc67c798601
parent63d8a1f83f4ad109817990354f05879f44419137 (diff)
parent6c53eb3967a1d0c3a31f65356515f07f90524f98 (diff)
downloadpuppet-f519899dacab51c23db3ecf043feb481d1aa4bc1.tar.gz
puppet-f519899dacab51c23db3ecf043feb481d1aa4bc1.tar.xz
puppet-f519899dacab51c23db3ecf043feb481d1aa4bc1.zip
Merge branch 'ticket/2.6.next/6445' into 2.6.next
-rw-r--r--lib/puppet/reference/configuration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb
index c8ff145ba..6581427ff 100644
--- a/lib/puppet/reference/configuration.rb
+++ b/lib/puppet/reference/configuration.rb
@@ -122,7 +122,7 @@ likewise be redirected to a file:
Puppet can also create user and group accounts for itself (one `puppet` group
and one `puppet` user) if it is invoked as `root` with the `--mkusers` argument:
- $ puppet agent --mkusers
+ $ puppet master --mkusers
## Signals