From 7a64eef5d48196b9f4d810c997ee4cb269b13daf Mon Sep 17 00:00:00 2001
From: t859531 <chris.dagdigigian@syngenta.com>
Date: Wed, 22 Mar 2017 19:05:52 -0400
Subject: [PATCH] Documentation fixes

configuration.rst
1. Corrected syntax error in Tag usage example
2. Corrected minimum size of root vol for master and compute node to 15 instead of 10

iam.rst
1. Added additional IAM permissions needed for clean start and clean delete/rollback
---
 docs/source/configuration.rst | 10 +++++-----
 docs/source/iam.rst           | 20 ++++++++++++++------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
index eb9e4ad09f..9af4945bae 100644
--- a/docs/source/configuration.rst
+++ b/docs/source/configuration.rst
@@ -273,17 +273,17 @@ master_root_volume_size
 """""""""""""""""""""""
 MasterServer root volume size in GB. (AMI must support growroot)
 
-Defaults to 10 in default template. ::
+Defaults to 15 in default template. ::
 
-    master_root_volume_size = 10
+    master_root_volume_size = 15
 
 compute_root_volume_size
 """"""""""""""""""""""""
 ComputeFleet root volume size in GB. (AMI must support growroot)
 
-Defaults to 10 in default template. ::
+Defaults to 15 in default template. ::
 
-    compute_root_volume_size = 10
+    compute_root_volume_size = 15
 
 base_os
 """""""
@@ -378,7 +378,7 @@ Tags are JSON formatted and should not have quotes outside the curly braces.
 
 See `AWS CloudFormation Resource Tags Type <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html>`_. ::
 
-    tags = {"key": "value", "key2", "value2"}
+    tags = {"key" : "value", "key2" : "value2"}
 
 .. _vpc_section:
 
diff --git a/docs/source/iam.rst b/docs/source/iam.rst
index 21e05cc2b2..c990181799 100644
--- a/docs/source/iam.rst
+++ b/docs/source/iam.rst
@@ -144,7 +144,8 @@ CfnClusterUserPolicy
                   "ec2:DescribeVpcAttribute",
                   "ec2:DescribeAddresses",
                   "ec2:CreateTags",
-                  "ec2:DescribeNetworkInterfaces"
+	          "ec2:DescribeNetworkInterfaces",
+	          "ec2:DescribeAvailabilityZones"
               ],
               "Effect": "Allow",
               "Resource": "*"
@@ -162,7 +163,10 @@ CfnClusterUserPolicy
                   "ec2:CreateNetworkInterface",
                   "ec2:CreateSecurityGroup",
                   "ec2:ModifyVolumeAttribute",
-                  "ec2:ModifyNetworkInterfaceAttribute"
+                  "ec2:ModifyNetworkInterfaceAttribute",
+	          "ec2:DeleteNetworkInterface",
+	          "ec2:DeleteVolume",
+	          "ec2:TerminateInstances"
               ],
               "Effect": "Allow",
               "Resource": "*"
@@ -200,7 +204,8 @@ CfnClusterUserPolicy
           {
               "Sid": "DynamoDBModify",
               "Action": [
-                  "dynamodb:CreateTable"
+              "dynamodb:CreateTable",
+	      "dynamodb:DeleteTable"
               ],
               "Effect": "Allow",
               "Resource": "*"
@@ -225,7 +230,8 @@ CfnClusterUserPolicy
               "Sid": "SQSModify",
               "Action": [
                   "sqs:CreateQueue",
-                  "sqs:SetQueueAttributes"
+                  "sqs:SetQueueAttributes",
+	          "sqs:DeleteQueue"
               ],
               "Effect": "Allow",
               "Resource": "*"
@@ -233,7 +239,8 @@ CfnClusterUserPolicy
           {
               "Sid": "SNSDescribe",
               "Action": [
-                  "sns:ListTopics"
+              "sns:ListTopics",
+	      “sns:GetTopicAttributes"
               ],
               "Effect": "Allow",
               "Resource": "*"
@@ -242,7 +249,8 @@ CfnClusterUserPolicy
               "Sid": "SNSModify",
               "Action": [
                   "sns:CreateTopic",
-                  "sns:Subscribe"
+                  "sns:Subscribe",
+	          “sns:DeleteTopic”
               ],
               "Effect": "Allow",
               "Resource": "*"