From 3aae74f60cdb4faf9eac0d6a2bad778be67d8ecf Mon Sep 17 00:00:00 2001
From: Radek Simko <radek.simko@timeinc.com>
Date: Wed, 22 Apr 2015 14:09:06 +0100
Subject: [PATCH 1/3] route53_record docs - missing newline added

---
 website/source/docs/providers/aws/r/route53_record.html.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/source/docs/providers/aws/r/route53_record.html.markdown b/website/source/docs/providers/aws/r/route53_record.html.markdown
index 54116c3b6..441dc313c 100644
--- a/website/source/docs/providers/aws/r/route53_record.html.markdown
+++ b/website/source/docs/providers/aws/r/route53_record.html.markdown
@@ -26,6 +26,7 @@ resource "aws_route53_record" "www" {
 
 ### Weighted routing policy
 See [AWS Route53 Developer Guide](http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-weighted) for details.
+
 ```
 resource "aws_route53_record" "www-dev" {
   zone_id = "${aws_route53_zone.primary.zone_id}"

From 9b182c13dd235bdc49b8bc55daf5628a40e0ebc3 Mon Sep 17 00:00:00 2001
From: Radek Simko <radek.simko@timeinc.com>
Date: Thu, 23 Apr 2015 10:27:35 +0100
Subject: [PATCH 2/3] route53_zone - docs updated (tags + name_servers)

---
 .../providers/aws/r/route53_zone.html.markdown   | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/website/source/docs/providers/aws/r/route53_zone.html.markdown b/website/source/docs/providers/aws/r/route53_zone.html.markdown
index 67a5f79f1..71c03a10e 100644
--- a/website/source/docs/providers/aws/r/route53_zone.html.markdown
+++ b/website/source/docs/providers/aws/r/route53_zone.html.markdown
@@ -29,6 +29,10 @@ resource "aws_route53_zone" "main" {
 
 resource "aws_route53_zone" "dev" {
   name = "dev.example.com"
+
+  tags {
+    Environment = "dev"
+  }
 }
 
 resource "aws_route53_record" "dev-ns" {
@@ -37,10 +41,10 @@ resource "aws_route53_record" "dev-ns" {
     type = "NS"
     ttl = "30"
     records = [
-        "${aws_route53_zone.dev.delegation_set_name_servers.0}",
-        "${aws_route53_zone.dev.delegation_set_name_servers.1}",
-        "${aws_route53_zone.dev.delegation_set_name_servers.2}",
-        "${aws_route53_zone.dev.delegation_set_name_servers.3}"
+        "${aws_route53_zone.dev.name_servers.0}",
+        "${aws_route53_zone.dev.name_servers.1}",
+        "${aws_route53_zone.dev.name_servers.2}",
+        "${aws_route53_zone.dev.name_servers.3}"
     ]
 }
 ```
@@ -50,10 +54,12 @@ resource "aws_route53_record" "dev-ns" {
 The following arguments are supported:
 
 * `name` - (Required) This is the name of the hosted zone.
+* `tags` - (Optional) A mapping of tags to assign to the zone.
 
 ## Attributes Reference
 
 The following attributes are exported:
 
 * `zone_id` - The Hosted Zone ID. This can be referenced by zone records.
-
+* `name_servers` - A list of name servers in a default delegation set.
+  Find more about delegation sets in [AWS docs](http://docs.aws.amazon.com/Route53/latest/APIReference/actions-on-reusable-delegation-sets.html).

From 17baf0bb2fc51215ec9736930de58a7ce3b4ad4b Mon Sep 17 00:00:00 2001
From: Radek Simko <radek.simko@timeinc.com>
Date: Thu, 23 Apr 2015 13:25:13 +0100
Subject: [PATCH 3/3] tags added to s3_bucket docs

---
 website/source/docs/providers/aws/r/s3_bucket.html.markdown | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/website/source/docs/providers/aws/r/s3_bucket.html.markdown b/website/source/docs/providers/aws/r/s3_bucket.html.markdown
index a2a4c7360..0f50d1356 100644
--- a/website/source/docs/providers/aws/r/s3_bucket.html.markdown
+++ b/website/source/docs/providers/aws/r/s3_bucket.html.markdown
@@ -16,6 +16,11 @@ Provides a S3 bucket resource.
 resource "aws_s3_bucket" "b" {
     bucket = "my_tf_test_bucket"
     acl = "private"
+
+    tags {
+        Name = "My bucket"
+        Environment = "Dev"
+    }
 }
 ```
 
@@ -25,6 +30,7 @@ The following arguments are supported:
 
 * `bucket` - (Required) The name of the bucket.
 * `acl` - (Optional) The canned ACL to apply. Defaults to "private".
+* `tags` - (Optional) A mapping of tags to assign to the bucket.
 
 ## Attributes Reference