summaryrefslogtreecommitdiff
path: root/docs/man
diff options
context:
space:
mode:
authorjctanner <tanner.jc@gmail.com>2013-11-14 05:32:47 -0800
committerjctanner <tanner.jc@gmail.com>2013-11-14 05:32:47 -0800
commit2d9087b806b73ab276fc96e4a431e4f759f98910 (patch)
tree5f40aaf25aefa6f4b9684d6834d04d6c4f05279a /docs/man
parent4707e3a472da6cc077b6c0995c7ec14a52c021e6 (diff)
parent92147aff0ff1c886eea2cfb48007fd1c41e46871 (diff)
downloadansible-2d9087b806b73ab276fc96e4a431e4f759f98910.tar.gz
Merge pull request #4484 from mscherer/add_short_hostname
ansible-pull by default will look for local.yml and $fqdn.yml.
Diffstat (limited to 'docs/man')
-rw-r--r--docs/man/man1/ansible-pull.1.asciidoc.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/man/man1/ansible-pull.1.asciidoc.in b/docs/man/man1/ansible-pull.1.asciidoc.in
index f6b64e3903..2e39d53aa8 100644
--- a/docs/man/man1/ansible-pull.1.asciidoc.in
+++ b/docs/man/man1/ansible-pull.1.asciidoc.in
@@ -43,8 +43,8 @@ OPTIONAL ARGUMENT
The name of one the YAML format files to run as an ansible playbook. This can
be a relative path within the checkout. If not provided, ansible-pull
-will look for a playbook based on the host's fully-qualified domain name and
-finally a playbook named *local.yml*.
+will look for a playbook based on the host's fully-qualified domain name, on the
+host hostname and finally a playbook named *local.yml*.
OPTIONS