aws-sdk-autoscaling 1.6.0 → 1.7.0

data/lib/aws-sdk-autoscaling/client_api.rb

@@ -41,6 +41,10 @@ module Aws::AutoScaling
     AutoScalingInstancesType = Shapes::StructureShape.new(name: 'AutoScalingInstancesType')
     AutoScalingNotificationTypes = Shapes::ListShape.new(name: 'AutoScalingNotificationTypes')
     AvailabilityZones = Shapes::ListShape.new(name: 'AvailabilityZones')
+    BatchDeleteScheduledActionAnswer = Shapes::StructureShape.new(name: 'BatchDeleteScheduledActionAnswer')
+    BatchDeleteScheduledActionType = Shapes::StructureShape.new(name: 'BatchDeleteScheduledActionType')
+    BatchPutScheduledUpdateGroupActionAnswer = Shapes::StructureShape.new(name: 'BatchPutScheduledUpdateGroupActionAnswer')
+    BatchPutScheduledUpdateGroupActionType = Shapes::StructureShape.new(name: 'BatchPutScheduledUpdateGroupActionType')
     BlockDeviceEbsDeleteOnTermination = Shapes::BooleanShape.new(name: 'BlockDeviceEbsDeleteOnTermination')
     BlockDeviceEbsEncrypted = Shapes::BooleanShape.new(name: 'BlockDeviceEbsEncrypted')
     BlockDeviceEbsIops = Shapes::IntegerShape.new(name: 'BlockDeviceEbsIops')
@@ -101,6 +105,8 @@ module Aws::AutoScaling
     ExecutePolicyType = Shapes::StructureShape.new(name: 'ExecutePolicyType')
     ExitStandbyAnswer = Shapes::StructureShape.new(name: 'ExitStandbyAnswer')
     ExitStandbyQuery = Shapes::StructureShape.new(name: 'ExitStandbyQuery')
+    FailedScheduledUpdateGroupActionRequest = Shapes::StructureShape.new(name: 'FailedScheduledUpdateGroupActionRequest')
+    FailedScheduledUpdateGroupActionRequests = Shapes::ListShape.new(name: 'FailedScheduledUpdateGroupActionRequests')
     Filter = Shapes::StructureShape.new(name: 'Filter')
     Filters = Shapes::ListShape.new(name: 'Filters')
     ForceDelete = Shapes::BooleanShape.new(name: 'ForceDelete')
@@ -195,6 +201,8 @@ module Aws::AutoScaling
     ScheduledActionNames = Shapes::ListShape.new(name: 'ScheduledActionNames')
     ScheduledActionsType = Shapes::StructureShape.new(name: 'ScheduledActionsType')
     ScheduledUpdateGroupAction = Shapes::StructureShape.new(name: 'ScheduledUpdateGroupAction')
+    ScheduledUpdateGroupActionRequest = Shapes::StructureShape.new(name: 'ScheduledUpdateGroupActionRequest')
+    ScheduledUpdateGroupActionRequests = Shapes::ListShape.new(name: 'ScheduledUpdateGroupActionRequests')
     ScheduledUpdateGroupActions = Shapes::ListShape.new(name: 'ScheduledUpdateGroupActions')
     SecurityGroups = Shapes::ListShape.new(name: 'SecurityGroups')
     ServiceLinkedRoleFailure = Shapes::StructureShape.new(name: 'ServiceLinkedRoleFailure')
@@ -343,6 +351,20 @@ module Aws::AutoScaling
 
     AvailabilityZones.member = Shapes::ShapeRef.new(shape: XmlStringMaxLen255)
 
