diff options
| author | Nick Tarleton <nick@quixey.com> | 2011-03-28 06:23:47 +0800 |
|---|---|---|
| committer | Jann Kleen <jann.kleen@freshx.de> | 2011-03-28 16:37:18 +0800 |
| commit | 1e6c47a4efcb9349258fdc474f95449687acd734 (patch) | |
| tree | 9e3c599de4a47bd0bce9418f6cca1a1d9473c066 | |
| parent | 1d8a204a1be0a45ceba15756666b2b319ee59ce8 (diff) | |
| download | boto-1e6c47a4efcb9349258fdc474f95449687acd734.tar.gz | |
Fix documentation for instance_initiated_shutdown_behavior
| -rw-r--r-- | boto/ec2/connection.py | 9 | ||||
| -rw-r--r-- | boto/ec2/image.py | 8 |
2 files changed, 6 insertions, 11 deletions
diff --git a/boto/ec2/connection.py b/boto/ec2/connection.py index bbb6d4f6..2d7ab085 100644 --- a/boto/ec2/connection.py +++ b/boto/ec2/connection.py @@ -507,12 +507,9 @@ class EC2Connection(AWSQueryConnection): :type instance_initiated_shutdown_behavior: string :param instance_initiated_shutdown_behavior: Specifies whether the - instance's EBS volumes are - stopped (i.e. detached) or - terminated (i.e. deleted) - when the instance is - shutdown by the - owner. Valid values are: + instance stops or terminates on + instance-initiated shutdown. + Valid values are: * stop * terminate diff --git a/boto/ec2/image.py b/boto/ec2/image.py index a85fba0b..d7f64e22 100644 --- a/boto/ec2/image.py +++ b/boto/ec2/image.py @@ -220,11 +220,9 @@ class Image(TaggedEC2Object): via the API. :type instance_initiated_shutdown_behavior: string - :param instance_initiated_shutdown_behavior: Specifies whether the instance's - EBS volumes are stopped (i.e. detached) - or terminated (i.e. deleted) when - the instance is shutdown by the - owner. Valid values are: + :param instance_initiated_shutdown_behavior: Specifies whether the instance + stops or terminates on instance-initiated + shutdown. Valid values are: stop | terminate :type placement_group: string |