diff --git a/amazonka-ec2.cabal b/amazonka-ec2.cabal
--- a/amazonka-ec2.cabal
+++ b/amazonka-ec2.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-ec2
-version:               0.3.3
+version:               0.3.4
 synopsis:              Amazon Elastic Compute Cloud SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -211,5 +211,5 @@
           Network.AWS.EC2.Internal
 
     build-depends:
-          amazonka-core == 0.3.3.*
+          amazonka-core == 0.3.4.*
         , base          >= 4.7     && < 5
diff --git a/gen/Network/AWS/EC2/AllocateAddress.hs b/gen/Network/AWS/EC2/AllocateAddress.hs
--- a/gen/Network/AWS/EC2/AllocateAddress.hs
+++ b/gen/Network/AWS/EC2/AllocateAddress.hs
@@ -25,7 +25,7 @@
 -- | Acquires an Elastic IP address.
 --
 -- An Elastic IP address is for use either in the EC2-Classic platform or in a
--- VPC. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html Elastic IP Addresses> in the /Amazon ElasticCompute Cloud User Guide/.
+-- VPC. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html Elastic IP Addresses> in the /Amazon ElasticCompute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AllocateAddress.html>
 module Network.AWS.EC2.AllocateAddress
diff --git a/gen/Network/AWS/EC2/AssignPrivateIpAddresses.hs b/gen/Network/AWS/EC2/AssignPrivateIpAddresses.hs
--- a/gen/Network/AWS/EC2/AssignPrivateIpAddresses.hs
+++ b/gen/Network/AWS/EC2/AssignPrivateIpAddresses.hs
@@ -27,8 +27,8 @@
 -- you can specify the number of secondary IP addresses to be automatically
 -- assigned within the subnet's CIDR block range. The number of secondary IP
 -- addresses that you can assign to an instance varies by instance type. For
--- information about instance types, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html Instance Types> in the /Amazon ElasticCompute Cloud User Guide/. For more information about Elastic IP addresses,
--- see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html Elastic IP Addresses> in the /Amazon Elastic Compute Cloud User Guide/.
+-- information about instance types, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html Instance Types> in the /Amazon ElasticCompute Cloud User Guide for Linux/. For more information about Elastic IP
+-- addresses, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html Elastic IP Addresses> in the /Amazon Elastic Compute Cloud UserGuide for Linux/.
 --
 -- AssignPrivateIpAddresses is available only in EC2-VPC.
 --
diff --git a/gen/Network/AWS/EC2/AssociateAddress.hs b/gen/Network/AWS/EC2/AssociateAddress.hs
--- a/gen/Network/AWS/EC2/AssociateAddress.hs
+++ b/gen/Network/AWS/EC2/AssociateAddress.hs
@@ -25,7 +25,7 @@
 -- | Associates an Elastic IP address with an instance or a network interface.
 --
 -- An Elastic IP address is for use in either the EC2-Classic platform or in a
--- VPC. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html Elastic IP Addresses> in the /Amazon ElasticCompute Cloud User Guide/.
+-- VPC. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html Elastic IP Addresses> in the /Amazon ElasticCompute Cloud User Guide for Linux/.
 --
 -- [EC2-Classic, VPC in an EC2-VPC-only account] If the Elastic IP address is
 -- already associated with a different instance, it is disassociated from that
diff --git a/gen/Network/AWS/EC2/AttachVolume.hs b/gen/Network/AWS/EC2/AttachVolume.hs
--- a/gen/Network/AWS/EC2/AttachVolume.hs
+++ b/gen/Network/AWS/EC2/AttachVolume.hs
@@ -26,10 +26,10 @@
 -- to the instance with the specified device name.
 --
 -- Encrypted Amazon EBS volumes may only be attached to instances that support
--- Amazon EBS encryption. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html Amazon EBS Encryption> in the /Amazon Elastic Compute Cloud User Guide/.
+-- Amazon EBS encryption. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html Amazon EBS Encryption> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- For a list of supported device names, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-attaching-volume.html Attaching an Amazon EBS Volume toan Instance>. Any device names that aren't reserved for instance store volumes
--- can be used for Amazon EBS volumes. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html Amazon EC2Instance Store> in the /Amazon Elastic Compute Cloud User Guide/.
+-- can be used for Amazon EBS volumes. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html Amazon EC2Instance Store> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- If a volume has an AWS Marketplace product code:
 --
@@ -40,7 +40,7 @@
 -- from a Windows instance and attach it to a Linux instance.  For an overview
 -- of the AWS Marketplace, see <https://aws.amazon.com/marketplace/help/200900000 Introducing AWS Marketplace>.
 --
--- For more information about Amazon EBS volumes, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-attaching-volume.html Attaching Amazon EBSVolumes> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information about Amazon EBS volumes, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-attaching-volume.html Attaching Amazon EBSVolumes> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AttachVolume.html>
 module Network.AWS.EC2.AttachVolume
diff --git a/gen/Network/AWS/EC2/CancelConversionTask.hs b/gen/Network/AWS/EC2/CancelConversionTask.hs
--- a/gen/Network/AWS/EC2/CancelConversionTask.hs
+++ b/gen/Network/AWS/EC2/CancelConversionTask.hs
@@ -28,7 +28,7 @@
 -- the process of transferring the final disk image, the command fails and
 -- returns an exception.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UploadingYourInstancesandVolumes.html Using the Command Line Tools to Import YourVirtual Machine to Amazon EC2> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UploadingYourInstancesandVolumes.html Using the Command Line Tools to Import YourVirtual Machine to Amazon EC2> in the /Amazon Elastic Compute Cloud User Guidefor Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CancelConversionTask.html>
 module Network.AWS.EC2.CancelConversionTask
diff --git a/gen/Network/AWS/EC2/CancelReservedInstancesListing.hs b/gen/Network/AWS/EC2/CancelReservedInstancesListing.hs
--- a/gen/Network/AWS/EC2/CancelReservedInstancesListing.hs
+++ b/gen/Network/AWS/EC2/CancelReservedInstancesListing.hs
@@ -25,7 +25,7 @@
 -- | Cancels the specified Reserved Instance listing in the Reserved Instance
 -- Marketplace.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ri-market-general.html Reserved Instance Marketplace> in the /AmazonElastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ri-market-general.html Reserved Instance Marketplace> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CancelReservedInstancesListing.html>
 module Network.AWS.EC2.CancelReservedInstancesListing
diff --git a/gen/Network/AWS/EC2/CancelSpotInstanceRequests.hs b/gen/Network/AWS/EC2/CancelSpotInstanceRequests.hs
--- a/gen/Network/AWS/EC2/CancelSpotInstanceRequests.hs
+++ b/gen/Network/AWS/EC2/CancelSpotInstanceRequests.hs
@@ -26,7 +26,7 @@
 -- Amazon EC2 starts on your behalf when the bid price that you specify exceeds
 -- the current Spot Price. Amazon EC2 periodically sets the Spot Price based on
 -- available Spot Instance capacity and current Spot Instance requests. For more
--- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-requests.html Spot Instance Requests> in the /Amazon Elastic Compute CloudUser Guide/.
+-- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-requests.html Spot Instance Requests> in the /Amazon Elastic Compute CloudUser Guide for Linux/.
 --
 -- Canceling a Spot Instance request does not terminate running Spot Instances
 -- associated with the request.
diff --git a/gen/Network/AWS/EC2/CopyImage.hs b/gen/Network/AWS/EC2/CopyImage.hs
--- a/gen/Network/AWS/EC2/CopyImage.hs
+++ b/gen/Network/AWS/EC2/CopyImage.hs
@@ -27,7 +27,7 @@
 -- the request. AMIs that use encrypted Amazon EBS snapshots cannot be copied
 -- with this method.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/CopyingAMIs.html Copying AMIs> in the /Amazon Elastic Compute CloudUser Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/CopyingAMIs.html Copying AMIs> in the /Amazon Elastic Compute CloudUser Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CopyImage.html>
 module Network.AWS.EC2.CopyImage
@@ -96,7 +96,7 @@
     }
 
 -- | Unique, case-sensitive identifier you provide to ensure idempotency of the
--- request. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html How to Ensure Idempotency> in the /AmazonElastic Compute Cloud User Guide/.
+-- request. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html How to Ensure Idempotency> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 ciClientToken :: Lens' CopyImage (Maybe Text)
 ciClientToken = lens _ciClientToken (\s a -> s { _ciClientToken = a })
 
diff --git a/gen/Network/AWS/EC2/CopySnapshot.hs b/gen/Network/AWS/EC2/CopySnapshot.hs
--- a/gen/Network/AWS/EC2/CopySnapshot.hs
+++ b/gen/Network/AWS/EC2/CopySnapshot.hs
@@ -34,7 +34,7 @@
 -- Copying snapshots that were encrypted with non-default AWS Key Management
 -- Service (KMS) master keys is not supported at this time.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-copy-snapshot.html Copying an Amazon EBS Snapshot> in the /AmazonElastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-copy-snapshot.html Copying an Amazon EBS Snapshot> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CopySnapshot.html>
 module Network.AWS.EC2.CopySnapshot
@@ -105,8 +105,16 @@
 csDescription :: Lens' CopySnapshot (Maybe Text)
 csDescription = lens _csDescription (\s a -> s { _csDescription = a })
 
--- | The destination region of the snapshot copy operation. This parameter is
--- required in the 'PresignedUrl'.
+-- | The destination region to use in the 'PresignedUrl' parameter of a snapshot
+-- copy operation. This parameter is only valid for specifying the destination
+-- region in a 'PresignedUrl' parameter, where it is required.
+--
+-- 'CopySnapshot' sends the snapshot copy to the regional endpoint that you send
+-- the HTTP request to, such as 'ec2.us-east-1.amazonaws.com' (in the AWS CLI,
+-- this is specified with the '--region' parameter or the default region in your
+-- AWS configuration file).
+--
+--
 csDestinationRegion :: Lens' CopySnapshot (Maybe Text)
 csDestinationRegion =
     lens _csDestinationRegion (\s a -> s { _csDestinationRegion = a })
diff --git a/gen/Network/AWS/EC2/CreateImage.hs b/gen/Network/AWS/EC2/CreateImage.hs
--- a/gen/Network/AWS/EC2/CreateImage.hs
+++ b/gen/Network/AWS/EC2/CreateImage.hs
@@ -30,7 +30,7 @@
 -- mapping information for those volumes. When you launch an instance from this
 -- new AMI, the instance automatically launches with those additional volumes.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami-ebs.html Creating Amazon EBS-Backed Linux AMIs> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami-ebs.html Creating Amazon EBS-Backed Linux AMIs> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateImage.html>
 module Network.AWS.EC2.CreateImage
diff --git a/gen/Network/AWS/EC2/CreateInstanceExportTask.hs b/gen/Network/AWS/EC2/CreateInstanceExportTask.hs
--- a/gen/Network/AWS/EC2/CreateInstanceExportTask.hs
+++ b/gen/Network/AWS/EC2/CreateInstanceExportTask.hs
@@ -25,7 +25,7 @@
 -- | Exports a running or stopped instance to an Amazon S3 bucket.
 --
 -- For information about the supported operating systems, image formats, and
--- known limitations for the types of instances you can export, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ExportingEC2Instances.html ExportingEC2 Instances> in the /Amazon Elastic Compute Cloud User Guide/.
+-- known limitations for the types of instances you can export, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ExportingEC2Instances.html ExportingEC2 Instances> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateInstanceExportTask.html>
 module Network.AWS.EC2.CreateInstanceExportTask
diff --git a/gen/Network/AWS/EC2/CreateKeyPair.hs b/gen/Network/AWS/EC2/CreateKeyPair.hs
--- a/gen/Network/AWS/EC2/CreateKeyPair.hs
+++ b/gen/Network/AWS/EC2/CreateKeyPair.hs
@@ -32,7 +32,7 @@
 -- The key pair returned to you is available only in the region in which you
 -- create it. To create a key pair that is available in all regions, use 'ImportKeyPair'.
 --
--- For more information about key pairs, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html Key Pairs> in the /Amazon ElasticCompute Cloud User Guide/.
+-- For more information about key pairs, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html Key Pairs> in the /Amazon ElasticCompute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateKeyPair.html>
 module Network.AWS.EC2.CreateKeyPair
diff --git a/gen/Network/AWS/EC2/CreateNetworkInterface.hs b/gen/Network/AWS/EC2/CreateNetworkInterface.hs
--- a/gen/Network/AWS/EC2/CreateNetworkInterface.hs
+++ b/gen/Network/AWS/EC2/CreateNetworkInterface.hs
@@ -25,7 +25,7 @@
 -- | Creates a network interface in the specified subnet.
 --
 -- For more information about network interfaces, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html Elastic Network Interfaces>
