From 28d39cd0bc7e9212eeea77f871cf4d4c7df0da73 Mon Sep 17 00:00:00 2001
From: Emil Hessman
Date: Sat, 3 Jan 2015 19:31:53 +0100
Subject: [PATCH] website: address spelling mistakes, casing and links
---
website/source/community.html.erb | 16 ++++++++--------
website/source/docs/commands/show.html.markdown | 4 ++--
website/source/docs/configuration/syntax.html.md | 2 +-
website/source/docs/modules/index.html.markdown | 4 ++--
.../source/docs/modules/sources.html.markdown | 6 +++---
.../providers/atlas/r/artifact.html.markdown | 2 +-
.../providers/aws/r/network_acl.html.markdown | 2 +-
.../providers/cloudflare/r/record.html.markdown | 4 ++--
.../providers/cloudstack/index.html.markdown | 4 ++--
.../cloudstack/r/firewall.html.markdown | 10 +++++-----
.../cloudstack/r/ipaddress.html.markdown | 10 +++++-----
.../providers/cloudstack/r/network.html.markdown | 2 +-
.../cloudstack/r/network_acl.html.markdown | 2 +-
.../cloudstack/r/network_acl_rule.html.markdown | 2 +-
.../cloudstack/r/port_forward.html.markdown | 4 ++--
.../docs/providers/consul/index.html.markdown | 2 +-
.../providers/dnsimple/r/record.html.markdown | 2 +-
.../google/r/compute_route.html.markdown | 2 +-
.../docs/providers/heroku/r/addon.html.markdown | 2 +-
.../docs/providers/heroku/r/app.html.markdown | 2 +-
.../docs/providers/heroku/r/cert.html.markdown | 4 ++--
.../docs/providers/heroku/r/domain.html.markdown | 8 ++++----
.../docs/providers/heroku/r/drain.html.markdown | 4 ++--
.../providers/mailgun/r/domain.html.markdown | 8 ++++----
website/source/intro/examples/aws.html.markdown | 2 +-
.../source/intro/examples/consul.html.markdown | 2 +-
.../source/intro/examples/index.html.markdown | 2 +-
.../source/intro/getting-started/build.html.md | 2 +-
.../source/intro/getting-started/modules.html.md | 2 +-
.../intro/getting-started/provision.html.md | 4 ++--
.../intro/getting-started/variables.html.md | 4 ++--
website/source/intro/use-cases.html.markdown | 2 +-
website/source/layouts/_footer.erb | 4 ++--
website/source/layouts/_header.erb | 2 +-
website/source/layouts/google.erb | 2 +-
35 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/website/source/community.html.erb b/website/source/community.html.erb
index 93947fb6e..9f7a60821 100644
--- a/website/source/community.html.erb
+++ b/website/source/community.html.erb
@@ -40,9 +40,9 @@ disappear from this list as contributors come and go.
Mitchell Hashimoto is the creator of Terraform and works on all
layers of Terraform from the core to providers. In addition to Terraform,
Mitchell is the creator of
- Vagrant,
- Packer, and
- Consul.
+ Vagrant,
+ Packer, and
+ Consul.
@@ -55,8 +55,8 @@ disappear from this list as contributors come and go.
Armon Dadgar is a creator of Terraform. He created valuable sections
of the core and helps maintain providers as well. Armon is also the
creator of
- Consul,
- Serf,
+ Consul,
+ Serf,
Statsite, and
Bloomd.
@@ -71,10 +71,10 @@ disappear from this list as contributors come and go.
Jack Pearkes is a creator of Terraform. He created and maintains
most of the providers and documentation.
He is also a core committer to
- Packer and
- Consul
+ Packer and
+ Consul
while also being an employee of
- HashiCorp.
+ HashiCorp.
diff --git a/website/source/docs/commands/show.html.markdown b/website/source/docs/commands/show.html.markdown
index a374b51fe..703c3b09c 100644
--- a/website/source/docs/commands/show.html.markdown
+++ b/website/source/docs/commands/show.html.markdown
@@ -3,7 +3,7 @@ layout: "docs"
page_title: "Command: show"
sidebar_current: "docs-commands-show"
description: |-
- The `terraform show` command is used to provide human-readable output from a state or plan file. This can be used to inspect a plan to ensure that the planned operations are expected, or to inspect the current state as terraform sees it.
+ The `terraform show` command is used to provide human-readable output from a state or plan file. This can be used to inspect a plan to ensure that the planned operations are expected, or to inspect the current state as Terraform sees it.
---
# Command: show
@@ -11,7 +11,7 @@ description: |-
The `terraform show` command is used to provide human-readable output
from a state or plan file. This can be used to inspect a plan to ensure
that the planned operations are expected, or to inspect the current state
-as terraform sees it.
+as Terraform sees it.
## Usage
diff --git a/website/source/docs/configuration/syntax.html.md b/website/source/docs/configuration/syntax.html.md
index ad8c8c910..000610442 100644
--- a/website/source/docs/configuration/syntax.html.md
+++ b/website/source/docs/configuration/syntax.html.md
@@ -60,7 +60,7 @@ Basic bullet point reference:
* Numbers can be suffixed with `kKmMgG` for some multiple of 10.
For example: `1k` is equal to `1000`.
- * Numbers can be suffxed with `[kKmMgG]b` for power of 2 multiples,
+ * Numbers can be suffixed with `[kKmMgG]b` for power of 2 multiples,
example: `1kb` is equal to `1024`.
* Boolean values: `true`, `false`, `on`, `off`, `yes`, `no`.
diff --git a/website/source/docs/modules/index.html.markdown b/website/source/docs/modules/index.html.markdown
index 5a4bd933b..cacccf847 100644
--- a/website/source/docs/modules/index.html.markdown
+++ b/website/source/docs/modules/index.html.markdown
@@ -3,12 +3,12 @@ layout: "docs"
page_title: "Modules"
sidebar_current: "docs-modules"
description: |-
- Modules in terraform are self-contained packages of Terraform configurations that are managed as a group. Modules are used to create reusable components in Terraform as well as for basic code organization.
+ Modules in Terraform are self-contained packages of Terraform configurations that are managed as a group. Modules are used to create reusable components in Terraform as well as for basic code organization.
---
# Modules
-Modules in terraform are self-contained packages of Terraform configurations
+Modules in Terraform are self-contained packages of Terraform configurations
that are managed as a group. Modules are used to create reusable components
in Terraform as well as for basic code organization.
diff --git a/website/source/docs/modules/sources.html.markdown b/website/source/docs/modules/sources.html.markdown
index 8b4fce01f..f8a3dd3c7 100644
--- a/website/source/docs/modules/sources.html.markdown
+++ b/website/source/docs/modules/sources.html.markdown
@@ -3,15 +3,15 @@ layout: "docs"
page_title: "Module Sources"
sidebar_current: "docs-modules-sources"
description: |-
- As documented in usage, the only required parameter when using a module is the `source` paramter which tells Terraform where the module can be found and what constraints to put on the module if any (such as branches for git, versions, etc.).
+ As documented in usage, the only required parameter when using a module is the `source` parameter which tells Terraform where the module can be found and what constraints to put on the module if any (such as branches for Git, versions, etc.).
---
# Module Sources
As documented in [usage](/docs/modules/usage.html), the only required
-parameter when using a module is the `source` paramter which tells Terraform
+parameter when using a module is the `source` parameter which tells Terraform
where the module can be found and what constraints to put on the module
-if any (such as branches for git, versions, etc.).
+if any (such as branches for Git, versions, etc.).
Terraform manages modules for you: it downloads them, organizes them
on disk, checks for updates, etc. Terraform uses this source parameter for
diff --git a/website/source/docs/providers/atlas/r/artifact.html.markdown b/website/source/docs/providers/atlas/r/artifact.html.markdown
index 72960df0f..ba139e411 100644
--- a/website/source/docs/providers/atlas/r/artifact.html.markdown
+++ b/website/source/docs/providers/atlas/r/artifact.html.markdown
@@ -73,7 +73,7 @@ The following attributes are exported:
* `id` - The ID of the artifact. This could be an AMI ID, GCE Image ID, etc.
* `file_url` - For artifacts that are binaries, this is a download path.
* `metadata_full` - Contains the full metadata of the artifact. The keys are sanitized
- to replace any characters that are invalid in a resource name with a hypen.
+ to replace any characters that are invalid in a resource name with a hyphen.
For example, the "region.us-east-1" key will become "region-us-east-1".
* `version_real` - The matching version of the artifact
* `slug` - The artifact slug in Atlas
diff --git a/website/source/docs/providers/aws/r/network_acl.html.markdown b/website/source/docs/providers/aws/r/network_acl.html.markdown
index a96de9bae..95eced1f3 100644
--- a/website/source/docs/providers/aws/r/network_acl.html.markdown
+++ b/website/source/docs/providers/aws/r/network_acl.html.markdown
@@ -43,7 +43,7 @@ The following arguments are supported:
* `vpc_id` - (Required) The ID of the associated VPC.
* `subnet_id` - (Optional) The ID of the associated subnet.
* `ingress` - (Optional) Specifies an ingress rule. Parameters defined below.
-* `egress` - (Optional) Speicifes an egress rule. Parameters defined below.
+* `egress` - (Optional) Specifies an egress rule. Parameters defined below.
Both `egress` and `ingress` support the following keys:
diff --git a/website/source/docs/providers/cloudflare/r/record.html.markdown b/website/source/docs/providers/cloudflare/r/record.html.markdown
index 55e401e3f..d1f705c41 100644
--- a/website/source/docs/providers/cloudflare/r/record.html.markdown
+++ b/website/source/docs/providers/cloudflare/r/record.html.markdown
@@ -32,7 +32,7 @@ The following arguments are supported:
* `value` - (Required) The value of the record
* `type` - (Required) The type of the record
* `ttl` - (Optional) The TTL of the record
-* `priority` - (Optional) The TTL of the record
+* `priority` - (Optional) The priority of the record
## Attributes Reference
@@ -42,7 +42,7 @@ The following attributes are exported:
* `name` - The name of the record
* `value` - The value of the record
* `type` - The type of the record
-* `ttl` - The ttl of the record
+* `ttl` - The TTL of the record
* `priority` - The priority of the record
* `hostname` - The FQDN of the record
diff --git a/website/source/docs/providers/cloudstack/index.html.markdown b/website/source/docs/providers/cloudstack/index.html.markdown
index 43d2f815f..3fe42b98a 100644
--- a/website/source/docs/providers/cloudstack/index.html.markdown
+++ b/website/source/docs/providers/cloudstack/index.html.markdown
@@ -3,14 +3,14 @@ layout: "cloudstack"
page_title: "Provider: CloudStack"
sidebar_current: "docs-cloudstack-index"
description: |-
- The CloudStack provider is used to interact with the many resources supported by CloudStack. The provider needs to be configured with a URL pointing to a runnning CloudStack API and the proper credentials before it can be used.
+ The CloudStack provider is used to interact with the many resources supported by CloudStack. The provider needs to be configured with a URL pointing to a running CloudStack API and the proper credentials before it can be used.
---
# CloudStack Provider
The CloudStack provider is used to interact with the many resources
supported by CloudStack. The provider needs to be configured with a
-URL pointing to a runnning CloudStack API and the proper credentials
+URL pointing to a running CloudStack API and the proper credentials
before it can be used.
Use the navigation to the left to read about the available resources.
diff --git a/website/source/docs/providers/cloudstack/r/firewall.html.markdown b/website/source/docs/providers/cloudstack/r/firewall.html.markdown
index 5558a0e6c..3bae04d0e 100644
--- a/website/source/docs/providers/cloudstack/r/firewall.html.markdown
+++ b/website/source/docs/providers/cloudstack/r/firewall.html.markdown
@@ -3,12 +3,12 @@ layout: "cloudstack"
page_title: "CloudStack: cloudstack_firewall"
sidebar_current: "docs-cloudstack-resource-firewall"
description: |-
- Creates firewall rules for a given ip address.
+ Creates firewall rules for a given IP address.
---
# cloudstack\_firewall
-Creates firewall rules for a given ip address.
+Creates firewall rules for a given IP address.
## Example Usage
@@ -28,7 +28,7 @@ resource "cloudstack_firewall" "default" {
The following arguments are supported:
-* `ipaddress` - (Required) The ip address for which to create the firewall rules.
+* `ipaddress` - (Required) The IP address for which to create the firewall rules.
Changing this forces a new resource to be created.
* `rule` - (Required) Can be specified multiple times. Each rule block supports
@@ -36,7 +36,7 @@ The following arguments are supported:
The `rule` block supports:
-* `source_cidr` - (Required) The source cidr to allow access to the given ports.
+* `source_cidr` - (Required) The source CIDR to allow access to the given ports.
* `protocol` - (Required) The name of the protocol to allow. Valid options are:
`tcp`, `udp` and `icmp`.
@@ -54,4 +54,4 @@ The `rule` block supports:
The following attributes are exported:
-* `ipaddress` - The ip address for which the firewall rules are created.
+* `ipaddress` - The IP address for which the firewall rules are created.
diff --git a/website/source/docs/providers/cloudstack/r/ipaddress.html.markdown b/website/source/docs/providers/cloudstack/r/ipaddress.html.markdown
index 9f6a23681..3f560d22a 100644
--- a/website/source/docs/providers/cloudstack/r/ipaddress.html.markdown
+++ b/website/source/docs/providers/cloudstack/r/ipaddress.html.markdown
@@ -23,10 +23,10 @@ resource "cloudstack_ipaddress" "default" {
The following arguments are supported:
* `network` - (Optional) The name of the network for which an IP address should
- be aquired and accociated. Changing this forces a new resource to be created.
+ be acquired and associated. Changing this forces a new resource to be created.
-* `vpc` - (Optional) The name of the vpc for which an IP address should
- be aquired and accociated. Changing this forces a new resource to be created.
+* `vpc` - (Optional) The name of the VPC for which an IP address should
+ be acquired and associated. Changing this forces a new resource to be created.
*NOTE: Either `network` or `vpc` should have a value!*
@@ -34,5 +34,5 @@ The following arguments are supported:
The following attributes are exported:
-* `id` - The ID of the aquired and accociated IP address.
-* `ipaddress` - The IP address that was aquired and accociated.
+* `id` - The ID of the acquired and associated IP address.
+* `ipaddress` - The IP address that was acquired and associated.
diff --git a/website/source/docs/providers/cloudstack/r/network.html.markdown b/website/source/docs/providers/cloudstack/r/network.html.markdown
index 47028f611..98e07f178 100644
--- a/website/source/docs/providers/cloudstack/r/network.html.markdown
+++ b/website/source/docs/providers/cloudstack/r/network.html.markdown
@@ -37,7 +37,7 @@ The following arguments are supported:
* `network_offering` - (Required) The name of the network offering to use for
this network.
-* `vpc` - (Optional) The name of the vpc to create this network for. Changing
+* `vpc` - (Optional) The name of the VPC to create this network for. Changing
this forces a new resource to be created.
* `aclid` - (Optional) The ID of a network ACL that should be attached to the
diff --git a/website/source/docs/providers/cloudstack/r/network_acl.html.markdown b/website/source/docs/providers/cloudstack/r/network_acl.html.markdown
index a96de9bae..95eced1f3 100644
--- a/website/source/docs/providers/cloudstack/r/network_acl.html.markdown
+++ b/website/source/docs/providers/cloudstack/r/network_acl.html.markdown
@@ -43,7 +43,7 @@ The following arguments are supported:
* `vpc_id` - (Required) The ID of the associated VPC.
* `subnet_id` - (Optional) The ID of the associated subnet.
* `ingress` - (Optional) Specifies an ingress rule. Parameters defined below.
-* `egress` - (Optional) Speicifes an egress rule. Parameters defined below.
+* `egress` - (Optional) Specifies an egress rule. Parameters defined below.
Both `egress` and `ingress` support the following keys:
diff --git a/website/source/docs/providers/cloudstack/r/network_acl_rule.html.markdown b/website/source/docs/providers/cloudstack/r/network_acl_rule.html.markdown
index 3be2f0898..2771a31e9 100644
--- a/website/source/docs/providers/cloudstack/r/network_acl_rule.html.markdown
+++ b/website/source/docs/providers/cloudstack/r/network_acl_rule.html.markdown
@@ -41,7 +41,7 @@ The `rule` block supports:
* `action` - (Optional) The action for the rule. Valid options are: `allow` and
`deny` (defaults allow).
-* `source_cidr` - (Required) The source cidr to allow access to the given ports.
+* `source_cidr` - (Required) The source CIDR to allow access to the given ports.
* `protocol` - (Required) The name of the protocol to allow. Valid options are:
`tcp`, `udp`, `icmp`, `all` or a valid protocol number.
diff --git a/website/source/docs/providers/cloudstack/r/port_forward.html.markdown b/website/source/docs/providers/cloudstack/r/port_forward.html.markdown
index e2e5adbb9..bdf7c70c7 100644
--- a/website/source/docs/providers/cloudstack/r/port_forward.html.markdown
+++ b/website/source/docs/providers/cloudstack/r/port_forward.html.markdown
@@ -29,7 +29,7 @@ resource "cloudstack_port_forward" "default" {
The following arguments are supported:
-* `ipaddress` - (Required) The ip address for which to create the port forwards.
+* `ipaddress` - (Required) The IP address for which to create the port forwards.
Changing this forces a new resource to be created.
* `forward` - (Required) Can be specified multiple times. Each forward block supports
@@ -50,4 +50,4 @@ The `forward` block supports:
The following attributes are exported:
-* `ipaddress` - The ip address for which the port forwards are created.
+* `ipaddress` - The IP address for which the port forwards are created.
diff --git a/website/source/docs/providers/consul/index.html.markdown b/website/source/docs/providers/consul/index.html.markdown
index d7ceec10b..7c0997294 100644
--- a/website/source/docs/providers/consul/index.html.markdown
+++ b/website/source/docs/providers/consul/index.html.markdown
@@ -8,7 +8,7 @@ description: |-
# Consul Provider
-[Consul](http://www.consul.io) is a tool for service discovery, configuration
+[Consul](https://www.consul.io) is a tool for service discovery, configuration
and orchestration. The Consul provider exposes resources used to interact with a
Consul cluster. Configuration of the provider is optional, as it provides
defaults for all arguments.
diff --git a/website/source/docs/providers/dnsimple/r/record.html.markdown b/website/source/docs/providers/dnsimple/r/record.html.markdown
index 24b6d199a..6c167df6c 100644
--- a/website/source/docs/providers/dnsimple/r/record.html.markdown
+++ b/website/source/docs/providers/dnsimple/r/record.html.markdown
@@ -41,7 +41,7 @@ The following attributes are exported:
* `name` - The name of the record
* `value` - The value of the record
* `type` - The type of the record
-* `ttl` - The ttl of the record
+* `ttl` - The TTL of the record
* `priority` - The priority of the record
* `domain_id` - The domain ID of the record
* `hostname` - The FQDN of the record
diff --git a/website/source/docs/providers/google/r/compute_route.html.markdown b/website/source/docs/providers/google/r/compute_route.html.markdown
index 3651ded95..318494b83 100644
--- a/website/source/docs/providers/google/r/compute_route.html.markdown
+++ b/website/source/docs/providers/google/r/compute_route.html.markdown
@@ -63,7 +63,7 @@ The following arguments are supported:
The following attributes are exported:
* `name` - The name of the resource.
-* `dest_range` - The detination CIDR block of this route.
+* `dest_range` - The destination CIDR block of this route.
* `network` - The name of the network of this route.
* `next_hop_ip` - The IP address of the next hop, if available.
* `next_hop_instance` - The name of the instance of the next hop, if available.
diff --git a/website/source/docs/providers/heroku/r/addon.html.markdown b/website/source/docs/providers/heroku/r/addon.html.markdown
index 6bb0a9bd5..d39cb1e8b 100644
--- a/website/source/docs/providers/heroku/r/addon.html.markdown
+++ b/website/source/docs/providers/heroku/r/addon.html.markdown
@@ -14,7 +14,7 @@ services to a Heroku app.
## Example Usage
```
-# Create a new heroku app
+# Create a new Heroku app
resource "heroku_app" "default" {
name = "test-app"
}
diff --git a/website/source/docs/providers/heroku/r/app.html.markdown b/website/source/docs/providers/heroku/r/app.html.markdown
index aba45924d..d05bd2fb0 100644
--- a/website/source/docs/providers/heroku/r/app.html.markdown
+++ b/website/source/docs/providers/heroku/r/app.html.markdown
@@ -14,7 +14,7 @@ create and manage applications on Heroku.
## Example Usage
```
-# Create a new heroku app
+# Create a new Heroku app
resource "heroku_app" "default" {
name = "my-cool-app"
diff --git a/website/source/docs/providers/heroku/r/cert.html.markdown b/website/source/docs/providers/heroku/r/cert.html.markdown
index 972a78ffb..7bcb5b8df 100644
--- a/website/source/docs/providers/heroku/r/cert.html.markdown
+++ b/website/source/docs/providers/heroku/r/cert.html.markdown
@@ -13,7 +13,7 @@ Provides a Heroku SSL certificate resource. It allows to set a given certificate
## Example Usage
```
-# Create a new heroku app
+# Create a new Heroku app
resource "heroku_app" "default" {
name = "test-app"
}
@@ -46,6 +46,6 @@ The following arguments are supported:
The following attributes are exported:
* `id` - The ID of the add-on
-* `cname` - The CNAME of ssl endpoint
+* `cname` - The CNAME for the SSL endpoint
* `name` - The name of the SSL certificate
diff --git a/website/source/docs/providers/heroku/r/domain.html.markdown b/website/source/docs/providers/heroku/r/domain.html.markdown
index 9d7b03cf4..3d902b45a 100644
--- a/website/source/docs/providers/heroku/r/domain.html.markdown
+++ b/website/source/docs/providers/heroku/r/domain.html.markdown
@@ -14,7 +14,7 @@ create and manage applications on Heroku.
## Example Usage
```
-# Create a new heroku app
+# Create a new Heroku app
resource "heroku_app" "default" {
name = "test-app"
}
@@ -37,7 +37,7 @@ The following arguments are supported:
The following attributes are exported:
-* `id` - The ID of the of the domain record
-* `hostname` - The hostname traffic will be served as
-* `cname` - The cname traffic should route to.
+* `id` - The ID of the of the domain record.
+* `hostname` - The hostname traffic will be served as.
+* `cname` - The CNAME traffic should route to.
diff --git a/website/source/docs/providers/heroku/r/drain.html.markdown b/website/source/docs/providers/heroku/r/drain.html.markdown
index 819181c3e..36938c632 100644
--- a/website/source/docs/providers/heroku/r/drain.html.markdown
+++ b/website/source/docs/providers/heroku/r/drain.html.markdown
@@ -24,12 +24,12 @@ resource "heroku_drain" "default" {
The following arguments are supported:
-* `url` - (Required) The URL for Heroku to drain your logs to
+* `url` - (Required) The URL for Heroku to drain your logs to.
* `app` - (Required) The Heroku app to link to.
## Attributes Reference
The following attributes are exported:
-* `token` - The unique token for your created drain
+* `token` - The unique token for your created drain.
diff --git a/website/source/docs/providers/mailgun/r/domain.html.markdown b/website/source/docs/providers/mailgun/r/domain.html.markdown
index 3efe63426..a70693a72 100644
--- a/website/source/docs/providers/mailgun/r/domain.html.markdown
+++ b/website/source/docs/providers/mailgun/r/domain.html.markdown
@@ -14,7 +14,7 @@ create and manage applications on Mailgun.
## Example Usage
```
-# Create a new mailgun domain
+# Create a new Mailgun domain
resource "mailgun_domain" "default" {
name = "test.example.com"
spam_action = "disabled"
@@ -30,8 +30,8 @@ The following arguments are supported:
* `smtp_password` - (Required) Password for SMTP authentication
* `spam_action` - (Optional) `disabled` or `tag` Disable, no spam
filtering will occur for inbound messages. Tag, messages
- will be tagged wtih a spam header.
-* `wildcard` - (Optional) Boolean determines whether
+ will be tagged with a spam header.
+* `wildcard` - (Optional) Boolean that determines whether
the domain will accept email for sub-domains.
## Attributes Reference
@@ -48,7 +48,7 @@ The following attributes are exported:
* `record_type` - The record type.
* `valid` - `"valid"` if the record is valid.
* `value` - The value of the record.
-* `sending_records` - An arry of DNS records for sending validation.
+* `sending_records` - An array of DNS records for sending validation.
* `name` - The name of the record.
* `record_type` - The record type.
* `valid` - `"valid"` if the record is valid.
diff --git a/website/source/intro/examples/aws.html.markdown b/website/source/intro/examples/aws.html.markdown
index b7bf529aa..bdcff6a94 100644
--- a/website/source/intro/examples/aws.html.markdown
+++ b/website/source/intro/examples/aws.html.markdown
@@ -18,7 +18,7 @@ To simplify the example, this intentionally ignores deploying and
getting your application onto the servers. However, you could do so either via
[provisioners](/docs/provisioners/index.html) and a configuration
management tool, or by pre-baking configured AMIs with
-[Packer](http://www.packer.io).
+[Packer](https://www.packer.io).
After you run `terraform apply` on this configuration, it will
automatically output the DNS address of the ELB. After your instance
diff --git a/website/source/intro/examples/consul.html.markdown b/website/source/intro/examples/consul.html.markdown
index 56e708603..47c896d36 100644
--- a/website/source/intro/examples/consul.html.markdown
+++ b/website/source/intro/examples/consul.html.markdown
@@ -10,7 +10,7 @@ description: |-
[**Example Contents**](https://github.com/hashicorp/terraform/tree/master/examples/consul)
-[Consul](http://www.consul.io) is a tool for service discovery, configuration
+[Consul](https://www.consul.io) is a tool for service discovery, configuration
and orchestration. The Key/Value store it provides is often used to store
application configuration and information about the infrastructure necessary
to process requests.
diff --git a/website/source/intro/examples/index.html.markdown b/website/source/intro/examples/index.html.markdown
index 421ac121e..8ac1e0d45 100644
--- a/website/source/intro/examples/index.html.markdown
+++ b/website/source/intro/examples/index.html.markdown
@@ -13,7 +13,7 @@ of the ways Terraform can be used.
All examples are ready to run as-is. Terraform will
ask for input of things such as variables and API keys. If you want to
-conitnue using the example, you should save those parameters in a
+continue using the example, you should save those parameters in a
"terraform.tfvars" file or in a `provider` config bock.
~> **Warning!** The examples use real providers that launch _real_ resources.
diff --git a/website/source/intro/getting-started/build.html.md b/website/source/intro/getting-started/build.html.md
index 4557403a0..a40369fad 100644
--- a/website/source/intro/getting-started/build.html.md
+++ b/website/source/intro/getting-started/build.html.md
@@ -195,7 +195,7 @@ the getting started guide.
The EC2 instance we launched at this point is based on the AMI
given, but has no additional software installed. If you're running
an image-based infrastructure (perhaps creating images with
-[Packer](http://www.packer.io)), then this is all you need.
+[Packer](https://www.packer.io)), then this is all you need.
However, many infrastructures still require some sort of initialization
or software provisioning step. Terraform supports
diff --git a/website/source/intro/getting-started/modules.html.md b/website/source/intro/getting-started/modules.html.md
index d774ae0f6..138ab6098 100644
--- a/website/source/intro/getting-started/modules.html.md
+++ b/website/source/intro/getting-started/modules.html.md
@@ -33,7 +33,7 @@ configuration files.
As an example, we're going to use the
[Consul Terraform module](#)
-which will setup a complete [Consul](http://www.consul.io) cluster
+which will setup a complete [Consul](https://www.consul.io) cluster
for us.
Create a configuration file with the following contents:
diff --git a/website/source/intro/getting-started/provision.html.md b/website/source/intro/getting-started/provision.html.md
index 69aa053ff..4c6a5cfee 100644
--- a/website/source/intro/getting-started/provision.html.md
+++ b/website/source/intro/getting-started/provision.html.md
@@ -13,7 +13,7 @@ introduces how to use provisioners to run basic shell scripts on
instances when they're created.
If you're using an image-based infrastructure (perhaps with images
-created with [Packer](http://www.packer.io)), then what you've
+created with [Packer](https://www.packer.io)), then what you've
learned so far is good enough. But if you need to do some initial
setup on your instances, provisioners let you upload files,
run shell scripts, etc.
@@ -35,7 +35,7 @@ resource "aws_instance" "example" {
```
This adds a `provision` block within the `resource` block. Multiple
-`provision` blocks can be added to define multiple provisoining steps.
+`provision` blocks can be added to define multiple provisioning steps.
Terraform supports
[multiple provisioners](/docs/provisioners/index.html),
but for this example we use the "local-exec" provisioner.
diff --git a/website/source/intro/getting-started/variables.html.md b/website/source/intro/getting-started/variables.html.md
index e1f779c8b..2ab525b8b 100644
--- a/website/source/intro/getting-started/variables.html.md
+++ b/website/source/intro/getting-started/variables.html.md
@@ -3,14 +3,14 @@ layout: "intro"
page_title: "Input Variables"
sidebar_current: "gettingstarted-variables"
description: |-
- You now have enough Terraform knowledge to create useful configurations, but we're still hardcoding access keys, AMIs, etc. To become truly shareable and commitable to version control, we need to parameterize the configurations. This page introduces input variables as a way to do this.
+ You now have enough Terraform knowledge to create useful configurations, but we're still hardcoding access keys, AMIs, etc. To become truly shareable and committable to version control, we need to parameterize the configurations. This page introduces input variables as a way to do this.
---
# Input Variables
You now have enough Terraform knowledge to create useful
configurations, but we're still hardcoding access keys,
-AMIs, etc. To become truly shareable and commitable to version
+AMIs, etc. To become truly shareable and committable to version
control, we need to parameterize the configurations. This page
introduces input variables as a way to do this.
diff --git a/website/source/intro/use-cases.html.markdown b/website/source/intro/use-cases.html.markdown
index 1b2db5a07..794d3cb12 100644
--- a/website/source/intro/use-cases.html.markdown
+++ b/website/source/intro/use-cases.html.markdown
@@ -56,7 +56,7 @@ a tool to manage their services.
#### Software Demos
Modern software is increasingly networked and distributed. Although tools like
-[Vagrant](http://www.vagrantup.com/) exist to build virtualized environments
+[Vagrant](https://www.vagrantup.com/) exist to build virtualized environments
for demos, it is still very challenging to demo software on real infrastructure
which more closely matches production environments.
diff --git a/website/source/layouts/_footer.erb b/website/source/layouts/_footer.erb
index 911db6417..af1fc6ddf 100644
--- a/website/source/layouts/_footer.erb
+++ b/website/source/layouts/_footer.erb
@@ -11,8 +11,8 @@
diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb
index eda3830f8..fa6119a29 100644
--- a/website/source/layouts/_header.erb
+++ b/website/source/layouts/_header.erb
@@ -16,7 +16,7 @@