summaryrefslogtreecommitdiffstats
path: root/lib/puppet/reference/configuration.rb
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2011-02-01 16:22:06 -0800
committerMarkus Roberts <Markus@reality.com>2011-02-01 16:22:06 -0800
commitadb8c7994ea7d2d30aaea698fbe08727ed553fef (patch)
tree3f8f7b605dc9ad999409353266e7e3130667e697 /lib/puppet/reference/configuration.rb
parent517c6794606e9adde7f2912d3b949cfcc18a446a (diff)
parent443eba9b7a85cffa6b8513a32a620c80917be768 (diff)
downloadpuppet-adb8c7994ea7d2d30aaea698fbe08727ed553fef.tar.gz
puppet-adb8c7994ea7d2d30aaea698fbe08727ed553fef.tar.xz
puppet-adb8c7994ea7d2d30aaea698fbe08727ed553fef.zip
Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.next
Diffstat (limited to 'lib/puppet/reference/configuration.rb')
-rw-r--r--lib/puppet/reference/configuration.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb
index e6a8dc20f..c8ff145ba 100644
--- a/lib/puppet/reference/configuration.rb
+++ b/lib/puppet/reference/configuration.rb
@@ -94,11 +94,11 @@ The file follows INI-style formatting. Here is an example of a very simple
Note that boolean parameters must be explicitly specified as `true` or
`false` as seen above.
-If you need to change file parameters (e.g., reset the mode or owner), do
+If you need to change file or directory parameters (e.g., reset the mode or owner), do
so within curly braces on the same line:
[main]
- myfile = /tmp/whatever {owner = root, mode = 644}
+ vardir = /new/vardir {owner = root, mode = 644}
If you're starting out with a fresh configuration, you may wish to let
the executable generate a template configuration file for you by invoking