Merge branch 'playbook_ssh_ask_pass' of git://github.com/clatour/ansible into devel

Conflicts:
	examples/ansible.cfg

+ doc tweak
This commit is contained in:
Michael DeHaan 2012-11-03 19:23:38 -04:00
parent 15af4c63e5
commit bb2929b508

View file

@ -63,14 +63,14 @@ options:
- all arguments accepted by the M(file) module also work here
required: false
examples:
- code: "ini_file: dest=/etc/conf section=drinks option=fav value=lemonade mode=0600 backup=true"
- code: "ini_file: dest=/etc/conf section=drinks option=fav value=lemonade mode=0600 backup=yes"
description: Ensure C(fav=lemonade) is in section C([drinks]) in said file
- code: |
ini_file: dest=/etc/anotherconf
section=drinks
option=temperature
value=cold
backup=true
backup=yes
notes:
- While it is possible to add an I(option) without specifying a I(value), this makes
no sense.