--- in the /Amazon Elastic Compute Cloud User Guide/.
+-- in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateNetworkInterface.html>
 module Network.AWS.EC2.CreateNetworkInterface
@@ -126,7 +126,7 @@
 -- option and specify more than one private IP address using 'privateIpAddresses'.
 --
 -- The number of IP addresses you can assign to a network interface varies by
--- instance type. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI Private IP Addresses Per ENI PerInstance Type> in the /Amazon Elastic Compute Cloud User Guide/.
+-- instance type. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI Private IP Addresses Per ENI PerInstance Type> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 cniSecondaryPrivateIpAddressCount :: Lens' CreateNetworkInterface (Maybe Int)
 cniSecondaryPrivateIpAddressCount =
     lens _cniSecondaryPrivateIpAddressCount
diff --git a/gen/Network/AWS/EC2/CreatePlacementGroup.hs b/gen/Network/AWS/EC2/CreatePlacementGroup.hs
--- a/gen/Network/AWS/EC2/CreatePlacementGroup.hs
+++ b/gen/Network/AWS/EC2/CreatePlacementGroup.hs
@@ -25,7 +25,7 @@
 -- | Creates a placement group that you launch cluster instances into. You must
 -- give the group a name that's unique within the scope of your account.
 --
--- For more information about placement groups and cluster instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using_cluster_computing.html Cluster Instances> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information about placement groups and cluster instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using_cluster_computing.html Cluster Instances> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreatePlacementGroup.html>
 module Network.AWS.EC2.CreatePlacementGroup
diff --git a/gen/Network/AWS/EC2/CreateReservedInstancesListing.hs b/gen/Network/AWS/EC2/CreateReservedInstancesListing.hs
--- a/gen/Network/AWS/EC2/CreateReservedInstancesListing.hs
+++ b/gen/Network/AWS/EC2/CreateReservedInstancesListing.hs
@@ -38,7 +38,7 @@
 -- Reserved Instance listings then become available for purchase. To view the
 -- details of your Reserved Instance listing, you can use the 'DescribeReservedInstancesListings' operation.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ri-market-general.html Reserved Instance Marketplace> in the /AmazonElastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ri-market-general.html Reserved Instance Marketplace> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateReservedInstancesListing.html>
 module Network.AWS.EC2.CreateReservedInstancesListing
@@ -97,7 +97,7 @@
     }
 
 -- | Unique, case-sensitive identifier you provide to ensure idempotency of your
--- listings. This helps avoid duplicate listings. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html Ensuring Idempotency> in the /Amazon Elastic Compute Cloud User Guide/.
+-- listings. This helps avoid duplicate listings. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html Ensuring Idempotency>.
 crilClientToken :: Lens' CreateReservedInstancesListing Text
 crilClientToken = lens _crilClientToken (\s a -> s { _crilClientToken = a })
 
diff --git a/gen/Network/AWS/EC2/CreateSecurityGroup.hs b/gen/Network/AWS/EC2/CreateSecurityGroup.hs
--- a/gen/Network/AWS/EC2/CreateSecurityGroup.hs
+++ b/gen/Network/AWS/EC2/CreateSecurityGroup.hs
@@ -25,7 +25,7 @@
 -- | Creates a security group.
 --
 -- A security group is for use with instances either in the EC2-Classic
--- platform or in a specific VPC. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html Amazon EC2 SecurityGroups> in the /Amazon Elastic Compute Cloud User Guide/ and <http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_SecurityGroups.html Security Groups forYour VPC> in the /Amazon Virtual Private Cloud User Guide/.
+-- platform or in a specific VPC. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html Amazon EC2 SecurityGroups> in the /Amazon Elastic Compute Cloud User Guide for Linux/ and <http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_SecurityGroups.html SecurityGroups for Your VPC> in the /Amazon Virtual Private Cloud User Guide/.
 --
 -- EC2-Classic: You can have up to 500 security groups.
 --
diff --git a/gen/Network/AWS/EC2/CreateSnapshot.hs b/gen/Network/AWS/EC2/CreateSnapshot.hs
--- a/gen/Network/AWS/EC2/CreateSnapshot.hs
+++ b/gen/Network/AWS/EC2/CreateSnapshot.hs
@@ -48,7 +48,7 @@
 -- encrypted. Your encrypted volumes and any associated snapshots always remain
 -- protected.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AmazonEBS.html Amazon Elastic Block Store> and <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html Amazon EBSEncryption> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AmazonEBS.html Amazon Elastic Block Store> and <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html Amazon EBSEncryption> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSnapshot.html>
 module Network.AWS.EC2.CreateSnapshot
diff --git a/gen/Network/AWS/EC2/CreateSpotDatafeedSubscription.hs b/gen/Network/AWS/EC2/CreateSpotDatafeedSubscription.hs
--- a/gen/Network/AWS/EC2/CreateSpotDatafeedSubscription.hs
+++ b/gen/Network/AWS/EC2/CreateSpotDatafeedSubscription.hs
@@ -24,7 +24,7 @@
 
 -- | Creates a data feed for Spot Instances, enabling you to view Spot Instance
 -- usage logs. You can create one data feed per AWS account. For more
--- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-data-feeds.html Spot Instance Data Feed> in the /Amazon Elastic Compute CloudUser Guide/.
+-- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-data-feeds.html Spot Instance Data Feed> in the /Amazon Elastic Compute CloudUser Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSpotDatafeedSubscription.html>
 module Network.AWS.EC2.CreateSpotDatafeedSubscription
diff --git a/gen/Network/AWS/EC2/CreateTags.hs b/gen/Network/AWS/EC2/CreateTags.hs
--- a/gen/Network/AWS/EC2/CreateTags.hs
+++ b/gen/Network/AWS/EC2/CreateTags.hs
@@ -26,7 +26,7 @@
 -- resources. Each resource can have a maximum of 10 tags. Each tag consists of
 -- a key and optional value. Tag keys must be unique per resource.
 --
--- For more information about tags, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html Tagging Your Resources> in the /AmazonElastic Compute Cloud User Guide/.
+-- For more information about tags, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html Tagging Your Resources> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateTags.html>
 module Network.AWS.EC2.CreateTags
diff --git a/gen/Network/AWS/EC2/CreateVolume.hs b/gen/Network/AWS/EC2/CreateVolume.hs
--- a/gen/Network/AWS/EC2/CreateVolume.hs
+++ b/gen/Network/AWS/EC2/CreateVolume.hs
@@ -33,9 +33,9 @@
 -- You can create encrypted volumes with the 'Encrypted' parameter. Encrypted
 -- volumes may only be attached to instances that support Amazon EBS encryption.
 -- Volumes that are created from encrypted snapshots are also automatically
--- encrypted. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html Amazon EBS Encryption> in the /AmazonElastic Compute Cloud User Guide/.
+-- encrypted. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html Amazon EBS Encryption> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-creating-volume.html Creating or Restoring an Amazon EBS Volume> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-creating-volume.html Creating or Restoring an Amazon EBS Volume> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateVolume.html>
 module Network.AWS.EC2.CreateVolume
@@ -135,12 +135,15 @@
 -- Volumes that are created from encrypted snapshots are automatically
 -- encrypted. There is no way to create an encrypted volume from an unencrypted
 -- snapshot or vice versa. If your AMI uses encrypted volumes, you can only
--- launch it on supported instance types. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html Amazon EBSEncryption> in the /Amazon Elastic Compute Cloud User Guide/.
+-- launch it on supported instance types. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html Amazon EBSEncryption> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 cv1Encrypted :: Lens' CreateVolume (Maybe Bool)
 cv1Encrypted = lens _cv1Encrypted (\s a -> s { _cv1Encrypted = a })
 
 -- | Only valid for Provisioned IOPS (SSD) volumes. The number of I/O operations
--- per second (IOPS) to provision for the volume.
+-- per second (IOPS) to provision for the volume, with a maximum ratio of 30
+-- IOPS/GiB.
+--
+-- Constraint: Range is 100 to 20000 for Provisioned IOPS (SSD) volumes
 cv1Iops :: Lens' CreateVolume (Maybe Int)
 cv1Iops = lens _cv1Iops (\s a -> s { _cv1Iops = a })
 
@@ -154,10 +157,8 @@
 
 -- | The size of the volume, in GiBs.
 --
--- Constraints: If the volume type is 'io1', the minimum size of the volume is 4
--- GiB; otherwise, the minimum size is 1 GiB. The maximum volume size is 1024
--- GiB. If you specify a snapshot, the volume size must be equal to or larger
--- than the snapshot size.
+-- Constraints: '1-1024' for 'standard' volumes, '1-16384' for 'gp2' volumes, and '4-16384' for 'io1' volumes. If you specify a snapshot, the volume size must be equal to
+-- or larger than the snapshot size.
 --
 -- Default: If you're creating the volume from a snapshot and don't specify a
 -- volume size, the default is the snapshot size.
@@ -263,10 +264,10 @@
 -- provisioned for the volume. For General Purpose (SSD) volumes, this
 -- represents the baseline performance of the volume and the rate at which the
 -- volume accumulates I/O credits for bursting. For more information on General
--- Purpose (SSD) baseline performance, I/O credits, and bursting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html Amazon EBSVolume Types> in the /Amazon Elastic Compute Cloud User Guide/.
+-- Purpose (SSD) baseline performance, I/O credits, and bursting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html Amazon EBSVolume Types> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
--- Constraint: Range is 100 to 4000 for Provisioned IOPS (SSD) volumes and 3 to
--- 3072 for General Purpose (SSD) volumes.
+-- Constraint: Range is 100 to 20000 for Provisioned IOPS (SSD) volumes and 3
+-- to 10000 for General Purpose (SSD) volumes.
 --
 -- Condition: This parameter is required for requests to create 'io1' volumes; it
 -- is not used in requests to create 'standard' or 'gp2' volumes.
diff --git a/gen/Network/AWS/EC2/DeletePlacementGroup.hs b/gen/Network/AWS/EC2/DeletePlacementGroup.hs
--- a/gen/Network/AWS/EC2/DeletePlacementGroup.hs
+++ b/gen/Network/AWS/EC2/DeletePlacementGroup.hs
@@ -24,7 +24,7 @@
 
 -- | Deletes the specified placement group. You must terminate all instances in
 -- the placement group before you can delete the placement group. For more
--- information about placement groups and cluster instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using_cluster_computing.html ClusterInstances> in the /Amazon Elastic Compute Cloud User Guide/.
+-- information about placement groups and cluster instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using_cluster_computing.html ClusterInstances> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeletePlacementGroup.html>
 module Network.AWS.EC2.DeletePlacementGroup
diff --git a/gen/Network/AWS/EC2/DeleteSnapshot.hs b/gen/Network/AWS/EC2/DeleteSnapshot.hs
--- a/gen/Network/AWS/EC2/DeleteSnapshot.hs
+++ b/gen/Network/AWS/EC2/DeleteSnapshot.hs
@@ -35,7 +35,7 @@
 -- by a registered AMI. You must first de-register the AMI before you can delete
 -- the snapshot.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-deleting-snapshot.html Deleting an Amazon EBS Snapshot> in the /AmazonElastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-deleting-snapshot.html Deleting an Amazon EBS Snapshot> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteSnapshot.html>
 module Network.AWS.EC2.DeleteSnapshot
diff --git a/gen/Network/AWS/EC2/DeleteSpotDatafeedSubscription.hs b/gen/Network/AWS/EC2/DeleteSpotDatafeedSubscription.hs
--- a/gen/Network/AWS/EC2/DeleteSpotDatafeedSubscription.hs
+++ b/gen/Network/AWS/EC2/DeleteSpotDatafeedSubscription.hs
@@ -22,7 +22,7 @@
 --
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
--- | Deletes the data feed for Spot Instances. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-data-feeds.html SpotInstance Data Feed> in the /Amazon Elastic Compute Cloud User Guide/.
+-- | Deletes the data feed for Spot Instances. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-data-feeds.html SpotInstance Data Feed> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteSpotDatafeedSubscription.html>
 module Network.AWS.EC2.DeleteSpotDatafeedSubscription
diff --git a/gen/Network/AWS/EC2/DeleteTags.hs b/gen/Network/AWS/EC2/DeleteTags.hs
--- a/gen/Network/AWS/EC2/DeleteTags.hs
+++ b/gen/Network/AWS/EC2/DeleteTags.hs
@@ -25,7 +25,7 @@
 -- | Deletes the specified set of tags from the specified set of resources. This
 -- call is designed to follow a 'DescribeTags' request.
 --
