From a6a3c2d1d664344839e5bc842c2044665cd7d504 Mon Sep 17 00:00:00 2001
From: Eron Hennessey <eronh@amazon.com>
Date: Tue, 12 Aug 2014 14:11:52 -0700
Subject: [PATCH] More updates from the AWS doc team (elb)

---
 awscli/examples/elb/add-tags.rst              | 12 +++++++++
 awscli/examples/elb/create-load-balancer.rst  | 11 ++++++++
 .../elb/describe-load-balancer-attributes.rst |  3 +++
 awscli/examples/elb/describe-tags.rst         | 25 +++++++++++++++++++
 awscli/examples/elb/remove-tags.rst           | 11 ++++++++
 5 files changed, 62 insertions(+)
 create mode 100644 awscli/examples/elb/add-tags.rst
 create mode 100644 awscli/examples/elb/describe-tags.rst
 create mode 100644 awscli/examples/elb/remove-tags.rst

diff --git a/awscli/examples/elb/add-tags.rst b/awscli/examples/elb/add-tags.rst
new file mode 100644
index 000000000000..9baec1ae0298
--- /dev/null
+++ b/awscli/examples/elb/add-tags.rst
@@ -0,0 +1,12 @@
+**To add tags for a load balancer**
+
+This example adds tags for a load balancer.
+
+Command::
+
+  aws elb add-tags  --load-balancer-name MyTCPLoadBalancer --tag "Key=project,Value=lima"
+
+Output::
+
+  {}
+  
diff --git a/awscli/examples/elb/create-load-balancer.rst b/awscli/examples/elb/create-load-balancer.rst
index f2ee19bddb84..02e30165b693 100644
--- a/awscli/examples/elb/create-load-balancer.rst
+++ b/awscli/examples/elb/create-load-balancer.rst
@@ -54,3 +54,14 @@ Output::
     "DNSName": "internal-MyInternalLoadBalancer-012345678.us-east-1.elb.amazonaws.com"
   }
 
+This example creates a TCP load balancer in EC2-Classic and assigns a tag.
+
+Command::
+
+  aws elb create-load-balancer --load-balancer-name MyTCPLoadBalancer --listeners Protocol=HTTP,LoadBalancerPort=80,InstanceProtocol=HTTP,InstancePort=80 --tag Key=department,Value=digital-media --availability-zones us-east-1a
+
+Output::
+
+  {
+    "DNSName": "MyTCPLoadBalancer-012345678.us-east-1.elb.amazonaws.com"
+  }
\ No newline at end of file
diff --git a/awscli/examples/elb/describe-load-balancer-attributes.rst b/awscli/examples/elb/describe-load-balancer-attributes.rst
index 97acfcf96ce9..7801ae2cbf67 100644
--- a/awscli/examples/elb/describe-load-balancer-attributes.rst
+++ b/awscli/examples/elb/describe-load-balancer-attributes.rst
@@ -10,6 +10,9 @@ Output::
 
   {
     "LoadBalancerAttributes": {
+	"ConnectionSettings": {
+               "IdleTimeout": 30
+      },
       "ConnectionDraining": {
         "Enabled": false,
         "Timeout": 300
diff --git a/awscli/examples/elb/describe-tags.rst b/awscli/examples/elb/describe-tags.rst
new file mode 100644
index 000000000000..9ff0d72db27e
--- /dev/null
+++ b/awscli/examples/elb/describe-tags.rst
@@ -0,0 +1,25 @@
+**To describe the tags assigned to load balancer**
+
+This example describes the the tags assigned to a load balancer.
+
+Command::
+
+  aws elb describe-tags --load-balancer-name MyTCPLoadBalancer
+
+Output::
+
+{
+    "TagDescriptions": [
+        {
+            "Tags": [                
+                {
+                    "Value": "digital-media", 
+                    "Key": "department"
+                }
+            ], 
+            "LoadBalancerName": "MyTCPLoadBalancer"
+        }
+    ]
+}
+
+
diff --git a/awscli/examples/elb/remove-tags.rst b/awscli/examples/elb/remove-tags.rst
new file mode 100644
index 000000000000..72ea5f1c2eed
--- /dev/null
+++ b/awscli/examples/elb/remove-tags.rst
@@ -0,0 +1,11 @@
+**To remove tags for a load balancer**
+
+This example removes tags for a load balancer.
+
+Command::
+
+  aws elb remove-tags  --load-balancer-name MyTCPLoadBalancer --tag "Key=project,Value=lima"
+
+Output::
+
+  {}
\ No newline at end of file