+    BatchDeleteScheduledActionAnswer.add_member(:failed_scheduled_actions, Shapes::ShapeRef.new(shape: FailedScheduledUpdateGroupActionRequests, location_name: "FailedScheduledActions"))
+    BatchDeleteScheduledActionAnswer.struct_class = Types::BatchDeleteScheduledActionAnswer
+
+    BatchDeleteScheduledActionType.add_member(:auto_scaling_group_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "AutoScalingGroupName"))
+    BatchDeleteScheduledActionType.add_member(:scheduled_action_names, Shapes::ShapeRef.new(shape: ScheduledActionNames, required: true, location_name: "ScheduledActionNames"))
+    BatchDeleteScheduledActionType.struct_class = Types::BatchDeleteScheduledActionType
+
+    BatchPutScheduledUpdateGroupActionAnswer.add_member(:failed_scheduled_update_group_actions, Shapes::ShapeRef.new(shape: FailedScheduledUpdateGroupActionRequests, location_name: "FailedScheduledUpdateGroupActions"))
+    BatchPutScheduledUpdateGroupActionAnswer.struct_class = Types::BatchPutScheduledUpdateGroupActionAnswer
+
+    BatchPutScheduledUpdateGroupActionType.add_member(:auto_scaling_group_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "AutoScalingGroupName"))
+    BatchPutScheduledUpdateGroupActionType.add_member(:scheduled_update_group_actions, Shapes::ShapeRef.new(shape: ScheduledUpdateGroupActionRequests, required: true, location_name: "ScheduledUpdateGroupActions"))
+    BatchPutScheduledUpdateGroupActionType.struct_class = Types::BatchPutScheduledUpdateGroupActionType
+
     BlockDeviceMapping.add_member(:virtual_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "VirtualName"))
     BlockDeviceMapping.add_member(:device_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "DeviceName"))
     BlockDeviceMapping.add_member(:ebs, Shapes::ShapeRef.new(shape: Ebs, location_name: "Ebs"))
@@ -591,6 +613,13 @@ module Aws::AutoScaling
     ExitStandbyQuery.add_member(:auto_scaling_group_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "AutoScalingGroupName"))
     ExitStandbyQuery.struct_class = Types::ExitStandbyQuery
 
+    FailedScheduledUpdateGroupActionRequest.add_member(:scheduled_action_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "ScheduledActionName"))
+    FailedScheduledUpdateGroupActionRequest.add_member(:error_code, Shapes::ShapeRef.new(shape: XmlStringMaxLen64, location_name: "ErrorCode"))
+    FailedScheduledUpdateGroupActionRequest.add_member(:error_message, Shapes::ShapeRef.new(shape: XmlString, location_name: "ErrorMessage"))
+    FailedScheduledUpdateGroupActionRequest.struct_class = Types::FailedScheduledUpdateGroupActionRequest
+
+    FailedScheduledUpdateGroupActionRequests.member = Shapes::ShapeRef.new(shape: FailedScheduledUpdateGroupActionRequest)
+
     Filter.add_member(:name, Shapes::ShapeRef.new(shape: XmlString, location_name: "Name"))
     Filter.add_member(:values, Shapes::ShapeRef.new(shape: Values, location_name: "Values"))
     Filter.struct_class = Types::Filter
@@ -836,6 +865,17 @@ module Aws::AutoScaling
     ScheduledUpdateGroupAction.add_member(:desired_capacity, Shapes::ShapeRef.new(shape: AutoScalingGroupDesiredCapacity, location_name: "DesiredCapacity"))
     ScheduledUpdateGroupAction.struct_class = Types::ScheduledUpdateGroupAction
 
+    ScheduledUpdateGroupActionRequest.add_member(:scheduled_action_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "ScheduledActionName"))
+    ScheduledUpdateGroupActionRequest.add_member(:start_time, Shapes::ShapeRef.new(shape: TimestampType, location_name: "StartTime"))
+    ScheduledUpdateGroupActionRequest.add_member(:end_time, Shapes::ShapeRef.new(shape: TimestampType, location_name: "EndTime"))
+    ScheduledUpdateGroupActionRequest.add_member(:recurrence, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "Recurrence"))
+    ScheduledUpdateGroupActionRequest.add_member(:min_size, Shapes::ShapeRef.new(shape: AutoScalingGroupMinSize, location_name: "MinSize"))
+    ScheduledUpdateGroupActionRequest.add_member(:max_size, Shapes::ShapeRef.new(shape: AutoScalingGroupMaxSize, location_name: "MaxSize"))
+    ScheduledUpdateGroupActionRequest.add_member(:desired_capacity, Shapes::ShapeRef.new(shape: AutoScalingGroupDesiredCapacity, location_name: "DesiredCapacity"))
+    ScheduledUpdateGroupActionRequest.struct_class = Types::ScheduledUpdateGroupActionRequest
+
+    ScheduledUpdateGroupActionRequests.member = Shapes::ShapeRef.new(shape: ScheduledUpdateGroupActionRequest)
+
     ScheduledUpdateGroupActions.member = Shapes::ShapeRef.new(shape: ScheduledUpdateGroupAction)
 
     SecurityGroups.member = Shapes::ShapeRef.new(shape: XmlString)
