Merge pull request #3000 from mvo5/devel

document in the man-page that {ansible,ansible-playbook} -M can also be ...

Merge pull request #3000 from mvo5/devel
document in the man-page that {ansible,ansible-playbook} -M can also be ...
1f8d3197 · Michael DeHaan · a581077b · d7b5b47e · 1f8d3197 · 1f8d3197
Commit 1f8d3197 authored May 29, 2013 by Michael DeHaan
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

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

docs/man/man1/ansible.1.asciidoc.in
+3 -2

No files found.
--- a/docs/man/man1/ansible-playbook.1.asciidoc.in
+++ b/docs/man/man1/ansible-playbook.1.asciidoc.in
@@ -47,7 +47,9 @@ 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'. This can also be set with the ANSIBLE_LIBRARY
+environment variable.

 *-e* 'VARS', *--extra-vars=*'VARS'::


--- a/docs/man/man1/ansible.1.asciidoc.in
+++ b/docs/man/man1/ansible.1.asciidoc.in
@@ -60,8 +60,9 @@ Execute the module called 'NAME'.

 *-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'. This can also be set with the ANSIBLE_LIBRARY
+environment variable.

 *-a* \'_ARGUMENTS_', *--args=*\'_ARGUMENTS_'::