summaryrefslogtreecommitdiffstats
path: root/lib/puppet/configuration.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/configuration.rb')
-rw-r--r--lib/puppet/configuration.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/configuration.rb b/lib/puppet/configuration.rb
index cfcda7120..074e656e0 100644
--- a/lib/puppet/configuration.rb
+++ b/lib/puppet/configuration.rb
@@ -80,7 +80,10 @@ module Puppet
exits. Comma-separate multiple values. For a list of all values,
specify 'all'. This feature is only available in Puppet versions
higher than 0.18.4."],
- :color => [true, "Whether to use ANSI colors when logging to the console."],
+ :color => ["ansi", "Whether to use colors when logging to the console.
+ Valid values are ``ansi`` (equivalent to ``true``), ``html`` (mostly
+ used during testing with TextMate), and ``false``, which produces
+ no color."],
:mkusers => [false,
"Whether to create the necessary user and group that puppetd will
run as."],