summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMichael DeHaan <michael.dehaan@gmail.com>2013-06-17 05:17:25 +0200
committerMichael DeHaan <michael.dehaan@gmail.com>2013-06-17 05:17:25 +0200
commitfda74110bd63bc03737467376a76554ed6e4dab8 (patch)
treea40915676e83587738f56edfce2adeaf0e1df81d /examples
parentMerge pull request #3204 from goozbach/devel (diff)
parentfix loading order of ansible.cfg in documentation (diff)
downloadansible-fda74110bd63bc03737467376a76554ed6e4dab8.tar.xz
ansible-fda74110bd63bc03737467376a76554ed6e4dab8.zip
Merge pull request #3202 from trbs/20130613_docs_fix_ansible_cfg_loading_order
docs fix ansible cfg loading order
Diffstat (limited to 'examples')
-rw-r--r--examples/ansible.cfg4
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/ansible.cfg b/examples/ansible.cfg
index 6536550c1c..dc42359fca 100644
--- a/examples/ansible.cfg
+++ b/examples/ansible.cfg
@@ -1,6 +1,8 @@
# config file for ansible -- http://ansible.github.com
+#
# nearly all parameters can be overridden in ansible-playbook or with command line flags
-# ansible will read ~/.ansible.cfg or /etc/ansible/ansible.cfg, whichever it finds first
+# ansible will read ~/.ansible.cfg, ansible.cfg in the current working directory or
+# /etc/ansible/ansible.cfg, whichever it finds first
[defaults]