From 110d2b6ec5efae98042064fab4dd085036330cd5 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael@ansibleworks.com>
Date: Fri, 5 Apr 2013 15:30:36 -0400
Subject: [PATCH] Fixup ec2 doc formatting and use complex args format to break
 up long lines.

---
 CHANGELOG.md |  2 ++
 library/ec2  | 44 +++++++++++++++++++++++++++++++++++---------
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa3c25a00c..9a217d9ca4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,8 @@ Bugfixes and Misc Changes:
 * service module happier if only enabled=yes|no specified and no state
 * mysql_db: use --password= instead of -p in dump/import so it doesn't go interactive if no pass set
 * when using -c ssh and the ansible user is the current user, don't pass a -o to allow SSH config to be
+* overwrite parameter added to the s3 module
+* private_ip parameter added to the ec2 module
 
 1.1 "Mean Street" -- 4/2/2013
 
diff --git a/library/ec2 b/library/ec2
index 7b9827df47..70f0ea02bd 100644
--- a/library/ec2
+++ b/library/ec2
@@ -136,24 +136,50 @@ options:
     default: null
     aliases: []
   private_ip:
-    version_added: "?.?"
+    version_added: "1.2"
     description:
       - the private ip address to assign the instance (from the vpc subnet)
     required: false
     defualt: null
     aliases: []
-
-examples:
-    - code: 'local_action: ec2 keypair=mykey instance_type=c1.medium image=emi-40603AD1 wait=yes group=webserver count=3'
-      description: "Basic provisioning example"
-    - code: 'local_action: ec2 keypair=mykey group=databases instance_type=m1.large image=ami-6e649707 wait=yes wait_timeout=500 count=5 instance_tags='{"db":"postgres"}' monitoring=true'
-      description: "Advanced example with tagging and CloudWatch"
-    - code: 'local_action: ec2 keypair=mykey group_id=sg-1dc53f72 instance_type=m1.small image=ami-6e649707 wait=yes vpc_subnet_id=subnet-29e63245'
-      description: "VPC example"
 requirements: [ "boto" ]
 author: Seth Vidal, Tim Gerla, Lester Wade
 '''
 
+EXAMPLES = '''
+# Basic provisioning example
+local_action: 
+    module: ec2 
+    keypair: mykey 
+    instance_type: c1.medium 
+    image: emi-40603AD1 
+    wait: yes 
+    group: webserver 
+    count: 3
+
+# Advanced example with tagging and CloudWatch
+local_action: 
+    module: ec2 
+    keypair: mykey 
+    group: databases 
+    instance_type: m1.large 
+    image: ami-6e649707 
+    wait: yes 
+    wait_timeout: 500 
+    count: 5 
+    instance_tags: '{"db":"postgres"}' monitoring=true'
+
+# VPC example
+local_action: 
+    module: ec2 
+    keypair: mykey 
+    group_id: sg-1dc53f72 
+    instance_type: m1.small 
+    image: ami-6e649707 
+    wait: yes 
+    vpc_subnet_id: subnet-29e63245'
+'''
+
 import sys
 import time