Merge pull request #6076 from wshaddix/patch-1

Update intro_configuration.rst
This commit is contained in:
Michael DeHaan 2014-02-28 13:12:06 -05:00
commit 2dbbf29421

View file

@ -8,7 +8,7 @@ The Ansible Configuration File
Certain settings in Ansible are adjustable via a configuration file. The stock configuration should be sufficient Certain settings in Ansible are adjustable via a configuration file. The stock configuration should be sufficient
for most users, but there may be reasons you would want to change them. for most users, but there may be reasons you would want to change them.
Changes can be made and used in a configuration file which will be processed processed in the following order:: Changes can be made and used in a configuration file which will be processed in the following order::
* ANSIBLE_CONFIG (an environment variable) * ANSIBLE_CONFIG (an environment variable)
* ansible.cfg (in the current directory) * ansible.cfg (in the current directory)