Skip to content

A
ansible
Commit c3d06b46 by James Cammarata
Options

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

parents ac3cdf7c c13dd50b
Showing with 5 additions and 5 deletions
library/cloud/ec2_eip
...@@ -2,7 +2,7 @@ ...@@ -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
......
library/source_control/bzr
...@@ -56,7 +56,7 @@ options: ...@@ -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 = '''
......
library/source_control/git
...@@ -79,7 +79,7 @@ options: ...@@ -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
......
library/source_control/hg
...@@ -71,7 +71,7 @@ options: ...@@ -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
......
library/source_control/subversion
...@@ -69,7 +69,7 @@ options: ...@@ -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 = '''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment