diff options
| author | James Turnbull <james@lovedthanlost.net> | 2011-01-17 10:38:03 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2011-01-17 10:38:03 +1100 |
| commit | 4d1b51fbcd7d7e285e7e56242951fcc821972e11 (patch) | |
| tree | cd91c080df327b5985ffaccc9bdef4d3df9f6cf1 /lib/puppet | |
| parent | 76d1c2aefb32cc3688e3f7c0a5c8bbf713a123ed (diff) | |
| download | puppet-4d1b51fbcd7d7e285e7e56242951fcc821972e11.tar.gz puppet-4d1b51fbcd7d7e285e7e56242951fcc821972e11.tar.xz puppet-4d1b51fbcd7d7e285e7e56242951fcc821972e11.zip | |
Fixed #5167 - misleading documentation in the defaults of [main]
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/defaults.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 4521a5901..df359a7b4 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -2,8 +2,8 @@ module Puppet setdefaults(:main, :confdir => [Puppet.run_mode.conf_dir, "The main Puppet configuration directory. The default for this parameter is calculated based on the user. If the process - is running as root or the user that `puppet master` is supposed to run as, it defaults to a system directory, but if it's running as any other user, - it defaults to being in `~`."], + is running as root or the user that Puppet is supposed to run as, it defaults to a system directory, but if it's running as any other user, + it defaults to being in the user's home directory."], :vardir => [Puppet.run_mode.var_dir, "Where Puppet stores dynamic and growing data. The default for this parameter is calculated specially, like `confdir`_."], :name => [Puppet.application_name.to_s, "The name of the application, if we are running as one. The default is essentially $0 without the path or `.rb`."], |