From f6bad310ee1076b8ac53bc391dd57300f6b19d11 Mon Sep 17 00:00:00 2001
From: Clint Shryock <clint@ctshryock.com>
Date: Thu, 30 Jul 2015 15:17:16 -0500
Subject: [PATCH] update docs

---
 .../docs/providers/aws/r/s3_bucket_object.html.markdown      | 5 ++++-
 website/source/layouts/aws.erb                               | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/website/source/docs/providers/aws/r/s3_bucket_object.html.markdown b/website/source/docs/providers/aws/r/s3_bucket_object.html.markdown
index 3f55a1d453..63d201b826 100644
--- a/website/source/docs/providers/aws/r/s3_bucket_object.html.markdown
+++ b/website/source/docs/providers/aws/r/s3_bucket_object.html.markdown
@@ -25,6 +25,7 @@ resource "aws_s3_bucket_object" "object" {
 ## Argument Reference
 
 The following arguments are supported:
+
 * `bucket` - (Required) The name of the bucket to put the file in.
 * `key` - (Required) The name of the object once it is in the bucket.
 * `source` - (Required) The path to the source file being uploaded to the bucket.
@@ -33,4 +34,6 @@ The following arguments are supported:
 
 The following attributes are exported
 
-* `id` - the id of the resource corresponds to the ETag of the bucket object on aws.
+* `id` - the `key` of the resource supplied above
+* `etag` - the ETag generated for the object. This is often the MD5 hash of the
+object, unless you specify your own encryption keys
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index a212bb6977..2bbff22f4b 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -279,6 +279,10 @@
                             <a href="/docs/providers/aws/r/s3_bucket.html">aws_s3_bucket</a>
                         </li>
 
+                        <li<%= sidebar_current("docs-aws-resource-s3-bucket-object") %>>
+                            <a href="/docs/providers/aws/r/s3_bucket_object.html">aws_s3_bucket_object</a>
+                        </li>
+
                     </ul>
                 </li>