@@ -969,6 +1009,26 @@ module Aws::AutoScaling
         o.errors << Shapes::ShapeRef.new(shape: ServiceLinkedRoleFailure)
       end)
 
+      api.add_operation(:batch_delete_scheduled_action, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "BatchDeleteScheduledAction"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: BatchDeleteScheduledActionType)
+        o.output = Shapes::ShapeRef.new(shape: BatchDeleteScheduledActionAnswer)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceContentionFault)
+      end)
+
+      api.add_operation(:batch_put_scheduled_update_group_action, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "BatchPutScheduledUpdateGroupAction"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: BatchPutScheduledUpdateGroupActionType)
+        o.output = Shapes::ShapeRef.new(shape: BatchPutScheduledUpdateGroupActionAnswer)
+        o.errors << Shapes::ShapeRef.new(shape: AlreadyExistsFault)
+        o.errors << Shapes::ShapeRef.new(shape: LimitExceededFault)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceContentionFault)
+      end)
+
       api.add_operation(:complete_lifecycle_action, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CompleteLifecycleAction"
         o.http_method = "POST"

data/lib/aws-sdk-autoscaling/instance.rb

@@ -47,11 +47,11 @@ module Aws::AutoScaling
     end
 
     # The lifecycle state for the instance. For more information, see [Auto
-    # Scaling Lifecycle][1] in the *Auto Scaling User Guide*.
+    # Scaling Lifecycle][1] in the *Amazon EC2 Auto Scaling User Guide*.
     #
     #
     #
-    # [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/AutoScalingGroupLifecycle.html
+    # [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/AutoScalingGroupLifecycle.html
     # @return [String]
     def lifecycle_state
       data[:lifecycle_state]
@@ -59,8 +59,8 @@ module Aws::AutoScaling
 
     # The last reported health status of this instance. "Healthy" means
     # that the instance is healthy and should remain in service.
-    # "Unhealthy" means that the instance is unhealthy and Auto Scaling
-    # should terminate and replace it.
+    # "Unhealthy" means that the instance is unhealthy and Amazon EC2 Auto
+    # Scaling should terminate and replace it.
     # @return [String]
     def health_status
       data[:health_status]
@@ -79,8 +79,8 @@ module Aws::AutoScaling
       data[:launch_template]
     end
 
-    # Indicates whether the instance is protected from termination by Auto
-    # Scaling when scaling in.
+    # Indicates whether the instance is protected from termination by Amazon
+    # EC2 Auto Scaling when scaling in.
     # @return [Boolean]
     def protected_from_scale_in
       data[:protected_from_scale_in]
@@ -318,8 +318,8 @@ module Aws::AutoScaling
     # @option options [required, String] :health_status
     #   The health status of the instance. Set to `Healthy` if you want the
     #   instance to remain in service. Set to `Unhealthy` if you want the
-    #   instance to be out of service. Auto Scaling will terminate and replace
-    #   the unhealthy instance.
+    #   instance to be out of service. Amazon EC2 Auto Scaling will terminate
+    #   and replace the unhealthy instance.
     # @option options [Boolean] :should_respect_grace_period
     #   If the Auto Scaling group of the specified instance has a
     #   `HealthCheckGracePeriod` specified for the group, by default, this

data/lib/aws-sdk-autoscaling/lifecycle_hook.rb

@@ -41,16 +41,19 @@ module Aws::AutoScaling
     alias :lifecycle_hook_name :name
 
     # The state of the EC2 instance to which you want to attach the
-    # lifecycle hook. For a list of lifecycle hook types, see
-    # DescribeLifecycleHookTypes.
+    # lifecycle hook. The following are possible values:
+    #
+    # * autoscaling:EC2\_INSTANCE\_LAUNCHING
+    #
+    # * autoscaling:EC2\_INSTANCE\_TERMINATING
     # @return [String]
     def lifecycle_transition
       data[:lifecycle_transition]
     end
 
-    # The ARN of the target that Auto Scaling sends notifications to when an
-    # instance is in the transition state for the lifecycle hook. The
-    # notification target can be either an SQS queue or an SNS topic.
+    # The ARN of the target that Amazon EC2 Auto Scaling sends notifications
+    # to when an instance is in the transition state for the lifecycle hook.
+    # The notification target can be either an SQS queue or an SNS topic.
     # @return [String]
     def notification_target_arn
       data[:notification_target_arn]
@@ -63,17 +66,17 @@ module Aws::AutoScaling
       data[:role_arn]
     end
 
-    # Additional information that you want to include any time Auto Scaling
-    # sends a message to the notification target.
+    # Additional information that you want to include any time Amazon EC2
+    # Auto Scaling sends a message to the notification target.
     # @return [String]
     def notification_metadata
       data[:notification_metadata]
     end
 
     # The maximum time, in seconds, that can elapse before the lifecycle
-    # hook times out. If the lifecycle hook times out, Auto Scaling performs
-    # the default action. You can prevent the lifecycle hook from timing out
-    # by calling RecordLifecycleActionHeartbeat.
+    # hook times out. If the lifecycle hook times out, Amazon EC2 Auto
+    # Scaling performs the default action. You can prevent the lifecycle
+    # hook from timing out by calling RecordLifecycleActionHeartbeat.
     # @return [Integer]
     def heartbeat_timeout
       data[:heartbeat_timeout]
@@ -242,9 +245,9 @@ module Aws::AutoScaling
     # @param [Hash] options ({})
     # @option options [String] :lifecycle_action_token
     #   A universally unique identifier (UUID) that identifies a specific
-    #   lifecycle action associated with an instance. Auto Scaling sends this
-    #   token to the notification target you specified when you created the
-    #   lifecycle hook.
+    #   lifecycle action associated with an instance. Amazon EC2 Auto Scaling
+    #   sends this token to the notification target you specified when you
+    #   created the lifecycle hook.
     # @option options [required, String] :lifecycle_action_result
     #   The action for the group to take. This parameter can be either
     #   `CONTINUE` or `ABANDON`.
@@ -286,8 +289,12 @@ module Aws::AutoScaling
     #   })
     # @param [Hash] options ({})
     # @option options [String] :lifecycle_transition
-    #   The instance state to which you want to attach the lifecycle hook. For
-    #   a list of lifecycle hook types, see DescribeLifecycleHookTypes.
+    #   The instance state to which you want to attach the lifecycle hook. The
+    #   possible values are:
+    #
+    #   * autoscaling:EC2\_INSTANCE\_LAUNCHING
+    #
+    #   * autoscaling:EC2\_INSTANCE\_TERMINATING
     #
     #   This parameter is required for new lifecycle hooks, but optional when
     #   updating existing hooks.
@@ -298,8 +305,8 @@ module Aws::AutoScaling
     #   This parameter is required for new lifecycle hooks, but optional when
     #   updating existing hooks.
     # @option options [String] :notification_target_arn
-    #   The ARN of the notification target that Auto Scaling will use to
-    #   notify you when an instance is in the transition state for the
+    #   The ARN of the notification target that Amazon EC2 Auto Scaling will
+    #   use to notify you when an instance is in the transition state for the
     #   lifecycle hook. This target can be either an SQS queue or an SNS
     #   topic. If you specify an empty string, this overrides the current ARN.
     #
@@ -307,20 +314,20 @@ module Aws::AutoScaling
     #   Amazon SQS queue, and an email key/value pair format when sending
     #   notifications to an Amazon SNS topic.
     #
-    #   When you specify a notification target, Auto Scaling sends it a test
-    #   message. Test messages contains the following additional key/value
-    #   pair: `"Event": "autoscaling:TEST_NOTIFICATION"`.
+    #   When you specify a notification target, Amazon EC2 Auto Scaling sends
+    #   it a test message. Test messages contains the following additional
+    #   key/value pair: `"Event": "autoscaling:TEST_NOTIFICATION"`.
     # @option options [String] :notification_metadata
-    #   Contains additional information that you want to include any time Auto
-    #   Scaling sends a message to the notification target.
+    #   Contains additional information that you want to include any time
+    #   Amazon EC2 Auto Scaling sends a message to the notification target.
     # @option options [Integer] :heartbeat_timeout
     #   The maximum time, in seconds, that can elapse before the lifecycle
     #   hook times out. The range is from 30 to 7200 seconds. The default is
     #   3600 seconds (1 hour).
     #
-    #   If the lifecycle hook times out, Auto Scaling performs the default
-    #   action. You can prevent the lifecycle hook from timing out by calling
-    #   RecordLifecycleActionHeartbeat.
+    #   If the lifecycle hook times out, Amazon EC2 Auto Scaling performs the
+    #   default action. You can prevent the lifecycle hook from timing out by
+    #   calling RecordLifecycleActionHeartbeat.
     # @option options [String] :default_result
     #   Defines the action the Auto Scaling group should take when the
     #   lifecycle hook timeout elapses or if an unexpected failure occurs.
@@ -345,8 +352,9 @@ module Aws::AutoScaling
     # @param [Hash] options ({})
     # @option options [String] :lifecycle_action_token
     #   A token that uniquely identifies a specific lifecycle action
-    #   associated with an instance. Auto Scaling sends this token to the
-    #   notification target you specified when you created the lifecycle hook.
+    #   associated with an instance. Amazon EC2 Auto Scaling sends this token
+    #   to the notification target you specified when you created the
+    #   lifecycle hook.
     # @option options [String] :instance_id
     #   The ID of the instance.
     # @return [Types::RecordLifecycleActionHeartbeatAnswer]

data/lib/aws-sdk-autoscaling/resource.rb

@@ -84,17 +84,17 @@ module Aws::AutoScaling
     #   group. You must specify one of the following: an EC2 instance, a
     #   launch configuration, or a launch template.
     #
-    #   When you specify an ID of an instance, Auto Scaling creates a new
-    #   launch configuration and associates it with the group. This launch
-    #   configuration derives its attributes from the specified instance, with
-    #   the exception of the block device mapping.
+    #   When you specify an ID of an instance, Amazon EC2 Auto Scaling creates
+    #   a new launch configuration and associates it with the group. This
+    #   launch configuration derives its attributes from the specified
+    #   instance, with the exception of the block device mapping.
     #
     #   For more information, see [Create an Auto Scaling Group Using an EC2
-    #   Instance][1] in the *Auto Scaling User Guide*.
+    #   Instance][1] in the *Amazon EC2 Auto Scaling User Guide*.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/create-asg-from-instance.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/create-asg-from-instance.html
     # @option options [required, Integer] :min_size
     #   The minimum size of the group.
     # @option options [required, Integer] :max_size
@@ -109,12 +109,12 @@ module Aws::AutoScaling
     #   The amount of time, in seconds, after a scaling activity completes
     #   before another scaling activity can start. The default is 300.
     #
-    #   For more information, see [Auto Scaling Cooldowns][1] in the *Auto
-    #   Scaling User Guide*.
+    #   For more information, see [Scaling Cooldowns][1] in the *Amazon EC2
+    #   Auto Scaling User Guide*.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/Cooldown.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/Cooldown.html
     # @option options [Array<String>] :availability_zones
     #   One or more Availability Zones for the group. This parameter is
     #   optional if you specify one or more subnets.
@@ -123,11 +123,11 @@ module Aws::AutoScaling
     #   Balancer, use `TargetGroupARNs` instead.
     #
     #   For more information, see [Using a Load Balancer With an Auto Scaling
-    #   Group][1] in the *Auto Scaling User Guide*.
+    #   Group][1] in the *Amazon EC2 Auto Scaling User Guide*.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/create-asg-from-instance.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/create-asg-from-instance.html
     # @option options [Array<String>] :target_group_arns
     #   The Amazon Resource Names (ARN) of the target groups.
     # @option options [String] :health_check_type
@@ -136,25 +136,25 @@ module Aws::AutoScaling
     #
     #   By default, health checks use Amazon EC2 instance status checks to
     #   determine the health of an instance. For more information, see [Health
-    #   Checks][1] in the *Auto Scaling User Guide*.
+    #   Checks][1] in the *Amazon EC2 Auto Scaling User Guide*.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/healthcheck.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/healthcheck.html
     # @option options [Integer] :health_check_grace_period
-    #   The amount of time, in seconds, that Auto Scaling waits before
-    #   checking the health status of an EC2 instance that has come into
-    #   service. During this time, any health check failures for the instance
-    #   are ignored. The default is 0.
+    #   The amount of time, in seconds, that Amazon EC2 Auto Scaling waits
+    #   before checking the health status of an EC2 instance that has come
+    #   into service. During this time, any health check failures for the
+    #   instance are ignored. The default is 0.
     #
     #   This parameter is required if you are adding an `ELB` health check.
     #
-    #   For more information, see [Health Checks][1] in the *Auto Scaling User
-    #   Guide*.
+    #   For more information, see [Health Checks][1] in the *Amazon EC2 Auto
+    #   Scaling User Guide*.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/healthcheck.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/healthcheck.html
     # @option options [String] :placement_group
     #   The name of the placement group into which you'll launch your
     #   instances, if any. For more information, see [Placement Groups][1] in
@@ -172,11 +172,11 @@ module Aws::AutoScaling
     #   specified.
     #
     #   For more information, see [Launching Auto Scaling Instances in a
-    #   VPC][1] in the *Auto Scaling User Guide*.
+    #   VPC][1] in the *Amazon EC2 Auto Scaling User Guide*.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/asg-in-vpc.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html
     # @option options [Array<String>] :termination_policies
     #   One or more termination policies used to select the instance to
     #   terminate. These policies are executed in the order that they are
@@ -187,7 +187,7 @@ module Aws::AutoScaling
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/as-instance-termination.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/as-instance-termination.html
     # @option options [Boolean] :new_instances_protected_from_scale_in
     #   Indicates whether newly launched instances are protected from
     #   termination by Auto Scaling when scaling in.
@@ -197,15 +197,15 @@ module Aws::AutoScaling
     #   One or more tags.
     #
     #   For more information, see [Tagging Auto Scaling Groups and
-    #   Instances][1] in the *Auto Scaling User Guide*.
+    #   Instances][1] in the *Amazon EC2 Auto Scaling User Guide*.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/autoscaling-tagging.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-tagging.html
     # @option options [String] :service_linked_role_arn
     #   The Amazon Resource Name (ARN) of the service-linked role that the
     #   Auto Scaling group uses to call other AWS services on your behalf. By
-    #   default, Auto Scaling uses a service-linked role named
+    #   default, Amazon EC2 Auto Scaling uses a service-linked role named
     #   AWSServiceRoleForAutoScaling, which it creates if it does not exist.
     # @return [AutoScalingGroup]
     def create_group(options = {})
@@ -333,11 +333,11 @@ module Aws::AutoScaling
     #   same request.
     #
     #   For more information, see [Create a Launch Configuration Using an EC2
-    #   Instance][1] in the *Auto Scaling User Guide*.
+    #   Instance][1] in the *Amazon EC2 Auto Scaling User Guide*.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/create-lc-with-instanceID.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/create-lc-with-instanceID.html
     # @option options [String] :instance_type
     #   The instance type of the EC2 instance.
     #
@@ -369,25 +369,25 @@ module Aws::AutoScaling
     #   fulfill the request. Spot Instances are launched when the price you
     #   specify exceeds the current Spot market price. For more information,
     #   see [Launching Spot Instances in Your Auto Scaling Group][1] in the
-    #   *Auto Scaling User Guide*.
+    #   *Amazon EC2 Auto Scaling User Guide*.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/US-SpotInstances.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-launch-spot-instances.html
     # @option options [String] :iam_instance_profile
     #   The name or the Amazon Resource Name (ARN) of the instance profile
     #   associated with the IAM role for the instance.
     #
     #   EC2 instances launched with an IAM role will automatically have AWS
-    #   security credentials available. You can use IAM roles with Auto
-    #   Scaling to automatically enable applications running on your EC2
+    #   security credentials available. You can use IAM roles with Amazon EC2
+    #   Auto Scaling to automatically enable applications running on your EC2
     #   instances to securely access other AWS resources. For more
     #   information, see [Launch Auto Scaling Instances with an IAM Role][1]
-    #   in the *Auto Scaling User Guide*.
+    #   in the *Amazon EC2 Auto Scaling User Guide*.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/us-iam-role.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/us-iam-role.html
     # @option options [Boolean] :ebs_optimized
     #   Indicates whether the instance is optimized for Amazon EBS I/O. By
     #   default, the instance is not optimized for EBS I/O. The optimization
@@ -404,7 +404,7 @@ module Aws::AutoScaling
     #   Used for groups that launch instances into a virtual private cloud
     #   (VPC). Specifies whether to assign a public IP address to each
     #   instance. For more information, see [Launching Auto Scaling Instances
-    #   in a VPC][1] in the *Auto Scaling User Guide*.
+    #   in a VPC][1] in the *Amazon EC2 Auto Scaling User Guide*.
     #
     #   If you specify this parameter, be sure to specify at least one subnet
     #   when you create your group.
@@ -416,7 +416,7 @@ module Aws::AutoScaling
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/asg-in-vpc.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html
     # @option options [String] :placement_tenancy
     #   The tenancy of the instance. An instance with a tenancy of `dedicated`
     #   runs on single-tenant hardware and can only be launched into a VPC.
@@ -429,13 +429,13 @@ module Aws::AutoScaling
     #   when you create your group.
     #
     #   For more information, see [Launching Auto Scaling Instances in a
-    #   VPC][1] in the *Auto Scaling User Guide*.
+    #   VPC][1] in the *Amazon EC2 Auto Scaling User Guide*.
     #
     #   Valid values: `default` \| `dedicated`
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/asg-in-vpc.html
+    #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html
     # @return [LaunchConfiguration]
     def create_launch_configuration(options = {})
       resp = @client.create_launch_configuration(options)
@@ -455,11 +455,11 @@ module Aws::AutoScaling
     #   })
     # @param [Hash] options ({})
     # @option options [Array<String>] :activity_ids
-    #   The activity IDs of the desired scaling activities. If you omit this
-    #   parameter, all activities for the past six weeks are described. If you
-    #   specify an Auto Scaling group, the results are limited to that group.
-    #   The list of requested activities cannot contain more than 50 items. If
-    #   unknown activities are requested, they are ignored with no error.
+    #   The activity IDs of the desired scaling activities. You can specify up
+    #   to 50 IDs. If you omit this parameter, all activities for the past six
+    #   weeks are described. If unknown activities are requested, they are
+    #   ignored with no error. If you specify an Auto Scaling group, the
+    #   results are limited to that group.
     # @option options [String] :auto_scaling_group_name
     #   The name of the Auto Scaling group.
     # @return [Activity::Collection]
@@ -506,8 +506,9 @@ module Aws::AutoScaling
     #   })
     # @param [Hash] options ({})
     # @option options [Array<String>] :auto_scaling_group_names
-    #   The names of the Auto Scaling groups. If you omit this parameter, all
-    #   Auto Scaling groups are described.
+    #   The names of the Auto Scaling groups. You can specify up to
+    #   `MaxRecords` names. If you omit this parameter, all Auto Scaling
+    #   groups are described.
     # @return [AutoScalingGroup::Collection]
     def groups(options = {})
       batches = Enumerator.new do |y|
@@ -534,9 +535,9 @@ module Aws::AutoScaling
     #   })
     # @param [Hash] options ({})
     # @option options [Array<String>] :instance_ids
-    #   The instances to describe; up to 50 instance IDs. If you omit this
-    #   parameter, all Auto Scaling instances are described. If you specify an
-    #   ID that does not exist, it is ignored with no error.
+    #   The IDs of the instances. You can specify up to `MaxRecords` IDs. If
+    #   you omit this parameter, all Auto Scaling instances are described. If
+    #   you specify an ID that does not exist, it is ignored with no error.
     # @return [Instance::Collection]
     def instances(options = {})
       batches = Enumerator.new do |y|
@@ -661,13 +662,10 @@ module Aws::AutoScaling
     # @option options [String] :auto_scaling_group_name
     #   The name of the Auto Scaling group.
     # @option options [Array<String>] :scheduled_action_names
-    #   Describes one or more scheduled actions. If you omit this parameter,
-    #   all scheduled actions are described. If you specify an unknown
-    #   scheduled action, it is ignored with no error.
-    #
-    #   You can describe up to a maximum of 50 instances with a single call.
-    #   If there are more items to return, the call returns a token. To get
-    #   the next set of items, repeat the call with the returned token.
+    #   The names of one or more scheduled actions. You can specify up to 50
+    #   actions. If you omit this parameter, all scheduled actions are
+    #   described. If you specify an unknown scheduled action, it is ignored
+    #   with no error.
     # @option options [Time,DateTime,Date,Integer,String] :start_time
     #   The earliest scheduled start time to return. If scheduled action names
     #   are provided, this parameter is ignored.