From 8338e75463df8dee8f099e22313d9d0a74df86a6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 May 2013 21:22:58 +0200 Subject: [PATCH 1/3] document in the man-page that {ansible,ansible-playbook} -M can also be overriden with the ANSIBLE_LIBRARY environment --- docs/man/man1/ansible-playbook.1.asciidoc.in | 3 ++- docs/man/man1/ansible.1.asciidoc.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/man/man1/ansible-playbook.1.asciidoc.in b/docs/man/man1/ansible-playbook.1.asciidoc.in index ecb32e81be..18619e422a 100644 --- a/docs/man/man1/ansible-playbook.1.asciidoc.in +++ b/docs/man/man1/ansible-playbook.1.asciidoc.in @@ -47,7 +47,8 @@ The 'PATH' to the inventory hosts file, which defaults to *-M* 'DIRECTORY', *--module-path=*'DIRECTORY':: -The 'DIRECTORY' to load modules from. The default is '/usr/share/ansible'. +The 'DIRECTORY' search path to load modules from. The default is +'/usr/share/ansible'. See also the ANSIBLE_LIBRARY environment variable. *-e* 'VARS', *--extra-vars=*'VARS':: diff --git a/docs/man/man1/ansible.1.asciidoc.in b/docs/man/man1/ansible.1.asciidoc.in index c8833d7650..9299066de3 100644 --- a/docs/man/man1/ansible.1.asciidoc.in +++ b/docs/man/man1/ansible.1.asciidoc.in @@ -61,7 +61,7 @@ Execute the module called 'NAME'. *-M* 'DIRECTORY', *--module-path=*'DIRECTORY':: The 'DIRECTORY' to load modules from. The default is '/usr/share/ansible'. - +See also the ANSIBLE_LIBRARY environment variable. *-a* \'_ARGUMENTS_', *--args=*\'_ARGUMENTS_':: From 22b0cf9275a3ee3defd23dbb3058678c02703a4c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 May 2013 21:34:33 +0200 Subject: [PATCH 2/3] use the same text for -M in ansible.1 and ansible-playbook.1 --- docs/man/man1/ansible.1.asciidoc.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/man/man1/ansible.1.asciidoc.in b/docs/man/man1/ansible.1.asciidoc.in index 9299066de3..9ed18953a1 100644 --- a/docs/man/man1/ansible.1.asciidoc.in +++ b/docs/man/man1/ansible.1.asciidoc.in @@ -60,8 +60,8 @@ Execute the module called 'NAME'. *-M* 'DIRECTORY', *--module-path=*'DIRECTORY':: -The 'DIRECTORY' to load modules from. The default is '/usr/share/ansible'. -See also the ANSIBLE_LIBRARY environment variable. +The 'DIRECTORY' search path to load modules from. The default is +'/usr/share/ansible'. See also the ANSIBLE_LIBRARY environment variable. *-a* \'_ARGUMENTS_', *--args=*\'_ARGUMENTS_':: From d7b5b47efe7075cf577b329ee3075cae6e5c868d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 25 May 2013 08:53:20 +0200 Subject: [PATCH 3/3] improve wording, thanks to Michael DeHaan --- docs/man/man1/ansible-playbook.1.asciidoc.in | 3 ++- docs/man/man1/ansible.1.asciidoc.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/man/man1/ansible-playbook.1.asciidoc.in b/docs/man/man1/ansible-playbook.1.asciidoc.in index 18619e422a..11f52d001d 100644 --- a/docs/man/man1/ansible-playbook.1.asciidoc.in +++ b/docs/man/man1/ansible-playbook.1.asciidoc.in @@ -48,7 +48,8 @@ The 'PATH' to the inventory hosts file, which defaults to *-M* 'DIRECTORY', *--module-path=*'DIRECTORY':: The 'DIRECTORY' search path to load modules from. The default is -'/usr/share/ansible'. See also the ANSIBLE_LIBRARY environment variable. +'/usr/share/ansible'. This can also be set with the ANSIBLE_LIBRARY +environment variable. *-e* 'VARS', *--extra-vars=*'VARS':: diff --git a/docs/man/man1/ansible.1.asciidoc.in b/docs/man/man1/ansible.1.asciidoc.in index 9ed18953a1..0f88311d93 100644 --- a/docs/man/man1/ansible.1.asciidoc.in +++ b/docs/man/man1/ansible.1.asciidoc.in @@ -61,7 +61,8 @@ Execute the module called 'NAME'. *-M* 'DIRECTORY', *--module-path=*'DIRECTORY':: The 'DIRECTORY' search path to load modules from. The default is -'/usr/share/ansible'. See also the ANSIBLE_LIBRARY environment variable. +'/usr/share/ansible'. This can also be set with the ANSIBLE_LIBRARY +environment variable. *-a* \'_ARGUMENTS_', *--args=*\'_ARGUMENTS_'::