--- For more information about tags, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html Tagging Your Resources> in the /AmazonElastic Compute Cloud User Guide/.
+-- For more information about tags, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html Tagging Your Resources> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteTags.html>
 module Network.AWS.EC2.DeleteTags
diff --git a/gen/Network/AWS/EC2/DeleteVolume.hs b/gen/Network/AWS/EC2/DeleteVolume.hs
--- a/gen/Network/AWS/EC2/DeleteVolume.hs
+++ b/gen/Network/AWS/EC2/DeleteVolume.hs
@@ -27,7 +27,7 @@
 --
 -- The volume may remain in the 'deleting' state for several minutes.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-deleting-volume.html Deleting an Amazon EBS Volume> in the /AmazonElastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-deleting-volume.html Deleting an Amazon EBS Volume> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteVolume.html>
 module Network.AWS.EC2.DeleteVolume
diff --git a/gen/Network/AWS/EC2/DescribeAddresses.hs b/gen/Network/AWS/EC2/DescribeAddresses.hs
--- a/gen/Network/AWS/EC2/DescribeAddresses.hs
+++ b/gen/Network/AWS/EC2/DescribeAddresses.hs
@@ -25,7 +25,7 @@
 -- | Describes one or more of your Elastic IP addresses.
 --
 -- An Elastic IP address is for use in either the EC2-Classic platform or in a
--- VPC. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html Elastic IP Addresses> in the /Amazon ElasticCompute Cloud User Guide/.
+-- VPC. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html Elastic IP Addresses> in the /Amazon ElasticCompute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeAddresses.html>
 module Network.AWS.EC2.DescribeAddresses
diff --git a/gen/Network/AWS/EC2/DescribeAvailabilityZones.hs b/gen/Network/AWS/EC2/DescribeAvailabilityZones.hs
--- a/gen/Network/AWS/EC2/DescribeAvailabilityZones.hs
+++ b/gen/Network/AWS/EC2/DescribeAvailabilityZones.hs
@@ -27,7 +27,7 @@
 -- there is an event impacting an Availability Zone, you can use this request to
 -- view the state and any provided message for that Availability Zone.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html Regions and Availability Zones> in the /AmazonElastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html Regions and Availability Zones> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeAvailabilityZones.html>
 module Network.AWS.EC2.DescribeAvailabilityZones
diff --git a/gen/Network/AWS/EC2/DescribeClassicLinkInstances.hs b/gen/Network/AWS/EC2/DescribeClassicLinkInstances.hs
--- a/gen/Network/AWS/EC2/DescribeClassicLinkInstances.hs
+++ b/gen/Network/AWS/EC2/DescribeClassicLinkInstances.hs
@@ -120,17 +120,18 @@
 dcliInstanceIds :: Lens' DescribeClassicLinkInstances [Text]
 dcliInstanceIds = lens _dcliInstanceIds (\s a -> s { _dcliInstanceIds = a }) . _List
 
--- | The maximum number of items to return for this request. The request returns
--- a token that you can specify in a subsequent call to get the next set of
--- results. You cannot specify this parameter and the instance IDs parameter in
+-- | The maximum number of results to return for the request in a single page. The
+-- remaining results of the initial request can be seen by sending another
+-- request with the returned 'NextToken' value. This value can be between 5 and
+-- 1000; if 'MaxResults' is given a value larger than 1000, only 1000 results are
+-- returned. You cannot specify this parameter and the instance IDs parameter in
 -- the same request.
 --
 -- Constraint: If the value is greater than 1000, we return only 1000 items.
 dcliMaxResults :: Lens' DescribeClassicLinkInstances (Maybe Int)
 dcliMaxResults = lens _dcliMaxResults (\s a -> s { _dcliMaxResults = a })
 
--- | The token for the next set of items to return. (You received this token from
--- a prior call.)
+-- | The token to retrieve the next page of results.
 dcliNextToken :: Lens' DescribeClassicLinkInstances (Maybe Text)
 dcliNextToken = lens _dcliNextToken (\s a -> s { _dcliNextToken = a })
 
@@ -157,8 +158,8 @@
 dclirInstances :: Lens' DescribeClassicLinkInstancesResponse [ClassicLinkInstance]
 dclirInstances = lens _dclirInstances (\s a -> s { _dclirInstances = a }) . _List
 
--- | The token to use when requesting the next set of items. If there are no
--- additional items to return, the string is empty.
+-- | The token to use to retrieve the next page of results. This value is 'null'
+-- when there are no more results to return.
 dclirNextToken :: Lens' DescribeClassicLinkInstancesResponse (Maybe Text)
 dclirNextToken = lens _dclirNextToken (\s a -> s { _dclirNextToken = a })
 
diff --git a/gen/Network/AWS/EC2/DescribeConversionTasks.hs b/gen/Network/AWS/EC2/DescribeConversionTasks.hs
--- a/gen/Network/AWS/EC2/DescribeConversionTasks.hs
+++ b/gen/Network/AWS/EC2/DescribeConversionTasks.hs
@@ -22,7 +22,7 @@
 --
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
--- | Describes one or more of your conversion tasks. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UploadingYourInstancesandVolumes.html Using the Command Line Tools to Import Your Virtual Machine to Amazon EC2> in the /Amazon Elastic Compute Cloud User Guide/.
+-- | Describes one or more of your conversion tasks. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UploadingYourInstancesandVolumes.html Using the Command Line Tools to Import Your Virtual Machine to Amazon EC2> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeConversionTasks.html>
 module Network.AWS.EC2.DescribeConversionTasks
diff --git a/gen/Network/AWS/EC2/DescribeInstanceAttribute.hs b/gen/Network/AWS/EC2/DescribeInstanceAttribute.hs
--- a/gen/Network/AWS/EC2/DescribeInstanceAttribute.hs
+++ b/gen/Network/AWS/EC2/DescribeInstanceAttribute.hs
@@ -219,7 +219,7 @@
 diar1RamdiskId :: Lens' DescribeInstanceAttributeResponse (Maybe AttributeValue)
 diar1RamdiskId = lens _diar1RamdiskId (\s a -> s { _diar1RamdiskId = a })
 
--- | The name of the root device (for example, '/dev/sda1').
+-- | The name of the root device (for example, '/dev/sda1' or '/dev/xvda').
 diar1RootDeviceName :: Lens' DescribeInstanceAttributeResponse (Maybe AttributeValue)
 diar1RootDeviceName =
     lens _diar1RootDeviceName (\s a -> s { _diar1RootDeviceName = a })
diff --git a/gen/Network/AWS/EC2/DescribeInstanceStatus.hs b/gen/Network/AWS/EC2/DescribeInstanceStatus.hs
--- a/gen/Network/AWS/EC2/DescribeInstanceStatus.hs
+++ b/gen/Network/AWS/EC2/DescribeInstanceStatus.hs
@@ -76,7 +76,8 @@
 -- you can do so manually. You can also avoid retirement of EBS-backed instances
 -- by manually restarting your instance when its event code is 'instance-retirement'. This ensures that your instance is started on a different underlying host.
 --
--- For more information about failed status checks, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstances.html TroubleshootingInstances with Failed Status Checks> in the /Amazon Elastic Compute Cloud UserGuide/. For more information about working with scheduled events, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/monitoring-instances-status-check_sched.html#schedevents_actions Workingwith an Instance That Has a Scheduled Event> in the /Amazon Elastic ComputeCloud User Guide/.
+-- For more information about failed status checks, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstances.html TroubleshootingInstances with Failed Status Checks> in the /Amazon Elastic Compute Cloud UserGuide for Linux/. For more information about working with scheduled events,
+-- see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/monitoring-instances-status-check_sched.html#schedevents_actions Working with an Instance That Has a Scheduled Event> in the /Amazon ElasticCompute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstanceStatus.html>
 module Network.AWS.EC2.DescribeInstanceStatus
@@ -196,18 +197,16 @@
 disInstanceIds :: Lens' DescribeInstanceStatus [Text]
 disInstanceIds = lens _disInstanceIds (\s a -> s { _disInstanceIds = a }) . _List
 
--- | The maximum number of paginated instance items per response. The call also
--- returns a token that you can specify in a subsequent call to get the next set
--- of results. If the value is greater than 1000, we return only 1000 items. You
--- cannot specify this parameter and the instance IDs parameter in the same
--- request.
---
--- Default: 1000
+-- | The maximum number of results to return for the request in a single page. The
+-- remaining results of the initial request can be seen by sending another
+-- request with the returned 'NextToken' value. This value can be between 5 and
+-- 1000; if 'MaxResults' is given a value larger than 1000, only 1000 results are
+-- returned. You cannot specify this parameter and the instance IDs parameter in
+-- the same request.
 disMaxResults :: Lens' DescribeInstanceStatus (Maybe Int)
 disMaxResults = lens _disMaxResults (\s a -> s { _disMaxResults = a })
 
--- | The next paginated set of results to return. (You received this token from a
--- prior call.)
+-- | The token to retrieve the next page of results.
 disNextToken :: Lens' DescribeInstanceStatus (Maybe Text)
 disNextToken = lens _disNextToken (\s a -> s { _disNextToken = a })
 
@@ -236,7 +235,8 @@
     lens _disrInstanceStatuses (\s a -> s { _disrInstanceStatuses = a })
         . _List
 
--- | The next paginated set of results to return.
+-- | The token to use to retrieve the next page of results. This value is 'null'
+-- when there are no more results to return.
 disrNextToken :: Lens' DescribeInstanceStatusResponse (Maybe Text)
 disrNextToken = lens _disrNextToken (\s a -> s { _disrNextToken = a })
 
diff --git a/gen/Network/AWS/EC2/DescribeInstances.hs b/gen/Network/AWS/EC2/DescribeInstances.hs
--- a/gen/Network/AWS/EC2/DescribeInstances.hs
+++ b/gen/Network/AWS/EC2/DescribeInstances.hs
@@ -108,7 +108,7 @@
 -- whether the Amazon EBS volume is deleted on instance termination.
 --
 -- 'block-device-mapping.device-name' - The device name for the Amazon EBS
--- volume (for example, '/dev/sdh').
+-- volume (for example, '/dev/sdh' or 'xvdh').
 --
 -- 'block-device-mapping.status' - The status for the Amazon EBS volume ('attaching' | 'attached' | 'detaching' | 'detached').
 --
@@ -143,7 +143,7 @@
 --
 -- 'instance-state-name' - The state of the instance ('pending' | 'running' | 'shutting-down' | 'terminated' | 'stopping' | 'stopped').
 --
--- 'instance-type' - The type of instance (for example, 'm1.small').
+-- 'instance-type' - The type of instance (for example, 't2.micro').
 --
 -- 'instance.group-id' - The ID of the security group for the instance.
 --
@@ -197,7 +197,7 @@
 -- get one reservation ID.
 --
 -- 'root-device-name' - The name of the root device for the instance (for
--- example, '/dev/sda1').
+-- example, '/dev/sda1' or '/dev/xvda').
 --
 -- 'root-device-type' - The type of root device that the instance uses ('ebs' | 'instance-store').
 --
@@ -262,7 +262,7 @@
 -- 'network-interface-private-dns-name' - The private DNS name of the network
 -- interface.
 --
--- 'network-interface.source-destination-check' - Whether the network interface
+-- 'network-interface.source-dest-check' - Whether the network interface
 -- performs source/destination checking. A value of 'true' means checking is
 -- enabled, and 'false' means checking is disabled. The value must be 'false' for
 -- the network interface to perform network address translation (NAT) in your
@@ -328,16 +328,16 @@
 di1InstanceIds :: Lens' DescribeInstances [Text]
 di1InstanceIds = lens _di1InstanceIds (\s a -> s { _di1InstanceIds = a }) . _List
 
--- | The maximum number of items to return for this call. The call also returns a
--- token that you can specify in a subsequent call to get the next set of
--- results. If the value is greater than 1000, we return only 1000 items. You
--- cannot specify this parameter and the instance IDs parameter in the same
--- request.
+-- | The maximum number of results to return for the request in a single page. The
+-- remaining results of the initial request can be seen by sending another
+-- request with the returned 'NextToken' value. This value can be between 5 and
+-- 1000; if 'MaxResults' is given a value larger than 1000, only 1000 results are
+-- returned. You cannot specify this parameter and the instance IDs parameter in
+-- the same request.
 di1MaxResults :: Lens' DescribeInstances (Maybe Int)
 di1MaxResults = lens _di1MaxResults (\s a -> s { _di1MaxResults = a })
 
--- | The token for the next set of items to return. (You received this token from
--- a prior call.)
+-- | The token to request the next page of results.
 di1NextToken :: Lens' DescribeInstances (Maybe Text)
 di1NextToken = lens _di1NextToken (\s a -> s { _di1NextToken = a })
 
