summaryrefslogtreecommitdiffstats
path: root/lib/puppet/reference/configuration.rb
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2011-02-01 15:51:30 -0800
committerMatt Robinson <matt@puppetlabs.com>2011-02-01 15:51:30 -0800
commit9550a884b7910b9863a230bcb166b5d805cbb06f (patch)
tree68a5bd3d318675498460a4de9fcf095b5e48a383 /lib/puppet/reference/configuration.rb
parent1ab9bd833237c7cf2036989a58a1b22d3cc49a5b (diff)
parent069f29bf2b348e540c63c12bc203838b02d8a0bf (diff)
downloadpuppet-9550a884b7910b9863a230bcb166b5d805cbb06f.tar.gz
puppet-9550a884b7910b9863a230bcb166b5d805cbb06f.tar.xz
puppet-9550a884b7910b9863a230bcb166b5d805cbb06f.zip
Merge branch 'tickets/2.6.x/2096' into 2.6.next
* tickets/2.6.x/2096: Fixed #2096 - clarified option modification and tested it is working
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