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

11 years ago · 6ea83779e3
parent 95f035ca4a 550b1a8ee0
commit 6ea83779e3
5 changed files with 5 additions and 5 deletions
--- a/cloud/ec2_eip
+++ b/cloud/ec2_eip
@ -2,7 +2,7 @@
 DOCUMENTATION = '''
 ---
 module: ec2_eip
-short_decription: associate an EC2 elastic IP with an instance.
+short_description: associate an EC2 elastic IP with an instance.
 description:
    - This module associates AWS EC2 elastic IP addresses with instances
 version_added: 1.4
--- a/source_control/bzr
+++ b/source_control/bzr
@ -56,7 +56,7 @@ options:
        version_added: "1.4"
        description:
            - 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 = '''
--- a/source_control/git
+++ b/source_control/git
@ -79,7 +79,7 @@ options:
        version_added: "1.4"
        description:
            - 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:
    - 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
--- a/source_control/hg
+++ b/source_control/hg
@ -71,7 +71,7 @@ options:
        version_added: "1.4"
        description:
            - 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:
    - 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
--- a/source_control/subversion
+++ b/source_control/subversion
@ -69,7 +69,7 @@ options:
    version_added: "1.4"
    description:
      - 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 = '''