diff --git a/website/docs/language/files/override.mdx b/website/docs/language/files/override.mdx index 487a760fa..f1388df3a 100644 --- a/website/docs/language/files/override.mdx +++ b/website/docs/language/files/override.mdx @@ -151,7 +151,10 @@ constraint entirely replaces the constraints for the same component in the original block. If both the base block and the override block both set `required_version` then the constraints in the base block are entirely ignored. -If a `cloud` block is set within the original configuration's `terraform` block and a `backend` block -is set in the override file, then the backend specified by the `backend` block is used by Terraform upon merging. -Similarly, if a `backend` block is set within the original configuration's `terraform` block -and a `cloud` block is set in the override file, then the backend specified by the `backend` block is used by Terraform upon merging. +The presence of a block defining a backend (either `cloud` or `backend`) in an override +file always takes precedence over a block defining a backend in the original configuration. +That is, if a `cloud` block is set within the original configuration and a `backend` block is +set in the override file, Terraform will use the `backend` block specified in the override file as the +configuration's backend upon merging. Similarly, if a `backend` block is set within the original +configuration and a `cloud` block is set in the override file, Terraform will use the `cloud` +block specified in the override file as the configuration's backend upon merging. diff --git a/website/docs/language/settings/terraform-cloud.mdx b/website/docs/language/settings/terraform-cloud.mdx index 902903c1d..e69013b71 100644 --- a/website/docs/language/settings/terraform-cloud.mdx +++ b/website/docs/language/settings/terraform-cloud.mdx @@ -30,6 +30,7 @@ terraform { You cannot use the CLI integration and a [state backend](/language/settings/backends) in the same configuration; they are mutually exclusive. A configuration can only provide one `cloud` block and the `cloud` block cannot refer to named values like input variables, locals, or data source attributes. -Note, however, that a `cloud` block can be overridden by a state backend in an [override file](/language/files/override). +However, if a state `backend` block is defined in an [override file](/language/files/override), +that `backend` block will override an existing `cloud` block in the configuration upon merging. Refer to [Using Terraform Cloud](/cli/cloud) in the Terraform CLI docs for more information.