From 50d72d89c24273d01104ca0ef3bff64e5acadf6b Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael@ansibleworks.com>
Date: Tue, 8 Oct 2013 08:42:03 -0400
Subject: [PATCH] Fix documentation of default value in s3 module.  Fixes #4289

---
 cloud/s3 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cloud/s3 b/cloud/s3
index faf3279efa2..8b8af40405d 100644
--- a/cloud/s3
+++ b/cloud/s3
@@ -46,7 +46,6 @@ options:
     description:
       - The destination file path when downloading an object/key with a GET operation.
     required: false
-    default: 600
     aliases: []
     version_added: "1.3"
   overwrite:
@@ -61,11 +60,11 @@ options:
     required: true
     default: null
     aliases: []
-  expiry:
+  expiration:
     description:
       - Time limit (in seconds) for the URL generated and returned by S3/Walrus when performing a mode=put or mode=geturl operation. 
     required: false
-    default: null
+    default: 600
     aliases: []
   s3_url:
     description: