diff --git a/command/apply_test.go b/command/apply_test.go index abc33dae57..5700ade690 100644 --- a/command/apply_test.go +++ b/command/apply_test.go @@ -841,7 +841,7 @@ func TestApply_planVars(t *testing.T) { // we should be able to apply a plan file with no other file dependencies func TestApply_planNoModuleFiles(t *testing.T) { - // temprary data directory which we can remove between commands + // temporary data directory which we can remove between commands td, err := ioutil.TempDir("", "tf") if err != nil { t.Fatal(err) diff --git a/command/init.go b/command/init.go index 54a244cdd7..ff0aadc9d8 100644 --- a/command/init.go +++ b/command/init.go @@ -194,7 +194,7 @@ Usage: terraform init [options] [SOURCE] [PATH] This is the first command that should be run for any new or existing Terraform configuration per machine. This sets up all the local data - necessary to run Terraform that is typically not comitted to version + necessary to run Terraform that is typically not committed to version control. This command is always safe to run multiple times. Though subsequent runs diff --git a/command/meta_backend.go b/command/meta_backend.go index 6f75acc772..f1e886e34d 100644 --- a/command/meta_backend.go +++ b/command/meta_backend.go @@ -1200,7 +1200,7 @@ func (m *Meta) backend_C_r_S_unchanged( s := sMgr.State() // it's possible for a backend to be unchanged, and the config itself to - // have changed by moving a paramter from the config to `-backend-config` + // have changed by moving a parameter from the config to `-backend-config` // In this case we only need to update the Hash. if c != nil && s.Backend.Hash != c.Hash { s.Backend.Hash = c.Hash diff --git a/command/state_mv.go b/command/state_mv.go index 7982d7b926..5b99dd2ab0 100644 --- a/command/state_mv.go +++ b/command/state_mv.go @@ -133,7 +133,7 @@ func (c *StateMvCommand) Run(args []string) int { } // addableResult takes the result from a filter operation and returns what to -// call State.Add with. The reason we do this is beacuse in the module case +// call State.Add with. The reason we do this is because in the module case // we must add the list of all modules returned versus just the root module. func (c *StateMvCommand) addableResult(results []*terraform.StateFilterResult) interface{} { switch v := results[0].Value.(type) { diff --git a/dag/walk.go b/dag/walk.go index a74f1142af..23c87adc1a 100644 --- a/dag/walk.go +++ b/dag/walk.go @@ -352,7 +352,7 @@ func (w *Walker) walkVertex(v Vertex, info *walkerVertex) { } // Check if we have updated dependencies. This can happen if the - // dependencies were satisfied exactly prior to an Update occuring. + // dependencies were satisfied exactly prior to an Update occurring. // In that case, we'd like to take into account new dependencies // if possible. info.DepsLock.Lock() diff --git a/examples/digitalocean/variable.tf b/examples/digitalocean/variable.tf index 179b8d803a..2068806a4e 100644 --- a/examples/digitalocean/variable.tf +++ b/examples/digitalocean/variable.tf @@ -1,6 +1,6 @@ # #### -# Current Availiable Datacenter Regions +# Current Available Datacenter Regions # As of 05-07-2016 diff --git a/examples/gce-vpn/vpn.tf b/examples/gce-vpn/vpn.tf index d9f86cbc7f..a588fd53db 100644 --- a/examples/gce-vpn/vpn.tf +++ b/examples/gce-vpn/vpn.tf @@ -5,7 +5,7 @@ provider "google" { region = "${var.region1}" } -# Create the two networks we want to join. They must have seperate, internal +# Create the two networks we want to join. They must have separate, internal # ranges. resource "google_compute_network" "network1" { name = "network1" diff --git a/flatmap/expand.go b/flatmap/expand.go index 2bfb3fe3d2..e0b81b6410 100644 --- a/flatmap/expand.go +++ b/flatmap/expand.go @@ -115,7 +115,7 @@ func expandArray(m map[string]string, prefix string) []interface{} { func expandMap(m map[string]string, prefix string) map[string]interface{} { // Submaps may not have a '%' key, so we can't count on this value being - // here. If we don't have a count, just procede as if we have have a map. + // here. If we don't have a count, just proceed as if we have have a map. if count, ok := m[prefix+"%"]; ok && count == "0" { return map[string]interface{}{} } diff --git a/website/source/docs/commands/init.html.markdown b/website/source/docs/commands/init.html.markdown index 57aeaed897..495763f2c5 100644 --- a/website/source/docs/commands/init.html.markdown +++ b/website/source/docs/commands/init.html.markdown @@ -21,7 +21,7 @@ initial files, loading any remote state, downloading modules, etc. This is the first command that should be run for any new or existing Terraform configuration per machine. This sets up all the local data -necessary to run Terraform that is typically not comitted to version +necessary to run Terraform that is typically not committed to version control. This command is always safe to run multiple times. Though subsequent runs diff --git a/website/source/docs/enterprise/vcs/bitbucket.html.md b/website/source/docs/enterprise/vcs/bitbucket.html.md index 1d02a69b51..d1a5633aa9 100644 --- a/website/source/docs/enterprise/vcs/bitbucket.html.md +++ b/website/source/docs/enterprise/vcs/bitbucket.html.md @@ -53,7 +53,7 @@ You are now ready to use your personal token to manage builds and configurations ## Connecting Configurations Once you have linked a Bitbucket installation to your account or organization, -you are ready to begin creating Packer Builds and Terraform Enviroments linked +you are ready to begin creating Packer Builds and Terraform Environments linked to your desired Bitbucket Cloud repository. Terraform Enterprise environments are linked to individual GitHub repositories. diff --git a/website/source/docs/enterprise/vcs/gitlab.html.md b/website/source/docs/enterprise/vcs/gitlab.html.md index 44409a9dd3..deaa808926 100644 --- a/website/source/docs/enterprise/vcs/gitlab.html.md +++ b/website/source/docs/enterprise/vcs/gitlab.html.md @@ -50,7 +50,7 @@ Navigate to https://atlas.hashicorp.com/settings/connections and click on “Con ## Connecting Configurations Once you have linked a GitLab installation to your account or organization, -you are ready to begin creating Packer Builds and Terraform Enviroments linked +you are ready to begin creating Packer Builds and Terraform Environments linked to your desired GitLab repository. Terraform Enterprise environments are linked to individual GitLab repositories. diff --git a/website/source/docs/providers/oneandone/r/loadbalancer.html.markdown b/website/source/docs/providers/oneandone/r/loadbalancer.html.markdown index 0d7cc306ab..6c30344fd4 100644 --- a/website/source/docs/providers/oneandone/r/loadbalancer.html.markdown +++ b/website/source/docs/providers/oneandone/r/loadbalancer.html.markdown @@ -47,7 +47,7 @@ The following arguments are supported: * `method` - (Required) Balancing procedure Can be `ROUND_ROBIN` or `LEAST_CONNECTIONS` * `datacenter` - (Optional) Location of desired 1and1 datacenter. Can be `DE`, `GB`, `US` or `ES` * `persistence` - (Optional) True/false defines whether persistence should be turned on/off -* `persistence_time` - (Optional) Persistance duration in seconds +* `persistence_time` - (Optional) Persistence duration in seconds * `health_check_test` - (Optional) Can be `TCP` or`ICMP`. * `health_check_test_interval` - (Optional) * `health_check_test_path` - (Optional) diff --git a/website/source/docs/state/locking.html.md b/website/source/docs/state/locking.html.md index 99b635f4d9..6a4b8648d7 100644 --- a/website/source/docs/state/locking.html.md +++ b/website/source/docs/state/locking.html.md @@ -19,7 +19,7 @@ with the `-lock` flag but it is not recommended. If acquiring the lock is taking longer than expected, Terraform will output a status message. If Terraform doesn't output a message, state locking is -still occuring if your backend supports it. +still occurring if your backend supports it. Not all [backends](/docs/backends) support locking. Please view the list of [backend types](/docs/backends/types) for details on whether a backend