Merge pull request #1489 from arrfab/my-branch

- Fixed some typos for the ansible config file in the man page

docs/man/man1/ansible-playbook.1.asciidoc.in

@@ -114,9 +114,9 @@ FILES
 
 /usr/share/ansible/ -- Default module library
 
-/etc/ansible/ansible.conf -- Config file, used if present
+/etc/ansible/ansible.cfg -- Config file, used if present
 
-~/.ansible.config -- User config file, overrides the default config if present
+~/.ansible.cfg -- User config file, overrides the default config if present
 
 AUTHOR
 ------

docs/man/man1/ansible.1.asciidoc.in

@@ -135,9 +135,9 @@ FILES
 
 /usr/share/ansible/ -- Default module library
 
-/etc/ansible/ansible.conf -- Config file, used if present
+/etc/ansible/ansible.cfg -- Config file, used if present
 
-~/.ansible.config -- User config file, overrides the default config if present
+~/.ansible.cfg -- User config file, overrides the default config if present
 
 ENVIRONMENT
 -----------
@@ -148,6 +148,8 @@ ANSIBLE_HOSTS  -- Override the default ansible hosts file
 
 ANSIBLE_LIBRARY -- Override the default ansible module library path
 
+ANSIBLE_CONFIG -- Override the default ansible config file
+
 
 AUTHOR
 ------