@@ -360,8 +360,8 @@
     , _dirNextToken    = Nothing
     }
 
--- | The token to use when requesting the next set of items. If there are no
--- additional items to return, the string is empty.
+-- | The token to use to retrieve the next page of results. This value is 'null'
+-- when there are no more results to return.
 dirNextToken :: Lens' DescribeInstancesResponse (Maybe Text)
 dirNextToken = lens _dirNextToken (\s a -> s { _dirNextToken = a })
 
diff --git a/gen/Network/AWS/EC2/DescribeKeyPairs.hs b/gen/Network/AWS/EC2/DescribeKeyPairs.hs
--- a/gen/Network/AWS/EC2/DescribeKeyPairs.hs
+++ b/gen/Network/AWS/EC2/DescribeKeyPairs.hs
@@ -24,7 +24,7 @@
 
 -- | Describes one or more of your key pairs.
 --
--- For more information about key pairs, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html Key Pairs> in the /Amazon ElasticCompute Cloud User Guide/.
+-- For more information about key pairs, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html Key Pairs> in the /Amazon ElasticCompute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeKeyPairs.html>
 module Network.AWS.EC2.DescribeKeyPairs
diff --git a/gen/Network/AWS/EC2/DescribePlacementGroups.hs b/gen/Network/AWS/EC2/DescribePlacementGroups.hs
--- a/gen/Network/AWS/EC2/DescribePlacementGroups.hs
+++ b/gen/Network/AWS/EC2/DescribePlacementGroups.hs
@@ -23,7 +23,7 @@
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Describes one or more of your placement groups. For more information about
--- placement groups and cluster instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using_cluster_computing.html Cluster Instances> in the /AmazonElastic Compute Cloud User Guide/.
+-- placement groups and cluster instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using_cluster_computing.html Cluster Instances> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribePlacementGroups.html>
 module Network.AWS.EC2.DescribePlacementGroups
diff --git a/gen/Network/AWS/EC2/DescribeReservedInstances.hs b/gen/Network/AWS/EC2/DescribeReservedInstances.hs
--- a/gen/Network/AWS/EC2/DescribeReservedInstances.hs
+++ b/gen/Network/AWS/EC2/DescribeReservedInstances.hs
@@ -24,7 +24,7 @@
 
 -- | Describes one or more of the Reserved Instances that you purchased.
 --
--- For more information about Reserved Instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/concepts-on-demand-reserved-instances.html Reserved Instances> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information about Reserved Instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/concepts-on-demand-reserved-instances.html Reserved Instances> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstances.html>
 module Network.AWS.EC2.DescribeReservedInstances
diff --git a/gen/Network/AWS/EC2/DescribeReservedInstancesListings.hs b/gen/Network/AWS/EC2/DescribeReservedInstancesListings.hs
--- a/gen/Network/AWS/EC2/DescribeReservedInstancesListings.hs
+++ b/gen/Network/AWS/EC2/DescribeReservedInstancesListings.hs
@@ -42,7 +42,7 @@
 -- until your demand is met. You are charged based on the total price of all of
 -- the listings that you purchase.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ri-market-general.html Reserved Instance Marketplace> in the /AmazonElastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ri-market-general.html Reserved Instance Marketplace> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstancesListings.html>
 module Network.AWS.EC2.DescribeReservedInstancesListings
diff --git a/gen/Network/AWS/EC2/DescribeReservedInstancesModifications.hs b/gen/Network/AWS/EC2/DescribeReservedInstancesModifications.hs
--- a/gen/Network/AWS/EC2/DescribeReservedInstancesModifications.hs
+++ b/gen/Network/AWS/EC2/DescribeReservedInstancesModifications.hs
@@ -28,7 +28,7 @@
 -- about the specific modification is returned.
 --
 -- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ri-modifying.html Modifying Reserved Instances> in the Amazon Elastic
--- Compute Cloud User Guide.
+-- Compute Cloud User Guide for Linux.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstancesModifications.html>
 module Network.AWS.EC2.DescribeReservedInstancesModifications
@@ -117,7 +117,7 @@
 drimFilters :: Lens' DescribeReservedInstancesModifications [Filter]
 drimFilters = lens _drimFilters (\s a -> s { _drimFilters = a }) . _List
 
--- | The token for the next page of data.
+-- | The token to retrieve the next page of results.
 drimNextToken :: Lens' DescribeReservedInstancesModifications (Maybe Text)
 drimNextToken = lens _drimNextToken (\s a -> s { _drimNextToken = a })
 
@@ -147,7 +147,8 @@
     , _drimrNextToken                      = Nothing
     }
 
--- | The token for the next page of data.
+-- | The token to use to retrieve the next page of results. This value is 'null'
+-- when there are no more results to return.
 drimrNextToken :: Lens' DescribeReservedInstancesModificationsResponse (Maybe Text)
 drimrNextToken = lens _drimrNextToken (\s a -> s { _drimrNextToken = a })
 
diff --git a/gen/Network/AWS/EC2/DescribeReservedInstancesOfferings.hs b/gen/Network/AWS/EC2/DescribeReservedInstancesOfferings.hs
--- a/gen/Network/AWS/EC2/DescribeReservedInstancesOfferings.hs
+++ b/gen/Network/AWS/EC2/DescribeReservedInstancesOfferings.hs
@@ -28,7 +28,7 @@
 -- errors, and you pay a lower usage rate than the rate charged for On-Demand
 -- instances for the actual time used.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ri-market-general.html Reserved Instance Marketplace> in the /AmazonElastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ri-market-general.html Reserved Instance Marketplace> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstancesOfferings.html>
 module Network.AWS.EC2.DescribeReservedInstancesOfferings
@@ -185,8 +185,7 @@
     lens _drioInstanceTenancy (\s a -> s { _drioInstanceTenancy = a })
 
 -- | The instance type on which the Reserved Instance can be used. For more
--- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html Instance Types> in the /Amazon Elastic Compute Cloud User Guide/
--- .
+-- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html Instance Types> in the /Amazon Elastic Compute Cloud UserGuide for Linux/.
 drioInstanceType :: Lens' DescribeReservedInstancesOfferings (Maybe InstanceType)
 drioInstanceType = lens _drioInstanceType (\s a -> s { _drioInstanceType = a })
 
@@ -203,7 +202,9 @@
 drioMaxInstanceCount =
     lens _drioMaxInstanceCount (\s a -> s { _drioMaxInstanceCount = a })
 
--- | The maximum number of offerings to return. The maximum is 100.
+-- | The maximum number of results to return for the request in a single page. The
+-- remaining results of the initial request can be seen by sending another
+-- request with the returned 'NextToken' value. The maximum is 100.
 --
 -- Default: 100
 drioMaxResults :: Lens' DescribeReservedInstancesOfferings (Maybe Int)
@@ -215,7 +216,7 @@
 drioMinDuration :: Lens' DescribeReservedInstancesOfferings (Maybe Integer)
 drioMinDuration = lens _drioMinDuration (\s a -> s { _drioMinDuration = a })
 
--- | The token to use when requesting the next paginated set of offerings.
+-- | The token to retrieve the next page of results.
 drioNextToken :: Lens' DescribeReservedInstancesOfferings (Maybe Text)
 drioNextToken = lens _drioNextToken (\s a -> s { _drioNextToken = a })
 
@@ -257,7 +258,8 @@
     , _driorNextToken                  = Nothing
     }
 
--- | The next paginated set of results to return.
+-- | The token to use to retrieve the next page of results. This value is 'null'
+-- when there are no more results to return.
 driorNextToken :: Lens' DescribeReservedInstancesOfferingsResponse (Maybe Text)
 driorNextToken = lens _driorNextToken (\s a -> s { _driorNextToken = a })
 
diff --git a/gen/Network/AWS/EC2/DescribeSecurityGroups.hs b/gen/Network/AWS/EC2/DescribeSecurityGroups.hs
--- a/gen/Network/AWS/EC2/DescribeSecurityGroups.hs
+++ b/gen/Network/AWS/EC2/DescribeSecurityGroups.hs
@@ -25,7 +25,7 @@
 -- | Describes one or more of your security groups.
 --
 -- A security group is for use with instances either in the EC2-Classic
--- platform or in a specific VPC. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html Amazon EC2 SecurityGroups> in the /Amazon Elastic Compute Cloud User Guide/ and <http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_SecurityGroups.html Security Groups forYour VPC> in the /Amazon Virtual Private Cloud User Guide/.
+-- platform or in a specific VPC. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html Amazon EC2 SecurityGroups> in the /Amazon Elastic Compute Cloud User Guide for Linux/ and <http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_SecurityGroups.html SecurityGroups for Your VPC> in the /Amazon Virtual Private Cloud User Guide/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSecurityGroups.html>
 module Network.AWS.EC2.DescribeSecurityGroups
diff --git a/gen/Network/AWS/EC2/DescribeSnapshotAttribute.hs b/gen/Network/AWS/EC2/DescribeSnapshotAttribute.hs
--- a/gen/Network/AWS/EC2/DescribeSnapshotAttribute.hs
+++ b/gen/Network/AWS/EC2/DescribeSnapshotAttribute.hs
@@ -26,7 +26,7 @@
 -- only one attribute at a time.
 --
 -- For more information about Amazon EBS snapshots, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSSnapshots.html Amazon EBS Snapshots> in
--- the /Amazon Elastic Compute Cloud User Guide/.
+-- the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSnapshotAttribute.html>
 module Network.AWS.EC2.DescribeSnapshotAttribute
diff --git a/gen/Network/AWS/EC2/DescribeSnapshots.hs b/gen/Network/AWS/EC2/DescribeSnapshots.hs
--- a/gen/Network/AWS/EC2/DescribeSnapshots.hs
+++ b/gen/Network/AWS/EC2/DescribeSnapshots.hs
@@ -58,7 +58,7 @@
 -- retrieve the remaining results.
 --
 -- For more information about Amazon EBS snapshots, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSSnapshots.html Amazon EBS Snapshots> in
--- the /Amazon Elastic Compute Cloud User Guide/.
+-- the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSnapshots.html>
 module Network.AWS.EC2.DescribeSnapshots
diff --git a/gen/Network/AWS/EC2/DescribeSpotDatafeedSubscription.hs b/gen/Network/AWS/EC2/DescribeSpotDatafeedSubscription.hs
--- a/gen/Network/AWS/EC2/DescribeSpotDatafeedSubscription.hs
+++ b/gen/Network/AWS/EC2/DescribeSpotDatafeedSubscription.hs
@@ -22,7 +22,7 @@
 --
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
--- | Describes the data feed for Spot Instances. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-data-feeds.html SpotInstance Data Feed> in the /Amazon Elastic Compute Cloud User Guide/.
+-- | Describes the data feed for Spot Instances. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-data-feeds.html SpotInstance Data Feed> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSpotDatafeedSubscription.html>
 module Network.AWS.EC2.DescribeSpotDatafeedSubscription
diff --git a/gen/Network/AWS/EC2/DescribeSpotInstanceRequests.hs b/gen/Network/AWS/EC2/DescribeSpotInstanceRequests.hs
--- a/gen/Network/AWS/EC2/DescribeSpotInstanceRequests.hs
+++ b/gen/Network/AWS/EC2/DescribeSpotInstanceRequests.hs
@@ -26,7 +26,7 @@
 -- Instances are instances that Amazon EC2 launches when the bid price that you
 -- specify exceeds the current Spot Price. Amazon EC2 periodically sets the Spot
 -- Price based on available Spot Instance capacity and current Spot Instance
--- requests. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-requests.html Spot Instance Requests> in the /AmazonElastic Compute Cloud User Guide/.
+-- requests. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-requests.html Spot Instance Requests> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- You can use 'DescribeSpotInstanceRequests' to find a running Spot Instance by
 -- examining the response. If the status of the Spot Instance is 'fulfilled', the
@@ -163,7 +163,7 @@
 --
 -- 'state' - The state of the Spot Instance request ('open' | 'active' | 'closed' | 'cancelled' | 'failed'). Spot bid status information can help you track your Amazon EC2
 -- Spot Instance requests. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-bid-status.html Spot Bid Status> in the
--- Amazon Elastic Compute Cloud User Guide.
+-- Amazon Elastic Compute Cloud User Guide for Linux.
 --
 -- 'status-code' - The short code describing the most recent evaluation of your
 -- Spot Instance request.
diff --git a/gen/Network/AWS/EC2/DescribeSpotPriceHistory.hs b/gen/Network/AWS/EC2/DescribeSpotPriceHistory.hs
--- a/gen/Network/AWS/EC2/DescribeSpotPriceHistory.hs
+++ b/gen/Network/AWS/EC2/DescribeSpotPriceHistory.hs
@@ -24,7 +24,7 @@
 
 -- | Describes the Spot Price history. The prices returned are listed in
 -- chronological order, from the oldest to the most recent, for up to the past
