summaryrefslogtreecommitdiffstats
path: root/docs/man/man1
diff options
context:
space:
mode:
authorMichael DeHaan <michael.dehaan@gmail.com>2013-05-31 22:06:05 +0200
committerMichael DeHaan <michael.dehaan@gmail.com>2013-05-31 22:06:05 +0200
commit0837c9785f532615945d03991115a39b39177afb (patch)
treea37af262831755e88b636a5fb169f6745268f029 /docs/man/man1
parentMake the actual user used for executing play available as 'ansible_ssh_user' ... (diff)
parentSupport JSON in --extra-vars. (diff)
downloadansible-0837c9785f532615945d03991115a39b39177afb.tar.xz
ansible-0837c9785f532615945d03991115a39b39177afb.zip
Merge pull request #3040 from bfabio/devel
Support JSON in --extra-vars.
Diffstat (limited to 'docs/man/man1')
-rw-r--r--docs/man/man1/ansible-playbook.1.asciidoc.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/man/man1/ansible-playbook.1.asciidoc.in b/docs/man/man1/ansible-playbook.1.asciidoc.in
index 11f52d001d..0f89850da8 100644
--- a/docs/man/man1/ansible-playbook.1.asciidoc.in
+++ b/docs/man/man1/ansible-playbook.1.asciidoc.in
@@ -53,7 +53,8 @@ environment variable.
*-e* 'VARS', *--extra-vars=*'VARS'::
-Extra variables to inject into a playbook, in key=value key=value format.
+Extra variables to inject into a playbook, in key=value key=value format or
+as JSON (objects and arrays).
*-f* 'NUM', *--forks=*'NUM'::