summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Knapp <kyleknap@amazon.com>2014-09-19 10:31:34 -0700
committerKyle Knapp <kyleknap@amazon.com>2014-09-19 10:31:34 -0700
commitd2231a210a31ee02333996437cc359ffdd13f09f (patch)
tree11c5f3fc9b05fc7e3af072e332eddd648af1c030
parent023874701faaaa1701c88e42b1c0cffe5384e892 (diff)
parent7980e0bad3364ef3e183d28cc691e4c0658bda83 (diff)
downloadboto-d2231a210a31ee02333996437cc359ffdd13f09f.tar.gz
Merge pull request #2620 from tedder/patch-1
fix ELB ConnectionSettings values in documentation
-rw-r--r--boto/ec2/elb/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/boto/ec2/elb/__init__.py b/boto/ec2/elb/__init__.py
index 5ae272f7..f88b4937 100644
--- a/boto/ec2/elb/__init__.py
+++ b/boto/ec2/elb/__init__.py
@@ -400,7 +400,7 @@ class ELBConnection(AWSQueryConnection):
: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 @@ class ELBConnection(AWSQueryConnection):
* accessLog - :py:class:`AccessLogAttribute` instance
* crossZoneLoadBalancing - Boolean
- * connectionSettings - :py:class:`ConnectionSettingAttribute` instance
+ * connectingSettings - :py:class:`ConnectionSettingAttribute` instance
* connectionDraining - :py:class:`ConnectionDrainingAttribute`
instance