--- 90 days. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-spot-instances-history.html Spot Instance Pricing History> in the /Amazon Elastic Compute Cloud User Guide/.
+-- 90 days. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-spot-instances-history.html Spot Instance Pricing History> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- When you specify a start and end time, this operation returns the prices of
 -- the instance types within the time range that you specified and the time when
@@ -149,14 +149,15 @@
     lens _dsphInstanceTypes (\s a -> s { _dsphInstanceTypes = a })
         . _List
 
--- | The maximum number of items to return for this call. The call also returns a
--- token that you can specify in a subsequent call to get the next set of
--- results.
+-- | The maximum number of results to return for the request in a single page. The
+-- remaining results of the initial request can be seen by sending another
+-- request with the returned 'NextToken' value. This value can be between 5 and
+-- 1000; if 'MaxResults' is given a value larger than 1000, only 1000 results are
+-- returned.
 dsphMaxResults :: Lens' DescribeSpotPriceHistory (Maybe Int)
 dsphMaxResults = lens _dsphMaxResults (\s a -> s { _dsphMaxResults = a })
 
--- | The token for the next set of items. (You received this token from a prior
--- call.)
+-- | The token to retrieve the next page of results.
 dsphNextToken :: Lens' DescribeSpotPriceHistory (Maybe Text)
 dsphNextToken = lens _dsphNextToken (\s a -> s { _dsphNextToken = a })
 
@@ -190,8 +191,8 @@
     , _dsphrNextToken        = Nothing
     }
 
--- | The token to use when requesting the next set of items. If there are no
--- additional items to return, the string is empty.
+-- | The token to use to retrieve the next page of results. This value is 'null'
+-- when there are no more results to return.
 dsphrNextToken :: Lens' DescribeSpotPriceHistoryResponse (Maybe Text)
 dsphrNextToken = lens _dsphrNextToken (\s a -> s { _dsphrNextToken = a })
 
diff --git a/gen/Network/AWS/EC2/DescribeTags.hs b/gen/Network/AWS/EC2/DescribeTags.hs
--- a/gen/Network/AWS/EC2/DescribeTags.hs
+++ b/gen/Network/AWS/EC2/DescribeTags.hs
@@ -24,7 +24,7 @@
 
 -- | Describes one or more of the tags for your EC2 resources.
 --
--- For more information about tags, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html Tagging Your Resources> in the /AmazonElastic Compute Cloud User Guide/.
+-- For more information about tags, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html Tagging Your Resources> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeTags.html>
 module Network.AWS.EC2.DescribeTags
@@ -99,14 +99,15 @@
 dtFilters :: Lens' DescribeTags [Filter]
 dtFilters = lens _dtFilters (\s a -> s { _dtFilters = a }) . _List
 
--- | The maximum number of items to return for this call. The call also returns a
--- token that you can specify in a subsequent call to get the next set of
--- results. If the value is greater than 1000, we return only 1000 items.
+-- | The maximum number of results to return for the request in a single page. The
+-- remaining results of the initial request can be seen by sending another
+-- request with the returned 'NextToken' value. This value can be between 5 and
+-- 1000; if 'MaxResults' is given a value larger than 1000, only 1000 results are
+-- returned.
 dtMaxResults :: Lens' DescribeTags (Maybe Int)
 dtMaxResults = lens _dtMaxResults (\s a -> s { _dtMaxResults = a })
 
--- | The token for the next set of items to return. (You received this token from
--- a prior call.)
+-- | The token to retrieve the next page of results.
 dtNextToken :: Lens' DescribeTags (Maybe Text)
 dtNextToken = lens _dtNextToken (\s a -> s { _dtNextToken = a })
 
@@ -129,8 +130,8 @@
     , _dtrNextToken = Nothing
     }
 
--- | The token to use when requesting the next set of items. If there are no
--- additional items to return, the string is empty.
+-- | The token to use to retrieve the next page of results. This value is 'null'
+-- when there are no more results to return..
 dtrNextToken :: Lens' DescribeTagsResponse (Maybe Text)
 dtrNextToken = lens _dtrNextToken (\s a -> s { _dtrNextToken = a })
 
diff --git a/gen/Network/AWS/EC2/DescribeVolumeAttribute.hs b/gen/Network/AWS/EC2/DescribeVolumeAttribute.hs
--- a/gen/Network/AWS/EC2/DescribeVolumeAttribute.hs
+++ b/gen/Network/AWS/EC2/DescribeVolumeAttribute.hs
@@ -25,7 +25,7 @@
 -- | Describes the specified attribute of the specified volume. You can specify
 -- only one attribute at a time.
 --
--- For more information about Amazon EBS volumes, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumes.html Amazon EBS Volumes> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information about Amazon EBS volumes, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumes.html Amazon EBS Volumes> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVolumeAttribute.html>
 module Network.AWS.EC2.DescribeVolumeAttribute
diff --git a/gen/Network/AWS/EC2/DescribeVolumeStatus.hs b/gen/Network/AWS/EC2/DescribeVolumeStatus.hs
--- a/gen/Network/AWS/EC2/DescribeVolumeStatus.hs
+++ b/gen/Network/AWS/EC2/DescribeVolumeStatus.hs
@@ -154,13 +154,21 @@
 dvsFilters :: Lens' DescribeVolumeStatus [Filter]
 dvsFilters = lens _dvsFilters (\s a -> s { _dvsFilters = a }) . _List
 
--- | The maximum number of paginated volume items per response. You cannot specify
--- this parameter and the volume IDs parameter in the same request.
+-- | The maximum number of volume results returned by 'DescribeVolumeStatus' in
+-- paginated output. When this parameter is used, the request only returns 'MaxResults' results in a single page along with a 'NextToken' response element. The
+-- remaining results of the initial request can be seen by sending another
+-- request with the returned 'NextToken' value. This value can be between 5 and
+-- 1000; if 'MaxResults' is given a value larger than 1000, only 1000 results are
+-- returned. If this parameter is not used, then 'DescribeVolumeStatus' returns
+-- all results. You cannot specify this parameter and the volume IDs parameter
+-- in the same request.
 dvsMaxResults :: Lens' DescribeVolumeStatus (Maybe Int)
 dvsMaxResults = lens _dvsMaxResults (\s a -> s { _dvsMaxResults = a })
 
--- | The next paginated set of results to return using the pagination token
--- returned by a previous call.
+-- | The 'NextToken' value to include in a future 'DescribeVolumeStatus' request. When
+-- the results of the request exceed 'MaxResults', this value can be used to
+-- retrieve the next page of results. This value is 'null' when there are no more
+-- results to return.
 dvsNextToken :: Lens' DescribeVolumeStatus (Maybe Text)
 dvsNextToken = lens _dvsNextToken (\s a -> s { _dvsNextToken = a })
 
@@ -189,7 +197,8 @@
     , _dvsrNextToken      = Nothing
     }
 
--- | The next paginated set of results to return.
+-- | The token to use to retrieve the next page of results. This value is 'null'
+-- when there are no more results to return.
 dvsrNextToken :: Lens' DescribeVolumeStatusResponse (Maybe Text)
 dvsrNextToken = lens _dvsrNextToken (\s a -> s { _dvsrNextToken = a })
 
diff --git a/gen/Network/AWS/EC2/DescribeVolumes.hs b/gen/Network/AWS/EC2/DescribeVolumes.hs
--- a/gen/Network/AWS/EC2/DescribeVolumes.hs
+++ b/gen/Network/AWS/EC2/DescribeVolumes.hs
@@ -30,7 +30,7 @@
 -- your 'MaxResults' value, then that number of results is returned along with a 'NextToken' value that can be passed to a subsequent 'DescribeVolumes' request to retrieve
 -- the remaining results.
 --
--- For more information about Amazon EBS volumes, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumes.html Amazon EBS Volumes> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information about Amazon EBS volumes, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumes.html Amazon EBS Volumes> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVolumes.html>
 module Network.AWS.EC2.DescribeVolumes
diff --git a/gen/Network/AWS/EC2/DetachVolume.hs b/gen/Network/AWS/EC2/DetachVolume.hs
--- a/gen/Network/AWS/EC2/DetachVolume.hs
+++ b/gen/Network/AWS/EC2/DetachVolume.hs
@@ -34,7 +34,7 @@
 -- When a volume with an AWS Marketplace product code is detached from an
 -- instance, the product code is no longer associated with the instance.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-detaching-volume.html Detaching an Amazon EBS Volume> in the /AmazonElastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-detaching-volume.html Detaching an Amazon EBS Volume> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DetachVolume.html>
 module Network.AWS.EC2.DetachVolume
diff --git a/gen/Network/AWS/EC2/DisassociateAddress.hs b/gen/Network/AWS/EC2/DisassociateAddress.hs
--- a/gen/Network/AWS/EC2/DisassociateAddress.hs
+++ b/gen/Network/AWS/EC2/DisassociateAddress.hs
@@ -26,7 +26,7 @@
 -- it's associated with.
 --
 -- An Elastic IP address is for use in either the EC2-Classic platform or in a
--- VPC. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html Elastic IP Addresses> in the /Amazon ElasticCompute Cloud User Guide/.
+-- VPC. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html Elastic IP Addresses> in the /Amazon ElasticCompute Cloud User Guide for Linux/.
 --
 -- This is an idempotent operation. If you perform the operation more than
 -- once, Amazon EC2 doesn't return an error.
diff --git a/gen/Network/AWS/EC2/EnableVpcClassicLink.hs b/gen/Network/AWS/EC2/EnableVpcClassicLink.hs
--- a/gen/Network/AWS/EC2/EnableVpcClassicLink.hs
+++ b/gen/Network/AWS/EC2/EnableVpcClassicLink.hs
@@ -27,7 +27,7 @@
 -- addresses. You cannot enable your VPC for ClassicLink if any of your VPC's
 -- route tables have existing routes for address ranges within the '10.0.0.0/8' IP
 -- address range, excluding local routes for VPCs in the '10.0.0.0/16' and '10.1.0.0/16' IP address ranges. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html ClassicLink> in the Amazon
--- Elastic Compute Cloud User Guide.
+-- Elastic Compute Cloud User Guide for Linux.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-EnableVpcClassicLink.html>
 module Network.AWS.EC2.EnableVpcClassicLink
diff --git a/gen/Network/AWS/EC2/GetPasswordData.hs b/gen/Network/AWS/EC2/GetPasswordData.hs
--- a/gen/Network/AWS/EC2/GetPasswordData.hs
+++ b/gen/Network/AWS/EC2/GetPasswordData.hs
@@ -90,39 +90,42 @@
 gpdInstanceId = lens _gpdInstanceId (\s a -> s { _gpdInstanceId = a })
 
 data GetPasswordDataResponse = GetPasswordDataResponse
