Merge branch 'devel' of https://github.com/ansible/ansible into devel

reviewable/pr18780/r1
James Cammarata 11 years ago
commit 6ea83779e3

@ -2,7 +2,7 @@
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
module: ec2_eip module: ec2_eip
short_decription: associate an EC2 elastic IP with an instance. short_description: associate an EC2 elastic IP with an instance.
description: description:
- This module associates AWS EC2 elastic IP addresses with instances - This module associates AWS EC2 elastic IP addresses with instances
version_added: 1.4 version_added: 1.4

@ -56,7 +56,7 @@ options:
version_added: "1.4" version_added: "1.4"
description: description:
- Path to bzr executable to use. If not supplied, - Path to bzr executable to use. If not supplied,
the normal mechanism for resolving binary paths will be used. the normal mechanism for resolving binary paths will be used.
''' '''
EXAMPLES = ''' EXAMPLES = '''

@ -79,7 +79,7 @@ options:
version_added: "1.4" version_added: "1.4"
description: description:
- Path to git executable to use. If not supplied, - Path to git executable to use. If not supplied,
the normal mechanism for resolving binary paths will be used. the normal mechanism for resolving binary paths will be used.
notes: notes:
- If the task seems to be hanging, first verify remote host is in C(known_hosts). - If the task seems to be hanging, first verify remote host is in C(known_hosts).
SSH will prompt user to authorize the first contact with a remote host. One solution is to add SSH will prompt user to authorize the first contact with a remote host. One solution is to add

@ -71,7 +71,7 @@ options:
version_added: "1.4" version_added: "1.4"
description: description:
- Path to hg executable to use. If not supplied, - Path to hg executable to use. If not supplied,
the normal mechanism for resolving binary paths will be used. the normal mechanism for resolving binary paths will be used.
notes: notes:
- If the task seems to be hanging, first verify remote host is in C(known_hosts). - If the task seems to be hanging, first verify remote host is in C(known_hosts).
SSH will prompt user to authorize the first contact with a remote host. One solution is to add SSH will prompt user to authorize the first contact with a remote host. One solution is to add

@ -69,7 +69,7 @@ options:
version_added: "1.4" version_added: "1.4"
description: description:
- Path to svn executable to use. If not supplied, - Path to svn executable to use. If not supplied,
the normal mechanism for resolving binary paths will be used. the normal mechanism for resolving binary paths will be used.
''' '''
EXAMPLES = ''' EXAMPLES = '''

Loading…
Cancel
Save