diff --git a/contrib/zsh-completion/_terraform b/contrib/zsh-completion/_terraform index 0b3fa55b0..1252bb961 100644 --- a/contrib/zsh-completion/_terraform +++ b/contrib/zsh-completion/_terraform @@ -13,7 +13,7 @@ _terraform_cmds=( 'push:Uploads the local state to the remote server' 'refresh:Update local state file against real resources' 'remote:Configures remote state management' - 'taint:Manualy forcing a destroy and recreate on the next plan/apply' + 'taint:Manually forcing a destroy and recreate on the next plan/apply' 'show:Inspect Terraform state or plan' 'version:Prints the Terraform version' ) @@ -82,7 +82,7 @@ __plan() { __push() { _arguments \ - '-force[Forces the upload of the local state, ignoring any conflits. This should be used carefully, as force pushing can cause remote state information to be lost.]' + '-force[Forces the upload of the local state, ignoring any conflicts. This should be used carefully, as force pushing can cause remote state information to be lost.]' } __refresh() { diff --git a/website/source/docs/providers/aws/r/autoscale.html.markdown b/website/source/docs/providers/aws/r/autoscale.html.markdown index 2e4021e94..6b02a703e 100644 --- a/website/source/docs/providers/aws/r/autoscale.html.markdown +++ b/website/source/docs/providers/aws/r/autoscale.html.markdown @@ -110,7 +110,7 @@ Docs](https://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingG for more information on an ASG's lifecycle. Terraform will wait for healthy instances for up to 10 minutes. If ASG creation -is taking more than a few minutes, it's worth investigating for scaling actvity +is taking more than a few minutes, it's worth investigating for scaling activity errors, which can be caused by problems with the selected Launch Configuration. #### Waiting for ELB Capacity diff --git a/website/source/docs/providers/aws/r/ebs_volume.html.md b/website/source/docs/providers/aws/r/ebs_volume.html.md index c7ce0096d..eee5f99d4 100644 --- a/website/source/docs/providers/aws/r/ebs_volume.html.md +++ b/website/source/docs/providers/aws/r/ebs_volume.html.md @@ -27,7 +27,7 @@ The following arguments are supported: * `encrypted` - (Optional) If true, the disk will be encrypted. * `iops` - (Optional) The amount of IOPS to provision for the disk. * `size` - (Optional) The size of the drive in GB. -* `snapshot_id` (Optinal) A snapshot to base the EBS volume off of. +* `snapshot_id` (Optional) A snapshot to base the EBS volume off of. * `type` - (Optional) The type of EBS volume. * `kms_key_id` - (Optional) The KMS key ID for the volume. diff --git a/website/source/docs/providers/aws/r/iam_group_policy.html.markdown b/website/source/docs/providers/aws/r/iam_group_policy.html.markdown index 9916e8ca0..f5efa8619 100644 --- a/website/source/docs/providers/aws/r/iam_group_policy.html.markdown +++ b/website/source/docs/providers/aws/r/iam_group_policy.html.markdown @@ -43,7 +43,7 @@ resource "aws_iam_group" "my_developers" { The following arguments are supported: * `policy` - (Required) The policy document. This is a JSON formatted string. - The heredoc syntax or `file` funciton is helpful here. + The heredoc syntax or `file` function is helpful here. * `name` - (Required) Name of the policy. * `group` - (Required) The IAM group to attach to the policy. diff --git a/website/source/docs/providers/aws/r/iam_policy.html.markdown b/website/source/docs/providers/aws/r/iam_policy.html.markdown index db8affeff..aea36b66e 100644 --- a/website/source/docs/providers/aws/r/iam_policy.html.markdown +++ b/website/source/docs/providers/aws/r/iam_policy.html.markdown @@ -39,7 +39,7 @@ The following arguments are supported: * `description` - (Optional) Description of the IAM policy. * `path` - (Optional, default "/") Path in which to create the policy. * `policy` - (Required) The policy document. This is a JSON formatted string. - The heredoc syntax or `file` funciton is helpful here. + The heredoc syntax or `file` function is helpful here. * `name` (Required) - The name of the policy. ## Attributes Reference diff --git a/website/source/docs/providers/aws/r/iam_role_policy.html.markdown b/website/source/docs/providers/aws/r/iam_role_policy.html.markdown index 2e9fe4620..7b3aaf8ae 100644 --- a/website/source/docs/providers/aws/r/iam_role_policy.html.markdown +++ b/website/source/docs/providers/aws/r/iam_role_policy.html.markdown @@ -57,7 +57,7 @@ The following arguments are supported: * `name` - (Required) The name of the role policy. * `policy` - (Required) The policy document. This is a JSON formatted string. - The heredoc syntax or `file` funciton is helpful here. + The heredoc syntax or `file` function is helpful here. * `role` - (Required) The IAM role to attach to the policy. ## Attributes Reference diff --git a/website/source/docs/providers/aws/r/iam_server_certificate.html.markdown b/website/source/docs/providers/aws/r/iam_server_certificate.html.markdown index 8e2283178..820bc6f89 100644 --- a/website/source/docs/providers/aws/r/iam_server_certificate.html.markdown +++ b/website/source/docs/providers/aws/r/iam_server_certificate.html.markdown @@ -9,7 +9,7 @@ description: |- # aws\_iam\_server\_certificate Provides an IAM Server Certificate resource to upload Server Certificates. -Certs uploated to IAM can easily work with other AWS services such as: +Certs uploaded to IAM can easily work with other AWS services such as: - AWS Elastic Beanstalk - Elastic Load Balancing diff --git a/website/source/docs/providers/aws/r/route53_record.html.markdown b/website/source/docs/providers/aws/r/route53_record.html.markdown index 092101e6a..500608853 100644 --- a/website/source/docs/providers/aws/r/route53_record.html.markdown +++ b/website/source/docs/providers/aws/r/route53_record.html.markdown @@ -54,7 +54,7 @@ See [related part of AWS Route53 Developer Guide](http://docs.aws.amazon.com/Rou to understand differences between alias and non-alias records. TTL for all alias records is [60 seconds](http://aws.amazon.com/route53/faqs/#dns_failover_do_i_need_to_adjust), -you cannot change this, therefore `ttl` has to be ommitted in alias records. +you cannot change this, therefore `ttl` has to be omitted in alias records. ``` resource "aws_elb" "main" { diff --git a/website/source/docs/providers/aws/r/route53_zone_association.html.markdown b/website/source/docs/providers/aws/r/route53_zone_association.html.markdown index 49995fb63..7275290af 100644 --- a/website/source/docs/providers/aws/r/route53_zone_association.html.markdown +++ b/website/source/docs/providers/aws/r/route53_zone_association.html.markdown @@ -30,7 +30,7 @@ resource "aws_route53_zone" "example" { vpc_id = "${aws_vpc.primary.id}" } -resource "aws_route53_zone_assocation" "secondary" { +resource "aws_route53_zone_association" "secondary" { zone_id = "${aws_route53_zone.example.id}" vpc_id = "${aws_vpc.secondary.id}" } diff --git a/website/source/docs/providers/aws/r/vpn_connection.html.markdown b/website/source/docs/providers/aws/r/vpn_connection.html.markdown index dd4a9ecea..ecfd197d2 100644 --- a/website/source/docs/providers/aws/r/vpn_connection.html.markdown +++ b/website/source/docs/providers/aws/r/vpn_connection.html.markdown @@ -46,7 +46,7 @@ The following arguments are supported: * `type` - (Required) The type of VPN connection. The only type AWS supports at this time is "ipsec.1". * `vpn_gateway_id` - (Required) The ID of the virtual private gateway. -## Attrubute Reference +## Attribute Reference The following attributes are exported: