diff --git a/content/source/docs/enterprise-legacy/user-accounts/access.html.md b/content/source/docs/enterprise-legacy/user-accounts/access.html.md index 7e9afef434..169f26a282 100644 --- a/content/source/docs/enterprise-legacy/user-accounts/access.html.md +++ b/content/source/docs/enterprise-legacy/user-accounts/access.html.md @@ -18,7 +18,7 @@ Read is the lowest level of access within Terraform Enterprise. Users with read ### Write -Write access allows collaborating users the abilty to view the resource and perform create, update, and edit actions on a resource. Users with write access are not able to destroy resources. For example, users with write access are able to view and edit Terraform environment variables as well as push new configuration. +Write access allows collaborating users the ability to view the resource and perform create, update, and edit actions on a resource. Users with write access are not able to destroy resources. For example, users with write access are able to view and edit Terraform environment variables as well as push new configuration. ### Admin diff --git a/content/source/docs/enterprise-legacy/vcs/bitbucket.html.md b/content/source/docs/enterprise-legacy/vcs/bitbucket.html.md index 70ae63a792..05bbb0836b 100644 --- a/content/source/docs/enterprise-legacy/vcs/bitbucket.html.md +++ b/content/source/docs/enterprise-legacy/vcs/bitbucket.html.md @@ -55,7 +55,7 @@ Back in the open Bitbucket tab, select the Terraform Enterprise OAuth consumer a ### Connect a Bitbucket Cloud User to Organization -Back on the **Configuration** page for your Terraform Enterprise Organization, in the **OAuth Connections** pane, you can now connect your organization to Bitbucket Cloud by clicking **Connect**. You will be briefly redirected to Bitbucket Cloud in order to authenticate the client. You should be successfuly redirected back to Terraform Enterprise. If you are not, check the values in your OAuth client and make sure they match exactly with the values associated with your Bitbucket OAuth consumer. +Back on the **Configuration** page for your Terraform Enterprise Organization, in the **OAuth Connections** pane, you can now connect your organization to Bitbucket Cloud by clicking **Connect**. You will be briefly redirected to Bitbucket Cloud in order to authenticate the client. You should be successfully redirected back to Terraform Enterprise. If you are not, check the values in your OAuth client and make sure they match exactly with the values associated with your Bitbucket OAuth consumer. The Terraform Enterprise Bitbucket Cloud integration is now ready your Organization to start using. diff --git a/content/source/docs/enterprise-legacy/vcs/gitlab.html.md b/content/source/docs/enterprise-legacy/vcs/gitlab.html.md index e2523cd320..2237e18005 100644 --- a/content/source/docs/enterprise-legacy/vcs/gitlab.html.md +++ b/content/source/docs/enterprise-legacy/vcs/gitlab.html.md @@ -47,7 +47,7 @@ Back in the open GitLab tab, select the Terraform Enterprise OAuth application a ### Connect a GitLab User to Organization -Back on the **Configuration** page for your Terraform Enterprise Organization, in the **OAuth Connections** pane, you can now connect your organization to GitLab by clicking **Connect**. You will be briefly redirected to GitLab in order to authenticate the client. You should be successfuly redirected back to Terraform Enterprise. If you are not, check the values in your OAuth client and make sure they match exactly with the values associated with your GitLab OAuth application. +Back on the **Configuration** page for your Terraform Enterprise Organization, in the **OAuth Connections** pane, you can now connect your organization to GitLab by clicking **Connect**. You will be briefly redirected to GitLab in order to authenticate the client. You should be successfully redirected back to Terraform Enterprise. If you are not, check the values in your OAuth client and make sure they match exactly with the values associated with your GitLab OAuth application. The Terraform Enterprise GitLab integration is now ready your Organization to start using. diff --git a/content/source/docs/enterprise/api/modules.html.md b/content/source/docs/enterprise/api/modules.html.md index c59325d765..025aef1c59 100644 --- a/content/source/docs/enterprise/api/modules.html.md +++ b/content/source/docs/enterprise/api/modules.html.md @@ -71,7 +71,7 @@ Key path | Type | Default | Description ------------------------------------------|--------|---------|------------ `data.type` | string | | Must be `"registry-modules"`. `data.attributes.vcs-repo.identifier` | string | | The repository from which to ingress the configuration. -`data.attributes.vcs-repo.oauth-token-id` | string | | The VCS Connection (OAuth Conection + Token) to use as identified. This ID can be obtained from the [oauth-tokens](./oauth-tokens.html) endpoint. +`data.attributes.vcs-repo.oauth-token-id` | string | | The VCS Connection (OAuth Connection + Token) to use as identified. This ID can be obtained from the [oauth-tokens](./oauth-tokens.html) endpoint. A VCS repository identifier is a reference to a VCS repository in the format `:org/:repo`, where `:org` and `:repo` refer to the organization (or project key, for Bitbucket Server) and repository in your VCS provider. diff --git a/content/source/docs/enterprise/api/oauth-tokens.html.md b/content/source/docs/enterprise/api/oauth-tokens.html.md index 1556129026..bf86486a87 100644 --- a/content/source/docs/enterprise/api/oauth-tokens.html.md +++ b/content/source/docs/enterprise/api/oauth-tokens.html.md @@ -8,7 +8,7 @@ sidebar_current: "docs-enterprise2-api-oauth-tokens" -> **Note**: These API endpoints are in beta and are subject to change. -The `oauth-token` object represents a VCS configuration which includes the OAuth connection and the assocaited OAuth token. This object is used when creating a workspace to identify which VCS connection to use. +The `oauth-token` object represents a VCS configuration which includes the OAuth connection and the associated OAuth token. This object is used when creating a workspace to identify which VCS connection to use. ## List OAuth Tokens diff --git a/content/source/docs/enterprise/api/workspaces.html.md b/content/source/docs/enterprise/api/workspaces.html.md index 5d0e2f59c5..72d5cea3ca 100644 --- a/content/source/docs/enterprise/api/workspaces.html.md +++ b/content/source/docs/enterprise/api/workspaces.html.md @@ -300,7 +300,7 @@ Key path | Type | Default `data.attributes.terraform-version` | string | (previous value) | The version of Terraform to use for this workspace. `data.attributes.working-directory` | string | (previous value) | A relative path that Terraform will execute within. This defaults to the root of your repository and is typically set to a subdirectory matching the environment when multiple environments exist within the same repository. `data.attributes.vcs-repo` | object or null | (previous value) | To delete a workspace's existing VCS repo, specify `null` instead of an object. To modify a workspace's existing VCS repo, include whichever of the keys below you wish to modify. To add a new VCS repo to a workspace that didn't previously have one, include at least the `oauth-token-id` and `identifier` keys. -`data.attributes.vcs-repo.oauth-token-id` | string | (previous value) | The VCS Connection (OAuth Conection + Token) to use. This ID can be obtained from the [oauth-tokens](./oauth-tokens.html) endpoint. +`data.attributes.vcs-repo.oauth-token-id` | string | (previous value) | The VCS Connection (OAuth Connection + Token) to use. This ID can be obtained from the [oauth-tokens](./oauth-tokens.html) endpoint. `data.attributes.vcs-repo.branch` | string | (previous value) | The repository branch that Terraform will execute from. `data.attributes.vcs-repo.ingress-submodules` | boolean | (previous value) | Whether submodules should be fetched when cloning the VCS repository. `data.attributes.vcs-repo.identifier` | string | (previous value) | A reference to your VCS repository in the format :org/:repo where :org and :repo refer to the organization and repository in your VCS provider. diff --git a/content/source/docs/enterprise/getting-started/policies.html.md b/content/source/docs/enterprise/getting-started/policies.html.md index 219a1c078d..9e8e78c253 100644 --- a/content/source/docs/enterprise/getting-started/policies.html.md +++ b/content/source/docs/enterprise/getting-started/policies.html.md @@ -6,7 +6,7 @@ sidebar_current: "docs-enterprise2-started-policies" # Creating and Managing Terraform Policies -**Prerequisites:** Before starting this guide, make sure you've [sucessfully completed a run](./runs.html). +**Prerequisites:** Before starting this guide, make sure you've [successfully completed a run](./runs.html). ## About Sentinel Policies diff --git a/content/source/docs/enterprise/private/admin/resources.html.md b/content/source/docs/enterprise/private/admin/resources.html.md index 9cab81c885..e136192b24 100644 --- a/content/source/docs/enterprise/private/admin/resources.html.md +++ b/content/source/docs/enterprise/private/admin/resources.html.md @@ -10,7 +10,7 @@ Site administrators have access to all organizations, users, runs, and workspace ## Viewing, Searching, and Filtering Lists -Each type of account or resource is initally presented as a searchable list, accessed by clicking the name of the resource on the left. In addition to searching or filtering (typically by email, name, or other relevant attribute), there are pre-existing filters to show useful sets, such as site administrators (users) or "Needs Attention" (workspaces, runs). +Each type of account or resource is initially presented as a searchable list, accessed by clicking the name of the resource on the left. In addition to searching or filtering (typically by email, name, or other relevant attribute), there are pre-existing filters to show useful sets, such as site administrators (users) or "Needs Attention" (workspaces, runs). ## Managing Users diff --git a/content/source/docs/enterprise/private/aws-setup-guide.html.md b/content/source/docs/enterprise/private/aws-setup-guide.html.md index 0e27a02556..e674a41b3e 100644 --- a/content/source/docs/enterprise/private/aws-setup-guide.html.md +++ b/content/source/docs/enterprise/private/aws-setup-guide.html.md @@ -160,7 +160,7 @@ the private key of a public ACM certificate on your PTFE instance. ### Application Layer The Application Layer is composed of an Auto Scaling Group and a Launch Configuration -providing an auto-recovery mechanism in the event of an instance or Availablity Zone failure. +providing an auto-recovery mechanism in the event of an instance or Availability Zone failure. ### Storage Layer diff --git a/content/source/docs/enterprise/private/capacity.html.md b/content/source/docs/enterprise/private/capacity.html.md index 6f2d91aaf6..be356858b3 100644 --- a/content/source/docs/enterprise/private/capacity.html.md +++ b/content/source/docs/enterprise/private/capacity.html.md @@ -29,14 +29,14 @@ the [application settings JSON file when using the automated install procedure]( To increase the number of concurrent runs, adjust the **Capacity** setting. Note that this setting is not limited by system checks; it depends on the operator to provide enough memory to the system to accommodate the requested -concurrent capacity. For instance, if **Capacity** is set to `100`, the instance would require, at a minumum, +concurrent capacity. For instance, if **Capacity** is set to `100`, the instance would require, at a minimum, 26 GB of memory reserved for Terraform runs. ## Adjusting Memory The default memory limit of 256 MB per Terraform run is also configurable. Note that this setting is not limited by system checks; it depends on the operator to provide enough memory to the system to accommodate the requested limits. -If the memory limit is adjusted to 512 MB with the default capacity of 10, the instance would require, at a minumum, +If the memory limit is adjusted to 512 MB with the default capacity of 10, the instance would require, at a minimum, 5.2 GB of memory reserved for Terraform runs. ### Downward Adjustment diff --git a/content/source/docs/enterprise/private/faq.html.md b/content/source/docs/enterprise/private/faq.html.md index d0d8dbd97a..cbdc740087 100644 --- a/content/source/docs/enterprise/private/faq.html.md +++ b/content/source/docs/enterprise/private/faq.html.md @@ -240,7 +240,7 @@ Terraform Enterprise makes several categories of outbound requests, detailed in Private Terraform Enterprise can be configured to connect to a number of [Version Control Systems (VCSs)](https://www.terraform.io/docs/enterprise/vcs/index.html), some supporting both SaaS and private-network installations. -In order to perform ingress of Terraform configuration from a configured VCS, Private Terraform Enterprise will need to be able to communciate with that provider's API, and webhooks from that provider will need to be able to reach Private Terraform Enterprise. +In order to perform ingress of Terraform configuration from a configured VCS, Private Terraform Enterprise will need to be able to communicate with that provider's API, and webhooks from that provider will need to be able to reach Private Terraform Enterprise. For example, an integration with GitHub.com will require Private Terraform Enterprise to have access to https://github.com and for GitHub's webhooks to be able to route back to Terraform. Similarly, an integration with GitHub Enterprise will require Terraform to have access to the local GitHub instance. diff --git a/content/source/docs/enterprise/private/install-ami.html.md b/content/source/docs/enterprise/private/install-ami.html.md index 5fedd17c0f..7f40651318 100644 --- a/content/source/docs/enterprise/private/install-ami.html.md +++ b/content/source/docs/enterprise/private/install-ami.html.md @@ -25,7 +25,7 @@ Before setup begins, a few resources need to be provisioned. We consider these o The following are **required** to complete installation: * **AWS IAM credentials** capable of creating new IAM roles configuring various services. We strongly suggest you use the `AdministratorAccess` policy for this. The credentials are only used for setup; during runtime only an assumed role is used. -* **AWS VPC** containing at least 2 subnets. These will be used to launch the cluster into. Subnets do not need to be public, but they do need an internet gateway at present. If two private subnets are used they should each be in a seperate Availability Zone (AZ). Also, if a third public subnet is used, and the instance resides in a private subnet, the public subnet must be in the same AZ as the instance. +* **AWS VPC** containing at least 2 subnets. These will be used to launch the cluster into. Subnets do not need to be public, but they do need an internet gateway at present. If two private subnets are used they should each be in a separate Availability Zone (AZ). Also, if a third public subnet is used, and the instance resides in a private subnet, the public subnet must be in the same AZ as the instance. * **SSH Key Pair** configured with AWS EC2. This will be used to configure support access to the cluster. This SSH key can be optionally removed from the instance once installation is complete. * To create a new one, [see Amazon's docs for EC2 key pairs.](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html) * A **Publicly Trusted TLS certificate** registered with AWS Certificate Manager. This can be one created by ACM for a hostname or the certificate can be imported into it. @@ -68,7 +68,7 @@ The values for these variables should be placed in the `terraform.tfvars` file. * `cert_id`: An AWS certificate ARN. This is the certification that will be used by the ELB for the cluster. Example: `arn:aws:acm:us-west-2:241656615859:certificate/f32fa674-de62-4681-8035-21a4c81474c6` * `instance_subnet_id`: Subnet ID of the subnet that the cluster's instance will be placed into. If this is a public subnet, the instance will be assigned a public IP. This is not required as the primary cluster interface is an ELB registered with the hostname. Example: `subnet-0de26b6a` * `elb_subnet_id`: Subnet ID of the subnet that the cluster's load balancer will be placed into. If this is a public subnet, the load balancer will be accessible from the public internet. This is not required — the ELB can be marked as private via the `internal_elb` option below. -* `data_subnet_ids`: Subnet IDs that will be used to create the data services (RDS and ElastiCache) used by the cluster. There must be 2 subnet IDs given for proper redundency. Example: `["subnet-0ce26b6b", "subnet-d0f35099"]` +* `data_subnet_ids`: Subnet IDs that will be used to create the data services (RDS and ElastiCache) used by the cluster. There must be 2 subnet IDs given for proper redundancy. Example: `["subnet-0ce26b6b", "subnet-d0f35099"]` * `db_password`: Password that will be used to access RDS. Example: `databaseshavesecrets` * `bucket_name`: Name of the S3 bucket to store artifacts used by the cluster into. This bucket is automatically created. We suggest you name it `tfe--data`, as convention. diff --git a/content/source/docs/enterprise/private/migrate.html.md b/content/source/docs/enterprise/private/migrate.html.md index 51b60cc35c..404425a2e0 100644 --- a/content/source/docs/enterprise/private/migrate.html.md +++ b/content/source/docs/enterprise/private/migrate.html.md @@ -191,7 +191,7 @@ later running this program on the linux instance being used to run the installer. This program will now shutdown some primary services before -continuning to be sure that the database is consistent +continuing to be sure that the database is consistent Shutting down services... 2018/05/25 17:37:04 Generated new root token to transmit 2018/05/25 17:37:04 connecting to postgresql at postgres://atlas:xxyyzz@tfe-aabbcc.ddeeff.us-west-2.rds.amazonaws.com:5432/atlas_production?&options=-c%20search%5Fpath%3Dvault diff --git a/content/source/docs/extend/best-practices/deprecations.md b/content/source/docs/extend/best-practices/deprecations.md index 45bfa51ce5..94ea78d71c 100644 --- a/content/source/docs/extend/best-practices/deprecations.md +++ b/content/source/docs/extend/best-practices/deprecations.md @@ -264,7 +264,7 @@ func resourceExampleWidgetUpdate(d *schema.ResourceData, meta interface{}) error ### Renaming an Optional Attribute -~> **NOTE:** If the schema defintion does not contain `Optional` or `Required`, see the [Renaming a Computed Attribute section](#renaming-a-computed-attribute) instead. If the schema definition contains `Required` instead of `Optional`, see the [Renaming a Required Attribute section](#renaming-a-required-attribute). +~> **NOTE:** If the schema definition does not contain `Optional` or `Required`, see the [Renaming a Computed Attribute section](#renaming-a-computed-attribute) instead. If the schema definition contains `Required` instead of `Optional`, see the [Renaming a Required Attribute section](#renaming-a-required-attribute). -> [Optional attributes](/docs/extend/schemas/schema-behaviors.html#optional) are also referred to as optional "arguments" throughout the Terraform documentation. diff --git a/content/source/docs/extend/best-practices/naming.html.md b/content/source/docs/extend/best-practices/naming.html.md index eff5e0354d..75cbd91ce0 100644 --- a/content/source/docs/extend/best-practices/naming.html.md +++ b/content/source/docs/extend/best-practices/naming.html.md @@ -81,7 +81,7 @@ List and set attributes use the same bracket syntax, and differ only in how they are described to and used by the user. In lists, the ordering is significant and duplicate values are often accepted. In sets, the ordering is *not* significant and duplicated values are usually *not* accepted, since -presence or absense is what is important. +presence or absence is what is important. Map blocks use the same syntax as other configuration blocks, but the keys in maps are arbitrary and not explicitly named by the plugin, so in some cases diff --git a/content/source/docs/extend/testing/acceptance-tests/testcase.html.md b/content/source/docs/extend/testing/acceptance-tests/testcase.html.md index 6fb43cc170..c38536557a 100644 --- a/content/source/docs/extend/testing/acceptance-tests/testcase.html.md +++ b/content/source/docs/extend/testing/acceptance-tests/testcase.html.md @@ -239,7 +239,7 @@ func testAccCheckExampleResourceDestroy(s *terraform.State) error { return nil } - // If the error is equivelent to 404 not found, the widget is destroyed. + // If the error is equivalent to 404 not found, the widget is destroyed. // Otherwise return the error if !strings.Contains(err.Error(), "Widget not found" { return err diff --git a/content/source/docs/extend/testing/acceptance-tests/teststep.html.md b/content/source/docs/extend/testing/acceptance-tests/teststep.html.md index c704432863..b4cdbf9f61 100644 --- a/content/source/docs/extend/testing/acceptance-tests/teststep.html.md +++ b/content/source/docs/extend/testing/acceptance-tests/teststep.html.md @@ -209,9 +209,9 @@ results to other `TestCheckFunc` methods. The below example uses `ComposeTestCheckFunc` to group a set of `TestCheckFunc` functions together. The first function `testAccCheckExampleWidgetExists` uses the `Example` service SDK directly, and queries it for the ID of the widget we have in state. Once found, -the result is stored into the `widget` struct declared at the begining of the +the result is stored into the `widget` struct declared at the beginning of the test function. The next check function `testAccCheckExampleWidgetAttributes` -recieves the updated `widget` and checks its attributes. The final check +receives the updated `widget` and checks its attributes. The final check `TestCheckResourceAttr` verifies that the same value is stored in state. ```go