-    { _gpdrInstanceId   :: Maybe Text
-    , _gpdrPasswordData :: Maybe Text
-    , _gpdrTimestamp    :: Maybe ISO8601
+    { _gpdrInstanceId   :: Text
+    , _gpdrPasswordData :: Text
+    , _gpdrTimestamp    :: ISO8601
     } deriving (Eq, Ord, Read, Show)
 
 -- | 'GetPasswordDataResponse' constructor.
 --
 -- The fields accessible through corresponding lenses are:
 --
--- * 'gpdrInstanceId' @::@ 'Maybe' 'Text'
+-- * 'gpdrInstanceId' @::@ 'Text'
 --
--- * 'gpdrPasswordData' @::@ 'Maybe' 'Text'
+-- * 'gpdrPasswordData' @::@ 'Text'
 --
--- * 'gpdrTimestamp' @::@ 'Maybe' 'UTCTime'
+-- * 'gpdrTimestamp' @::@ 'UTCTime'
 --
-getPasswordDataResponse :: GetPasswordDataResponse
-getPasswordDataResponse = GetPasswordDataResponse
-    { _gpdrInstanceId   = Nothing
-    , _gpdrTimestamp    = Nothing
-    , _gpdrPasswordData = Nothing
+getPasswordDataResponse :: Text -- ^ 'gpdrInstanceId'
+                        -> UTCTime -- ^ 'gpdrTimestamp'
+                        -> Text -- ^ 'gpdrPasswordData'
+                        -> GetPasswordDataResponse
+getPasswordDataResponse p1 p2 p3 = GetPasswordDataResponse
+    { _gpdrInstanceId   = p1
+    , _gpdrTimestamp    = withIso _Time (const id) p2
+    , _gpdrPasswordData = p3
     }
 
 -- | The ID of the Windows instance.
-gpdrInstanceId :: Lens' GetPasswordDataResponse (Maybe Text)
+gpdrInstanceId :: Lens' GetPasswordDataResponse Text
 gpdrInstanceId = lens _gpdrInstanceId (\s a -> s { _gpdrInstanceId = a })
 
 -- | The password of the instance.
-gpdrPasswordData :: Lens' GetPasswordDataResponse (Maybe Text)
+gpdrPasswordData :: Lens' GetPasswordDataResponse Text
 gpdrPasswordData = lens _gpdrPasswordData (\s a -> s { _gpdrPasswordData = a })
 
 -- | The time the data was last updated.
-gpdrTimestamp :: Lens' GetPasswordDataResponse (Maybe UTCTime)
-gpdrTimestamp = lens _gpdrTimestamp (\s a -> s { _gpdrTimestamp = a }) . mapping _Time
+gpdrTimestamp :: Lens' GetPasswordDataResponse UTCTime
+gpdrTimestamp = lens _gpdrTimestamp (\s a -> s { _gpdrTimestamp = a }) . _Time
 
 instance ToPath GetPasswordData where
     toPath = const "/"
@@ -144,6 +147,6 @@
 
 instance FromXML GetPasswordDataResponse where
     parseXML x = GetPasswordDataResponse
-        <$> x .@? "instanceId"
-        <*> x .@? "passwordData"
-        <*> x .@? "timestamp"
+        <$> x .@  "instanceId"
+        <*> x .@  "passwordData"
+        <*> x .@  "timestamp"
diff --git a/gen/Network/AWS/EC2/ImportInstance.hs b/gen/Network/AWS/EC2/ImportInstance.hs
--- a/gen/Network/AWS/EC2/ImportInstance.hs
+++ b/gen/Network/AWS/EC2/ImportInstance.hs
@@ -23,10 +23,8 @@
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Creates an import instance task using metadata from the specified disk image.
--- After importing the image, you then upload it using the ec2-import-volume
--- command in the EC2 command line tools. For more information, see Using the
--- Command Line Tools to Import Your Virtual Machine to Amazon EC2 in the Amazon
--- Elastic Compute Cloud User Guide.
+-- After importing the image, you then upload it using the 'ec2-import-volume'
+-- command in the EC2 command line tools. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UploadingYourInstancesandVolumes.html Using theCommand Line Tools to Import Your Virtual Machine to Amazon EC2> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ImportInstance.html>
 module Network.AWS.EC2.ImportInstance
diff --git a/gen/Network/AWS/EC2/ImportKeyPair.hs b/gen/Network/AWS/EC2/ImportKeyPair.hs
--- a/gen/Network/AWS/EC2/ImportKeyPair.hs
+++ b/gen/Network/AWS/EC2/ImportKeyPair.hs
@@ -28,7 +28,7 @@
 -- ImportKeyPair, you create the key pair and give AWS just the public key. The
 -- private key is never transferred between you and AWS.
 --
--- For more information about key pairs, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html Key Pairs> in the /Amazon ElasticCompute Cloud User Guide/.
+-- For more information about key pairs, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html Key Pairs> in the /Amazon ElasticCompute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ImportKeyPair.html>
 module Network.AWS.EC2.ImportKeyPair
diff --git a/gen/Network/AWS/EC2/ImportVolume.hs b/gen/Network/AWS/EC2/ImportVolume.hs
--- a/gen/Network/AWS/EC2/ImportVolume.hs
+++ b/gen/Network/AWS/EC2/ImportVolume.hs
@@ -23,9 +23,9 @@
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Creates an import volume task using metadata from the specified disk image.
--- After importing the image, you then upload it using the ec2-import-volume
+-- After importing the image, you then upload it using the 'ec2-import-volume'
 -- command in the Amazon EC2 command-line interface (CLI) tools. For more
--- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UploadingYourInstancesandVolumes.html Using the Command Line Tools to Import Your Virtual Machineto Amazon EC2> in the /Amazon Elastic Compute Cloud User Guide/.
+-- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UploadingYourInstancesandVolumes.html Using the Command Line Tools to Import Your Virtual Machineto Amazon EC2> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ImportVolume.html>
 module Network.AWS.EC2.ImportVolume
diff --git a/gen/Network/AWS/EC2/ModifyImageAttribute.hs b/gen/Network/AWS/EC2/ModifyImageAttribute.hs
--- a/gen/Network/AWS/EC2/ModifyImageAttribute.hs
+++ b/gen/Network/AWS/EC2/ModifyImageAttribute.hs
@@ -126,7 +126,7 @@
 miaImageId :: Lens' ModifyImageAttribute Text
 miaImageId = lens _miaImageId (\s a -> s { _miaImageId = a })
 
-
+-- | A launch permission modification.
 miaLaunchPermission :: Lens' ModifyImageAttribute (Maybe LaunchPermissionModifications)
 miaLaunchPermission =
     lens _miaLaunchPermission (\s a -> s { _miaLaunchPermission = a })
diff --git a/gen/Network/AWS/EC2/ModifyInstanceAttribute.hs b/gen/Network/AWS/EC2/ModifyInstanceAttribute.hs
--- a/gen/Network/AWS/EC2/ModifyInstanceAttribute.hs
+++ b/gen/Network/AWS/EC2/ModifyInstanceAttribute.hs
@@ -26,7 +26,7 @@
 -- only one attribute at a time.
 --
 -- To modify some attributes, the instance must be stopped. For more
--- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_ChangingAttributesWhileInstanceStopped.html Modifying Attributes of a Stopped Instance> in the /AmazonElastic Compute Cloud User Guide/.
+-- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_ChangingAttributesWhileInstanceStopped.html Modifying Attributes of a Stopped Instance> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyInstanceAttribute.html>
 module Network.AWS.EC2.ModifyInstanceAttribute
@@ -145,7 +145,7 @@
 -- the instance is terminated.
 --
 -- To add instance store volumes to an Amazon EBS-backed instance, you must add
--- them when you launch the instance. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html#Using_OverridingAMIBDM Updating theBlock Device Mapping when Launching an Instance> in the /Amazon Elastic ComputeCloud User Guide/.
+-- them when you launch the instance. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html#Using_OverridingAMIBDM Updating theBlock Device Mapping when Launching an Instance> in the /Amazon Elastic ComputeCloud User Guide for Linux/.
 mia1BlockDeviceMappings :: Lens' ModifyInstanceAttribute [InstanceBlockDeviceMappingSpecification]
 mia1BlockDeviceMappings =
     lens _mia1BlockDeviceMappings (\s a -> s { _mia1BlockDeviceMappings = a })
@@ -172,9 +172,6 @@
 -- | [EC2-VPC] Changes the security groups of the instance. You must specify at
 -- least one security group, even if it's just the default security group for
 -- the VPC. You must specify the security group ID, not the security group name.
---
--- For example, if you want the instance to be in sg-1a1a1a1a and sg-9b9b9b9b,
--- specify 'GroupId.1=sg-1a1a1a1a' and 'GroupId.2=sg-9b9b9b9b'.
 mia1Groups :: Lens' ModifyInstanceAttribute [Text]
 mia1Groups = lens _mia1Groups (\s a -> s { _mia1Groups = a }) . _List
 
diff --git a/gen/Network/AWS/EC2/ModifyReservedInstances.hs b/gen/Network/AWS/EC2/ModifyReservedInstances.hs
--- a/gen/Network/AWS/EC2/ModifyReservedInstances.hs
+++ b/gen/Network/AWS/EC2/ModifyReservedInstances.hs
@@ -28,7 +28,7 @@
 -- network platform, and instance type.
 --
 -- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ri-modifying.html Modifying Reserved Instances> in the Amazon Elastic
--- Compute Cloud User Guide.
+-- Compute Cloud User Guide for Linux.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyReservedInstances.html>
 module Network.AWS.EC2.ModifyReservedInstances
@@ -79,7 +79,7 @@
     }
 
 -- | A unique, case-sensitive token you provide to ensure idempotency of your
--- modification request.
+-- modification request. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html Ensuring Idempotency>.
 mriClientToken :: Lens' ModifyReservedInstances (Maybe Text)
 mriClientToken = lens _mriClientToken (\s a -> s { _mriClientToken = a })
 
diff --git a/gen/Network/AWS/EC2/ModifySnapshotAttribute.hs b/gen/Network/AWS/EC2/ModifySnapshotAttribute.hs
--- a/gen/Network/AWS/EC2/ModifySnapshotAttribute.hs
+++ b/gen/Network/AWS/EC2/ModifySnapshotAttribute.hs
@@ -28,7 +28,7 @@
 -- add and remove account IDs for a snapshot, you must use multiple API calls.
 --
 -- For more information on modifying snapshot permissions, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-modifying-snapshot-permissions.html Sharing Snapshots>
--- in the /Amazon Elastic Compute Cloud User Guide/.
+-- in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- Snapshots with AWS Marketplace product codes cannot be made public.
 --
diff --git a/gen/Network/AWS/EC2/ModifySubnetAttribute.hs b/gen/Network/AWS/EC2/ModifySubnetAttribute.hs
--- a/gen/Network/AWS/EC2/ModifySubnetAttribute.hs
+++ b/gen/Network/AWS/EC2/ModifySubnetAttribute.hs
@@ -66,6 +66,8 @@
     , _msaMapPublicIpOnLaunch = Nothing
     }
 
+-- | Specify 'true' to indicate that instances launched into the specified subnet
+-- should be assigned public IP address.
 msaMapPublicIpOnLaunch :: Lens' ModifySubnetAttribute (Maybe AttributeBooleanValue)
 msaMapPublicIpOnLaunch =
     lens _msaMapPublicIpOnLaunch (\s a -> s { _msaMapPublicIpOnLaunch = a })
diff --git a/gen/Network/AWS/EC2/MonitorInstances.hs b/gen/Network/AWS/EC2/MonitorInstances.hs
--- a/gen/Network/AWS/EC2/MonitorInstances.hs
+++ b/gen/Network/AWS/EC2/MonitorInstances.hs
@@ -23,7 +23,7 @@
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Enables monitoring for a running instance. For more information about
--- monitoring instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-cloudwatch.html Monitoring Your Instances and Volumes> in the /AmazonElastic Compute Cloud User Guide/.
+-- monitoring instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-cloudwatch.html Monitoring Your Instances and Volumes> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-MonitorInstances.html>
 module Network.AWS.EC2.MonitorInstances
diff --git a/gen/Network/AWS/EC2/PurchaseReservedInstancesOffering.hs b/gen/Network/AWS/EC2/PurchaseReservedInstancesOffering.hs
--- a/gen/Network/AWS/EC2/PurchaseReservedInstancesOffering.hs
+++ b/gen/Network/AWS/EC2/PurchaseReservedInstancesOffering.hs
@@ -32,7 +32,7 @@
 -- offerings that match your specifications. After you've purchased a Reserved
 -- Instance, you can check for your new Reserved Instance with 'DescribeReservedInstances'.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/concepts-on-demand-reserved-instances.html Reserved Instances> and <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ri-market-general.html Reserved InstanceMarketplace> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/concepts-on-demand-reserved-instances.html Reserved Instances> and <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ri-market-general.html Reserved InstanceMarketplace> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-PurchaseReservedInstancesOffering.html>
 module Network.AWS.EC2.PurchaseReservedInstancesOffering
diff --git a/gen/Network/AWS/EC2/RebootInstances.hs b/gen/Network/AWS/EC2/RebootInstances.hs
--- a/gen/Network/AWS/EC2/RebootInstances.hs
+++ b/gen/Network/AWS/EC2/RebootInstances.hs
@@ -30,7 +30,7 @@
 -- If a Linux/Unix instance does not cleanly shut down within four minutes,
 -- Amazon EC2 performs a hard reboot.
 --
--- For more information about troubleshooting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-console.html Getting Console Output andRebooting Instances> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information about troubleshooting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-console.html Getting Console Output andRebooting Instances> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-RebootInstances.html>
 module Network.AWS.EC2.RebootInstances
diff --git a/gen/Network/AWS/EC2/RegisterImage.hs b/gen/Network/AWS/EC2/RegisterImage.hs
--- a/gen/Network/AWS/EC2/RegisterImage.hs
+++ b/gen/Network/AWS/EC2/RegisterImage.hs
@@ -24,13 +24,13 @@
 
 -- | Registers an AMI. When you're creating an AMI, this is the final step you
 -- must complete before you can launch an instance from the AMI. For more
--- information about creating AMIs, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami.html Creating Your Own AMIs> in the /AmazonElastic Compute Cloud User Guide/.
+-- information about creating AMIs, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami.html Creating Your Own AMIs> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- For Amazon EBS-backed instances, 'CreateImage' creates and registers the AMI
 -- in a single request, so you don't have to register the AMI yourself.
 --
 -- You can also use 'RegisterImage' to create an Amazon EBS-backed AMI from a
