Merge pull request #2620 from tedder/patch-1

fix ELB ConnectionSettings values in documentation
boto · Sep 19, 2014 · d2231a2 · d2231a2
2 parents 0238747 + 7980e0b
commit d2231a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/boto/ec2/elb/__init__.py b/boto/ec2/elb/__init__.py
@@ -400,7 +400,7 @@ def modify_lb_attribute(self, load_balancer_name, attribute, value):
         :param attribute: The attribute you wish to change.
 
         * crossZoneLoadBalancing - Boolean (true)
-        * connectionSettings - :py:class:`ConnectionSettingAttribute` instance
+        * connectingSettings - :py:class:`ConnectionSettingAttribute` instance
         * accessLog - :py:class:`AccessLogAttribute` instance
         * connectionDraining - :py:class:`ConnectionDrainingAttribute` instance
 
@@ -472,7 +472,7 @@ def get_lb_attribute(self, load_balancer_name, attribute):
 
           * accessLog - :py:class:`AccessLogAttribute` instance
           * crossZoneLoadBalancing - Boolean
-          * connectionSettings - :py:class:`ConnectionSettingAttribute` instance
+          * connectingSettings - :py:class:`ConnectionSettingAttribute` instance
           * connectionDraining - :py:class:`ConnectionDrainingAttribute`
             instance