diff options
| author | Michael DeHaan <michael.dehaan@gmail.com> | 2014-08-05 20:41:47 -0400 |
|---|---|---|
| committer | Michael DeHaan <michael.dehaan@gmail.com> | 2014-08-05 20:45:16 -0400 |
| commit | cc1d1ad0420a53de21fef9e521355a46682cf930 (patch) | |
| tree | 4f0b1f1bd9f6e462516df4fe1531e3c945719ab8 | |
| parent | 1c6398dd3b03d5dc1e44cfb347bba46f883a673c (diff) | |
| download | ansible-cc1d1ad0420a53de21fef9e521355a46682cf930.tar.gz | |
Some stray doc tweaks with file modules.
| -rw-r--r-- | library/files/copy | 6 | ||||
| -rw-r--r-- | library/files/template | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/library/files/copy b/library/files/copy index 0a5fa699d0..45009626d0 100644 --- a/library/files/copy +++ b/library/files/copy @@ -83,6 +83,12 @@ options: defaults. required: false version_added: "1.5" + recurse: + description: + - Copy all contents in the source directory recursively. This will be slightly inefficient compared to the 'synchronize' + module and should not be used for large directory trees. + required: false + default: false extends_documentation_fragment: files author: Michael DeHaan notes: diff --git a/library/files/template b/library/files/template index 3c21f3f117..3dd2ece448 100644 --- a/library/files/template +++ b/library/files/template @@ -49,11 +49,6 @@ options: version_added: "1.2" notes: - "Since Ansible version 0.9, templates are loaded with C(trim_blocks=True)." - - - "Also, you can override jinja2 settings by adding a special header to template file. - i.e. C(#jinja2:variable_start_string:'[%' , variable_end_string:'%]') - which changes the variable interpolation markers to [% var %] instead of {{ var }}. This is the best way to prevent evaluation of things that look like, but should not be Jinja2. raw/endraw in Jinja2 will not work as you expect because templates in Ansible are recursively evaluated." - requirements: [] author: Michael DeHaan ''' |