--- snapshot of a root device volume. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_LaunchingInstanceFromSnapshot.html Launching anInstance from a Snapshot> in the /Amazon Elastic Compute Cloud User Guide/.
+-- snapshot of a root device volume. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_LaunchingInstanceFromSnapshot.html Launching anInstance from a Snapshot> in the /Amazon Elastic Compute Cloud User Guide forLinux/.
 --
 -- If needed, you can deregister an AMI at any time. Any modifications you make
 -- to an AMI backed by an instance store volume invalidates its registration. If
@@ -170,7 +170,7 @@
 ri1RamdiskId :: Lens' RegisterImage (Maybe Text)
 ri1RamdiskId = lens _ri1RamdiskId (\s a -> s { _ri1RamdiskId = a })
 
--- | The name of the root device (for example, '/dev/sda1', or 'xvda').
+-- | The name of the root device (for example, '/dev/sda1', or '/dev/xvda').
 ri1RootDeviceName :: Lens' RegisterImage (Maybe Text)
 ri1RootDeviceName =
     lens _ri1RootDeviceName (\s a -> s { _ri1RootDeviceName = a })
diff --git a/gen/Network/AWS/EC2/RequestSpotInstances.hs b/gen/Network/AWS/EC2/RequestSpotInstances.hs
--- a/gen/Network/AWS/EC2/RequestSpotInstances.hs
+++ b/gen/Network/AWS/EC2/RequestSpotInstances.hs
@@ -25,7 +25,7 @@
 -- | Creates a Spot Instance request. Spot Instances are instances that Amazon EC2
 -- launches when the bid price that you specify exceeds the current Spot Price.
 -- Amazon EC2 periodically sets the Spot Price based on available Spot Instance
--- capacity and current Spot Instance requests. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-requests.html SpotInstance Requests> in the /Amazon Elastic Compute Cloud User Guide/.
+-- capacity and current Spot Instance requests. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-requests.html SpotInstance Requests> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-RequestSpotInstances.html>
 module Network.AWS.EC2.RequestSpotInstances
diff --git a/gen/Network/AWS/EC2/ResetSnapshotAttribute.hs b/gen/Network/AWS/EC2/ResetSnapshotAttribute.hs
--- a/gen/Network/AWS/EC2/ResetSnapshotAttribute.hs
+++ b/gen/Network/AWS/EC2/ResetSnapshotAttribute.hs
@@ -25,7 +25,7 @@
 -- | Resets permission settings for the specified snapshot.
 --
 -- For more information on modifying snapshot permissions, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-modifying-snapshot-permissions.html Sharing Snapshots>
--- in the /Amazon Elastic Compute Cloud User Guide/.
+-- in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ResetSnapshotAttribute.html>
 module Network.AWS.EC2.ResetSnapshotAttribute
diff --git a/gen/Network/AWS/EC2/RunInstances.hs b/gen/Network/AWS/EC2/RunInstances.hs
--- a/gen/Network/AWS/EC2/RunInstances.hs
+++ b/gen/Network/AWS/EC2/RunInstances.hs
@@ -31,15 +31,15 @@
 --
 -- If you don't specify a security group when launching an instance, Amazon EC2
 -- uses the default security group. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html Security Groups> in
--- the /Amazon Elastic Compute Cloud User Guide/.
+-- the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- Linux instances have access to the public key of the key pair at boot. You
 -- can use this key to provide secure access to the instance. Amazon EC2 public
 -- images use this feature to provide secure access without passwords. For more
--- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html Key Pairs> in the /Amazon Elastic Compute Cloud User Guide/.
+-- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html Key Pairs> in the /Amazon Elastic Compute Cloud User Guide forLinux/.
 --
 -- You can provide optional user data when launching an instance. For more
--- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AESDG-chapter-instancedata.html Instance Metadata> in the /Amazon Elastic Compute Cloud UserGuide/.
+-- information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AESDG-chapter-instancedata.html Instance Metadata> in the /Amazon Elastic Compute Cloud UserGuide for Linux/.
 --
 -- If any of the AMIs have a product code attached for which the user has not
 -- subscribed, 'RunInstances' fails.
@@ -49,7 +49,7 @@
 -- fails.
 --
 -- For more information about troubleshooting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_InstanceStraightToTerminated.html What To Do If An InstanceImmediately Terminates>, and <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstancesConnecting.html Troubleshooting Connecting to Your Instance> in
--- the /Amazon Elastic Compute Cloud User Guide/.
+-- the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-RunInstances.html>
 module Network.AWS.EC2.RunInstances
@@ -217,7 +217,7 @@
         . _List
 
 -- | Unique, case-sensitive identifier you provide to ensure the idempotency of
--- the request. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html How to Ensure Idempotency> in the /Amazon Elastic Compute Cloud User Guide/.
+-- the request. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html Ensuring Idempotency>.
 --
 -- Constraints: Maximum 64 ASCII characters
 riClientToken :: Lens' RunInstances (Maybe Text)
@@ -265,7 +265,7 @@
     lens _riInstanceInitiatedShutdownBehavior
         (\s a -> s { _riInstanceInitiatedShutdownBehavior = a })
 
--- | The instance type. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html Instance Types> in the /AmazonElastic Compute Cloud User Guide/.
+-- | The instance type. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html Instance Types> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- Default: 'm1.small'
 riInstanceType :: Lens' RunInstances (Maybe InstanceType)
@@ -274,7 +274,7 @@
 -- | The ID of the kernel.
 --
 -- We recommend that you use PV-GRUB instead of kernels and RAM disks. For
--- more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html  PV-GRUB> in the /Amazon Elastic Compute Cloud User Guide/.
+-- more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html  PV-GRUB> in the /Amazon Elastic Compute Cloud User Guidefor Linux/.
 --
 --
 riKernelId :: Lens' RunInstances (Maybe Text)
@@ -340,7 +340,7 @@
 -- | The ID of the RAM disk.
 --
 -- We recommend that you use PV-GRUB instead of kernels and RAM disks. For
--- more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html  PV-GRUB> in the /Amazon Elastic Compute Cloud User Guide/.
+-- more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html  PV-GRUB> in the /Amazon Elastic Compute Cloud User Guidefor Linux/.
 --
 --
 riRamdiskId :: Lens' RunInstances (Maybe Text)
diff --git a/gen/Network/AWS/EC2/StartInstances.hs b/gen/Network/AWS/EC2/StartInstances.hs
--- a/gen/Network/AWS/EC2/StartInstances.hs
+++ b/gen/Network/AWS/EC2/StartInstances.hs
@@ -39,7 +39,7 @@
 -- Performing this operation on an instance that uses an instance store as its
 -- root device returns an error.
 --
--- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Stop_Start.html Stopping Instances> in the /Amazon Elastic ComputeCloud User Guide/.
+-- For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Stop_Start.html Stopping Instances> in the /Amazon Elastic ComputeCloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-StartInstances.html>
 module Network.AWS.EC2.StartInstances
diff --git a/gen/Network/AWS/EC2/StopInstances.hs b/gen/Network/AWS/EC2/StopInstances.hs
--- a/gen/Network/AWS/EC2/StopInstances.hs
+++ b/gen/Network/AWS/EC2/StopInstances.hs
@@ -48,9 +48,9 @@
 -- persist. When you terminate an instance, the root device and any other
 -- devices attached during the instance launch are automatically deleted. For
 -- more information about the differences between stopping and terminating
--- instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-lifecycle.html Instance Lifecycle> in the /Amazon Elastic Compute Cloud UserGuide/.
+-- instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-lifecycle.html Instance Lifecycle> in the /Amazon Elastic Compute Cloud UserGuide for Linux/.
 --
--- For more information about troubleshooting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstancesStopping.html Troubleshooting StoppingYour Instance> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information about troubleshooting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstancesStopping.html Troubleshooting StoppingYour Instance> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-StopInstances.html>
 module Network.AWS.EC2.StopInstances
diff --git a/gen/Network/AWS/EC2/TerminateInstances.hs b/gen/Network/AWS/EC2/TerminateInstances.hs
--- a/gen/Network/AWS/EC2/TerminateInstances.hs
+++ b/gen/Network/AWS/EC2/TerminateInstances.hs
@@ -39,9 +39,9 @@
 -- persist. When you terminate an instance, the root device and any other
 -- devices attached during the instance launch are automatically deleted. For
 -- more information about the differences between stopping and terminating
--- instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-lifecycle.html Instance Lifecycle> in the /Amazon Elastic Compute Cloud UserGuide/.
+-- instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-lifecycle.html Instance Lifecycle> in the /Amazon Elastic Compute Cloud UserGuide for Linux/.
 --
--- For more information about troubleshooting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstancesShuttingDown.html Troubleshooting TerminatingYour Instance> in the /Amazon Elastic Compute Cloud User Guide/.
+-- For more information about troubleshooting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstancesShuttingDown.html Troubleshooting TerminatingYour Instance> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-TerminateInstances.html>
 module Network.AWS.EC2.TerminateInstances
diff --git a/gen/Network/AWS/EC2/Types.hs b/gen/Network/AWS/EC2/Types.hs
--- a/gen/Network/AWS/EC2/Types.hs
+++ b/gen/Network/AWS/EC2/Types.hs
@@ -1729,8 +1729,9 @@
 -- | The instance type. This is not supported for VMs imported into a VPC, which
 -- are assigned the default security group. After a VM is imported into a VPC,
 -- you can specify another security group using the AWS Management Console. For
--- more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html Instance Types> in the /Amazon Elastic Compute Cloud UserGuide/. For more information about the Linux instance types you can import,
--- see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/VMImportPrerequisites.html Before You Get Started> in the Amazon Elastic Compute Cloud User Guide.
+-- more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html Instance Types> in the /Amazon Elastic Compute Cloud UserGuide for Linux/. For more information about the Linux instance types you can
+-- import, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/VMImportPrerequisites.html Before You Get Started> in the Amazon Elastic Compute Cloud User
+-- Guide for Linux.
 iilsInstanceType :: Lens' ImportInstanceLaunchSpecification (Maybe InstanceType)
 iilsInstanceType = lens _iilsInstanceType (\s a -> s { _iilsInstanceType = a })
 
@@ -2143,7 +2144,8 @@
     , _rilClientToken                = Nothing
     }
 
--- | The idempotency token you provided when you created the listing.
+-- | A unique, case-sensitive key supplied by the client to ensure that the
+-- request is idempotent. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html Ensuring Idempotency>.
 rilClientToken :: Lens' ReservedInstancesListing (Maybe Text)
 rilClientToken = lens _rilClientToken (\s a -> s { _rilClientToken = a })
 
@@ -2905,7 +2907,7 @@
 iRamdiskId :: Lens' Image (Maybe Text)
 iRamdiskId = lens _iRamdiskId (\s a -> s { _iRamdiskId = a })
 
--- | The device name of the root device (for example, /dev/sda1 or xvda).
+-- | The device name of the root device (for example, '/dev/sda1' or '/dev/xvda').
 iRootDeviceName :: Lens' Image (Maybe Text)
 iRootDeviceName = lens _iRootDeviceName (\s a -> s { _iRootDeviceName = a })
 
@@ -3625,7 +3627,7 @@
     lens _etstDiskImageFormat (\s a -> s { _etstDiskImageFormat = a })
 
 -- | The Amazon S3 bucket for the destination image. The destination bucket must
--- exist and grant WRITE and READ_ACL permissions to the AWS account 'vm-import-export@amazon.com'.
+-- exist and grant WRITE and READ_ACP permissions to the AWS account 'vm-import-export@amazon.com'.
 etstS3Bucket :: Lens' ExportToS3Task (Maybe Text)
 etstS3Bucket = lens _etstS3Bucket (\s a -> s { _etstS3Bucket = a })
 
@@ -3675,7 +3677,7 @@
     , _bdmNoDevice    = Nothing
     }
 
--- | The device name exposed to the instance (for example, '/dev/sdh').
+-- | The device name exposed to the instance (for example, '/dev/sdh' or 'xvdh').
 bdmDeviceName :: Lens' BlockDeviceMapping Text
 bdmDeviceName = lens _bdmDeviceName (\s a -> s { _bdmDeviceName = a })
 
@@ -4316,7 +4318,7 @@
 siSpotPrice = lens _siSpotPrice (\s a -> s { _siSpotPrice = a })
 
 -- | The state of the Spot Instance request. Spot bid status information can help
