vendored/puppet/lib/puppet/reference/configuration.rb in bolt-0.21.1 vs vendored/puppet/lib/puppet/reference/configuration.rb in bolt-0.21.2
- old
+ new
@@ -52,9 +52,15 @@
config.header = <<EOT
## Configuration settings
* Each of these settings can be specified in `puppet.conf` or on the
command line.
+* Puppet Enterprise (PE) and open source Puppet share the configuration settings
+ that are documented here. However, PE defaults for some settings differ from
+ the open source Puppet defaults. Some examples of settings that have different
+ PE defaults include `disable18n`, `environment_timeout`, `always_retry_plugins`,
+ and the Puppet Server JRuby `max-active-instances` setting. To verify PE
+ configuration defaults, check the `puppet.conf` file after installation.
* When using boolean settings on the command line, use `--setting` and
`--no-setting` instead of `--setting (true|false)`. (Using `--setting false`
results in "Error: Could not parse application options: needless argument".)
* Settings can be interpolated as `$variables` in other settings; `$environment`
is special, in that puppet master will interpolate each agent node's