summaryrefslogtreecommitdiff
path: root/boto
diff options
context:
space:
mode:
authorDaniel G. Taylor <dan@programmer-art.org>2014-07-30 14:15:22 -0700
committerDaniel G. Taylor <dan@programmer-art.org>2014-07-30 14:15:22 -0700
commiteb26fdc98988ac9d3a6aeb543bf19df082989b73 (patch)
treef59d9e103ee6df5f8474ccd3780a49e251464de4 /boto
parent102c3b68377e3e7b20fed7e3091e440ed1d0ee29 (diff)
parent35aa86d0ce7cae8b18922b382c2b6e683698a520 (diff)
downloadboto-eb26fdc98988ac9d3a6aeb543bf19df082989b73.tar.gz
Merge pull request #2467 from ilam/patch-1
[DOC] Fixed #2464 added keyword "detailed". Fixes #2467.
Diffstat (limited to 'boto')
-rw-r--r--boto/ec2/connection.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/boto/ec2/connection.py b/boto/ec2/connection.py
index e8d27652..eccb41ad 100644
--- a/boto/ec2/connection.py
+++ b/boto/ec2/connection.py
@@ -826,7 +826,7 @@ class EC2Connection(AWSQueryConnection):
instances.
:type monitoring_enabled: bool
- :param monitoring_enabled: Enable CloudWatch monitoring on
+ :param monitoring_enabled: Enable detailed CloudWatch monitoring on
the instance.
:type subnet_id: string
@@ -1527,7 +1527,7 @@ class EC2Connection(AWSQueryConnection):
instances
:type monitoring_enabled: bool
- :param monitoring_enabled: Enable CloudWatch monitoring on
+ :param monitoring_enabled: Enable detailed CloudWatch monitoring on
the instance.
:type subnet_id: string
@@ -3868,7 +3868,7 @@ class EC2Connection(AWSQueryConnection):
def monitor_instances(self, instance_ids, dry_run=False):
"""
- Enable CloudWatch monitoring for the supplied instances.
+ Enable detailed CloudWatch monitoring for the supplied instances.
:type instance_id: list of strings
:param instance_id: The instance ids
@@ -3889,7 +3889,7 @@ class EC2Connection(AWSQueryConnection):
def monitor_instance(self, instance_id, dry_run=False):
"""
Deprecated Version, maintained for backward compatibility.
- Enable CloudWatch monitoring for the supplied instance.
+ Enable detailed CloudWatch monitoring for the supplied instance.
:type instance_id: string
:param instance_id: The instance id
@@ -3925,7 +3925,7 @@ class EC2Connection(AWSQueryConnection):
def unmonitor_instance(self, instance_id, dry_run=False):
"""
Deprecated Version, maintained for backward compatibility.
- Disable CloudWatch monitoring for the supplied instance.
+ Disable detailed CloudWatch monitoring for the supplied instance.
:type instance_id: string
:param instance_id: The instance id