diff options
| author | Michael DeHaan <michael@ansibleworks.com> | 2014-01-03 17:06:32 +0100 |
|---|---|---|
| committer | Michael DeHaan <michael@ansibleworks.com> | 2014-01-03 17:06:32 +0100 |
| commit | 0882eefdff933391be40644890d453927685849f (patch) | |
| tree | e240baa4d1a53e40c59c766c60323c1718cc67b2 | |
| parent | Fixes #5146 Handle missing stdin when running under celery with rabbitmq or r... (diff) | |
| download | ansible-0882eefdff933391be40644890d453927685849f.tar.xz ansible-0882eefdff933391be40644890d453927685849f.zip | |
Merge conflict
| -rw-r--r-- | docs/man/man1/ansible-pull.1 | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/docs/man/man1/ansible-pull.1 b/docs/man/man1/ansible-pull.1 index 6d75a3cc5e..fb727631eb 100644 --- a/docs/man/man1/ansible-pull.1 +++ b/docs/man/man1/ansible-pull.1 @@ -7,16 +7,7 @@ .\" Source: Ansible 1.5 .\" Language: English .\" -.TH "ANSIBLE" "1" "01/02/2014" "Ansible 1\&.5" "System administration commands" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' +.TH "ANSIBLE" "1" "01/03/2014" "Ansible 1\&.5" "System administration commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- |