diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-02-01 16:31:54 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-02-01 16:31:54 -0800 |
| commit | c4da5fcb0ef75f2baaffad5c84b3cfe6889dc58c (patch) | |
| tree | 83bacdc5e4fa7c03aa3fec56285f9cabd681b783 /lib | |
| parent | f34141477244564f31edde503a19b9fb898d986f (diff) | |
| parent | 4d1b51fbcd7d7e285e7e56242951fcc821972e11 (diff) | |
| download | puppet-c4da5fcb0ef75f2baaffad5c84b3cfe6889dc58c.tar.gz puppet-c4da5fcb0ef75f2baaffad5c84b3cfe6889dc58c.tar.xz puppet-c4da5fcb0ef75f2baaffad5c84b3cfe6889dc58c.zip | |
Merge branch 'tickets/2.6.x/5167' into 2.6.next
* tickets/2.6.x/5167:
Fixed #5167 - misleading documentation in the defaults of [main]
Diffstat (limited to 'lib')
| -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 400d59f15..764cbbe2b 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`."], |