From 96770a3057cd1a78f0f27fd20cc0795cc12434cc Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Tue, 30 Oct 2012 17:08:12 +0100 Subject: [PATCH] - Fixed some typos for the ansible config file - added the ANSIBLE_CONFIG environment variable --- docs/man/man1/ansible-playbook.1.asciidoc.in | 4 ++-- docs/man/man1/ansible.1.asciidoc.in | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/man/man1/ansible-playbook.1.asciidoc.in b/docs/man/man1/ansible-playbook.1.asciidoc.in index 0e5eda527b..2c8b7e07a1 100644 --- a/docs/man/man1/ansible-playbook.1.asciidoc.in +++ b/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 ------ diff --git a/docs/man/man1/ansible.1.asciidoc.in b/docs/man/man1/ansible.1.asciidoc.in index a5999ab911..22c11aa95a 100644 --- a/docs/man/man1/ansible.1.asciidoc.in +++ b/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 ------