diff --git a/website/data/language-nav-data.json b/website/data/language-nav-data.json index bbd0d4b764..b2a7b26ab9 100644 --- a/website/data/language-nav-data.json +++ b/website/data/language-nav-data.json @@ -933,7 +933,7 @@ "title": "Terraform Settings", "routes": [ { "title": "Overview", "path": "settings" }, - { "title": "Terraform Cloud", "path": "settings/terraform-cloud" }, + { "title": "HCP Terraform", "path": "settings/settings/cloud" }, { "title": "Backends", "routes": [ diff --git a/website/docs/language/settings/backends/configuration.mdx b/website/docs/language/settings/backends/configuration.mdx index 0913007fcf..00f08a7246 100644 --- a/website/docs/language/settings/backends/configuration.mdx +++ b/website/docs/language/settings/backends/configuration.mdx @@ -8,7 +8,7 @@ description: >- A backend defines where Terraform stores its [state](/terraform/language/state) data files. -Terraform uses persisted state data to keep track of the resources it manages. Most non-trivial Terraform configurations either [integrate with HCP Terraform](/terraform/language/settings/terraform-cloud) or use a backend to store state remotely. This lets multiple people access the state data and work together on that collection of infrastructure resources. +Terraform uses persisted state data to keep track of the resources it manages. Most non-trivial Terraform configurations either [integrate with HCP Terraform](/terraform/language/settings/cloud) or use a backend to store state remotely. This lets multiple people access the state data and work together on that collection of infrastructure resources. This page describes how to configure a backend by adding the [`backend` block](#using-a-backend-block) to your configuration. @@ -25,7 +25,7 @@ Some of these backends act like plain remote disks for state files, while others ## Using a Backend Block You do not need to configure a backend when using HCP Terraform because -HCP Terraform automatically manages state in the workspaces associated with your configuration. If your configuration includes a [`cloud` block](/terraform/language/settings/terraform-cloud), it cannot include a `backend` block. +HCP Terraform automatically manages state in the workspaces associated with your configuration. If your configuration includes a [`cloud` block](/terraform/language/settings/cloud), it cannot include a `backend` block. To configure a backend, add a nested `backend` block within the top-level `terraform` block. The following example configures the `remote` backend. diff --git a/website/docs/language/settings/terraform-cloud.mdx b/website/docs/language/settings/cloud.mdx similarity index 98% rename from website/docs/language/settings/terraform-cloud.mdx rename to website/docs/language/settings/cloud.mdx index bf653a8daf..6c47ff70b1 100644 --- a/website/docs/language/settings/terraform-cloud.mdx +++ b/website/docs/language/settings/cloud.mdx @@ -1,8 +1,7 @@ --- page_title: HCP Terraform Configuration - Terraform Settings - Configuration Language description: >- - The nested `cloud` block configures Terraform's integration with Terraform - Cloud. + The nested `cloud` block configures Terraform's integration with HCP Terraform. --- # HCP Terraform Configuration diff --git a/website/docs/language/settings/index.mdx b/website/docs/language/settings/index.mdx index e02a879af8..333bc67539 100644 --- a/website/docs/language/settings/index.mdx +++ b/website/docs/language/settings/index.mdx @@ -35,7 +35,7 @@ following sections. The nested `cloud` block configures HCP Terraform for enabling its [CLI-driven run workflow](/terraform/cloud-docs/run/cli). -- Refer to [HCP Terraform Configuration](/terraform/language/settings/terraform-cloud) for a summary of the `cloud` block's syntax. +- Refer to [HCP Terraform Configuration](/terraform/language/settings/cloud) for a summary of the `cloud` block's syntax. - Refer to [Using HCP Terraform](/terraform/cli/cloud) in the Terraform CLI documentation for complete details about how to initialize and configure the HCP Terraform CLI integration. diff --git a/website/redirects.js b/website/redirects.js new file mode 100644 index 0000000000..6383c5b330 --- /dev/null +++ b/website/redirects.js @@ -0,0 +1,11 @@ +/** + * Redirects in this file are intended to be for documentation content only. The redirects will be applied to developer.hashicorp.com. + */ +module.exports = [ + // HCP Terraform rebranding + { + source: "/terraform/language/settings/terraform-cloud", + destination: "/terraform/language/settings/cloud", + permanent: true, + } +];