diff --git a/docsite/latest/rst/examples.rst b/docsite/latest/rst/examples.rst index 5edb9a2361..6fa38a4352 100644 --- a/docsite/latest/rst/examples.rst +++ b/docsite/latest/rst/examples.rst @@ -259,8 +259,8 @@ Ansible has an optional configuration file that can be used to tune settings and the first config file it finds present: 1. File specified by the ``ANSIBLE_CONFIG`` environment variable -2. ``ansible.cfg`` in the current working directory. (version 0.8 and up) -3. ``~/.ansible.cfg`` +2. ``~/.ansible.cfg`` +3. ``ansible.cfg`` in the current working directory. (version 0.8 and up) 4. ``/etc/ansible/ansible.cfg`` For those running from source, a sample configuration file lives in the examples/ directory. The RPM will install configuration into /etc/ansible/ansible.cfg automatically. 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]