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

c3d06b46 · James Cammarata · ac3cdf7c · c13dd50b · c3d06b46 · c3d06b46
Commit c3d06b46 authored Oct 01, 2013 by James Cammarata
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

library/cloud/ec2_eip
+1 -1

library/source_control/bzr
+0 -0

library/source_control/git
+0 -0

library/source_control/hg
+0 -0

library/source_control/subversion
+0 -0

No files found.
--- a/library/cloud/ec2_eip
+++ b/library/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/library/source_control/bzr
+++ b/library/source_control/bzr
--- a/library/source_control/git
+++ b/library/source_control/git
--- a/library/source_control/hg
+++ b/library/source_control/hg
--- a/library/source_control/subversion
+++ b/library/source_control/subversion