--- you track your Spot Instance requests. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-bid-status.html Spot BidStatus> in the /Amazon Elastic Compute Cloud User Guide/.
+-- you track your Spot Instance requests. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-bid-status.html Spot BidStatus> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 siState :: Lens' SpotInstanceRequest (Maybe SpotInstanceState)
 siState = lens _siState (\s a -> s { _siState = a })
 
@@ -4723,10 +4725,10 @@
 -- provisioned for the volume. For General Purpose (SSD) volumes, this
 -- represents the baseline performance of the volume and the rate at which the
 -- volume accumulates I/O credits for bursting. For more information on General
--- Purpose (SSD) baseline performance, I/O credits, and bursting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html Amazon EBSVolume Types> in the /Amazon Elastic Compute Cloud User Guide/.
+-- Purpose (SSD) baseline performance, I/O credits, and bursting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html Amazon EBSVolume Types> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
--- Constraint: Range is 100 to 4000 for Provisioned IOPS (SSD) volumes and 3 to
--- 3072 for General Purpose (SSD) volumes.
+-- Constraint: Range is 100 to 20000 for Provisioned IOPS (SSD) volumes and 3
+-- to 10000 for General Purpose (SSD) volumes.
 --
 -- Condition: This parameter is required for requests to create 'io1' volumes; it
 -- is not used in requests to create 'standard' or 'gp2' volumes.
@@ -5040,7 +5042,7 @@
     }
 
 -- | A unique, case-sensitive key supplied by the client to ensure that the
--- modification request is idempotent.
+-- request is idempotent. For more information, see <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html Ensuring Idempotency>.
 rimClientToken :: Lens' ReservedInstancesModification (Maybe Text)
 rimClientToken = lens _rimClientToken (\s a -> s { _rimClientToken = a })
 
@@ -6759,6 +6761,10 @@
     | CC2_8XLarge -- ^ cc2.8xlarge
     | CG1_4XLarge -- ^ cg1.4xlarge
     | CR1_8XLarge -- ^ cr1.8xlarge
+    | D2_2XLarge  -- ^ d2.2xlarge
+    | D2_4XLarge  -- ^ d2.4xlarge
+    | D2_8XLarge  -- ^ d2.8xlarge
+    | D2_XLarge   -- ^ d2.xlarge
     | G2_2XLarge  -- ^ g2.2xlarge
     | HI1_4XLarge -- ^ hi1.4xlarge
     | HS1_8XLarge -- ^ hs1.8xlarge
@@ -6808,6 +6814,10 @@
         "cc2.8xlarge" -> pure CC2_8XLarge
         "cg1.4xlarge" -> pure CG1_4XLarge
         "cr1.8xlarge" -> pure CR1_8XLarge
+        "d2.2xlarge"  -> pure D2_2XLarge
+        "d2.4xlarge"  -> pure D2_4XLarge
+        "d2.8xlarge"  -> pure D2_8XLarge
+        "d2.xlarge"   -> pure D2_XLarge
         "g2.2xlarge"  -> pure G2_2XLarge
         "hi1.4xlarge" -> pure HI1_4XLarge
         "hs1.8xlarge" -> pure HS1_8XLarge
@@ -6856,6 +6866,10 @@
         CC2_8XLarge -> "cc2.8xlarge"
         CG1_4XLarge -> "cg1.4xlarge"
         CR1_8XLarge -> "cr1.8xlarge"
+        D2_2XLarge  -> "d2.2xlarge"
+        D2_4XLarge  -> "d2.4xlarge"
+        D2_8XLarge  -> "d2.8xlarge"
+        D2_XLarge   -> "d2.xlarge"
         G2_2XLarge  -> "g2.2xlarge"
         HI1_4XLarge -> "hi1.4xlarge"
         HS1_8XLarge -> "hs1.8xlarge"
@@ -7336,7 +7350,7 @@
     , _ibdmsNoDevice    = Nothing
     }
 
--- | The device name exposed to the instance (for example, /dev/sdh).
+-- | The device name exposed to the instance (for example, '/dev/sdh' or 'xvdh').
 ibdmsDeviceName :: Lens' InstanceBlockDeviceMappingSpecification (Maybe Text)
 ibdmsDeviceName = lens _ibdmsDeviceName (\s a -> s { _ibdmsDeviceName = a })
 
@@ -7937,7 +7951,7 @@
     , _ibdmEbs        = Nothing
     }
 
--- | The device name exposed to the instance (for example, /dev/sdh).
+-- | The device name exposed to the instance (for example, '/dev/sdh' or 'xvdh').
 ibdmDeviceName :: Lens' InstanceBlockDeviceMapping (Maybe Text)
 ibdmDeviceName = lens _ibdmDeviceName (\s a -> s { _ibdmDeviceName = a })
 
@@ -9551,10 +9565,10 @@
 -- provisioned for the volume. For General Purpose (SSD) volumes, this
 -- represents the baseline performance of the volume and the rate at which the
 -- volume accumulates I/O credits for bursting. For more information on General
--- Purpose (SSD) baseline performance, I/O credits, and bursting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html Amazon EBSVolume Types> in the /Amazon Elastic Compute Cloud User Guide/.
+-- Purpose (SSD) baseline performance, I/O credits, and bursting, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html Amazon EBSVolume Types> in the /Amazon Elastic Compute Cloud User Guide for Linux/.
 --
--- Constraint: Range is 100 to 4000 for Provisioned IOPS (SSD) volumes and 3 to
--- 3072 for General Purpose (SSD) volumes.
+-- Constraint: Range is 100 to 20000 for Provisioned IOPS (SSD) volumes and 3
+-- to 10000 for General Purpose (SSD) volumes.
 --
 -- Condition: This parameter is required for requests to create 'io1' volumes; it
 -- is not used in requests to create 'standard' or 'gp2' volumes.
@@ -9567,10 +9581,8 @@
 
 -- | The size of the volume, in GiB.
 --
--- Constraints: If the volume type is 'io1', the minimum size of the volume is 4
--- GiB; otherwise, the minimum size is 1 GiB. The maximum volume size is 1024
--- GiB. If you specify a snapshot, the volume size must be equal to or larger
--- than the snapshot size.
+-- Constraints: '1-1024' for 'standard' volumes, '1-16384' for 'gp2' volumes, and '4-16384' for 'io1' volumes. If you specify a snapshot, the volume size must be equal to
+-- or larger than the snapshot size.
 --
 -- Default: If you're creating the volume from a snapshot and don't specify a
 -- volume size, the default is the snapshot size.
@@ -12226,7 +12238,7 @@
 i1RamdiskId :: Lens' Instance (Maybe Text)
 i1RamdiskId = lens _i1RamdiskId (\s a -> s { _i1RamdiskId = a })
 
--- | The root device name (for example, '/dev/sda1').
+-- | The root device name (for example, '/dev/sda1' or '/dev/xvda').
 i1RootDeviceName :: Lens' Instance (Maybe Text)
 i1RootDeviceName = lens _i1RootDeviceName (\s a -> s { _i1RootDeviceName = a })
 
diff --git a/gen/Network/AWS/EC2/UnmonitorInstances.hs b/gen/Network/AWS/EC2/UnmonitorInstances.hs
--- a/gen/Network/AWS/EC2/UnmonitorInstances.hs
+++ b/gen/Network/AWS/EC2/UnmonitorInstances.hs
@@ -23,7 +23,7 @@
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
 -- | Disables monitoring for a running instance. For more information about
--- monitoring instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-cloudwatch.html Monitoring Your Instances and Volumes> in the /AmazonElastic Compute Cloud User Guide/.
+-- monitoring instances, see <http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-cloudwatch.html Monitoring Your Instances and Volumes> in the /AmazonElastic Compute Cloud User Guide for Linux/.
 --
 -- <http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-UnmonitorInstances.html>
 module Network.AWS.EC2.UnmonitorInstances
diff --git a/gen/Network/AWS/EC2/Waiters.hs b/gen/Network/AWS/EC2/Waiters.hs
--- a/gen/Network/AWS/EC2/Waiters.hs
+++ b/gen/Network/AWS/EC2/Waiters.hs
@@ -19,12 +19,16 @@
 import Network.AWS.EC2.DescribeConversionTasks
 import Network.AWS.EC2.DescribeCustomerGateways
 import Network.AWS.EC2.DescribeExportTasks
+import Network.AWS.EC2.DescribeImages
+import Network.AWS.EC2.DescribeInstanceStatus
 import Network.AWS.EC2.DescribeInstances
 import Network.AWS.EC2.DescribeSnapshots
+import Network.AWS.EC2.DescribeSpotInstanceRequests
 import Network.AWS.EC2.DescribeSubnets
 import Network.AWS.EC2.DescribeVolumes
 import Network.AWS.EC2.DescribeVpcs
 import Network.AWS.EC2.DescribeVpnConnections
+import Network.AWS.EC2.GetPasswordData
 import Network.AWS.EC2.Types
 import Network.AWS.Waiters
 
@@ -104,6 +108,19 @@
         ]
     }
 
+imageAvailable :: Wait DescribeImages
+imageAvailable = Wait
+    { _waitName      = "ImageAvailable"
+    , _waitAttempts  = 40
+    , _waitDelay     = 15
+    , _waitAcceptors =
+        [ matchAll ISAvailable AcceptSuccess
+            (folding (concatOf dirImages) . iState)
+        , matchAny ISDeregistered AcceptFailure
+            (folding (concatOf dirImages) . iState)
+        ]
+    }
+
 instanceRunning :: Wait DescribeInstances
 instanceRunning = Wait
     { _waitName      = "InstanceRunning"
@@ -121,6 +138,17 @@
         ]
     }
 
+instanceStatusOk :: Wait DescribeInstanceStatus
+instanceStatusOk = Wait
+    { _waitName      = "InstanceStatusOk"
+    , _waitAttempts  = 40
+    , _waitDelay     = 15
+    , _waitAcceptors =
+        [ matchAll SSOk AcceptSuccess
+            (folding (concatOf disrInstanceStatuses) . isInstanceStatus . _Just . issStatus . _Just)
+        ]
+    }
+
 instanceStopped :: Wait DescribeInstances
 instanceStopped = Wait
     { _waitName      = "InstanceStopped"
@@ -151,6 +179,17 @@
         ]
     }
 
+passwordDataAvailable :: Wait GetPasswordData
+passwordDataAvailable = Wait
+    { _waitName      = "PasswordDataAvailable"
+    , _waitAttempts  = 40
+    , _waitDelay     = 15
+    , _waitAcceptors =
+        [ matchAll True AcceptSuccess
+            (nonEmpty gpdrPasswordData)
+        ]
+    }
+
 snapshotCompleted :: Wait DescribeSnapshots
 snapshotCompleted = Wait
     { _waitName      = "SnapshotCompleted"
@@ -162,6 +201,25 @@
         ]
     }
 
+spotInstanceRequestFulfilled :: Wait DescribeSpotInstanceRequests
+spotInstanceRequestFulfilled = Wait
+    { _waitName      = "SpotInstanceRequestFulfilled"
+    , _waitAttempts  = 40
+    , _waitDelay     = 15
+    , _waitAcceptors =
+        [ matchAll "fulfilled" AcceptSuccess
+            (folding (concatOf dsirrSpotInstanceRequests) . siStatus . _Just . sisCode . _Just)
+        , matchAny "schedule-expired" AcceptFailure
+            (folding (concatOf dsirrSpotInstanceRequests) . siStatus . _Just . sisCode . _Just)
+        , matchAny "canceled-before-fulfillment" AcceptFailure
+            (folding (concatOf dsirrSpotInstanceRequests) . siStatus . _Just . sisCode . _Just)
+        , matchAny "bad-parameters" AcceptFailure
+            (folding (concatOf dsirrSpotInstanceRequests) . siStatus . _Just . sisCode . _Just)
+        , matchAny "system-error" AcceptFailure
+            (folding (concatOf dsirrSpotInstanceRequests) . siStatus . _Just . sisCode . _Just)
+        ]
+    }
+
 subnetAvailable :: Wait DescribeSubnets
 subnetAvailable = Wait
     { _waitName      = "SubnetAvailable"
@@ -170,6 +228,17 @@
     , _waitAcceptors =
         [ matchAll SSAvailable AcceptSuccess
             (folding (concatOf dsrSubnets) . s1State)
+        ]
+    }
+
+systemStatusOk :: Wait DescribeInstanceStatus
+systemStatusOk = Wait
+    { _waitName      = "SystemStatusOk"
+    , _waitAttempts  = 40
+    , _waitDelay     = 15
+    , _waitAcceptors =
+        [ matchAll SSOk AcceptSuccess
+            (folding (concatOf disrInstanceStatuses) . isSystemStatus . _Just . issStatus . _Just)
         ]
     }
 
