From bb2929b508695af1a99864543e5269179438b880 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Sat, 3 Nov 2012 19:23:38 -0400
Subject: [PATCH] Merge branch 'playbook_ssh_ask_pass' of
 git://github.com/clatour/ansible into devel

Conflicts:
	examples/ansible.cfg

+ doc tweak
---
 ini_file | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ini_file b/ini_file
index 744f5d6baae..63131d5232d 100755
--- a/ini_file
+++ b/ini_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.